am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '546909c9901f3acc659b3402fbf7320c96f562ad':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
This commit is contained in:
Adam Lesinski
2015-08-14 20:04:16 +00:00
committed by Android Git Automerger

View File

@@ -179,16 +179,16 @@ public final class UserHandle implements Parcelable {
} }
/** /**
* Returns the app id for a given shared app gid. * Returns the app id for a given shared app gid. Returns -1 if the ID is invalid.
* @hide * @hide
*/ */
public static final int getAppIdFromSharedAppGid(int gid) { public static final int getAppIdFromSharedAppGid(int gid) {
final int noUserGid = getAppId(gid); final int appId = getAppId(gid) + Process.FIRST_APPLICATION_UID
if (noUserGid < Process.FIRST_SHARED_APPLICATION_GID || - Process.FIRST_SHARED_APPLICATION_GID;
noUserGid > Process.LAST_SHARED_APPLICATION_GID) { if (appId < 0 || appId >= Process.FIRST_SHARED_APPLICATION_GID) {
throw new IllegalArgumentException(Integer.toString(gid) + " is not a shared app gid"); return -1;
} }
return (noUserGid + Process.FIRST_APPLICATION_UID) - Process.FIRST_SHARED_APPLICATION_GID; return appId;
} }
/** /**