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

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

Snap for 8591706 from cb815498 to tm-qpr1-release 

Change-Id: I8351a385bd9a9a927f42b4179d964f99ff03178e
parents f4f980f6 cb815498

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7552332"

    build_id: "8572644"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "sc-dev"

  git_branch: "tm-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+15 −3
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import static android.app.AlarmManager.INTERVAL_HOUR; 
import static android.app.AlarmManager.RTC;

import static android.app.AlarmManager.RTC_WAKEUP;

import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;

import static android.os.PowerExemptionManager.REASON_ALARM_MANAGER_ALARM_CLOCK;

import static android.os.PowerExemptionManager.REASON_DENIED;

import static android.os.PowerExemptionManager.REASON_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED;

import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED;

import static android.os.PowerWhitelistManager.REASON_ALARM_MANAGER_WHILE_IDLE;
@@ -329,6 +331,7 @@ public class AlarmManagerService extends SystemService { 
    });



    BroadcastOptions mOptsWithFgs = BroadcastOptions.makeBasic();

    BroadcastOptions mOptsWithFgsForAlarmClock = BroadcastOptions.makeBasic();

    BroadcastOptions mOptsWithoutFgs = BroadcastOptions.makeBasic();

    BroadcastOptions mOptsTimeBroadcast = BroadcastOptions.makeBasic();

    ActivityOptions mActivityOptsRestrictBal = ActivityOptions.makeBasic();
@@ -730,9 +733,12 @@ public class AlarmManagerService extends SystemService { 
                mOptsWithFgs.setTemporaryAppAllowlist(ALLOW_WHILE_IDLE_WHITELIST_DURATION,

                        TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                        REASON_ALARM_MANAGER_WHILE_IDLE, "");

                mOptsWithFgsForAlarmClock.setTemporaryAppAllowlist(

                        ALLOW_WHILE_IDLE_WHITELIST_DURATION,

                        TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                        REASON_ALARM_MANAGER_ALARM_CLOCK, "");

                mOptsWithoutFgs.setTemporaryAppAllowlist(ALLOW_WHILE_IDLE_WHITELIST_DURATION,

                        TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED,

                        REASON_ALARM_MANAGER_WHILE_IDLE, "");

                        TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED, REASON_DENIED, "");

            }

        }
@@ -1710,6 +1716,7 @@ public class AlarmManagerService extends SystemService { 
    public void onStart() {

        mInjector.init();

        mOptsWithFgs.setPendingIntentBackgroundActivityLaunchAllowed(false);

        mOptsWithFgsForAlarmClock.setPendingIntentBackgroundActivityLaunchAllowed(false);

        mOptsWithoutFgs.setPendingIntentBackgroundActivityLaunchAllowed(false);

        mOptsTimeBroadcast.setPendingIntentBackgroundActivityLaunchAllowed(false);

        mActivityOptsRestrictBal.setPendingIntentBackgroundActivityLaunchAllowed(false);
@@ -2707,7 +2714,12 @@ public class AlarmManagerService extends SystemService { 
                if (isExactAlarmChangeEnabled(callingPackage, callingUserId)) {

                    needsPermission = exact;

                    lowerQuota = !exact;

                    idleOptions = exact ? mOptsWithFgs.toBundle() : mOptsWithoutFgs.toBundle();

                    if (exact) {

                        idleOptions = (alarmClock != null) ? mOptsWithFgsForAlarmClock.toBundle()

                                : mOptsWithFgs.toBundle();

                    } else {

                        idleOptions = mOptsWithoutFgs.toBundle();

                    }

                } else {

                    changeDisabled = true;

                    needsPermission = false;