diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-15 19:35:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-15 19:35:10 +0000 |
commit | 177c4b05ed8e9f71afc526e5cad339f245563450 (patch) | |
tree | b00d7c3f5062eb67795c1e1848bead61c92d4704 /src/com/android/camera/ui/FilmStripView.java | |
parent | 487200db7f4d73e85ae568221d268b46fad19726 (diff) | |
parent | 3cb2004b2897129c67181316b7c9f62607858618 (diff) | |
download | android_packages_apps_Snap-177c4b05ed8e9f71afc526e5cad339f245563450.tar.gz android_packages_apps_Snap-177c4b05ed8e9f71afc526e5cad339f245563450.tar.bz2 android_packages_apps_Snap-177c4b05ed8e9f71afc526e5cad339f245563450.zip |
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/ui/FilmStripView.java')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index ea0120706..074f80b8a 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1074,6 +1074,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); @@ -1082,7 +1089,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } final int requestId = getCurrentId(); - if (requestId < 0) { return; } |