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

Commit dfb32165 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Android (Google) Code Review
Browse files

Merge "Wifi: Pass the multicast wakelock TAG in release"

parents cc788c8d 3793c020

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ interface IWifiManager 


    void acquireMulticastLock(IBinder binder, String tag);



    void releaseMulticastLock();

    void releaseMulticastLock(String tag);



    void updateInterfaceIpState(String ifaceName, int mode);

wifi/java/android/net/wifi/WifiManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3434,7 +3434,7 @@ public class WifiManager { 
                        mService.acquireMulticastLock(mBinder, mTag);

                        synchronized (WifiManager.this) {

                            if (mActiveLockCount >= MAX_ACTIVE_LOCKS) {

                                mService.releaseMulticastLock();

                                mService.releaseMulticastLock(mTag);

                                throw new UnsupportedOperationException(

                                        "Exceeded maximum number of wifi locks");

                            }
@@ -3476,7 +3476,7 @@ public class WifiManager { 
            synchronized (mBinder) {

                if (mRefCounted ? (--mRefCount == 0) : (mHeld)) {

                    try {

                        mService.releaseMulticastLock();

                        mService.releaseMulticastLock(mTag);

                        synchronized (WifiManager.this) {

                            mActiveLockCount--;

                        }