Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d16a9af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TIF: fix issue of using caller-aware methods after... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15553334

Change-Id: I056b0ef3d000ff2bd966e7ca54e8e28143769e8c
parents e48d6d3f a7d0e743

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

+2 −3
Original line number Diff line number Diff line
@@ -2304,10 +2304,9 @@ public final class TvInputManagerService extends SystemService { 
        public void requestChannelBrowsable(Uri channelUri, int userId)

                throws RemoteException {

            final String callingPackageName = getCallingPackageName();

            final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),

                    Binder.getCallingUid(), userId, "requestChannelBrowsable");

            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

            final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,

                userId, "requestChannelBrowsable");

            try {

                Intent intent = new Intent(TvContract.ACTION_CHANNEL_BROWSABLE_REQUESTED);

                List<ResolveInfo> list = getContext().getPackageManager()