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

Commit d6f5fccc authored by Joel Galenson's avatar Joel Galenson
Browse files

Check a flag to see whether or not to disable the Permissions Hub. 

Bug: 122615235
Test: Manually set/unset flag, see/don't see Permissions Hub screens.
Change-Id: I8ea62228c48dbb59ab4b384947b358f76e04bfca
parent 0950ecf4

res/layout/app_permission.xml

+9 −8
Original line number Diff line number Diff line
@@ -119,15 +119,8 @@ 


            </LinearLayout>



            <View

                android:id="@+id/divider"

                android:layout_width="match_parent"

                android:layout_height=".75dp"

                android:layout_marginTop="@dimen/app_permission_divider_margin_top"

                android:layout_marginBottom="@dimen/app_permission_divider_margin_bottom"

                android:background="?android:attr/dividerHorizontal"/>



            <LinearLayout

                android:id="@+id/footer_all"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"
@@ -136,6 +129,14 @@ 
                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                android:background="?android:attr/selectableItemBackground">



                <View

                    android:id="@+id/divider"

                    android:layout_width="match_parent"

                    android:layout_height=".75dp"

                    android:layout_marginTop="@dimen/app_permission_divider_margin_top"

                    android:layout_marginBottom="@dimen/app_permission_divider_margin_bottom"

                    android:background="?android:attr/dividerHorizontal"/>



                <TextView

                    android:id="@+id/usage_summary"

                    android:layout_width="wrap_content"

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

+7 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ public final class PermissionUsages implements LoaderCallbacks<List<AppPermissio 


    public static @Nullable AppPermissionUsage.GroupUsage loadLastGroupUsage(

            @NonNull Context context, @NonNull AppPermissionGroup group) {

        if (!Utils.isPermissionsHubEnabled()) {

            return null;

        }

        final ArraySet<String> opNames = new ArraySet<>();

        final List<Permission> permissions = group.getPermissions();

        final int permCount = permissions.size();
@@ -185,6 +188,10 @@ public final class PermissionUsages implements LoaderCallbacks<List<AppPermissio 
            final List<PermissionGroup> groups = PermissionGroups.getPermissionGroups(

                    getContext(), this::isLoadInBackgroundCanceled, mGetUiInfo,

                    mFilterPermissionGroup, mFilterPackageName);

            if (!Utils.isPermissionsHubEnabled()) {

                return Collections.emptyList();

            }



            if (groups.isEmpty()) {

                return Collections.emptyList();

            }

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

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
                verifyIntent(this, getIntent());

                // fall through

            case Intent.ACTION_REVIEW_PERMISSION_USAGE: {

                if (!Utils.isPermissionsHubEnabled()) {

                    return;

                }



                permissionName = getIntent().getStringExtra(Intent.EXTRA_PERMISSION_NAME);

                String groupName = getIntent().getStringExtra(Intent.EXTRA_PERMISSION_GROUP_NAME);

                long numMillis = getIntent().getLongExtra(Intent.EXTRA_DURATION_MILLIS,
@@ -143,6 +147,10 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
            } break;



            case Intent.ACTION_REVIEW_APP_PERMISSION_USAGE: {

                if (!Utils.isPermissionsHubEnabled()) {

                    return;

                }



                String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);

                if (packageName == null) {

                    Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PACKAGE_NAME");

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

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ public class AppPermissionFragment extends SettingsWithButtonHeader { 


        mNestedScrollView = root.requireViewById(R.id.nested_scroll_view);



        if (!Utils.isPermissionsHubEnabled()) {

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

        }



        updateButtons();

        updateJustification(context, root, appLabel);

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

+4 −0
Original line number Diff line number Diff line
@@ -198,6 +198,10 @@ public class AppPermissionUsageFragment extends SettingsWithButtonHeader impleme 
    }



    private void updateUi() {

        if (!Utils.isPermissionsHubEnabled()) {

            setLoading(false, true);

            return;

        }

        Context context = getPreferenceManager().getContext();

        if (context == null) {

            return;