Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev (05889540) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1598,10 +1598,10 @@ public class Am extends BaseCommand {
	}		}

	System.out.println("Performing idle maintenance...");		System.out.println("Performing idle maintenance...");
	Intent intent = new Intent(		try {
	"com.android.server.task.controllers.IdleController.ACTION_TRIGGER_IDLE");		mAm.sendIdleJobTrigger();
	mAm.broadcastIntent(null, intent, null, null, 0, null, null, null,		} catch (RemoteException e) {
	android.app.AppOpsManager.OP_NONE, null, true, false, UserHandle.USER_ALL);		}
	}		}

	private void runScreenCompat() throws Exception {		private void runScreenCompat() throws Exception {

core/java/android/app/ActivityManagerNative.java

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2970,6 +2970,12 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
	reply.writeNoException();		reply.writeNoException();
	return true;		return true;
	}		}
			case SEND_IDLE_JOB_TRIGGER_TRANSACTION: {
			data.enforceInterface(IActivityManager.descriptor);
			sendIdleJobTrigger();
			reply.writeNoException();
			return true;
			}
	}		}

	return super.onTransact(code, data, reply, flags);		return super.onTransact(code, data, reply, flags);
	@@ -6247,6 +6253,16 @@ class ActivityManagerProxy implements IActivityManager
	reply.recycle();		reply.recycle();
	}		}

			public void sendIdleJobTrigger() throws RemoteException {
			Parcel data = Parcel.obtain();
			Parcel reply = Parcel.obtain();
			data.writeInterfaceToken(IActivityManager.descriptor);
			mRemote.transact(SEND_IDLE_JOB_TRIGGER_TRANSACTION, data, reply, 0);
			reply.readException();
			data.recycle();
			reply.recycle();
			}

	public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,		public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,
	IActivityContainerCallback callback) throws RemoteException {		IActivityContainerCallback callback) throws RemoteException {
	Parcel data = Parcel.obtain();		Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -546,6 +546,8 @@ public interface IActivityManager extends IInterface {

	public void performIdleMaintenance() throws RemoteException;		public void performIdleMaintenance() throws RemoteException;

			public void sendIdleJobTrigger() throws RemoteException;

	public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,		public IActivityContainer createVirtualActivityContainer(IBinder parentActivityToken,
	IActivityContainerCallback callback) throws RemoteException;		IActivityContainerCallback callback) throws RemoteException;

	@@ -1035,4 +1037,5 @@ public interface IActivityManager extends IInterface {
	int SWAP_DOCKED_AND_FULLSCREEN_STACK = IBinder.FIRST_CALL_TRANSACTION + 372;		int SWAP_DOCKED_AND_FULLSCREEN_STACK = IBinder.FIRST_CALL_TRANSACTION + 372;
	int NOTIFY_LOCKED_PROFILE = IBinder.FIRST_CALL_TRANSACTION + 373;		int NOTIFY_LOCKED_PROFILE = IBinder.FIRST_CALL_TRANSACTION + 373;
	int START_CONFIRM_DEVICE_CREDENTIAL_INTENT = IBinder.FIRST_CALL_TRANSACTION + 374;		int START_CONFIRM_DEVICE_CREDENTIAL_INTENT = IBinder.FIRST_CALL_TRANSACTION + 374;
			int SEND_IDLE_JOB_TRIGGER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 375;
	}		}

core/res/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -307,7 +307,7 @@
	<protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_START" />		<protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_START" />
	<protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_END" />		<protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_END" />

	<protected-broadcast android:name="com.android.server.task.controllers.IdleController.ACTION_TRIGGER_IDLE" />		<protected-broadcast android:name="com.android.server.ACTION_TRIGGER_IDLE" />

	<protected-broadcast android:name="android.intent.action.HDMI_PLUGGED" />		<protected-broadcast android:name="android.intent.action.HDMI_PLUGGED" />

services/core/java/com/android/server/am/ActivityManagerService.java

+25 −0

Original line number	Original line	Diff line number	Diff line
	@@ -390,6 +390,11 @@ public final class ActivityManagerService extends ActivityManagerNative
	private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY;		private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY;
	private static final String TAG_VISIBLE_BEHIND = TAG + POSTFIX_VISIBLE_BEHIND;		private static final String TAG_VISIBLE_BEHIND = TAG + POSTFIX_VISIBLE_BEHIND;

			// Mock "pretend we're idle now" broadcast action to the job scheduler; declared
			// here so that while the job scheduler can depend on AMS, the other way around
			// need not be the case.
			public static final String ACTION_TRIGGER_IDLE = "com.android.server.ACTION_TRIGGER_IDLE";

	/** Control over CPU and battery monitoring */		/** Control over CPU and battery monitoring */
	// write battery stats every 30 minutes.		// write battery stats every 30 minutes.
	static final long BATTERY_STATS_TIME = 30 * 60 * 1000;		static final long BATTERY_STATS_TIME = 30 * 60 * 1000;
	@@ -12658,6 +12663,26 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	}		}

			@Override
			public void sendIdleJobTrigger() {
			if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
			!= PackageManager.PERMISSION_GRANTED) {
			throw new SecurityException("Requires permission "
			+ android.Manifest.permission.SET_ACTIVITY_WATCHER);
			}

			final long ident = Binder.clearCallingIdentity();
			try {
			Intent intent = new Intent(ACTION_TRIGGER_IDLE)
			.setPackage("android")
			.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
			broadcastIntent(null, intent, null, null, 0, null, null, null,
			android.app.AppOpsManager.OP_NONE, null, true, false, UserHandle.USER_ALL);
			} finally {
			Binder.restoreCallingIdentity(ident);
			}
			}

	private void retrieveSettings() {		private void retrieveSettings() {
	final ContentResolver resolver = mContext.getContentResolver();		final ContentResolver resolver = mContext.getContentResolver();
	final boolean freeformWindowManagement =		final boolean freeformWindowManagement =