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

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

Snap for 10157673 from 1ec573a0 to udc-qpr1-release

Change-Id: I6aaa02d3a43d1e496c8d86292bea7443f4400504
parents 391f51f9 1ec573a0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,7 @@ public class JobSchedulerService extends com.android.server.SystemService
        // or the user stopped the job somehow.
        if (internalStopReason == JobParameters.INTERNAL_STOP_REASON_SUCCESSFUL_FINISH
                || internalStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT
                || internalStopReason == JobParameters.INTERNAL_STOP_REASON_ANR
                || stopReason == JobParameters.STOP_REASON_USER) {
            numFailures++;
        } else {
+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ public final class WallpaperColors implements Parcelable {

        int hints = 0;
        double meanLuminance = totalLuminance / pixels.length;
        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE && darkPixels < maxDarkPixels) {
        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE && darkPixels <= maxDarkPixels) {
            hints |= HINT_SUPPORTS_DARK_TEXT;
        }
        if (meanLuminance < DARK_THEME_MEAN_LUMINANCE) {
+2 −2
Original line number Diff line number Diff line
@@ -1680,14 +1680,14 @@ public class WallpaperManager {
     * @hide
     */
    public void addOnColorsChangedListener(@NonNull LocalWallpaperColorConsumer callback,
            List<RectF> regions) throws IllegalArgumentException {
            List<RectF> regions, int which) throws IllegalArgumentException {
        for (RectF region : regions) {
            if (!LOCAL_COLOR_BOUNDS.contains(region)) {
                throw new IllegalArgumentException("Regions must be within bounds "
                        + LOCAL_COLOR_BOUNDS);
            }
        }
        sGlobals.addOnColorsChangedListener(callback, regions, FLAG_SYSTEM,
        sGlobals.addOnColorsChangedListener(callback, regions, which,
                                                 mContext.getUserId(), mContext.getDisplayId());
    }

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.ComponentName;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager.EnforcingUser;

import java.util.List;
import java.util.Set;
@@ -326,4 +327,10 @@ public abstract class DevicePolicyManagerInternal {
     */
    public abstract List<Bundle> getApplicationRestrictionsPerAdminForUser(
            String packageName, @UserIdInt int userId);

    /**
     *  Returns a list of users who set a user restriction on a given user.
     */
    public abstract List<EnforcingUser> getUserRestrictionSources(String restriction,
                @UserIdInt int userId);
}
+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ public class TransactionExecutorHelper {
        switch (prevState) {
            // TODO(lifecycler): Extend to support all possible states.
            case ON_START:
                lifecycleItem = StartActivityItem.obtain(null /* activityOptions */);
                break;
                // Fall through to return the PAUSE item to ensure the activity is properly
                // resumed while relaunching.
            case ON_PAUSE:
                lifecycleItem = PauseActivityItem.obtain();
                break;
Loading