Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d457144 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into... 

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

Change-Id: I6db6577b701977806cd14014a4700d71619915c4
parents dc83dc39 1bbc25d9

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;