OSDN Git Service
Android Build Merger (Role) [Fri, 13 Jan 2017 21:27:22 +0000 (21:27 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
eadd29ffa6" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd
am:
eadd29ffa6
Change-Id: I1147b961e3413d845b4b95e7f2b0c2f6cd10dd65
Android Build Merger (Role) [Fri, 13 Jan 2017 21:26:25 +0000 (21:26 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4" into nyc-mr2-dev-plus-aosp
Andrew Scull [Fri, 13 Jan 2017 21:25:50 +0000 (21:25 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1
am:
9af145dcc4
Change-Id: I15cb7dbf619355f22f27e81aa1465683bac7e619
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
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: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
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
Andrew Scull [Fri, 13 Jan 2017 17:55:21 +0000 (17:55 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c
am:
b2db3761cd
Change-Id: I3d74f6406b76fbc6858a7359bc08f9b563426066
Andrew Scull [Fri, 13 Jan 2017 17:54:22 +0000 (17:54 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969
am:
3aac3ebee1
Change-Id: Idf677426c40799b17d08e0a8ac7dfafc2f2609b2
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
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
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
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: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"
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
Manu Cornet [Fri, 13 Jan 2017 02:36:06 +0000 (02:36 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
am:
2660111259
Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
Manu Cornet [Fri, 13 Jan 2017 02:36:02 +0000 (02:36 +0000)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
am:
da5900d0a7
Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
Chen Xu [Fri, 13 Jan 2017 02:33:24 +0000 (02:33 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd
am:
1d0877f59e
Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
TreeHugger Robot [Fri, 13 Jan 2017 02:31:08 +0000 (02:31 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
Chen Xu [Fri, 13 Jan 2017 02:28:28 +0000 (02:28 +0000)]
Merge "Default Carrier app for traffic mitigation"
am:
4533b1ccdd
Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
Chen Xu [Fri, 13 Jan 2017 02:22:38 +0000 (02:22 +0000)]
Merge "Default Carrier app for traffic mitigation"
Andrew Sapperstein [Fri, 13 Jan 2017 01:21:12 +0000 (17:21 -0800)]
Add logging for high temp warning.
Adds a log line that prints the current and throttling temps
when we decide to show the notification.
Test: manual
Bug:
34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
Philip P. Moltmann [Fri, 13 Jan 2017 01:17:30 +0000 (01:17 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc
am:
331a4bb8d4
Change-Id: I068dcbfcdaffff85379d422a9c53aafe7caa01c2
Philip P. Moltmann [Fri, 13 Jan 2017 01:16:23 +0000 (01:16 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5
am:
889a420a9e
Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015
Philip P. Moltmann [Fri, 13 Jan 2017 01:10:01 +0000 (01:10 +0000)]
Do not write if apply() did not change the file.
am:
1f99f81bdc
Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1
Philip P. Moltmann [Fri, 13 Jan 2017 01:09:03 +0000 (01:09 +0000)]
Only persist last Shared Preferences state
am:
d15c4f1da5
Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
Manu Cornet [Wed, 11 Jan 2017 20:32:54 +0000 (12:32 -0800)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
Bug:
32101881
Test: Checked layout in various situations when switching orientation
Change-Id: Iae1f142f6568890512e24787d78cfb1e15280feb
Manu Cornet [Thu, 12 Jan 2017 23:05:13 +0000 (15:05 -0800)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.
Bug:
33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.
For commit() we need to make sure that we have at least persisted the
state of the commit.
Generation counts are 64 bit, hence they never overflow.
Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug:
33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit
31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)
Manu Cornet [Fri, 13 Jan 2017 00:28:26 +0000 (00:28 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
am:
5ee87b5b6a
Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
Manu Cornet [Fri, 13 Jan 2017 00:28:19 +0000 (00:28 +0000)]
2D Recents: Use a different task dismiss animation
am:
5df7667edb
Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
Manu Cornet [Fri, 13 Jan 2017 00:23:44 +0000 (00:23 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
fionaxu [Wed, 14 Dec 2016 01:15:11 +0000 (17:15 -0800)]
Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
captive portal login
- support carrier customization, OEM could configure a list of carrier
actions to act upon certain signals
- unit test
Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug:
30958215
Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
Robert Greenwalt [Thu, 12 Jan 2017 23:20:45 +0000 (23:20 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641 am:
24dea10375
am:
503d8fbb26
Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
Robert Greenwalt [Thu, 12 Jan 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641
am:
24dea10375
Change-Id: I5091d35ff79eff952c57109ce120369c95309598
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am:
082b118641
Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"
Andrew Sapperstein [Thu, 12 Jan 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
am:
1f2769189d
Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
Chris Wren [Thu, 12 Jan 2017 21:23:11 +0000 (21:23 +0000)]
Create a global registry for system message IDs
am:
117d5b4f28
Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
Andrew Sapperstein [Thu, 12 Jan 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
Andrew Rossignol [Thu, 12 Jan 2017 18:59:56 +0000 (18:59 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
am:
c65a010a39 -s ours
Change-Id: I39efaeb589830e7d448e208d37a079c798477224
Andrew Rossignol [Thu, 12 Jan 2017 18:59:51 +0000 (18:59 +0000)]
Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"
am:
57edeef91a -s ours
Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
Jiaquan He [Thu, 12 Jan 2017 18:56:34 +0000 (18:56 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
am:
5c4c5e1682
Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
Jiaquan He [Thu, 12 Jan 2017 18:56:27 +0000 (18:56 +0000)]
2D Recents: Show shadows behind task views.
am:
15fa3246d8
Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
TreeHugger Robot [Thu, 12 Jan 2017 18:52:38 +0000 (18:52 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
Jiaquan He [Thu, 12 Jan 2017 18:50:06 +0000 (18:50 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
Selim Cinek [Thu, 12 Jan 2017 18:42:41 +0000 (18:42 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
am:
c1c7d1f938
Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
Selim Cinek [Thu, 12 Jan 2017 18:42:32 +0000 (18:42 +0000)]
Fixed a bug where notifications could stay expanded
am:
b2236108ae
Change-Id: I9c776321f0865f6971692008256cd80adbab5469
Selim Cinek [Thu, 12 Jan 2017 18:37:04 +0000 (18:37 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
Bill Yi [Thu, 12 Jan 2017 17:24:45 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
2f9af2aa69 -s ours
Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
Bill Yi [Thu, 12 Jan 2017 17:24:41 +0000 (17:24 +0000)]
Import translations. DO NOT MERGE
am:
50a1d26ac0 -s ours
Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
Bill Yi [Thu, 12 Jan 2017 17:22:54 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
57988f49e6 -s ours
Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
Bill Yi [Thu, 12 Jan 2017 17:22:50 +0000 (17:22 +0000)]
Import translations. DO NOT MERGE
am:
8c90b5ace0 -s ours
Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
TreeHugger Robot [Thu, 12 Jan 2017 17:19:00 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 17:17:46 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Michal Karpinski [Thu, 12 Jan 2017 14:45:01 +0000 (14:45 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism
The full batch will still be available to DPC if there were no
network logs pending.
Added some more debug logging to better investigate the issues.
Test: manual for both cases - pending batch was empty and non-empty,
with locally decreased timeout
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Bug:
34245471
Bug:
29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
Andre Eisenbach [Thu, 12 Jan 2017 16:48:15 +0000 (16:48 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e am:
2d0ad3a9e7
am:
e81838f7e1
Change-Id: I62d424e92e10c1604938349e94ae38938557130c
Andre Eisenbach [Thu, 12 Jan 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e
am:
2d0ad3a9e7
Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
OSDN Git Service
