Revert "Hide APIs for M2024-04."
This reverts commit 3af56a2f6c64d1c7af848d8f0cd95d79e970aaa5.
Reason for revert: Hide not required, flagging is enough.
Bug: 316002089
Test: TH
Change-Id: I7ce1434eeae67ed3e7fecdc047e014359825c0a2
diff --git a/framework/api/current.txt b/framework/api/current.txt
index d802177..76bdded 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -1 +1,249 @@
// Signature format: 2.0
+package android.adservices.ondevicepersonalization {
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class AppInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public boolean isInstalled();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.adservices.ondevicepersonalization.AppInfo> CREATOR;
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class DownloadCompletedInput {
+ method @NonNull public java.util.Map<java.lang.String,byte[]> getData();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class DownloadCompletedOutput {
+ method @NonNull public java.util.List<java.lang.String> getRetainedKeys();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class DownloadCompletedOutput.Builder {
+ ctor public DownloadCompletedOutput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.DownloadCompletedOutput.Builder addRetainedKey(@NonNull String);
+ method @NonNull public android.adservices.ondevicepersonalization.DownloadCompletedOutput build();
+ method @NonNull public android.adservices.ondevicepersonalization.DownloadCompletedOutput.Builder setRetainedKeys(@NonNull java.util.List<java.lang.String>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class EventInput {
+ method @NonNull public android.os.PersistableBundle getParameters();
+ method @Nullable public android.adservices.ondevicepersonalization.RequestLogRecord getRequestLogRecord();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class EventLogRecord implements android.os.Parcelable {
+ method public int describeContents();
+ method @Nullable public android.content.ContentValues getData();
+ method @Nullable public android.adservices.ondevicepersonalization.RequestLogRecord getRequestLogRecord();
+ method @IntRange(from=0) public int getRowIndex();
+ method @NonNull public java.time.Instant getTime();
+ method @IntRange(from=1, to=127) public int getType();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.adservices.ondevicepersonalization.EventLogRecord> CREATOR;
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class EventLogRecord.Builder {
+ ctor public EventLogRecord.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.EventLogRecord build();
+ method @NonNull public android.adservices.ondevicepersonalization.EventLogRecord.Builder setData(@NonNull android.content.ContentValues);
+ method @NonNull public android.adservices.ondevicepersonalization.EventLogRecord.Builder setRequestLogRecord(@NonNull android.adservices.ondevicepersonalization.RequestLogRecord);
+ method @NonNull public android.adservices.ondevicepersonalization.EventLogRecord.Builder setRowIndex(@IntRange(from=0) int);
+ method @NonNull public android.adservices.ondevicepersonalization.EventLogRecord.Builder setType(@IntRange(from=1, to=127) int);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class EventOutput {
+ method @Nullable public android.adservices.ondevicepersonalization.EventLogRecord getEventLogRecord();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class EventOutput.Builder {
+ ctor public EventOutput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.EventOutput build();
+ method @NonNull public android.adservices.ondevicepersonalization.EventOutput.Builder setEventLogRecord(@NonNull android.adservices.ondevicepersonalization.EventLogRecord);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class EventUrlProvider {
+ method @NonNull @WorkerThread public android.net.Uri createEventTrackingUrlWithRedirect(@NonNull android.os.PersistableBundle, @Nullable android.net.Uri);
+ method @NonNull @WorkerThread public android.net.Uri createEventTrackingUrlWithResponse(@NonNull android.os.PersistableBundle, @Nullable byte[], @Nullable String);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class ExecuteInput {
+ method @NonNull public String getAppPackageName();
+ method @NonNull public android.os.PersistableBundle getAppParams();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class ExecuteOutput {
+ method @Nullable public android.adservices.ondevicepersonalization.RenderingConfig getRenderingConfig();
+ method @Nullable public android.adservices.ondevicepersonalization.RequestLogRecord getRequestLogRecord();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class ExecuteOutput.Builder {
+ ctor public ExecuteOutput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.ExecuteOutput build();
+ method @NonNull public android.adservices.ondevicepersonalization.ExecuteOutput.Builder setRenderingConfig(@NonNull android.adservices.ondevicepersonalization.RenderingConfig);
+ method @NonNull public android.adservices.ondevicepersonalization.ExecuteOutput.Builder setRequestLogRecord(@NonNull android.adservices.ondevicepersonalization.RequestLogRecord);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class FederatedComputeInput {
+ method @NonNull public String getPopulationName();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class FederatedComputeInput.Builder {
+ ctor public FederatedComputeInput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.FederatedComputeInput build();
+ method @NonNull public android.adservices.ondevicepersonalization.FederatedComputeInput.Builder setPopulationName(@NonNull String);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class FederatedComputeScheduler {
+ method @WorkerThread public void cancel(@NonNull String);
+ method @WorkerThread public void schedule(@NonNull android.adservices.ondevicepersonalization.FederatedComputeScheduler.Params, @NonNull android.adservices.ondevicepersonalization.FederatedComputeInput);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static class FederatedComputeScheduler.Params {
+ ctor public FederatedComputeScheduler.Params(@NonNull android.adservices.ondevicepersonalization.TrainingInterval);
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingInterval getTrainingInterval();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public abstract class IsolatedService extends android.app.Service {
+ ctor public IsolatedService();
+ method @NonNull public final android.adservices.ondevicepersonalization.EventUrlProvider getEventUrlProvider(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @NonNull public final android.adservices.ondevicepersonalization.FederatedComputeScheduler getFederatedComputeScheduler(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @NonNull public final android.adservices.ondevicepersonalization.MutableKeyValueStore getLocalData(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @NonNull public final android.adservices.ondevicepersonalization.LogReader getLogReader(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @NonNull public final android.adservices.ondevicepersonalization.KeyValueStore getRemoteData(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @Nullable public final android.adservices.ondevicepersonalization.UserData getUserData(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);
+ method @NonNull public abstract android.adservices.ondevicepersonalization.IsolatedWorker onRequest(@NonNull android.adservices.ondevicepersonalization.RequestToken);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public interface IsolatedWorker {
+ method public default void onDownloadCompleted(@NonNull android.adservices.ondevicepersonalization.DownloadCompletedInput, @NonNull java.util.function.Consumer<android.adservices.ondevicepersonalization.DownloadCompletedOutput>);
+ method public default void onEvent(@NonNull android.adservices.ondevicepersonalization.EventInput, @NonNull java.util.function.Consumer<android.adservices.ondevicepersonalization.EventOutput>);
+ method public default void onExecute(@NonNull android.adservices.ondevicepersonalization.ExecuteInput, @NonNull java.util.function.Consumer<android.adservices.ondevicepersonalization.ExecuteOutput>);
+ method public default void onRender(@NonNull android.adservices.ondevicepersonalization.RenderInput, @NonNull java.util.function.Consumer<android.adservices.ondevicepersonalization.RenderOutput>);
+ method public default void onTrainingExamples(@NonNull android.adservices.ondevicepersonalization.TrainingExamplesInput, @NonNull java.util.function.Consumer<android.adservices.ondevicepersonalization.TrainingExamplesOutput>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public interface KeyValueStore {
+ method @Nullable @WorkerThread public byte[] get(@NonNull String);
+ method @NonNull @WorkerThread public java.util.Set<java.lang.String> keySet();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class LogReader {
+ method @NonNull @WorkerThread public java.util.List<android.adservices.ondevicepersonalization.EventLogRecord> getJoinedEvents(@NonNull java.time.Instant, @NonNull java.time.Instant);
+ method @NonNull @WorkerThread public java.util.List<android.adservices.ondevicepersonalization.RequestLogRecord> getRequests(@NonNull java.time.Instant, @NonNull java.time.Instant);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public interface MutableKeyValueStore extends android.adservices.ondevicepersonalization.KeyValueStore {
+ method @Nullable @WorkerThread public byte[] put(@NonNull String, @NonNull byte[]);
+ method @Nullable @WorkerThread public byte[] remove(@NonNull String);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class OnDevicePersonalizationException extends java.lang.Exception {
+ method public int getErrorCode();
+ field public static final int ERROR_ISOLATED_SERVICE_FAILED = 1; // 0x1
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class OnDevicePersonalizationManager {
+ method public void execute(@NonNull android.content.ComponentName, @NonNull android.os.PersistableBundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.adservices.ondevicepersonalization.SurfacePackageToken,java.lang.Exception>);
+ method public void requestSurfacePackage(@NonNull android.adservices.ondevicepersonalization.SurfacePackageToken, @NonNull android.os.IBinder, int, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.view.SurfaceControlViewHost.SurfacePackage,java.lang.Exception>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class RenderInput {
+ method public int getHeight();
+ method @Nullable public android.adservices.ondevicepersonalization.RenderingConfig getRenderingConfig();
+ method public int getWidth();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class RenderOutput {
+ method @Nullable public String getContent();
+ method @Nullable public String getTemplateId();
+ method @NonNull public android.os.PersistableBundle getTemplateParams();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class RenderOutput.Builder {
+ ctor public RenderOutput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.RenderOutput build();
+ method @NonNull public android.adservices.ondevicepersonalization.RenderOutput.Builder setContent(@NonNull String);
+ method @NonNull public android.adservices.ondevicepersonalization.RenderOutput.Builder setTemplateId(@NonNull String);
+ method @NonNull public android.adservices.ondevicepersonalization.RenderOutput.Builder setTemplateParams(@NonNull android.os.PersistableBundle);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class RenderingConfig implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public java.util.List<java.lang.String> getKeys();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.adservices.ondevicepersonalization.RenderingConfig> CREATOR;
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class RenderingConfig.Builder {
+ ctor public RenderingConfig.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.RenderingConfig.Builder addKey(@NonNull String);
+ method @NonNull public android.adservices.ondevicepersonalization.RenderingConfig build();
+ method @NonNull public android.adservices.ondevicepersonalization.RenderingConfig.Builder setKeys(@NonNull java.util.List<java.lang.String>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class RequestLogRecord implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public java.util.List<android.content.ContentValues> getRows();
+ method @NonNull public java.time.Instant getTime();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.adservices.ondevicepersonalization.RequestLogRecord> CREATOR;
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class RequestLogRecord.Builder {
+ ctor public RequestLogRecord.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.RequestLogRecord.Builder addRow(@NonNull android.content.ContentValues);
+ method @NonNull public android.adservices.ondevicepersonalization.RequestLogRecord build();
+ method @NonNull public android.adservices.ondevicepersonalization.RequestLogRecord.Builder setRows(@NonNull java.util.List<android.content.ContentValues>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class RequestToken {
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class SurfacePackageToken {
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class TrainingExamplesInput {
+ method @NonNull public String getPopulationName();
+ method @Nullable public byte[] getResumptionToken();
+ method @NonNull public String getTaskName();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class TrainingExamplesOutput {
+ method @NonNull public java.util.List<byte[]> getResumptionTokens();
+ method @NonNull public java.util.List<byte[]> getTrainingExamples();
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class TrainingExamplesOutput.Builder {
+ ctor public TrainingExamplesOutput.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingExamplesOutput.Builder addResumptionToken(@NonNull byte[]);
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingExamplesOutput.Builder addTrainingExample(@NonNull byte[]);
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingExamplesOutput build();
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingExamplesOutput.Builder setResumptionTokens(@NonNull java.util.List<byte[]>);
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingExamplesOutput.Builder setTrainingExamples(@NonNull java.util.List<byte[]>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class TrainingInterval {
+ method @NonNull public java.time.Duration getMinimumInterval();
+ method public int getSchedulingMode();
+ field public static final int SCHEDULING_MODE_ONE_TIME = 1; // 0x1
+ field public static final int SCHEDULING_MODE_RECURRENT = 2; // 0x2
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public static final class TrainingInterval.Builder {
+ ctor public TrainingInterval.Builder();
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingInterval build();
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingInterval.Builder setMinimumInterval(@NonNull java.time.Duration);
+ method @NonNull public android.adservices.ondevicepersonalization.TrainingInterval.Builder setSchedulingMode(int);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public final class UserData implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public java.util.Map<java.lang.String,android.adservices.ondevicepersonalization.AppInfo> getAppInfos();
+ method @IntRange(from=0) public long getAvailableStorageBytes();
+ method @IntRange(from=0, to=100) public int getBatteryPercentage();
+ method @NonNull public String getCarrier();
+ method public int getOrientation();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.adservices.ondevicepersonalization.UserData> CREATOR;
+ }
+
+}
+
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index d802177..e705028 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -1 +1,13 @@
// Signature format: 2.0
+package android.adservices.ondevicepersonalization {
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class OnDevicePersonalizationConfigManager {
+ method @FlaggedApi("enable_ondevicepersonalization_apis") @RequiresPermission(android.adservices.ondevicepersonalization.OnDevicePersonalizationPermissions.MODIFY_ONDEVICEPERSONALIZATION_STATE) public void setPersonalizationEnabled(boolean, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);
+ }
+
+ @FlaggedApi("enable_ondevicepersonalization_apis") public class OnDevicePersonalizationPermissions {
+ field @FlaggedApi("enable_ondevicepersonalization_apis") public static final String MODIFY_ONDEVICEPERSONALIZATION_STATE = "android.permission.ondevicepersonalization.MODIFY_ONDEVICEPERSONALIZATION_STATE";
+ }
+
+}
+
diff --git a/framework/java/android/adservices/ondevicepersonalization/AppInfo.java b/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
index d564838..4a628d8 100644
--- a/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
+++ b/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
@@ -28,7 +28,6 @@
/**
* Information about apps.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genHiddenBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedInput.java b/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedInput.java
index f413dc9..14dfb32 100644
--- a/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedInput.java
@@ -32,7 +32,6 @@
* The input data for {@link
* IsolatedWorker#onDownloadCompleted(DownloadCompletedInput, java.util.function.Consumer)}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genHiddenBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedOutput.java b/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedOutput.java
index c3a26e2..5c503fc 100644
--- a/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedOutput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/DownloadCompletedOutput.java
@@ -31,7 +31,6 @@
* The result returned by {@link
* IsolatedWorker#onDownloadCompleted(DownloadCompletedInput, java.util.function.Consumer)}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/EventInput.java b/framework/java/android/adservices/ondevicepersonalization/EventInput.java
index 1fd6e44..33057ad 100644
--- a/framework/java/android/adservices/ondevicepersonalization/EventInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/EventInput.java
@@ -29,7 +29,6 @@
/**
* The input data for {@link
* IsolatedWorker#onEvent(EventInput, java.util.function.Consumer)}.
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = false, genHiddenConstructor = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/EventLogRecord.java b/framework/java/android/adservices/ondevicepersonalization/EventLogRecord.java
index 3735d66..bb1c610 100644
--- a/framework/java/android/adservices/ondevicepersonalization/EventLogRecord.java
+++ b/framework/java/android/adservices/ondevicepersonalization/EventLogRecord.java
@@ -42,8 +42,6 @@
* The contents of the EVENTS table can be
* consumed by Federated Learning facilitated model training, or Federated Analytics facilitated
* cross-device statistical analysis.
- *
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/EventOutput.java b/framework/java/android/adservices/ondevicepersonalization/EventOutput.java
index e330233..9fe978d 100644
--- a/framework/java/android/adservices/ondevicepersonalization/EventOutput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/EventOutput.java
@@ -25,7 +25,6 @@
/**
* The result returned by {@link IsolatedWorker#onEvent(EventInput, java.util.function.Consumer)}.
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/EventUrlProvider.java b/framework/java/android/adservices/ondevicepersonalization/EventUrlProvider.java
index 7605c2c..930c434 100644
--- a/framework/java/android/adservices/ondevicepersonalization/EventUrlProvider.java
+++ b/framework/java/android/adservices/ondevicepersonalization/EventUrlProvider.java
@@ -40,7 +40,6 @@
* {@code IsolatedWorker#onEvent(EventInput, java.util.function.Consumer)}, and log the returned
* output in the EVENTS table.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class EventUrlProvider {
diff --git a/framework/java/android/adservices/ondevicepersonalization/ExecuteInput.java b/framework/java/android/adservices/ondevicepersonalization/ExecuteInput.java
index e939a6b..825b25a 100644
--- a/framework/java/android/adservices/ondevicepersonalization/ExecuteInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/ExecuteInput.java
@@ -28,7 +28,6 @@
/**
* The input data for {@link IsolatedWorker#onExecute(ExecuteInput, java.util.function.Consumer)}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = false, genHiddenConstructor = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/ExecuteOutput.java b/framework/java/android/adservices/ondevicepersonalization/ExecuteOutput.java
index 79ea256..66914d4 100644
--- a/framework/java/android/adservices/ondevicepersonalization/ExecuteOutput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/ExecuteOutput.java
@@ -34,7 +34,6 @@
* {@code OnDevicePersonalizationManager#execute(ComponentName, PersistableBundle,
* java.util.concurrent.Executor, OutcomeReceiver)}
* from a client app.
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/FederatedComputeInput.java b/framework/java/android/adservices/ondevicepersonalization/FederatedComputeInput.java
index d91892b..6057b2c 100644
--- a/framework/java/android/adservices/ondevicepersonalization/FederatedComputeInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/FederatedComputeInput.java
@@ -24,10 +24,7 @@
import com.android.ondevicepersonalization.internal.util.AnnotationValidations;
import com.android.ondevicepersonalization.internal.util.DataClass;
-/**
- * The input data for {@link FederatedComputeScheduler#schedule}.
- * @hide
- */
+/** The input data for {@link FederatedComputeScheduler#schedule}. */
@DataClass(genBuilder = true, genEqualsHashCode = true)
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public final class FederatedComputeInput {
diff --git a/framework/java/android/adservices/ondevicepersonalization/FederatedComputeScheduler.java b/framework/java/android/adservices/ondevicepersonalization/FederatedComputeScheduler.java
index 4ed043d..6e6f2be 100644
--- a/framework/java/android/adservices/ondevicepersonalization/FederatedComputeScheduler.java
+++ b/framework/java/android/adservices/ondevicepersonalization/FederatedComputeScheduler.java
@@ -33,7 +33,6 @@
/**
* Handles scheduling federated compute jobs. See {@link
* IsolatedService#getFederatedComputeScheduler}.
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class FederatedComputeScheduler {
diff --git a/framework/java/android/adservices/ondevicepersonalization/IsolatedService.java b/framework/java/android/adservices/ondevicepersonalization/IsolatedService.java
index f92c2c2..abecf1f 100644
--- a/framework/java/android/adservices/ondevicepersonalization/IsolatedService.java
+++ b/framework/java/android/adservices/ondevicepersonalization/IsolatedService.java
@@ -55,8 +55,6 @@
* by Federated Learning for model training.
* Client apps use {@link OnDevicePersonalizationManager} to interact with an {@link
* IsolatedService}.
- *
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public abstract class IsolatedService extends Service {
diff --git a/framework/java/android/adservices/ondevicepersonalization/IsolatedWorker.java b/framework/java/android/adservices/ondevicepersonalization/IsolatedWorker.java
index 88db946..e1e90f1 100644
--- a/framework/java/android/adservices/ondevicepersonalization/IsolatedWorker.java
+++ b/framework/java/android/adservices/ondevicepersonalization/IsolatedWorker.java
@@ -30,7 +30,6 @@
* IsolatedService} calls the method on a Binder thread and the {@link IsolatedWorker} should
* offload long running operations to a worker thread. The consumer parameter of each method is used
* to return results.
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public interface IsolatedWorker {
diff --git a/framework/java/android/adservices/ondevicepersonalization/KeyValueStore.java b/framework/java/android/adservices/ondevicepersonalization/KeyValueStore.java
index e943194..b50f70e 100644
--- a/framework/java/android/adservices/ondevicepersonalization/KeyValueStore.java
+++ b/framework/java/android/adservices/ondevicepersonalization/KeyValueStore.java
@@ -32,7 +32,6 @@
*
* @see IsolatedService#getRemoteData(RequestToken)
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public interface KeyValueStore {
diff --git a/framework/java/android/adservices/ondevicepersonalization/LogReader.java b/framework/java/android/adservices/ondevicepersonalization/LogReader.java
index c06c48d..bf25efc 100644
--- a/framework/java/android/adservices/ondevicepersonalization/LogReader.java
+++ b/framework/java/android/adservices/ondevicepersonalization/LogReader.java
@@ -43,7 +43,6 @@
*
* @see IsolatedService#getLogReader(RequestToken)
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class LogReader {
diff --git a/framework/java/android/adservices/ondevicepersonalization/MutableKeyValueStore.java b/framework/java/android/adservices/ondevicepersonalization/MutableKeyValueStore.java
index b67df7e..e63bcc6 100644
--- a/framework/java/android/adservices/ondevicepersonalization/MutableKeyValueStore.java
+++ b/framework/java/android/adservices/ondevicepersonalization/MutableKeyValueStore.java
@@ -30,7 +30,6 @@
*
* @see IsolatedService#getLocalData(RequestToken)
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public interface MutableKeyValueStore extends KeyValueStore {
diff --git a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationConfigManager.java b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationConfigManager.java
index 82a38ce..f6442fe 100644
--- a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationConfigManager.java
+++ b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationConfigManager.java
@@ -26,6 +26,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
+import android.annotation.SystemApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -50,6 +51,7 @@
*
* @hide
*/
+@SystemApi
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class OnDevicePersonalizationConfigManager {
/** @hide */
diff --git a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationException.java b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationException.java
index c88fa38..e54f76b 100644
--- a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationException.java
+++ b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationException.java
@@ -27,7 +27,6 @@
/**
* Exception thrown by OnDevicePersonalization APIs.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class OnDevicePersonalizationException extends Exception {
diff --git a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationManager.java b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationManager.java
index cc6434a..17cf77a 100644
--- a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationManager.java
+++ b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationManager.java
@@ -51,8 +51,6 @@
* persistent results to on-device storage which can be consumed by Federated Analytics for
* cross-device statistical analysis or by Federated Learning for model training. The displayed
* content and the persistent output are both not directly accessible by the calling app.
- *
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class OnDevicePersonalizationManager {
diff --git a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationPermissions.java b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationPermissions.java
index b87e073..694e336 100644
--- a/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationPermissions.java
+++ b/framework/java/android/adservices/ondevicepersonalization/OnDevicePersonalizationPermissions.java
@@ -20,6 +20,7 @@
import android.annotation.FlaggedApi;
import android.annotation.NonNull;
+import android.annotation.SystemApi;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -28,6 +29,7 @@
*
* @hide
*/
+@SystemApi
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class OnDevicePersonalizationPermissions {
private OnDevicePersonalizationPermissions() {}
diff --git a/framework/java/android/adservices/ondevicepersonalization/RenderInput.java b/framework/java/android/adservices/ondevicepersonalization/RenderInput.java
index c7e9682..a1d8341 100644
--- a/framework/java/android/adservices/ondevicepersonalization/RenderInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/RenderInput.java
@@ -28,7 +28,6 @@
* The input data for
* {@link IsolatedWorker#onRender(RenderInput, java.util.function.Consumer)}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = false, genHiddenConstructor = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/RenderOutput.java b/framework/java/android/adservices/ondevicepersonalization/RenderOutput.java
index f1ab9e1..33c8c8b 100644
--- a/framework/java/android/adservices/ondevicepersonalization/RenderOutput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/RenderOutput.java
@@ -30,7 +30,6 @@
* The result returned by
* {@link IsolatedWorker#onRender(RenderInput, java.util.function.Consumer)}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/RenderingConfig.java b/framework/java/android/adservices/ondevicepersonalization/RenderingConfig.java
index a79cbca..ae54c77 100644
--- a/framework/java/android/adservices/ondevicepersonalization/RenderingConfig.java
+++ b/framework/java/android/adservices/ondevicepersonalization/RenderingConfig.java
@@ -35,7 +35,6 @@
* {@link IsolatedWorker#onRender(RenderInput, java.util.function.Consumer)} to identify the
* content to be displayed in a single {@link android.view.View}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/RequestLogRecord.java b/framework/java/android/adservices/ondevicepersonalization/RequestLogRecord.java
index bab8afa..618462e 100644
--- a/framework/java/android/adservices/ondevicepersonalization/RequestLogRecord.java
+++ b/framework/java/android/adservices/ondevicepersonalization/RequestLogRecord.java
@@ -39,7 +39,6 @@
* the REQUESTS table can be consumed by Federated Learning facilitated model training,
* or Federated Analytics facilitated cross-device statistical analysis.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
diff --git a/framework/java/android/adservices/ondevicepersonalization/RequestToken.java b/framework/java/android/adservices/ondevicepersonalization/RequestToken.java
index 04c67f6..d3e2331 100644
--- a/framework/java/android/adservices/ondevicepersonalization/RequestToken.java
+++ b/framework/java/android/adservices/ondevicepersonalization/RequestToken.java
@@ -30,8 +30,6 @@
/**
* An opaque token that identifies the current request to an {@link IsolatedService}. This token
* must be passed as a parameter to all service methods that depend on per-request state.
- *
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class RequestToken {
diff --git a/framework/java/android/adservices/ondevicepersonalization/SurfacePackageToken.java b/framework/java/android/adservices/ondevicepersonalization/SurfacePackageToken.java
index c8340b9..48406c3 100644
--- a/framework/java/android/adservices/ondevicepersonalization/SurfacePackageToken.java
+++ b/framework/java/android/adservices/ondevicepersonalization/SurfacePackageToken.java
@@ -25,7 +25,6 @@
* An opaque reference to content that can be displayed in a {@link android.view.SurfaceView}. This
* maps to a {@link RenderingConfig} returned by an {@link IsolatedService}.
*
- * @hide
*/
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
public class SurfacePackageToken {
diff --git a/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesInput.java b/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesInput.java
index 6b6dd25..bd8ca99 100644
--- a/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesInput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesInput.java
@@ -25,11 +25,7 @@
import com.android.ondevicepersonalization.internal.util.AnnotationValidations;
import com.android.ondevicepersonalization.internal.util.DataClass;
-/**
- * The input data for {@link IsolatedWorker#onTrainingExamples}.
- *
- * @hide
- */
+/** The input data for {@link IsolatedWorker#onTrainingExamples}. */
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = false, genHiddenConstructor = true, genEqualsHashCode = true)
public final class TrainingExamplesInput {
diff --git a/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesOutput.java b/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesOutput.java
index 246aaba..deea25c 100644
--- a/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesOutput.java
+++ b/framework/java/android/adservices/ondevicepersonalization/TrainingExamplesOutput.java
@@ -28,10 +28,7 @@
import java.util.Collections;
import java.util.List;
-/**
- * The output data of {@link IsolatedWorker#onTrainingExamples}
- * @hide
- */
+/** The output data of {@link IsolatedWorker#onTrainingExamples} */
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genEqualsHashCode = true)
public final class TrainingExamplesOutput {
diff --git a/framework/java/android/adservices/ondevicepersonalization/TrainingInterval.java b/framework/java/android/adservices/ondevicepersonalization/TrainingInterval.java
index 2f822c7..890620e 100644
--- a/framework/java/android/adservices/ondevicepersonalization/TrainingInterval.java
+++ b/framework/java/android/adservices/ondevicepersonalization/TrainingInterval.java
@@ -26,11 +26,7 @@
import java.time.Duration;
-/**
- * Training interval settings required for federated computation jobs.
- *
- * @hide
- */
+/** Training interval settings required for federated computation jobs. */
@FlaggedApi(KEY_ENABLE_ONDEVICEPERSONALIZATION_APIS)
@DataClass(genBuilder = true, genHiddenConstDefs = true, genEqualsHashCode = true)
public final class TrainingInterval {
diff --git a/framework/java/android/adservices/ondevicepersonalization/UserData.java b/framework/java/android/adservices/ondevicepersonalization/UserData.java
index 442c279..644ea74 100644
--- a/framework/java/android/adservices/ondevicepersonalization/UserData.java
+++ b/framework/java/android/adservices/ondevicepersonalization/UserData.java
@@ -43,7 +43,7 @@
/**
* User data provided by the platform to an {@link IsolatedService}.
- * @hide
+ *
*/
// This class should be updated with the Kotlin mirror
// {@link com.android.ondevicepersonalization.services.policyengine.data.UserData}.
