Commit Graph

302758 Commits

Author SHA1 Message Date
Philip P. Moltmann
e9bb5137e0 Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 am: 764a7901e6
am: 1156bf1dc1

Change-Id: I4559bb240589f523ab035c42b09be2bf17fbe599
2017-01-13 21:37:36 +00:00
Philip P. Moltmann
aa288c1049 Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e am: 0aa5138861 -s ours
am: 6a1dcd17e4

Change-Id: Iffc426e95d47559bf1a01e0cf4b9c5c0f160d33b
2017-01-13 21:36:33 +00:00
Justin Klaassen
3a6605cbf6 Merge "Add support for carrier demo mode" into nyc-mr2-dev am: 482ba6b831
am: 84d0b9ea6b

Change-Id: I52df2e1fd79db3b324406215c4d6b32dc832f2cd
2017-01-13 21:34:59 +00:00
Justin Klaassen
de17548f76 Add support for carrier demo mode am: b632c55469
am: b4be8c8df1  -s ours

Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6
2017-01-13 21:33:45 +00:00
Rob Carr
1ce0793ab4 Merge "Expose SurfaceControl method to screenshot to GraphicBuffer." 2017-01-13 21:29:09 +00:00
Philip P. Moltmann
1156bf1dc1 Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4
am: 764a7901e6

Change-Id: I845318f60eadb6c31f9795024cf10df33a15dc20
2017-01-13 21:14:41 +00:00
Philip P. Moltmann
6a1dcd17e4 Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e
am: 0aa5138861  -s ours

Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
2017-01-13 21:13:46 +00:00
Justin Klaassen
84d0b9ea6b Merge "Add support for carrier demo mode" into nyc-mr2-dev
am: 482ba6b831

Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186
2017-01-13 21:04:55 +00:00
Justin Klaassen
b4be8c8df1 Add support for carrier demo mode
am: b632c55469

Change-Id: Ib8061ae05e5144a79921123ba6dfdaec81baaece
2017-01-13 21:04:31 +00:00
Pankaj Kanwar
c854415223 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev am: ae9e15fa44
am: 074a166e28  -s ours

Change-Id: I2cc7c861011387e70557fdf110470db7a125bcd2
2017-01-13 21:03:17 +00:00
pkanwar
99e727314e DO NOT MERGE: Fix to maintain the Carrier Network connection. am: e45b50293e
am: 07998e8e26  -s ours

Change-Id: I5fb03b65175cbfc8992ca72309d5de766bdf3ae9
2017-01-13 21:02:08 +00:00
Justin Klaassen
482ba6b831 Merge "Add support for carrier demo mode" into nyc-mr2-dev 2017-01-13 21:00:08 +00:00
Pankaj Kanwar
074a166e28 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
am: ae9e15fa44

Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4
2017-01-13 20:58:15 +00:00
pkanwar
07998e8e26 DO NOT MERGE: Fix to maintain the Carrier Network connection.
am: e45b50293e

Change-Id: I6a48b308cd461097a195a073249cde096cc74886
2017-01-13 20:58:09 +00:00
Pankaj Kanwar
ae9e15fa44 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 2017-01-13 20:46:02 +00:00
Andrew Sapperstein
47492094f6 Merge "Add logging for high temp warning." into nyc-mr2-dev am: 409d93356c
am: ace5aea996

Change-Id: Ie91752bfa32fa7b2b155bec84a985ad520f00844
2017-01-13 20:33:36 +00:00
Andrew Sapperstein
67d75cf6f7 Add logging for high temp warning. am: 6c08f8da09
am: 990826a0a1

Change-Id: Ife42afb4b41fe3f733f6f8b23d56d977e6edb7d7
2017-01-13 20:32:41 +00:00
Andrew Sapperstein
ace5aea996 Merge "Add logging for high temp warning." into nyc-mr2-dev
am: 409d93356c

Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
2017-01-13 20:28:40 +00:00
Andrew Sapperstein
990826a0a1 Add logging for high temp warning.
am: 6c08f8da09

Change-Id: Id567e12b8eb6b85ab49ace003c03b80759073687
2017-01-13 20:28:35 +00:00
TreeHugger Robot
409d93356c Merge "Add logging for high temp warning." into nyc-mr2-dev 2017-01-13 20:24:50 +00:00
TreeHugger Robot
8f7bad2fec Merge "Add additional guards to ensure input consumer is re-registered." 2017-01-13 20:21:33 +00:00
TreeHugger Robot
3127190898 Merge "Move all time ticks to bg handlers, and post" 2017-01-13 20:11:12 +00:00
TreeHugger Robot
7fdd4d831b Merge "Fix ScoredNetwork: unparcel bundle in toString." 2017-01-13 20:06:31 +00:00
Manu Cornet
13a5ccaa65 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev am: a4d01c8573
am: 07ed38cddc  -s ours

Change-Id: I0079cab21d15736c991bf9d92649e5cd95f13e7c
2017-01-13 20:05:55 +00:00
Manu Cornet
3f497ae739 DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations am: 569cbecd92
am: 548ff6209c  -s ours

