Merge "Remove unused Role.type from User" into main

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
     }
 }