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

Merge "Fixed device info reporting for media player" into sc-dev

Browse Source
This commit is contained in:
Oscar Azucena
2021-02-26 03:05:07 +00:00
committed by Android (Google) Code Review
parent 24eadb70ce 7f9d814df9
commit f4e58509a7
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/AudioTrack.java
View File

@@ -3526,8 +3526,9 @@ public class AudioTrack extends PlayerBase
native_enableDeviceCallback(); native_enableDeviceCallback();
return true; return true;
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// Fail silently as track state could have changed in between start if (Log.isLoggable(TAG, Log.DEBUG)) {
// and enabling routing callback, return false to indicate not enabled Log.d(TAG, "testEnableNativeRoutingCallbacks failed", e);
}
} }
} }
return false; return false;
@@ -3577,7 +3578,7 @@ public class AudioTrack extends PlayerBase
Handler handler) { Handler handler) {
synchronized (mRoutingChangeListeners) { synchronized (mRoutingChangeListeners) {
if (listener != null && !mRoutingChangeListeners.containsKey(listener)) { if (listener != null && !mRoutingChangeListeners.containsKey(listener)) {
testEnableNativeRoutingCallbacksLocked(); mEnableSelfRoutingMonitor = testEnableNativeRoutingCallbacksLocked();
mRoutingChangeListeners.put( mRoutingChangeListeners.put(
listener, new NativeRoutingEventHandlerDelegate(this, listener, listener, new NativeRoutingEventHandlerDelegate(this, listener,
handler != null ? handler : new Handler(mInitializationLooper))); handler != null ? handler : new Handler(mInitializationLooper)));

21
media/java/android/media/MediaPlayer.java
View File

@@ -1360,6 +1360,7 @@ public class MediaPlayer extends PlayerBase
private void startImpl() { private void startImpl() {
baseStart(0); // unknown device at this point baseStart(0); // unknown device at this point
stayAwake(true); stayAwake(true);
tryToEnableNativeRoutingCallback();
_start(); _start();
} }
@@ -1385,6 +1386,7 @@ public class MediaPlayer extends PlayerBase
stayAwake(false); stayAwake(false);
_stop(); _stop();
baseStop(); baseStop();
tryToDisableNativeRoutingCallback();
} }
private native void _stop() throws IllegalStateException; private native void _stop() throws IllegalStateException;
@@ -1526,8 +1528,9 @@ public class MediaPlayer extends PlayerBase
native_enableDeviceCallback(true); native_enableDeviceCallback(true);
return true; return true;
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// Fail silently as media player state could have changed in between start if (Log.isLoggable(TAG, Log.DEBUG)) {
// and enabling routing callback, return false to indicate not enabled Log.d(TAG, "testEnableNativeRoutingCallbacks failed", e);
}
} }
} }
return false; return false;
@@ -1590,7 +1593,7 @@ public class MediaPlayer extends PlayerBase
Handler handler) { Handler handler) {
synchronized (mRoutingChangeListeners) { synchronized (mRoutingChangeListeners) {
if (listener != null && !mRoutingChangeListeners.containsKey(listener)) { if (listener != null && !mRoutingChangeListeners.containsKey(listener)) {
testEnableNativeRoutingCallbacksLocked(); mEnableSelfRoutingMonitor = testEnableNativeRoutingCallbacksLocked();
mRoutingChangeListeners.put( mRoutingChangeListeners.put(
listener, new NativeRoutingEventHandlerDelegate(this, listener, listener, new NativeRoutingEventHandlerDelegate(this, listener,
handler != null ? handler : mEventHandler)); handler != null ? handler : mEventHandler));
@@ -3483,9 +3486,6 @@ public class MediaPlayer extends PlayerBase
case MEDIA_STOPPED: case MEDIA_STOPPED:
{ {
tryToDisableNativeRoutingCallback();
// FIXME see b/179218630
//baseStop();
TimeProvider timeProvider = mTimeProvider; TimeProvider timeProvider = mTimeProvider;
if (timeProvider != null) { if (timeProvider != null) {
timeProvider.onStopped(); timeProvider.onStopped();
@@ -3494,18 +3494,9 @@ public class MediaPlayer extends PlayerBase
break; break;
case MEDIA_STARTED: case MEDIA_STARTED:
{
// FIXME see b/179218630
//baseStart(native_getRoutedDeviceId());
tryToEnableNativeRoutingCallback();
}
// fall through // fall through
case MEDIA_PAUSED: case MEDIA_PAUSED:
{ {
// FIXME see b/179218630
//if (msg.what == MEDIA_PAUSED) {
// basePause();
//}
TimeProvider timeProvider = mTimeProvider; TimeProvider timeProvider = mTimeProvider;
if (timeProvider != null) { if (timeProvider != null) {
timeProvider.onPaused(msg.what == MEDIA_PAUSED); timeProvider.onPaused(msg.what == MEDIA_PAUSED);