Merge "Made ExplicitHealthCheckService testable." into rvc-dev am: 62cd75f90d (6828c3e5) · Commits · e / os / android_frameworks_base

api/test-current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -3522,6 +3522,32 @@ package android.service.textclassifier {

		}

		package android.service.watchdog {

		public abstract class ExplicitHealthCheckService extends android.app.Service {
		ctor public ExplicitHealthCheckService();
		method public final void notifyHealthCheckPassed(@NonNull String);
		method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method public abstract void onCancelHealthCheck(@NonNull String);
		method @NonNull public abstract java.util.List<java.lang.String> onGetRequestedPackages();
		method @NonNull public abstract java.util.List<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> onGetSupportedPackages();
		method public abstract void onRequestHealthCheck(@NonNull String);
		method public void setCallback(@Nullable android.os.RemoteCallback);
		field public static final String BIND_PERMISSION = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";
		field public static final String SERVICE_INTERFACE = "android.service.watchdog.ExplicitHealthCheckService";
		}

		public static final class ExplicitHealthCheckService.PackageConfig implements android.os.Parcelable {
		ctor public ExplicitHealthCheckService.PackageConfig(@NonNull String, long);
		method public int describeContents();
		method public long getHealthCheckTimeoutMillis();
		method @NonNull public String getPackageName();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> CREATOR;
		}

		}

		package android.telecom {

		public final class Call {

core/java/android/service/watchdog/ExplicitHealthCheckService.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,9 @@ import static android.os.Parcelable.Creator;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.Service;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		@@ -64,6 +66,7 @@ import java.util.concurrent.TimeUnit;
		* </pre>
		* @hide
		*/
		@TestApi
		@SystemApi
		public abstract class ExplicitHealthCheckService extends Service {

		@@ -158,6 +161,15 @@ public abstract class ExplicitHealthCheckService extends Service {
		return mWrapper;
		}

		/**
		* Sets {@link RemoteCallback}, for testing purpose.
		*
		* @hide
		*/
		@TestApi
		public void setCallback(@Nullable RemoteCallback callback) {
		mCallback = callback;
		}
		/**
		* Implementors should call this to notify the system when explicit health check passes
		* for {@code packageName};
		@@ -183,6 +195,7 @@ public abstract class ExplicitHealthCheckService extends Service {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class PackageConfig implements Parcelable {
		private static final long DEFAULT_HEALTH_CHECK_TIMEOUT_MILLIS = TimeUnit.HOURS.toMillis(1);
		@@ -263,7 +276,7 @@ public abstract class ExplicitHealthCheckService extends Service {
		}

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		public void writeToParcel(@SuppressLint({"MissingNullability"}) Parcel parcel, int flags) {
		parcel.writeString(mPackageName);
		parcel.writeLong(mHealthCheckTimeoutMillis);
		}