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

Commit 38b3257b authored by Jae Seo's avatar Jae Seo
Browse files

TIF: Convert fields to local variables 

Change-Id: Ide6c5ad36229410f30f7929c6dd511945d48aa6f
parent 8fa24e91

media/java/android/media/tv/TvInputManager.java

+2 −4
Original line number Diff line number Diff line
@@ -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) {

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

+7 −8
Original line number Diff line number Diff line
@@ -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);

                }