diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-02-10 19:15:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-10 19:15:44 +0000 |
| commit | db33f67f8ddbfb29acbe6fb57763cc2f029ec83b (patch) | |
| tree | fd6e20f8cd8c5ee52fac9631d01dc7e93156afa7 /core/java | |
| parent | ffccd289b579419ab92c39d3750d3d9b4368881b (diff) | |
| parent | bb287ae2d7f5c2d1831883c4f103b3eae93b0e23 (diff) | |
Merge "Use property instead of meta-data for primary CDM service"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/companion/CompanionDeviceManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/companion/CompanionDeviceService.java | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index 36802eabee15..15685000d6ba 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -780,9 +780,9 @@ public final class CompanionDeviceManager { } /** - * Notify the system that the given self-managed association has just 'appeared'. + * Notify the system that the given self-managed association has just appeared. * This causes the system to bind to the companion app to keep it running until the association - * is reported as 'disappeared' + * is reported as disappeared * * <p>This API is only available for the companion apps that manage the connectivity by * themselves.</p> @@ -803,7 +803,7 @@ public final class CompanionDeviceManager { } /** - * Notify the system that the given self-managed association has just 'disappeared'. + * Notify the system that the given self-managed association has just disappeared. * This causes the system to unbind to the companion app. * * <p>This API is only available for the companion apps that manage the connectivity by diff --git a/core/java/android/companion/CompanionDeviceService.java b/core/java/android/companion/CompanionDeviceService.java index cb96ebe8bca9..9e1bf4bb9484 100644 --- a/core/java/android/companion/CompanionDeviceService.java +++ b/core/java/android/companion/CompanionDeviceService.java @@ -77,10 +77,11 @@ import java.util.Objects; * {@link #onDeviceAppeared(AssociationInfo)} and {@link #onDeviceDisappeared(AssociationInfo)} * only to one "primary" services. * Applications that declare multiple {@link CompanionDeviceService}-s should indicate the "primary" - * service using "android.companion.primary" tag. + * service using "android.companion.PROPERTY_PRIMARY_COMPANION_DEVICE_SERVICE" service level + * property. * <pre>{@code - * <meta-data - * android:name="android.companion.primary" + * <property + * android:name="android.companion.PROPERTY_PRIMARY_COMPANION_DEVICE_SERVICE" * android:value="true" /> * }</pre> * |