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

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

Correctly handle empty usages. 

When PermissionUsages finds no usages (which happens at least for
custom permissions), it does not call its callback, which causes UI
screens to be waiting forever.  This ensures it calls back and has
AppPermissionUsage stop showing its loading bar.

Test: View AppPermissionUsage with a custom permission.
Test: Click around Permissions Hub a lot.
Change-Id: I19e2c914b7f54c9ff11d6edd04f5ed98f3cde58f
parent 8680ce47

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

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

    public void onLoadFinished(@NonNull Loader<List<AppPermissionUsage>> loader,

            List<AppPermissionUsage> usages) {

        if (mUsages.equals(usages)) {

            return;

        }

        mUsages.clear();

        mUsages.addAll(usages);

        if (mCallback != null) {

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

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ public class AppPermissionUsageFragment extends SettingsWithButtonHeader impleme 
        // Add the permission usages.

        final List<AppPermissionUsage> permissionUsages = mPermissionUsages.getUsages();

        if (permissionUsages.isEmpty()) {

            setLoading(false, true);

            return;

        }

        if (permissionUsages.size() > 1) {