Merge changes from topic 'oemOverRide'

* changes:
  Reset gadget stack before configuring
  selinux policy for letting the system server set radio config
  Overlay for modem functions
This commit is contained in:
Thierry Strudel
2017-03-30 05:13:04 +00:00
committed by Android (Google) Code Review
8 changed files with 25 additions and 0 deletions

View File

@@ -1,4 +1,5 @@
import init.wahoo.usb.rc
on boot && property:ro.bootmode=usbradio && property:persist.sys.usb.usbradio.config=*
setprop sys.usb.config "none"
setprop sys.usb.config ${persist.sys.usb.usbradio.config}

View File

@@ -21,3 +21,6 @@ include device/google/wahoo/BoardConfig.mk
-include vendor/google_devices/muskie/BoardConfigVendor.mk
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
#sepolicy common to muskie/walleye
BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy

View File

@@ -98,4 +98,12 @@
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
<integer name="config_screenBrightnessSettingMinimum">4</integer>
<!-- Values for USB port setting. in format of bootmode:current function:new function -->
<string-array translatable="false" name="config_oemUsbModeOverride">
<item>"usbradio:adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp,adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp:diag,serial_cdev,rmnet_gsi:diag,serial_cdev,rmnet_gsi"</item>
</string-array>
</resources>

1
sepolicy/property.te Normal file
View File

@@ -0,0 +1 @@
type radio_usb_prop, property_type;

View File

@@ -0,0 +1 @@
persist.sys.usb.usbradio.rc u:object_r:radio_usb_prop:s0

View File

@@ -0,0 +1 @@
userdebug_or_eng(`set_prop(system_server, radio_usb_prop)')

View File

@@ -21,3 +21,6 @@ include device/google/wahoo/BoardConfig.mk
-include vendor/google_devices/muskie/BoardConfigVendor.mk
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
#sepolicy common to muskie/walleye
BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy

View File

@@ -98,4 +98,11 @@
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
<integer name="config_screenBrightnessSettingMinimum">4</integer>
<!-- Values for USB port setting. in format of bootmode:current function:new function -->
<string-array translatable="false" name="config_oemUsbModeOverride">
<item>"usbradio:adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp,adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp:diag,serial_cdev,rmnet_gsi:diag,serial_cdev,rmnet_gsi"</item>
</string-array>
</resources>