OSDN Git Service
Geoff Mendal [Wed, 16 Dec 2015 04:53:01 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours
am:
57a89670cb -s ours
* commit '
57a89670cbe157cf8a99a6a0f0a10b37aac2b8ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours
am:
7babe8de9e -s ours
* commit '
7babe8de9eb51c5c23c9d3257314aa374112d550':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
531eb5b484 -s ours
* commit '
531eb5b484765888aa0dd969645593b50144c201':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours
am:
d8004c03d2 -s ours
* commit '
d8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:35:34 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
327d917865 -s ours
* commit '
327d917865331d1b6823495e1e4ba43930caaacb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:34:26 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:33:27 +0000 (20:33 -0800)]
Import translations. DO NOT MERGE
am:
22dea4e16f -s ours
* commit '
22dea4e16f9a32eb4693829b59462c32dda3f45c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:29:48 +0000 (20:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:26:04 +0000 (04:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:21:26 +0000 (20:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:18:32 +0000 (20:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
Adam Lesinski [Tue, 15 Dec 2015 23:57:13 +0000 (23:57 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
am:
1d6d4c5a69
* commit '
1d6d4c5a695051ccb9b455306b155bad5d6f136a':
DO NOT MERGE: Fix batterystats battery level int packing
Adam Lesinski [Tue, 15 Dec 2015 23:52:43 +0000 (23:52 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
(cherry picked from commit
6902052c77bbcb9078b4ced243874f67542f64f9)
Adam Lesinski [Tue, 15 Dec 2015 22:01:03 +0000 (22:01 +0000)]
Use wakeup reason when FingerPrint sensor wakes up the device
am:
9289560aa0
* commit '
9289560aa0d195dfed67dab05811114bc7bc88a9':
Use wakeup reason when FingerPrint sensor wakes up the device
Adam Lesinski [Wed, 4 Nov 2015 00:31:25 +0000 (16:31 -0800)]
Use wakeup reason when FingerPrint sensor wakes up the device
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.
Bug:
26209577
Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
(cherry picked from commit
5bcb8bb31ab6688dff432cb7bd20fe69016c7003)
Bryce Lee [Mon, 14 Dec 2015 23:57:38 +0000 (23:57 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag. am:
4614596a39
am:
36393a5674
* commit '
36393a5674bf50b351b5961a194ce2814ca00140':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 23:43:54 +0000 (23:43 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
am:
4614596a39
* commit '
4614596a395b6c86fff3f35a07edda2e848d743c':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 22:39:10 +0000 (14:39 -0800)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.
Bug:
26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
Ian Pedowitz [Sat, 12 Dec 2015 01:12:35 +0000 (17:12 -0800)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
am:
cf07154e71
* commit '
cf07154e7102de304f1d887c8c2a2ef61b4880d7':
DO NOT MERGE Remove more extras during notification lightening.
Ian Pedowitz [Sat, 12 Dec 2015 01:06:43 +0000 (01:06 +0000)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
Dan Sandler [Tue, 8 Dec 2015 20:42:41 +0000 (15:42 -0500)]
DO NOT MERGE Remove more extras during notification lightening.
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.
Cherry-picked from
5012853de26eac023deda82d138a35677fe6117b
Bug:
26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
Christopher Tate [Fri, 11 Dec 2015 19:37:19 +0000 (11:37 -0800)]
Don\'t back up / restore EAP network definitions
am:
a89f9d93cb
* commit '
a89f9d93cbda665259812e990bca1045bd8abf9f':
Don't back up / restore EAP network definitions
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Cherrypick from AOSP.
Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
Dianne Hackborn [Fri, 11 Dec 2015 00:26:55 +0000 (16:26 -0800)]
Work on issue #
25467052: System lagged out
am:
022c748f54
* commit '
022c748f54626f77f01079595a0100d1d145f383':
Work on issue #
25467052: System lagged out
Dianne Hackborn [Wed, 4 Nov 2015 20:32:45 +0000 (12:32 -0800)]
Work on issue #
25467052: System lagged out
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.
Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
Adam Lesinski [Thu, 10 Dec 2015 22:47:09 +0000 (14:47 -0800)]
Prevent DivideByZero error in BatteryStatsImpl
am:
ba88e68fe4
* commit '
ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
Prevent DivideByZero error in BatteryStatsImpl
Adam Lesinski [Tue, 8 Dec 2015 20:06:55 +0000 (12:06 -0800)]
Prevent DivideByZero error in BatteryStatsImpl
It was assumed that when a UID had either rx or tx bytes/packets that it would
have the other as well.
Bug:
25706750
Change-Id: Iefac59a6bd02876aed9a0bac218d187b81807a95
Bryce Lee [Wed, 9 Dec 2015 23:01:13 +0000 (15:01 -0800)]
Improve logging in BluetoothHeadsetClientCall. am:
3c67873f0a
am:
180dd72a9b
* commit '
180dd72a9b36ca6f74e5ad255347d815a0c8729a':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Wed, 9 Dec 2015 22:54:19 +0000 (22:54 +0000)]
Improve logging in BluetoothHeadsetClientCall.
am:
3c67873f0a
* commit '
3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Tue, 8 Dec 2015 19:22:31 +0000 (11:22 -0800)]
Improve logging in BluetoothHeadsetClientCall.
Bug:
26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
Prashant Malani [Tue, 8 Dec 2015 01:37:05 +0000 (01:37 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15
am:
6344cb8144
* commit '
6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:31:31 +0000 (01:31 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
am:
487f0d3d15
* commit '
487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
Chenjie Luo [Mon, 7 Dec 2015 23:28:44 +0000 (23:28 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d
am:
bef0525c38
* commit '
bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
Amit Mahajan [Mon, 7 Dec 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
am:
cd2cc9aa9b
* commit '
cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:08:01 +0000 (23:08 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
am:
dde5a6ef28
* commit '
dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:06:36 +0000 (23:06 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
am:
e56f7b0d1d
* commit '
e56f7b0d1d92390c3409999ea841525514163f65':
Check NPE beforehand instead of catching it at runtime
Chenjie Luo [Mon, 7 Dec 2015 21:04:14 +0000 (21:04 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
Amit Mahajan [Mon, 7 Dec 2015 18:15:38 +0000 (18:15 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
Julia Reynolds [Mon, 7 Dec 2015 15:06:03 +0000 (15:06 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Bug:
25783349
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Eino-Ville Talvala [Sat, 5 Dec 2015 00:28:38 +0000 (00:28 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41 am:
7417f70ac6
am:
e2d516fd4b
* commit '
e2d516fd4b77352919d1c40971678909e3f4a15d':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:20:47 +0000 (16:20 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41
am:
7417f70ac6
* commit '
7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:11:43 +0000 (00:11 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d
am:
add4b91d41
* commit '
add4b91d41d3ba810b6b25c14d7c13050394f201':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:03:23 +0000 (16:03 -0800)]
Merge "Camera: codegen doc update" into mnc-dev
am:
69c5e7143d
* commit '
69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
Camera: codegen doc update
Eino-Ville Talvala [Fri, 4 Dec 2015 23:54:05 +0000 (23:54 +0000)]
Merge "Camera: codegen doc update" into mnc-dev
Chenjie Luo [Thu, 3 Dec 2015 20:24:12 +0000 (12:24 -0800)]
Check NPE beforehand instead of catching it at runtime
This will fix the page fault when watch rings during incoming call
Bug:
25904666
Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
Vineeta Srivastava [Thu, 3 Dec 2015 22:01:30 +0000 (22:01 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
am:
9eacc97d71
* commit '
9eacc97d71166a05ec0eb67025a00cb4e57979c8':
Set Tether APN protocol type to IPv4 for Telus
Vineeta Srivastava [Thu, 3 Dec 2015 21:56:29 +0000 (21:56 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
Hyejin Kim [Fri, 30 Oct 2015 00:46:53 +0000 (09:46 +0900)]
Set Tether APN protocol type to IPv4 for Telus
BUG=
25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
Christine Hallstrom [Thu, 3 Dec 2015 20:42:35 +0000 (20:42 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472
am:
67d068b5ec
* commit '
67d068b5ec7ca3739047f0c5a162f9317171f784':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:35:39 +0000 (20:35 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
am:
7fb263c472
* commit '
7fb263c472c9df98410b2b9dfe72e093e2d594e0':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
Andy Hung [Thu, 3 Dec 2015 19:50:25 +0000 (19:50 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb
am:
a30685ef8d
* commit '
a30685ef8dcaa18b2561c17cfbbb48044adb2d27':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:42:45 +0000 (19:42 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7
am:
94cefd6adb
* commit '
94cefd6adb7cf464e4765faaba001071b543517b':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:34:01 +0000 (19:34 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c
am:
7c798c13a7
* commit '
7c798c13a7c36f3c8877f410ecf5552e1b385805':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:24:02 +0000 (19:24 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am:
0a887bcd5c
* commit '
0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Christine Hallstrom [Tue, 17 Nov 2015 20:24:07 +0000 (12:24 -0800)]
Log API calls to createBond(), cancelBondProcess(), removeBond()
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.
Bug:
25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
Andy Hung [Tue, 1 Dec 2015 00:09:55 +0000 (16:09 -0800)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug:
25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit
0275a982abecee683f16c827d405eafe51fb67ae)
Chris Elliott [Wed, 2 Dec 2015 21:57:06 +0000 (21:57 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
am:
8e79dae3f6
* commit '
8e79dae3f67aae032010ddbbef2f8032ace01263':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Chris Elliott [Wed, 2 Dec 2015 21:16:46 +0000 (13:16 -0800)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
This reverts commit
f60491183def4c46b4026afb4648544e7289ea5f.
Adrian Roos [Wed, 2 Dec 2015 01:44:21 +0000 (01:44 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev
Ben Fennema [Wed, 2 Dec 2015 01:20:15 +0000 (01:20 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am:
4d70e6a3c0 -s ours
am:
8780f07b5c -s ours
* commit '
8780f07b5c2a318cb28c172f9eac47b975793c90':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:12:04 +0000 (01:12 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev
am:
4d70e6a3c0 -s ours
* commit '
4d70e6a3c044c4e29d84835a026b3e70b44b66e8':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:06:12 +0000 (01:06 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev
Ben Fennema [Wed, 2 Dec 2015 01:05:25 +0000 (01:05 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
ad75169628589a275fb869a813ea697336e0c0aa.
Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
Ben Fennema [Wed, 2 Dec 2015 00:34:14 +0000 (00:34 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am:
ec7180f733 -s ours
am:
b98383291f -s ours
* commit '
b98383291f32d0152cb291855aa00f016d526a4a':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Ben Fennema [Wed, 2 Dec 2015 00:26:19 +0000 (00:26 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev
am:
ec7180f733 -s ours
* commit '
ec7180f7333777582e642fc54f7106d500b7da33':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Ben Fennema [Wed, 2 Dec 2015 00:01:55 +0000 (00:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev
Chris Elliott [Tue, 1 Dec 2015 21:27:33 +0000 (21:27 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am:
50276adde2
am:
c54aa0c3f7
* commit '
c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
MediaPlayer: Disable acquiring wakelocks based on property.
Chris Elliott [Tue, 1 Dec 2015 21:19:54 +0000 (21:19 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev
am:
50276adde2
* commit '
50276adde24c55394c0023ef49d01f054303dc87':
MediaPlayer: Disable acquiring wakelocks based on property.
Chris Elliott [Tue, 1 Dec 2015 21:12:15 +0000 (21:12 +0000)]
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev
Bryce Lee [Tue, 1 Dec 2015 15:50:14 +0000 (15:50 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am:
085796bdf5 -s ours
am:
4ecf963e77 -s ours
* commit '
4ecf963e770e0226c3fcef509ff5d7fb6c31ed0b':
DO NOT MERGE ANYWHERE
Bryce Lee [Tue, 1 Dec 2015 15:43:15 +0000 (15:43 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
am:
085796bdf5 -s ours
* commit '
085796bdf5e106abd42db2d0ef7d3aee899a766b':
DO NOT MERGE ANYWHERE
Bryce Lee [Tue, 1 Dec 2015 15:37:30 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
Jani Suonpera [Fri, 9 Oct 2015 08:59:19 +0000 (11:59 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
This is special solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: Id19226d7d3ac0628488a0f005f2b1c44bafcf9b6
Signed-off-by: Ben Fennema <fennema@google.com>
Yin-Chia Yeh [Fri, 20 Nov 2015 23:39:36 +0000 (15:39 -0800)]
Camera: codegen doc update
Bug:
25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
Bryce Lee [Mon, 30 Nov 2015 19:02:38 +0000 (19:02 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am:
52bdf11583
am:
b241487c16
* commit '
b241487c16976a3f0aa6592740bba15f489eab17':
Add callback for connections to be notified when the ringer is silenced.
Bryce Lee [Mon, 30 Nov 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
am:
52bdf11583
* commit '
52bdf11583366322ca14d69b895ac451a71245db':
Add callback for connections to be notified when the ringer is silenced.
Bryce Lee [Mon, 30 Nov 2015 18:51:39 +0000 (18:51 +0000)]
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
Erik Wolsheimer [Mon, 30 Nov 2015 17:28:44 +0000 (17:28 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd
am:
1dbb0355dc
* commit '
1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:22:56 +0000 (17:22 +0000)]
fix data race condition BUG:
25819358
am:
2242b4d2bd
* commit '
2242b4d2bda7f83cf7813103ff95d9b4e244126f':
fix data race condition BUG:
25819358
Erik Wolsheimer [Tue, 24 Nov 2015 21:22:04 +0000 (13:22 -0800)]
fix data race condition
BUG:
25819358
Change-Id: I9d9978c92d084e93ccb41ea1d0fe33ffe3e17e3d
Kevin Neas [Tue, 24 Nov 2015 02:46:24 +0000 (02:46 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am:
4dbb586585
am:
b6ae32162e
* commit '
b6ae32162e77d9f11620b6806dec20a0987e2dab':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 01:58:00 +0000 (01:58 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
am:
4dbb586585
* commit '
4dbb58658552d1cdae46ef06d331b867f5610786':
DO NOT MERGE. Cherrypick UiBench from Master
Adrian Roos [Tue, 24 Nov 2015 00:47:50 +0000 (16:47 -0800)]
Charging speed based on voltage
Also takes into account the voltage
at which we charge to make speeds
at different voltages comparable.
Bug:
25229483
Change-Id: I62a192932a013036585cd9fc870808debceac0d3
Kevin Neas [Tue, 24 Nov 2015 00:50:18 +0000 (00:50 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
Sridhar Vashist [Mon, 27 Jul 2015 18:30:21 +0000 (13:30 -0500)]
MediaPlayer: Disable acquiring wakelocks based on property.
Ignore setWakeMode based on system property.
Wakelocks essential for playback will be held by audioflinger.
Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
Geoff Mendal [Mon, 23 Nov 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 23 Nov 2015 17:50:05 +0000 (18:50 +0100)]
Import translations. DO NOT MERGE
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 17:38:52 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
ae7c51a9cc -s ours
* commit '
ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:32:02 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 23 Nov 2015 17:30:39 +0000 (18:30 +0100)]
Import translations. DO NOT MERGE
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 13:43:48 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE am:
b21b778567 -s ours
am:
b96f640a77 -s ours
* commit '
b96f640a77b0c09868e104028d3bb9db3687018b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:36:02 +0000 (13:36 +0000)]
Import translations. DO NOT MERGE
am:
b21b778567 -s ours
* commit '
b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:26:59 +0000 (14:26 +0100)]
Import translations. DO NOT MERGE
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
Adam Lesinski [Fri, 20 Nov 2015 20:20:14 +0000 (20:20 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours
am:
888916ff0f -s ours
* commit '
888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 20 Nov 2015 20:14:08 +0000 (20:14 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
am:
6902052c77 -s ours
* commit '
6902052c77bbcb9078b4ced243874f67542f64f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839