commit 7fc7f9ce2211e161fc8f009302ded5a78daedd17
author Lorenzo Colitti <lorenzo@google.com> Fri Jun 14 04:13:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 04:13:27 2019 +0000
tree a488f39be19498ec28a38f582d93d771138c079a
parent 19f2034a8f5869352dec70aa39a50a7172690039
parent 9e31318bffffd319f52dd366b61e5541e743622f

Merge "Change factoryReset to succeed for Settings" into qt-dev

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 5027a12..1cca0b9 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6901,8 +6901,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);