diff options
| author | Wonsik Kim <wonsik@google.com> | 2014-07-20 23:04:59 +0900 |
|---|---|---|
| committer | Wonsik Kim <wonsik@google.com> | 2014-07-20 22:13:54 +0000 |
| commit | 7f4342e5b8e086fc96a4cb4d6df7e4d0bd3256ba (patch) | |
| tree | d8b10b50290346026d08fd8530413ff609ae5587 /media | |
| parent | 7226b9b62d9c26eda9e2353e8ce35808e51c3fd3 (diff) | |
| download | frameworks_base-7f4342e5b8e086fc96a4cb4d6df7e4d0bd3256ba.zip frameworks_base-7f4342e5b8e086fc96a4cb4d6df7e4d0bd3256ba.tar.gz frameworks_base-7f4342e5b8e086fc96a4cb4d6df7e4d0bd3256ba.tar.bz2 | |
audio: fix too early connection to HdmiControlService
Connect to HdmiControlService on systemReady(), not on constructor.
Change-Id: Ic91467f040fbffa48393e876997bd320ae9500db
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index b01323c..a1a7af9 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -583,11 +583,6 @@ public class AudioService extends IAudioService.Stub { setRotationForAudioSystem(); } - HdmiControlManager hdmiManager = - (HdmiControlManager) mContext.getSystemService(Context.HDMI_CONTROL_SERVICE); - // Null if device is not Tv. - mHdmiTvClient = hdmiManager.getTvClient(); - context.registerReceiver(mReceiver, intentFilter); mUseMasterVolume = context.getResources().getBoolean( @@ -627,6 +622,11 @@ public class AudioService extends IAudioService.Stub { BluetoothProfile.A2DP); } + HdmiControlManager hdmiManager = + (HdmiControlManager) mContext.getSystemService(Context.HDMI_CONTROL_SERVICE); + // Null if device is not Tv. + mHdmiTvClient = hdmiManager.getTvClient(); + sendMsg(mAudioHandler, MSG_CONFIGURE_SAFE_MEDIA_VOLUME_FORCED, SENDMSG_REPLACE, |