joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Verify the return value of scheduleJob()."

Browse source
This commit is contained in:
Treehugger Robot 2022-04-20 03:07:37 +00:00 • committed by Gerrit Code Review
commit a4ea04d869
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/cts/hostside/aidl/com/android/cts/net/hostside/IMyService.aidl
View file

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

4
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View file

@ -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;

4
tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java
View file

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

4
tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyService.java
View file

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