Merge "[AWARE] Minor hardening of manager."

am: d0f1c9d1d3 Change-Id: I182e8c10eea318cf1fd3d3fe4da3275df01f851d
2017-01-31 01:30:24 +00:00
parent 276672d192 d0f1c9d1d3
commit 155d9ba6fc
1 changed files with 5 additions and 1 deletions
--- 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);