diff --git a/tests/cts/hostside/aidl/com/android/cts/net/hostside/IMyService.aidl b/tests/cts/hostside/aidl/com/android/cts/net/hostside/IMyService.aidl index 28437c28a6..e7b28157c5 100644 --- a/tests/cts/hostside/aidl/com/android/cts/net/hostside/IMyService.aidl +++ b/tests/cts/hostside/aidl/com/android/cts/net/hostside/IMyService.aidl @@ -28,5 +28,5 @@ interface IMyService { void sendNotification(int notificationId, String notificationType); void registerNetworkCallback(in NetworkRequest request, in INetworkCallback cb); void unregisterNetworkCallback(); - void scheduleJob(in JobInfo jobInfo); + int scheduleJob(in JobInfo jobInfo); } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 3c4c3e3f71..96ce65f6d4 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -16,6 +16,7 @@ package com.android.cts.net.hostside; +import static android.app.job.JobScheduler.RESULT_SUCCESS; import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED; import static android.os.BatteryManager.BATTERY_PLUGGED_AC; import static android.os.BatteryManager.BATTERY_PLUGGED_USB; @@ -855,7 +856,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) .setTransientExtras(extras) .build(); - mServiceClient.scheduleJob(jobInfo); + assertEquals("Error scheduling " + jobInfo, + RESULT_SUCCESS, mServiceClient.scheduleJob(jobInfo)); forceRunJob(TEST_APP2_PKG, TEST_JOB_ID); if (latch.await(JOB_NETWORK_STATE_TIMEOUT_MS, TimeUnit.MILLISECONDS)) { final int resultCode = result.get(0).first; diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java index 8b70f9b549..0610774254 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java @@ -107,7 +107,7 @@ public class MyServiceClient { mService.unregisterNetworkCallback(); } - public void scheduleJob(JobInfo jobInfo) throws RemoteException { - mService.scheduleJob(jobInfo); + public int scheduleJob(JobInfo jobInfo) throws RemoteException { + return mService.scheduleJob(jobInfo); } } diff --git a/tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java b/tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java index f2a7b3f656..3ed5391b1b 100644 --- a/tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java +++ b/tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java @@ -165,10 +165,10 @@ public class MyService extends Service { } @Override - public void scheduleJob(JobInfo jobInfo) { + public int scheduleJob(JobInfo jobInfo) { final JobScheduler jobScheduler = getApplicationContext() .getSystemService(JobScheduler.class); - jobScheduler.schedule(jobInfo); + return jobScheduler.schedule(jobInfo); } };