Merge "Revert erroneous rename from previous CL" into main (adfb5266) · Commits · e / os / android_frameworks_base

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;
		}
		@@ -726,7 +726,7 @@ public class PersistentDataBlockService extends SystemService {
		synchronized (mLock) {
		if (!hasFrpSecretMagic()) {
		Slog.i(TAG, "No FRP secret magic, system must have been upgraded.");
		writeFrpMagicAndDefaultSecretLocked();
		writeFrpMagicAndDefaultSecret();
		}
		}

		@@ -748,7 +748,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");