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

Commit 3caa1b66 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12730913 from 50201ffc to 25Q1-release 

Change-Id: I43d67ef75ee5b199a25b2f6982f958952b6038f8
parents 2e634400 50201ffc

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ package android { 
    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field @FlaggedApi("android.content.pm.support_minor_versions_in_minsdkversion") public static final int minSdkVersionFull;

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int minSdkVersionFull;

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

core/java/android/companion/AssociationInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ public final class AssociationInfo implements Parcelable { 
        } else {

            mDeviceIcon = null;

        }



        if (Flags.associationTag() && in.readInt() == 1) {

        int deviceId = in.readInt();

        if (Flags.associationTag() && deviceId == 1) {

            mDeviceId = in.readTypedObject(DeviceId.CREATOR);

        } else {

            mDeviceId = null;

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2572,7 +2572,7 @@ 
             against a development branch, in which case it will only work against

             the development builds. -->

        <attr name="minSdkVersion" format="integer|string" />

        <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) -->

        <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->

        <attr name="minSdkVersionFull" format="string" />

        <!-- This is the SDK version number that the application is targeting.

             It is able to run on older versions (down to minSdkVersion), but

core/res/res/values/public-staging.xml

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ 
    <public name="pageSizeCompat" />

    <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->

    <public name="shareRolePriority"/>

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) -->

    <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->

    <public name="minSdkVersionFull"/>

  </staging-public-group>

media/java/android/media/IMediaRoute2ProviderServiceCallback.aidl

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.os.Bundle; 
 * @hide

 */

oneway interface IMediaRoute2ProviderServiceCallback {

    // TODO: Change it to updateRoutes?

    void notifyProviderUpdated(in MediaRoute2ProviderInfo providerInfo);

    void notifySessionCreated(long requestId, in RoutingSessionInfo sessionInfo);

    void notifySessionsUpdated(in List<RoutingSessionInfo> sessionInfo);