Add flags to requests for package UID/GIDs.
This gives callers the ability to request details for missing
packages. Also add annotations for userId and appId variables and
start tagging their usage.
Change-Id: I63d5d7f870ac4b7ebae501e0ba4f40e08b14f3f6
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index e34b1ac..42b18384 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -213,10 +213,15 @@
}
@Override
- public int[] getPackageGids(String packageName)
+ public int[] getPackageGids(String packageName) throws NameNotFoundException {
+ return getPackageGids(packageName, 0);
+ }
+
+ @Override
+ public int[] getPackageGids(String packageName, int flags)
throws NameNotFoundException {
try {
- int[] gids = mPM.getPackageGids(packageName, mContext.getUserId());
+ int[] gids = mPM.getPackageGidsEtc(packageName, flags, mContext.getUserId());
if (gids != null) {
return gids;
}
@@ -228,10 +233,20 @@
}
@Override
- public int getPackageUidAsUser(String packageName, int userHandle)
+ public int getPackageUid(String packageName, int flags) throws NameNotFoundException {
+ return getPackageUidAsUser(packageName, flags, mContext.getUserId());
+ }
+
+ @Override
+ public int getPackageUidAsUser(String packageName, int userId) throws NameNotFoundException {
+ return getPackageUidAsUser(packageName, 0, userId);
+ }
+
+ @Override
+ public int getPackageUidAsUser(String packageName, int flags, int userId)
throws NameNotFoundException {
try {
- int uid = mPM.getPackageUid(packageName, userHandle);
+ int uid = mPM.getPackageUidEtc(packageName, flags, userId);
if (uid >= 0) {
return uid;
}