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

Merge "Ensure members are non-null in callback" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-13 11:00:25 +00:00
committed by Android (Google) Code Review
parent 5a0b48a13d 623122cd98
commit f0927b0726
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/session/MediaSessionManager.java
View File

@@ -775,8 +775,7 @@ public final class MediaSessionManager {
public void run() {
final Context context = mContext;
if (context != null) {
ArrayList<MediaController> controllers
= new ArrayList<MediaController>();
ArrayList<MediaController> controllers = new ArrayList<>();
int size = tokens.size();
for (int i = 0; i < size; i++) {
controllers.add(new MediaController(context, tokens.get(i)));
@@ -814,10 +813,16 @@ public final class MediaSessionManager {
private final ISessionTokensListener.Stub mStub = new ISessionTokensListener.Stub() {
@Override
public void onSessionTokensChanged(final List<Bundle> bundles) {
mExecutor.execute(() -> {
List<SessionToken2> tokens = toTokenList(mContext, bundles);
mListener.onSessionTokensChanged(tokens);
});
final Executor executor = mExecutor;
if (executor != null) {
executor.execute(() -> {
final Context context = mContext;
final OnSessionTokensChangedListener listener = mListener;
if (context != null && listener != null) {
listener.onSessionTokensChanged(toTokenList(context, bundles));
}
});
}
}
};