Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6435d00e authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "First pass on the new permission grouping."

parents d8d07f17 61a4dd5c

api/current.txt

+4 −25
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ package android { 
    field public static final java.lang.String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS";

    field public static final java.lang.String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";

    field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR";

    field public static final java.lang.String SUBSCRIBED_FEEDS_READ = "android.permission.SUBSCRIBED_FEEDS_READ";

    field public static final java.lang.String SUBSCRIBED_FEEDS_WRITE = "android.permission.SUBSCRIBED_FEEDS_WRITE";

    field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";

    field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";

    field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";
@@ -166,37 +164,18 @@ package android { 














  public static final class Manifest.permission_group {















    ctor public Manifest.permission_group();













    field public static final java.lang.String ACCESSIBILITY_FEATURES = "android.permission-group.ACCESSIBILITY_FEATURES";















    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";













    field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";













    field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";













    field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";













    field public static final java.lang.String BLUETOOTH_NETWORK = "android.permission-group.BLUETOOTH_NETWORK";















    field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";















    field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";















    field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";













    field public static final java.lang.String COST_MONEY = "android.permission-group.COST_MONEY";













    field public static final java.lang.String DEVELOPMENT_TOOLS = "android.permission-group.DEVELOPMENT_TOOLS";













    field public static final java.lang.String DEVICE_ALARMS = "android.permission-group.DEVICE_ALARMS";













    field public static final java.lang.String DISPLAY = "android.permission-group.DISPLAY";













    field public static final java.lang.String HARDWARE_CONTROLS = "android.permission-group.HARDWARE_CONTROLS";













    field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";















    field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";













    field public static final java.lang.String MESSAGES = "android.permission-group.MESSAGES";















    field public static final java.lang.String MICROPHONE = "android.permission-group.MICROPHONE";













    field public static final java.lang.String NETWORK = "android.permission-group.NETWORK";













    field public static final java.lang.String PERSONAL_INFO = "android.permission-group.PERSONAL_INFO";













    field public static final java.lang.String PHONE_CALLS = "android.permission-group.PHONE_CALLS";













    field public static final java.lang.String SCREENLOCK = "android.permission-group.SCREENLOCK";













    field public static final java.lang.String PHONE = "android.permission-group.PHONE";













    field public static final java.lang.String SENSORS = "android.permission-group.SENSORS";













    field public static final java.lang.String SMS = "android.permission-group.SMS";















    field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO";













    field public static final java.lang.String STATUS_BAR = "android.permission-group.STATUS_BAR";













    field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";













    field public static final java.lang.String SYNC_SETTINGS = "android.permission-group.SYNC_SETTINGS";













    field public static final java.lang.String SYSTEM_CLOCK = "android.permission-group.SYSTEM_CLOCK";













    field public static final java.lang.String SYSTEM_TOOLS = "android.permission-group.SYSTEM_TOOLS";















    field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";













    field public static final java.lang.String VOICEMAIL = "android.permission-group.VOICEMAIL";













    field public static final java.lang.String WALLPAPER = "android.permission-group.WALLPAPER";













    field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission-group.WRITE_USER_DICTIONARY";















  }





























  public final class R {

























api/system-current.txt



+4
−25




























Original line number
Diff line number
Diff line








@@ -202,8 +202,6 @@ package android {













    field public static final java.lang.String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";















    field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR";















    field public static final java.lang.String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";













    field public static final java.lang.String SUBSCRIBED_FEEDS_READ = "android.permission.SUBSCRIBED_FEEDS_READ";













    field public static final java.lang.String SUBSCRIBED_FEEDS_WRITE = "android.permission.SUBSCRIBED_FEEDS_WRITE";















    field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";















    field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";















    field public static final java.lang.String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";










@@ -238,37 +236,18 @@ package android {



























  public static final class Manifest.permission_group {















    ctor public Manifest.permission_group();













    field public static final java.lang.String ACCESSIBILITY_FEATURES = "android.permission-group.ACCESSIBILITY_FEATURES";















    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";













    field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";













    field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";













    field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";













    field public static final java.lang.String BLUETOOTH_NETWORK = "android.permission-group.BLUETOOTH_NETWORK";















    field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";















    field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";















    field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";













    field public static final java.lang.String COST_MONEY = "android.permission-group.COST_MONEY";













    field public static final java.lang.String DEVELOPMENT_TOOLS = "android.permission-group.DEVELOPMENT_TOOLS";













    field public static final java.lang.String DEVICE_ALARMS = "android.permission-group.DEVICE_ALARMS";













    field public static final java.lang.String DISPLAY = "android.permission-group.DISPLAY";













    field public static final java.lang.String HARDWARE_CONTROLS = "android.permission-group.HARDWARE_CONTROLS";













    field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";















    field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";













    field public static final java.lang.String MESSAGES = "android.permission-group.MESSAGES";















    field public static final java.lang.String MICROPHONE = "android.permission-group.MICROPHONE";













    field public static final java.lang.String NETWORK = "android.permission-group.NETWORK";













    field public static final java.lang.String PERSONAL_INFO = "android.permission-group.PERSONAL_INFO";













    field public static final java.lang.String PHONE_CALLS = "android.permission-group.PHONE_CALLS";













    field public static final java.lang.String SCREENLOCK = "android.permission-group.SCREENLOCK";













    field public static final java.lang.String PHONE = "android.permission-group.PHONE";













    field public static final java.lang.String SENSORS = "android.permission-group.SENSORS";













    field public static final java.lang.String SMS = "android.permission-group.SMS";















    field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO";













    field public static final java.lang.String STATUS_BAR = "android.permission-group.STATUS_BAR";













    field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";













    field public static final java.lang.String SYNC_SETTINGS = "android.permission-group.SYNC_SETTINGS";













    field public static final java.lang.String SYSTEM_CLOCK = "android.permission-group.SYSTEM_CLOCK";













    field public static final java.lang.String SYSTEM_TOOLS = "android.permission-group.SYSTEM_TOOLS";















    field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";













    field public static final java.lang.String VOICEMAIL = "android.permission-group.VOICEMAIL";













    field public static final java.lang.String WALLPAPER = "android.permission-group.WALLPAPER";













    field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission-group.WRITE_USER_DICTIONARY";















  }





























  public final class R {

























core/res/AndroidManifest.xml



+505
−1158


























File changed.
Preview size limit exceeded, changes collapsed.
























core/res/res/values/strings.xml



+57
−1323


























File changed.
Preview size limit exceeded, changes collapsed.