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

Commit 2dd55e11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a crash in AppPermissionUsageFragment."

parents dfab3edd d18b2612

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

+3 −1
Original line number Diff line number Diff line
@@ -27,15 +27,17 @@ import android.content.AsyncTaskLoader; 
import android.content.Context;

import android.content.Loader;

import android.os.Bundle;



import android.os.Process;

import android.util.ArrayMap;

import android.util.ArraySet;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.packageinstaller.permission.model.AppPermissionUsage.Builder;

import com.android.packageinstaller.permission.model.PermissionApps.PermissionApp;

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



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

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

+7 −5
Original line number Diff line number Diff line
@@ -101,11 +101,10 @@ public class AppPermissionUsageFragment extends SettingsWithButtonHeader { 
            return;

        }



        final long endTimeMillis = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(24);

        final long beginTimeMillis = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(24);

        mPermissionUsages = new PermissionUsages(getContext());

        mPermissionUsages.load(packageName, null, 0 /*filterBeginTimeMillis*/,

                endTimeMillis, PermissionUsages.USAGE_FLAG_LAST

                        | PermissionUsages.USAGE_FLAG_HISTORICAL,

        mPermissionUsages.load(packageName, null, beginTimeMillis, Long.MAX_VALUE,

                PermissionUsages.USAGE_FLAG_LAST | PermissionUsages.USAGE_FLAG_HISTORICAL,

                getActivity().getLoaderManager(),

                true, this::updateUi);

    }
@@ -157,7 +156,10 @@ public class AppPermissionUsageFragment extends SettingsWithButtonHeader { 


        // Add the permission usages.

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

        if (permissionUsages.isEmpty() || permissionUsages.size() > 1) {

        if (permissionUsages.isEmpty()) {

            return;

        }

        if (permissionUsages.size() > 1) {

            Log.e(LOG_TAG, "Expected one AppPermissionUsage but got: " + permissionUsages);

            getActivity().finish();

            return;