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

[Companion] Prevent NPE in CallbackProxy

Browse Source 
Fixes: 63383044
Test: Ensure all fields of CompanionDeviceManager.CallbackProxy are
null-checked in onSuccess and onFailure
Change-Id: If95a46686f74d184bccfcb2d8c8195add4747a07
This commit is contained in:
Eugene Susla
2017-07-07 14:06:14 -07:00
parent 150fec445a
commit 3a74c7ac8e
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