commit 59e3189d9664206e581099ac80ab146bf051e8f6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jan 25 18:32:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 25 18:32:35 2019 +0000
tree 73297a504966f3b60bdd242f66534f46acc8341f
parent 623f3785bd5998962f6140f6a46dc2d5f5c236c9
parent c7eef3e49d9d9d9e8e6c49507920c8d66d15e58a

Merge "Merge "Track change of some java.nio.Buffer methods to nonfinal." am: 38a641d29f am: 5fdb4eb6ef am: 5cb69db85c"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e3fa3eb..bb6dbeb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -38749,6 +38749,7 @@
 
   public static final class Settings.Panel {
     field public static final String ACTION_INTERNET_CONNECTIVITY = "android.settings.panel.action.INTERNET_CONNECTIVITY";
+    field public static final String ACTION_NFC = "android.settings.panel.action.NFC";
     field public static final String ACTION_VOLUME = "android.settings.panel.action.VOLUME";
   }
 

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d840e3c..5222fc3 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -14603,6 +14603,17 @@
                 "android.settings.panel.action.INTERNET_CONNECTIVITY";
 
         /**
+         * Activity Action: Show a settings dialog containing NFC-related settings.
+         * <p>
+         * Input: Nothing.
+         * <p>
+         * Output: Nothing.
+         */
+        @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+        public static final String ACTION_NFC =
+                "android.settings.panel.action.NFC";
+
+        /**
          * Activity Action: Show a settings dialog containing all volume streams.
          * <p>
          * Input: Nothing.