From 6a32eec74dc631e0bc06bca84cb2d0b3cd222c8b Mon Sep 17 00:00:00 2001 From: Nick Kralevich <nnk@google.com> Date: Thu, 12 Dec 2013 15:23:10 -0800 Subject: [PATCH] alphabetize /data/misc entries. Alphabetize the entries for the /data/misc subdirectories. Change-Id: I3690085cbb99c225545545668dedd66341a14edb --- file.te | 14 ++++++++------ file_contexts | 20 +++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/file.te b/file.te index ed56ec9a9..e4f0a1055 100644 --- a/file.te +++ b/file.te @@ -52,18 +52,20 @@ type dalvikcache_data_file, file_type, data_file_type; type shell_data_file, file_type, data_file_type; # /data/gps type gps_data_file, file_type, data_file_type; + # /data/misc subdirectories +type adb_keys_file, file_type, data_file_type; type audio_data_file, file_type, data_file_type; type bluetooth_data_file, file_type, data_file_type; -type media_data_file, file_type, data_file_type; +type camera_data_file, file_type, data_file_type; type keystore_data_file, file_type, data_file_type; -type vpn_data_file, file_type, data_file_type; +type media_data_file, file_type, data_file_type; +type nfc_data_file, file_type, data_file_type; +type radio_data_file, file_type, data_file_type; type systemkeys_data_file, file_type, data_file_type; +type vpn_data_file, file_type, data_file_type; type wifi_data_file, file_type, data_file_type; -type radio_data_file, file_type, data_file_type; -type nfc_data_file, file_type, data_file_type; -type camera_data_file, file_type, data_file_type; -type adb_keys_file, file_type, data_file_type; + # Compatibility with type names used in vanilla Android 4.3 and 4.4. typealias audio_data_file alias audio_firmware_file; typealias camera_data_file alias camera_calibration_file; diff --git a/file_contexts b/file_contexts index ebb32488f..529649960 100644 --- a/file_contexts +++ b/file_contexts @@ -167,18 +167,20 @@ /data/app-private/vmdl.*\.tmp u:object_r:apk_private_tmp_file:s0 /data/tombstones(/.*)? u:object_r:tombstone_data_file:s0 /data/local/tmp(/.*)? u:object_r:shell_data_file:s0 + # Misc data +/data/misc/adb(/.*)? u:object_r:adb_keys_file:s0 /data/misc/audio(/.*)? u:object_r:audio_data_file:s0 -/data/misc/bluetooth(/.*)? u:object_r:bluetooth_data_file:s0 -/data/misc/bluedroid(/.*)? u:object_r:bluetooth_data_file:s0 -/data/misc/keystore(/.*)? u:object_r:keystore_data_file:s0 -/data/misc/media(/.*)? u:object_r:media_data_file:s0 -/data/misc/vpn(/.*)? u:object_r:vpn_data_file:s0 -/data/misc/systemkeys(/.*)? u:object_r:systemkeys_data_file:s0 -/data/misc/wifi(/.*)? u:object_r:wifi_data_file:s0 -/data/misc/camera(/.*)? u:object_r:camera_data_file:s0 +/data/misc/bluetooth(/.*)? u:object_r:bluetooth_data_file:s0 +/data/misc/bluedroid(/.*)? u:object_r:bluetooth_data_file:s0 +/data/misc/camera(/.*)? u:object_r:camera_data_file:s0 /data/misc/dhcp(/.*)? u:object_r:dhcp_data_file:s0 -/data/misc/adb(/.*)? u:object_r:adb_keys_file:s0 +/data/misc/keystore(/.*)? u:object_r:keystore_data_file:s0 +/data/misc/media(/.*)? u:object_r:media_data_file:s0 +/data/misc/systemkeys(/.*)? u:object_r:systemkeys_data_file:s0 +/data/misc/vpn(/.*)? u:object_r:vpn_data_file:s0 +/data/misc/wifi(/.*)? u:object_r:wifi_data_file:s0 + # App sandboxes /data/data/.* u:object_r:app_data_file:s0 # Wallpaper file. -- GitLab