Merge "Allow "shortcut manager" icons to be returned to apps" into nyc-dev

This commit is contained in:
Makoto Onuki 2016-03-09 17:37:31 +00:00 committed by Android (Google) Code Review
commit 671127790c
4 changed files with 15 additions and 0 deletions

3
app.te
View file

@ -104,6 +104,9 @@ allow appdomain wallpaper_file:file { getattr read write };
# Read/write cached ringtones (opened by system). # Read/write cached ringtones (opened by system).
allow appdomain ringtone_file:file { getattr read write }; allow appdomain ringtone_file:file { getattr read write };
# Read ShortcutManager icon files (opened by system).
allow appdomain shortcut_manager_icons:file { getattr read };
# Write to /data/anr/traces.txt. # Write to /data/anr/traces.txt.
allow appdomain anr_data_file:dir search; allow appdomain anr_data_file:dir search;
allow appdomain anr_data_file:file { open append }; allow appdomain anr_data_file:file { open append };

View file

@ -168,6 +168,8 @@ type cache_recovery_file, file_type, mlstrustedobject;
type efs_file, file_type; type efs_file, file_type;
# Type for wallpaper file. # Type for wallpaper file.
type wallpaper_file, file_type, data_file_type, mlstrustedobject; type wallpaper_file, file_type, data_file_type, mlstrustedobject;
# Type for shortcut manager icon file.
type shortcut_manager_icons, file_type, data_file_type, mlstrustedobject;
# /mnt/asec # /mnt/asec
type asec_apk_file, file_type, data_file_type, mlstrustedobject; type asec_apk_file, file_type, data_file_type, mlstrustedobject;
# Elements of asec files (/mnt/asec) that are world readable # Elements of asec files (/mnt/asec) that are world readable

View file

@ -330,6 +330,10 @@
# Ringtone files # Ringtone files
/data/system_de/[0-9]+/ringtones(/.*)? u:object_r:ringtone_file:s0 /data/system_de/[0-9]+/ringtones(/.*)? u:object_r:ringtone_file:s0
# ShortcutManager icons, e.g.
# /data/system_ce/0/shortcut_service/bitmaps/com.example.app/1457472879282.png
/data/system_ce/[0-9]+/shortcut_service/bitmaps(/.*)? u:object_r:shortcut_manager_icons:s0
############################# #############################
# efs files # efs files
# #

View file

@ -300,6 +300,12 @@ allow system_server system_data_file:file relabelfrom;
allow system_server wallpaper_file:file relabelto; allow system_server wallpaper_file:file relabelto;
allow system_server wallpaper_file:file { rw_file_perms unlink }; allow system_server wallpaper_file:file { rw_file_perms unlink };
# ShortcutManager icons
allow system_server system_data_file:dir relabelfrom;
allow system_server shortcut_manager_icons:dir { create_dir_perms relabelto };
allow system_server shortcut_manager_icons:file create_file_perms;
# Manage ringtones. # Manage ringtones.
allow system_server ringtone_file:dir { create_dir_perms relabelto }; allow system_server ringtone_file:dir { create_dir_perms relabelto };
allow system_server ringtone_file:file create_file_perms; allow system_server ringtone_file:file create_file_perms;