commit cb0da694b0ea845b7fd342d4e1ea961b8330385a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 08 09:44:50 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 09:44:50 2019 +0000
tree 4aa2e1b1b2ab4fefe359604350e7a4c331564e5f
parent 4225c7d77587ac4f1066fba179e85ae7a4e6b727
parent f8c809582c6b1a454f017d1c1cd2fba8aa0b1a17

Merge "Add a public attr secureElementName"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e19a7af..25c676e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1204,6 +1204,7 @@
     field public static final int secondaryProgress = 16843064; // 0x1010138
     field public static final int secondaryProgressTint = 16843879; // 0x1010467
     field public static final int secondaryProgressTintMode = 16843880; // 0x1010468
+    field public static final int secureElementName = 16844200; // 0x10105a8
     field public static final int seekBarStyle = 16842875; // 0x101007b
     field public static final int segmentedButtonStyle = 16843568; // 0x1010330
     field public static final int selectAllOnFocus = 16843102; // 0x101015e

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index b48c6b0..840cd63 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2941,6 +2941,7 @@
         <!-- @hide @SystemApi -->
         <public name="allowClearUserDataOnFailedRestore"/>
         <public name="allowAudioPlaybackCapture"/>
+        <public name="secureElementName" />
     </public-group>
 
     <public-group type="drawable" first-id="0x010800b4">