Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621e06a6 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs 

System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
parent 81eeef58

core/java/android/os/UserHandle.java

+6 −6
Original line number Diff line number Diff line
@@ -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

     */

    public static final int getAppIdFromSharedAppGid(int gid) {

        final int noUserGid = getAppId(gid);

        if (noUserGid < Process.FIRST_SHARED_APPLICATION_GID ||

                noUserGid > Process.LAST_SHARED_APPLICATION_GID) {

            throw new IllegalArgumentException(Integer.toString(gid) + " is not a shared app gid");

        final int appId = getAppId(gid) + Process.FIRST_APPLICATION_UID

                - Process.FIRST_SHARED_APPLICATION_GID;

        if (appId < 0 || appId >= Process.FIRST_SHARED_APPLICATION_GID) {

            return -1;

        }

        return (noUserGid + Process.FIRST_APPLICATION_UID) - Process.FIRST_SHARED_APPLICATION_GID;

        return appId;

    }



    /**