From 741408fe623238a677467609d4b43369f8aeb07f Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 18 Jun 2018 14:02:08 -0700 Subject: [PATCH 1/9] [DO NOT MERGE] Update SVN to 15 for August Fi Backpocket Bug:109889880 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index daba697d..03155eec 100755 --- a/device.mk +++ b/device.mk @@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=14 + ro.vendor.build.svn=15 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 1f3b02164716c0ebfe060308921cee7c4a85bbaf Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 18 Jun 2018 14:04:44 -0700 Subject: [PATCH 2/9] [DO NOT MERGE] Update SVN to 16 for August RoW backpocket bug:109889880 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 03155eec..0018ca6a 100755 --- a/device.mk +++ b/device.mk @@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=15 + ro.vendor.build.svn=16 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 2cded42036f5dfdb470c82e2e7cbdaa2f43320bd Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 26 Jul 2018 15:22:22 -0700 Subject: [PATCH 3/9] Update SVN to 18 for September Monthly release Bug: 111501777 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index fe27cf66..602d0247 100755 --- a/device.mk +++ b/device.mk @@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=17 + ro.vendor.build.svn=18 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 296429c678ed81dd0b6360c585182d6117d7ef64 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 16 Aug 2018 19:37:12 +0800 Subject: [PATCH 4/9] thermal: Add property for thermal testing. Add property to disable usb overheat mitigation that prevent device offline during thermal testing in chamber. Bug: 111762741 Test: Run thermal test in chamber Change-Id: I23a760c8e31979b38ae89cd6750ae107605d5c3b --- device.mk | 2 ++ init.hardware.chamber.rc.userdebug | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 init.hardware.chamber.rc.userdebug diff --git a/device.mk b/device.mk index 602d0247..5ca99748 100755 --- a/device.mk +++ b/device.mk @@ -91,6 +91,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 diff --git a/init.hardware.chamber.rc.userdebug b/init.hardware.chamber.rc.userdebug new file mode 100644 index 00000000..a62c9ea3 --- /dev/null +++ b/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 From aa30298a1c59700bc0091609113deb8444bd35d1 Mon Sep 17 00:00:00 2001 From: Maggie White Date: Fri, 17 Aug 2018 11:20:01 -0700 Subject: [PATCH 5/9] Do not set charge levels unless retaildemo mode is enabled Test labs use start and stop charge levels to control the battery levels of DUTs. This is not currently possible since retaildemo mode is set to 0 on every boot. After this behavior is removed, it will still be possible to reset the charging behavior via a factory reset. Bug: 112763954 Change-Id: I73992bb44d32357f0ed41b55fc551db79c486338 Signed-off-by: Maggie White --- init.hardware.rc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init.hardware.rc b/init.hardware.rc index 5fcd03ad..8c563704 100644 --- a/init.hardware.rc +++ b/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 From 12fdb32b878b0054b71c2182dfebac275165958e Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Fri, 17 Aug 2018 15:09:56 -0700 Subject: [PATCH 6/9] PowerHAL: skip Audio streaming hint in VR/SUSTAINED_PERFORMANCE mode Bug: 110795217 Test: Boot Change-Id: I008b1f82b5d92ab0901312b0451c766034e76aa8 --- power-libperfmgr/Power.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/power-libperfmgr/Power.cpp b/power-libperfmgr/Power.cpp index c0fadac3..8a009c33 100644 --- a/power-libperfmgr/Power.cpp +++ b/power-libperfmgr/Power.cpp @@ -444,15 +444,19 @@ Return 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; From ab4136a982723839cfebccc90875909a6eec194e Mon Sep 17 00:00:00 2001 From: Eva Bertels Date: Thu, 23 Aug 2018 18:34:06 +0100 Subject: [PATCH 7/9] Add check for misprovisioned Pixel devices. Some Pixel devices had a wrong brand value provisioned into keymaster. Due to this misprovisioning those devices fail device ID attestation because it includes a check for the correct brand value. This is now solved by re-trying Device ID attestation if we are running on a potentially misprovisioned device, allowing for the known incorrect brand value. Bug: 69471841 Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement Change-Id: I41b51a355e1b582fd7c7f12f8b7e0992294b16e3 Merged-In: I73dd4501416bcc2587d137d8b1e27127e3bfc0c0 (cherry picked from commit 0e5b3f13963b6ba92f52251749bba76ab1cafcc8) --- overlay/frameworks/base/core/res/res/values/config.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 5f42508a..8294e6f1 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -341,4 +341,9 @@ com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence + + Pixel 2 + + + htc From 437e4d9247dc7cf4ea19b56e452bf13e7b84b1b0 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Thu, 6 Sep 2018 15:21:02 -0700 Subject: [PATCH 8/9] Update SVN for November for Wahoo to 20 on pi-dev & master Bug:114110585 (cherry picked from commit 3ef04ad9ce35623dd4a14fce2db20767d8fe89ce) Change-Id: I3f93051a875265067d7373b7ed07868dbbbbaec5 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 5ca99748..9ea22039 100755 --- a/device.mk +++ b/device.mk @@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=18 + ro.vendor.build.svn=20 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 78ed42ad70d1c31124889af61012de24c3b0d40d Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Wed, 27 Jun 2018 21:37:27 -0700 Subject: [PATCH 9/9] usb gadget hal: Increase disconnect timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Increase disconnect timeout from 10ms to 100ms for the host ports which dont strictly adhere to the spec to sense disconnect. This is a work around given that some of the root ports dont detect it. From the USB 2.0 spec guidelines, the disconnect should be detected in 2.5us. From the USB 2.0 spec (pg 186) Time to detect a disconnect event at a hub’s downstream facing port TDDIS Section 7.1.7.3 2 2.5 µs Bug: 110412433 Test: Walleye entering accessory mode in USB 3.0 with IOGear cable and USB 3.0 host. Change-Id: I8d8f62dc1a7bcbc9c7727c51cad7f3cb07ba6b50 (cherry picked from commit 28ad0a90cfc35817fdff097a6a3ed73251c24800) --- usb/UsbGadget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp index 603afbba..66ac85e5 100644 --- a/usb/UsbGadget.cpp +++ b/usb/UsbGadget.cpp @@ -30,7 +30,7 @@ constexpr int BUFFER_SIZE = 512; constexpr int MAX_FILE_PATH_LENGTH = 256; constexpr int EPOLL_EVENTS = 10; constexpr bool DEBUG = false; -constexpr int DISCONNECT_WAIT_US = 10000; +constexpr int DISCONNECT_WAIT_US = 100000; #define BUILD_TYPE "ro.build.type" #define GADGET_PATH "/config/usb_gadget/g1/"