Skip to content

Commit db831da

Browse files
committed
Fix permission accessing getCurrentUser
Bug: 7174737 Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
1 parent 61e8180 commit db831da

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,11 @@ public WifiInfo getConnectionInfo() {
836836
*/
837837
public List<ScanResult> getScanResults() {
838838
enforceAccessPermission();
839-
if (UserHandle.getCallingUserId() != ActivityManager.getCurrentUser()) {
839+
int userId = UserHandle.getCallingUserId();
840+
long ident = Binder.clearCallingIdentity();
841+
int currentUser = ActivityManager.getCurrentUser();
842+
Binder.restoreCallingIdentity(ident);
843+
if (userId != currentUser) {
840844
return new ArrayList<ScanResult>();
841845
} else {
842846
return mWifiStateMachine.syncGetScanResultsList();

0 commit comments

Comments
 (0)