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

Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3 am: 155d9ba6fc

Browse Source 
am: 3e8f90a62b

Change-Id: Ia909905095094f33c536774235d49060ca2d63c3
This commit is contained in:
Etan Cohen
2017-01-31 01:40:49 +00:00
committed by android-build-merger
parent b67f853f6f 3e8f90a62b
commit 4717b99a9d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/aware/WifiAwareManager.java
View File

@@ -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);