Merge "Fix permission check log in TRM Fix npe in Tuner init" into rvc-dev am:... (08b7c750) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tuner/Tuner.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,9 @@ public class Tuner implements AutoCloseable {
		mContext = context;
		mTunerResourceManager = (TunerResourceManager)
		context.getSystemService(Context.TV_TUNER_RESOURCE_MGR_SERVICE);
		if (mHandler == null) {
		mHandler = createEventHandler();
		}

		int[] clientId = new int[1];
		ResourceClientProfile profile = new ResourceClientProfile(tvInputSessionId, useCase);

+3 −3

Original line number	Diff line number	Diff line
		@@ -653,16 +653,16 @@ public class TunerResourceManagerService extends SystemService {

		private void enforceTrmAccessPermission(String apiName) {
		getContext().enforceCallingPermission("android.permission.TUNER_RESOURCE_ACCESS",
		TAG + ": " + "apiName");
		TAG + ": " + apiName);
		}

		private void enforceTunerAccessPermission(String apiName) {
		getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_TUNER",
		TAG + ": " + "apiName");
		TAG + ": " + apiName);
		}

		private void enforceDescramblerAccessPermission(String apiName) {
		getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_DESCRAMBLER",
		TAG + ": " + "apiName");
		TAG + ": " + apiName);
		}
		}