Snap for 8657776 from cfbca60b0a1277da376ba2882f198b095c4d04c2 to mainline-media-swcodec-release

Change-Id: Ib0aebfdb6f108a1d7ae18a5de649d2e3fc8e5faf

21 files changed, 85 insertions, 126 deletions

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1009bb4a..b5843c7c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -82,7 +82,6 @@ AB_OTA_UPDATER := true
 
 AB_OTA_PARTITIONS += \
 	system \
-	system_dlkm \
 	system_ext \
 	product \
 	vbmeta_system
@@ -133,7 +132,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO
 #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
 
 # Enable chain partition for system.
-BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product
+BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
@@ -161,11 +160,6 @@ TARGET_COPY_OUT_PRODUCT := product
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 
-# system_dlkm.img
-BOARD_USES_SYSTEM_DLKMIMAGE := true
-BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm
-
 ########################
 # Video Codec
 ########################
@@ -183,7 +177,6 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     system \
-    system_dlkm \
     system_ext \
     product \
     vendor \
diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in
index 5ad10a3c..8b7a7e3b 100644
--- a/conf/fstab.gs101.in
+++ b/conf/fstab.gs101.in
@@ -5,7 +5,6 @@
 #
 #<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
 system                                                   /system                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-system_dlkm                                              /system_dlkm                ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index a64ebe07..bf63c26f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -219,6 +219,7 @@ on init
     chown system system /dev/logbuffer_ttf
     chown system system /dev/logbuffer_tcpm
     chown system system /dev/logbuffer_usbpd
+    chown system system /dev/logbuffer_pogo_transport
     chown system system /dev/logbuffer_wireless
     chown system system /dev/logbuffer_pca9468
     chown system system /dev/logbuffer_cpm
@@ -744,12 +745,12 @@ on property:sys.boot_completed=1
     write /sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/exynos_data/cancel_boot_freq 1
 
     # Setup final cpuset
-    write /dev/cpuset/top-app/cpus 0-7
-    write /dev/cpuset/foreground/cpus 0-3,4-5
-    write /dev/cpuset/background/cpus 0-1
-    write /dev/cpuset/system-background/cpus 0-3
-    write /dev/cpuset/restricted/cpus 0-3
-    write /dev/cpuset/camera-daemon/cpus 0-7
+    write /dev/cpuset/top-app/cpus ${persist.device_config.vendor_system_native.top-app_cpuset:-0-7}
+    write /dev/cpuset/foreground/cpus ${persist.device_config.vendor_system_native.foreground_cpuset:-0-3,4-5}
+    write /dev/cpuset/background/cpus ${persist.device_config.vendor_system_native.background_cpuset:-0-1}
+    write /dev/cpuset/system-background/cpus ${persist.device_config.vendor_system_native.system-background_cpuset:-0-3}
+    write /dev/cpuset/restricted/cpus ${persist.device_config.vendor_system_native.restricted_cpuset:-0-3}
+    write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
     setprop vendor.powerhal.init 1
 
     # Setup final cpu.uclamp
@@ -1007,3 +1008,17 @@ on property:vendor.disable.bcl.control=0
 on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
     # Enable UFS powersaving in Off Mode Charger
     write /dev/sys/block/bootdevice/clkgate_enable 1
+
+# Cpuset experiment
+on property:persist.device_config.vendor_system_native.top-app_cpuset=*
+    write /dev/cpuset/top-app/cpus ${persist.device_config.vendor_system_native.top-app_cpuset:-0-7}
+on property:persist.device_config.vendor_system_native.foreground_cpuset=*
+    write /dev/cpuset/foreground/cpus ${persist.device_config.vendor_system_native.foreground_cpuset:-0-3,4-5}
+on property:persist.device_config.vendor_system_native.background_cpuset=*
+    write /dev/cpuset/background/cpus ${persist.device_config.vendor_system_native.background_cpuset:-0-1}
+on property:persist.device_config.vendor_system_native.system-background_cpuset=*
+    write /dev/cpuset/system-background/cpus ${persist.device_config.vendor_system_native.system-background_cpuset:-0-3}
+on property:persist.device_config.vendor_system_native.restricted_cpuset=*
+    write /dev/cpuset/restricted/cpus ${persist.device_config.vendor_system_native.restricted_cpuset:-0-3}
+on property:persist.device_config.vendor_system_native.camera-daemon_cpuset=*
+    write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
diff --git a/device.mk b/device.mk
index 3a85217e..6cb0b3b0 100644
--- a/device.mk
+++ b/device.mk
@@ -506,8 +506,6 @@ PRODUCT_PACKAGES += \
 # for now include gralloc here. should come from hardware/google_devices/exynos5
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator@4.0-service \
-	android.hardware.graphics.allocator@4.0-impl \
 	android.hardware.graphics.allocator-V1-service
 
 PRODUCT_PACKAGES += \
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 4b285b4e..7da9b3fc 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -375,6 +375,7 @@ void DumpstateDevice::dumpPowerSection(int fd) {
 		       "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status;  done"});
 
     DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");
