From 61ba8a106ed697d9fee9b59535cdd47bf26d6cba Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 8 Dec 2020 12:48:06 -0800 Subject: [PATCH] Remove Plugin mechanism. It has no current uses and no expected future uses, so it's effectively dead code. Bug: 79580230 Test: Android builds Change-Id: I79035111293d3d23d388c28096ab4818d2588b5f --- .../batterysaver/BatterySaverController.java | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java index 68d038bb5cf68..16f50694ebb96 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java @@ -112,11 +112,6 @@ public class BatterySaverController implements BatterySaverPolicyListener { @GuardedBy("mLock") private boolean mIsInteractive; - /** - * Read-only list of plugins. No need for synchronization. - */ - private final Plugin[] mPlugins; - /** * Package name that will receive an explicit manifest broadcast for * {@link PowerManager#ACTION_POWER_SAVE_MODE_CHANGED}. It's {@code null} if it hasn't been @@ -172,15 +167,6 @@ public class BatterySaverController implements BatterySaverPolicyListener { } } - /** - * Plugin interface. All methods are guaranteed to be called on the same (handler) thread. - */ - public interface Plugin { - void onSystemReady(BatterySaverController caller); - - void onBatterySaverChanged(BatterySaverController caller); - } - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -194,6 +180,7 @@ public class BatterySaverController implements BatterySaverPolicyListener { updateBatterySavingStats(); return; // No need to send it if not enabled. } + // We currently evaluate state only for CPU frequency changes. // Don't send the broadcast, because we never did so in this case. mHandler.postStateChanged(/*sendBroadcast=*/ false, REASON_INTERACTIVE_CHANGED); @@ -224,9 +211,6 @@ public class BatterySaverController implements BatterySaverPolicyListener { mFileUpdater = new FileUpdater(context); mBatterySavingStats = batterySavingStats; - // TODO(79580230): remove plugin code and maybe screen on/off listeners? - // Initialize plugins. - mPlugins = new Plugin[0]; PowerManager.invalidatePowerSaveModeCaches(); } @@ -300,12 +284,6 @@ public class BatterySaverController implements BatterySaverPolicyListener { msg.arg1 == ARG_SEND_BROADCAST, msg.arg2); break; - - case MSG_SYSTEM_READY: - for (Plugin p : mPlugins) { - p.onSystemReady(BatterySaverController.this); - } - break; } } } @@ -479,10 +457,6 @@ public class BatterySaverController implements BatterySaverPolicyListener { mFileUpdater.writeFiles(fileValues); } - for (Plugin p : mPlugins) { - p.onBatterySaverChanged(this); - } - if (sendBroadcast) { if (DEBUG) {