Skip to content

Commit 05363ef

Browse files
author
shubang
committed
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 a2ab277)
1 parent 95ff59d commit 05363ef

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
@@ -1970,10 +1970,9 @@ private void ensureCaptureTvInputPermission() {
19701970
public void requestChannelBrowsable(Uri channelUri, int userId)
19711971
throws RemoteException {
19721972
final String callingPackageName = getCallingPackageName();
1973+
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
1974+
Binder.getCallingUid(), userId, "requestChannelBrowsable");
19731975
final long identity = Binder.clearCallingIdentity();
1974-
final int callingUid = Binder.getCallingUid();
1975-
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
1976-
userId, "requestChannelBrowsable");
19771976
try {
19781977
Intent intent = new Intent(TvContract.ACTION_CHANNEL_BROWSABLE_REQUESTED);
19791978
List<ResolveInfo> list = getContext().getPackageManager()

0 commit comments

Comments
 (0)