summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/policy
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-09-05 20:43:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 20:43:52 +0000
commit71aa8ab5d78de8292be4af49e5930fe37b7525ef (patch)
tree0aa85b7765b5f7d2b2200beaa75964db71371001 /packages/SystemUI/src/com/android/systemui/statusbar/policy
parentf2f3bde62fd9738e1a5b7bd250aec3569cbb14c1 (diff)
parentfd887436bd111e4d2c7307578a51b5070025b7f2 (diff)
downloadframeworks_base-71aa8ab5d78de8292be4af49e5930fe37b7525ef.zip
frameworks_base-71aa8ab5d78de8292be4af49e5930fe37b7525ef.tar.gz
frameworks_base-71aa8ab5d78de8292be4af49e5930fe37b7525ef.tar.bz2
Merge "Camera2: Final API revisions" into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/policy')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
index 70eaa5c..6f021ac 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
@@ -81,7 +81,7 @@ public class FlashlightController {
if (mCameraId != null) {
ensureHandler();
- mCameraManager.addAvailabilityListener(mAvailabilityListener, mHandler);
+ mCameraManager.registerAvailabilityCallback(mAvailabilityCallback, mHandler);
}
}
@@ -339,8 +339,8 @@ public class FlashlightController {
}
};
- private final CameraManager.AvailabilityListener mAvailabilityListener =
- new CameraManager.AvailabilityListener() {
+ private final CameraManager.AvailabilityCallback mAvailabilityCallback =
+ new CameraManager.AvailabilityCallback() {
@Override
public void onCameraAvailable(String cameraId) {
if (DEBUG) Log.d(TAG, "onCameraAvailable(" + cameraId + ")");