summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author mrenouf <mrenouf@google.com> 2024-03-10 04:18:08 -0400
committer mrenouf <mrenouf@google.com> 2024-03-11 21:02:25 -0400
commit418363e77491189cbd44656adc57b2006e37c58b (patch)
tree5239fde867aab5c4d052ce380bb5197f1c979fac /java/src
parent495018d2eb13dfc232e073f86c90b7993749e07b (diff)
Remove unused Role.type from User
This removes a single assertion and a test covering it. Asserting on type can instead be done by just testing if the user is the profile parent. This will be modeled in the new design. Bug: 328927949 Test: atest IntentResolver-tests-unit Change-Id: I3a28d986f36f87190a4af5c98ed954999250fd92
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/v2/data/repository/UserRepository.kt1
-rw-r--r--java/src/com/android/intentresolver/v2/shared/model/User.kt23
2 files changed, 5 insertions, 19 deletions
diff --git a/java/src/com/android/intentresolver/v2/data/repository/UserRepository.kt b/java/src/com/android/intentresolver/v2/data/repository/UserRepository.kt
index b57609e5..b13ea871 100644
--- a/java/src/com/android/intentresolver/v2/data/repository/UserRepository.kt
+++ b/java/src/com/android/intentresolver/v2/data/repository/UserRepository.kt
@@ -151,7 +151,6 @@ constructor(
.distinctUntilChanged()
override suspend fun requestState(user: User, available: Boolean) {
- require(user.type == User.Type.PROFILE) { "Only profile users are supported" }
return withContext(backgroundDispatcher) {
Log.i(TAG, "requestQuietModeEnabled: ${!available} for user $user")
userManager.requestQuietModeEnabled(/* enableQuietMode = */ !available, user.handle)
diff --git a/java/src/com/android/intentresolver/v2/shared/model/User.kt b/java/src/com/android/intentresolver/v2/shared/model/User.kt
index 97db3280..46279ad0 100644
--- a/java/src/com/android/intentresolver/v2/shared/model/User.kt
+++ b/java/src/com/android/intentresolver/v2/shared/model/User.kt
@@ -18,8 +18,6 @@ package com.android.intentresolver.v2.shared.model
import android.annotation.UserIdInt
import android.os.UserHandle
-import com.android.intentresolver.v2.shared.model.User.Type.FULL
-import com.android.intentresolver.v2.shared.model.User.Type.PROFILE
/**
* A User represents the owner of a distinct set of content.
@@ -45,21 +43,10 @@ data class User(
) {
val handle: UserHandle = UserHandle.of(id)
- val type: Type
- get() = role.type
-
- enum class Type {
- FULL,
- PROFILE
- }
-
- enum class Role(
- /** The type of the role user. */
- val type: Type
- ) {
- PERSONAL(FULL),
- PRIVATE(PROFILE),
- WORK(PROFILE),
- CLONE(PROFILE)
+ enum class Role {
+ PERSONAL,
+ PRIVATE,
+ WORK,
+ CLONE
}
}