LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697 am: ab42076b53

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I7c23d33349e7f28a6fc17f5191e973f60e1eb96d
This commit is contained in:
Treehugger Robot
2021-05-21 02:08:51 +00:00
committed by Automerger Merge Worker
parent 31cee3ca28 ab42076b53
commit 6eeaa90005
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
service/src/com/android/server/ConnectivityService.java
View File

@@ -8655,28 +8655,32 @@ public class ConnectivityService extends IConnectivityManager.Stub
public void factoryReset() {
enforceSettingsPermission();
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
return;
}
final int uid = mDeps.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
if (mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_NETWORK_RESET,
UserHandle.getUserHandleForUid(uid))) {
return;
}
final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
ipMemoryStore.factoryReset();
// Turn airplane mode off
setAirplaneMode(false);
// restore private DNS settings to default mode (opportunistic)
if (!mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_CONFIG_PRIVATE_DNS,
UserHandle.getUserHandleForUid(uid))) {
ConnectivitySettingsManager.setPrivateDnsMode(mContext,
PRIVATE_DNS_MODE_OPPORTUNISTIC);
}
Settings.Global.putString(mContext.getContentResolver(),
ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI, null);
} finally {
Binder.restoreCallingIdentity(token);
}
// Turn airplane mode off
setAirplaneMode(false);
// restore private DNS settings to default mode (opportunistic)
if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_PRIVATE_DNS)) {
ConnectivitySettingsManager.setPrivateDnsMode(mContext, PRIVATE_DNS_MODE_OPPORTUNISTIC);
}
Settings.Global.putString(mContext.getContentResolver(),
ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI, null);
}
@Override