diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 15:54:06 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 17:18:49 -0700 |
| commit | bdfce2ec05a3e9ca6acd6711de6133e06f2446e6 (patch) | |
| tree | 50fd53ef94070944416713eacceaa4cb4bff15c5 /wifi/java/android/net/wifi/p2p | |
| parent | 51ce1607b392bf463e4175596d0b91dc337f4c14 (diff) | |
| download | frameworks_base-bdfce2ec05a3e9ca6acd6711de6133e06f2446e6.zip frameworks_base-bdfce2ec05a3e9ca6acd6711de6133e06f2446e6.tar.gz frameworks_base-bdfce2ec05a3e9ca6acd6711de6133e06f2446e6.tar.bz2 | |
First step towards cleaning up Global settings.
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index 8f0d8f0..8670650 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -2039,8 +2039,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub { } private String getPersistedDeviceName() { - String deviceName = Settings.Secure.getString(mContext.getContentResolver(), - Settings.Secure.WIFI_P2P_DEVICE_NAME); + String deviceName = Settings.Global.getString(mContext.getContentResolver(), + Settings.Global.WIFI_P2P_DEVICE_NAME); if (deviceName == null) { /* We use the 4 digits of the ANDROID_ID to have a friendly * default that has low likelihood of collision with a peer */ @@ -2062,8 +2062,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub { mThisDevice.deviceName = devName; mWifiNative.setP2pSsidPostfix("-" + mThisDevice.deviceName); - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.WIFI_P2P_DEVICE_NAME, devName); + Settings.Global.putString(mContext.getContentResolver(), + Settings.Global.WIFI_P2P_DEVICE_NAME, devName); sendThisDeviceChangedBroadcast(); return true; } |