+    DumpFileToFd(fd, "POGO Transport", "/dev/logbuffer_pogo_transport");
     DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm");
     DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468");
 
@@ -960,6 +961,10 @@ void DumpstateDevice::dumpDisplaySection(int fd) {
                    CommandOptions::WithTimeout(2).Build());
     DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
     DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
+    RunCommandToFd(fd, "HWC logs", {"/vendor/bin/sh", "-c",
+                   "for f in $(ls /data/vendor/log/hwc/*hwc_*); do "
+                   "echo $f ; cat $f ; done"},
+                   CommandOptions::WithTimeout(2).Build());
 }
 
 // Dump items related to AoC
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
index 722995d5..565d467f 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
index 5c821400..87dd16e1 100755
--- a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
+++ b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
diff --git a/gnss/47765/bin/flp.default.so b/gnss/47765/bin/flp.default.so
index 684fd210..d3e0d3e4 100755
--- a/gnss/47765/bin/flp.default.so
+++ b/gnss/47765/bin/flp.default.so
diff --git a/gnss/47765/bin/gps.default.so b/gnss/47765/bin/gps.default.so
index 67eda7a5..66efb36f 100755
--- a/gnss/47765/bin/gps.default.so
+++ b/gnss/47765/bin/gps.default.so
diff --git a/gnss/47765/bin/gpsd b/gnss/47765/bin/gpsd
index 7cb22a4d..cbade95d 100755
--- a/gnss/47765/bin/gpsd
+++ b/gnss/47765/bin/gpsd
diff --git a/gnss/47765/bin/lhd b/gnss/47765/bin/lhd
index 6d59cba3..3ad54073 100755
--- a/gnss/47765/bin/lhd
+++ b/gnss/47765/bin/lhd
diff --git a/gnss/47765/bin/scd b/gnss/47765/bin/scd
index bcd484d5..e7e56197 100755
--- a/gnss/47765/bin/scd
+++ b/gnss/47765/bin/scd
diff --git a/gnss/47765/firmware/SensorHub.patch b/gnss/47765/firmware/SensorHub.patch
index 7a5d41ab..6617416c 100644
--- a/gnss/47765/firmware/SensorHub.patch
+++ b/gnss/47765/firmware/SensorHub.patch
@@ -1,9 +1,9 @@
 <FormatVersion=0x00010003>
 
-<Crc=188>
+<Crc=90>
 <BlobLength=161839>
 <AsicVersion=0x004776A0>
-<ChangeList=534799>
+<ChangeList=537976>
 <PatchLevel=0>
 <PostPatchLevel=1>
 <CustomerVersion=None>
@@ -79,7 +79,7 @@ F087FE022102914FF4005101915B220748084B00F13801
 009102A101F438F703B000BD4170700080BD8900708989
 00805D8A006905800025643A2564095374617274206368
 70704170705461736B0A00000000633A5C77735C626F64
-5F3437373631303037375F3533343739395C637573746F
+5F3437373631303336385F3533373937365C637573746F
 6D6572735C676F6F676C655C503231466C61677461696C
 6D63755C64656C69766572795C53656E736F724875625F
 5032315C7372635C6875625F636F6E74726F6C6C65722E
@@ -390,7 +390,7 @@ D00FF298080FF2206140F271673B4642468B2011F48EF2
 F22046FEF700FF07E002464FF4D1630FF2F4518F2011F4
 5FF2FEF769FC04F5A6620A23C2E9000105F0F00006F00F
 0101433A462046BDE8F041FFF7BDBB0000633A5C77735C
-626F645F3437373631303037375F3533343739395C6375
+626F645F3437373631303336385F3533373937365C6375
 73746F6D6572735C676F6F676C655C503231466C616774
 61696C6D63755C64656C69766572795C53656E736F7248
 75625F5032315C7372635C636870705C7472616E73706F
@@ -526,7 +526,7 @@ B590B00C46C17B0FF248420E91817B0D91417B0C91017B
 25210378204626F4F1F510B010BD000025643A25640948
 232568687520756E6B6E6F776E20726571756573742E20
 636D643D2523782C2049443D256868750A00633A5C7773