Change-Id: Ie8fd34cdf1eab78be4e6412d6656d3e5360096d5
2017-01-13 20:05:04 +00:00
Manu Cornet
07ed38cddc Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
am: a4d01c8573

Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
2017-01-13 19:58:42 +00:00
Manu Cornet
548ff6209c DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
am: 569cbecd92

Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
2017-01-13 19:58:35 +00:00
TreeHugger Robot
a4d01c8573 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 2017-01-13 19:54:20 +00:00
TreeHugger Robot
f0707fe34a Merge "Fix a near instant stats permission check false negative." 2017-01-13 19:36:46 +00:00
TreeHugger Robot
284d9401ac Merge "Refactor LockSettingsService to unify the handling of pattern and password" 2017-01-13 19:30:49 +00:00
TreeHugger Robot
1897b5777b Merge "Initialize the Installer in the StorageStatsService." 2017-01-13 19:27:45 +00:00
Jason Monk
cd26af7054 Move all time ticks to bg handlers, and post
This will hopefully avoid blaming sysui for ANRs when the system
is hosed.

Test: Manual, build, push, wait for time to change
Change-Id: I1661ac1a997ad8917b449dd175229d8b77f583c9
2017-01-13 13:43:22 -05:00
Winson Chung
929d4f7225 Add additional guards to ensure input consumer is re-registered.
- Also removing some old code related to menu start, which is already
  called when the menu is shown.

Bug: 34240533
Test: Open PIP, ensure that you can drag it after the menu fades out.
Change-Id: Ia16b405f8507f5c3d81fdf4f1049ce9359298672
2017-01-13 10:32:15 -08:00
Kang Li
96b39666a7 Merge "Adds tests for b/34095835." 2017-01-13 18:15:25 +00:00
Hakan Seyalioglu
8e0a405fad Merge "Only test the empty state in the right test." 2017-01-13 18:12:45 +00:00
Ashutosh Joshi
24f2a6f939 Merge "Add an uncalibrated acclerometer sensor type." 2017-01-13 17:47:33 +00:00
Kalle Raita
836320ff12 Merge "Add EGL_RECORDABLE_ANDROID enum in EGLExt" 2017-01-13 17:39:09 +00:00
Justin Klaassen
b632c55469 Add support for carrier demo mode
Fixes: 33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly

Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
2017-01-13 09:26:58 -08:00
Kang Li
64b018e0eb Adds tests for b/34095835.
Bug: 34095835

Test: reproduced the bug in b/34095835 to ensure that it is covered by
the test. Manually ran the tests.

Change-Id: I28a887341906dc443e1a854ddba51cd1b4daeead
2017-01-13 08:35:13 -08:00
Andrei Stingaceanu
ed76b34c42 Merge "AutoSize TextView (part 6) - introduce autoSizeMaxTextSize" 2017-01-13 14:12:39 +00:00
TreeHugger Robot
61301e9cf5 Merge "Fix bad merge" 2017-01-13 13:28:53 +00:00
Jorim Jaggi
553cec66f7 Fix bad merge
Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241
2017-01-13 13:00:42 +01:00
Andrei Stingaceanu
564328b21e AutoSize TextView (part 6) - introduce autoSizeMaxTextSize
Using textSize as maxTextSize for autosizing is buggy and
unclean. Introduce and use new autoSizeMaxTextSize attribute for
TextView.

Also while doing this optimized the auto-size process by removing
unnecessary computations:

1. If auto-size is enabled than setTextSize(...) is no-op.
2. After setting the text size internally and from the auto-size
context onMeasure() will stop doing another round of redundant
measurements..

Bug: 33449596
Bug: 32221168
Test: atttached in the same topic
Change-Id: Ieecaea6df0aebb4c182bdd1114e3c6fc5066bed1
2017-01-13 11:52:00 +00:00
Andrew Scull
a7d1580547 Merge "Save password metrics on non-FBE devices." 2017-01-13 11:49:20 +00:00
TreeHugger Robot
e5bab865b3 Merge "Remove dependence on SkTRegistry" 2017-01-13 11:44:36 +00:00
Michal Karpinski
ab97986977 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev am: 54b7388163
am: 3f0307c050

Change-Id: I6ac0f419c6dc2f5ffe03181b15d865930731d07d
2017-01-13 09:58:11 +00:00
Michal Karpinski
3c461ee46a [DPM] Improvements to the network logs batch finalization mechanism am: 4da4a5d0c8
am: f27cc410dd

Change-Id: I2762db1be4849841089e43c0adb2868bce3d9551
2017-01-13 09:56:58 +00:00
Michal Karpinski
3f0307c050 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
am: 54b7388163

Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
2017-01-13 09:51:32 +00:00
Michal Karpinski
f27cc410dd [DPM] Improvements to the network logs batch finalization mechanism
am: 4da4a5d0c8

Change-Id: I6318392173aeb2653734537569d03158799a099c
2017-01-13 09:51:27 +00:00
Michal Karpinski
54b7388163 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 2017-01-13 09:47:24 +00:00