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

Merge "TIF: fix issue of using caller-aware methods after clearCallingIdentity()" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-01 02:44:22 +00:00
committed by Android (Google) Code Review
parent 5c81b883bf a2ab2772d7
commit a7d0e74359
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -2304,10 +2304,9 @@ public final class TvInputManagerService extends SystemService {
public void requestChannelBrowsable(Uri channelUri, int userId) public void requestChannelBrowsable(Uri channelUri, int userId)
throws RemoteException { throws RemoteException {
final String callingPackageName = getCallingPackageName(); final String callingPackageName = getCallingPackageName();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
Binder.getCallingUid(), userId, "requestChannelBrowsable");
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
final int callingUid = Binder.getCallingUid();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
userId, "requestChannelBrowsable");
try { try {
Intent intent = new Intent(TvContract.ACTION_CHANNEL_BROWSABLE_REQUESTED); Intent intent = new Intent(TvContract.ACTION_CHANNEL_BROWSABLE_REQUESTED);
List<ResolveInfo> list = getContext().getPackageManager() List<ResolveInfo> list = getContext().getPackageManager()