Merge "Change factoryReset to succeed for Settings"

am: 3b056773f1 Change-Id: I714a8e46fb948b66d10efe15c536a625e67e9d2c
2019-06-14 00:14:30 -07:00
parent 05d08d1a1e 3b056773f1
commit 9d59a75463
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
@@ -6892,8 +6892,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);