Merge "Remove IMaintenanceActivityListener (which was unused)" (72fcdcde) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.os;

		import android.os.IMaintenanceActivityListener;
		import android.os.UserHandle;

		/** @hide */
		@@ -44,8 +43,6 @@ interface IDeviceIdleController {
		long addPowerSaveTempWhitelistAppForMms(String name, int userId, String reason);
		long addPowerSaveTempWhitelistAppForSms(String name, int userId, String reason);
		void exitIdle(String reason);
		boolean registerMaintenanceActivityListener(IMaintenanceActivityListener listener);
		void unregisterMaintenanceActivityListener(IMaintenanceActivityListener listener);
		int setPreIdleTimeoutMode(int Mode);
		void resetPreIdleTimeoutMode();
		}

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+0 −58

Original line number	Diff line number	Diff line
		@@ -51,14 +51,12 @@ import android.os.Environment;
		import android.os.FileUtils;
		import android.os.Handler;
		import android.os.IDeviceIdleController;
		import android.os.IMaintenanceActivityListener;
		import android.os.Looper;
		import android.os.Message;
		import android.os.PowerManager;
		import android.os.PowerManager.ServiceType;
		import android.os.PowerManagerInternal;
		import android.os.Process;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		@@ -448,7 +446,6 @@ public class DeviceIdleController extends SystemService
		// down.
		private boolean mJobsActive;
		private boolean mAlarmsActive;
		private boolean mReportedMaintenanceActivity;

		/* Factor to apply to INACTIVE_TIMEOUT and IDLE_AFTER_INACTIVE_TIMEOUT in order to enter
		* STATE_IDLE faster or slower. Don't apply this to SENSING_TIMEOUT or LOCATING_TIMEOUT because:
		@@ -463,9 +460,6 @@ public class DeviceIdleController extends SystemService

		public final AtomicFile mConfigFile;

		private final RemoteCallbackList<IMaintenanceActivityListener> mMaintenanceActivityListeners =
		new RemoteCallbackList<IMaintenanceActivityListener>();

		/**
		* Package names the system has white-listed to opt out of power save restrictions,
		* except for device idle mode.
		@@ -1309,7 +1303,6 @@ public class DeviceIdleController extends SystemService
		private static final int MSG_REPORT_IDLE_OFF = 4;
		private static final int MSG_REPORT_ACTIVE = 5;
		private static final int MSG_TEMP_APP_WHITELIST_TIMEOUT = 6;
		private static final int MSG_REPORT_MAINTENANCE_ACTIVITY = 7;
		private static final int MSG_FINISH_IDLE_OP = 8;
		private static final int MSG_REPORT_TEMP_APP_WHITELIST_CHANGED = 9;
		private static final int MSG_SEND_CONSTRAINT_MONITORING = 10;
		@@ -1410,22 +1403,6 @@ public class DeviceIdleController extends SystemService
		int appId = msg.arg1;
		checkTempAppWhitelistTimeout(appId);
		} break;
		case MSG_REPORT_MAINTENANCE_ACTIVITY: {
		// TODO: What is keeping the device awake at this point? Does it need to be?
		boolean active = (msg.arg1 == 1);
		final int size = mMaintenanceActivityListeners.beginBroadcast();
		try {
		for (int i = 0; i < size; i++) {
		try {
		mMaintenanceActivityListeners.getBroadcastItem(i)
		.onMaintenanceActivityChanged(active);
		} catch (RemoteException ignored) {
		}
		}
		} finally {
		mMaintenanceActivityListeners.finishBroadcast();
		}
		} break;
		case MSG_FINISH_IDLE_OP: {
		// mActiveIdleWakeLock is held at this point
		decActiveIdleOps();
		@@ -1594,16 +1571,6 @@ public class DeviceIdleController extends SystemService
		}
		}

		@Override public boolean registerMaintenanceActivityListener(
		IMaintenanceActivityListener listener) {
		return DeviceIdleController.this.registerMaintenanceActivityListener(listener);
		}

		@Override public void unregisterMaintenanceActivityListener(
		IMaintenanceActivityListener listener) {
		DeviceIdleController.this.unregisterMaintenanceActivityListener(listener);
		}

		@Override public int setPreIdleTimeoutMode(int mode) {
		getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER,
		null);
		@@ -3131,7 +3098,6 @@ public class DeviceIdleController extends SystemService
		void setJobsActive(boolean active) {
		synchronized (this) {
		mJobsActive = active;
		reportMaintenanceActivityIfNeededLocked();
		if (!active) {
		exitMaintenanceEarlyIfNeededLocked();
		}
		@@ -3147,19 +3113,6 @@ public class DeviceIdleController extends SystemService
		}
		}

		boolean registerMaintenanceActivityListener(IMaintenanceActivityListener listener) {
		synchronized (this) {
		mMaintenanceActivityListeners.register(listener);
		return mReportedMaintenanceActivity;
		}
		}

		void unregisterMaintenanceActivityListener(IMaintenanceActivityListener listener) {
		synchronized (this) {
		mMaintenanceActivityListeners.unregister(listener);
		}
		}

		@VisibleForTesting
		int setPreIdleTimeoutMode(int mode) {
		return setPreIdleTimeoutFactor(getPreIdleTimeoutByMode(mode));
		@@ -3281,17 +3234,6 @@ public class DeviceIdleController extends SystemService
		}
		}

		void reportMaintenanceActivityIfNeededLocked() {
		boolean active = mJobsActive;
		if (active == mReportedMaintenanceActivity) {
		return;
		}
		mReportedMaintenanceActivity = active;
		Message msg = mHandler.obtainMessage(MSG_REPORT_MAINTENANCE_ACTIVITY,
		mReportedMaintenanceActivity ? 1 : 0, 0);
		mHandler.sendMessage(msg);
		}

		@VisibleForTesting
		long getNextAlarmTime() {
		return mNextAlarmTime;

core/java/android/os/IMaintenanceActivityListener.aidl

deleted100644 → 0

+0 −22

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);
		}