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

8 files changed, 7 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 9b1857741..f2aab3568 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,6 +110,7 @@ bootclasspath_fragment {
         package_prefixes: [
             "android.app.role",
             "android.app.ecm",
+            "android.permission.internal",
             "android.permission.jarjar",
             "android.safetycenter",
             "android.safetylabel",
diff --git a/service/java/com/android/permission/compat/UserHandleCompat.java b/framework-s/java/android/permission/internal/compat/UserHandleCompat.java
index 1b3ebb8d6..8a3ec444d 100644
--- a/service/java/com/android/permission/compat/UserHandleCompat.java
+++ b/framework-s/java/android/permission/internal/compat/UserHandleCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.permission.compat;
+package android.permission.internal.compat;
 
 import android.annotation.UserIdInt;
 import android.os.UserHandle;
diff --git a/service/java/com/android/permission/compat/package-info.java b/framework-s/java/android/permission/internal/compat/package-info.java
index c89cc8eab..b78aac878 100644
--- a/service/java/com/android/permission/compat/package-info.java
+++ b/framework-s/java/android/permission/internal/compat/package-info.java
@@ -19,4 +19,4 @@
  * TODO(b/146466118) remove this javadoc tag
  */
 @android.annotation.Hide
-package com.android.permission.compat;
+package android.permission.internal.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;
diff --git a/service/lint-baseline.xml b/service/lint-baseline.xml
index b10928320..6aaf3da8c 100644
--- a/service/lint-baseline.xml
+++ b/service/lint-baseline.xml
@@ -35,17 +35,6 @@
     </issue>
 
     <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
-        errorLine1="        return UserHandle.of(userId).getUid(appId);"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="packages/modules/Permission/service/java/com/android/permission/compat/UserHandleCompat.java"
-            line="57"
-            column="38"/>
-    </issue>
-
-    <issue
         id="FlaggedApi"
         message="Method `RolesState()` is a flagged API and should be inside an `if (Flags.systemServerRoleControllerEnabled())` check (or annotate the surrounding method `writeFile` with `@FlaggedApi(Flags.FLAG_SYSTEM_SERVER_ROLE_CONTROLLER_ENABLED) to transfer requirement to caller`)"
         errorLine1="            roles = new RolesState(mVersion, packagesHash,"