Skip to content

Commit 330b187

Browse files
committed
Return empty scan results for background user
Bug: 7087342 Change-Id: I62493e5004111311b7ac9b7610c85e6784e2c7e4
1 parent fd2ccaf commit 330b187

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

services/java/com/android/server/WifiService.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.android.server;
1818

19+
import android.app.ActivityManager;
1920
import android.app.AlarmManager;
2021
import android.app.Notification;
2122
import android.app.NotificationManager;
@@ -55,6 +56,7 @@
5556
import android.os.RemoteException;
5657
import android.os.ServiceManager;
5758
import android.os.SystemProperties;
59+
import android.os.UserHandle;
5860
import android.os.WorkSource;
5961
import android.provider.Settings;
6062
import android.text.TextUtils;
@@ -834,7 +836,11 @@ public WifiInfo getConnectionInfo() {
834836
*/
835837
public List<ScanResult> getScanResults() {
836838
enforceAccessPermission();
837-
return mWifiStateMachine.syncGetScanResultsList();
839+
if (UserHandle.getCallingUserId() != ActivityManager.getCurrentUser()) {
840+
return new ArrayList<ScanResult>();
841+
} else {
842+
return mWifiStateMachine.syncGetScanResultsList();
843+
}
838844
}
839845

840846
/**

0 commit comments

Comments
 (0)