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

Commit c43c53c1 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "JobScheduler: remove TARE" into main

parents 065e8c4a 4a98dd23

apex/jobscheduler/framework/java/android/app/job/JobSchedulerFrameworkInitializer.java

+0 −5
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.app.job; 
import android.annotation.SystemApi;

import android.app.JobSchedulerImpl;

import android.app.SystemServiceRegistry;

import android.app.tare.EconomyManager;

import android.app.tare.IEconomyManager;

import android.content.Context;

import android.os.DeviceIdleManager;

import android.os.IDeviceIdleController;
@@ -58,8 +56,5 @@ public class JobSchedulerFrameworkInitializer { 
        SystemServiceRegistry.registerContextAwareService(

                Context.POWER_EXEMPTION_SERVICE, PowerExemptionManager.class,

                PowerExemptionManager::new);

        SystemServiceRegistry.registerStaticService(

                Context.RESOURCE_ECONOMY_SERVICE, EconomyManager.class,

                (b) -> new EconomyManager(IEconomyManager.Stub.asInterface(b)));

    }

}

apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java

deleted100644 → 0
+0 −653

File deleted.

Preview size limit exceeded, changes collapsed.

apex/jobscheduler/framework/java/android/app/tare/IEconomyManager.aidl

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app.tare;



 /**

  * IPC interface that supports the app-facing {@link #EconomyManager} api.

  * {@hide}

  */

interface IEconomyManager {

    int getEnabledMode();

}

apex/jobscheduler/framework/java/android/app/tare/OWNERS

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
include /apex/jobscheduler/service/java/com/android/server/tare/OWNERS
 
 No newline at end of file

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

+1 −9
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import java.util.Date; 
 */

class Alarm {

    @VisibleForTesting

    public static final int NUM_POLICIES = 5;

    public static final int NUM_POLICIES = 4;

    /**

     * Index used to store the time the alarm was requested to expire. To be used with

     * {@link #setPolicyElapsed(int, long)}.
@@ -68,12 +68,6 @@ class Alarm { 
     */

    public static final int BATTERY_SAVER_POLICY_INDEX = 3;



    /**

     * Index used to store the earliest time the alarm can expire based on TARE policy.

     * To be used with {@link #setPolicyElapsed(int, long)}.

     */

    public static final int TARE_POLICY_INDEX = 4;



    /**

     * Reason to use for inexact alarms.

     */
@@ -278,8 +272,6 @@ class Alarm { 
                return "device_idle";

            case BATTERY_SAVER_POLICY_INDEX:

                return "battery_saver";

            case TARE_POLICY_INDEX:

                return "tare";

            default:

                return "--unknown(" + index + ")--";

        }