Move UserHandleCompat to framework-s for more convenient accessed

NO_IFTTT=Does not modify RoleParser logic
RelNote: N/A
Bug: 376728836
Flag: EXEMPT refactor
Test: build
Change-Id: I603adc9e8e584bbadda49903bca6c3aba30cad89

6 files changed, 4 insertions, 92 deletions

diff --git a/service/java/com/android/permission/compat/UserHandleCompat.java b/service/java/com/android/permission/compat/UserHandleCompat.java
deleted file mode 100644
index 1b3ebb8d6..000000000
--- a/service/java/com/android/permission/compat/UserHandleCompat.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.permission.compat;
-
-import android.annotation.UserIdInt;
-import android.os.UserHandle;
-
-/**
- * Helper for accessing features in {@link UserHandle}.
- */
-public final class UserHandleCompat {
-    /**
-     * A user ID to indicate all users on the device.
-     */
-    public static final int USER_ALL = UserHandle.ALL.getIdentifier();
-
-    /**
-     * A user ID to indicate an undefined user of the device.
-     *
-     * @see UserHandle#USER_NULL
-     */
-    public static final @UserIdInt int USER_NULL = -10000;
-
-    /**
-     * A user ID to indicate the "system" user of the device.
-     */
-    public static final int USER_SYSTEM = UserHandle.SYSTEM.getIdentifier();
-
-    private UserHandleCompat() {}
-
-    /**
-     * Get the user ID of a given UID.
-     *
-     * @param uid the UID
-     * @return the user ID
-     */
-    @UserIdInt
-    public static int getUserId(int uid) {
-        return UserHandle.getUserHandleForUid(uid).getIdentifier();
-    }
-
-    /**
-     * Get the UID from the give user ID and app ID
-     *
-     * @param userId the user ID
-     * @param appId the app ID
-     * @return the UID
-     */
-    public static int getUid(@UserIdInt int userId, int appId) {
-        return UserHandle.of(userId).getUid(appId);
-    }
-}
diff --git a/service/java/com/android/permission/compat/package-info.java b/service/java/com/android/permission/compat/package-info.java
deleted file mode 100644
index c89cc8eab..000000000
--- a/service/java/com/android/permission/compat/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @hide
- * TODO(b/146466118) remove this javadoc tag
- */
-@android.annotation.Hide
-package com.android.permission.compat;
diff --git a/service/java/com/android/permission/util/UserUtils.java b/service/java/com/android/permission/util/UserUtils.java
index 639c7aacb..986b5af5b 100644
--- a/service/java/com/android/permission/util/UserUtils.java
+++ b/service/java/com/android/permission/util/UserUtils.java
@@ -24,10 +24,10 @@ import android.os.Binder;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.permission.internal.compat.UserHandleCompat;
 
 import com.android.internal.util.Preconditions;
 import com.android.modules.utils.build.SdkLevel;
-import com.android.permission.compat.UserHandleCompat;
 import com.android.permission.flags.Flags;
 
 import java.util.List;
diff --git a/service/java/com/android/role/RoleService.java b/service/java/com/android/role/RoleService.java
index b8e3ad8b1..c4316ff71 100644
--- a/service/java/com/android/role/RoleService.java
+++ b/service/java/com/android/role/RoleService.java
@@ -45,6 +45,7 @@ import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.permission.internal.compat.UserHandleCompat;
 import android.permission.flags.Flags;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -62,7 +63,6 @@ import com.android.internal.infra.AndroidFuture;
 import com.android.internal.util.Preconditions;
 import com.android.internal.util.dump.DualDumpOutputStream;
 import com.android.modules.utils.build.SdkLevel;
-import com.android.permission.compat.UserHandleCompat;
 import com.android.permission.util.ArrayUtils;
 import com.android.permission.util.CollectionUtils;
 import com.android.permission.util.ForegroundThread;
diff --git a/service/java/com/android/role/RoleShellCommand.java b/service/java/com/android/role/RoleShellCommand.java
index 808a64cb4..41f0702a2 100644
--- a/service/java/com/android/role/RoleShellCommand.java
+++ b/service/java/com/android/role/RoleShellCommand.java
@@ -22,11 +22,11 @@ import android.app.role.IRoleManager;
 import android.os.Build;
 import android.os.RemoteCallback;
 import android.os.RemoteException;
+import android.permission.internal.compat.UserHandleCompat;
 
 import androidx.annotation.RequiresApi;
 
 import com.android.modules.utils.BasicShellCommandHandler;
-import com.android.permission.compat.UserHandleCompat;
 
 import java.io.PrintWriter;
 import java.util.List;
diff --git a/service/java/com/android/safetycenter/UserProfileGroup.java b/service/java/com/android/safetycenter/UserProfileGroup.java
index a78113b04..d4b051d0f 100644
--- a/service/java/com/android/safetycenter/UserProfileGroup.java
+++ b/service/java/com/android/safetycenter/UserProfileGroup.java
@@ -26,11 +26,11 @@ import android.os.Binder;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.permission.internal.compat.UserHandleCompat;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
-import com.android.permission.compat.UserHandleCompat;
 import com.android.permission.util.UserUtils;
 
 import java.lang.annotation.Retention;