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

Commit eb694bb6 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 546909c9: am 479c482c: am 504600bb: Merge "Fix... 

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

* commit '546909c9':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
parents 8dd0bce6 546909c9

core/java/android/os/UserHandle.java

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

     * @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;

    }

    }





    /**

    /**