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

Commit f8b62032 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add test for RoleManager."

parents c70a74e1 6329be48

api/test-current.txt

+17 −0
Original line number Diff line number Diff line
@@ -276,6 +276,23 @@ package android.app.backup { 


}



package android.app.role {



  public final class RoleManager {

    method public void addRoleHolderAsUser(java.lang.String, java.lang.String, android.os.UserHandle, java.util.concurrent.Executor, android.app.role.RoleManagerCallback);

    method public void clearRoleHoldersAsUser(java.lang.String, android.os.UserHandle, java.util.concurrent.Executor, android.app.role.RoleManagerCallback);

    method public java.util.List<java.lang.String> getRoleHolders(java.lang.String);

    method public java.util.List<java.lang.String> getRoleHoldersAsUser(java.lang.String, android.os.UserHandle);

    method public void removeRoleHolderAsUser(java.lang.String, java.lang.String, android.os.UserHandle, java.util.concurrent.Executor, android.app.role.RoleManagerCallback);

  }



  public abstract interface RoleManagerCallback {

    method public abstract void onFailure();

    method public abstract void onSuccess();

  }



}



package android.app.usage {



  public class NetworkStatsManager {

core/java/android/app/role/RoleManager.java

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.content.Intent;

import android.os.Binder;
@@ -212,6 +213,7 @@ public final class RoleManager { 
    @NonNull

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    @TestApi

    public List<String> getRoleHolders(@NonNull String roleName) {

        return getRoleHoldersAsUser(roleName, Process.myUserHandle());

    }
@@ -239,6 +241,7 @@ public final class RoleManager { 
    @NonNull

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    @TestApi

    public List<String> getRoleHoldersAsUser(@NonNull String roleName, @NonNull UserHandle user) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

        Preconditions.checkNotNull(user, "user cannot be null");
@@ -273,6 +276,7 @@ public final class RoleManager { 
     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    @TestApi

    public void addRoleHolderAsUser(@NonNull String roleName, @NonNull String packageName,

            @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor,

            @NonNull RoleManagerCallback callback) {
@@ -312,6 +316,7 @@ public final class RoleManager { 
     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    @TestApi

    public void removeRoleHolderAsUser(@NonNull String roleName, @NonNull String packageName,

            @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor,

            @NonNull RoleManagerCallback callback) {
@@ -350,6 +355,7 @@ public final class RoleManager { 
     */

    @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS)

    @SystemApi

    @TestApi

    public void clearRoleHoldersAsUser(@NonNull String roleName, @NonNull UserHandle user,

            @CallbackExecutor @NonNull Executor executor, @NonNull RoleManagerCallback callback) {

        Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");

core/java/android/app/role/RoleManagerCallback.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app.role;



import android.annotation.SystemApi;

import android.annotation.TestApi;



/**

 * Callback for a {@link RoleManager} request.
@@ -24,6 +25,7 @@ import android.annotation.SystemApi; 
 * @hide

 */

@SystemApi

@TestApi

public interface RoleManagerCallback {



    /**