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

Don't start Android Beam Activity if feature is not supported

Browse Source 
Test: manual; application using NFCSHARING intent
Bug: 117519147
Change-Id: I2caa881c73e3d5976b7b2666351e773e504a8925
This commit is contained in:
Ruchi Kandoi
2019-01-11 12:53:18 -08:00
parent 05a39bc4ba
commit 8b14531569
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ package com.android.settings.nfc;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
import android.content.pm.PackageManager;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
@@ -52,8 +54,10 @@ public class AndroidBeam extends InstrumentedFragment
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); final Context context = getActivity();
if (mNfcAdapter == null) mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
final PackageManager pm = context.getPackageManager();
if (mNfcAdapter == null || !pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM))
getActivity().finish(); getActivity().finish();
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }