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

Commit 47a30308 authored by Vicky Kuo's avatar Vicky Kuo Committed by Android (Google) Code Review
Browse files

Merge "Check the tuner feature before access TunerResourceManager." into main

parents ab94e59d d02f2194
Loading
Loading
Loading
Loading
+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) {