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

Commit 24da93d9 authored by Yan Han's avatar Yan Han
Browse files

Add call to onBootPhase to tests that use HdmiControlService 

Some system services are accessed and cached in a call to
HdmiControlService#onBootPhase(SystemService#SYSTEM_SERVICES_READY).
Since a lot of the code in the HDMI framework accesses other system
services, tests that use HdmiControlService may cause null pointer
exceptions as the codebase changes. This CL proactively adds this
call to avoid future breakages.

Test: atest com.android.server.hdmi
Bug: 205817707
Change-Id: I684d188e563ff9089deacd1009f511e50a08f255
parent 6613fd3f

services/tests/servicestests/src/com/android/server/hdmi/ActiveSourceActionTest.java

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public class ActiveSourceActionTest { 
        mHdmiControlService.setCecController(hdmiCecController);

        mHdmiControlService.setHdmiMhlController(HdmiMhlControllerStub.create(mHdmiControlService));

        mHdmiControlService.initService();

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mPowerManager = new FakePowerManagerWrapper(mContextSpy);

        mHdmiControlService.setPowerManager(mPowerManager);

        mPhysicalAddress = 0x2000;
@@ -154,7 +155,6 @@ public class ActiveSourceActionTest { 
                mHdmiControlService);

        audioDevice.init();

        mLocalDevices.add(audioDevice);

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        mTestLooper.dispatchAll();

services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.hdmi;



import static com.android.server.SystemService.PHASE_SYSTEM_SERVICES_READY;

import static com.android.server.hdmi.Constants.ADDR_BROADCAST;

import static com.android.server.hdmi.Constants.ADDR_TV;

import static com.android.server.hdmi.HdmiControlService.INITIATED_BY_ENABLE_CEC;
@@ -111,6 +112,7 @@ public class DevicePowerStatusActionTest { 
        mHdmiControlService.setCecController(hdmiCecController);

        mHdmiControlService.setHdmiMhlController(HdmiMhlControllerStub.create(mHdmiControlService));

        mHdmiControlService.initService();

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mPowerManager = new FakePowerManagerWrapper(mContextSpy);

        mHdmiControlService.setPowerManager(mPowerManager);

        mPhysicalAddress = 0x2000;

services/tests/servicestests/src/com/android/server/hdmi/DeviceSelectActionFromPlaybackTest.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_ON; 
import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_STANDBY;

import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_TRANSIENT_TO_ON;



import static com.android.server.SystemService.PHASE_SYSTEM_SERVICES_READY;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_1;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_2;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_3;
@@ -136,6 +137,7 @@ public class DeviceSelectActionFromPlaybackTest { 


        mLocalDevices.add(mHdmiCecLocalDevicePlayback);

        mHdmiControlService.initService();

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        mNativeWrapper.setPhysicalAddress(0x0000);

        mPowerManager = new FakePowerManagerWrapper(context);

services/tests/servicestests/src/com/android/server/hdmi/DeviceSelectActionFromTvTest.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_ON; 
import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_STANDBY;

import static android.hardware.hdmi.HdmiControlManager.POWER_STATUS_TRANSIENT_TO_ON;



import static com.android.server.SystemService.PHASE_SYSTEM_SERVICES_READY;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_1;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_2;

import static com.android.server.hdmi.Constants.ADDR_TV;
@@ -145,6 +146,7 @@ public class DeviceSelectActionFromTvTest { 
                                 true, false, false);

        mNativeWrapper.setPortInfo(hdmiPortInfos);

        mHdmiControlService.initService();

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mPowerManager = new FakePowerManagerWrapper(context);

        mHdmiControlService.setPowerManager(mPowerManager);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.server.hdmi;



import static com.android.server.SystemService.PHASE_SYSTEM_SERVICES_READY;

import static com.android.server.hdmi.Constants.ABORT_UNRECOGNIZED_OPCODE;

import static com.android.server.hdmi.Constants.ADDR_AUDIO_SYSTEM;

import static com.android.server.hdmi.Constants.ADDR_BROADCAST;
@@ -151,6 +152,7 @@ public class HdmiCecLocalDevicePlaybackTest { 
        mNativeWrapper.setPortInfo(hdmiPortInfos);

        mNativeWrapper.setPortConnectionStatus(1, true);

        mHdmiControlService.initService();

        mHdmiControlService.onBootPhase(PHASE_SYSTEM_SERVICES_READY);

        mPowerManager = new FakePowerManagerWrapper(context);

        mHdmiControlService.setPowerManager(mPowerManager);

        mHdmiControlService.setPowerManagerInternal(mPowerManagerInternal);