summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-12-23 17:02:18 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-03 20:51:10 -0800
commit1be248ea70c7d5ef63e34e82cc887b9e2366df6f (patch)
treea6493f4f658b6873b7552aa2e3e9377f9a018f22
parentf4b7f4496af70a54fb220b80267edf0e3d9db5b3 (diff)
downloadandroid_packages_apps_Snap-1be248ea70c7d5ef63e34e82cc887b9e2366df6f.tar.gz
android_packages_apps_Snap-1be248ea70c7d5ef63e34e82cc887b9e2366df6f.tar.bz2
android_packages_apps_Snap-1be248ea70c7d5ef63e34e82cc887b9e2366df6f.zip
SnapdragonCamera: Fix app couldn't open Camera when Flashlight is on
Camera couldn't be open when Flashlight is on because CameraDevice has been used. Receive the led flashlight intent and close flashlight. CRs-Fixed: 769624 Change-Id: Ib5be47cc93b55bb06637f15309b7d4bea694e58f
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b85a7de06..8fd8f9daa 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1433,8 +1433,8 @@ public class CameraActivity extends Activity
//This is a temporal solution to share LED resource
//as Android doesn’t have any default intent to share the state.
// if the led flash light is open, turn it off
- Log.d(TAG, "send the turn off LED Flashlight the broadcast");
- Intent intent = new Intent("qualcomm.android.LEDFlashlight.appWidgetUpdate");
+ Log.d(TAG, "send the turn off Flashlight broadcast");
+ Intent intent = new Intent("org.codeaurora.snapcam.action.CLOSE_FLASHLIGHT");
intent.putExtra("camera_led", true);
sendBroadcast(intent);
}