-5C626F645F3437373631303037375F3533343739395C63
+5C626F645F3437373631303336385F3533373937365C63
 7573746F6D6572735C676F6F676C655C503231466C6167
 7461696C6D63755C64656C69766572795C53656E736F72
 4875625F5032315C7372F19403502E8000635C63687070
@@ -585,7 +585,7 @@ F752DEC007F9D5FFF7CBFFF6E700B583B0022102914FF4
 D803B000BDF07E8A000C53890028878A00113280009D32
 800025643A256409434850502042617564726174652069
 732073657420746F20256C640A0A00633A5C77735C626F
-645F3437373631303037375F3533343739395C63757374
+645F3437373631303336385F3533373937365C63757374
 6F6D6572735C676F6F676C655C503231466C6167746169
 6C6D63755C64656C69766572795C53656E736F72487562
 5F5032315C7372635C73656E736F725F6875622E630000
@@ -679,13 +679,13 @@ E08619AE4210D22946204600F067FF0028F6D510F1040F
 B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
 12D00020009069462846FDF712DE761E012804DB024600
 992046FEF79EF82846FDF76FDD002EECD173BD70470000
-633A5C77735C626F645F3437373631303037375F353334
-3739395C637573746F6D6572735C676F6F676C655C5032
+633A5C77735C626F645F3437373631303336385F353337
+3937365C637573746F6D6572735C676F6F676C655C5032
 31466C61677461696C6D63755C64656C69766572795C53
 656E736F724875625F5032315C7372635C636870705C69
 6E636C7564655C636870702F7472616E73706F72742E68
-00633A5C77735C626F645F3437373631303037375F3533
-343739395C637573746F6D6572735C676F6F676C655C50
+00633A5C77735C626F645F3437373631303336385F3533
+373937365C637573746F6D6572735C676F6F676C655C50
 3231466C61677461696C6D63755C64656C69766572795C
 53656E736F724875625F5032315C7372635C636870705C
 706C6174666F726D5C62636D5C42434D343737785C6C69
@@ -696,7 +696,7 @@ B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
 D1D6E90223D0E918679F42E7D8E8D39642E4D2E5E7D0E9
 1823CDE900230FF27C010FF2100240F21E238F200FF4B1
 F403B0F0BD0000633A5C77735C626F645F343737363130
-3037375F3533343739395C637573746F6D6572735C676F
+3336385F3533373937365C637573746F6D6572735C676F
 6F676C655C503231466C61677461696C6D63755C64656C
 69766572795C53656E736F724875625F5032315C737263
 5C636870705C636C69656E74732E630000000025643A25
@@ -706,7 +706,7 @@ F403B0F0BD0000633A5C77735C626F645F343737363130
 21FEF75DF80AE03246294625F420F40120787032462068
 3946FEF718F8012003B0F0BD25643A2564094F4F4D2061
 742025733A25640A00633A5C77735C626F645F34373736
-31303037375F3533343739395C637573746F6D6572735C
+31303336385F3533373937365C637573746F6D6572735C
 676F6F676C655C503231466C61677461696C6D63755C64
 656C69766572795C53656E736F724875625F5032315C73
 72635C636870705C73657276696365735C6C6F6F706261
@@ -718,8 +718,8 @@ D4FFC6F80600C6F80A103923D6F80600D6F80A10CDE902
 0122460E2000908F200FF2B0010FF4C3F32868314604B0
 BDE870400E22FDF78CBF10B58B880124012B02D1FFF7BE
 FF00E00024204610BD25643A2564094F4F4D2061742025
-733A25640A00633A5C77735C626F645F34373736313030
-37375F3533343739395C637573746F6D6572735C676F6F
+733A25640A00633A5C77735C626F645F34373736313033
+36385F3533373937365C637573746F6D6572735C676F6F
 676C655C503231466C61677461696C6D63755C64656C69
 766572795C53656E736F724875625F5032315C7372635C
 636870705C73657276696365735C74696D6573796E632E
@@ -734,7 +734,7 @@ D13B2001903B230FF280040FF26801009422468B200FF4
 314603B0BDE8F043FDF7E2BE10B58A880124012A02D1FF
 F7BAFF00E00024204610BD25643A2564094F4F4D206174
 2025733A25640A00633A5C77735C626F645F3437373631
-303037375F3533343739395C637573746F6D6572735C67
+303336385F3533373937365C637573746F6D6572735C67
 6F6F676C655C503231466C61677461696C6D63755C6465
 6C69766572795C53656E736F724875625F5032315C7372
 635C636870705C73657276696365735C646973636F7665
