From c29724005b02c45d9127e54b641c4188b59c28d5 Mon Sep 17 00:00:00 2001
From: Cassie Wang <cassiewang@google.com>
Date: Tue, 30 Mar 2021 12:38:46 -0700
Subject: [PATCH] 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
---
 .../android/server/appsearch/AppSearchManagerService.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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