diff options
| author | Paul McLean <pmclean@google.com> | 2015-06-09 17:20:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 17:20:50 +0000 |
| commit | dd0db9f63d081514b8e9e39d0f274cdb8de6f535 (patch) | |
| tree | b3fb39826a36fe92dbdee91ef870d6c4950f3fcf /media/java | |
| parent | c87cd46dc7b8989d733639ae04c4ad2ff334666a (diff) | |
| parent | 5be68ede1943354371233ed2511e308f83b77932 (diff) | |
| download | frameworks_base-dd0db9f63d081514b8e9e39d0f274cdb8de6f535.zip frameworks_base-dd0db9f63d081514b8e9e39d0f274cdb8de6f535.tar.gz frameworks_base-dd0db9f63d081514b8e9e39d0f274cdb8de6f535.tar.bz2 | |
Merge "Adding default handler to (re)Routing callbacks where no handler is provided." into mnc-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioRecord.java | 3 | ||||
| -rw-r--r-- | media/java/android/media/AudioTrack.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 7eb1357..3cbc405 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -1277,7 +1277,8 @@ public class AudioRecord native_enableDeviceCallback(); } mRoutingChangeListeners.put( - listener, new NativeRoutingEventHandlerDelegate(this, listener, handler)); + listener, new NativeRoutingEventHandlerDelegate(this, listener, + handler != null ? handler : new Handler(mInitializationLooper))); } } } diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 7293c6c..f395cb3 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -2244,7 +2244,8 @@ public class AudioTrack native_enableDeviceCallback(); } mRoutingChangeListeners.put( - listener, new NativeRoutingEventHandlerDelegate(this, listener, handler)); + listener, new NativeRoutingEventHandlerDelegate(this, listener, + handler != null ? handler : new Handler(mInitializationLooper))); } } } |