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

Fixes Settings app crashing when NfcAdapter is null

Browse Source 
If a device doesn't support NFC then
android.settings.NFCSHARING_SETTINGS and
android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT intents shouldn't
do anything and gracefully exit.

Test: Manual; Emulate a non-NFC device and test with apks sending intents
Bug: 80094104
Bug: 80092438
Change-Id: I5b3c3fdd582679e2cb16f474ef3331bc246b0d42
This commit is contained in:
Ruchi Kandoi
2018-08-01 13:30:35 -07:00
parent d22671aed1
commit 37efa64d63
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -53,6 +53,8 @@ public class AndroidBeam extends InstrumentedFragment
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
if (mNfcAdapter == null)
getActivity().finish();
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@@ -90,7 +92,6 @@ public class AndroidBeam extends InstrumentedFragment
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
SettingsActivity activity = (SettingsActivity) getActivity(); SettingsActivity activity = (SettingsActivity) getActivity();
mOldActivityTitle = activity.getActionBar().getTitle(); mOldActivityTitle = activity.getActionBar().getTitle();

6
src/com/android/settings/nfc/PaymentDefaultDialog.java
View File

@@ -42,7 +42,11 @@ public final class PaymentDefaultDialog extends AlertActivity implements
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mBackend = new PaymentBackend(this); try {
mBackend = new PaymentBackend(this);
} catch (NullPointerException e) {
finish();
}
Intent intent = getIntent(); Intent intent = getIntent();
ComponentName component = intent.getParcelableExtra( ComponentName component = intent.getParcelableExtra(
CardEmulation.EXTRA_SERVICE_COMPONENT); CardEmulation.EXTRA_SERVICE_COMPONENT);