Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev

2018-03-07 11:23:29 +00:00
parent be1033fda2 b10e372284
commit aa79f03ca6
1 changed files with 3 additions and 1 deletions
--- a/media/java/android/media/MediaSessionService2.java
+++ b/media/java/android/media/MediaSessionService2.java
@@ -173,10 +173,12 @@ public abstract class MediaSessionService2 extends Service {
    /**
     * Get instance of the {@link MediaSession2} that you've previously created with the
     * {@link #onCreateSession} for this service.
+     * <p>
+     * This may be {@code null} before the {@link #onCreate()} is finished.
     *
     * @return created session
     */
-    public final MediaSession2 getSession() {
+    public final @Nullable MediaSession2 getSession() {
        return mProvider.getSession_impl();
    }