From 994807b1d2f33698a3e309b956a2fb467444e4d2 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Tue, 30 Jul 2013 15:46:25 -0700
Subject: [PATCH] Use the application name instead of package.

bug:10094017
Change-Id: I92341a819d13169c710f0d383f362796ee3ccf61
---
 src/com/android/settings/wifi/WifiScanModeActivity.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index b83b22f0b0c..4133eb81986 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;