Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d59a754 authored by Heemin Seog's avatar Heemin Seog Committed by android-build-merger
Browse files

Merge "Change factoryReset to succeed for Settings" 

am: 3b056773

Change-Id: I714a8e46fb948b66d10efe15c536a625e67e9d2c
parents 05d08d1a 3b056773

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

+4 −2
Original line number Diff line number Diff line
@@ -6892,8 +6892,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);