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

Commit 0790933b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5586686 from bbe795d4 to qt-c2f2-release 

Change-Id: I06e38559377602e9fd47e643e948de79c367774c
parents 28f076ae bbe795d4

cmds/statsd/src/atoms.proto

+16 −0
Original line number Diff line number Diff line
@@ -750,6 +750,22 @@ message ScheduledJobStateChanged { 
    // This is only applicable when the state is FINISHED.

    // The default value is STOP_REASON_UNKNOWN.

    optional android.app.job.StopReasonEnum stop_reason = 4;



    // The standby bucket of the app that scheduled the job. These match the framework constants

    // defined in JobSchedulerService.java with the addition of UNKNOWN using -1, as ACTIVE is

    // already assigned 0.

    enum Bucket {

        UNKNOWN = -1;

        ACTIVE = 0;

        WORKING_SET = 1;

        FREQUENT = 2;

        RARE = 3;

        NEVER = 4;

    }

    optional Bucket standby_bucket = 5 [default = UNKNOWN];



    // The job id (as assigned by the app).

    optional int32 job_id = 6;

}



/**

core/java/android/app/ActivityThread.java

+10 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ import android.provider.Settings; 
import android.renderscript.RenderScriptCacheDir;

import android.security.NetworkSecurityPolicy;

import android.security.net.config.NetworkSecurityConfigProvider;

import android.service.voice.VoiceInteractionSession;

import android.system.ErrnoException;

import android.system.OsConstants;

import android.system.StructStat;
@@ -5627,6 +5626,16 @@ public final class ActivityThread extends ClientTransactionHandler { 
        }

    }



    /**

     * Updates the application info.

     *

     * This only works in the system process. Must be called on the main thread.

     */

    public void handleSystemApplicationInfoChanged(@NonNull ApplicationInfo ai) {

        Preconditions.checkState(mSystemThread, "Must only be called in the system process");

        handleApplicationInfoChanged(ai);

    }



    @VisibleForTesting(visibility = PACKAGE)

    public void handleApplicationInfoChanged(@NonNull final ApplicationInfo ai) {

        // Updates triggered by package installation go through a package update

core/java/android/app/ActivityView.java

+11 −0
Original line number Diff line number Diff line
@@ -188,6 +188,17 @@ public class ActivityView extends ViewGroup { 
        }

    }



    /**

     * Sets the corner radius for the Activity displayed here. The corners will be

     * cropped from the window painted by the contained Activity.

     *

     * @param cornerRadius the radius for the corners, in pixels

     * @hide

     */

    public void setCornerRadius(float cornerRadius) {

        mSurfaceView.setCornerRadius(cornerRadius);

    }



    /**

     * Launch a new activity into this container.

     * <p>Activity resolved by the provided {@link Intent} must have

core/java/android/service/quicksettings/Tile.java

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ public final class Tile implements Parcelable { 
    private CharSequence mLabel;

    private CharSequence mSubtitle;

    private CharSequence mContentDescription;

    // Default to active until clients of the new API can update.

    private int mState = STATE_ACTIVE;

    // Default to inactive until clients of the new API can update.

    private int mState = STATE_INACTIVE;



    private IQSService mService;

core/java/android/util/MemoryIntArray.java

+4 −6
Original line number Diff line number Diff line
@@ -175,12 +175,10 @@ public final class MemoryIntArray implements Parcelable, Closeable { 


    @Override

    public void writeToParcel(Parcel parcel, int flags) {

        ParcelFileDescriptor pfd = ParcelFileDescriptor.adoptFd(mFd);

        try {

            // Don't let writing to a parcel to close our fd - plz

            parcel.writeParcelable(pfd, flags & ~Parcelable.PARCELABLE_WRITE_RETURN_VALUE);

        } finally {

            pfd.detachFd();

        try (ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(mFd)) {

            parcel.writeParcelable(pfd, flags);

        } catch (IOException ex) {

            throw new RuntimeException(ex);

        }

    }