315517 Commits

Author SHA1 Message Date
Chong Zhang
35af7a8948 MediaCas: address comments for API reviews am: addc39ec27
am: e0c465fefa

Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
2017-04-13 06:43:36 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
2017-04-13 06:32:28 +00:00
Erik Kline
4b7af54762 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca am: 1d3528ba86
am: 23c0170352

Change-Id: I1f99a5fdcf2285a2579610d1eb0a946d21043e3d
2017-04-13 06:25:02 +00:00
Erik Kline
23c0170352 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca
am: 1d3528ba86

Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
2017-04-13 06:18:38 +00:00
Erik Kline
1d3528ba86 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
2017-04-13 06:12:30 +00:00
Erik Kline
1303b8b9ca Merge "Ignore potential SystemProperties errors when setting net.dns"
am: f854c9034c

Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
2017-04-13 06:00:37 +00:00
Lorenzo Colitti
7586a5e4bc Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 am: 997e6b085a
am: 42f7ca684c

Change-Id: I94265917ea58b78c3ee56ee89f99c0af307b7fe2
2017-04-13 05:54:27 +00:00
Treehugger Robot
f854c9034c Merge "Ignore potential SystemProperties errors when setting net.dns" 2017-04-13 05:49:31 +00:00
Lorenzo Colitti
42f7ca684c Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2
am: 997e6b085a

Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
2017-04-13 05:48:37 +00:00
Lorenzo Colitti
997e6b085a Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
2017-04-13 05:37:01 +00:00
Lorenzo Colitti
67401e25c2 Merge "Move some NetworkStats tests to tests/net."
am: ab3901dc8b

Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
2017-04-13 05:29:58 +00:00
Lorenzo Colitti
ab3901dc8b Merge "Move some NetworkStats tests to tests/net." 2017-04-13 05:18:47 +00:00
Daichi Hirono
a5e04889ee Merge "Use Context#startForegroundService in MTP provider" into oc-dev am: 96907e6553
am: 1737e10334

Change-Id: I9eba75fb2af47cccb2bec9d71adc258bb5296ebd
2017-04-13 04:47:53 +00:00
Daichi Hirono
1737e10334 Merge "Use Context#startForegroundService in MTP provider" into oc-dev
am: 96907e6553

Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
2017-04-13 04:42:22 +00:00
TreeHugger Robot
96907e6553 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 2017-04-13 04:36:50 +00:00
Fyodor Kupolov
0c48ce1309 Merge "Report app data fixup and prepare timings" into oc-dev am: 1423ea3a45
am: 9f3cf1a692

Change-Id: I81dfcf98097d356e53994ba7ffaf247618349304
2017-04-13 04:24:51 +00:00
Erik Kline
4edba01eb4 Ignore potential SystemProperties errors when setting net.dns
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
2017-04-13 13:16:22 +09:00
Fyodor Kupolov
9f3cf1a692 Merge "Report app data fixup and prepare timings" into oc-dev
am: 1423ea3a45

Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
2017-04-13 04:13:44 +00:00
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Vladislav Kaznacheev
ee10f27cbe Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc
am: 2679fe4e95

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
2017-04-13 03:57:09 +00:00
Vladislav Kaznacheev
2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc
2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 2017-04-13 03:36:30 +00:00
Jocelyn Dang
6306035a26 Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev am: 78b3b2308c
am: ae624f3f0b

Change-Id: Ibae7b4256adfdf9265d68dffbb5189326342471e
2017-04-13 03:08:46 +00:00
Jocelyn Dang
ae624f3f0b Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
am: 78b3b2308c

Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
2017-04-13 02:58:37 +00:00
Jocelyn Dang
78b3b2308c Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 2017-04-13 02:50:52 +00:00
TreeHugger Robot
63e9903f3d Merge "Address API review for ProxyFileDescriptorCallback" 2017-04-13 02:30:14 +00:00
Sudheer Shanka
911abd9bcf Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev am: 67e802dd5e
am: 012ddf15c7

Change-Id: Ic491c87920519ac0fc04353f62f02a45dc1ba5fc
2017-04-13 02:05:17 +00:00
Sudheer Shanka
012ddf15c7 Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
am: 67e802dd5e

Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
2017-04-13 01:59:13 +00:00
Sudheer Shanka
67e802dd5e Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev 2017-04-13 01:53:32 +00:00
Winson Chung
3ab2d3328e Merge "Fix regression when removing task." into oc-dev am: efbcb0d2cc
am: 67004e209d

