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

Commit d04fa659 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5764972 from 8465ba73 to qt-c2f2-release 

Change-Id: Iea1ce114b9d958dabc76c4f20f0f2eb1c85e423b
parents 2534ef6c 8465ba73

src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java

+8 −10
Original line number Diff line number Diff line
@@ -67,9 +67,8 @@ import java.util.function.IntConsumer; 
/**

 * Calls from the system into the permission controller.

 *

 * All methods are called async beside the backup related method. For these we force to use the

 * async-task single thread executor so that multiple parallel backups don't override the delayed

 * the backup state racily.

 * All reading methods are called async, and all writing method are called on the AsyncTask single

 * thread executor so that multiple writes won't override each other concurrently.

 */

public final class PermissionControllerServiceImpl extends PermissionControllerService {

    private static final String LOG_TAG = PermissionControllerServiceImpl.class.getSimpleName();
@@ -210,8 +209,8 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 
    public void onRevokeRuntimePermissions(@NonNull Map<String, List<String>> request,

            boolean doDryRun, int reason, @NonNull String callerPackageName,

            @NonNull Consumer<Map<String, List<String>>> callback) {

        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> callback.accept(

                onRevokeRuntimePermissions(request, doDryRun, reason, callerPackageName)));

        AsyncTask.execute(() -> callback.accept(onRevokeRuntimePermissions(request, doDryRun,

                reason, callerPackageName)));

    }



    private @NonNull Map<String, List<String>> onRevokeRuntimePermissions(
@@ -403,7 +402,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 
    @Override

    public void onRevokeRuntimePermission(@NonNull String packageName,

            @NonNull String permissionName, @NonNull Runnable callback) {

        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {

        AsyncTask.execute(() -> {

            onRevokeRuntimePermission(packageName, permissionName);

            callback.run();

        });
@@ -503,9 +502,8 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 
    public void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String callerPackageName,

            @NonNull String packageName, @NonNull String unexpandedPermission, int grantState,

            @NonNull Consumer<Boolean> callback) {

        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> callback.accept(

                onSetRuntimePermissionGrantStateByDeviceAdmin(callerPackageName, packageName,

                        unexpandedPermission, grantState)));

        AsyncTask.execute(() -> callback.accept(onSetRuntimePermissionGrantStateByDeviceAdmin(

                callerPackageName, packageName, unexpandedPermission, grantState)));

    }



    private boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String callerPackageName,
@@ -568,7 +566,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 


    @Override

    public void onGrantOrUpgradeDefaultRuntimePermissions(@NonNull Runnable callback) {

        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {

        AsyncTask.execute(() -> {

            onGrantOrUpgradeDefaultRuntimePermissions();

            callback.run();

        });

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

+5 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat 
            // If the system called for a review but no groups are found, this means that all groups

            // are restricted. Hence there is nothing to review and instantly continue.

            confirmPermissionsReview();

            executeCallback(true);

            activity.finish();

        }

    }
@@ -188,7 +189,10 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat 
            preferenceGroups.add(mNewPermissionsCategory);

            preferenceGroups.add(mCurrentPermissionsCategory);

        } else {

            preferenceGroups.add(getPreferenceScreen());

            PreferenceScreen preferenceScreen = getPreferenceScreen();

            if (preferenceScreen != null) {

                preferenceGroups.add(preferenceScreen);

            }

        }



        final int preferenceGroupCount = preferenceGroups.size();