diff options
| -rw-r--r-- | media/java/android/media/tv/TvInputManager.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/tv/TvInputHardwareManager.java | 15 |
2 files changed, 9 insertions, 12 deletions
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 7fc19f1..1c98c79 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -238,8 +238,6 @@ public final class TvInputManager { private final ITvInputClient mClient; - private final ITvInputManagerCallback mManagerCallback; - private final int mUserId; /** @@ -879,7 +877,7 @@ public final class TvInputManager { } } }; - mManagerCallback = new ITvInputManagerCallback.Stub() { + ITvInputManagerCallback managerCallback = new ITvInputManagerCallback.Stub() { @Override public void onInputStateChanged(String inputId, int state) { synchronized (mLock) { @@ -921,7 +919,7 @@ public final class TvInputManager { }; try { if (mService != null) { - mService.registerCallback(mManagerCallback, mUserId); + mService.registerCallback(managerCallback, mUserId); List<TvInputInfo> infos = mService.getTvInputList(mUserId); synchronized (mLock) { for (TvInputInfo info : infos) { diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index ac8ad30..444969f 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -88,7 +88,6 @@ class TvInputHardwareManager implements TvInputHal.Callback { private final Map<String, TvInputInfo> mInputMap = new ArrayMap<>(); private final AudioManager mAudioManager; - private IHdmiControlService mHdmiControlService; private final IHdmiHotplugEventListener mHdmiHotplugEventListener = new HdmiHotplugEventListener(); private final IHdmiDeviceEventListener mHdmiDeviceEventListener = new HdmiDeviceEventListener(); @@ -121,15 +120,15 @@ class TvInputHardwareManager implements TvInputHal.Callback { public void onBootPhase(int phase) { if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { - mHdmiControlService = IHdmiControlService.Stub.asInterface(ServiceManager.getService( - Context.HDMI_CONTROL_SERVICE)); - if (mHdmiControlService != null) { + IHdmiControlService hdmiControlService = IHdmiControlService.Stub.asInterface( + ServiceManager.getService(Context.HDMI_CONTROL_SERVICE)); + if (hdmiControlService != null) { try { - mHdmiControlService.addHotplugEventListener(mHdmiHotplugEventListener); - mHdmiControlService.addDeviceEventListener(mHdmiDeviceEventListener); - mHdmiControlService.addSystemAudioModeChangeListener( + hdmiControlService.addHotplugEventListener(mHdmiHotplugEventListener); + hdmiControlService.addDeviceEventListener(mHdmiDeviceEventListener); + hdmiControlService.addSystemAudioModeChangeListener( mHdmiSystemAudioModeChangeListener); - mHdmiDeviceList.addAll(mHdmiControlService.getInputDevices()); + mHdmiDeviceList.addAll(hdmiControlService.getInputDevices()); } catch (RemoteException e) { Slog.w(TAG, "Error registering listeners to HdmiControlService:", e); } |