Merge tag 'android-9.0.0_r16' of https://android.googlesource.com/dev…

…ice/google/wahoo into HEAD

Android 9.0.0 Release 16 (PQ1A.181105.017.A1)

Change-Id: I0ebbc267f7f87c2a32451c8e7a5fc4d605a002d1

device.mk

@@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=19
+    ro.vendor.build.svn=20
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -84,6 +84,8 @@ PRODUCT_COPY_FILES += \
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
   PRODUCT_COPY_FILES += \
       $(LOCAL_PATH)/init.hardware.diag.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).diag.rc
+  PRODUCT_COPY_FILES += \
+      $(LOCAL_PATH)/init.hardware.chamber.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).chamber.rc
 else
   PRODUCT_COPY_FILES += \
       $(LOCAL_PATH)/init.hardware.diag.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_HARDWARE).diag.rc

init.hardware.chamber.rc.userdebug

@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2018 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+on property:persist.vendor.disable.usb.overheat.mitigation=1
+    write /sys/module/smb_lib/parameters/enable_ovh 0

init.hardware.rc

@@ -890,7 +890,3 @@ on property:sys.retaildemo.enabled=1
     setprop persist.vendor.charge.stop.level 35
     setprop persist.vendor.charge.start.level 30
 
-# system will not set the sys.retaildemo.enabled to 0 but this is used to set back to default charging
-on property:sys.retaildemo.enabled=0
-    setprop persist.vendor.charge.stop.level 100
-    setprop persist.vendor.charge.start.level 0

overlay/frameworks/base/core/res/res/values/config.xml

@@ -341,4 +341,9 @@
     <!-- Colon separated list of package names that should be granted DND access -->
     <string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
 
+    <!-- Specify model in case of attestation failure due to misprovisioned device. -->
+    <string name="config_misprovisionedDeviceModel" translatable="false">Pixel 2</string>
+
+    <!-- Brand value for attestation of misprovisioned device. -->
+    <string name="config_misprovisionedBrandValue" translatable="false">htc</string>
 </resources>

power-libperfmgr/Power.cpp

@@ -444,15 +444,19 @@ Return<void> Power::powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) {
             break;
         case PowerHint_1_2::AUDIO_STREAMING:
             ATRACE_BEGIN("audio_streaming");
-            if (data) {
-                // Hint until canceled
-                ATRACE_INT("audio_streaming_lock", 1);
-                mHintManager->DoHint("AUDIO_STREAMING");
-                ALOGD("AUDIO STREAMING ON");
+            if (mVRModeOn || mSustainedPerfModeOn) {
+                ALOGV("%s: ignoring due to other active perf hints", __func__);
             } else {
-                ATRACE_INT("audio_streaming_lock", 0);
-                mHintManager->EndHint("AUDIO_STREAMING");
-                ALOGD("AUDIO STREAMING OFF");
+                if (data) {
+                    // Hint until canceled
+                    ATRACE_INT("audio_streaming_lock", 1);
+                    mHintManager->DoHint("AUDIO_STREAMING");
+                    ALOGD("AUDIO STREAMING ON");
+                } else {
+                    ATRACE_INT("audio_streaming_lock", 0);
+                    mHintManager->EndHint("AUDIO_STREAMING");
+                    ALOGD("AUDIO STREAMING OFF");
+                }
             }
             ATRACE_END();
             break;