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

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

Snap for 6449986 from de848300 to rvc-release 

Change-Id: I6e2381be9094aafd601f73c4081520fabca95d9d
parents 8cb764a4 de848300

res/xml/roles.xml

+3 −3
Original line number Diff line number Diff line
@@ -417,9 +417,9 @@ 
                </intent-filter>

            </service>

        </required-components>

        <app-ops>

            <app-op name="android:system_alert_window" mode="allowed" />

        </app-ops>

        <app-op-permissions>

            <app-op-permission name="android.permission.SYSTEM_ALERT_WINDOW" />

        </app-op-permissions>

    </role>



    <role

src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ private const val LOG_TAG = "AutoRevokePermissions" 
// TODO eugenesusla: temporarily enabled for extra logs during dogfooding

private const val DEBUG = false || DEBUG_OVERRIDE_THRESHOLDS



// TODO eugenesusla: temporarily disabled due to issues in droidfood

private const val AUTO_REVOKE_ENABLED = false

private const val AUTO_REVOKE_ENABLED = true



private val DEFAULT_UNUSED_THRESHOLD_MS =

        if (AUTO_REVOKE_ENABLED) DAYS.toMillis(90) else Long.MAX_VALUE

src/com/android/permissioncontroller/role/Role.md

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ when it declares all these components. They follow a similar syntax as in typica 
- `<permissions>`: Child tags like `<permission-set>` and `<permission>` can be used to specify the

permissions that should be granted to the app when it has the role. Several `<permission-set>` are

defined at the beginning of `roles.xml`.

- `<app-op-permissions>`: The child tag `<app-op-permission>` can be used to specify the app op

permissions whose app op should be granted to the app when it has the role.

- `<app-ops>`: The child tag `<app-op>` can be used to specify the app ops that should be granted to

the app when it has the role.

- `<preferred-activities>`: The child tag `<preferred-activity>` can be used to specify the

src/com/android/permissioncontroller/role/model/AppOp.java

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class AppOp { 
        if (!checkTargetSdkVersion(packageName, context)) {

            return false;

        }

        return Permissions.setAppOpMode(packageName, mName, mMode, context);

        return Permissions.setAppOpUidMode(packageName, mName, mMode, context);

    }



    /**
@@ -96,7 +96,7 @@ public class AppOp { 
            return false;

        }

        int defaultMode = Permissions.getDefaultAppOpMode(mName);

        return Permissions.setAppOpMode(packageName, mName, defaultMode, context);

        return Permissions.setAppOpUidMode(packageName, mName, defaultMode, context);

    }



    private boolean checkTargetSdkVersion(@NonNull String packageName, @NonNull Context context) {

src/com/android/permissioncontroller/role/model/AppOpPermissions.java

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.permissioncontroller.role.model;



import android.app.AppOpsManager;

import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;



import androidx.annotation.NonNull;



import com.android.permissioncontroller.permission.utils.ArrayUtils;

import com.android.permissioncontroller.role.utils.PackageUtils;



/**

 * App op permissions to be granted or revoke by a {@link Role}.

 */

public class AppOpPermissions {



    private AppOpPermissions() {}



    /**

     * Grant the app op of an app op permission to an application.

     *

     * @param packageName the package name of the application

     * @param appOpPermission the name of the app op permission

     * @param context the {@code Context} to retrieve system services

     *

     * @return whether any app op mode has changed

     */

    public static boolean grant(@NonNull String packageName, @NonNull String appOpPermission,

            @NonNull Context context) {

        PackageInfo packageInfo = PackageUtils.getPackageInfo(packageName,

                PackageManager.GET_PERMISSIONS, context);

        if (packageInfo == null) {

            return false;

        }

        if (!ArrayUtils.contains(packageInfo.requestedPermissions, appOpPermission)) {

            return false;

        }

        String appOp = AppOpsManager.permissionToOp(appOpPermission);

        return setAppOpMode(packageName, appOp, AppOpsManager.MODE_ALLOWED, context);

    }



    /**

     * Revoke the app op of an app op permission from an application.

     *

     * @param packageName the package name of the application

     * @param appOpPermission the name of the app op permission

     * @param context the {@code Context} to retrieve system services

     *

     * @return whether any app op mode has changed

     */

    public static boolean revoke(@NonNull String packageName, @NonNull String appOpPermission,

            @NonNull Context context) {

        String appOp = AppOpsManager.permissionToOp(appOpPermission);

        int defaultMode = Permissions.getDefaultAppOpMode(appOp);

        return setAppOpMode(packageName, appOp, defaultMode, context);

    }



    private static boolean setAppOpMode(@NonNull String packageName, @NonNull String appOp,

            int mode, @NonNull Context context) {

        switch (appOp) {

            case AppOpsManager.OPSTR_ACCESS_NOTIFICATIONS:

            case AppOpsManager.OPSTR_SYSTEM_ALERT_WINDOW:

            case AppOpsManager.OPSTR_WRITE_SETTINGS:

            case AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES:

            case AppOpsManager.OPSTR_START_FOREGROUND:

            // This isn't an API but we are deprecating it soon anyway.

            //case AppOpsManager.OPSTR_SMS_FINANCIAL_TRANSACTIONS:

            case AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS:

            case AppOpsManager.OPSTR_INSTANT_APP_START_FOREGROUND:

            case AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES:

            case AppOpsManager.OPSTR_LOADER_USAGE_STATS:

                return Permissions.setAppOpPackageMode(packageName, appOp, mode, context);

            default:

                return Permissions.setAppOpUidMode(packageName, appOp, mode, context);

        }

    }

}