diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-30 20:50:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-30 20:50:04 +0000 |
| commit | 4988378cd0f1bb6cdd83f797d10fd45105672296 (patch) | |
| tree | d206d79d882ef4aca203b2dd79829fa91e10c06b /api | |
| parent | 75e51ec0b14e9c5363ad86a69fd7a764290a5cfb (diff) | |
| parent | 136a2e7fc94098f762cd3d9bd092b4c4d5bf4c70 (diff) | |
| download | frameworks_base-4988378cd0f1bb6cdd83f797d10fd45105672296.zip frameworks_base-4988378cd0f1bb6cdd83f797d10fd45105672296.tar.gz frameworks_base-4988378cd0f1bb6cdd83f797d10fd45105672296.tar.bz2 | |
Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 65214b8..37b1d7b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -141,6 +141,7 @@ package android { field public static final java.lang.String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG"; field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS"; field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT"; + field public static final java.lang.String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS"; field public static final java.lang.String PERFORM_CDMA_PROVISIONING = "android.permission.PERFORM_CDMA_PROVISIONING"; field public static final java.lang.String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION"; field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY"; |