commit d0f1c9d1d3598a23a3d400e6aefc940d1b798bde
author Etan Cohen <etancohen@google.com> Tue Jan 31 01:19:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 31 01:19:49 2017 +0000
tree ade7c67f54adf0d3b5918e6cd850654d1f7f9b1d
parent 54604d9143fb6dbee6f63ea9f11ec99ec44c4345
parent 275f323e865b020cdd76483c8c0a4c859f2085cf

Merge "[AWARE] Minor hardening of manager."

wifi/java/android/net/wifi/aware/WifiAwareManager.java

diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
index 043925ed..a9e38ce 100644
--- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java
+++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
@@ -706,7 +706,11 @@
                             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);