@@ -761,7 +761,7 @@ D0CDE9000197230FF2B8020FF2B0118B200FF41BF2FFF7
 05CDE90445AD230FF2AC118F200FF4D8F106B0BDE87083
 70B50446084615461E46FFF7BEFF3246294620680068BD
 E87040FDF797BD00000000633A5C77735C626F645F3437
-373631303037375F3533343739395C637573746F6D6572
+373631303336385F3533373937365C637573746F6D6572
 735C676F6F676C655C503231466C61677461696C6D6375
 5C64656C69766572795C53656E736F724875625F503231
 5C7372635C636870705C73657276696365732E63000000
@@ -788,8 +788,8 @@ D009D31AE001A8009038230FF264020FF250018B2019E0
 230FF240020FF22C018E2007E001A8009042230FF22C02
 0FF218018F200FF49DF00DF5027D10BC5DF80CFB0FF284
 014160704725643A25640950414C3A2025730A0000633A
-5C77735C626F645F3437373631303037375F3533343739
-395C637573746F6D6572735C676F6F676C655C50323146
+5C77735C626F645F3437373631303336385F3533373937
+365C637573746F6D6572735C676F6F676C655C50323146
 6C61677461696C6D63755C64656C69766572795C53656E
 736F724875625F5032315C7372635C636870705C706C61
 74666F726D5C70616C5F6170692E6300000000000001C9
@@ -848,7 +848,7 @@ F7A8FE6089FFF793FE42F654000059FFF7A0FE02200290
 32BD13460A4601460248007810F469B000001453890055
 47800065478000687B890060D09100354780002B488000
 436870704C696E6B5461736B00000000633A5C77735C62
-6F645F3437373631303037375F3533343739395C637573
+6F645F3437373631303336385F3533373937365C637573
 746FF19403D04A80006D6572735C676F6F676C655C5032
 31466C61677461696C6D63755C64656C69766572795C53
 656E736F724875625F5032315C7372635C636870705C70
@@ -914,7 +914,7 @@ BD38B504464FF0827000F0B5FC144DA86078B90FF27004
 0023002240F293210FF2380001B0BDE83040FBF732BB31
 BD0000D088890025643A256409474E5353207365727669
 636520616C7265616479206F70656E0A00000000633A5C
-77735C626F645F3437373631303037375F353334373939
+77735C626F645F3437373631303336385F353337393736
 5C637573746F6D6572735C676F6F676C655C503231466C
 61677461696C6D63755C64656C69766572795C53656E73
 6F724875625F5032315C7372635C636870705C73657276
@@ -965,7 +965,7 @@ B6F9286060B13421ADF80410821D01A900913B46811D20
 0023002295210FF23000FBF7EFF836B90023002296210F
 F22000FBF7E7F83620FEF78EF9286030B1811D2046FFF7
 99FF36203060012070BD633A5C77735C626F645F343737
-3631303037375F3533343739395C637573746F6D657273
+3631303336385F3533373937365C637573746F6D657273
 5C676F6F676C655C503231466C61677461696C6D63755C
 64656C69766572795C53656E736F724875625F5032315C
 7372635C636870705C636F6D6D6F6E5C676E73735F63F1
@@ -1020,7 +1020,7 @@ B02016BD6272636D476E73734F6E4D6561734461746100
 0025643A2564095B25735D204D6561737572656D656E74
 2064617461206576656E74203A206D6561737572656D65
 6E745F636F756E74203D20282564290A000000633A5C77
-735C626F645F3437373631303037375F3533343739395C
+735C626F645F3437373631303336385F3533373937365C
 637573746F6D6572735C676F6F676C655C503231466C61
 677461696C6D63755C64656C69766572795C53656E736F
 724875625F5032315C7372635C636870705C706C617466
@@ -1229,9 +1229,9 @@ A288F2804343226C9A4214D291FBF0F111FB00F1A980F1
 8891FBF0F111FB00F008E0B08838B1A88070BD00291CBF
 F088002800D0A08070BD0B480170704700000948007870
 4700000848017070470000064800787047000001484161
-70470000787B89000F29080099CB91009ACB91002F2F64
+70470000787B89007835080099CB91009ACB91002F2F64
 65706F742F636C69656E742F636F72652F72656C2F476F
-6F676C652F5032322F3533343635332F2E2E2E0000007E
+6F676C652F5032322F3533373538382F2E2E2E0000007E
 24247E5056542044756D70203A20474C4C207665722E20
 256C7520666C61677461696C3A25730A000000007E2424
 7E5056542044756D70203A2054203D20256C752C204E54
