Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

Browse Source 
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
This commit is contained in:
Zach Riggle
2015-03-19 23:15:02 +00:00
committed by Android Git Automerger
parent 3bc84b18b7 6a5b2110eb
commit a6e7a9b50d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
View File

@@ -308,7 +308,11 @@ public class FlashlightController {
new CameraCaptureSession.StateListener() { new CameraCaptureSession.StateListener() {
@Override @Override
public void onConfigured(CameraCaptureSession session) { public void onConfigured(CameraCaptureSession session) {
if (session.getDevice() == mCameraDevice) {
mSession = session; mSession = session;
} else {
session.close();
}
postUpdateFlashlight(); postUpdateFlashlight();
} }