Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return empty scan results for background user" into jb-mr1-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-09-16 15:23:54 -07:00
committed by Android (Google) Code Review
parent df5bdd721b 330b187574
commit 3849490c63
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/WifiService.java
View File

@@ -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();
}
}
/**