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

Fix NPE in BT Settings launch from a shortcut.

Browse Source 
Bug: 3089335
This commit is contained in:
Amith Yamasani
2010-10-13 13:33:32 -07:00
parent 4747950d8e
commit 290ba7c1ae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -41,11 +41,10 @@ import android.preference.CheckBoxPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ContextMenu.ContextMenuInfo;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import java.util.List; import java.util.List;
@@ -148,7 +147,8 @@ public class BluetoothSettings extends SettingsPreferenceFragment
final Intent intent = activity.getIntent(); final Intent intent = activity.getIntent();
// This additional argument comes from PreferenceScreen (See TetherSettings.java). // This additional argument comes from PreferenceScreen (See TetherSettings.java).
String action = getArguments().getString(ACTION); Bundle args = getArguments();
String action = args != null ? args.getString(ACTION) : null;
if (TextUtils.isEmpty(action)) { if (TextUtils.isEmpty(action)) {
action = intent.getAction(); action = intent.getAction();
} }