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

Commit 33c239f7 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "allow the framework to access a Sensor's handle"

parents 1fb69f0f 7f84c065

core/java/android/hardware/Sensor.java

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ public final class Sensor { 
        return mMinDelay;

    }



    int getHandle() {

    /** @hide */

    public int getHandle() {

        return mHandle;

    }

core/java/android/os/BatteryStats.java

+5 −0
Original line number Diff line number Diff line
@@ -301,6 +301,11 @@ public abstract class BatteryStats implements Parcelable { 
        public abstract int getUserActivityCount(int type, int which);

        

        public static abstract class Sensor {

            /*

             * FIXME: it's not correct to use this magic value because it

             * could clash with a sensor handle (which are defined by

             * the sensor HAL, and therefore out of our control

             */

            // Magic sensor number for the GPS.

            public static final int GPS = -10000;