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

Commit 11dce732 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Add Ethernet feature."

parents 62728e31 4efb8b40

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9518,6 +9518,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final java.lang.String FEATURE_ETHERNET = "android.hardware.ethernet";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9828,6 +9828,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final java.lang.String FEATURE_ETHERNET = "android.hardware.ethernet";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9518,6 +9518,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final java.lang.String FEATURE_ETHERNET = "android.hardware.ethernet";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

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

+0 −1
Original line number Diff line number Diff line
@@ -1947,7 +1947,6 @@ public abstract class PackageManager { 
    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This device supports ethernet.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_ETHERNET = "android.hardware.ethernet";