Merge "Remove flag wait_for_internet_ror" into main (9fc7d787) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,6 @@ java_library_static {
		"dreams_flags_lib",
		"aconfig_new_storage_flags_lib",
		"powerstats_flags_lib",
		"locksettings_flags_lib",
		"MmdProperties",
		"mmd_flags_lib",
		"profiling_flags_lib",

services/core/java/com/android/server/locksettings/Android.bp

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "locksettings_flags",
		package: "com.android.server.locksettings",
		container: "system",
		srcs: ["*.aconfig"],
		}

		java_aconfig_library {
		name: "locksettings_flags_lib",
		aconfig_declarations: "locksettings_flags",
		}

services/core/java/com/android/server/locksettings/RebootEscrowManager.java

+21 −45

Original line number	Diff line number	Diff line
		@@ -428,15 +428,11 @@ class RebootEscrowManager {

		/** Wrapper function to set error code serialized through handler, */
		private void setLoadEscrowDataErrorCode(@RebootEscrowErrorCode int value, Handler handler) {
		if (Flags.waitForInternetRor()) {
		mInjector.post(
		handler,
		() -> {
		mLoadEscrowDataErrorCode = value;
		});
		} else {
		mLoadEscrowDataErrorCode = value;
		}
		}

		/** Wrapper function to compare and set error code serialized through handler. */
		@@ -511,7 +507,6 @@ class RebootEscrowManager {
		mWakeLock.acquire(mInjector.getWakeLockTimeoutMillis());
		}

		if (Flags.waitForInternetRor()) {
		// Timeout to stop retrying same as the wake lock timeout.
		mInjector.postDelayed(
		retryHandler,
		@@ -523,11 +518,6 @@ class RebootEscrowManager {
		mInjector.post(
		retryHandler,
		() -> loadRebootEscrowDataOnInternet(retryHandler, users, rebootEscrowUsers));
		return;
		}

		mInjector.post(retryHandler, () -> loadRebootEscrowDataWithRetry(
		retryHandler, 0, users, rebootEscrowUsers));
		}

		void scheduleLoadRebootEscrowDataOrFail(
		@@ -548,29 +538,15 @@ class RebootEscrowManager {
		return;
		}

		if (Flags.waitForInternetRor()) {
		if (mRebootEscrowTimedOut) {
		Slog.w(TAG, "Failed to load reboot escrow data within timeout");
		compareAndSetLoadEscrowDataErrorCode(
		ERROR_NONE, ERROR_TIMEOUT_EXHAUSTED, retryHandler);
		compareAndSetLoadEscrowDataErrorCode(ERROR_NONE, ERROR_TIMEOUT_EXHAUSTED, retryHandler);
		} else {
		Slog.w(
		TAG,
		"Failed to load reboot escrow data after " + attemptNumber + " attempts");
		Slog.w(TAG, "Failed to load reboot escrow data after " + attemptNumber + " attempts");
		compareAndSetLoadEscrowDataErrorCode(
		ERROR_NONE, ERROR_RETRY_COUNT_EXHAUSTED, retryHandler);
		}
		onGetRebootEscrowKeyFailed(users, attemptNumber, retryHandler);
		return;
		}

		Slog.w(TAG, "Failed to load reboot escrow data after " + attemptNumber + " attempts");
		if (mInjector.serverBasedResumeOnReboot() && !mInjector.isNetworkConnected()) {
		mLoadEscrowDataErrorCode = ERROR_NO_NETWORK;
		} else {
		mLoadEscrowDataErrorCode = ERROR_RETRY_COUNT_EXHAUSTED;
		}
		onGetRebootEscrowKeyFailed(users, attemptNumber, retryHandler);
		}

		void loadRebootEscrowDataOnInternet(

services/core/java/com/android/server/locksettings/flags.aconfig

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "com.android.server.locksettings"
		container: "system"

		flag {
		name: "wait_for_internet_ror"
		namespace: "sudo"
		description: "Feature flag to wait for internet connectivity before calling resume on reboot server."
		bug: "231660348"
		}
		No newline at end of file

services/tests/servicestests/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,6 @@ android_test {
		"net_flags_lib",
		"CtsVirtualDeviceCommonLib",
		"com_android_server_accessibility_flags_lib",
		"locksettings_flags_lib",
		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
		"true": ["service-crashrecovery-pre-jarjar"],
		default: [],