summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-11 10:49:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-11 10:49:10 -0700
commit03422d262685f1b665e736c291f9fd01124c2416 (patch)
tree56118f98b03bdeaf7f00b5f89347d8d6286d530c /wifi
parentabc7f5438c2b63864ba964f155d1efe7ea006803 (diff)
parente9aad4ae31caeb00f95d83119c2020f4cb5f345c (diff)
downloadframeworks_base-03422d262685f1b665e736c291f9fd01124c2416.zip
frameworks_base-03422d262685f1b665e736c291f9fd01124c2416.tar.gz
frameworks_base-03422d262685f1b665e736c291f9fd01124c2416.tar.bz2
am e9aad4ae: Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev
* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c': Fix issue #10688644: Java crash in com.android.phone:
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java4
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;
}