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

Commit d85aac1a authored by Cassie Wang's avatar Cassie Wang Committed by Automerger Merge Worker
Browse files

Merge "Switch to Binder.getCallingUid." into sc-dev am: 98b7da73 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14037973

Change-Id: Ie70ab4bea912c7a55563c6458b161946121d6154
parents 32c367f6 98b7da73

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(packageName);

            Preconditions.checkNotNull(databaseName);

            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUid = Binder.getCallingUid();

            int callingUserId = handleIncomingUser(userId, callingUid);

            final long callingIdentity = Binder.clearCallingIdentity();

            try {
@@ -187,7 +187,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(packageName);

            Preconditions.checkNotNull(databaseName);

            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUid = Binder.getCallingUid();

            int callingUserId = handleIncomingUser(userId, callingUid);

            final long callingIdentity = Binder.clearCallingIdentity();

            try {
@@ -640,7 +640,7 @@ public class AppSearchManagerService extends SystemService { 


        @Override

        public void persistToDisk(@UserIdInt int userId) {

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUid = Binder.getCallingUid();

            int callingUserId = handleIncomingUser(userId, callingUid);

            final long callingIdentity = Binder.clearCallingIdentity();

            try {