Finish the secure camera activity when user try to play a video.
bug:11190995
Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index ea62d2c..f442f22 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -857,11 +857,19 @@
public static void playVideo(Activity activity, Uri uri, String title) {
try {
- Intent intent = new Intent(Intent.ACTION_VIEW)
- .setDataAndType(uri, "video/*")
- .putExtra(Intent.EXTRA_TITLE, title)
- .putExtra(KEY_TREAT_UP_AS_BACK, true);
- activity.startActivityForResult(intent, CameraActivity.REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+ boolean isSecureCamera = ((CameraActivity)activity).isSecureCamera();
+ if (!isSecureCamera) {
+ Intent intent = new Intent(Intent.ACTION_VIEW)
+ .setDataAndType(uri, "video/*")
+ .putExtra(Intent.EXTRA_TITLE, title)
+ .putExtra(KEY_TREAT_UP_AS_BACK, true);
+ activity.startActivityForResult(intent, CameraActivity.REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+ } else {
+ // In order not to send out any intent to be intercepted and
+ // show the lock screen immediately, we just let the secure
+ // camera activity finish.
+ activity.finish();
+ }
} catch (ActivityNotFoundException e) {
Toast.makeText(activity, activity.getString(R.string.video_err),
Toast.LENGTH_SHORT).show();