diff options
| author | 2025-03-21 16:26:04 -0700 | |
|---|---|---|
| committer | 2025-03-21 16:26:04 -0700 | |
| commit | da844144fd9c5df04fe8ac225660808642ef0040 (patch) | |
| tree | 3b5fb58384f4fbaa25f26b6af2dd999acb0af5e5 /framework/java | |
| parent | 8a6b0e8611f837c15b325e61b814745a9422f78a (diff) | |
| parent | 739e49277de8e110259243c7363cd548efc3b856 (diff) | |
Merge "Retrieve the attribution tag and package name when a multicast lock is acquired." into main
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/net/wifi/IWifiManager.aidl | 5 | ||||
| -rw-r--r-- | framework/java/android/net/wifi/WifiManager.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/framework/java/android/net/wifi/IWifiManager.aidl b/framework/java/android/net/wifi/IWifiManager.aidl index 2382f94382..9e126e3c95 100644 --- a/framework/java/android/net/wifi/IWifiManager.aidl +++ b/framework/java/android/net/wifi/IWifiManager.aidl @@ -228,9 +228,10 @@ interface IWifiManager { boolean isMulticastEnabled(); - void acquireMulticastLock(IBinder binder, String tag); + void acquireMulticastLock( + IBinder binder, String lockTag, String attributionTag, String packageName); - void releaseMulticastLock(IBinder binder, String tag); + void releaseMulticastLock(IBinder binder, String lockTag); void updateInterfaceIpState(String ifaceName, int mode); diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java index 0ebf06fa5d..c642e04dc8 100644 --- a/framework/java/android/net/wifi/WifiManager.java +++ b/framework/java/android/net/wifi/WifiManager.java @@ -8465,7 +8465,8 @@ public class WifiManager { synchronized (mBinder) { if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) { try { - mService.acquireMulticastLock(mBinder, mTag); + mService.acquireMulticastLock(mBinder, mTag, + mContext.getAttributionTag(), mContext.getOpPackageName()); synchronized (WifiManager.this) { if (mActiveLockCount >= MAX_ACTIVE_LOCKS) { mService.releaseMulticastLock(mBinder, mTag); |