Update operationCode constants to match updated method names.
Bug: 228200518
Test: TH
Change-Id: I41c706b7800a7356adbe37c669f67e39e95f3dc6
diff --git a/framework/java/android/ondevicepersonalization/Constants.java b/framework/java/android/ondevicepersonalization/Constants.java
index 41174b1..90e6c13 100644
--- a/framework/java/android/ondevicepersonalization/Constants.java
+++ b/framework/java/android/ondevicepersonalization/Constants.java
@@ -26,10 +26,10 @@
public static final int STATUS_INTERNAL_ERROR = 100;
// Operations implemented by personalization services.
- public static final int OP_SELECT_CONTENT = 1;
- public static final int OP_DOWNLOAD_FINISHED = 2;
- public static final int OP_RENDER_CONTENT = 3;
- public static final int OP_COMPUTE_EVENT_METRICS = 4;
+ public static final int OP_EXECUTE = 1;
+ public static final int OP_DOWNLOAD = 2;
+ public static final int OP_RENDER = 3;
+ public static final int OP_EVENT = 4;
// Keys for Bundle objects passed between processes.
public static final String
diff --git a/framework/java/android/ondevicepersonalization/IsolatedComputationService.java b/framework/java/android/ondevicepersonalization/IsolatedComputationService.java
index d73a689..1fb7460 100644
--- a/framework/java/android/ondevicepersonalization/IsolatedComputationService.java
+++ b/framework/java/android/ondevicepersonalization/IsolatedComputationService.java
@@ -68,7 +68,7 @@
Objects.requireNonNull(callback);
// TODO(b/228200518): Ensure that caller is ODP Service.
- if (operationCode == Constants.OP_SELECT_CONTENT) {
+ if (operationCode == Constants.OP_EXECUTE) {
ExecuteInput input = Objects.requireNonNull(
params.getParcelable(Constants.EXTRA_INPUT, ExecuteInput.class));
@@ -82,7 +82,7 @@
mHandler.onExecute(
input, odpContext, new WrappedCallback<ExecuteOutput>(callback));
- } else if (operationCode == Constants.OP_DOWNLOAD_FINISHED) {
+ } else if (operationCode == Constants.OP_DOWNLOAD) {
DownloadInputParcel input = Objects.requireNonNull(
params.getParcelable(Constants.EXTRA_INPUT, DownloadInputParcel.class));
@@ -112,7 +112,7 @@
mHandler.onDownload(
downloadInput, odpContext, new WrappedCallback<DownloadOutput>(callback));
- } else if (operationCode == Constants.OP_RENDER_CONTENT) {
+ } else if (operationCode == Constants.OP_RENDER) {
RenderInput input = Objects.requireNonNull(
params.getParcelable(Constants.EXTRA_INPUT, RenderInput.class));
@@ -127,7 +127,7 @@
mHandler.onRender(
input, odpContext, new WrappedCallback<RenderOutput>(callback));
- } else if (operationCode == Constants.OP_COMPUTE_EVENT_METRICS) {
+ } else if (operationCode == Constants.OP_EVENT) {
EventInput input = Objects.requireNonNull(
params.getParcelable(Constants.EXTRA_INPUT, EventInput.class));
diff --git a/src/com/android/ondevicepersonalization/services/display/OdpWebViewClient.java b/src/com/android/ondevicepersonalization/services/display/OdpWebViewClient.java
index 182bbde..f38cff4 100644
--- a/src/com/android/ondevicepersonalization/services/display/OdpWebViewClient.java
+++ b/src/com/android/ondevicepersonalization/services/display/OdpWebViewClient.java
@@ -147,7 +147,7 @@
isolatedServiceInfo,
AppManifestConfigHelper.getServiceNameFromOdpSettings(
mContext, mServicePackageName),
- Constants.OP_COMPUTE_EVENT_METRICS,
+ Constants.OP_EVENT,
serviceParams))
.transform(
result -> result.getParcelable(
diff --git a/src/com/android/ondevicepersonalization/services/download/OnDevicePersonalizationDataProcessingAsyncCallable.java b/src/com/android/ondevicepersonalization/services/download/OnDevicePersonalizationDataProcessingAsyncCallable.java
index 137648e..9b92502 100644
--- a/src/com/android/ondevicepersonalization/services/download/OnDevicePersonalizationDataProcessingAsyncCallable.java
+++ b/src/com/android/ondevicepersonalization/services/download/OnDevicePersonalizationDataProcessingAsyncCallable.java
@@ -235,7 +235,7 @@
return ProcessUtils.runIsolatedService(
isolatedServiceInfo,
AppManifestConfigHelper.getServiceNameFromOdpSettings(mContext, mPackageName),
- Constants.OP_DOWNLOAD_FINISHED,
+ Constants.OP_DOWNLOAD,
pluginParams);
}
diff --git a/src/com/android/ondevicepersonalization/services/request/AppRequestFlow.java b/src/com/android/ondevicepersonalization/services/request/AppRequestFlow.java
index d401eac..e507148 100644
--- a/src/com/android/ondevicepersonalization/services/request/AppRequestFlow.java
+++ b/src/com/android/ondevicepersonalization/services/request/AppRequestFlow.java
@@ -182,7 +182,7 @@
mHandler.getPackageName(), mContext, true, null);
serviceParams.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, binder);
return ProcessUtils.runIsolatedService(
- isolatedServiceInfo, mServiceClassName, Constants.OP_SELECT_CONTENT, serviceParams);
+ isolatedServiceInfo, mServiceClassName, Constants.OP_EXECUTE, serviceParams);
}
private ListenableFuture<Long> logQuery(ExecuteOutput result) {
diff --git a/src/com/android/ondevicepersonalization/services/request/RenderFlow.java b/src/com/android/ondevicepersonalization/services/request/RenderFlow.java
index 85e1c59..add4948 100644
--- a/src/com/android/ondevicepersonalization/services/request/RenderFlow.java
+++ b/src/com/android/ondevicepersonalization/services/request/RenderFlow.java
@@ -220,7 +220,7 @@
new DataAccessServiceImpl.EventUrlQueryData(queryId, slotResult));
serviceParams.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, binder);
return ProcessUtils.runIsolatedService(
- isolatedServiceInfo, mServiceClassName, Constants.OP_RENDER_CONTENT,
+ isolatedServiceInfo, mServiceClassName, Constants.OP_RENDER,
serviceParams);
}
diff --git a/tests/frameworktests/src/android/ondevicepersonalization/IsolatedComputationServiceTest.java b/tests/frameworktests/src/android/ondevicepersonalization/IsolatedComputationServiceTest.java
index e41a4e4..0ce61ac 100644
--- a/tests/frameworktests/src/android/ondevicepersonalization/IsolatedComputationServiceTest.java
+++ b/tests/frameworktests/src/android/ondevicepersonalization/IsolatedComputationServiceTest.java
@@ -87,7 +87,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params, new TestServiceCallback());
+ Constants.OP_EXECUTE, params, new TestServiceCallback());
mLatch.await();
assertTrue(mSelectContentCalled);
ExecuteOutput result =
@@ -109,7 +109,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params, new TestServiceCallback());
+ Constants.OP_EXECUTE, params, new TestServiceCallback());
mLatch.await();
assertTrue(mSelectContentCalled);
assertEquals(Constants.STATUS_INTERNAL_ERROR, mCallbackErrorCode);
@@ -125,7 +125,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params, new TestServiceCallback());
+ Constants.OP_EXECUTE, params, new TestServiceCallback());
mLatch.await();
assertTrue(mSelectContentCalled);
}
@@ -136,7 +136,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, null,
+ Constants.OP_EXECUTE, null,
new TestServiceCallback());
});
}
@@ -149,7 +149,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params,
+ Constants.OP_EXECUTE, params,
new TestServiceCallback());
});
}
@@ -166,7 +166,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params,
+ Constants.OP_EXECUTE, params,
new TestServiceCallback());
});
}
@@ -184,7 +184,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_SELECT_CONTENT, params, null);
+ Constants.OP_EXECUTE, params, null);
});
}
@@ -198,7 +198,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_DOWNLOAD_FINISHED, params, new TestServiceCallback());
+ Constants.OP_DOWNLOAD, params, new TestServiceCallback());
mLatch.await();
assertTrue(mOnDownloadCalled);
DownloadOutput result =
@@ -212,7 +212,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_DOWNLOAD_FINISHED, null,
+ Constants.OP_DOWNLOAD, null,
new TestServiceCallback());
});
}
@@ -225,7 +225,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_DOWNLOAD_FINISHED, params,
+ Constants.OP_DOWNLOAD, params,
new TestServiceCallback());
});
}
@@ -242,7 +242,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_DOWNLOAD_FINISHED, params,
+ Constants.OP_DOWNLOAD, params,
new TestServiceCallback());
});
}
@@ -261,7 +261,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_DOWNLOAD_FINISHED, params, null);
+ Constants.OP_DOWNLOAD, params, null);
});
}
@@ -279,7 +279,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, params, new TestServiceCallback());
+ Constants.OP_RENDER, params, new TestServiceCallback());
mLatch.await();
assertTrue(mRenderContentCalled);
RenderOutput result =
@@ -300,7 +300,7 @@
params.putParcelable(Constants.EXTRA_INPUT, input);
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, params, new TestServiceCallback());
+ Constants.OP_RENDER, params, new TestServiceCallback());
mLatch.await();
assertTrue(mRenderContentCalled);
assertEquals(Constants.STATUS_INTERNAL_ERROR, mCallbackErrorCode);
@@ -312,7 +312,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, null,
+ Constants.OP_RENDER, null,
new TestServiceCallback());
});
}
@@ -325,7 +325,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, params,
+ Constants.OP_RENDER, params,
new TestServiceCallback());
});
}
@@ -346,7 +346,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, params,
+ Constants.OP_RENDER, params,
new TestServiceCallback());
});
}
@@ -368,7 +368,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_RENDER_CONTENT, params, null);
+ Constants.OP_RENDER, params, null);
});
}
@@ -379,7 +379,7 @@
Constants.EXTRA_INPUT, new EventInput.Builder().build());
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, params,
+ Constants.OP_EVENT, params,
new TestServiceCallback());
mLatch.await();
assertTrue(mComputeEventMetricsCalled);
@@ -397,7 +397,7 @@
new EventInput.Builder().setEventType(9999).build());
params.putBinder(Constants.EXTRA_DATA_ACCESS_SERVICE_BINDER, new TestDataAccessService());
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, params,
+ Constants.OP_EVENT, params,
new TestServiceCallback());
mLatch.await();
assertTrue(mComputeEventMetricsCalled);
@@ -410,7 +410,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, null,
+ Constants.OP_EVENT, null,
new TestServiceCallback());
});
}
@@ -423,7 +423,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, params,
+ Constants.OP_EVENT, params,
new TestServiceCallback());
});
}
@@ -437,7 +437,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, params,
+ Constants.OP_EVENT, params,
new TestServiceCallback());
});
}
@@ -452,7 +452,7 @@
NullPointerException.class,
() -> {
mBinder.onRequest(
- Constants.OP_COMPUTE_EVENT_METRICS, params, null);
+ Constants.OP_EVENT, params, null);
});
}