summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-04 00:11:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-04 00:11:38 -0800
commitd5bb29f7b1f4107f0128ae5949dad2093e264564 (patch)
tree1c0282556ab038255925b929d725a5a970add0d8
parent7036b13af72d8bc62e416250f90f6c3d0f17d02a (diff)
parent1be248ea70c7d5ef63e34e82cc887b9e2366df6f (diff)
downloadandroid_packages_apps_Snap-d5bb29f7b1f4107f0128ae5949dad2093e264564.tar.gz
android_packages_apps_Snap-d5bb29f7b1f4107f0128ae5949dad2093e264564.tar.bz2
android_packages_apps_Snap-d5bb29f7b1f4107f0128ae5949dad2093e264564.zip
Merge "SnapdragonCamera: Fix app couldn't open Camera when Flashlight is on"
-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);
}