Merge "Revert "Expose role API for Settings on RoleManager.""

This commit is contained in:
Diego Vela
2021-01-11 19:30:04 +00:00
committed by Android (Google) Code Review
7 changed files with 33 additions and 17 deletions

View File

@@ -14,7 +14,9 @@
package com.android.settings.applications.appinfo;
import android.app.role.RoleControllerManager;
import android.app.role.RoleManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.UserManager;
@@ -56,12 +58,14 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
mRoleManager = context.getSystemService(RoleManager.class);
final RoleControllerManager roleControllerManager =
mContext.getSystemService(RoleControllerManager.class);
final Executor executor = mContext.getMainExecutor();
mRoleManager.isRoleVisible(mRoleName, executor, visible -> {
roleControllerManager.isRoleVisible(mRoleName, executor, visible -> {
mRoleVisible = visible;
refreshAvailability();
});
mRoleManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
roleControllerManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
visible -> {
mAppVisible = visible;
refreshAvailability();