Merge "Remove Plugin mechanism." (30afb2d5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/batterysaver/BatterySaverController.java

+1 −27

Original line number	Original line	Diff line number	Diff line
	@@ -112,11 +112,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
	@GuardedBy("mLock")		@GuardedBy("mLock")
	private boolean mIsInteractive;		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		* 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		* {@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() {		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
	@Override		@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	@@ -194,6 +180,7 @@ public class BatterySaverController implements BatterySaverPolicyListener {
	updateBatterySavingStats();		updateBatterySavingStats();
	return; // No need to send it if not enabled.		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.		// Don't send the broadcast, because we never did so in this case.
	mHandler.postStateChanged(/sendBroadcast=/ false,		mHandler.postStateChanged(/sendBroadcast=/ false,
	REASON_INTERACTIVE_CHANGED);		REASON_INTERACTIVE_CHANGED);
	@@ -224,9 +211,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
	mFileUpdater = new FileUpdater(context);		mFileUpdater = new FileUpdater(context);
	mBatterySavingStats = batterySavingStats;		mBatterySavingStats = batterySavingStats;

	// TODO(79580230): remove plugin code and maybe screen on/off listeners?
	// Initialize plugins.
	mPlugins = new Plugin[0];
	PowerManager.invalidatePowerSaveModeCaches();		PowerManager.invalidatePowerSaveModeCaches();
	}		}

	@@ -300,12 +284,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
	msg.arg1 == ARG_SEND_BROADCAST,		msg.arg1 == ARG_SEND_BROADCAST,
	msg.arg2);		msg.arg2);
	break;		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);		mFileUpdater.writeFiles(fileValues);
	}		}

	for (Plugin p : mPlugins) {
	p.onBatterySaverChanged(this);
	}

	if (sendBroadcast) {		if (sendBroadcast) {

	if (DEBUG) {		if (DEBUG) {