Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE by pressing Volume Up/Down" am: fca5ee0bb8

Browse Source 
am: bd57a4d8a1

Change-Id: I23595e55b5c38cecb39272f7c739c27abe1eddb3
This commit is contained in:
Dan Zhang
2018-01-18 23:16:49 +00:00
committed by android-build-merger
parent 3a05ecd714 bd57a4d8a1
commit cc07fa73a1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -1018,6 +1018,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
void changeVolume(int curVolume, int delta, int maxVolume) {
assertRunOnServiceThread();
if (getAvrDeviceInfo() == null) {
// On initialization process, getAvrDeviceInfo() may return null and cause exception
return;
}
if (delta == 0 || !isSystemAudioActivated()) {
return;
}
@@ -1047,6 +1051,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
void changeMute(boolean mute) {
assertRunOnServiceThread();
if (getAvrDeviceInfo() == null) {
// On initialization process, getAvrDeviceInfo() may return null and cause exception
return;
}
HdmiLogger.debug("[A]:Change mute:%b", mute);
synchronized (mLock) {
if (mSystemAudioMute == mute) {