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

Commit a92dd836 authored by Shawn Willden's avatar Shawn Willden
Browse files

Revert erroneous rename from previous CL 

Test: atest PersistentDataBlockServiceTest
Bug: 290312729
Change-Id: I05f7640641d93fc4dbc871f489871cc24e42234a
parent 53c8e3a7

services/core/java/com/android/server/pdb/PersistentDataBlockService.java

+3 −3
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ public class PersistentDataBlockService extends SystemService { 
            // version.  If so, we deactivate FRP and set the secret to the default value.

            if (isUpgradingFromPreVRelease()) {

                Slog.w(TAG, "Upgrading from Android 14 or lower, defaulting FRP secret");

                writeFrpMagicAndDefaultSecretLocked();

                writeFrpMagicAndDefaultSecret();

                mFrpActive = false;

                return true;

            }
@@ -724,7 +724,7 @@ public class PersistentDataBlockService extends SystemService { 
        synchronized (mLock) {

            if (!hasFrpSecretMagic()) {

                Slog.i(TAG, "No FRP secret magic, system must have been upgraded.");

                writeFrpMagicAndDefaultSecretLocked();

                writeFrpMagicAndDefaultSecret();

            }

        }
@@ -746,7 +746,7 @@ public class PersistentDataBlockService extends SystemService { 
        }

    }



    private void writeFrpMagicAndDefaultSecretLocked() {

    private void writeFrpMagicAndDefaultSecret() {

        try (FileChannel channel = getBlockOutputChannelIgnoringFrp()) {

            synchronized (mLock) {

                Slog.i(TAG, "Writing default FRP secret");