diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-22 21:41:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 21:41:40 +0000 |
| commit | 3d6f606031da248a3b1fd6f0f569ac33a26c0b5e (patch) | |
| tree | 964838ddbe20f03310c6f144883da088ec517daa /api | |
| parent | 3f2c51084b9d9578532c8a88e7a5444eeedc86c2 (diff) | |
| parent | 2062eeff0156bc4e119398f1736e699d90ad8345 (diff) | |
| download | frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.zip frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.tar.gz frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.tar.bz2 | |
Merge "Add a privileged permission to get user accounts" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 741ff9b..462ca0a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -66,6 +66,7 @@ package android { field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; + field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS"; field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH"; diff --git a/api/system-current.txt b/api/system-current.txt index 4c2d7b1..d6e3c03 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -95,6 +95,7 @@ package android { field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK"; field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; + field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS"; field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; |