Merge "Help prevent OOM while running SystemUI tests on cuttlefish." (635c8934) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,16 +52,17 @@ public class FalsingManagerProxy implements FalsingManager {

	private FalsingManager mInternalFalsingManager;		private FalsingManager mInternalFalsingManager;
	private final Handler mMainHandler;		private final Handler mMainHandler;
			private boolean mBrightlineEnabled;

	@Inject		@Inject
	FalsingManagerProxy(Context context, PluginManager pluginManager,		FalsingManagerProxy(Context context, PluginManager pluginManager,
	@Named(MAIN_HANDLER_NAME) Handler handler) {		@Named(MAIN_HANDLER_NAME) Handler handler) {
	mMainHandler = handler;		mMainHandler = handler;
			setupFalsingManager(context);
	DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,		DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,
	command -> mMainHandler.post(command),		command -> mMainHandler.post(command),
	properties -> onDeviceConfigPropertiesChanged(context, properties.getNamespace())		properties -> onDeviceConfigPropertiesChanged(context, properties.getNamespace())
	);		);
	setupFalsingManager(context);
	final PluginListener<FalsingPlugin> mPluginListener = new PluginListener<FalsingPlugin>() {		final PluginListener<FalsingPlugin> mPluginListener = new PluginListener<FalsingPlugin>() {
	public void onPluginConnected(FalsingPlugin plugin, Context context) {		public void onPluginConnected(FalsingPlugin plugin, Context context) {
	FalsingManager pluginFalsingManager = plugin.getFalsingManager(context);		FalsingManager pluginFalsingManager = plugin.getFalsingManager(context);
	@@ -94,6 +95,10 @@ public class FalsingManagerProxy implements FalsingManager {
	public void setupFalsingManager(Context context) {		public void setupFalsingManager(Context context) {
	boolean brightlineEnabled = DeviceConfig.getBoolean(		boolean brightlineEnabled = DeviceConfig.getBoolean(
	DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);		DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);
			if (brightlineEnabled == mBrightlineEnabled && mInternalFalsingManager != null) {
			return;
			}
			mBrightlineEnabled = brightlineEnabled;

	if (mInternalFalsingManager != null) {		if (mInternalFalsingManager != null) {
	mInternalFalsingManager.cleanup();		mInternalFalsingManager.cleanup();