diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-13 20:57:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-13 20:57:58 +0000 |
| commit | 166c228af45698aa9a63ba3885de56f0ad2ce243 (patch) | |
| tree | e3eff7528656e53b5e3e3e65be3d62e7b62b409c /core/java | |
| parent | af26be987e883a948876b3f981d4cbf9b2c42385 (diff) | |
| parent | 897187dcfaaef167b8ffcfffffe716ef444ef897 (diff) | |
Merge "Controls API - Flag controls support" into rvc-dev am: 897187dcfa
Change-Id: I00f1675670c354c5b03ce638f0fc7a73ee70bc9b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4d718ef6bebe..1e9cddbb684a 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3049,6 +3049,16 @@ public abstract class PackageManager { public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels"; /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports a system interface for the user to select + * and bind device control services provided by applications. + * + * @see android.service.controls.ControlsProviderService + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_CONTROLS = "android.software.controls"; + + /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has * the requisite hardware support to support reboot escrow of synthetic password for updates. * |