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

Commit 9941ab3c authored by Yao Chen's avatar Yao Chen Committed by Android (Google) Code Review
Browse files

Merge "Changes in DeviceIdlecontroller and JobScheduler to support Auto GarageMode."

parents 59f1744e ca5edbb6

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IBatteryPropertiesRegistrar.aidl \

	core/java/android/os/ICancellationSignal.aidl \

	core/java/android/os/IDeviceIdleController.aidl \

	core/java/android/os/IMaintenanceActivityListener.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/INetworkActivityListener.aidl \

	core/java/android/os/INetworkManagementService.aidl \

core/java/android/os/IDeviceIdleController.aidl

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.os.IMaintenanceActivityListener;

import android.os.UserHandle;



/** @hide */
@@ -37,4 +38,6 @@ interface IDeviceIdleController { 
    void exitIdle(String reason);

    void downloadServiceActive(IBinder token);

    void downloadServiceInactive();

    boolean registerMaintenanceActivityListener(IMaintenanceActivityListener listener);

    void unregisterMaintenanceActivityListener(IMaintenanceActivityListener listener);

}

core/java/android/os/IMaintenanceActivityListener.aidl

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2016, 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.os;



/** @hide */

oneway interface IMaintenanceActivityListener {

    void onMaintenanceActivityChanged(boolean active);

}

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -2429,4 +2429,10 @@ 
    <!-- List of comma separated package names for which we the system will not show crash, ANR,

         etc. dialogs. -->

    <string translatable="false" name="config_appsNotReportingCrashes"></string>



    <!-- Inactivity threshold (in milliseconds) used in JobScheduler. JobScheduler will consider

         the device to be "idle" after being inactive for this long. -->

    <integer name="config_jobSchedulerInactivityIdleThreshold">4260000</integer>

    <!-- The alarm window (in milliseconds) that JobScheduler uses to enter the idle state -->

    <integer name="config_jobSchedulerIdleWindowSlop">300000</integer>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,9 @@ 


  <java-symbol type="integer" name="config_defaultNightMode" />



  <java-symbol type="integer" name="config_jobSchedulerInactivityIdleThreshold" />

  <java-symbol type="integer" name="config_jobSchedulerIdleWindowSlop" />



  <java-symbol type="style" name="Animation.ImmersiveModeConfirmation" />



  <java-symbol type="integer" name="config_screen_magnification_multi_tap_adjustment" />