diff options
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 14 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java | 23 |
2 files changed, 5 insertions, 32 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 1e8f48c3..fdb77934 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -325,20 +325,6 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> return false; } - public boolean shouldRevokeOnUpgrade() { - if (mAppSupportsRuntimePermissions) { - return false; - } - final int permissionCount = mPermissions.size(); - for (int i = 0; i < permissionCount; i++) { - Permission permission = mPermissions.valueAt(i); - if ((permission.getFlags() & PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE) != 0) { - return true; - } - } - return false; - } - public boolean grantRuntimePermissions(boolean fixedByTheUser) { return grantRuntimePermissions(fixedByTheUser, null); } diff --git a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java index d7e44e7e..f31d618e 100644 --- a/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java @@ -240,9 +240,6 @@ public final class ReviewPermissionsActivity extends Activity private void bindUi() { Activity activity = getActivity(); - if (activity == null) { - return; - } // Set icon Drawable icon = mAppPermissions.getPackageInfo().applicationInfo.loadIcon( @@ -282,11 +279,6 @@ public final class ReviewPermissionsActivity extends Activity } private void loadPreferences() { - Activity activity = getActivity(); - if (activity == null) { - return; - } - PreferenceScreen screen = getPreferenceScreen(); if (screen == null) { screen = getPreferenceManager().createPreferenceScreen(getActivity()); @@ -319,17 +311,15 @@ public final class ReviewPermissionsActivity extends Activity // We update permission grants based on the final preference states if (group.isReviewRequired()) { - // If review is required use granted as default unless - // the user went to settings first and expressed that - // the permission should be revoked for this app. - preference.setChecked(!group.shouldRevokeOnUpgrade()); + // If review is required use granted as default + preference.setChecked(true); } else { // If review not required use the current grant state as default preference.setChecked(group.areRuntimePermissionsGranted()); } preference.setKey(group.getName()); - Drawable icon = Utils.loadDrawable(activity.getPackageManager(), + Drawable icon = Utils.loadDrawable(getActivity().getPackageManager(), group.getIconPkg(), group.getIconResId()); preference.setIcon(Utils.applyTint(getContext(), icon, android.R.attr.colorControlNormal)); @@ -354,7 +344,7 @@ public final class ReviewPermissionsActivity extends Activity screen.addPreference(preference); } else { if (mNewPermissionsCategory == null) { - mNewPermissionsCategory = new PreferenceCategory(activity); + mNewPermissionsCategory = new PreferenceCategory(getActivity()); mNewPermissionsCategory.setTitle(R.string.new_permissions_category); mNewPermissionsCategory.setOrder(1); screen.addPreference(mNewPermissionsCategory); @@ -363,7 +353,7 @@ public final class ReviewPermissionsActivity extends Activity } } else { if (currentPermissionsCategory == null) { - currentPermissionsCategory = new PreferenceCategory(activity); + currentPermissionsCategory = new PreferenceCategory(getActivity()); currentPermissionsCategory.setTitle(R.string.current_permissions_category); currentPermissionsCategory.setOrder(2); screen.addPreference(currentPermissionsCategory); @@ -387,9 +377,6 @@ public final class ReviewPermissionsActivity extends Activity private void executeCallback(boolean success) { Activity activity = getActivity(); - if (activity == null) { - return; - } if (success) { IntentSender intent = activity.getIntent().getParcelableExtra(Intent.EXTRA_INTENT); if (intent != null) { |