Merge "Out with the old; in with the new" into lmp-preview-dev (e9ed3707) · Commits · e / os / android_frameworks_base

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -77,9 +77,9 @@ LOCAL_SRC_FILES += \
		core/java/android/app/ISearchManagerCallback.aidl \
		core/java/android/app/IServiceConnection.aidl \
		core/java/android/app/IStopUserCallback.aidl \
		core/java/android/app/task/ITaskCallback.aidl \
		core/java/android/app/task/ITaskManager.aidl \
		core/java/android/app/task/ITaskService.aidl \
		core/java/android/app/job/IJobCallback.aidl \
		core/java/android/app/job/IJobScheduler.aidl \
		core/java/android/app/job/IJobService.aidl \
		core/java/android/app/IThumbnailRetriever.aidl \
		core/java/android/app/ITransientNotification.aidl \
		core/java/android/app/IUiAutomationConnection.aidl \

CleanSpec.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -197,3 +197,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/classes/android/app/task)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/app/task)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/classes/android/app/TaskManager)

api/current.txt

+46 −46

Original line number	Diff line number	Diff line
		@@ -5359,23 +5359,9 @@ package android.app.backup {

		}

		package android.app.maintenance {
		package android.app.job {

		public abstract class IdleService extends android.app.Service {
		ctor public IdleService();
		method public final void finishIdle();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract boolean onIdleStart();
		method public abstract void onIdleStop();
		field public static final java.lang.String PERMISSION_BIND = "android.permission.BIND_IDLE_SERVICE";
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.idle.IdleService";
		}

		}

		package android.app.task {

		public class Task implements android.os.Parcelable {
		public class JobInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getBackoffPolicy();
		method public android.os.PersistableBundle getExtras();
		@@ -5393,55 +5379,69 @@ package android.app.task {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public static abstract interface Task.BackoffPolicy {
		public static abstract interface JobInfo.BackoffPolicy {
		field public static final int EXPONENTIAL = 1; // 0x1
		field public static final int LINEAR = 0; // 0x0
		}

		public static final class Task.Builder {
		ctor public Task.Builder(int, android.content.ComponentName);
		method public android.app.task.Task build();
		method public android.app.task.Task.Builder setBackoffCriteria(long, int);
		method public android.app.task.Task.Builder setExtras(android.os.PersistableBundle);
		method public android.app.task.Task.Builder setMinimumLatency(long);
		method public android.app.task.Task.Builder setOverrideDeadline(long);
		method public android.app.task.Task.Builder setPeriodic(long);
		method public android.app.task.Task.Builder setRequiredNetworkCapabilities(int);
		method public android.app.task.Task.Builder setRequiresCharging(boolean);
		method public android.app.task.Task.Builder setRequiresDeviceIdle(boolean);
		public static final class JobInfo.Builder {
		ctor public JobInfo.Builder(int, android.content.ComponentName);
		method public android.app.job.JobInfo build();
		method public android.app.job.JobInfo.Builder setBackoffCriteria(long, int);
		method public android.app.job.JobInfo.Builder setExtras(android.os.PersistableBundle);
		method public android.app.job.JobInfo.Builder setMinimumLatency(long);
		method public android.app.job.JobInfo.Builder setOverrideDeadline(long);
		method public android.app.job.JobInfo.Builder setPeriodic(long);
		method public android.app.job.JobInfo.Builder setRequiredNetworkCapabilities(int);
		method public android.app.job.JobInfo.Builder setRequiresCharging(boolean);
		method public android.app.job.JobInfo.Builder setRequiresDeviceIdle(boolean);
		}

		public static abstract interface Task.NetworkType {
		public static abstract interface JobInfo.NetworkType {
		field public static final int ANY = 1; // 0x1
		field public static final int NONE = 0; // 0x0
		field public static final int UNMETERED = 2; // 0x2
		}

		public abstract class TaskManager {
		ctor public TaskManager();
		public class JobParameters implements android.os.Parcelable {
		method public int describeContents();
		method public android.os.PersistableBundle getExtras();
		method public int getJobId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public abstract class JobScheduler {
		ctor public JobScheduler();
		method public abstract void cancel(int);
		method public abstract void cancelAll();
		method public abstract java.util.List<android.app.task.Task> getAllPendingTasks();
		method public abstract int schedule(android.app.task.Task);
		method public abstract java.util.List<android.app.job.JobInfo> getAllPendingJobs();
		method public abstract int schedule(android.app.job.JobInfo);
		field public static final int RESULT_FAILURE = 0; // 0x0
		field public static final int RESULT_SUCCESS = 1; // 0x1
		}

		public class TaskParams implements android.os.Parcelable {
		method public int describeContents();
		method public android.os.PersistableBundle getExtras();
		method public int getTaskId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		public abstract class JobService extends android.app.Service {
		ctor public JobService();
		method public final void jobFinished(android.app.job.JobParameters, boolean);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract boolean onStartJob(android.app.job.JobParameters);
		method public abstract boolean onStopJob(android.app.job.JobParameters);
		field public static final java.lang.String PERMISSION_BIND = "android.permission.BIND_JOB_SERVICE";
		}

		}

		public abstract class TaskService extends android.app.Service {
		ctor public TaskService();
		package android.app.maintenance {

		public abstract class IdleService extends android.app.Service {
		ctor public IdleService();
		method public final void finishIdle();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract boolean onStartTask(android.app.task.TaskParams);
		method public abstract boolean onStopTask(android.app.task.TaskParams);
		method public final void taskFinished(android.app.task.TaskParams, boolean);
		field public static final java.lang.String PERMISSION_BIND = "android.permission.BIND_TASK_SERVICE";
		method public abstract boolean onIdleStart();
		method public abstract void onIdleStop();
		field public static final java.lang.String PERMISSION_BIND = "android.permission.BIND_IDLE_SERVICE";
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.idle.IdleService";
		}

		}
		@@ -7009,6 +7009,7 @@ package android.content {
		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		field public static final java.lang.String INPUT_SERVICE = "input";
		field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";
		field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";
		field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";
		field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater";
		@@ -7029,7 +7030,6 @@ package android.content {
		field public static final java.lang.String SEARCH_SERVICE = "search";
		field public static final java.lang.String SENSOR_SERVICE = "sensor";
		field public static final java.lang.String STORAGE_SERVICE = "storage";
		field public static final java.lang.String TASK_SERVICE = "task";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";

core/java/android/app/ContextImpl.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ import android.view.textservice.TextServicesManager;
		import android.accounts.AccountManager;
		import android.accounts.IAccountManager;
		import android.app.admin.DevicePolicyManager;
		import android.app.task.ITaskManager;
		import android.app.job.IJobScheduler;
		import android.app.trust.TrustManager;

		import com.android.internal.annotations.GuardedBy;
		@@ -697,10 +697,10 @@ class ContextImpl extends Context {
		return new UsageStatsManager(ctx.getOuterContext());
		}});

		registerService(TASK_SERVICE, new ServiceFetcher() {
		registerService(JOB_SCHEDULER_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(TASK_SERVICE);
		return new TaskManagerImpl(ITaskManager.Stub.asInterface(b));
		IBinder b = ServiceManager.getService(JOB_SCHEDULER_SERVICE);
		return new JobSchedulerImpl(IJobScheduler.Stub.asInterface(b));
		}});
		}

core/java/android/app/TaskManagerImpl.java→core/java/android/app/JobSchedulerImpl.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -17,38 +17,38 @@
		// in android.app so ContextImpl has package access
		package android.app;

		import android.app.task.ITaskManager;
		import android.app.task.Task;
		import android.app.task.TaskManager;
		import android.app.job.JobInfo;
		import android.app.job.JobScheduler;
		import android.app.job.IJobScheduler;
		import android.os.RemoteException;

		import java.util.List;


		/**
		* Concrete implementation of the TaskManager interface
		* Concrete implementation of the JobScheduler interface
		* @hide
		*/
		public class TaskManagerImpl extends TaskManager {
		ITaskManager mBinder;
		public class JobSchedulerImpl extends JobScheduler {
		IJobScheduler mBinder;

		/* package */ TaskManagerImpl(ITaskManager binder) {
		/* package */ JobSchedulerImpl(IJobScheduler binder) {
		mBinder = binder;
		}

		@Override
		public int schedule(Task task) {
		public int schedule(JobInfo job) {
		try {
		return mBinder.schedule(task);
		return mBinder.schedule(job);
		} catch (RemoteException e) {
		return TaskManager.RESULT_FAILURE;
		return JobScheduler.RESULT_FAILURE;
		}
		}

		@Override
		public void cancel(int taskId) {
		public void cancel(int jobId) {
		try {
		mBinder.cancel(taskId);
		mBinder.cancel(jobId);
		} catch (RemoteException e) {}

		}
		@@ -62,9 +62,9 @@ public class TaskManagerImpl extends TaskManager {
		}

		@Override
		public List<Task> getAllPendingTasks() {
		public List<JobInfo> getAllPendingJobs() {
		try {
		return mBinder.getAllPendingTasks();
		return mBinder.getAllPendingJobs();
		} catch (RemoteException e) {
		return null;
		}