diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-30 17:08:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 17:08:07 +0000 |
| commit | 8407968db68f1838663118fd0b23576854b8c525 (patch) | |
| tree | dd61b3606c4fcc5321bf513dbca5a528c639fc3f /core | |
| parent | c05cb5ffb33ad59236cad29c920aea0a70c1178f (diff) | |
| parent | 0cb59f2c03daa056e2cb351bf2ee1c9338b61551 (diff) | |
| download | frameworks_base-8407968db68f1838663118fd0b23576854b8c525.zip frameworks_base-8407968db68f1838663118fd0b23576854b8c525.tar.gz frameworks_base-8407968db68f1838663118fd0b23576854b8c525.tar.bz2 | |
Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Context.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index b0673b5..2ff85c6 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2363,6 +2363,7 @@ public abstract class Context { * * @see #getSystemService * @see android.net.wifi.passpoint.WifiPasspointManager + * @hide */ public static final String WIFI_PASSPOINT_SERVICE = "wifipasspoint"; |