commit e23784c5e2f8316aaf3501dd7ff273e03000b42a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 06 23:02:11 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 06 23:02:11 2024 +0000
tree 4a2ef3726df1a66ded75fe4016f6c55b960abca2
parent 88a85b79d2c6351a6c102f98ff7d309df85f9f59
parent cd0c17add9e97c542b0e4fcaa17aa157cb2c499e

Snap for 11938003 from cd0c17add9e97c542b0e4fcaa17aa157cb2c499e to 24Q3-release

Change-Id: I93deac7587b6ffed8213c518f3a230f209d377d6

default-permissions.xml

diff --git a/default-permissions.xml b/default-permissions.xml
index 03fdec2..3ba6011 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -55,7 +55,6 @@
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
         <!-- Camera Connectivity -->
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>

device.mk

diff --git a/device.mk b/device.mk
index 99efae4..3df64ff 100644
--- a/device.mk
+++ b/device.mk
@@ -894,6 +894,7 @@
 # Exynos RIL and telephony
 # Multi SIM(DSDS)
 SIM_COUNT := 2
+$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
 SUPPORT_MULTI_SIM := true
 # Support NR
 SUPPORT_NR := true

usb/usb/Android.bp

diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 5afdcc6..fa7a07f 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -52,6 +52,7 @@
         "libbinder_ndk",
         "libprotobuf-cpp-lite",
         "server_configurable_flags",
+        "libaconfig_storage_read_api_cc",
     ],
     static_libs: [
         "libpixelusb",