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

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

Browse Source 
am: aa79f03ca6

Change-Id: Id0752a1ddada27d43ff8da59b2ae0b96dd92d29c
This commit is contained in:
Jaewan Kim
2018-03-07 11:44:29 +00:00
committed by android-build-merger
parent e09bf4f7cd aa79f03ca6
commit 2c10f2e660
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaSessionService2.java
View File

@@ -173,10 +173,12 @@ public abstract class MediaSessionService2 extends Service {
/** /**
* Get instance of the {@link MediaSession2} that you've previously created with the * Get instance of the {@link MediaSession2} that you've previously created with the
* {@link #onCreateSession} for this service. * {@link #onCreateSession} for this service.
* <p>
* This may be {@code null} before the {@link #onCreate()} is finished.
* *
* @return created session * @return created session
*/ */
public final MediaSession2 getSession() { public final @Nullable MediaSession2 getSession() {
return mProvider.getSession_impl(); return mProvider.getSession_impl();
} }