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

Commit 231d258e authored by Hai Zhang's avatar Hai Zhang
Browse files

Use RoleControllerService for role related APIs. 

Move isApplicationQualifiedForRole() and isRoleVisible() from
PermissionControllerService to RoleControllerService.

Bug: 127691087
Test: manual
Change-Id: I7ee39d2cf9fa819a87d63e4487642d07be2e02c8
parent 95d073df

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

+0 −13
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.packageinstaller.permission.model.AppPermissions; 
import com.android.packageinstaller.permission.model.Permission;

import com.android.packageinstaller.permission.model.PermissionUsages;

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

import com.android.packageinstaller.role.service.PermissionControllerServiceImplRoleMixin;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlSerializer;
@@ -500,18 +499,6 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 
        return users;

    }



    @Override

    public boolean onIsApplicationQualifiedForRole(@NonNull String roleName,

            @NonNull String packageName) {

        return PermissionControllerServiceImplRoleMixin.onIsApplicationQualifiedForRole(roleName,

                packageName, this);

    }



    @Override

    public boolean onIsRoleVisible(@NonNull String roleName) {

        return PermissionControllerServiceImplRoleMixin.onIsRoleVisible(roleName, this);

    }



    @Override

    public boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String callerPackageName,

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

src/com/android/packageinstaller/role/service/PermissionControllerServiceImplRoleMixin.java

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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.packageinstaller.role.service;



import android.content.Context;

import android.os.Process;



import androidx.annotation.NonNull;



import com.android.packageinstaller.role.model.Role;

import com.android.packageinstaller.role.model.Roles;



/**

 * Mixin for {@link com.android.packageinstaller.permission.service.PermissionControllerServiceImpl}

 * methods that are related to roles.

 */

public class PermissionControllerServiceImplRoleMixin {



    private PermissionControllerServiceImplRoleMixin() {}



    /**

     * @see android.permission.PermissionControllerService#onIsApplicationQualifiedForRole(String,

     *      String)

     */

    public static boolean onIsApplicationQualifiedForRole(@NonNull String roleName,

            @NonNull String packageName, @NonNull Context context) {

        Role role = Roles.get(context).get(roleName);

        if (role == null) {

            return false;

        }

        if (!role.isAvailable(context)) {

            return false;

        }

        return role.isPackageQualified(packageName, context);

    }



    /**

     * @see android.permission.PermissionControllerService#onIsRoleVisible(String)

     */

    public static boolean onIsRoleVisible(@NonNull String roleName, @NonNull Context context) {

        Role role = Roles.get(context).get(roleName);

        if (role == null) {

            return false;

        }

        if (!role.isAvailable(context)) {

            return false;

        }

        return role.isVisibleAsUser(Process.myUserHandle(), context);

    }

}

src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java

+25 −0
Original line number Diff line number Diff line
@@ -182,6 +182,31 @@ public class RoleControllerServiceImpl extends RoleControllerService { 
        });

    }



    @Override

    public boolean onIsApplicationQualifiedForRole(@NonNull String roleName,

            @NonNull String packageName) {

        Role role = Roles.get(this).get(roleName);

        if (role == null) {

            return false;

        }

        if (!role.isAvailable(this)) {

            return false;

        }

        return role.isPackageQualified(packageName, this);

    }



    @Override

    public boolean onIsRoleVisible(@NonNull String roleName) {

        Role role = Roles.get(this).get(roleName);

        if (role == null) {

            return false;

        }

        if (!role.isAvailable(this)) {

            return false;

        }

        return role.isVisibleAsUser(Process.myUserHandle(), this);

    }



    private void enforceCallerSystemUid(@NonNull String methodName) {

        if (Binder.getCallingUid() != Process.SYSTEM_UID) {

            throw new SecurityException("Only the system process call " + methodName + "()");