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

Commit a7d0e743 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5c81b883 a2ab2772

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -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()