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

Commit f380332f authored by Yixiao Luo's avatar Yixiao Luo Committed by Android (Google) Code Review
Browse files

Merge "TVIF: Fix use of caller-aware methods after clearCallingIdentity()"

parents c05ecef1 b245d169

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

+5 −5
Original line number Diff line number Diff line
@@ -2184,10 +2184,10 @@ public final class TvInputManagerService extends SystemService { 
                return null;

            }



            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

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

                    userId, "acquireTvInputHardware");

            final long identity = Binder.clearCallingIdentity();

            try {

                return mTvInputHardwareManager.acquireHardware(

                        deviceId, callback, info, callingUid, resolvedUserId,
@@ -2205,10 +2205,10 @@ public final class TvInputManagerService extends SystemService { 
                return;

            }



            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

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

                    userId, "releaseTvInputHardware");

            final long identity = Binder.clearCallingIdentity();

            try {

                mTvInputHardwareManager.releaseHardware(

                        deviceId, hardware, callingUid, resolvedUserId);
@@ -2350,10 +2350,10 @@ public final class TvInputManagerService extends SystemService { 
                throws RemoteException {

            ensureCaptureTvInputPermission();



            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

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

                    userId, "getAvailableTvStreamConfigList");

            final long identity = Binder.clearCallingIdentity();

            try {

                return mTvInputHardwareManager.getAvailableTvStreamConfigList(

                        inputId, callingUid, resolvedUserId);
@@ -2368,10 +2368,10 @@ public final class TvInputManagerService extends SystemService { 
                throws RemoteException {

            ensureCaptureTvInputPermission();



            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

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

                    userId, "captureFrame");

            final long identity = Binder.clearCallingIdentity();

            try {

                String hardwareInputId = null;

                synchronized (mLock) {
@@ -2400,10 +2400,10 @@ public final class TvInputManagerService extends SystemService { 
        @Override

        public boolean isSingleSessionActive(int userId) throws RemoteException {

            ensureCaptureTvInputPermission();

            final long identity = Binder.clearCallingIdentity();

            final int callingUid = Binder.getCallingUid();

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

                    userId, "isSingleSessionActive");

            final long identity = Binder.clearCallingIdentity();

            try {

                synchronized (mLock) {

                    UserState userState = getOrCreateUserStateLocked(resolvedUserId);