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

Commit 78560f26 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed the incorrect uid check for HSUM mode" into main

parents f74fa762 6db05fdc

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+2 −1
Original line number Diff line number Diff line
@@ -816,7 +816,8 @@ public final class TelephonyPermissions { 
     * @param callingUid pass Binder.callingUid().

     */

    public static void enforceShellOnly(int callingUid, String message) {

        if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID) {

        if (UserHandle.isSameApp(callingUid, Process.SHELL_UID)

                || UserHandle.isSameApp(callingUid, Process.ROOT_UID)) {

            return; // okay

        }

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3785,7 +3785,7 @@ public class SubscriptionManager { 
    }



    private boolean isSystemProcess() {

        return Process.myUid() == Process.SYSTEM_UID;

        return UserHandle.isSameApp(Process.myUid(), Process.SYSTEM_UID);

    }



    /**