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

Commit a0e7a28b authored by Zach Johnson's avatar Zach Johnson Committed by android-build-merger
Browse files

Merge "Simplify system or active user checks" 

am: 6062a2d0

Change-Id: I4f99330c8e2c3fe3370cc412e745748b93a01119
parents f7816c30 6062a2d0

src/com/android/bluetooth/Utils.java

+8 −0
Original line number Diff line number Diff line
@@ -284,6 +284,14 @@ public final class Utils { 
                "Need DUMP permission");

    }



    public static boolean callerIsSystemOrActiveUser(String tag, String method) {

        if (!checkCaller()) {

          Log.w(TAG, method + "() - Not allowed for non-active user and non system user");

          return false;

        }

        return true;

    }



    public static boolean checkCaller() {

        int callingUser = UserHandle.getCallingUserId();

        int callingUid = Binder.getCallingUid();

src/com/android/bluetooth/btservice/AdapterService.java

+42 −210

File changed.

Preview size limit exceeded, changes collapsed.