diff options
| author | Aravind Akella <aakella@google.com> | 2014-04-11 19:32:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-11 19:32:38 +0000 |
| commit | cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 (patch) | |
| tree | 06467644c156434d6e7b1ce57dd0566b190dd01f /api | |
| parent | 970417c7d3e33ccbd6918e28d9bc5da24651f5b3 (diff) | |
| parent | cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247 (diff) | |
| download | frameworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.zip frameworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.tar.gz frameworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.tar.bz2 | |
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b0e8142..f93ea06 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32,6 +32,7 @@ package android { field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH"; field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN"; field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED"; + field public static final java.lang.String BODY_SENSORS = "android.permission.BODY_SENSORS"; field public static final java.lang.String BRICK = "android.permission.BRICK"; field public static final java.lang.String BROADCAST_PACKAGE_REMOVED = "android.permission.BROADCAST_PACKAGE_REMOVED"; field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS"; @@ -10756,10 +10757,33 @@ package android.hardware { method public int getMinDelay(); method public java.lang.String getName(); method public float getPower(); + method public java.lang.String getRequiredPermission(); method public float getResolution(); + method public java.lang.String getStringType(); method public int getType(); method public java.lang.String getVendor(); method public int getVersion(); + field public static final java.lang.String STRING_TYPE_ACCELEROMETER = "android.sensor.accelerometer"; + field public static final java.lang.String STRING_TYPE_AMBIENT_TEMPERATURE = "android.sensor.ambient_temperature"; + field public static final java.lang.String STRING_TYPE_GAME_ROTATION_VECTOR = "android.sensor.game_rotation_vector"; + field public static final java.lang.String STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR = "android.sensor.geomagnetic_rotation_vector"; + field public static final java.lang.String STRING_TYPE_GRAVITY = "android.sensor.gravity"; + field public static final java.lang.String STRING_TYPE_GYROSCOPE = "android.sensor.gyroscope"; + field public static final java.lang.String STRING_TYPE_GYROSCOPE_UNCALIBRATED = "android.sensor.gyroscope_uncalibrated"; + field public static final java.lang.String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate"; + field public static final java.lang.String STRING_TYPE_LIGHT = "android.sensor.light"; + field public static final java.lang.String STRING_TYPE_LINEAR_ACCELERATION = "android.sensor.linear_acceleration"; + field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD = "android.sensor.magnetic_field"; + field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED = "android.sensor.magnetic_field_uncalibrated"; + field public static final deprecated java.lang.String STRING_TYPE_ORIENTATION = "android.sensor.orientation"; + field public static final java.lang.String STRING_TYPE_PRESSURE = "android.sensor.pressure"; + field public static final java.lang.String STRING_TYPE_PROXIMITY = "android.sensor.proximity"; + field public static final java.lang.String STRING_TYPE_RELATIVE_HUMIDITY = "android.sensor.relative_humidity"; + field public static final java.lang.String STRING_TYPE_ROTATION_VECTOR = "android.sensor.rotation_vector"; + field public static final java.lang.String STRING_TYPE_SIGNIFICANT_MOTION = "android.sensor.significant_motion"; + field public static final java.lang.String STRING_TYPE_STEP_COUNTER = "android.sensor.step_counter"; + field public static final java.lang.String STRING_TYPE_STEP_DETECTOR = "android.sensor.step_detector"; + field public static final deprecated java.lang.String STRING_TYPE_TEMPERATURE = "android.sensor.temperature"; field public static final int TYPE_ACCELEROMETER = 1; // 0x1 field public static final int TYPE_ALL = -1; // 0xffffffff field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd @@ -10768,6 +10792,7 @@ package android.hardware { field public static final int TYPE_GRAVITY = 9; // 0x9 field public static final int TYPE_GYROSCOPE = 4; // 0x4 field public static final int TYPE_GYROSCOPE_UNCALIBRATED = 16; // 0x10 + field public static final int TYPE_HEART_RATE = 21; // 0x15 field public static final int TYPE_LIGHT = 5; // 0x5 field public static final int TYPE_LINEAR_ACCELERATION = 10; // 0xa field public static final int TYPE_MAGNETIC_FIELD = 2; // 0x2 |