Suppress 'help feedback' message pre-L in secure camera

Becase we see issues when starting activities above lockscreen
from filmstrip menu in K, disable unless we are on L.

Bug: 17767821
Change-Id: Ic59defd3fef5e283b356e94a952a2b75f4e9f1d6

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index ec65cd2..f606137 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1985,6 +1985,17 @@ public class CameraActivity extends Activity
         return super.onCreateOptionsMenu(menu);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (isSecureCamera() && !ApiHelper.isLOrHigher()) {
+            // Compatibility pre-L: launching new activities right above
+            // lockscreen does not reliably work, only show help if not secure
+            menu.removeItem(R.id.action_help_and_feedback);
+        }
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     protected long getStorageSpaceBytes() {
         synchronized (mStorageSpaceLock) {
             return mStorageSpaceBytes;