commit fd43edf1bb52a93eec2724b0fa328a7b6a509b4b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 27 00:10:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 27 00:10:40 2019 +0000
tree a568630008cc01d6dc8cc1f7e3ba88277d213719
parent 3f8aea60015c4a257b0bffc5625c6f371880deb9
parent 4066175cabdd25bab9b1dfb89aa53df3403848ff

Merge "Change the allow button for camera/microphone"

PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
index 58f0d92..8a00eee 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
@@ -38,6 +38,7 @@
 import static com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandler.GRANTED_ONE_TIME;
 import static com.android.permissioncontroller.permission.utils.Utils.getRequestMessage;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
@@ -736,6 +737,12 @@
                                 !isForegroundPermissionUserSet;
                         mButtonVisibilities[VISIBILITY_DENY_AND_DONT_ASK_AGAIN_BUTTON] =
                                 isForegroundPermissionUserSet;
+                        if (groupState.mGroup.getName().equals(Manifest.permission_group.CAMERA)
+                                || groupState.mGroup.getName().equals(
+                                        Manifest.permission_group.MICROPHONE)) {
+                            mButtonVisibilities[VISIBILITY_ALLOW_BUTTON] = false;
+                            mButtonVisibilities[VISIBILITY_ALLOW_FOREGROUND_BUTTON] = true;
+                        }
                     }
                 }