summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:06:15 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:06:15 +0000
commit8a7d32375e17885bba4be4f5302f82f1edafda0d (patch)
tree3fa11aa007c7f3888d167b134885b33ec5b41d35
parent145f804642182bd77700c910afce7a70433046a1 (diff)
parented808b442579f892d1b98dda4121e345c2177c4d (diff)
downloadzuma-8a7d32375e17885bba4be4f5302f82f1edafda0d.tar.gz
Snap for 11211173 from ed808b442579f892d1b98dda4121e345c2177c4d to 24Q1-release
Change-Id: I1662f94e7c3672ad0eb720647d8171023e1720aa
-rw-r--r--conf/init.zuma.usb.rc2
-rw-r--r--default-permissions.xml5
-rw-r--r--device.mk2
3 files changed, 8 insertions, 1 deletions
diff --git a/conf/init.zuma.usb.rc b/conf/init.zuma.usb.rc
index 4dff012..2cbb30b 100644
--- a/conf/init.zuma.usb.rc
+++ b/conf/init.zuma.usb.rc
@@ -370,6 +370,8 @@ on boot
write sys/module/usbcore/parameters/initial_descriptor_timeout 500
# Use USB Gadget HAL
setprop sys.usb.configfs 2
+ # Enable in-kernel media-presence polling for SD cards
+ write /sys/module/block/parameters/events_dfl_poll_msecs 2000
on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.usb.configfs=1
write /config/usb_gadget/g1/idProduct 0x4EE7
diff --git a/default-permissions.xml b/default-permissions.xml
index 4dafb5b..582971c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -151,6 +151,11 @@
<permission name="android.permission.POST_NOTIFICATIONS" fixed="true"/>
</exception>
<exception
+ package="com.google.android.apps.turbo">
+ <!-- Notifications -->
+ <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+ </exception>
+ <exception
package="com.google.android.euicc">
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
diff --git a/device.mk b/device.mk
index bde0a2f..5f44856 100644
--- a/device.mk
+++ b/device.mk
@@ -197,7 +197,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Carrier configuration default location
PRODUCT_PROPERTY_OVERRIDES += \
- persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+ persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig
PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2