diff options
| author | Benjamin Franz <bfranz@google.com> | 2014-10-16 14:39:00 +0100 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2014-10-22 17:49:34 +0100 |
| commit | b708f80d56ba6d6ed110b9b7d1008563689821a4 (patch) | |
| tree | c6848fe3a719966d0750148b7dc40923574a40b3 /src/com/android/nfc/BeamShareActivity.java | |
| parent | f6525245a348abb715233aa91994fd919f29e523 (diff) | |
| download | android_packages_apps_Nfc-b708f80d56ba6d6ed110b9b7d1008563689821a4.tar.gz android_packages_apps_Nfc-b708f80d56ba6d6ed110b9b7d1008563689821a4.tar.bz2 android_packages_apps_Nfc-b708f80d56ba6d6ed110b9b7d1008563689821a4.zip | |
Deactivate Beam when DISALLOW_OUTGOING_BEAM is set.
Bug: 18008824
Change-Id: I25b64f0de6e62a94ba59b3ff6ea40c14da25ca90
Diffstat (limited to 'src/com/android/nfc/BeamShareActivity.java')
| -rw-r--r-- | src/com/android/nfc/BeamShareActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java index 84a658a8..c22c184f 100644 --- a/src/com/android/nfc/BeamShareActivity.java +++ b/src/com/android/nfc/BeamShareActivity.java @@ -32,6 +32,7 @@ import android.nfc.NdefMessage; import android.nfc.NdefRecord; import android.nfc.NfcAdapter; import android.os.Bundle; +import android.os.UserHandle; import android.util.Log; import android.webkit.URLUtil; @@ -78,7 +79,7 @@ public class BeamShareActivity extends Activity { private void showNfcDialogAndExit(int msgId) { IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED); - registerReceiver(mReceiver, filter); + registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, null); AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, AlertDialog.THEME_DEVICE_DEFAULT_LIGHT); |