Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc7de936 authored by Svet Ganov's avatar Svet Ganov Committed by Svetoslav Ganov
Browse files

Show permissions requiring a review as not granted. 

In a permission review mode legacy apps that use runtime permission
should go through a review UI for the user to manage their permissions
on a first launch. Until reviewed a permission should be shown as
not-granted in the UI as opposed to granted regardless that internally
it is granted with a review flag set. This UX matches the user
expectation that the permission is not approved by them yet. If such
a permission is granted in the management UI, then it no longer needs
to be reviewed.

Test: manual

bug:63721140

Change-Id: I167ac920536ef0b40909e925bb9bb9a7382c03aa
parent 0045f3d1

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+8 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
                    return true;

                }

            } else if (permission.isGranted() && (permission.getAppOp() == null

                    || permission.isAppOpAllowed())) {

                    || permission.isAppOpAllowed()) && !permission.isReviewRequired()) {

                return true;

            }

        }
@@ -409,6 +409,13 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
                    }

                }



                // Granting a permission explicitly means the user already

                // reviewed it so clear the review flag on every grant.

                if (permission.isReviewRequired()) {

                    permission.resetReviewRequired();

                    mask |= PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;

                }



                if (mask != 0) {

                    mPackageManager.updatePermissionFlags(permission.getName(),

                            mPackageInfo.packageName, mask, 0, mUserHandle);

src/com/android/packageinstaller/permission/ui/ReviewPermissionsActivity.java

+1 −346
Original line number Diff line number Diff line
@@ -18,42 +18,18 @@ package com.android.packageinstaller.permission.ui; 


import android.app.Activity;



import android.app.DialogFragment;

import android.app.Fragment;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.RemoteCallback;

import android.preference.Preference;

import android.preference.PreferenceCategory;

import android.preference.PreferenceFragment;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.preference.TwoStatePreference;

import android.text.Html;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.TextUtils;

import android.text.style.ForegroundColorSpan;

import android.util.TypedValue;

import android.view.View;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;

import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.R;

import com.android.packageinstaller.permission.model.AppPermissionGroup;

import com.android.packageinstaller.permission.model.AppPermissions;

import com.android.packageinstaller.permission.utils.Utils;

import com.android.packageinstaller.permission.ui.handheld.ReviewPermissionsFragment;

import com.android.packageinstaller.permission.ui.ConfirmActionDialogFragment.OnActionConfirmedListener;

import com.android.packageinstaller.permission.ui.wear.ReviewPermissionsWearFragment;



import java.util.List;



public final class ReviewPermissionsActivity extends Activity

        implements OnActionConfirmedListener {
@@ -100,325 +76,4 @@ public final class ReviewPermissionsActivity extends Activity 
            return null;

        }

    }



    public static final class ReviewPermissionsFragment extends PreferenceFragment

            implements View.OnClickListener, Preference.OnPreferenceChangeListener,

            ConfirmActionDialogFragment.OnActionConfirmedListener {

        public static final String EXTRA_PACKAGE_INFO =

                "com.android.packageinstaller.permission.ui.extra.PACKAGE_INFO";



        private AppPermissions mAppPermissions;



        private Button mContinueButton;

        private Button mCancelButton;

        private Button mMoreInfoButton;



        private PreferenceCategory mNewPermissionsCategory;



        private boolean mHasConfirmedRevoke;



        public static ReviewPermissionsFragment newInstance(PackageInfo packageInfo) {

            Bundle arguments = new Bundle();

            arguments.putParcelable(ReviewPermissionsFragment.EXTRA_PACKAGE_INFO, packageInfo);

            ReviewPermissionsFragment instance = new ReviewPermissionsFragment();

            instance.setArguments(arguments);

            instance.setRetainInstance(true);

            return instance;

        }



        @Override

        public void onCreate(Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);



            Activity activity = getActivity();

            if (activity == null) {

                return;

            }



            PackageInfo packageInfo = getArguments().getParcelable(EXTRA_PACKAGE_INFO);

            if (packageInfo == null) {

                activity.finish();

                return;

            }



            mAppPermissions = new AppPermissions(activity, packageInfo, null, false,

                    new Runnable() {

                        @Override

                        public void run() {

                            getActivity().finish();

                        }

                    });



            if (mAppPermissions.getPermissionGroups().isEmpty()) {

                activity.finish();

                return;

            }



            boolean reviewRequired = false;

            for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {

                if (group.isReviewRequired()) {

                    reviewRequired = true;

                    break;

                }

            }



            if (!reviewRequired) {

                activity.finish();

            }

        }



        @Override

        public void onViewCreated(View view, Bundle savedInstanceState) {

            super.onViewCreated(view, savedInstanceState);

            bindUi();

        }



        @Override

        public void onResume() {

            super.onResume();

            mAppPermissions.refresh();

            loadPreferences();

        }



        @Override

        public void onClick(View view) {

            Activity activity = getActivity();

            if (activity == null) {

                return;

            }

            if (view == mContinueButton) {

                confirmPermissionsReview();

                executeCallback(true);

            } else if (view == mCancelButton) {

                executeCallback(false);

                activity.setResult(Activity.RESULT_CANCELED);

            } else if (view == mMoreInfoButton) {

                Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);

                intent.putExtra(Intent.EXTRA_PACKAGE_NAME,

                        mAppPermissions.getPackageInfo().packageName);

                intent.putExtra(ManagePermissionsActivity.EXTRA_ALL_PERMISSIONS, true);

                getActivity().startActivity(intent);

            }

            activity.finish();

        }



        @Override

        public boolean onPreferenceChange(Preference preference, Object newValue) {

            if (mHasConfirmedRevoke) {

                return true;

            }

            if (preference instanceof SwitchPreference) {

                SwitchPreference switchPreference = (SwitchPreference) preference;

                if (switchPreference.isChecked()) {

                    showWarnRevokeDialog(switchPreference.getKey());

                } else {

                    return true;

                }

            }

            return false;

        }



        @Override

        public void onActionConfirmed(String action) {

            Preference preference = getPreferenceManager().findPreference(action);

            if (preference instanceof SwitchPreference) {

                SwitchPreference switchPreference = (SwitchPreference) preference;

                switchPreference.setChecked(false);

                mHasConfirmedRevoke = true;

            }

        }



        private void showWarnRevokeDialog(final String groupName) {

            DialogFragment fragment = ConfirmActionDialogFragment.newInstance(

                    getString(R.string.old_sdk_deny_warning), groupName);

            fragment.show(getFragmentManager(), fragment.getClass().getName());

        }



        private void confirmPermissionsReview() {

            PreferenceGroup preferenceGroup = mNewPermissionsCategory != null

                ? mNewPermissionsCategory : getPreferenceScreen();



            final int preferenceCount = preferenceGroup.getPreferenceCount();

            for (int i = 0; i < preferenceCount; i++) {

                Preference preference = preferenceGroup.getPreference(i);

                if (preference instanceof TwoStatePreference) {

                    TwoStatePreference twoStatePreference = (TwoStatePreference) preference;

                    String groupName = preference.getKey();

                    AppPermissionGroup group = mAppPermissions.getPermissionGroup(groupName);

                    if (twoStatePreference.isChecked()) {

                        group.grantRuntimePermissions(false);

                    } else {

                        group.revokeRuntimePermissions(false);

                    }

                    group.resetReviewRequired();

                }

            }

        }



        private void bindUi() {

            Activity activity = getActivity();

            if (activity == null) {

                return;

            }



            // Set icon

            Drawable icon = mAppPermissions.getPackageInfo().applicationInfo.loadIcon(

                    activity.getPackageManager());

            ImageView iconView = (ImageView) activity.findViewById(R.id.app_icon);

            iconView.setImageDrawable(icon);



            // Set message

            final int labelTemplateResId = isPackageUpdated()

                    ?  R.string.permission_review_title_template_update

                    :  R.string.permission_review_title_template_install;

            Spanned message = Html.fromHtml(getString(labelTemplateResId,

                    mAppPermissions.getAppLabel()), 0);



            // Set the permission message as the title so it can be announced.

            activity.setTitle(message.toString());



            // Color the app name.

            TextView permissionsMessageView = (TextView) activity.findViewById(

                    R.id.permissions_message);

            permissionsMessageView.setText(message);



            mContinueButton = (Button) getActivity().findViewById(R.id.continue_button);

            mContinueButton.setOnClickListener(this);



            mCancelButton = (Button) getActivity().findViewById(R.id.cancel_button);

            mCancelButton.setOnClickListener(this);



            mMoreInfoButton = (Button)  getActivity().findViewById(

                    R.id.permission_more_info_button);

            mMoreInfoButton.setOnClickListener(this);

        }



        private void loadPreferences() {

            Activity activity = getActivity();

            if (activity == null) {

                return;

            }



            PreferenceScreen screen = getPreferenceScreen();

            if (screen == null) {

                screen = getPreferenceManager().createPreferenceScreen(getActivity());

                setPreferenceScreen(screen);

            } else {

                screen.removeAll();

            }



            PreferenceGroup currentPermissionsCategory = null;

            PreferenceGroup oldNewPermissionsCategory = mNewPermissionsCategory;

            mNewPermissionsCategory = null;



            final boolean isPackageUpdated = isPackageUpdated();



            for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {

                if (!Utils.shouldShowPermission(group, mAppPermissions.getPackageInfo().packageName)

                        || !Utils.OS_PKG.equals(group.getDeclaringPackage())) {

                    continue;

                }



                // TODO: Sort permissions - platform first then third-party ones



                final SwitchPreference preference;

                Preference cachedPreference = oldNewPermissionsCategory != null

                        ? oldNewPermissionsCategory.findPreference(group.getName()) : null;

                if (cachedPreference instanceof SwitchPreference) {

                    preference = (SwitchPreference) cachedPreference;

                } else {

                    preference = new SwitchPreference(getActivity());



                    preference.setKey(group.getName());

                    Drawable icon = Utils.loadDrawable(activity.getPackageManager(),

                            group.getIconPkg(), group.getIconResId());

                    preference.setIcon(Utils.applyTint(getContext(), icon,

                            android.R.attr.colorControlNormal));

                    preference.setTitle(group.getLabel());

                    preference.setSummary(group.getDescription());

                    preference.setPersistent(false);



                    preference.setOnPreferenceChangeListener(this);

                }



                preference.setChecked(group.areRuntimePermissionsGranted());



                // Mutable state

                if (group.isPolicyFixed()) {

                    preference.setEnabled(false);

                    preference.setSummary(getString(

                            R.string.permission_summary_enforced_by_policy));

                } else {

                    preference.setEnabled(true);

                }



                if (group.isReviewRequired()) {

                    if (!isPackageUpdated) {

                        screen.addPreference(preference);

                    } else {

                        if (mNewPermissionsCategory == null) {

                            mNewPermissionsCategory = new PreferenceCategory(activity);

                            mNewPermissionsCategory.setTitle(R.string.new_permissions_category);

                            mNewPermissionsCategory.setOrder(1);

                            screen.addPreference(mNewPermissionsCategory);

                        }

                        mNewPermissionsCategory.addPreference(preference);

                    }

                } else {

                    if (currentPermissionsCategory == null) {

                        currentPermissionsCategory = new PreferenceCategory(activity);

                        currentPermissionsCategory.setTitle(R.string.current_permissions_category);

                        currentPermissionsCategory.setOrder(2);

                        screen.addPreference(currentPermissionsCategory);

                    }

                    currentPermissionsCategory.addPreference(preference);

                }

            }

        }



        private boolean isPackageUpdated() {

            List<AppPermissionGroup> groups = mAppPermissions.getPermissionGroups();

            final int groupCount = groups.size();

            for (int i = 0; i < groupCount; i++) {

                AppPermissionGroup group = groups.get(i);

                if (!group.isReviewRequired()) {

                    return true;

                }

            }

            return false;

        }



        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) {

                    try {

                        int flagMask = 0;

                        int flagValues = 0;

                        if (activity.getIntent().getBooleanExtra(

                                Intent.EXTRA_RESULT_NEEDED, false)) {

                            flagMask = Intent.FLAG_ACTIVITY_FORWARD_RESULT;

                            flagValues = Intent.FLAG_ACTIVITY_FORWARD_RESULT;

                        }

                        activity.startIntentSenderForResult(intent, -1, null,

                                flagMask, flagValues, 0);

                    } catch (IntentSender.SendIntentException e) {

                        /* ignore */

                    }

                    return;

                }

            }

            RemoteCallback callback = activity.getIntent().getParcelableExtra(

                    Intent.EXTRA_REMOTE_CALLBACK);

            if (callback != null) {

                Bundle result = new Bundle();

                result.putBoolean(Intent.EXTRA_RETURN_RESULT, success);

                callback.sendResult(result);

            }

        }

    }

}

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
        for (int i = 0; i < permissionCount; i++) {

            Permission permission = permissions.get(i);

            if (group.doesSupportRuntimePermissions()

                    ? !permission.isGranted() : !permission.isAppOpAllowed()) {

                    ? !permission.isGranted() : (!permission.isAppOpAllowed()

                            || permission.isReviewRequired())) {

                revokedCount++;

            }

        }

src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.packageinstaller.permission.ui.handheld; 


import android.content.Context;

import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.util.AttributeSet;

import android.view.View;

import android.widget.TextView;

src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java

0 → 100644
+381 −0

File added.

Preview size limit exceeded, changes collapsed.