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

Ensure members are non-null in callback

Browse Source 
Bug: 74570008
Test: runtest-cts-MediaComponents -r 100
Change-Id: I59590afae4e67fa8a90f8a7b4a6be58ce54e2806
This commit is contained in:
Christofer Åkersten
2018-03-13 13:30:06 +09:00
parent 660a7639ca
commit 623122cd98
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));
}
});
}
}
};