diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-06 23:35:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-06 23:35:46 +0000 |
| commit | 8ad8bfd9aa871473a3cd1546bed34a366bfaa74f (patch) | |
| tree | b8da0a3a7cbd10ddda65303aa8e9224891bd5782 /src/com | |
| parent | 4c7de61320f3ea1df8d5cdd3d0645830b67722ea (diff) | |
| parent | 994807b1d2f33698a3e309b956a2fb467444e4d2 (diff) | |
| download | packages_apps_Settings-8ad8bfd9aa871473a3cd1546bed34a366bfaa74f.zip packages_apps_Settings-8ad8bfd9aa871473a3cd1546bed34a366bfaa74f.tar.gz packages_apps_Settings-8ad8bfd9aa871473a3cd1546bed34a366bfaa74f.tar.bz2 | |
Merge "Use the application name instead of package." into klp-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiScanModeActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index b83b22f..4133eb8 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -24,6 +24,8 @@ import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; import android.provider.Settings; @@ -43,7 +45,13 @@ public class WifiScanModeActivity extends Activity { if (savedInstanceState == null) { if (intent != null && intent.getAction() .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) { + ApplicationInfo ai; mApp = getCallingPackage(); + try { + PackageManager pm = getPackageManager(); + ai = pm.getApplicationInfo(mApp, 0); + mApp = (String)pm.getApplicationLabel(ai); + } catch (PackageManager.NameNotFoundException e) { } } else { finish(); return; |