Merge "Change factoryReset to succeed for Settings" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
015f25c3fa
@@ -6901,8 +6901,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
|
|
||||||
final int userId = UserHandle.getCallingUserId();
|
final int userId = UserHandle.getCallingUserId();
|
||||||
|
|
||||||
final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
|
Binder.withCleanCallingIdentity(() -> {
|
||||||
ipMemoryStore.factoryReset();
|
final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
|
||||||
|
ipMemoryStore.factoryReset();
|
||||||
|
});
|
||||||
|
|
||||||
// Turn airplane mode off
|
// Turn airplane mode off
|
||||||
setAirplaneMode(false);
|
setAirplaneMode(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user