:Fix should show permission API back button behavior.

Pressing the back button in the request permission dialog
should be treated as a denial of the currently displayed
permission.

bug:22041240

Change-Id: I853d9ff5d3d10a29b2a5b1815de7de8b1c28cc6b

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index aa91b488..db5e530b 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -178,8 +178,7 @@ public class GrantPermissionsActivity extends Activity
 
         for (int i = 0; i < groupCount; i++) {
             GroupState groupState = mRequestGrantPermissionGroups.valueAt(i);
-            if (/*!groupState.mGroup.areRuntimePermissionsGranted()
-                    && */groupState.mState == GroupState.STATE_UNKNOWN) {
+            if (groupState.mState == GroupState.STATE_UNKNOWN) {
                 CharSequence appLabel = mAppPermissions.getAppLabel();
                 SpannableString message = new SpannableString(getString(
                         R.string.permission_warning_template, appLabel,
@@ -244,6 +243,11 @@ public class GrantPermissionsActivity extends Activity
     }
 
     @Override
+    public void onBackPressed() {
+        mViewHandler.onBackPressed();
+    }
+
+    @Override
     public void finish() {
         setResultIfNeeded(RESULT_CANCELED);
         super.finish();