From 330b1875747561e1f4dfdc062bf15d3c345806ed Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Sun, 16 Sep 2012 12:27:57 -0700
Subject: [PATCH] Return empty scan results for background user

Bug: 7087342
Change-Id: I62493e5004111311b7ac9b7610c85e6784e2c7e4
---
 services/java/com/android/server/WifiService.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 7ed4f8a39b210..c139e0c547b04 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -16,6 +16,7 @@
 
 package com.android.server;
 
+import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -55,6 +56,7 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.WorkSource;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -834,7 +836,11 @@ public class WifiService extends IWifiManager.Stub {
      */
     public List<ScanResult> getScanResults() {
         enforceAccessPermission();
-        return mWifiStateMachine.syncGetScanResultsList();
+        if (UserHandle.getCallingUserId() != ActivityManager.getCurrentUser()) {
+            return new ArrayList<ScanResult>();
+        } else {
+            return mWifiStateMachine.syncGetScanResultsList();
+        }
     }
 
     /**