Merge Android 14 QPR2 to AOSP main
Bug: 319669529 Merged-In: I7bf682d11afd9cd8dbb5717afc0dba0c9e25a1a7 Change-Id: I995e7189c4fac90e8adfb21481ee87c35ca83788
This commit is contained in:
commit
dea482ea8b
3 changed files with 8 additions and 5 deletions
|
@ -48,8 +48,8 @@ var (
|
|||
"android.hardware.biometrics.fingerprint.IFingerprint/default": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.biometrics.fingerprint.IFingerprint/virtual": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/default": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.broadcastradio.IBroadcastRadio/amfm": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.broadcastradio.IBroadcastRadio/dab": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.broadcastradio.IBroadcastRadio/amfm": []string{"android.hardware.broadcastradio-service.default_fuzzer"},
|
||||
"android.hardware.broadcastradio.IBroadcastRadio/dab": []string{"android.hardware.broadcastradio-service.default_fuzzer"},
|
||||
"android.hardware.bluetooth.IBluetoothHci/default": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.bluetooth.finder.IBluetoothFinder/default": EXCEPTION_NO_FUZZER,
|
||||
"android.hardware.bluetooth.ranging.IBluetoothChannelSounding/default": EXCEPTION_NO_FUZZER,
|
||||
|
@ -333,7 +333,7 @@ var (
|
|||
"media.metrics": []string{"mediametrics_aidl_fuzzer"},
|
||||
"media.extractor": []string{"mediaextractor_service_fuzzer"},
|
||||
"media.transcoding": EXCEPTION_NO_FUZZER,
|
||||
"media.resource_manager": EXCEPTION_NO_FUZZER,
|
||||
"media.resource_manager": []string{"resourcemanager_service_fuzzer", "mediaresourcemanager_fuzzer"},
|
||||
"media.resource_observer": EXCEPTION_NO_FUZZER,
|
||||
"media.sound_trigger_hw": EXCEPTION_NO_FUZZER,
|
||||
"media.drm": EXCEPTION_NO_FUZZER,
|
||||
|
@ -479,7 +479,7 @@ var (
|
|||
"vibrator_manager": EXCEPTION_NO_FUZZER,
|
||||
"virtualdevice": EXCEPTION_NO_FUZZER,
|
||||
"virtualdevice_native": EXCEPTION_NO_FUZZER,
|
||||
"virtual_camera": EXCEPTION_NO_FUZZER,
|
||||
"virtual_camera": []string{"virtual_camera_fuzzer"},
|
||||
"virtual_touchpad": EXCEPTION_NO_FUZZER,
|
||||
"voiceinteraction": EXCEPTION_NO_FUZZER,
|
||||
"vold": []string{"vold_native_service_fuzzer"},
|
||||
|
|
|
@ -179,6 +179,9 @@ get_prop(priv_app, incremental_prop)
|
|||
# allow privileged apps to read the device config flags.
|
||||
get_prop(priv_app, device_config_aconfig_flags_prop)
|
||||
|
||||
# allow privileged apps to read boot reason property
|
||||
get_prop(priv_app, system_boot_reason_prop)
|
||||
|
||||
# Required for Phonesky to be able to read APEX files under /data/apex/active/.
|
||||
allow priv_app apex_data_file:dir search;
|
||||
allow priv_app staging_data_file:file r_file_perms;
|
||||
|
|
2
vendor/file_contexts
vendored
2
vendor/file_contexts
vendored
|
@ -164,7 +164,7 @@
|
|||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.common-V2-ndk\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.common\.fmq-V1-ndk\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.allocator-V2-ndk\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.common-V4-ndk\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.common-V5-ndk\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.common@1\.0\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.common@1\.1\.so u:object_r:same_process_hal_file:s0
|
||||
/(vendor|system/vendor)/lib(64)?/android\.hardware\.graphics\.common@1\.2\.so u:object_r:same_process_hal_file:s0
|
||||
|
|
Loading…
Reference in a new issue