diff options
| author | 2017-01-31 01:36:18 +0000 | |
|---|---|---|
| committer | 2017-01-31 01:36:18 +0000 | |
| commit | 3e8f90a62bc7eb2be57ada8186d3b9c955c61280 (patch) | |
| tree | b83990087128eae0043dfebd6f2ecc02310d06bd | |
| parent | 5445bdda2818fd1e8db343513df8177df60141ca (diff) | |
| parent | 155d9ba6fcd99f261808ac43d9bba3e00c5d3ec0 (diff) | |
Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3
am: 155d9ba6fc
Change-Id: I222a30730ec6199a53c91fb6c3fd4b96846ac7d3
| -rw-r--r-- | wifi/java/android/net/wifi/aware/WifiAwareManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java index 043925edc5f0..a9e38cef97e8 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java @@ -706,7 +706,11 @@ public class WifiAwareManager { attachCallback.onAttachFailed(); break; case CALLBACK_IDENTITY_CHANGED: - identityChangedListener.onIdentityChanged((byte[]) msg.obj); + if (identityChangedListener == null) { + Log.e(TAG, "CALLBACK_IDENTITY_CHANGED: null listener."); + } else { + identityChangedListener.onIdentityChanged((byte[]) msg.obj); + } break; case CALLBACK_RANGING_SUCCESS: { RttManager.RttListener listener = getAndRemoveRangingListener(msg.arg1); |