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

Commit e2d85b7f authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge "Don't overwrite the host FRP when running a GSI."

parents d7947d77 a032a2b6

services/java/com/android/server/SystemServer.java

+4 −1
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ public final class SystemServer { 
    private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file";

    private static final String BLOCK_MAP_FILE = "/cache/recovery/block.map";



    private static final String GSI_RUNNING_PROP = "ro.gsid.image_running";



    // maximum number of binder threads used for system_server

    // will be higher than the system default

    private static final int sMaxBinderThreads = 31;
@@ -1167,7 +1169,8 @@ public final class SystemServer { 
            traceEnd();



            final boolean hasPdb = !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");

            if (hasPdb) {

            final boolean hasGsi = SystemProperties.getInt(GSI_RUNNING_PROP, 0) > 0;

            if (hasPdb && !hasGsi) {

                traceBeginAndSlog("StartPersistentDataBlock");

                mSystemServiceManager.startService(PersistentDataBlockService.class);

                traceEnd();