Geoff Mendal
4893042569
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: d0dd157ade
2015-12-16 05:11:07 +00:00
Geoff Mendal
82ce2a6cdb
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 8b4b230174
2015-12-16 05:09:37 +00:00
Geoff Mendal
d0dd157ade
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 05:05:18 +00:00
Geoff Mendal
8f316d2723
Import translations. DO NOT MERGE
...
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
2015-12-15 21:03:50 -08:00
Geoff Mendal
8b4b230174
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 05:02:26 +00:00
Geoff Mendal
1144462f6b
Import translations. DO NOT MERGE
...
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
2015-12-15 21:00:49 -08:00
Geoff Mendal
c8ddc96f01
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 10bc1c7000
2015-12-16 04:58:38 +00:00
Geoff Mendal
10bc1c7000
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:49:00 +00:00
Geoff Mendal
e0b74266f7
Import translations. DO NOT MERGE
...
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
2015-12-15 20:45:33 -08:00
Geoff Mendal
a32b362f00
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: df5dd062a0
2015-12-16 04:45:32 +00:00
Geoff Mendal
57a89670cb
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 531eb5b484
2015-12-16 04:43:18 +00:00
Geoff Mendal
df5dd062a0
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:36:13 +00:00
Geoff Mendal
7babe8de9e
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 327d917865
2015-12-15 20:35:34 -08:00
Geoff Mendal
648fa53981
Import translations. DO NOT MERGE
...
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
2015-12-15 20:34:53 -08:00
Geoff Mendal
531eb5b484
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:34:26 +00:00
Geoff Mendal
d8004c03d2
Import translations. DO NOT MERGE
...
am: 22dea4e16f
2015-12-15 20:33:27 -08:00
Geoff Mendal
d2615bdf40
Import translations. DO NOT MERGE
...
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
2015-12-15 20:29:48 -08:00
Geoff Mendal
327d917865
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:26:04 +00:00
Geoff Mendal
695cf968b7
Import translations. DO NOT MERGE
...
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
2015-12-15 20:21:26 -08:00
Geoff Mendal
22dea4e16f
Import translations. DO NOT MERGE
...
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
2015-12-15 20:18:32 -08:00
Adam Lesinski
1d6d4c5a69
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
2015-12-15 23:52:43 +00:00
Adam Lesinski
5f8c8186ec
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 6902052c77
2015-12-15 22:12:10 +00:00
Adam Lesinski
9289560aa0
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 5bcb8bb31a
2015-12-15 21:46:11 +00:00
Bryce Lee
36393a5674
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
...
am: 4614596a39
2015-12-14 23:43:54 +00:00
Bryce Lee
4614596a39
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
2015-12-14 14:39:10 -08:00
Ian Pedowitz
cf07154e71
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
2015-12-12 01:06:43 +00:00
Dan Sandler
ddb52fb1f5
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 5012853de2
2015-12-12 01:05:25 +00:00
Christopher Tate
a89f9d93cb
Don't back up / restore EAP network definitions
...
Bug 25725016
Cherrypick from AOSP.
Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
2015-12-10 18:23:22 -08:00
Dianne Hackborn
022c748f54
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
2015-12-10 15:14:46 -08:00
Adam Lesinski
ba88e68fe4
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
2015-12-10 00:48:24 +00:00
Bryce Lee
180dd72a9b
Improve logging in BluetoothHeadsetClientCall.
...
am: 3c67873f0a
2015-12-09 22:54:19 +00:00
Bryce Lee
3c67873f0a
Improve logging in BluetoothHeadsetClientCall.
...
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
2015-12-08 11:22:31 -08:00
Prashant Malani
6344cb8144
Merge "Add rotary encoder input source" into cw-e-dev
...
am: 487f0d3d15
2015-12-08 01:31:31 +00:00
Prashant Malani
487f0d3d15
Merge "Add rotary encoder input source" into cw-e-dev
2015-12-08 01:27:18 +00:00
Chenjie Luo
bef0525c38
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
...
am: e56f7b0d1d
2015-12-07 23:06:36 +00:00
Chenjie Luo
e56f7b0d1d
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
2015-12-07 21:04:14 +00:00
Amit Mahajan
cd2cc9aa9b
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
2015-12-07 18:15:38 +00:00
Julia Reynolds
dde5a6ef28
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
2015-12-07 15:06:03 +00:00
Julia Reynolds
3e57340b6a
Fix radio button flash on hour change.
...
Also delete confusing debug variable.
Bug: 25459795
Bug: 25783349
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
2015-12-07 14:59:16 +00:00
Eino-Ville Talvala
e2d516fd4b
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41
...
am: 7417f70ac6
2015-12-04 16:20:47 -08:00
Eino-Ville Talvala
7417f70ac6
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d
...
am: add4b91d41
2015-12-05 00:11:43 +00:00
Eino-Ville Talvala
add4b91d41
Merge "Camera: codegen doc update" into mnc-dev
...
am: 69c5e7143d
2015-12-04 16:03:23 -08:00
Eino-Ville Talvala
69c5e7143d
Merge "Camera: codegen doc update" into mnc-dev
2015-12-04 23:54:05 +00:00
Chenjie Luo
90bc39d7e3
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
2015-12-03 14:58:01 -08:00
Vineeta Srivastava
9eacc97d71
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
2015-12-03 21:56:29 +00:00
Hyejin Kim
47268e974e
Set Tether APN protocol type to IPv4 for Telus
...
BUG=25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
2015-12-03 13:35:06 -08:00
Christine Hallstrom
67d068b5ec
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
...
am: 7fb263c472
2015-12-03 20:35:39 +00:00
Christine Hallstrom
7fb263c472
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
2015-12-03 20:32:05 +00:00
Andy Hung
a30685ef8d
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7
...
am: 94cefd6adb
2015-12-03 19:42:45 +00:00
Andy Hung
94cefd6adb
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c
...
am: 7c798c13a7
2015-12-03 19:34:01 +00:00
