commit b0d601266f0b472ac277f821a424bbdb5d1b92f3
author Cassie Wang <cassiewang@google.com> Tue Mar 30 12:38:46 2021 -0700
committer Cassie Wang <cassiewang@google.com> Tue Mar 30 12:39:21 2021 -0700
tree 2a4d1583d8be6bad207014a08c3dccaae7c62d67
parent c4d65f2f3a9d22648b62b56413db130d7ed94ba9

Switch to Binder.getCallingUid.

Since there are some AppSearch callers from system_server, we don't want
to throw.

Bug: 183986767
Test: presubmit
Change-Id: I4ee3640a71f2f0bc2758a0fb41667c55ef13296c

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

diff --git a/service/java/com/android/server/appsearch/AppSearchManagerService.java b/service/java/com/android/server/appsearch/AppSearchManagerService.java
index 991dda7..877dacb 100644
--- a/service/java/com/android/server/appsearch/AppSearchManagerService.java
+++ b/service/java/com/android/server/appsearch/AppSearchManagerService.java
@@ -160,7 +160,7 @@
             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 @@
             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 @@
 
         @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 {