Change-Id: I523d86f963a6346edac079abde552e5dff732fb6
2017-04-13 01:48:53 +00:00
Dianne Hackborn
6cdf56764c Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev am: c62f0d7495
am: bea817a712

Change-Id: I58010d9417177fed45d01a5c9498aa38cc3c2566
2017-04-13 01:47:43 +00:00
Winson Chung
67004e209d Merge "Fix regression when removing task." into oc-dev
am: efbcb0d2cc

Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
2017-04-13 01:39:01 +00:00
Dianne Hackborn
bea817a712 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev
am: c62f0d7495

Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
2017-04-13 01:38:01 +00:00
TreeHugger Robot
efbcb0d2cc Merge "Fix regression when removing task." into oc-dev 2017-04-13 01:29:31 +00:00
TreeHugger Robot
c62f0d7495 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev 2017-04-13 01:27:53 +00:00
Salvador Martinez
fe169d9a0e Merge "Added strings for thermal shutdown warning" into oc-dev am: dc52fd3168
am: 37393f92f3

Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866
2017-04-13 01:11:25 +00:00
Salvador Martinez
37393f92f3 Merge "Added strings for thermal shutdown warning" into oc-dev
am: dc52fd3168

Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
2017-04-13 01:01:35 +00:00
Wale Ogunwale
23e60637ea Merge "Dump controller for AppWindowToken" into oc-dev am: b74567dd3b
am: 651a2970e6

Change-Id: I1b116104494c3c3797c9a6d6277e6ae668f5d232
2017-04-13 00:58:29 +00:00
Wale Ogunwale
5f9af8362b Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev am: 343cf6e920
am: c1cb7039b1

Change-Id: I7367e0f6b347c957ce6a6439c31ab657876930c2
2017-04-13 00:57:31 +00:00
TreeHugger Robot
dc52fd3168 Merge "Added strings for thermal shutdown warning" into oc-dev 2017-04-13 00:51:25 +00:00
Wale Ogunwale
651a2970e6 Merge "Dump controller for AppWindowToken" into oc-dev
am: b74567dd3b

Change-Id: I1c166eb1c7ad36396d7a463549d0ab1f9daebb61
2017-04-13 00:49:12 +00:00
Wale Ogunwale
c1cb7039b1 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
am: 343cf6e920

Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d
2017-04-13 00:48:06 +00:00
TreeHugger Robot
b74567dd3b Merge "Dump controller for AppWindowToken" into oc-dev 2017-04-13 00:43:42 +00:00
Wale Ogunwale
343cf6e920 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev 2017-04-13 00:39:16 +00:00
Wale Ogunwale
919a05d4a3 Revert "Ensure visible activities when device is unlocked."
Causes issues with window life-cycle...

Bug: 37119770
Bug: 37244415
Bug: 37281544
This reverts commit 7004a8801d0a60013681a86043bab74b4d42d680.

Change-Id: I0039db6e44488cd82ef745aa979bc8549fd8aeed
2017-04-13 00:36:34 +00:00
TreeHugger Robot
2cafa2db05 Merge "Remove support for auto-paging of cursors." 2017-04-13 00:32:05 +00:00
Chad Brubaker
9e6bb31110 Merge "Expose more settings to Instant Apps" into oc-dev am: 055b51af28
am: a927a8c3ba

Change-Id: I3224b23298ad06cd6a75ae1a5d96f0690c7bccf3
2017-04-13 00:22:49 +00:00
Evan Rosky
dc4792c10e Merge "Fix focus ordering with duplicate ids" into oc-dev am: a0ce440d60
am: 33f6bcb71d

Change-Id: I06f4cc41131ca82c6bfb75fcd174741589d936a4
2017-04-13 00:19:06 +00:00
Chad Brubaker
a927a8c3ba Merge "Expose more settings to Instant Apps" into oc-dev
am: 055b51af28

Change-Id: I1bddeffc290009c2ebf34168dc9ba8b69fe81e98
2017-04-13 00:11:16 +00:00
Evan Rosky
33f6bcb71d Merge "Fix focus ordering with duplicate ids" into oc-dev
am: a0ce440d60

Change-Id: I05050c7d2078a21f86a096ebc65bc2d6d8b4aa6a
2017-04-13 00:06:42 +00:00