Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb0da694 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a public attr secureElementName"

parents 4225c7d7 f8c80958

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ package android { 
    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

+1 −0
Original line number Diff line number Diff line
@@ -2941,6 +2941,7 @@ 
        <!-- @hide @SystemApi -->

        <public name="allowClearUserDataOnFailedRestore"/>

        <public name="allowAudioPlaybackCapture"/>

        <public name="secureElementName" />

    </public-group>



    <public-group type="drawable" first-id="0x010800b4">