summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorYi-Ling Chuang <emilychuang@google.com>2019-11-27 18:33:34 +0800
committerYi-Ling Chuang <emilychuang@google.com>2019-11-28 14:32:15 +0800
commit430c16c0125fdecf91f835031b97f47ed72ebf20 (patch)
tree602cf40a376575f6bdf678015ee6512e378804df /src/com/android/settings/nfc
parent617458b07c91d59c24e73c7c413c58467e437c7e (diff)
downloadpackages_apps_Settings-430c16c0125fdecf91f835031b97f47ed72ebf20.tar.gz
packages_apps_Settings-430c16c0125fdecf91f835031b97f47ed72ebf20.tar.bz2
packages_apps_Settings-430c16c0125fdecf91f835031b97f47ed72ebf20.zip
Make some existing slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed to other apps. Others will be Settings only. Bug: 141088937 Test: robotests Change-Id: I5934e89bc1b268fdd44acd630621fa46987728ff
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/NfcPreferenceController.java4
-rw-r--r--src/com/android/settings/nfc/SecureNfcPreferenceController.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 34e7e24efd..9bf013c8c3 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -23,7 +23,7 @@ import android.net.Uri;
import android.nfc.NfcAdapter;
import android.provider.Settings;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
+
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -90,7 +90,7 @@ public class NfcPreferenceController extends TogglePreferenceController
}
@Override
- public boolean isSliceable() {
+ public boolean isPublicSlice() {
return true;
}
diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index 12dbd5749c..4e548d141b 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -77,7 +77,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
}
@Override
- public boolean isSliceable() {
+ public boolean isPublicSlice() {
return true;
}