diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
commit | b8042fc9b036db0a6692ca853428fc6ab1e60892 (patch) | |
tree | 82669ea5d75238758e22d379a42baeada526219e /android/support | |
parent | 4d01eeaffaa720e4458a118baa137a11614f00f7 (diff) | |
download | android-28-b8042fc9b036db0a6692ca853428fc6ab1e60892.tar.gz |
Import Android SDK Platform P [4719250]HEADmastermainandroidx-work-releaseandroidx-webkit-releaseandroidx-viewpager2-releaseandroidx-versionedparcelable-releaseandroidx-vectordrawable-releaseandroidx-transition-releaseandroidx-sqlite-releaseandroidx-sharetarget-releaseandroidx-security-security-crypto-releaseandroidx-savedstate-releaseandroidx-room-releaseandroidx-recyclerview-releaseandroidx-recyclerview-recyclerview-selection-releaseandroidx-preference-releaseandroidx-paging-releaseandroidx-paging-legacy-releaseandroidx-navigation-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-localbroadcastmanager-releaseandroidx-loader-releaseandroidx-lifecycle-releaseandroidx-jetifier-releaseandroidx-g3-releaseandroidx-fragment-releaseandroidx-exifinterface-releaseandroidx-enterprise-releaseandroidx-core-releaseandroidx-core-core-role-releaseandroidx-coordinatorlayout-releaseandroidx-concurrent-releaseandroidx-compose-releaseandroidx-collection-releaseandroidx-camerax-releaseandroidx-browser-releaseandroidx-biometric-releaseandroidx-benchmark-releaseandroidx-autofill-releaseandroidx-arch-core-releaseandroidx-appcompat-releaseandroidx-annotation-releaseandroidx-annotation-annotation-experimental-releaseandroidx-activity-releaseandroid-arch-work-releaseandroid-arch-navigation-release
/google/data/ro/projects/android/fetch_artifact \
--bid 4719250 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4719250.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9ec0a12c9251b8449dba0d86b0cfdbcca16b0a7c
Diffstat (limited to 'android/support')
-rw-r--r-- | android/support/v4/media/session/MediaControllerCompat.java | 25 | ||||
-rw-r--r-- | android/support/v4/media/session/PlaybackStateCompat.java | 1 |
2 files changed, 17 insertions, 9 deletions
diff --git a/android/support/v4/media/session/MediaControllerCompat.java b/android/support/v4/media/session/MediaControllerCompat.java index 5e6f4eac..4a4ad322 100644 --- a/android/support/v4/media/session/MediaControllerCompat.java +++ b/android/support/v4/media/session/MediaControllerCompat.java @@ -667,13 +667,13 @@ public final class MediaControllerCompat { public static abstract class Callback implements IBinder.DeathRecipient { private final Object mCallbackObj; MessageHandler mHandler; - boolean mHasExtraCallback; + IMediaControllerCallback mIControllerCallback; public Callback() { if (android.os.Build.VERSION.SDK_INT >= 21) { mCallbackObj = MediaControllerCompatApi21.createCallback(new StubApi21(this)); } else { - mCallbackObj = new StubCompat(this); + mCallbackObj = mIControllerCallback = new StubCompat(this); } } @@ -789,6 +789,14 @@ public final class MediaControllerCompat { public void onShuffleModeChanged(@PlaybackStateCompat.ShuffleMode int shuffleMode) { } + /** + * @hide + */ + @RestrictTo(LIBRARY) + public IMediaControllerCallback getIControllerCallback() { + return mIControllerCallback; + } + @Override public void binderDied() { onSessionDestroyed(); @@ -837,7 +845,8 @@ public final class MediaControllerCompat { public void onSessionEvent(String event, Bundle extras) { MediaControllerCompat.Callback callback = mCallback.get(); if (callback != null) { - if (callback.mHasExtraCallback && android.os.Build.VERSION.SDK_INT < 23) { + if (callback.mIControllerCallback != null + && android.os.Build.VERSION.SDK_INT < 23) { // Ignore. ExtraCallback will handle this. } else { callback.onSessionEvent(event, extras); @@ -849,7 +858,7 @@ public final class MediaControllerCompat { public void onPlaybackStateChanged(Object stateObj) { MediaControllerCompat.Callback callback = mCallback.get(); if (callback != null) { - if (callback.mHasExtraCallback) { + if (callback.mIControllerCallback != null) { // Ignore. ExtraCallback will handle this. } else { callback.onPlaybackStateChanged( @@ -1944,7 +1953,7 @@ public final class MediaControllerCompat { if (mExtraBinder != null) { ExtraCallback extraCallback = new ExtraCallback(callback); mCallbackMap.put(callback, extraCallback); - callback.mHasExtraCallback = true; + callback.mIControllerCallback = extraCallback; try { mExtraBinder.registerCallbackListener(extraCallback); } catch (RemoteException e) { @@ -1952,7 +1961,7 @@ public final class MediaControllerCompat { } } else { synchronized (mPendingCallbacks) { - callback.mHasExtraCallback = false; + callback.mIControllerCallback = null; mPendingCallbacks.add(callback); } } @@ -1965,7 +1974,7 @@ public final class MediaControllerCompat { try { ExtraCallback extraCallback = mCallbackMap.remove(callback); if (extraCallback != null) { - callback.mHasExtraCallback = false; + callback.mIControllerCallback = null; mExtraBinder.unregisterCallbackListener(extraCallback); } } catch (RemoteException e) { @@ -2173,7 +2182,7 @@ public final class MediaControllerCompat { for (Callback callback : mPendingCallbacks) { ExtraCallback extraCallback = new ExtraCallback(callback); mCallbackMap.put(callback, extraCallback); - callback.mHasExtraCallback = true; + callback.mIControllerCallback = extraCallback; try { mExtraBinder.registerCallbackListener(extraCallback); } catch (RemoteException e) { diff --git a/android/support/v4/media/session/PlaybackStateCompat.java b/android/support/v4/media/session/PlaybackStateCompat.java index e6420ea0..b9c51caa 100644 --- a/android/support/v4/media/session/PlaybackStateCompat.java +++ b/android/support/v4/media/session/PlaybackStateCompat.java @@ -15,7 +15,6 @@ */ package android.support.v4.media.session; - import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import android.os.Build; |