diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-02 19:13:11 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-02 19:13:11 +0000 |
| commit | 87bb63214039e63d5c17629cbb92fd19a63c7c6f (patch) | |
| tree | 1cdfd266ee122679c32716ee0e7b62a54976c56f | |
| parent | ecca654aa1b8151cd3c7a62ed2be0b026e3bdaeb (diff) | |
| parent | 1f1dd9be95619ee802ee6e9cd51340b3030b6fba (diff) | |
| download | redbull-android12-s4-release.tar.gz | |
Merge cherrypicks of [15749384, 15749385, 15749021, 15749367, 15749149, 15749150, 15749402, 15748246, 15748540, 15749368, 15749369, 15749386, 15749387, 15749403, 15749404] into sc-releaseandroid-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-cts-12.0_r1android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s1-release
Change-Id: I854f89bc92ff03fa6d531fb5c5c50edc8a90d5ed
| -rw-r--r-- | device-common.mk | 2 | ||||
| -rw-r--r-- | manifest.xml | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/device-common.mk b/device-common.mk index 4e7705de..62434281 100644 --- a/device-common.mk +++ b/device-common.mk @@ -835,7 +835,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),) PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 endif # Enable iwlan service logging for debug diff --git a/manifest.xml b/manifest.xml index ba78cc75..2ef2d5dc 100644 --- a/manifest.xml +++ b/manifest.xml @@ -65,15 +65,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </interface> </hal> <hal format="hidl"> - <name>android.hardware.confirmationui</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IConfirmationUI</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.soundtrigger</name> <transport>hwbinder</transport> <version>2.3</version> |