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

Commit 0977d006 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12722466 from 0288dc27 to 25Q1-release 

Change-Id: I077fd589bcf2ddad5828c37b825776f3f365be65
parents 11481ec9 0288dc27

AconfigFlags.bp

+3 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ cc_aconfig_library { 
    name: "android_nfc_flags_aconfig_c_lib",

    vendor_available: true,

    aconfig_declarations: "android.nfc.flags-aconfig",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",
@@ -652,6 +653,8 @@ java_aconfig_library { 
    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.art",

        "com.android.art.debug",

        "com.android.permission",

    ],

}

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ filegroup { 
        ":framework-telecomm-sources",

        ":framework-telephony-common-sources",

        ":framework-telephony-sources",

        ":framework-vcn-util-sources",

        ":framework-wifi-annotations",

        ":framework-wifi-non-updatable-sources",

        ":PacProcessor-aidl-sources",
@@ -313,7 +312,6 @@ java_defaults { 
            ":framework-telecomm-sources",

            ":framework-telephony-common-sources",

            ":framework-telephony-sources",

            ":framework-vcn-util-sources",

            ":framework-wifi-annotations",

            ":framework-wifi-non-updatable-sources",

            ":PacProcessor-aidl-sources",
@@ -371,6 +369,7 @@ java_defaults { 
        "view-inspector-annotation-processor",

        "staledataclass-annotation-processor",

        "error_prone_android_framework",

        "systemfeatures-metadata-processor",

    ],

    // Exports needed for staledataclass-annotation-processor, see b/139342589.

    javacflags: [
@@ -597,7 +596,7 @@ filegroup { 
    srcs: [

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

        "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java",

        "core/java/android/net/vcn/util/PersistableBundleUtils.java",

        "telephony/java/android/telephony/Annotation.java",

    ],

}

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tests/

               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

core/api/current.txt

+31 −11
Original line number Diff line number Diff line
@@ -8917,6 +8917,7 @@ package android.app.assist { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.assist.AssistContent> CREATOR;

    field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXTRA_APP_FUNCTION_DATA = "android.app.assist.extra.APP_FUNCTION_DATA";

    field @FlaggedApi("com.android.window.flags.enable_desktop_windowing_app_to_web_education") public static final String EXTRA_SESSION_TRANSFER_WEB_URI = "android.app.assist.extra.SESSION_TRANSFER_WEB_URI";

  }















  public class AssistStructure implements android.os.Parcelable {










@@ -9999,12 +10000,12 @@ package android.companion {













    method public int describeContents();















    method @Nullable public android.companion.AssociatedDevice getAssociatedDevice();















    method @FlaggedApi("android.companion.association_device_icon") @Nullable public android.graphics.drawable.Icon getDeviceIcon();













    method @FlaggedApi("android.companion.association_tag") @Nullable public android.companion.DeviceId getDeviceId();















    method @Nullable public android.net.MacAddress getDeviceMacAddress();















    method @Nullable public String getDeviceProfile();















    method @Nullable public CharSequence getDisplayName();















    method public int getId();















    method public int getSystemDataSyncFlags();













    method @FlaggedApi("android.companion.association_tag") @Nullable public String getTag();















    method public boolean isSelfManaged();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.companion.AssociationInfo> CREATOR;










@@ -10077,7 +10078,6 @@ package android.companion {













    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;















    method @Nullable public android.content.IntentSender buildAssociationCancellationIntent();















    method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException;













    method @FlaggedApi("android.companion.association_tag") public void clearAssociationTag(int);















    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;















    method public void disableSystemDataSyncForTypes(int, int);















    method @Deprecated public void disassociate(@NonNull String);









@@ -10089,7 +10089,7 @@ package android.companion {













    method @FlaggedApi("android.companion.perm_sync_user_consent") public boolean isPermissionTransferUserConsented(int);















    method @FlaggedApi("android.companion.unpair_associated_device") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond(int);















    method public void requestNotificationAccess(android.content.ComponentName);













    method @FlaggedApi("android.companion.association_tag") public void setAssociationTag(int, @NonNull String);













    method @FlaggedApi("android.companion.association_tag") public void setDeviceId(int, @Nullable android.companion.DeviceId);















    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;















    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);















    method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException;










@@ -10134,6 +10134,21 @@ package android.companion {













  public interface DeviceFilter<D extends android.os.Parcelable> extends android.os.Parcelable {















  }



























  @FlaggedApi("android.companion.association_tag") public final class DeviceId implements android.os.Parcelable {













    method public int describeContents();













    method @Nullable public String getCustomId();













    method @Nullable public android.net.MacAddress getMacAddress();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.companion.DeviceId> CREATOR;













  }

























  public static final class DeviceId.Builder {













    ctor public DeviceId.Builder();













    method @NonNull public android.companion.DeviceId build();













    method @NonNull public android.companion.DeviceId.Builder setCustomId(@Nullable String);













    method @NonNull public android.companion.DeviceId.Builder setMacAddress(@Nullable android.net.MacAddress);













  }



























  public class DeviceNotAssociatedException extends java.lang.RuntimeException {















  }
























@@ -20768,6 +20783,7 @@ package android.hardware.display {



























  public final class VirtualDisplayConfig implements android.os.Parcelable {















    method public int describeContents();













    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @FloatRange(from=0.0f, to=1.0f) public float getDefaultBrightness();















    method public int getDensityDpi();















    method @NonNull public java.util.Set<java.lang.String> getDisplayCategories();















    method public int getFlags();









@@ -20780,10 +20796,16 @@ package android.hardware.display {













    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.display.VirtualDisplayConfig> CREATOR;















  }



























  @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public static interface VirtualDisplayConfig.BrightnessListener {













    method public void onBrightnessChanged(@FloatRange(from=0.0f, to=1.0f) float);













  }



























  public static final class VirtualDisplayConfig.Builder {















    ctor public VirtualDisplayConfig.Builder(@NonNull String, @IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int);















    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder addDisplayCategory(@NonNull String);















    method @NonNull public android.hardware.display.VirtualDisplayConfig build();













    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setBrightnessListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.display.VirtualDisplayConfig.BrightnessListener);













    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDefaultBrightness(@FloatRange(from=0.0f, to=1.0f) float);















    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCategories(@NonNull java.util.Set<java.lang.String>);















    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setFlags(int);















    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setRequestedRefreshRate(@FloatRange(from=0.0f) float);










@@ -24853,6 +24875,7 @@ package android.media {













    method @Nullable public android.net.Uri getIconUri();















    method @NonNull public String getId();















    method @NonNull public CharSequence getName();













    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public java.util.Set<java.lang.String> getRequiredPermissions();















    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public int getSuitabilityStatus();















    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") public int getSupportedRoutingTypes();















    method public int getType();










@@ -24921,6 +24944,7 @@ package android.media {













    method @NonNull public android.media.MediaRoute2Info.Builder setDescription(@Nullable CharSequence);















    method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);















    method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);













    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public android.media.MediaRoute2Info.Builder setRequiredPermissions(@NonNull java.util.Set<java.lang.String>);















    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") @NonNull public android.media.MediaRoute2Info.Builder setSuitabilityStatus(int);















    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") @NonNull public android.media.MediaRoute2Info.Builder setSupportedRoutingTypes(int);















    method @NonNull public android.media.MediaRoute2Info.Builder setType(int);










@@ -33617,14 +33641,12 @@ package android.os {













  @FlaggedApi("android.os.cpu_gpu_headrooms") public final class CpuHeadroomParams {















    ctor public CpuHeadroomParams();















    method public int getCalculationType();













    method @IntRange(from=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) public long getCalculationWindowMillis();













    method @IntRange(from=0x32, to=0x2710) public long getCalculationWindowMillis();















    method public void setCalculationType(int);













    method public void setCalculationWindowMillis(@IntRange(from=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int);













    method public void setCalculationWindowMillis(@IntRange(from=0x32, to=0x2710) int);















    method public void setTids(@NonNull int...);















    field public static final int CPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; // 0x1















    field public static final int CPU_HEADROOM_CALCULATION_TYPE_MIN = 0; // 0x0













    field public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; // 0x2710













    field public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; // 0x32















  }





























  public final class CpuUsageInfo implements android.os.Parcelable {










@@ -33877,13 +33899,11 @@ package android.os {













  @FlaggedApi("android.os.cpu_gpu_headrooms") public final class GpuHeadroomParams {















    ctor public GpuHeadroomParams();















    method public int getCalculationType();













    method @IntRange(from=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) public int getCalculationWindowMillis();













    method @IntRange(from=0x32, to=0x2710) public int getCalculationWindowMillis();















    method public void setCalculationType(int);













    method public void setCalculationWindowMillis(@IntRange(from=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int);













    method public void setCalculationWindowMillis(@IntRange(from=0x32, to=0x2710) int);















    field public static final int GPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; // 0x1















    field public static final int GPU_HEADROOM_CALCULATION_TYPE_MIN = 0; // 0x0













    field public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; // 0x2710













    field public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; // 0x32















  }





























  public class Handler {

























core/api/module-lib-current.txt



+14
−0






























Original line number
Diff line number
Diff line








@@ -100,6 +100,7 @@ package android.content {













    method @NonNull public android.content.Context createContextForSdkInSandbox(@NonNull android.content.pm.ApplicationInfo, int) throws android.content.pm.PackageManager.NameNotFoundException;















    method @NonNull public android.os.IBinder getProcessToken();















    method @NonNull public android.os.UserHandle getUser();













    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int BIND_FOREGROUND_SERVICE = 67108864; // 0x4000000















    field public static final String PAC_PROXY_SERVICE = "pac_proxy";















    field public static final String TEST_NETWORK_SERVICE = "test_network";















    field @FlaggedApi("android.os.mainline_vcn_platform_api") public static final String VCN_MANAGEMENT_SERVICE = "vcn_management";










@@ -129,6 +130,7 @@ package android.content.pm {





























  public abstract class PackageManager {















    method @NonNull public String getSdkSandboxPackageName();













    method @FlaggedApi("android.content.pm.cloud_compilation_pm") @NonNull public static android.content.pm.SigningInfo getVerifiedSigningInfo(@NonNull String, int) throws android.content.pm.SigningInfoException;















    method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);















    field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";















    field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000









@@ -139,6 +141,18 @@ package android.content.pm {













    method @NonNull public String getPackageName();















  }





























  public final class SigningInfo implements android.os.Parcelable {













    method @FlaggedApi("android.content.pm.cloud_compilation_pm") public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);













    field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_JAR = 1; // 0x1













    field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V2 = 2; // 0x2













    field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V3 = 3; // 0x3













    field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V4 = 4; // 0x4













  }



























  @FlaggedApi("android.content.pm.cloud_compilation_pm") public class SigningInfoException extends java.lang.Exception {













    method @FlaggedApi("android.content.pm.cloud_compilation_pm") public int getCode();













  }





























}































package android.hardware.usb {