Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WRITE_SECURE_SETTINGS permission issue"

Browse Source
This commit is contained in:
Irfan Sheriff
2010-08-18 16:54:45 -07:00
committed by Android (Google) Code Review
parent 5aaeaffdce 6118069b1d
commit b8ea4aa79d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/WifiService.java
View File

@@ -405,7 +405,14 @@ public class WifiService extends IWifiManager.Stub {
}
mWifiStateMachine.setWifiEnabled(enable);
/*
* Caller might not have WRITE_SECURE_SETTINGS,
* only CHANGE_WIFI_STATE is enforced
*/
long ident = Binder.clearCallingIdentity();
persistWifiEnabled(enable);
Binder.restoreCallingIdentity(ident);
if (enable) {
if (!mIsReceiverRegistered) {
@@ -451,7 +458,13 @@ public class WifiService extends IWifiManager.Stub {
wifiConfig.SSID = mContext.getString(R.string.wifi_tether_configure_ssid_default);
wifiConfig.allowedKeyManagement.set(KeyMgmt.NONE);
}
/*
* Caller might not have WRITE_SECURE_SETTINGS,
* only CHANGE_WIFI_STATE is enforced
*/
long ident = Binder.clearCallingIdentity();
setWifiApConfiguration(wifiConfig);
Binder.restoreCallingIdentity(ident);
}
mWifiStateMachine.setWifiApEnabled(wifiConfig, enabled);