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

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-12 18:11:34 +00:00
committed by Android (Google) Code Review
parent b07f49dd92 3a74c7ac8e
commit 9e419d3082
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -280,12 +280,24 @@ public final class CompanionDeviceManager {
@Override
public void onSuccess(PendingIntent launcher) {
mHandler.post(() -> mCallback.onDeviceFound(launcher.getIntentSender()));
Handler handler = mHandler;
if (handler == null) return;
handler.post(() -> {
Callback callback = mCallback;
if (callback == null) return;
callback.onDeviceFound(launcher.getIntentSender());
});
}
@Override
public void onFailure(CharSequence reason) {
mHandler.post(() -> mCallback.onFailure(reason));
Handler handler = mHandler;
if (handler == null) return;
handler.post(() -> {
Callback callback = mCallback;
if (callback == null) return;
callback.onFailure(reason);
});
}
@Override