QS: Don't set flashlight state when we don't have an id am: ad32c550c0 (0490a848) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3405,6 +3405,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		if (KeyguardUpdateMonitor.getInstance(mContext) != null) {
		KeyguardUpdateMonitor.getInstance(mContext).dump(fd, pw, args);
		}
		if (mFlashlightController != null) {
		mFlashlightController.dump(fd, pw, args);
		}

		FalsingManager.getInstance(mContext).dump(pw);
		FalsingLog.dump(pw);

+14 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.os.Process;
		import android.text.TextUtils;
		import android.util.Log;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.util.ArrayList;

		@@ -80,6 +82,7 @@ public class FlashlightController {
		public void setFlashlight(boolean enabled) {
		boolean pendingError = false;
		synchronized (this) {
		if (mCameraId == null) return;
		if (mFlashlightEnabled != enabled) {
		mFlashlightEnabled = enabled;
		try {
		@@ -235,6 +238,17 @@ public class FlashlightController {
		}
		};

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("FlashlightController state:");

		pw.print(" mCameraId=");
		pw.println(mCameraId);
		pw.print(" mFlashlightEnabled=");
		pw.println(mFlashlightEnabled);
		pw.print(" mTorchAvailable=");
		pw.println(mTorchAvailable);
		}

		public interface FlashlightListener {

		/**