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

Commit 08e290e4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7468789 from 6b1067a7 to sc-d1-release

Change-Id: I39d8dbe6ad116a76d58fabefc2e39a578058d835
parents 84d933f6 6b1067a7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
drops {
  android_build_drop {
    build_id: "7396576"
    build_id: "7464984"
    target: "CtsShim"
    source_file: "aosp_arm64/CtsShimPriv.apk"
  }
+1 −1
Original line number Diff line number Diff line
drops {
  android_build_drop {
    build_id: "7396576"
    build_id: "7464984"
    target: "CtsShim"
    source_file: "aosp_arm64/CtsShim.apk"
  }
+1 −1
Original line number Diff line number Diff line
drops {
  android_build_drop {
    build_id: "7396576"
    build_id: "7464984"
    target: "CtsShim"
    source_file: "aosp_x86_64/CtsShimPriv.apk"
  }
+1 −1
Original line number Diff line number Diff line
drops {
  android_build_drop {
    build_id: "7396576"
    build_id: "7464984"
    target: "CtsShim"
    source_file: "aosp_x86_64/CtsShim.apk"
  }
+8 −5
Original line number Diff line number Diff line
@@ -2006,16 +2006,12 @@ public class AlarmManagerService extends SystemService {
                windowLength = INTERVAL_DAY;
            } else if ((flags & FLAG_PRIORITIZE) == 0 && windowLength < minAllowedWindow) {
                // Prioritized alarms are exempt from minimum window limits.
                if (CompatChanges.isChangeEnabled(
                if (!isExemptFromMinWindowRestrictions(callingUid) && CompatChanges.isChangeEnabled(
                        AlarmManager.ENFORCE_MINIMUM_WINDOW_ON_INEXACT_ALARMS, callingPackage,
                        UserHandle.getUserHandleForUid(callingUid))) {
                    Slog.w(TAG, "Window length " + windowLength + "ms too short; expanding to "
                            + minAllowedWindow + "ms.");
                    windowLength = minAllowedWindow;
                } else {
                    // TODO (b/185199076): Remove temporary log to catch breaking apps.
                    Slog.wtf(TAG, "Short window " + windowLength + "ms specified by "
                            + callingPackage);
                }
            }
            maxElapsed = triggerElapsed + windowLength;
@@ -2408,6 +2404,13 @@ public class AlarmManagerService extends SystemService {
        return hasPermission;
    }

    /**
     * Returns true if the given uid can set window to be as small as it wants.
     */
    boolean isExemptFromMinWindowRestrictions(int uid) {
        return isExemptFromExactAlarmPermission(uid);
    }

    /**
     * Returns true if the given uid does not require SCHEDULE_EXACT_ALARM to set exact,
     * allow-while-idle alarms.
Loading