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

Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-13 01:34:43 +00:00
committed by Android (Google) Code Review
parent 2ddb92f2d9 830f4db231
commit 43dc06a9a9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/java/android/net/wifi/aware/WifiAwareSession.java
View File

@@ -67,6 +67,7 @@ public class WifiAwareSession implements AutoCloseable {
* An application may re-attach after a destroy using * An application may re-attach after a destroy using
* {@link WifiAwareManager#attach(AttachCallback, Handler)} . * {@link WifiAwareManager#attach(AttachCallback, Handler)} .
*/ */
@Override
public void close() { public void close() {
WifiAwareManager mgr = mMgr.get(); WifiAwareManager mgr = mMgr.get();
if (mgr == null) { if (mgr == null) {

2
wifi/java/android/net/wifi/p2p/WifiP2pManager.java
View File

@@ -683,7 +683,7 @@ public class WifiP2pManager {
private DnsSdTxtRecordListener mDnsSdTxtListener; private DnsSdTxtRecordListener mDnsSdTxtListener;
private UpnpServiceResponseListener mUpnpServRspListener; private UpnpServiceResponseListener mUpnpServRspListener;
private HashMap<Integer, Object> mListenerMap = new HashMap<Integer, Object>(); private HashMap<Integer, Object> mListenerMap = new HashMap<Integer, Object>();
private Object mListenerMapLock = new Object(); private final Object mListenerMapLock = new Object();
private int mListenerKey = 0; private int mListenerKey = 0;
private AsyncChannel mAsyncChannel; private AsyncChannel mAsyncChannel;