PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8ad8bfd9: Merge "Use the application name instead of package." into klp-dev

Browse Source 
* commit '8ad8bfd9aa871473a3cd1546bed34a366bfaa74f':
  Use the application name instead of package.
This commit is contained in:
Robert Greenwalt
2013-09-06 16:37:52 -07:00
committed by Android Git Automerger
parent f37120b998 8ad8bfd9aa
commit 0c6790a745
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiScanModeActivity.java
View File

@@ -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;