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

Commit d02f2194 authored by Vicky Kuo's avatar Vicky Kuo
Browse files

Check the tuner feature before access TunerResourceManager. 

Change-Id: I76181c09fc8b2706c78ced997c354e63001efa47
Flag: EXEMPT b/427137356
Bug: b/427137356
parent ecd80149

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

+8 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.HdmiHotplugEvent;
@@ -86,6 +87,8 @@ import java.util.Map; 
class TvInputHardwareManager implements TvInputHal.Callback {

    private static final String TAG = TvInputHardwareManager.class.getSimpleName();



    private PackageManager mPackageManager;



    private final Context mContext;

    private final Listener mListener;

    private final TvInputHal mHal = new TvInputHal(this);
@@ -139,6 +142,7 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
        mContext = context;

        mListener = listener;

        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

        mPackageManager = mContext.getPackageManager();

        mHal.init();

    }
@@ -473,8 +477,10 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
        if (callback == null) {

            throw new NullPointerException();

        }

        TunerResourceManager trm = (TunerResourceManager) mContext.getSystemService(

                Context.TV_TUNER_RESOURCE_MGR_SERVICE);

        TunerResourceManager trm = null;

        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TUNER)) {

            trm = mContext.getSystemService(TunerResourceManager.class);

        }

        synchronized (mLock) {

            Connection connection = mConnections.get(deviceId);

            if (connection == null) {