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

Commit 9346e533 authored by Thomas Vannet's avatar Thomas Vannet
Browse files

Add killed delay param to startOneTimePermissionSession 

This param controls how long to wait before revoking permission after
every process has been killed.
Deprecate previous API and update all known uses of the deprecated API.
Use updated API for self-revocation feature.
If multiple one-time permission sessions are started for the same
package with different parameters, always use the shortest parameters.

Test: atest android.permission.cts.RevokeOwnPermissionTest,
atest android.permission.cts.OneTimePermissionTest
Bug: 210387494

Change-Id: I0c0e21b3b48dd31f0c267d5c8b89336714835289
parent 4fae26cd

core/api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -9948,7 +9948,8 @@ package android.permission { 
    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public int getRuntimePermissionsVersion();

    method @NonNull public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();

    method @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public void setRuntimePermissionsVersion(@IntRange(from=0) int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void startOneTimePermissionSession(@NonNull String, long, int, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void startOneTimePermissionSession(@NonNull String, long, int, int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void startOneTimePermissionSession(@NonNull String, long, long, int, int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void stopOneTimePermissionSession(@NonNull String);

    field @RequiresPermission(android.Manifest.permission.START_REVIEW_PERMISSION_DECISIONS) public static final String ACTION_REVIEW_PERMISSION_DECISIONS = "android.permission.action.REVIEW_PERMISSION_DECISIONS";

    field public static final int PERMISSION_GRANTED = 0; // 0x0

core/java/android/permission/IPermissionManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ interface IPermissionManager { 
    void revokeOwnPermissionsOnKill(String packageName, in List<String> permissions);



    void startOneTimePermissionSession(String packageName, int userId, long timeout,

            int importanceToResetTimer, int importanceToKeepSessionAlive);

            long revokeAfterKilledDelay, int importanceToResetTimer,

            int importanceToKeepSessionAlive);



    void stopOneTimePermissionSession(String packageName, int userId);

core/java/android/permission/PermissionControllerManager.java

+3 −3
Original line number Diff line number Diff line
@@ -913,15 +913,15 @@ public final class PermissionControllerManager { 
     *

     * @param packageName The name of the package for which the permissions will be revoked.

     * @param permissions List of permissions to be revoked.

     * @param callback Callback called when the revocation request has been completed.

     *

     * @see Context#revokeOwnPermissionsOnKill(Collection)

     * @see Context#revokeOwnPermissionsOnKill(java.util.Collection)

     *

     * @hide

     */

    public void revokeOwnPermissionsOnKill(@NonNull String packageName,

            @NonNull List<String> permissions, AndroidFuture<Void> callback) {

            @NonNull List<String> permissions) {

        mRemoteService.postAsync(service -> {

            AndroidFuture<Void> callback = new AndroidFuture<>();

            service.revokeOwnPermissionsOnKill(packageName, permissions, callback);

            return callback;

        }).whenComplete((result, err) -> {

core/java/android/permission/PermissionControllerService.java

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public abstract class PermissionControllerService extends Service { 


    /**

     * Called when a package is considered inactive based on the criteria given by

     * {@link PermissionManager#startOneTimePermissionSession(String, long, int, int)}.

     * {@link PermissionManager#startOneTimePermissionSession(String, long, long, int, int)}.

     * This method is called at the end of a one-time permission session

     *

     * @param packageName The package that has been inactive

core/java/android/permission/PermissionManager.java

+30 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.os.Build.VERSION_CODES.S; 


import android.Manifest;

import android.annotation.CheckResult;

import android.annotation.DurationMillisLong;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -1281,6 +1282,22 @@ public final class PermissionManager { 
        }

    }



    /**

     * Starts a one-time permission session for a given package.

     * @see #startOneTimePermissionSession(String, long, long, int, int)

     * @hide

     * @deprecated Use {@link #startOneTimePermissionSession(String, long, long, int, int)} instead

     */

    @Deprecated

    @SystemApi

    @RequiresPermission(Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS)

    public void startOneTimePermissionSession(@NonNull String packageName, long timeoutMillis,

            @ActivityManager.RunningAppProcessInfo.Importance int importanceToResetTimer,

            @ActivityManager.RunningAppProcessInfo.Importance int importanceToKeepSessionAlive) {

        startOneTimePermissionSession(packageName, timeoutMillis, -1,

                importanceToResetTimer, importanceToKeepSessionAlive);

    }



    /**

     * Starts a one-time permission session for a given package. A one-time permission session is

     * ended if app becomes inactive. Inactivity is defined as the package's uid importance level
@@ -1301,11 +1318,16 @@ public final class PermissionManager { 
     * {@link PermissionControllerService#onOneTimePermissionSessionTimeout(String)} is invoked.

     * </p>

     * <p>

     * Note that if there is currently an active session for a package a new one isn't created and

     * the existing one isn't changed.

     * Note that if there is currently an active session for a package a new one isn't created but

     * each parameter of the existing one will be updated to the more aggressive of both sessions.

     * This means that durations will be set to the shortest parameter and importances will be set

     * to the lowest one.

     * </p>

     * @param packageName The package to start a one-time permission session for

     * @param timeoutMillis Number of milliseconds for an app to be in an inactive state

     * @param revokeAfterKilledDelayMillis Number of milliseconds to wait before revoking on the

     *                                     event an app is terminated. Set to -1 to use default

     *                                     value for the device.

     * @param importanceToResetTimer The least important level to uid must be to reset the timer

     * @param importanceToKeepSessionAlive The least important level the uid must be to keep the

     *                                     session alive
@@ -1314,12 +1336,15 @@ public final class PermissionManager { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS)

    public void startOneTimePermissionSession(@NonNull String packageName, long timeoutMillis,

    public void startOneTimePermissionSession(@NonNull String packageName,

            @DurationMillisLong long timeoutMillis,

            @DurationMillisLong long revokeAfterKilledDelayMillis,

            @ActivityManager.RunningAppProcessInfo.Importance int importanceToResetTimer,

            @ActivityManager.RunningAppProcessInfo.Importance int importanceToKeepSessionAlive) {

        try {

            mPermissionManager.startOneTimePermissionSession(packageName, mContext.getUserId(),

                    timeoutMillis, importanceToResetTimer, importanceToKeepSessionAlive);

                    timeoutMillis, revokeAfterKilledDelayMillis, importanceToResetTimer,

                    importanceToKeepSessionAlive);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }