diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-03-10 20:04:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-10 20:04:10 +0000 |
| commit | 6d9ed0c35327adfba50004fe9270ee6471459fb0 (patch) | |
| tree | 221e253d70359ca25c2ffa4c90a7ee7d35047398 /services | |
| parent | 82ec1442487d66935cb0c30f6da3545d8c33af6e (diff) | |
| parent | fcbced38a6a53c5fa31568417170afcf14d86ae6 (diff) | |
| download | frameworks_base-6d9ed0c35327adfba50004fe9270ee6471459fb0.zip frameworks_base-6d9ed0c35327adfba50004fe9270ee6471459fb0.tar.gz frameworks_base-6d9ed0c35327adfba50004fe9270ee6471459fb0.tar.bz2 | |
Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wifi/WifiService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index f2efde1..aecf9ae 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -870,7 +870,7 @@ public final class WifiService extends IWifiManager.Stub { public void setCountryCode(String countryCode, boolean persist) { Slog.i(TAG, "WifiService trying to set country code to " + countryCode + " with persist set to " + persist); - enforceChangePermission(); + enforceConnectivityInternalPermission(); final long token = Binder.clearCallingIdentity(); try { mWifiStateMachine.setCountryCode(countryCode, persist); |