From db831da426602f36e4ccf2eae64e999fcc52736a Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Sun, 16 Sep 2012 17:39:26 -0700
Subject: [PATCH] Fix permission accessing getCurrentUser

Bug: 7174737
Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
---
 services/java/com/android/server/WifiService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 68ac38a8c5e04..2cae48b241594 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -836,7 +836,11 @@ public class WifiService extends IWifiManager.Stub {
      */
     public List<ScanResult> getScanResults() {
         enforceAccessPermission();
-        if (UserHandle.getCallingUserId() != ActivityManager.getCurrentUser()) {
+        int userId = UserHandle.getCallingUserId();
+        long ident = Binder.clearCallingIdentity();
+        int currentUser = ActivityManager.getCurrentUser();
+        Binder.restoreCallingIdentity(ident);
+        if (userId != currentUser) {
             return new ArrayList<ScanResult>();
         } else {
             return mWifiStateMachine.syncGetScanResultsList();