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

Commit 5a2fbae4 authored by John Patterson's avatar John Patterson Committed by Android (Google) Code Review
Browse files

Merge "Add calendar sync manager role."

parents 803315ad 5b2380d3

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ package android { 
    field public static final int config_systemAmbientAudioIntelligence = 17039411; // 0x1040033

    field public static final int config_systemAppProtectionService;

    field public static final int config_systemAudioIntelligence = 17039412; // 0x1040034

    field public static final int config_systemAutomotiveCalendarSyncManager;

    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028

    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029

    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ package android { 
  public static final class R.string {

    field public static final int config_defaultAssistant = 17039393; // 0x1040021

    field public static final int config_defaultDialer = 17039395; // 0x1040023

    field public static final int config_systemAutomotiveCalendarSyncManager;

    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028

    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029

    field public static final int config_systemGallery = 17039399; // 0x1040027

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2133,6 +2133,8 @@ 
    <string name="config_deviceManager" translatable="false"></string>

    <!-- The name of the package that will hold the app protection service role. -->

    <string name="config_systemAppProtectionService" translatable="false"></string>

    <!-- The name of the package that will hold the system calendar sync manager role. -->

    <string name="config_systemAutomotiveCalendarSyncManager" translatable="false"></string>



    <!-- The name of the package that will be allowed to change its components' label/icon. -->

    <string name="config_overrideComponentUiPackage" translatable="false">com.android.stk</string>

core/res/res/values/public.xml

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

    <!-- @hide @SystemApi -->

    <public name="config_systemAppProtectionService" />

    <!-- @hide @SystemApi @TestApi -->

    <public name="config_systemAutomotiveCalendarSyncManager" />

  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01db0000">