Merge "Add an API for launching intent to view permission usage." into qt-dev
am: 13e4ff16c4
Change-Id: I28e47d8e7209785f6841631763b88610ecc9e830
This commit is contained in:
@@ -143,6 +143,7 @@ package android {
|
||||
field public static final String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS";
|
||||
field public static final String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";
|
||||
field public static final String SMS_FINANCIAL_TRANSACTIONS = "android.permission.SMS_FINANCIAL_TRANSACTIONS";
|
||||
field public static final String START_VIEW_PERMISSION_USAGE = "android.permission.START_VIEW_PERMISSION_USAGE";
|
||||
field public static final String STATUS_BAR = "android.permission.STATUS_BAR";
|
||||
field public static final String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
|
||||
field public static final String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
|
||||
@@ -10326,6 +10327,7 @@ package android.content {
|
||||
field public static final String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";
|
||||
field public static final String ACTION_VIEW = "android.intent.action.VIEW";
|
||||
field public static final String ACTION_VIEW_LOCUS = "android.intent.action.VIEW_LOCUS";
|
||||
field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE = "android.intent.action.VIEW_PERMISSION_USAGE";
|
||||
field public static final String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";
|
||||
field @Deprecated public static final String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
|
||||
field public static final String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";
|
||||
|
||||
Reference in New Issue
Block a user