Expose role API for Settings on RoleManager.
Settings is a platform app so the role APIs for it wasn't system APIs,
but just @hide. Now that we are moving role into module, we need to
create system APIs for them.
RoleControllerManager is an implementation detail and may change in
soon when we move role logic into system server and leave only UI in
PermissionController, so we shouldn't expose it. Instead, we can
expose the new system APIs on RoleManager, and delegate to
RoleControllerManager internally.
Bug: 158736025
Test: RoleControllerManagerTest
Change-Id: Idbd0db119f9432eb0ee5ff66f089cd8cff9e83f4
diff --git a/tests/tests/role/src/android/app/role/cts/RoleControllerManagerTest.kt b/tests/tests/role/src/android/app/role/cts/RoleControllerManagerTest.kt
index d3ebfc5..3c09a30 100644
--- a/tests/tests/role/src/android/app/role/cts/RoleControllerManagerTest.kt
+++ b/tests/tests/role/src/android/app/role/cts/RoleControllerManagerTest.kt
@@ -18,7 +18,6 @@
import android.app.Instrumentation
-import android.app.role.RoleControllerManager
import android.app.role.RoleManager
import android.content.Context
import android.content.Intent
@@ -42,15 +41,14 @@
import java.util.function.Consumer
/**
- * Tests [RoleControllerManager].
+ * Tests RoleControllerManager APIs exposed on [RoleManager].
*/
@RunWith(AndroidJUnit4::class)
class RoleControllerManagerTest {
private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
private val context: Context = instrumentation.context
private val packageManager: PackageManager = context.packageManager
- private val roleControllerManager: RoleControllerManager =
- context.getSystemService(RoleControllerManager::class.java)!!
+ private val roleManager: RoleManager = context.getSystemService(RoleManager::class.java)!!
@Before
fun installApp() {
@@ -95,7 +93,7 @@
) {
runWithShellPermissionIdentity {
val future = CompletableFuture<Boolean>()
- roleControllerManager.isApplicationVisibleForRole(
+ roleManager.isApplicationVisibleForRole(
roleName, packageName, context.mainExecutor, Consumer { future.complete(it) }
)
val isVisible = future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
@@ -121,7 +119,7 @@
private fun isRoleVisible(roleName: String): Boolean =
runWithShellPermissionIdentity(ThrowingSupplier {
val future = CompletableFuture<Boolean>()
- roleControllerManager.isRoleVisible(
+ roleManager.isRoleVisible(
roleName, context.mainExecutor, Consumer { future.complete(it) }
)
future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
