summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-05-19 00:13:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-19 00:13:22 +0000
commitf7b541ff749ec8336852ba781f1fa6f7abb3f6df (patch)
treede32bafec441a451c5eeda456cade47e6d3b0f75 /api/system-current.txt
parent10e23977bd1aec6d833df1e8894f3a78eb0bd3cb (diff)
parent408abf7f1bec3253675d0225300d7ee39481d286 (diff)
downloadframeworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.zip
frameworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.tar.gz
frameworks_base-f7b541ff749ec8336852ba781f1fa6f7abb3f6df.tar.bz2
Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index d2e0556..26466ed 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -111,6 +111,7 @@ package android {
field public static final java.lang.String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";
field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
field public static final java.lang.String KILL_UID = "android.permission.KILL_UID";
+ field public static final java.lang.String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
field public static final java.lang.String LOOP_RADIO = "android.permission.LOOP_RADIO";
field public static final java.lang.String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS";