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

Commit 2df433cc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10872577 from eda4d1b0 to 24Q1-release 

Change-Id: Ib7dbf2eb8be6003ec7194214f62a5b3b78062367
parents 6c409427 eda4d1b0

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
aconfig_srcjars = [

    ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",
@@ -341,3 +342,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.app.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Broadcast Radio

aconfig_declarations {

    name: "android.hardware.radio.flags-aconfig",

    package: "android.hardware.radio",

    srcs: ["core/java/android/hardware/radio/*.aconfig"],

}



java_aconfig_library {

    name: "android.hardware.radio.flags-aconfig-java",

    aconfig_declarations: "android.hardware.radio.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

api/StubLibraries.bp

+9 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" + 


droidstubs {

    name: "system-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -126,6 +129,9 @@ droidstubs { 


droidstubs {

    name: "test-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -173,6 +179,9 @@ droidstubs { 


droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",

core/api/current.txt

+7 −2
Original line number Diff line number Diff line
@@ -6749,7 +6749,6 @@ package android.app { 
    method public android.app.Notification.WearableExtender clone();

    method public android.app.Notification.Builder extend(android.app.Notification.Builder);

    method public java.util.List<android.app.Notification.Action> getActions();

    method @Deprecated public android.graphics.Bitmap getBackground();

    method public String getBridgeTag();

    method public int getContentAction();

    method @Deprecated public int getContentIcon();
@@ -6768,7 +6767,6 @@ package android.app { 
    method @Deprecated public boolean getHintShowBackgroundOnly();

    method @Deprecated public java.util.List<android.app.Notification> getPages();

    method public boolean getStartScrollBottom();

    method @Deprecated public android.app.Notification.WearableExtender setBackground(android.graphics.Bitmap);

    method public android.app.Notification.WearableExtender setBridgeTag(String);

    method public android.app.Notification.WearableExtender setContentAction(int);

    method @Deprecated public android.app.Notification.WearableExtender setContentIcon(int);
@@ -9682,6 +9680,7 @@ package android.companion.virtual { 
    method public int describeContents();

    method public int getDeviceId();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @NonNull public int[] getDisplayIds();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public CharSequence getDisplayName();

    method @Nullable public String getName();

    method @Nullable public String getPersistentDeviceId();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public boolean hasCustomSensorSupport();
@@ -39008,6 +39007,7 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityStart();

    method @NonNull public String getKeystoreAlias();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();
@@ -39015,6 +39015,7 @@ package android.security.keystore { 
    method public boolean isDevicePropertiesAttestationIncluded();

    method @NonNull public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isStrongBoxBacked();

    method public boolean isUnlockedDeviceRequired();
@@ -39046,6 +39047,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMgf1Digests(@Nullable java.lang.String...);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...);

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUnlockedDeviceRequired(boolean);
@@ -39150,12 +39152,14 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityForOriginationEnd();

    method @Nullable public java.util.Date getKeyValidityStart();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();
@@ -39177,6 +39181,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);

    method @NonNull public android.security.keystore.KeyProtection.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyProtection.Builder setMgf1Digests(@Nullable java.lang.String...);

    method @NonNull public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean);

    method @NonNull public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...);

    method @NonNull public android.security.keystore.KeyProtection.Builder setUnlockedDeviceRequired(boolean);

core/api/module-lib-current.txt

+12 −12
Original line number Diff line number Diff line
@@ -556,24 +556,24 @@ package android.provider { 


package android.se.omapi {



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeFrameworkInitializer {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public static android.se.omapi.SeServiceManager getSeServiceManager();

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static void setSeServiceManager(@NonNull android.se.omapi.SeServiceManager);

  @FlaggedApi("android.nfc.enable_nfc_mainline") public class SeFrameworkInitializer {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public static android.se.omapi.SeServiceManager getSeServiceManager();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public static void setSeServiceManager(@NonNull android.se.omapi.SeServiceManager);

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeServiceManager {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.se.omapi.SeServiceManager.ServiceRegisterer getSeManagerServiceRegisterer();

  @FlaggedApi("android.nfc.enable_nfc_mainline") public class SeServiceManager {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.se.omapi.SeServiceManager.ServiceRegisterer getSeManagerServiceRegisterer();

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static class SeServiceManager.ServiceNotFoundException extends java.lang.Exception {

    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public SeServiceManager.ServiceNotFoundException(@NonNull String);

  @FlaggedApi("android.nfc.enable_nfc_mainline") public static class SeServiceManager.ServiceNotFoundException extends java.lang.Exception {

    ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public SeServiceManager.ServiceNotFoundException(@NonNull String);

  }



  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static final class SeServiceManager.ServiceRegisterer {

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder get();

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.os.IBinder getOrThrow() throws android.se.omapi.SeServiceManager.ServiceNotFoundException;

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void register(@NonNull android.os.IBinder);

    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder tryGet();

  @FlaggedApi("android.nfc.enable_nfc_mainline") public static final class SeServiceManager.ServiceRegisterer {

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public android.os.IBinder get();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.os.IBinder getOrThrow() throws android.se.omapi.SeServiceManager.ServiceNotFoundException;

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void register(@NonNull android.os.IBinder);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public android.os.IBinder tryGet();

  }



}

core/api/removed.txt

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ package android.app { 
    method @Deprecated public android.app.Notification.Builder setTimeout(long);

  }



  public static final class Notification.WearableExtender implements android.app.Notification.Extender {

    method @Deprecated public android.graphics.Bitmap getBackground();

    method @Deprecated public android.app.Notification.WearableExtender setBackground(android.graphics.Bitmap);

  }



}



package android.app.slice {