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

Change factoryReset to succeed for Settings

Browse Source 
Wrap a part of factoryReset with Binder.withCleanCallingIdentity() so
that it doesn't crash thinking that a different uid connected to the
network stack.

Bug: 135029349
Test: build, manual
Change-Id: Iea246a4c1939a4e7e35434137051835ece81d92f
This commit is contained in:
Heemin Seog
2019-06-12 09:21:44 -07:00
parent 4c94d3051d
commit d9cdbc1e45
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6901,8 +6901,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
final int userId = UserHandle.getCallingUserId(); final int userId = UserHandle.getCallingUserId();
Binder.withCleanCallingIdentity(() -> {
final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext); final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
ipMemoryStore.factoryReset(); ipMemoryStore.factoryReset();
});
// Turn airplane mode off // Turn airplane mode off
setAirplaneMode(false); setAirplaneMode(false);