OSDN Git Service
Chen Xu [Wed, 19 Jul 2017 03:17:53 +0000 (03:17 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev am:
068397a319
am:
47208e2cf5
Change-Id: I3d2af92b69f3a5736323900c27dcecc096eb1ab7
Chen Xu [Wed, 19 Jul 2017 03:12:33 +0000 (03:12 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am:
068397a319
Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
Chen Xu [Wed, 19 Jul 2017 03:06:01 +0000 (03:06 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
Steven Moreland [Wed, 19 Jul 2017 02:46:48 +0000 (02:46 +0000)]
Reference nativehelper/jni.h as jni.h am:
d82cdb4624 am:
6b9d4b76ae
am:
8e9b7efefd
Change-Id: I50143a02c35a9924e77afcbe5b70564058c3ed3e
Steven Moreland [Wed, 19 Jul 2017 02:41:21 +0000 (02:41 +0000)]
Reference nativehelper/jni.h as jni.h am:
d82cdb4624
am:
6b9d4b76ae
Change-Id: I27f7f300b0a4e3d8d8d150e7902ed2763b442a4b
Steven Moreland [Wed, 19 Jul 2017 02:36:09 +0000 (02:36 +0000)]
Reference nativehelper/jni.h as jni.h
am:
d82cdb4624
Change-Id: I0c83f089c388f2e967323a0e74a8582904cb4cbd
TreeHugger Robot [Wed, 19 Jul 2017 02:36:04 +0000 (02:36 +0000)]
Merge "Appease the static analyzer"
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
TreeHugger Robot [Wed, 19 Jul 2017 02:25:23 +0000 (02:25 +0000)]
Merge "IP metrics: update link layer mapping"
TreeHugger Robot [Wed, 19 Jul 2017 02:18:58 +0000 (02:18 +0000)]
Merge "Remove references to (unused) colortables"
Phil Weaver [Wed, 19 Jul 2017 01:43:42 +0000 (01:43 +0000)]
Merge "Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp am:
6ba27f079f" into oc-dr1-dev-plus-aosp
am:
db39f87386
Change-Id: Iee216425127540370783e43d40d85066f7212ef0
Phil Weaver [Wed, 19 Jul 2017 01:33:12 +0000 (01:33 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d am:
cbc1e6afe9" into oc-dr1-dev-plus-aosp
am:
91a658cd50
Change-Id: I2cb94c91a850a7edd4700664c169ca7f16bd74ee
Hugo Benichi [Wed, 19 Jul 2017 01:31:28 +0000 (01:31 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b am:
361162b636 am:
fe88fa947e
am:
93c5a4b389
Change-Id: I7c66b30f5f7961900c3b5a5baf0c14644cbcb69e
Android Build Merger (Role) [Wed, 19 Jul 2017 01:29:37 +0000 (01:29 +0000)]
Merge "Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp am:
6ba27f079f" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:28:07 +0000 (01:28 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp
am:
6ba27f079f
Change-Id: Ifcce5af8b05a67ea61688d059a397021fdc7517b
Android Build Merger (Role) [Wed, 19 Jul 2017 01:25:53 +0000 (01:25 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d am:
cbc1e6afe9" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:24:21 +0000 (01:24 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d
am:
cbc1e6afe9
Change-Id: Id52ab73ff87b5045bd3ccebd93343cf18712bfb1
Hugo Benichi [Wed, 19 Jul 2017 01:22:59 +0000 (01:22 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b am:
361162b636
am:
fe88fa947e
Change-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe
TreeHugger Robot [Wed, 19 Jul 2017 01:22:49 +0000 (01:22 +0000)]
Merge "WebView: remove @Nullable from SB whitelist"
Android Build Merger (Role) [Wed, 19 Jul 2017 01:19:41 +0000 (01:19 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:19:03 +0000 (01:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: If720a3669b9d04ea115609bac0e1e60d5a7bc291
Phil Weaver [Wed, 19 Jul 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: I15d2da6b1acf1eb2b6b5126d04dd67274e7230fb
Hugo Benichi [Wed, 19 Jul 2017 01:15:12 +0000 (01:15 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b
am:
361162b636
Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b
Phil Weaver [Wed, 19 Jul 2017 01:13:43 +0000 (01:13 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8 am:
ad737afc4c" into oc-dr1-dev-plus-aosp
am:
ca624861a6
Change-Id: Ia89b9c08534a5dedc96c252150f1433842c1372d
TreeHugger Robot [Wed, 19 Jul 2017 01:11:19 +0000 (01:11 +0000)]
Merge "Revert "lowpan: Introduce new unit tests for data classes""
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028
am:
72c56fb84a -s ours
Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3
Phil Weaver [Wed, 19 Jul 2017 01:09:12 +0000 (01:09 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev am:
54cf73ebd9
am:
fd239ec334
Change-Id: I676955f1bbd6136558fd29dfd89ecf448bfa22e1
Hugo Benichi [Wed, 19 Jul 2017 01:06:59 +0000 (01:06 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
am:
2627d4856b
Change-Id: I087aee995858ae898f5d660c11552724a07503c3
Romain Guy [Wed, 19 Jul 2017 01:06:34 +0000 (01:06 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev am:
e00bcc0fef
am:
5a92a6e074
Change-Id: Iab42acc209b1fb31d56971eb69b0140eb99e227b
Android Build Merger (Role) [Wed, 19 Jul 2017 01:05:36 +0000 (01:05 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8 am:
ad737afc4c" into oc-dr1-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:04:15 +0000 (01:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8
am:
ad737afc4c
Change-Id: I9a9f962ec81d72e3432d4c6b71e99db3279b78d8
TreeHugger Robot [Wed, 19 Jul 2017 01:02:32 +0000 (01:02 +0000)]
Merge "Cache VectorDrawables in an atlas"
Phil Weaver [Wed, 19 Jul 2017 01:02:01 +0000 (01:02 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev
am:
54cf73ebd9
Change-Id: Ib6dab0953e81ce350e08fbe70df86e836d58a2c1
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d
am:
a84f7a3028
Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1
Romain Guy [Wed, 19 Jul 2017 01:00:13 +0000 (01:00 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
am:
e00bcc0fef
Change-Id: I300fa41c30c64f22c47d164f3b6d6d698e34302f
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Android Build Merger (Role) [Wed, 19 Jul 2017 00:56:36 +0000 (00:56 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 00:55:42 +0000 (00:55 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
am:
4a1dc3458d
Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768
Phil Weaver [Wed, 19 Jul 2017 00:52:23 +0000 (00:52 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I91ec75b1c21fc278c2bb723cf791cae1e94f52ec
Phil Weaver [Wed, 19 Jul 2017 00:47:59 +0000 (00:47 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I1601d89e5c39e68361b03dff475f312d0e7fc22e
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5
am:
d761dad216
Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0
fionaxu [Fri, 23 Jun 2017 01:14:23 +0000 (18:14 -0700)]
initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug:
36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a
am:
2da30457c5
Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091
The Android Automerger [Wed, 19 Jul 2017 00:27:08 +0000 (00:27 +0000)]
Manually merge commit '
530b93aae428'
* commit '
530b93aae428':
NetworkCapabilities: Unhide TRANSPORT_LOWPAN
BUG:
31038431
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3
am:
edbe4bd86a
Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade
Shubham Ajmera [Wed, 19 Jul 2017 00:21:57 +0000 (00:21 +0000)]
Merge "Fix: handle null value for packageUsageInfo while deciding unused apps"
George Burgess IV [Tue, 18 Jul 2017 23:28:28 +0000 (16:28 -0700)]
Appease the static analyzer
Since the static analyzer assumes that
`head == blockToRemove && blockToRemove->prevBlock == nullptr` may be
true, it complains that we're deleting `head` and returning `head`
shortly afterward.
Assert (without assertions, since -DNDEBUG is passed) that this isn't
the case.
Bug:
27101951
Test: mma. Warning is gone.
Change-Id: I33e98eec7b293fcf0d8826f89c287a3b870758f2
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548
am:
afdcad0df3
Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours
am:
9e39e1e548
Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f
Billy Lam [Wed, 19 Jul 2017 00:01:00 +0000 (00:01 +0000)]
Merge "Merge "GC in heapDumpFinished to cleanup hprof fd" am:
f126c41de7 am:
8e82bc9961 am:
c3cc786404" into oc-dr1-dev-plus-aosp
am:
925a55c957
Change-Id: I192765b70d64a87c35d71b13e15c7ac052a99cf8
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4
am:
996bc6bc12 -s ours
Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819
Roozbeh Pournader [Tue, 18 Jul 2017 23:55:32 +0000 (23:55 +0000)]
Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev am:
d5b776c721
am:
de8185aa2f
Change-Id: Ia7660a91d958ae4d2a12735f7446bbaac860e5dc
Android Build Merger (Role) [Tue, 18 Jul 2017 23:52:59 +0000 (23:52 +0000)]
Merge "Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22 am:
6b0e6946c3 am:
dbc78509ae" into oc-dr1-dev-plus-aosp
Robert Quattlebaum [Tue, 18 Jul 2017 23:51:04 +0000 (23:51 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22 am:
6b0e6946c3
am:
dbc78509ae
Change-Id: I017036f8c63ea1e9c1934daad55ef087b3a83012
Android Build Merger (Role) [Tue, 18 Jul 2017 23:50:41 +0000 (23:50 +0000)]
Merge "Merge "GC in heapDumpFinished to cleanup hprof fd" am:
f126c41de7 am:
8e82bc9961 am:
c3cc786404" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Tue, 18 Jul 2017 23:49:38 +0000 (23:49 +0000)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master am:
8228eb3446 am:
6a5fe34edf -s ours
am:
9e06896a03 -s ours
Change-Id: I81cbf2347d4660f3bd8978730e2222934c235b02
Billy Lam [Tue, 18 Jul 2017 23:49:35 +0000 (23:49 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd" am:
f126c41de7 am:
8e82bc9961
am:
c3cc786404
Change-Id: I5b23033e5481778e1e9f7d95a341bab985f6fa43
Roozbeh Pournader [Tue, 18 Jul 2017 23:48:47 +0000 (23:48 +0000)]
Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev
am:
d5b776c721
Change-Id: I1d1cf56a6bda1cd23a422aeb0dd0a720044f4f46
Lorenzo Colitti [Tue, 18 Jul 2017 23:44:17 +0000 (23:44 +0000)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master am:
8228eb3446
am:
6a5fe34edf -s ours
Change-Id: Ie520e145c7c97841ac36970c62633962eed8b30b
Robert Quattlebaum [Tue, 18 Jul 2017 23:43:46 +0000 (23:43 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22
am:
6b0e6946c3
Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8
Billy Lam [Tue, 18 Jul 2017 23:42:13 +0000 (23:42 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd" am:
f126c41de7
am:
8e82bc9961
Change-Id: I4b9ecfcbe0e3757615ef4eca7602e4bf066a25e5
Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714
am:
9625d164e4
Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1
Christine Franks [Tue, 18 Jul 2017 23:40:43 +0000 (23:40 +0000)]
Merge "Disable lock screen by default for demo users" into oc-dr1-dev am:
205585e574
am:
6b43433062
Change-Id: I9e00e9e2771ba8c2a271c12e8213debbca96b9aa
Lorenzo Colitti [Tue, 18 Jul 2017 23:37:57 +0000 (23:37 +0000)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master
am:
8228eb3446
Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72
Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56
am:
0ddd7e4714
Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
TreeHugger Robot [Tue, 18 Jul 2017 23:35:19 +0000 (23:35 +0000)]
Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev
Robert Quattlebaum [Tue, 18 Jul 2017 23:33:08 +0000 (23:33 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am:
777c408a22
Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
Nate Fischer [Tue, 18 Jul 2017 23:08:42 +0000 (16:08 -0700)]
WebView: remove @Nullable from SB whitelist
This removes the @Nullable annotation from
WebView#setSafeBrowsingWhitelist's List parameter. This does not need to
be Nullable, since the whitelist can be unset just as easily by passing
an empty list.
Bug:
63084528
Test: N/A
Change-Id: Ica9d67bc907b16e89d0a1b6a15d91e21f74cc4c9
Billy Lam [Tue, 18 Jul 2017 23:30:46 +0000 (23:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
am:
f126c41de7
Change-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0
Christine Franks [Tue, 18 Jul 2017 23:30:29 +0000 (23:30 +0000)]
Merge "Disable lock screen by default for demo users" into oc-dr1-dev
am:
205585e574
Change-Id: I05eeee1b997916e0f8fa86614aaac3d0e395a35c
Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
am:
093c7a8e56
Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
Calin Juravle [Tue, 18 Jul 2017 23:20:33 +0000 (23:20 +0000)]
Merge "Record dex files users in the dex-usage list"
Christine Franks [Tue, 18 Jul 2017 23:18:40 +0000 (23:18 +0000)]
Merge "Disable lock screen by default for demo users" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 23:16:57 +0000 (23:16 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd am:
80c2eeedbb am:
f947a122cb
am:
68bedb0335
Change-Id: I345e6eca8fde61b18e92113558d9169bdc98a4e0
Selim Cinek [Tue, 18 Jul 2017 23:14:48 +0000 (23:14 +0000)]
Merge "Merge "Fixed the text alignment with RTL text" into oc-dr1-dev am:
198218809e" into oc-dr1-dev-plus-aosp
am:
43f989234d
Change-Id: Id4b3af10ed5ccbd1eefbd2c735c66ac38962319f
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
Phil Weaver [Tue, 18 Jul 2017 23:07:45 +0000 (23:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852 am:
fd3f7f3d71
am:
77d4198346
Change-Id: Ia6b5d1df7fbbcc5f5e8aabcbe41f9f9341cbc382
Phil Weaver [Tue, 18 Jul 2017 23:03:13 +0000 (23:03 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd am:
80c2eeedbb am:
40f47253fd
am:
727f27e661
Change-Id: I386817277f9280067b2de25bf51683ab86b792b1
Stan Iliev [Thu, 23 Mar 2017 20:56:51 +0000 (16:56 -0400)]
Cache VectorDrawables in an atlas
Optimize VectorDrawables for Skia pipeline: draw small VectorDrawables
in a GPU atlas instead of seprate offscreen buffers.
This implementation is using CacheManger and allows for the atlas to
be released if there is a memory pressure.
Test: A new unit test for VectorDrawableAtlas is passing. Systrace shows
0.5ms faster DrawFrame for fling in Settings app main screen.
Change-Id: Ide3884eefae777e1547f1dfdb67b807185839fb4
Phil Weaver [Tue, 18 Jul 2017 22:56:44 +0000 (22:56 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd am:
80c2eeedbb
am:
f947a122cb
Change-Id: Iaa193ad64cee5d2d7f843d0b5ce4626035ebc090
Android Build Merger (Role) [Tue, 18 Jul 2017 22:53:52 +0000 (22:53 +0000)]
Merge "Merge "DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
ad09c7e7d0" into oc-dr1-dev-plus-aosp am:
1ccec78121"
Android Build Merger (Role) [Tue, 18 Jul 2017 22:53:48 +0000 (22:53 +0000)]
Merge "Merge "Fixed the text alignment with RTL text" into oc-dr1-dev am:
198218809e" into oc-dr1-dev-plus-aosp
Selim Cinek [Tue, 18 Jul 2017 22:50:31 +0000 (22:50 +0000)]
Merge "Fixed the text alignment with RTL text" into oc-dr1-dev
am:
198218809e
Change-Id: If4addbc49a299fbee7ccb23f84852897269475d3
Romain Guy [Tue, 18 Jul 2017 22:42:06 +0000 (15:42 -0700)]
Put generated/compiled graphics code in getCodeCacheDir()
A refactoring introduced a slight regression that caused compiled
shaders to be cached in the wrong directory.
Bug:
63813783
Test: Manual
Change-Id: I863e584ff1df4cda9242c64afd643a899023ee1c
Phil Weaver [Tue, 18 Jul 2017 22:45:45 +0000 (22:45 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852
am:
fd3f7f3d71
Change-Id: I55a55467111057f2e136b0c59d5d24ae23bf2578
Phil Weaver [Tue, 18 Jul 2017 22:44:52 +0000 (22:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
ad09c7e7d0" into oc-dr1-dev-plus-aosp
am:
1ccec78121
Change-Id: I539d83d710a1814dcf93fd0a8a5e782d82c4ca88
Android Build Merger (Role) [Tue, 18 Jul 2017 22:44:03 +0000 (22:44 +0000)]
Merge "Merge "Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852 am:
412614bcdf" into oc-dr1-dev-plus-aosp am:
3f16f7bf51"
Selim Cinek [Tue, 18 Jul 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Fixed the text alignment with RTL text" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 22:43:02 +0000 (22:43 +0000)]
Merge "Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852 am:
412614bcdf" into oc-dr1-dev-plus-aosp
am:
3f16f7bf51
Change-Id: I169e9cbf7656a1f0ef3e51f754c622ad7243abe7
Android Build Merger (Role) [Tue, 18 Jul 2017 22:42:12 +0000 (22:42 +0000)]
Phil Weaver [Tue, 18 Jul 2017 22:41:23 +0000 (22:41 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd am:
80c2eeedbb
am:
40f47253fd
Change-Id: I8031af47f1d2a55a0ea2fd73cd782ca80ecd6cea
Phil Weaver [Tue, 18 Jul 2017 22:41:14 +0000 (22:41 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018 am:
3700014be0 am:
b086ea50bb
am:
d88cf7f597
Change-Id: I3a39d335642d29d274d5c0101c717a03ea6f3759
Android Build Merger (Role) [Tue, 18 Jul 2017 22:40:48 +0000 (22:40 +0000)]
Merge "Merge "Launch NetD in a different thread" am:
c721dce3fc am:
709f3c1d46 am:
cd3633fc01 am:
d122f4e811"
nharold [Tue, 18 Jul 2017 22:39:38 +0000 (22:39 +0000)]
Merge "Launch NetD in a different thread" am:
c721dce3fc am:
709f3c1d46 am:
cd3633fc01
am:
d122f4e811
Change-Id: I64abc4069121180f873906d6e30035aec139b612
Android Build Merger (Role) [Tue, 18 Jul 2017 22:38:53 +0000 (22:38 +0000)]
TreeHugger Robot [Tue, 18 Jul 2017 22:37:28 +0000 (22:37 +0000)]
Merge "AAPT2: Parse artifact names from template."
Phil Weaver [Tue, 18 Jul 2017 22:37:10 +0000 (22:37 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
2b57d28b4c
am:
05ce47aa25
Change-Id: I8f1bd0568b423511c5463f3216fc77c1b5d832f0
OSDN Git Service
