OSDN Git Service
Andrew Scull [Sat, 14 Jan 2017 00:30:22 +0000 (00:30 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049" into nyc-mr2-dev-plus-aosp
am:
c697ffe98b
Change-Id: I79d4ec95100e09eb6225cbfe900bceb357ee6b71
Andrew Scull [Sat, 14 Jan 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049
am:
bc94427593
Change-Id: I7e3cc5845ddafa4299f3bec1c2d40c05a66ffa99
Andrew Scull [Sat, 14 Jan 2017 00:28:46 +0000 (00:28 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f" into nyc-mr2-dev-plus-aosp
am:
0877a45f02
Change-Id: I8b4a708f5204346e791f5450bfaa4501afa3704b
Andrew Scull [Sat, 14 Jan 2017 00:28:39 +0000 (00:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f
am:
8203155664 -s ours
Change-Id: I920c10e52faef95e0d3d55e075fdc85610b358c0
Zak Cohen [Fri, 13 Jan 2017 23:14:57 +0000 (23:14 +0000)]
Merge changes from topic 'vrmode'
* changes:
Set ui mode in UiModeManagerService to vrheadset when VR mode is enabled.
Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
Roger Xue [Fri, 13 Jan 2017 21:59:13 +0000 (21:59 +0000)]
Merge "move PreferenceController into settingLib/core"
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:55 +0000 (21:45 +0000)]
Merge changes from topic 'am-
72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
am:
7dfd0b9843
Change-Id: I8a7ab11326864e25a993c4e4daecc3c280adf1a2
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:49 +0000 (21:45 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
0dfa7b58b8
am:
af5875d1be
Change-Id: Ia85f754316e9f003dfffdfb17efa8622d49068f2
Philip P. Moltmann [Fri, 13 Jan 2017 21:44:50 +0000 (21:44 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours am:
2288ee6b01
am:
44ee186c79
Change-Id: I81498bb620cd0a2c3bfac8654d5536ed38ba4d4b
Joachim Sauer [Fri, 13 Jan 2017 21:41:52 +0000 (21:41 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a am:
d05e19954b am:
88002e8e38
am:
b26cc7f971
Change-Id: Ib52d788a1787fa3689c14135673de044e2a7c989
Erik Kline [Fri, 13 Jan 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e am:
a94e66868c am:
21a148550d
am:
c8c42637d9
Change-Id: Ia6a834e00d3f681dd7558d096f157f1c8f279bea
Erik Kline [Fri, 13 Jan 2017 21:39:45 +0000 (21:39 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6 am:
7340e272c3 am:
ca6d265bbe
am:
930ff60ca8
Change-Id: I307f0c83c09dd5962bd4b6e929083aff9f6f6f05
Chen Xu [Fri, 13 Jan 2017 21:38:45 +0000 (21:38 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd am:
1d0877f59e am:
c90dc2072c
am:
10839091d9
Change-Id: I2a09577e0912c1d6ff324f0471b4a2012656749a
Philip P. Moltmann [Fri, 13 Jan 2017 21:37:36 +0000 (21:37 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
764a7901e6
am:
1156bf1dc1
Change-Id: I4559bb240589f523ab035c42b09be2bf17fbe599
Philip P. Moltmann [Fri, 13 Jan 2017 21:36:33 +0000 (21:36 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e am:
0aa5138861 -s ours
am:
6a1dcd17e4
Change-Id: Iffc426e95d47559bf1a01e0cf4b9c5c0f160d33b
Justin Klaassen [Fri, 13 Jan 2017 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev am:
482ba6b831
am:
84d0b9ea6b
Change-Id: I52df2e1fd79db3b324406215c4d6b32dc832f2cd
Justin Klaassen [Fri, 13 Jan 2017 21:33:45 +0000 (21:33 +0000)]
Add support for carrier demo mode am:
b632c55469
am:
b4be8c8df1 -s ours
Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6
Rob Carr [Fri, 13 Jan 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Expose SurfaceControl method to screenshot to GraphicBuffer."
Android Build Merger (Role) [Fri, 13 Jan 2017 21:24:55 +0000 (21:24 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:24:22 +0000 (21:24 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd
am:
32992b4049
Change-Id: I2acaf1bd0a03e04611ec29cd9afd04e130e832d0
Android Build Merger (Role) [Fri, 13 Jan 2017 21:24:04 +0000 (21:24 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:23:27 +0000 (21:23 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1
am:
3c9b36482f
Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
Android Build Merger (Role) [Fri, 13 Jan 2017 21:23:07 +0000 (21:23 +0000)]
Merge changes from topic 'am-
72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
* changes:
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
0dfa7b58b8
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours am:
2288ee6b01
Philip P. Moltmann [Fri, 13 Jan 2017 21:22:16 +0000 (21:22 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4
am:
0dfa7b58b8
Change-Id: I64d9e83dbabdf1f3f3574cea135488cb86d4a2c1
Philip P. Moltmann [Fri, 13 Jan 2017 21:21:11 +0000 (21:21 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours
am:
2288ee6b01
Change-Id: Idcd4200ad47c5fd7d007b2a717941cec5db08595
Joachim Sauer [Fri, 13 Jan 2017 21:19:56 +0000 (21:19 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a am:
d05e19954b
am:
88002e8e38
Change-Id: I82a83e52e96bff1b43ca8bca7afe9b32877c3ecb
Erik Kline [Fri, 13 Jan 2017 21:17:39 +0000 (21:17 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e am:
a94e66868c
am:
21a148550d
Change-Id: I04b03ff7cee505e8322320ec3d0ee10e6dbf2b09
Andrew Scull [Fri, 13 Jan 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c
am:
b2db3761cd
Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87
Erik Kline [Fri, 13 Jan 2017 21:16:46 +0000 (21:16 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6 am:
7340e272c3
am:
ca6d265bbe
Change-Id: Ia761aeaa897538666cc690aac61092f38bb9b425
Andrew Scull [Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969
am:
3aac3ebee1
Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
Chen Xu [Fri, 13 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd am:
1d0877f59e
am:
c90dc2072c
Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
Philip P. Moltmann [Fri, 13 Jan 2017 21:15:18 +0000 (21:15 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc
am:
331a4bb8d4
Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
Philip P. Moltmann [Fri, 13 Jan 2017 21:14:41 +0000 (21:14 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4
am:
764a7901e6
Change-Id: I845318f60eadb6c31f9795024cf10df33a15dc20
Philip P. Moltmann [Fri, 13 Jan 2017 21:14:17 +0000 (21:14 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5
am:
889a420a9e -s ours
Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
Philip P. Moltmann [Fri, 13 Jan 2017 21:13:46 +0000 (21:13 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e
am:
0aa5138861 -s ours
Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
Justin Klaassen [Fri, 13 Jan 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev
am:
482ba6b831
Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186
Justin Klaassen [Fri, 13 Jan 2017 21:04:31 +0000 (21:04 +0000)]
Add support for carrier demo mode
am:
b632c55469
Change-Id: Ib8061ae05e5144a79921123ba6dfdaec81baaece
Pankaj Kanwar [Fri, 13 Jan 2017 21:03:17 +0000 (21:03 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev am:
ae9e15fa44
am:
074a166e28 -s ours
Change-Id: I2cc7c861011387e70557fdf110470db7a125bcd2
pkanwar [Fri, 13 Jan 2017 21:02:08 +0000 (21:02 +0000)]
DO NOT MERGE: Fix to maintain the Carrier Network connection. am:
e45b50293e
am:
07998e8e26 -s ours
Change-Id: I5fb03b65175cbfc8992ca72309d5de766bdf3ae9
Justin Klaassen [Fri, 13 Jan 2017 21:00:06 +0000 (21:00 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev
Pankaj Kanwar [Fri, 13 Jan 2017 20:58:15 +0000 (20:58 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
am:
ae9e15fa44
Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4
pkanwar [Fri, 13 Jan 2017 20:58:09 +0000 (20:58 +0000)]
DO NOT MERGE: Fix to maintain the Carrier Network connection.
am:
e45b50293e
Change-Id: I6a48b308cd461097a195a073249cde096cc74886
Pankaj Kanwar [Fri, 13 Jan 2017 20:45:59 +0000 (20:45 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
Andrew Sapperstein [Fri, 13 Jan 2017 20:33:36 +0000 (20:33 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev am:
409d93356c
am:
ace5aea996
Change-Id: Ie91752bfa32fa7b2b155bec84a985ad520f00844
Andrew Sapperstein [Fri, 13 Jan 2017 20:32:41 +0000 (20:32 +0000)]
Add logging for high temp warning. am:
6c08f8da09
am:
990826a0a1
Change-Id: Ife42afb4b41fe3f733f6f8b23d56d977e6edb7d7
Andrew Sapperstein [Fri, 13 Jan 2017 20:28:40 +0000 (20:28 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev
am:
409d93356c
Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
Andrew Sapperstein [Fri, 13 Jan 2017 20:28:35 +0000 (20:28 +0000)]
Add logging for high temp warning.
am:
6c08f8da09
Change-Id: Id567e12b8eb6b85ab49ace003c03b80759073687
TreeHugger Robot [Fri, 13 Jan 2017 20:24:47 +0000 (20:24 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev
TreeHugger Robot [Fri, 13 Jan 2017 20:21:30 +0000 (20:21 +0000)]
Merge "Add additional guards to ensure input consumer is re-registered."
TreeHugger Robot [Fri, 13 Jan 2017 20:11:09 +0000 (20:11 +0000)]
Merge "Move all time ticks to bg handlers, and post"
TreeHugger Robot [Fri, 13 Jan 2017 20:06:28 +0000 (20:06 +0000)]
Merge "Fix ScoredNetwork: unparcel bundle in toString."
Manu Cornet [Fri, 13 Jan 2017 20:05:55 +0000 (20:05 +0000)]
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
Manu Cornet [Fri, 13 Jan 2017 20:05:04 +0000 (20:05 +0000)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations am:
569cbecd92
am:
548ff6209c -s ours
Change-Id: Ie8fd34cdf1eab78be4e6412d6656d3e5360096d5
Manu Cornet [Fri, 13 Jan 2017 19:58:42 +0000 (19:58 +0000)]
Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
am:
a4d01c8573
Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
Manu Cornet [Fri, 13 Jan 2017 19:58:35 +0000 (19:58 +0000)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
am:
569cbecd92
Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
TreeHugger Robot [Fri, 13 Jan 2017 19:54:18 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
TreeHugger Robot [Fri, 13 Jan 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Fix a near instant stats permission check false negative."
TreeHugger Robot [Fri, 13 Jan 2017 19:30:46 +0000 (19:30 +0000)]
Merge "Refactor LockSettingsService to unify the handling of pattern and password"
TreeHugger Robot [Fri, 13 Jan 2017 19:27:43 +0000 (19:27 +0000)]
Merge "Initialize the Installer in the StorageStatsService."
roger xue [Mon, 19 Dec 2016 20:39:44 +0000 (12:39 -0800)]
move PreferenceController into settingLib/core
Test: moved
Change-Id: I9adde03ac7790dc0eacc2f58be3c2af0c9c58900
Jason Monk [Wed, 11 Jan 2017 19:32:58 +0000 (14:32 -0500)]
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
Winson Chung [Fri, 13 Jan 2017 18:21:33 +0000 (10:21 -0800)]
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
Kang Li [Fri, 13 Jan 2017 18:15:22 +0000 (18:15 +0000)]
Merge "Adds tests for b/
34095835."
Hakan Seyalioglu [Fri, 13 Jan 2017 18:12:42 +0000 (18:12 +0000)]
Merge "Only test the empty state in the right test."
Ashutosh Joshi [Fri, 13 Jan 2017 17:47:30 +0000 (17:47 +0000)]
Merge "Add an uncalibrated acclerometer sensor type."
Kalle Raita [Fri, 13 Jan 2017 17:39:07 +0000 (17:39 +0000)]
Merge "Add EGL_RECORDABLE_ANDROID enum in EGLExt"
Justin Klaassen [Wed, 11 Jan 2017 23:54:17 +0000 (15:54 -0800)]
Add support for carrier demo mode
Fixes:
33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly
Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
Andrew Scull [Fri, 13 Jan 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542
am:
66d66dd50c
Change-Id: Ic622d551181566585be89380e32658e963768cbf
Andrew Scull [Fri, 13 Jan 2017 17:17:49 +0000 (17:17 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
am:
eb35ad9969
Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
Andrew Scull [Fri, 13 Jan 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473
am:
ea9463f542
Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966
Kang Li [Fri, 6 Jan 2017 01:30:06 +0000 (17:30 -0800)]
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
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
Andrew Scull [Fri, 13 Jan 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
am:
97848fc473
Change-Id: I12d9a6d18654673e5912416550c64e81aab857f9
Andrei Stingaceanu [Fri, 13 Jan 2017 14:12:37 +0000 (14:12 +0000)]
Merge "AutoSize TextView (part 6) - introduce autoSizeMaxTextSize"
TreeHugger Robot [Fri, 13 Jan 2017 13:28:49 +0000 (13:28 +0000)]
Merge "Fix bad merge"
Andrew Scull [Fri, 13 Jan 2017 13:16:09 +0000 (13:16 +0000)]
resolve merge conflicts of
e4cefbf4fce4 to nyc-dr1-dev
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
Andrew Scull [Fri, 13 Jan 2017 12:18:42 +0000 (12:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
Jorim Jaggi [Fri, 13 Jan 2017 12:00:42 +0000 (13:00 +0100)]
Fix bad merge
Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes:
34227241
Andrei Stingaceanu [Wed, 14 Dec 2016 17:38:19 +0000 (17:38 +0000)]
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
Andrew Scull [Fri, 13 Jan 2017 11:49:17 +0000 (11:49 +0000)]
Merge "Save password metrics on non-FBE devices."
TreeHugger Robot [Fri, 13 Jan 2017 11:44:31 +0000 (11:44 +0000)]
Merge "Remove dependence on SkTRegistry"
Joachim Sauer [Fri, 13 Jan 2017 10:34:55 +0000 (10:34 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a
am:
d05e19954b
Change-Id: I08e6eedff692aa2be86224ffb1869e7a57182db5
Joachim Sauer [Fri, 13 Jan 2017 10:27:05 +0000 (10:27 +0000)]
Merge "Add java.time APIs."
am:
0938b22c0a
Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee
Joachim Sauer [Fri, 13 Jan 2017 10:18:18 +0000 (10:18 +0000)]
Merge "Add java.time APIs."
Michal Karpinski [Fri, 13 Jan 2017 09:58:11 +0000 (09:58 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev am:
54b7388163
am:
3f0307c050
Change-Id: I6ac0f419c6dc2f5ffe03181b15d865930731d07d
Michal Karpinski [Fri, 13 Jan 2017 09:56:58 +0000 (09:56 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism am:
4da4a5d0c8
am:
f27cc410dd
Change-Id: I2762db1be4849841089e43c0adb2868bce3d9551
Michal Karpinski [Fri, 13 Jan 2017 09:51:32 +0000 (09:51 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
am:
54b7388163
Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
Michal Karpinski [Fri, 13 Jan 2017 09:51:27 +0000 (09:51 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism
am:
4da4a5d0c8
Change-Id: I6318392173aeb2653734537569d03158799a099c
Michal Karpinski [Fri, 13 Jan 2017 09:47:21 +0000 (09:47 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
Erik Kline [Fri, 13 Jan 2017 07:18:55 +0000 (07:18 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e
am:
a94e66868c
Change-Id: Ie4d1cf3ef1729fc92de6a209a66e2e1ad386fb32
Erik Kline [Fri, 13 Jan 2017 07:17:47 +0000 (07:17 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6
am:
7340e272c3
Change-Id: Ie5065a8224e392dafc75e9f9cd9e07587e46b814
Erik Kline [Fri, 13 Jan 2017 07:11:47 +0000 (07:11 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
am:
caf62d305e
Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892
Erik Kline [Fri, 13 Jan 2017 07:11:43 +0000 (07:11 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor
am:
fdd4111ef6
Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03
Treehugger Robot [Fri, 13 Jan 2017 07:03:16 +0000 (07:03 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
Winson Chung [Fri, 13 Jan 2017 07:02:46 +0000 (07:02 +0000)]
Merge "Ensure that we always resume task overlay activities if requested."
Keisuke Kuroyanagi [Fri, 13 Jan 2017 06:39:18 +0000 (06:39 +0000)]
Merge "Make selection end handle stick to selection at line end."
Erik Kline [Thu, 12 Jan 2017 08:02:51 +0000 (17:02 +0900)]
Move explicit mobile request handling into UpstreamNetworkMonitor
Also:
- some minor typo fixes
- some minor style fixes
- variable renames for clarity
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- regular (no DUN) wifi tethering to mobile works
- USB tethering with switching between mobile and wifi works
Bug:
32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a
pkanwar [Fri, 13 Jan 2017 03:17:00 +0000 (19:17 -0800)]
DO NOT MERGE: Fix to maintain the Carrier Network connection.
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.
BUG:
30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
Sundeep Ghuman [Thu, 12 Jan 2017 21:48:51 +0000 (13:48 -0800)]
Fix ScoredNetwork: unparcel bundle in toString.
Calling isEmpty will ensure the bundle is unparceled before converting
to a string.
Test: dumped network_score
Change-Id: Icaa4e736af55c6112805a2ce0e829739bbb5b312
Manu Cornet [Fri, 13 Jan 2017 02:42:05 +0000 (02:42 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev am:
2660111259
am:
4c7317373c -s ours
Change-Id: I7054561b72b89871318e17c2948c69a85bd654d5
OSDN Git Service
