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

Commit 8680ce47 authored by Joel Galenson's avatar Joel Galenson
Browse files

Do not show usage information for custom permissions. 

Test: View these three screens for custom permissions.
Change-Id: Ie3c55860beec1655a05dcd294c60eec718a0d18b
parent b27c7ed3

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

+18 −14
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ public class AppPermissionFragment extends SettingsWithButtonHeader { 
        ((TextView) root.requireViewById(R.id.permission_message)).setText(

                context.getString(R.string.app_permission_header, mGroup.getLabel(), appLabel));



        if (Utils.isModernPermissionGroup(mGroup.getName())) {

            String timeDiffStr = Utils.getRelativeLastUsageString(context,

                    PermissionUsages.loadLastGroupUsage(context, mGroup));

            if (timeDiffStr == null) {
@@ -200,6 +201,9 @@ public class AppPermissionFragment extends SettingsWithButtonHeader { 
                                mGroup.getLabel().toString().toLowerCase(),

                                timeDiffStr));

            }

        } else {

            root.requireViewById(R.id.usage_summary).setVisibility(View.GONE);

        }



        root.requireViewById(R.id.usage_link).setOnClickListener((v) -> {

            Intent intent = new Intent(Intent.ACTION_REVIEW_APP_PERMISSION_USAGE);

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

+15 −11
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ public final class AppPermissionsFragment extends SettingsWithButtonHeader { 
            preference.setIcon(Utils.applyTint(context, icon,

                    android.R.attr.colorControlNormal));

            preference.setTitle(group.getFullLabel());

            if (Utils.isModernPermissionGroup(group.getName())) {

                String lastAccessStr = Utils.getAbsoluteLastUsageString(context,

                        PermissionUsages.loadLastGroupUsage(context, group));

                // STOPSHIP: Ignore {READ,WRITE}_EXTERNAL_STORAGE since they're going away.
@@ -229,6 +230,9 @@ public final class AppPermissionsFragment extends SettingsWithButtonHeader { 
                                context.getString(R.string.app_permission_never_accessed_summary));

                    }

                }

            } else {

                preference.setGroupSummary(group);

            }



            if (isPlatform) {

                PreferenceCategory category =

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

+3 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple 


    private void setPreferenceSummary(AppPermissionGroup group, PermissionControlPreference pref,

            Context context) {

        if (!Utils.isModernPermissionGroup(group.getName())) {

            return;

        }

        String lastAccessStr = Utils.getAbsoluteLastUsageString(context,

                PermissionUsages.loadLastGroupUsage(context, group));

        // STOPSHIP: Ignore {READ,WRITE}_EXTERNAL_STORAGE since they're going away.