diff --git a/manifest.xml b/manifest.xml
index 1d59695c..1cb5345a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -40,15 +40,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>4.0</version>
diff --git a/manifest_64.xml b/manifest_64.xml
index d1bc1559..09466c99 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -27,15 +27,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>4.0</version>
diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 62b47070..85096ee4 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -26,7 +26,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -39,7 +39,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -53,7 +53,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -66,7 +66,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -105,7 +105,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -118,7 +118,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
@@ -131,7 +131,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
@@ -148,7 +148,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
@@ -162,7 +162,7 @@
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="979200" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
@@ -203,7 +203,7 @@
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
@@ -217,7 +217,7 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />
             <Limit name="bitrate" range="1-80000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1920x1080" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 22ad88e2..fb54359e 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -25,8 +25,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-1920x1080" value="200" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="can-swap-width-height" value="1" />
@@ -40,8 +39,7 @@
           <Limit name="bitrate" range="1-120000000" />
           <Limit name="frame-rate" range="1-180" />
           <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-1920x1080" value="200" />
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="secure-playback" required="true" />
diff --git a/powerhint_a0.json b/powerhint_a0.json
index 47873678..76472db1 100644
--- a/powerhint_a0.json
+++ b/powerhint_a0.json
@@ -76,15 +76,6 @@
       "ResetOnInit": true
     },
     {
-      "Name": "F2fsRecessModeEnable",
-      "Path": "/dev/sys/fs/by-name/userdata/gc_urgent",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
       "Name": "PowerHALRenderingState",
       "Path": "vendor.powerhal.rendering",
       "Values": [
@@ -185,12 +176,6 @@
       "Value": "0"
     },
     {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "LAUNCH",
       "Type": "EndHint",
       "Value": "DISABLE_TA_BOOST"
@@ -232,12 +217,6 @@
       "Value": "0"
     },
     {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 1000,
diff --git a/powerhint_a1.json b/powerhint_a1.json
index 81b4b659..7a980ba5 100644
--- a/powerhint_a1.json
+++ b/powerhint_a1.json
@@ -96,15 +96,6 @@
       "ResetOnInit": true
     },
     {
-      "Name": "F2fsRecessModeEnable",
-      "Path": "/dev/sys/fs/by-name/userdata/gc_urgent",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
       "Name": "LimitFlashCurrent",
       "Path": "vendor.camera.max_flash_current",
       "Values": [
@@ -215,12 +206,6 @@
       "Value": "0"
     },
     {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "LAUNCH",
       "Type": "EndHint",
       "Value": "DISABLE_TA_BOOST"
@@ -262,12 +247,6 @@
       "Value": "0"
     },
     {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "F2fsRecessModeEnable",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 1000,
diff --git a/radio/config/Pixel_stability.nprf b/radio/config/Pixel_stability.nprf
index 327b8f18..58148921 100644
--- a/radio/config/Pixel_stability.nprf
+++ b/radio/config/Pixel_stability.nprf
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index b8ad7c5f..6cff2f26 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -83,23 +83,39 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
         int64_t in_transactionId) {
     bool result = true;
     std::vector<PortStatus> currentPortStatus;
+    string pullup;
 
     ALOGI("Userspace turn %s USB data signaling. opID:%ld", in_enable ? "on" : "off",
             in_transactionId);
 
     if (in_enable) {
         if (!mUsbDataEnabled) {
-            if (!WriteStringToFile("1", USB_DATA_PATH)) {
-                ALOGE("Not able to turn on usb connection notification");
-                result = false;
+            if (ReadFileToString(PULLUP_PATH, &pullup)) {
+                pullup = Trim(pullup);
+                if (pullup != kGadgetName) {
+                    if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
+                        ALOGE("Gadget cannot be pulled up");
+                        result = false;
+                    }
+                }
             }
 
-            if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
-                ALOGE("Gadget cannot be pulled up");
+            if (!WriteStringToFile("1", USB_DATA_PATH)) {
+                ALOGE("Not able to turn on usb connection notification");
                 result = false;
             }
         }
     } else {
+        if (ReadFileToString(PULLUP_PATH, &pullup)) {
+            pullup = Trim(pullup);
+            if (pullup == kGadgetName) {
+                if (!WriteStringToFile("none", PULLUP_PATH)) {
+                    ALOGE("Gadget cannot be pulled down");
+                    result = false;
+                }
+            }
+        }
+
         if (!WriteStringToFile("1", ID_PATH)) {
             ALOGE("Not able to turn off host mode");
             result = false;
@@ -114,11 +130,6 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
             ALOGE("Not able to turn on usb connection notification");
             result = false;
         }
-
-        if (!WriteStringToFile("none", PULLUP_PATH)) {
-            ALOGE("Gadget cannot be pulled down");
-            result = false;
-        }
     }
 
     if (result) {