summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2021-08-16 15:16:33 -0700
committerErwin Jansen <jansene@google.com>2021-08-17 17:01:54 -0700
commite8d56650ebdf3d82abdfa064eebb29d2919d0ab4 (patch)
tree254b7ada02c4da776107b84a5b19623760752e56
parent7820a3ec9a07d84dab7ba672dca540aa15cedfc7 (diff)
downloaddevice_generic_goldfish-e8d56650ebdf3d82abdfa064eebb29d2919d0ab4.tar.gz
device_generic_goldfish-e8d56650ebdf3d82abdfa064eebb29d2919d0ab4.tar.bz2
device_generic_goldfish-e8d56650ebdf3d82abdfa064eebb29d2919d0ab4.zip
Bump emulator version to 7637665
This adds support for bluetooth emulation, which requires and updated sepolicy as the emulator will inject a property into the system image. Test: presubmit. Change-Id: I88832aa59243c55199c1807fb245c979621be491
-rw-r--r--emulator-info.txt2
-rw-r--r--sepolicy/common/genfs_contexts2
-rw-r--r--sepolicy/common/property_contexts1
3 files changed, 4 insertions, 1 deletions
diff --git a/emulator-info.txt b/emulator-info.txt
index 532435c5..d1151206 100644
--- a/emulator-info.txt
+++ b/emulator-info.txt
@@ -1,2 +1,2 @@
# Emulator (stable) version
-require version-emulator=7479360
+require version-emulator=7637665
diff --git a/sepolicy/common/genfs_contexts b/sepolicy/common/genfs_contexts
index b24382c3..ee210d2a 100644
--- a/sepolicy/common/genfs_contexts
+++ b/sepolicy/common/genfs_contexts
@@ -98,6 +98,8 @@ genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup31
genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup31/event_count u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup32 u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup32/event_count u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup33 u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup33/event_count u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/pnp0/00:00/rtc/rtc0/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/pnp0/00:00/wakeup/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/virtual/wakeup/wakeup u:object_r:sysfs_wakeup:s0
diff --git a/sepolicy/common/property_contexts b/sepolicy/common/property_contexts
index c2155eca..e86a2a50 100644
--- a/sepolicy/common/property_contexts
+++ b/sepolicy/common/property_contexts
@@ -3,6 +3,7 @@ vendor.qemu.keyboard_layout u:object_r:vendor_qemu_prop:s0 exact string
vendor.qemu.networknamespace u:object_r:vendor_qemu_prop:s0 exact string
vendor.qemu.logcat_filter u:object_r:vendor_qemu_prop:s0 exact string
vendor.qemu.sf.fake_camera u:object_r:vendor_qemu_prop:s0 exact string
+vendor.qemu.vport.bluetooth u:object_r:vendor_qemu_prop:s0 exact string
vendor.qemu.vport.modem u:object_r:vendor_qemu_prop:s0 exact string
vendor.qemu.timezone u:object_r:vendor_qemu_prop:s0 exact string
vendor.network.bridged u:object_r:vendor_net:s0 exact string