diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-11 16:43:22 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2013-09-11 16:43:22 -0700 |
| commit | 8d717b917cfe0b7d47743e2c80fd22131048ef3a (patch) | |
| tree | 8bdd9edff76f976561c7b24f189b202c2c626ac8 /wifi | |
| parent | f8f6ef02047808a1cfbfd0a4f64f031965558ee1 (diff) | |
| parent | 03422d262685f1b665e736c291f9fd01124c2416 (diff) | |
| download | frameworks_base-8d717b917cfe0b7d47743e2c80fd22131048ef3a.zip frameworks_base-8d717b917cfe0b7d47743e2c80fd22131048ef3a.tar.gz frameworks_base-8d717b917cfe0b7d47743e2c80fd22131048ef3a.tar.bz2 | |
resolved conflicts for merge of 03422d26 to master
Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 5f5d54f..2a5b4da 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -833,7 +833,7 @@ public class WifiManager { */ public List<BatchedScanResult> getBatchedScanResults() { try { - return mService.getBatchedScanResults(mContext.getBasePackageName()); + return mService.getBatchedScanResults(mContext.getOpPackageName()); } catch (RemoteException e) { return null; } @@ -883,7 +883,7 @@ public class WifiManager { */ public List<ScanResult> getScanResults() { try { - return mService.getScanResults(mContext.getBasePackageName()); + return mService.getScanResults(mContext.getOpPackageName()); } catch (RemoteException e) { return null; } |