diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-28 14:34:28 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-28 14:34:28 -0700 |
commit | 96cdc61c69aa735e65295a50e3e2922425b3c877 (patch) | |
tree | 7d88100a2f15856e87086c6dee8a85cad656e1a4 /services/java/com/android/server/WifiService.java | |
parent | aebadd2cf489948847f262d917ee39cb285815b3 (diff) | |
parent | 1e2e44e900cb9a25d548e27a20d65292a7f321bc (diff) | |
download | frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.zip frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.tar.gz frameworks_base-96cdc61c69aa735e65295a50e3e2922425b3c877.tar.bz2 |
am 1e2e44e9: Merge change 2365 into donut
Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'
* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
Fix wifi multicast API for public use.
Revert "Bug fixes and performance improvements"
Diffstat (limited to 'services/java/com/android/server/WifiService.java')
-rw-r--r-- | services/java/com/android/server/WifiService.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 64d1ba2..5bded50 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -588,6 +588,12 @@ public class WifiService extends IWifiManager.Stub { } + private void enforceMulticastChangePermission() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, + "WifiService"); + } + /** * see {@link WifiManager#getWifiState()} * @return One of {@link WifiManager#WIFI_STATE_DISABLED}, @@ -1935,8 +1941,8 @@ public class WifiService extends IWifiManager.Stub { } } - public void enableMulticast(IBinder binder, String tag) { - enforceChangePermission(); + public void acquireMulticastLock(IBinder binder, String tag) { + enforceMulticastChangePermission(); synchronized (mMulticasters) { mMulticastEnabled++; @@ -1958,8 +1964,8 @@ public class WifiService extends IWifiManager.Stub { } } - public void disableMulticast() { - enforceChangePermission(); + public void releaseMulticastLock() { + enforceMulticastChangePermission(); int uid = Binder.getCallingUid(); synchronized (mMulticasters) { |