Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad

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;
         }