Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am: 43dc06a9a9" into oc-dr1-dev-plus-aosp

wifi/java/android/net/wifi/aware/WifiAwareSession.java

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

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

@@ -683,7 +683,7 @@ public class WifiP2pManager {
         private DnsSdTxtRecordListener mDnsSdTxtListener;
         private UpnpServiceResponseListener mUpnpServRspListener;
         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 AsyncChannel mAsyncChannel;