commit 67322170b51b22b921ed1b09fb3da4d683451aaa
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 14 07:02:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 14 07:02:17 2019 +0000
tree 6fd7f768e08b5149a28b1ae8e01d3fe5f102c505
parent 6b6e383d2bd712cc38380aa4d301dee4e3609a27
parent d5085f30932c36e13e576309c5334bb623e7969e

Merge "Change factoryReset to succeed for Settings"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index f6a972b..fcecb71 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6892,8 +6892,10 @@
 
         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);