Snap for 6533464 from 9cfb20ff150e9861f1dbfae9c23a04703b4f6c72 to sdk-releaseplatform-tools-30.0.3platform-tools-30.0.2

Change-Id: I179ab67deba4adcb1a1e22001f466a20bc45c049

5 files changed, 59 insertions, 22 deletions

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 5c5d83fc..cb4548dc 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -104,7 +104,6 @@ BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
 # boot.img
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
 
-BOARD_EXT4_SHARE_DUP_BLOCKS := true
 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     system \
diff --git a/METADATA b/METADATA
new file mode 100644
index 00000000..d97975ca
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/device.mk b/device.mk
index 18931e32..8c7d0e85 100644
--- a/device.mk
+++ b/device.mk
@@ -319,6 +319,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.zram.first_wb_delay_mins=180 \
     ro.zram.periodic_wb_delay_hours=24 \
 
+# Enable reboot free DSDS
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.radio.reboot_on_modem_change=false
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    telephony.active_modems.max_count=2
+
 # Disable snapshot timer
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.radio.snapshot_enabled=0 \
@@ -691,11 +698,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapgrowthlimit=256m
 
-PRODUCT_COPY_FILES += \
-    device/google/bonito/hidl/android.hidl.base@1.0.so-32:system/lib/android.hidl.base@1.0.so \
-    device/google/bonito/hidl/android.hidl.base@1.0.so-64:system/lib64/android.hidl.base@1.0.so \
-    device/google/bonito/hidl/android.hidl.base@1.0.so-32:vendor/lib/android.hidl.base@1.0.so \
-    device/google/bonito/hidl/android.hidl.base@1.0.so-64:vendor/lib64/android.hidl.base@1.0.so \
+# TODO(b/139369543): remove android.hidl.base@1.0 in next release (Q+1)
+PRODUCT_PACKAGES += \
+    android.hidl.base@1.0 \
+    android.hidl.base@1.0.vendor
 
 PRODUCT_PACKAGES += \
     ipacm \
@@ -871,4 +877,4 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=20
+	ro.vendor.build.svn=22
diff --git a/hidl/Android.bp b/hidl/Android.bp
new file mode 100644
index 00000000..1389d1cf
--- /dev/null
+++ b/hidl/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2020 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.
+
+// TODO(b/139369543): remove android.hidl.base@1.0
+cc_prebuilt_library_shared {
+    name: "android.hidl.base@1.0",
+    arch: {
+        arm: {
+            srcs: ["android.hidl.base@1.0.so-32"],
+        },
+        arm64: {
+            srcs: ["android.hidl.base@1.0.so-64"],
+        },
+    },
+    shared_libs: [
+        "libhidlbase",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "libc++",
+        "libdl",
+        "libc",
+        "libm",
+    ],
+    compile_multilib: "both",
+    vendor_available: true,
+    strip: {
+        none: true,
+    },
+    // This module has broken dependencies, libhidltransport and libhwbinder have
+    // hidden visibility, but this is phasing out anyway so just bypass the check.
+    check_elf_files: false,
+}
diff --git a/init.hardware.rc b/init.hardware.rc
index b4623128..3f1867fc 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -792,21 +792,6 @@ on property:init.svc.vendor.hwcomposer-2-2=stopped
 on property:init.svc.vendor.hwcomposer-2-2=running
     start ppd
 
-# b/70518189 vDSO experiments
-on property:sys.vdso=*
-    write /sys/module/vdso/parameters/enable_32 1
-    write /sys/module/vdso/parameters/enable_64 1
-
-on property:sys.vdso=false
-    write /sys/module/vdso/parameters/enable_32 0
-    write /sys/module/vdso/parameters/enable_64 0
-
-on property:sys.vdso=64
-    write /sys/module/vdso/parameters/enable_32 0
-
-on property:sys.vdso=32
-    write /sys/module/vdso/parameters/enable_64 0
-
 on property:wlan.driver.status=ok
     # Get the wlan driver/fw version
     start vendor.wlan_sh