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

Commit 9fba5abb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5563067 from 856fe0fe to qt-release 

Change-Id: Iaf0a0e00a507e6c46c41efdad0d5838091fb9472
parents 0fe336e4 856fe0fe

cmds/statsd/src/atoms.proto

+18 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ message Atom { 
        VehicleMapServicePacketFailureReported vms_packet_failure_reported = 202;

        CarPowerStateChanged car_power_state_changed = 203;

        GarageModeInfo garage_mode_info = 204;

        TestAtomReported test_atom_reported = 205 [(log_from_module) = "cts"];

    }



    // Pulled events will start at field 10000.
@@ -3342,6 +3343,23 @@ message BinaryPushStateChanged { 
    optional int32 user_id = 8;

}



/* Test atom, is not logged anywhere */

message TestAtomReported {

    repeated AttributionNode attribution_node = 1;

    optional int32 int_field = 2;

    optional int64 long_field = 3;

    optional float float_field = 4;

    optional string string_field = 5;

    optional bool boolean_field = 6;

    enum State {

        UNKNOWN = 0;

        OFF = 1;

        ON = 2;

    }

    optional State state = 7;

    optional TrainExperimentIds bytes_field = 8 [(android.os.statsd.log_mode) = MODE_BYTES];

}



/** Represents USB port overheat event. */

message UsbPortOverheatEvent {

    /* Temperature of USB port at USB plug event, in 1/10ths of degree C. */

core/java/android/app/Notification.java

+2 −2
Original line number Diff line number Diff line
@@ -8832,8 +8832,8 @@ public class Notification implements Parcelable 
             * <p>Setting this flag is optional; it defaults to false.</p>

             */

            @NonNull

            public BubbleMetadata.Builder setSuppressNotification(boolean shouldSupressNotif) {

                setFlag(FLAG_SUPPRESS_NOTIFICATION, shouldSupressNotif);

            public BubbleMetadata.Builder setSuppressNotification(boolean shouldSuppressNotif) {

                setFlag(FLAG_SUPPRESS_NOTIFICATION, shouldSuppressNotif);

                return this;

            }

core/java/android/content/ContentResolver.java

+11 −4
Original line number Diff line number Diff line
@@ -825,7 +825,9 @@ public abstract class ContentResolver implements ContentInterface { 
     * @param sortOrder How to order the rows, formatted as an SQL ORDER BY

     *         clause (excluding the ORDER BY itself). Passing null will use the

     *         default sort order, which may be unordered.

     * @return A Cursor object, which is positioned before the first entry, or null

     * @return A Cursor object, which is positioned before the first entry. May return

     *         <code>null</code> if the underlying content provider returns <code>null</code>,

     *         or if it crashes.

     * @see Cursor

     */

    public final @Nullable Cursor query(@RequiresPermission.Read @NonNull Uri uri,
@@ -865,7 +867,9 @@ public abstract class ContentResolver implements ContentInterface { 
     * @param cancellationSignal A signal to cancel the operation in progress, or null if none.

     * If the operation is canceled, then {@link OperationCanceledException} will be thrown

     * when the query is executed.

     * @return A Cursor object, which is positioned before the first entry, or null

     * @return A Cursor object, which is positioned before the first entry. May return

     *         <code>null</code> if the underlying content provider returns <code>null</code>,

     *         or if it crashes.

     * @see Cursor

     */

    public final @Nullable Cursor query(@RequiresPermission.Read @NonNull Uri uri,
@@ -902,7 +906,9 @@ public abstract class ContentResolver implements ContentInterface { 
     * @param cancellationSignal A signal to cancel the operation in progress, or null if none.

     * If the operation is canceled, then {@link OperationCanceledException} will be thrown

     * when the query is executed.

     * @return A Cursor object, which is positioned before the first entry, or null

     * @return A Cursor object, which is positioned before the first entry. May return

     *         <code>null</code> if the underlying content provider returns <code>null</code>,

     *         or if it crashes.

     * @see Cursor

     */

    @Override
@@ -1799,7 +1805,8 @@ public abstract class ContentResolver implements ContentInterface { 
     * @param url The URL of the table to insert into.

     * @param values The initial values for the newly inserted row. The key is the column name for

     *               the field. Passing an empty ContentValues will create an empty row.

     * @return the URL of the newly created row.

     * @return the URL of the newly created row. May return <code>null</code> if the underlying

     *         content provider returns <code>null</code>, or if it crashes.

     */

    @Override

    public final @Nullable Uri insert(@RequiresPermission.Write @NonNull Uri url,

core/java/android/net/SocketKeepalive.java

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ import java.util.concurrent.Executor; 
 * To stop an existing keepalive, call {@link SocketKeepalive#stop}. The system will call

 * {@link SocketKeepalive.Callback#onStopped} if the operation was successful or

 * {@link SocketKeepalive.Callback#onError} if an error occurred.

 *

 * The device SHOULD support keepalive offload. If it does not, it MUST reply with

 * {@link SocketKeepalive.Callback#onError} with {@code ERROR_UNSUPPORTED} to any keepalive offload

 * request. If it does, it MUST support at least 3 concurrent keepalive slots per transport.

 */

public abstract class SocketKeepalive implements AutoCloseable {

    static final String TAG = "SocketKeepalive";

core/java/android/net/metrics/ApfProgramEvent.java

+13 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { 
        out.writeInt(filteredRas);

        out.writeInt(currentRas);

        out.writeInt(programLength);

        out.writeInt(flags);

        out.writeInt(this.flags);

    }



    /** @hide */
@@ -192,6 +192,18 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { 
                programLength, actualLifetime, lifetimeString, namesOf(flags));

    }



    @Override

    public boolean equals(Object obj) {

        if (obj == null || !(obj.getClass().equals(ApfProgramEvent.class))) return false;

        final ApfProgramEvent other = (ApfProgramEvent) obj;

        return lifetime == other.lifetime

                && actualLifetime == other.actualLifetime

                && filteredRas == other.filteredRas

                && currentRas == other.currentRas

                && programLength == other.programLength

                && flags == other.flags;

    }



    /** @hide */

    public static final @android.annotation.NonNull Parcelable.Creator<ApfProgramEvent> CREATOR

            = new Parcelable.Creator<ApfProgramEvent>() {