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

am: 9d5fbc0821 Change-Id: I75b0f141421ff0eec3e9d62daf953600a8173186
2019-06-13 22:34:04 -07:00
parent 994a93cc83 9d5fbc0821
commit 524556d6cf
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6899,8 +6899,10 @@ public class ConnectivityService extends IConnectivityManager.Stub

        final int userId = UserHandle.getCallingUserId();

-        final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
-        ipMemoryStore.factoryReset();
+        Binder.withCleanCallingIdentity(() -> {
+            final IpMemoryStore ipMemoryStore = IpMemoryStore.getMemoryStore(mContext);
+            ipMemoryStore.factoryReset();
+        });

        // Turn airplane mode off
        setAirplaneMode(false);