Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f564c7fe authored by Ben Murdoch's avatar Ben Murdoch
Browse files

resolved conflicts for merge of ecf09321 to master 

Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
parents d41b9116 ecf09321

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8271,6 +8271,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

core/java/android/content/pm/PackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_MANAGEDPROFILES = "android.software.managedprofiles";



    /**

     * 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