From 12cd221e680adb6e863f66093d36b91c966ee237 Mon Sep 17 00:00:00 2001
From: Chia-Kai Liang <ckliang@google.com>
Date: Thu, 14 Jul 2022 04:20:16 +0000
Subject: [PATCH 1/2] Revert "powerhint: Disable PreferIdle STANDARD streaming"

This reverts commit 5b8dbb546cf3ec73ba1711d5d54b4a03d72fe72d.

Reason for revert: b/238852060 and b/238284104)

Bug: 238852060

Change-Id: I0aa5910f7047d3f710cbb3f2538330454ba370f4
---
 powerhint-cheetah-a0.json | 6 ------
 powerhint-cheetah.json    | 6 ------
 powerhint-panther-a0.json | 6 ------
 powerhint-panther.json    | 6 ------
 4 files changed, 24 deletions(-)

diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 6f27263..3974f21 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -1018,12 +1018,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index fd31e44..8b55958 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -1039,12 +1039,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index 265960f..9e84dab 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -1006,12 +1006,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 3bfc4f5..1896925 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -1016,12 +1016,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUBigClusterMaxFreq",

From 76de57ae2fa8abae7dc6478efc3fbd08c2a07768 Mon Sep 17 00:00:00 2001
From: Long Ling <longling@google.com>
Date: Mon, 18 Jul 2022 15:41:50 -0700
Subject: [PATCH 2/2] display: update color data

Bug: 216312292
Change-Id: Iad084514aa4ae580d9356fd6c2da4b8b9db0fef6
---
 cheetah/display_colordata_dev_cal0.pb | Bin 0 -> 642 bytes
 device-cheetah.mk                     |   1 +
 panther/display_colordata_dev_cal0.pb | Bin 1426 -> 1995 bytes
 3 files changed, 1 insertion(+)
 create mode 100644 cheetah/display_colordata_dev_cal0.pb

diff --git a/cheetah/display_colordata_dev_cal0.pb b/cheetah/display_colordata_dev_cal0.pb
new file mode 100644
index 0000000000000000000000000000000000000000..1094e9e3dc682f70cdc4ea0e79dcc7c069ca36e6
GIT binary patch
literal 642
zcmXZXT}V@57yw}3_xqc(bge8ctJx39A`}x53Cbc7A`z7+5G-q!piaUIgD%cR<uMhP
zj$9xzE$9?hC(}4Y=>oB(q(@6TWIv<C7L*P_oCd8fx_Yi3bEXL_U;{fp>#VABR;T|r
zJMp}u+Hvtrt>c`n?2^q{US3&I?XcB4ot1}4erk^O6*Ui0b6jy@PJU7D(ZbTA;`Fqv
z4691bt6)Zp*&=KaVV{R6Kx(oi*izE64&@b`Jbj_2P68QR-~lfvpn?WI@PiHp1Rw|@
z2!n(&y3m7OR8U0?edtFW4GdrqLl{Ph$iziF#7h*S5{>wXpXkIO0TLu35+)Lrsf&83
zmnu}H8ud{>)u}-PG)O}<OeH2W7xOSLQ<%y$=3{=QGlK<KkcC*7NnGYG?%`gpaFuJ^
z$NgOA1`qHc5AiUUge+XbBfLTps?dZ__=PS4A|xzU760We7G{e?i2XK3k?5rTC9Uut
zx^Nx`$xXUQ-?276$=$*bou)a{<LF5AxVbB4Ic9v#{k3xJkJz!eev5Zqvo&J<u>Q%0
zmiS-sZ#Jr%+zG1*vx)lVfh`Y{y0?0^-Pqn_yPn**qh)9NuHoHR_q<MNvwz$BY+rlo
z@3gseBV#i2ZPrZo&jZ&EDmjx!uH_EpH6HtTTr21-YB|w#%3X4=bfj#>(O2=Oa;oNe
zZEu}+c}#+(EAXHJ!p$(%3d8L%(gCww(0Uh)9_Z@@MT7nUm>GhOQCOLPMFZpjy!Z}n
z3(&9(-4Xayj{`0ozJ*KOIM##uQ<Prfmr-1pM)fP+na7D$?5`)&ZqnOL9u1Pg&%~Gf
E7slrKd;kCd

literal 0
HcmV?d00001

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 7ee0529..57c1c35 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -70,6 +70,7 @@ PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=33
 
 # Display Config
 PRODUCT_COPY_FILES += \
+        device/google/pantah/cheetah/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
         device/google/pantah/cheetah/display_colordata_boe-nt37290_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_boe-nt37290_cal0.pb \
         device/google/pantah/cheetah/display_colordata_sdc-s6e3hc3-c10_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_sdc-s6e3hc3-c10_cal0.pb \
         device/google/pantah/cheetah/display_colordata_sdc-s6e3hc4_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_sdc-s6e3hc4_cal0.pb \
diff --git a/panther/display_colordata_dev_cal0.pb b/panther/display_colordata_dev_cal0.pb
index b88b27c5b758676ab4548f3aa86a072b3d45222a..f02e9f29b01a8dfa73729cd9d86d9bf03e96806b 100644
GIT binary patch
delta 635
zcmXZXTS!xJ8~|W{zyEE{(zUWyS<NnJi%3jFA}EQ(h(uJPKro7+C{v;bAA+5S(qk&l
zIdXx>w4hU19dB`n(gk8mNspFx$S#KxTTnU#aT>IG=;?d@ya^*o4r{grY~TbJKUYy+
zUU4P!zfHTHZu={09i-NzlA_##;=H3pWyK|#897;Ym0DN8iZ-iFIAg*!2XTPZVskjt
zGja~+7oIwEp|VN>89d;J04Sh>20;jc4hEPIh6qGKLK!{i#{ep*qJ}{Xp^gTc7{&-j
zQ6jRNc!-|_h(c7Nkst{XofyO<VG<!xB2k%osGkO?LRG5KAPrHS8q}m=8lh1tF`0Ro
zp9Pr0RHm^Y3o)G;%w%B}VNoV=nR~dO2e`sjuJIrbah)67<Y6A+Q7#F$EIh(50zwh0
z&_qy#gf2`G5jMMu|N1r?bH-xCbr<7Ee9Hb(FT96#oWlWfn=a6IteH=6pD;w5W!BOa
zAB!KewkIqljIDaOT2B0tIGWUF3#@6d$Lt^0_N;46{+0Y@y}H5YSaHm3)Hn5Sew^a&
z*y7*Xw5{HGE46NW<Bpb{L%VLKy-sg-ecSVFZ_B>l8MB#2)<pK(oaqBU4^|&iawm>d
z=MCo99shVjD{L!nJXwF*SNfoA`0Voe-iv=OPgXv^)?KAtAC+M720W^TXah`oVW<U$
zTVbXhy!XNAgx+pYH0bMx>A?bM9f9R>STH~~;l+1oo`>2c=!n6m8tnJr&>dXtz|l_B
vpQ7{<zl`Ag6slkG-W-mvU|$WH@{#Ti@??Mvd?vxvrem(2G`vK*uJ*!T&u{m1

delta 63
zcmX@jKZ#qD%bkN!fKh=_i@!KAx41MfU8mSA)i^EL*oe<E(J;lp$jHPf&B!bzb)tmA
T<R&Jq%@S;z88@$H%3%fo1CS9b