Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to Binder.getCallingUid." into sc-dev

Browse Source
This commit is contained in:
Cassie Wang
2021-03-30 21:30:31 +00:00
committed by Android (Google) Code Review
parent 395b88847f c29724005b
commit 98b7da73c5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java
View File

@@ -160,7 +160,7 @@ public class AppSearchManagerService extends SystemService {
Preconditions.checkNotNull(packageName); Preconditions.checkNotNull(packageName);
Preconditions.checkNotNull(databaseName); Preconditions.checkNotNull(databaseName);
Preconditions.checkNotNull(callback); Preconditions.checkNotNull(callback);
int callingUid = Binder.getCallingUidOrThrow(); int callingUid = Binder.getCallingUid();
int callingUserId = handleIncomingUser(userId, callingUid); int callingUserId = handleIncomingUser(userId, callingUid);
final long callingIdentity = Binder.clearCallingIdentity(); final long callingIdentity = Binder.clearCallingIdentity();
try { try {
@@ -187,7 +187,7 @@ public class AppSearchManagerService extends SystemService {
Preconditions.checkNotNull(packageName); Preconditions.checkNotNull(packageName);
Preconditions.checkNotNull(databaseName); Preconditions.checkNotNull(databaseName);
Preconditions.checkNotNull(callback); Preconditions.checkNotNull(callback);
int callingUid = Binder.getCallingUidOrThrow(); int callingUid = Binder.getCallingUid();
int callingUserId = handleIncomingUser(userId, callingUid); int callingUserId = handleIncomingUser(userId, callingUid);
final long callingIdentity = Binder.clearCallingIdentity(); final long callingIdentity = Binder.clearCallingIdentity();
try { try {
@@ -640,7 +640,7 @@ public class AppSearchManagerService extends SystemService {
@Override @Override
public void persistToDisk(@UserIdInt int userId) { public void persistToDisk(@UserIdInt int userId) {
int callingUid = Binder.getCallingUidOrThrow(); int callingUid = Binder.getCallingUid();
int callingUserId = handleIncomingUser(userId, callingUid); int callingUserId = handleIncomingUser(userId, callingUid);
final long callingIdentity = Binder.clearCallingIdentity(); final long callingIdentity = Binder.clearCallingIdentity();
try { try {