summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-12-13 17:03:59 -0800
committerIrfan Sheriff <isheriff@google.com>2011-12-14 10:58:49 -0800
commit8cef06798ef1f67641f8b15165aca39abd6c46ca (patch)
tree421eba65c16f53eee0eb8f7bcfa206f75a514d6f /services
parentd2ea737a1f28b43ce2e01686d64a5cf8243daa49 (diff)
downloadframeworks_base-8cef06798ef1f67641f8b15165aca39abd6c46ca.zip
frameworks_base-8cef06798ef1f67641f8b15165aca39abd6c46ca.tar.gz
frameworks_base-8cef06798ef1f67641f8b15165aca39abd6c46ca.tar.bz2
Track scan count by UID
Helps track down misbehaving apps that are initiating too many scans Bug:5722180 Change-Id: I0bc396cf5e68ed53b900e8a65abb56acdbd8d8a5
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WifiService.java28
1 files changed, 28 insertions, 0 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 016dc82..5208785 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -61,6 +61,7 @@ import android.text.TextUtils;
import android.util.Slog;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -112,6 +113,10 @@ public class WifiService extends IWifiManager.Stub {
private int mScanLocksAcquired;
private int mScanLocksReleased;
+ /* A mapping from UID to scan count */
+ private HashMap<Integer, Integer> mScanCount =
+ new HashMap<Integer, Integer>();
+
private final List<Multicaster> mMulticasters =
new ArrayList<Multicaster>();
private int mMulticastEnabled;
@@ -527,6 +532,15 @@ public class WifiService extends IWifiManager.Stub {
*/
public void startScan(boolean forceActive) {
enforceChangePermission();
+
+ int uid = Binder.getCallingUid();
+ int count = 0;
+ synchronized (mScanCount) {
+ if (mScanCount.containsKey(uid)) {
+ count = mScanCount.get(uid);
+ }
+ mScanCount.put(uid, ++count);
+ }
mWifiStateMachine.startScan(forceActive);
}
@@ -990,6 +1004,13 @@ public class WifiService extends IWifiManager.Stub {
}
mAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerTime, mIdleIntent);
}
+
+ //Start scan stats tracking when device unplugged
+ if (pluggedType == 0) {
+ synchronized (mScanCount) {
+ mScanCount.clear();
+ }
+ }
mPluggedType = pluggedType;
} else if (action.equals(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)) {
int state = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE,
@@ -1180,6 +1201,13 @@ public class WifiService extends IWifiManager.Stub {
pw.println("Locks held:");
mLocks.dump(pw);
+ pw.println("Scan count since last plugged in");
+ synchronized (mScanCount) {
+ for(int sc : mScanCount.keySet()) {
+ pw.println("UID: " + sc + " Scan count: " + mScanCount.get(sc));
+ }
+ }
+
pw.println();
pw.println("WifiWatchdogStateMachine dump");
mWifiWatchdogStateMachine.dump(pw);