Merge "Fixes for FlashlightTile lifecycle" (2d752640) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -47,13 +47,11 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements
		public FlashlightTile(Host host) {
		super(host);
		mFlashlightController = host.getFlashlightController();
		mFlashlightController.addCallback(this);
		}

		@Override
		protected void handleDestroy() {
		super.handleDestroy();
		mFlashlightController.removeCallback(this);
		}

		@Override
		@@ -63,6 +61,11 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements

		@Override
		public void setListening(boolean listening) {
		if (listening) {
		mFlashlightController.addCallback(this);
		} else {
		mFlashlightController.removeCallback(this);
		}
		}

		@Override

+2 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ public class FlashlightControllerImpl implements FlashlightController {
		}
		cleanUpListenersLocked(l);
		mListeners.add(new WeakReference<>(l));
		l.onFlashlightAvailabilityChanged(mTorchAvailable);
		l.onFlashlightChanged(mFlashlightEnabled);
		}
		}