diff options
| author | Roshan Pius <rpius@google.com> | 2017-06-08 20:52:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 20:52:14 +0000 |
| commit | 9a7f1d1ab15b33b117fc5e35bb7f607076651617 (patch) | |
| tree | e952fbc9e95af0962c94ad07144032dd3fa26779 /service | |
| parent | 12f18f1708c4d27388478230c03fd51a59e22f98 (diff) | |
| parent | 95bad763cff555fcf37442d5d3129f777bb0b978 (diff) | |
Merge "WifiBackupRestore: Change to |NETWORK_SETTINGS| permission" into oc-dev
am: 95bad763cf
Change-Id: I47494cf5efac696438a5e19002b7bbecdafcdaed
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 04afb8bb9..d3f5b13de 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -2507,8 +2507,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { */ @Override public byte[] retrieveBackupData() { - enforceReadCredentialPermission(); - enforceAccessPermission(); + enforceNetworkSettingsPermission(); mLog.trace("retrieveBackupData uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel == null) { Slog.e(TAG, "mWifiStateMachineChannel is not initialized"); @@ -2553,7 +2552,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { */ @Override public void restoreBackupData(byte[] data) { - enforceChangePermission(); + enforceNetworkSettingsPermission(); mLog.trace("restoreBackupData uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel == null) { Slog.e(TAG, "mWifiStateMachineChannel is not initialized"); @@ -2575,7 +2574,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { * @param ipConfigData Raw byte stream of ipconfig.txt */ public void restoreSupplicantBackupData(byte[] supplicantData, byte[] ipConfigData) { - enforceChangePermission(); + enforceNetworkSettingsPermission(); mLog.trace("restoreSupplicantBackupData uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel == null) { Slog.e(TAG, "mWifiStateMachineChannel is not initialized"); |