From 3cb2004b2897129c67181316b7c9f62607858618 Mon Sep 17 00:00:00 2001 From: Erin Dahlgren Date: Tue, 15 Oct 2013 09:50:54 -0700 Subject: Do not show any bottom controls in secure camera to prevent launching out of app behavior. Bug: 11235651 Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074 --- src/com/android/camera/ui/FilmStripView.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/com/android/camera/ui/FilmStripView.java') diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index d17567d52..a8eaf91ad 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1066,6 +1066,13 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { * has been checked for button visibilities */ private void updateBottomControls(boolean force) { + if (mActivity.isSecureCamera()) { + // We cannot show buttons in secure camera that send out of app intents, + // because another app with the same name can parade as the intented + // Activity. + return; + } + if (mBottomControls == null) { mBottomControls = (FilmstripBottomControls) ((View) getParent()) .findViewById(R.id.filmstrip_bottom_controls); @@ -1074,7 +1081,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } final int requestId = getCurrentId(); - if (requestId < 0) { return; } -- cgit v1.2.3