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

Commit 3793c020 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy
Browse files

Wifi: Pass the multicast wakelock TAG in release 

In current implementation, when the same UID allocates, and acquires
multiple wiFi multicast wakelocks, the tag associated with the lock is
passed in the acquire method, and stored in the multicasters list.
However, when the UID tries to release the lock, the tag is not included
in the method call, and all the wakelocks found in the list of
multicasters for this UID are released.
This behavior does not reflect the expected behavior of the App using the
API

This commit contributes to the fix of this situation by passing the
wakelock tag in the release method, to enable the release of the proper
wakelock.

Bug: 70691435
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I4e4efd2ce75e77cde54ba92217364b83f2c7c401
parent deee3950

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
@@ -3390,7 +3390,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");

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

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

                    try {

                        mService.releaseMulticastLock();

                        mService.releaseMulticastLock(mTag);

                        synchronized (WifiManager.this) {

                            mActiveLockCount--;

                        }