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

2019-06-14 04:13:27 +00:00
parent c23ae79df5 d9cdbc1e45
commit 015f25c3fa
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
@@ -6901,8 +6901,10 @@ public class ConnectivityService extends IConnectivityManager.Stub

        final int userId = UserHandle.getCallingUserId();

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

        // Turn airplane mode off
        setAirplaneMode(false);