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

Commit 7020aa66 authored by Polina Bondarenko's avatar Polina Bondarenko Committed by Android (Google) Code Review
Browse files

Merge "Renamed HARDWARE_PROPERTIES_SERVICE to hardware_properties." into nyc-dev

parents e62beb0e 8333c732

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8114,7 +8114,7 @@ package android.content { 
    field public static final java.lang.String DOWNLOAD_SERVICE = "download";

    field public static final java.lang.String DROPBOX_SERVICE = "dropbox";

    field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_SERVICE = "input";

    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8417,7 +8417,7 @@ package android.content { 
    field public static final java.lang.String DOWNLOAD_SERVICE = "download";

    field public static final java.lang.String DROPBOX_SERVICE = "dropbox";

    field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";

    field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_SERVICE = "input";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8120,7 +8120,7 @@ package android.content { 
    field public static final java.lang.String DOWNLOAD_SERVICE = "download";

    field public static final java.lang.String DROPBOX_SERVICE = "dropbox";

    field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";

    field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_SERVICE = "input";

    field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";

core/java/android/content/Context.java

+2 −2
Original line number Diff line number Diff line
@@ -2742,7 +2742,7 @@ public abstract class Context { 
     * <dt> {@link #NETWORK_STATS_SERVICE} ("netstats")

     * <dd> A {@link android.app.usage.NetworkStatsManager NetworkStatsManager} for querying network

     * usage statistics.

     * <dt> {@link #HARDWARE_PROPERTIES_SERVICE} ("hardwareproperties")

     * <dt> {@link #HARDWARE_PROPERTIES_SERVICE} ("hardware_properties")

     * <dd> A {@link android.os.HardwarePropertiesManager} for accessing hardware properties.

     * </dl>

     *
@@ -3574,7 +3574,7 @@ public abstract class Context { 
     *

     * @see #getSystemService

     */

    public static final String HARDWARE_PROPERTIES_SERVICE = "hardwareproperties";

    public static final String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";



    /**

     * TODO Javadoc