Merge "Change factoryReset to succeed for Settings"

2019-06-14 07:02:17 +00:00
parent fbb97ab240 db8489dc29
commit c687700cde
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);