OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5585d5e
a7c8869
)
Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52 am: 39845367ab
author
Ruchi Kandoi
<kandoiruchi@google.com>
Fri, 4 Jan 2019 22:19:23 +0000
(14:19 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 4 Jan 2019 22:19:23 +0000
(14:19 -0800)
am:
a7c886925f
Change-Id: I08ff3b1bd80e913aeec9800b1c5ddce69543ba3c
1
2
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index
181faa5
,
9fc0aec
..
b784dc5
---
1
/
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
---
2
/
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@@
-16,8
-16,9
+16,9
@@@
package com.android.settings.nfc;
import android.content.Context;
+ import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
-import androidx.preference.Preference;
+
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
diff --cc
tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
Simple merge
OSDN Git Service
