Skip to content

Commit ee583fd

Browse files
shubanganisassigoogle
authored andcommitted
TIF: fix issue of using caller-aware methods after clearCallingIdentity()
Bug: 189824175 Test: atest android.media.tv.cts.TvInputManagerTest Change-Id: Iced6c2245c0099bc4bcdaceb51f8cce4dbc0a392 (cherry picked from commit a2ab2772d70984b1c24d5d4509b9c7a5abea71f9) (cherry picked from commit 05363ef193ae231fc7a1fe666de88861e1084b17)
1 parent 42f9dee commit ee583fd

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

services/core/java/com/android/server/tv/TvInputManagerService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,10 +2005,9 @@ private void ensureCaptureTvInputPermission() {
20052005
public void requestChannelBrowsable(Uri channelUri, int userId)
20062006
throws RemoteException {
20072007
final String callingPackageName = getCallingPackageName();
2008+
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
2009+
Binder.getCallingUid(), userId, "requestChannelBrowsable");
20082010
final long identity = Binder.clearCallingIdentity();
2009-
final int callingUid = Binder.getCallingUid();
2010-
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
2011-
userId, "requestChannelBrowsable");
20122011
try {
20132012
Intent intent = new Intent(TvContract.ACTION_CHANNEL_BROWSABLE_REQUESTED);
20142013
List<ResolveInfo> list = getContext().getPackageManager()

0 commit comments

Comments
 (0)