diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-14 20:03:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-14 20:03:34 +0000 |
commit | 98e82ef00e339f56329dcd56165ff92d953f82da (patch) | |
tree | 2d4c181892e9c74e871a7dedf798b05021ce6831 | |
parent | 0c97826393825a5cffef3abfc0e1c22f99a0c880 (diff) | |
parent | 65731d06cedc07501f7fb93411b01e678aeec364 (diff) | |
download | base-98e82ef00e339f56329dcd56165ff92d953f82da.tar.gz |
Merge "Add additional clarification regarding nanoapp loading APIs" into sc-dev am: 65731d06ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286092
Change-Id: I648f666160150beff922a5616d2751f7c326416d
-rw-r--r-- | core/java/android/hardware/location/ContextHubClientCallback.java | 7 | ||||
-rw-r--r-- | core/java/android/hardware/location/ContextHubManager.java | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/hardware/location/ContextHubClientCallback.java b/core/java/android/hardware/location/ContextHubClientCallback.java index 35d00f03de67..9309c5b0d8e3 100644 --- a/core/java/android/hardware/location/ContextHubClientCallback.java +++ b/core/java/android/hardware/location/ContextHubClientCallback.java @@ -68,8 +68,11 @@ public class ContextHubClientCallback { /** * Callback invoked when a nanoapp is dynamically loaded at the attached Context Hub through - * the {@link android.hardware.location.ContextHubManager}. This callback is not invoked for a - * nanoapp that is loaded internally by CHRE (e.g. nanoapps that are preloaded by the system). + * the {@link android.hardware.location.ContextHubManager}. + * + * NOTE: This callback is <b>not</b> invoked for a nanoapp that is loaded internally by CHRE + * (e.g. nanoapps that are preloaded by the system). To check the availability of these + * nanoapps, use the {@link ContextHubManager#queryNanoApps(ContextHubInfo)} API. * * @param client the client that is associated with this callback * @param nanoAppId the ID of the nanoapp that had been loaded diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index f69a7d7e5f16..9af0e09ee97a 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -128,7 +128,8 @@ public final class ContextHubManager { public static final int AUTHORIZATION_GRANTED = 2; /** - * Constants describing the type of events from a Context Hub. + * Constants describing the type of events from a Context Hub, as defined in + * {@link ContextHubClientCallback}. * {@hide} */ @Retention(RetentionPolicy.SOURCE) |