Merge "Add support for overriding power manager flags" into main (fa8943e6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/feature/PowerManagerFlags.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.power.feature;

		import android.os.Build;
		import android.os.SystemProperties;
		import android.text.TextUtils;
		import android.util.Slog;

		@@ -82,7 +84,7 @@ public class PowerManagerFlags {
		}
		return mEnabled;
		}
		mEnabled = mFlagFunction.get();
		mEnabled = flagOrSystemProperty(mFlagFunction, mName);
		if (DEBUG) {
		Slog.d(TAG, mName + ": mEnabled. Flag value = " + mEnabled);
		}
		@@ -90,6 +92,15 @@ public class PowerManagerFlags {
		return mEnabled;
		}

		private boolean flagOrSystemProperty(Supplier<Boolean> flagFunction, String flagName) {
		boolean flagValue = flagFunction.get();
		if (Build.IS_ENG \|\| Build.IS_USERDEBUG) {
		return SystemProperties.getBoolean("persist.sys." + flagName + "-override",
		flagValue);
		}
		return flagValue;
		}

		@Override
		public String toString() {
		// remove com.android.server.power.feature.flags. from the beginning of the name.