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

Commit f214e5c4 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

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

am: 7fc7f9ce

Change-Id: Iea895d4bbbae2fd6ddaf0c7627c8066c0a7e6033
parents 78bb5017 7fc7f9ce

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

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