From 3dd969b534adfce243f3e8135e70b0937066b446 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Thu, 16 Nov 2017 10:19:30 -0800 Subject: [PATCH 1/8] Use nfc_nci.msm8998 instead of nfc_nci.$(TARGET_BOARD_PLATFORM) Fixes: 69413085 Fixes: 69414641 Test: Make clean; make and flash. Change-Id: I0edeb196ab28ff44cade1611e181eeedd42f79c3 (cherry picked from commit c2283035e28e95d3297839923842e1e7c4d40d11) --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 6e0d7749..66822fad 100755 --- a/device.mk +++ b/device.mk @@ -326,7 +326,7 @@ PRODUCT_PACKAGES += \ # NFC packages PRODUCT_PACKAGES += \ - nfc_nci.$(TARGET_BOARD_PLATFORM) \ + nfc_nci.msm8998 \ NfcNci \ Tag \ android.hardware.nfc@1.0-impl \ From 32704ad04d30a85ac90bb26e7efa963314867438 Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Tue, 16 Jan 2018 16:29:37 -0800 Subject: [PATCH 2/8] Increased GPS debugging Increased GPS debugging for W/T to root cause b/72045381 BUG:72045381 Change-Id: Ibd248ada765b69a42746f6f8a9d68d2797ed2eb9 (cherry picked from commit 06c8581a2152ce6cd0b11dbddd0b5366b8c94cc5) --- gps.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gps.conf b/gps.conf index 4e8fffa7..61680665 100644 --- a/gps.conf +++ b/gps.conf @@ -26,7 +26,7 @@ NTP_SERVER = time.google.com # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose # If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 2 +DEBUG_LEVEL = 5 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 From 6c3e9b157943f9a117bfb25921cee9b5c34c7b96 Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Tue, 16 Jan 2018 16:29:37 -0800 Subject: [PATCH 3/8] Increased GPS debugging Increased GPS debugging for W/T to root cause b/72045381 BUG:72045381 Change-Id: Ibd248ada765b69a42746f6f8a9d68d2797ed2eb9 (cherry picked from commit 06c8581a2152ce6cd0b11dbddd0b5366b8c94cc5) --- gps.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gps.conf b/gps.conf index 4e8fffa7..61680665 100644 --- a/gps.conf +++ b/gps.conf @@ -26,7 +26,7 @@ NTP_SERVER = time.google.com # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose # If DEBUG_LEVEL is commented, Android's logging levels will be used -DEBUG_LEVEL = 2 +DEBUG_LEVEL = 5 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 From 91d14832f0fceb574fca8a66684b6d61fdcb0044 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 26 Mar 2018 17:01:34 +0000 Subject: [PATCH 4/8] Revert "Remove drm@1.1::I*/default and widevine from the manifest." This reverts commit d1fc766d4d483119b44c5d41c21d0149403e69ce. 1.1 clearkey was kept in the old format, but because this manifest is target-level 2, it should have been 1.0 default to be kept in the old format. Bug: b/73556059 Reason for revert: b/76227590 Test: boot Test: vts_treble_vintf_test Test: update from PPR1.180315.002 -> (ToT + this) succeeds Change-Id: I6a437bd77c66a4be679da9cb9b44c5a80cb7a9b4 (cherry picked from commit 21dbcfd27d57f0c44ef5db1c858ddbc9251a2446) --- manifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.xml b/manifest.xml index 07002526..9e54b83a 100644 --- a/manifest.xml +++ b/manifest.xml @@ -86,16 +86,16 @@ 1.1 ICryptoFactory + default + widevine clearkey IDrmFactory + default + widevine clearkey - @1.0::ICryptoFactory/default - @1.0::IDrmFactory/default - @1.0::ICryptoFactory/widevine - @1.0::IDrmFactory/widevine android.hardware.dumpstate From 9a152aa149a4aadcb6bd4a9f7eff5beadbc1318d Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Thu, 10 May 2018 12:50:54 +0100 Subject: [PATCH 5/8] Disable hvx NN service for pi-dev Bug: 78249699 Test: manual, cts Change-Id: Ic0b7a8ab8e1ca854069544e35f5e4139d800c4f3 (cherry picked from commit 04cfd2ae4fd50b4ea293508e658ff86113e8b20b) --- device.mk | 4 ---- manifest.xml | 9 --------- 2 files changed, 13 deletions(-) diff --git a/device.mk b/device.mk index c065d8c4..2790bdcc 100755 --- a/device.mk +++ b/device.mk @@ -349,10 +349,6 @@ PRODUCT_PACKAGES += \ android.hardware.drm@1.1-service.clearkey \ move_widevine_data.sh -# NeuralNetworks HAL -PRODUCT_PACKAGES += \ - android.hardware.neuralnetworks@1.0-service-hvx - # NFC packages PRODUCT_PACKAGES += \ NfcNci \ diff --git a/manifest.xml b/manifest.xml index cf2b763b..8a7986d8 100644 --- a/manifest.xml +++ b/manifest.xml @@ -209,15 +209,6 @@ default - - android.hardware.neuralnetworks - hwbinder - 1.0 - - IDevice - hvx - - android.hardware.nfc hwbinder From 60983c25c373c6f9c21fc1ae7b45007caedc0254 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 26 Jul 2018 15:22:22 -0700 Subject: [PATCH 6/8] Update SVN to 18 for September Monthly release Bug: 111501777 (cherry picked from commit 2cded42036f5dfdb470c82e2e7cbdaa2f43320bd) Change-Id: I000eb4caac77c085c7938d59fb62e8168de59668 --- 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 a063ae4f55d5de60f12350759987ce2dc0baee2a Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Wed, 27 Jun 2018 21:37:27 -0700 Subject: [PATCH 7/8] 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/" From 6c91ec9be143ca9893c10d7564c6b6475266210f Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Mon, 13 Aug 2018 15:31:03 -0700 Subject: [PATCH 8/8] Update SVN to 19 for October Monthly release Bug: 112535135 (cherry picked from commit b0d073596a250b7b47a979fff04caa37ba6791af) Change-Id: I820f6dbc6c0b12e35a212ee3a8235606c3e6d142 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 602d0247..689b5980 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=19 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \