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

Merge "Change factoryReset to succeed for Settings" into qt-dev am: 015f25c3fa

Browse Source 
am: 2d2d35427c

Change-Id: Ica379a97191bb4c7f7b93b4b3396df9e102d30e0
This commit is contained in:
Lorenzo Colitti
2019-06-13 22:09:00 -07:00
committed by android-build-merger
parent a1023d9340 015f25c3fa
commit 9d5fbc0821
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6899,8 +6899,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);