diff options
| author | Ben Murdoch <benm@google.com> | 2014-05-20 09:32:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 09:32:43 +0000 |
| commit | e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae (patch) | |
| tree | 4f294fa162fea34c0b27743d5d43c77bcc869755 | |
| parent | 6071e45a64ab764eb86603f2f4496cfd5c8de708 (diff) | |
| parent | 422c7a5834b4e0f1bbf56d00fb824c9bbbd3ead4 (diff) | |
| download | frameworks_base-e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae.zip frameworks_base-e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae.tar.gz frameworks_base-e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae.tar.bz2 | |
Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0de2394..0f84194 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7349,6 +7349,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; + field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int GET_ACTIVITIES = 1; // 0x1 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index b456cf0..ff88dd7 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1309,6 +1309,14 @@ public abstract class PackageManager { public static final String FEATURE_BACKUP = "android.software.backup"; /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: + * The device has a full implementation of the android.webkit.* APIs. Devices + * lacking this feature will not have a functioning WebView implementation. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_WEBVIEW = "android.software.webview"; + + /** * Action to external storage service to clean out removed apps. * @hide */ |