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

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

Merge "Add userRestriction attribute in Location settings injector."

parents 647b394c 172da621

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ package android { 
    field public static final int isVrOnly = 16844152; // 0x1010578

    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566

    field public static final int userRestriction = 16844165; // 0x1010585

  }



  public static final class R.raw {

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -8006,6 +8006,8 @@ 
        <attr name="icon"/>

        <!-- The activity to launch when the setting is clicked on. -->

        <attr name="settingsActivity"/>

        <!-- The user restriction for this preference. -->

        <attr name="userRestriction"/>

    </declare-styleable>



    <!-- =============================== -->

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2870,6 +2870,8 @@ 
      <public name="outlineAmbientShadowColor" />

      <public name="maxLongVersionCode" />

      <public name="urlBarResourceId" />

      <!-- @hide @SystemApi -->

      <public name="userRestriction" />

    </public-group>



    <public-group type="style" first-id="0x010302e0">