Skip to content

GitLab

Commit 9f289d60 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 14687fef: Fix crash when invoking Beam with NFC off. 

* commit '14687fef':
  Fix crash when invoking Beam with NFC off.
parents c5eec3c6 14687fef
master marshmallow-dr-dev marshmallow-dr-dragon-release marshmallow-dr-release marshmallow-dr1.5-dev marshmallow-dr1.5-release marshmallow-dr1.6-release marshmallow-mr1-dev marshmallow-mr1-release marshmallow-mr2-release marshmallow-mr3-release nougat-cts-release nougat-dev nougat-dr1-release nougat-mr0.5-release nougat-mr1-cts-release nougat-mr1-dev nougat-mr1-release nougat-mr1.1-release nougat-mr1.2-release nougat-release rockchip-6.0.1_r55 sdk-release android-wear-n-preview-2 android-wear-n-preview-1 android-n-preview-5 android-n-preview-4 android-n-preview-3 android-n-preview-2 android-n-preview-1 android-n-mr1-preview-2 android-n-mr1-preview-1 android-cts-7.1_r1 android-cts-7.0_r5 android-cts-7.0_r4 android-cts-7.0_r3 android-cts-7.0_r2 android-cts-7.0_r1 android-7.1.1_r13 android-7.1.1_r12 android-7.1.1_r11 android-7.1.1_r10 android-7.1.1_r9 android-7.1.1_r8 android-7.1.1_r7 android-7.1.1_r6 android-7.1.1_r4 android-7.1.1_r3 android-7.1.1_r2 android-7.1.1_r1 android-7.1.0_r7 android-7.1.0_r6 android-7.1.0_r5 android-7.1.0_r4 android-7.1.0_r3 android-7.1.0_r2 android-7.1.0_r1 android-7.0.0_r27 android-7.0.0_r24 android-7.0.0_r21 android-7.0.0_r19 android-7.0.0_r17 android-7.0.0_r15 android-7.0.0_r14 android-7.0.0_r13 android-7.0.0_r12 android-7.0.0_r7 android-7.0.0_r6 android-7.0.0_r5 android-7.0.0_r4 android-7.0.0_r3 android-7.0.0_r1 android-6.0.1_r78 android-6.0.1_r77 android-6.0.1_r74 android-6.0.1_r73 android-6.0.1_r72 android-6.0.1_r70 android-6.0.1_r69 android-6.0.1_r68 android-6.0.1_r67 android-6.0.1_r66 android-6.0.1_r65 android-6.0.1_r63 android-6.0.1_r62 android-6.0.1_r61 android-6.0.1_r60 android-6.0.1_r59 android-6.0.1_r58 android-6.0.1_r57 android-6.0.1_r56 android-6.0.1_r55 android-6.0.1_r54 android-6.0.1_r53 android-6.0.1_r52 android-6.0.1_r51 android-6.0.1_r50 android-6.0.1_r49 android-6.0.1_r48 android-6.0.1_r47 android-6.0.1_r46 android-6.0.1_r45 android-6.0.1_r43 android-6.0.1_r42 android-6.0.1_r41 android-6.0.1_r40 android-6.0.1_r33 android-6.0.1_r32 android-6.0.1_r31 android-6.0.1_r30 android-6.0.1_r28 android-6.0.1_r27 android-6.0.1_r26 android-6.0.1_r25 android-6.0.1_r24 android-6.0.1_r22 android-6.0.1_r21 android-6.0.1_r20 android-6.0.1_r18 android-6.0.1_r17 android-6.0.1_r16 android-6.0.1_r13 android-6.0.1_r12 android-6.0.1_r11 android-6.0.1_r10 android-6.0.1_r9 android-6.0.1_r8 android-6.0.1_r7 android-6.0.1_r5 android-6.0.1_r4 android-6.0.1_r3 android-6.0.1_r1 android-6.0.0_r41 android-6.0.0_r26 android-6.0.0_r25 android-6.0.0_r24 android-6.0.0_r23 android-6.0.0_r13 android-6.0.0_r12 android-6.0.0_r11
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
AndroidManifest.xml
View file @ 9f289d60
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<activity android:name=".BeamShareActivity" <activity android:name=".BeamShareActivity"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:theme="@android:style/Theme.NoDisplay" android:theme="@android:style/Theme.Translucent"
android:label="@string/android_beam" android:label="@string/android_beam"
android:noHistory="true" android:noHistory="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment