Android Build Merger (Role)
e691e4ff56
Merge "Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8" into nyc-mr2-dev-plus-aosp am: 7e789f3f5c"
2016-12-08 17:24:12 +00:00
Bill Yi
5966efe1cd
Import translations. DO NOT MERGE am: ef89f62670 -s ours
...
am: 42318626f2
2016-12-08 17:23:55 +00:00
Android Build Merger (Role)
e4fe7f6e7d
Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8 am: 6a6516c57e"
2016-12-08 17:23:48 +00:00
Svetoslav Ganov
7f8f7da7d2
Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8" into nyc-mr2-dev-plus-aosp
...
am: 7e789f3f5c
2016-12-08 17:22:57 +00:00
Bill Yi
42c2cbf5c3
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours
...
am: f7a5a3b0ce
2016-12-08 17:22:52 +00:00
Svetoslav Ganov
5a76e8aec9
Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8
...
am: 6a6516c57e
2016-12-08 17:22:46 +00:00
Android Build Merger (Role)
93c495b2c4
Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 6023fd1800 am: 61705a3e64 -s ours"
2016-12-08 17:22:14 +00:00
Bill Yi
ec97386557
Import translations. DO NOT MERGE am: d4bdbc314b -s ours
...
am: d47bc2f25c
2016-12-08 17:21:50 +00:00
Tyler Gunn
a7a96d1563
Merge "Add carrier configuration options to allow enforcing max conference size."
2016-12-08 17:21:38 +00:00
Svetoslav Ganov
03cbddb668
Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 6023fd1800
...
am: 61705a3e64
2016-12-08 17:21:28 +00:00
Bill Yi
0c985d8957
Import translations. DO NOT MERGE am: ef89f62670 -s ours
...
am: ec82e05e7b
2016-12-08 17:19:00 +00:00
Bill Yi
237edac526
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours
...
am: 19e2b518ff
2016-12-08 17:17:59 +00:00
Bill Yi
ec69ea62ad
Import translations. DO NOT MERGE am: d4bdbc314b -s ours
...
am: c52c508e8c
2016-12-08 17:16:52 +00:00
Bill Yi
462d9a3335
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: c0b7e766b0
2016-12-08 17:16:51 +00:00
Bill Yi
f1a5ffbf99
Import translations. DO NOT MERGE
...
am: b004945727
2016-12-08 17:16:49 +00:00
Bill Yi
d6c831513f
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: c0b7e766b0
2016-12-08 17:16:41 +00:00
Bill Yi
6919758aba
Import translations. DO NOT MERGE
...
am: b004945727
2016-12-08 17:16:37 +00:00
Bill Yi
f014d755a1
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: e1add91fa1
2016-12-08 17:15:12 +00:00
Bill Yi
a40b64efdd
Import translations. DO NOT MERGE
...
am: c30efc0214
2016-12-08 17:15:09 +00:00
Bill Yi
f0ed05f4b7
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: e1add91fa1
2016-12-08 17:15:00 +00:00
Bill Yi
3831df7485
Import translations. DO NOT MERGE
...
am: c30efc0214
2016-12-08 17:14:54 +00:00
Bill Yi
a62eff1f94
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 7e212ae873
2016-12-08 17:13:32 +00:00
Bill Yi
83810d0665
Import translations. DO NOT MERGE
...
am: c300be1cf4
2016-12-08 17:13:31 +00:00
Bill Yi
71398a5624
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 7e212ae873
2016-12-08 17:13:22 +00:00
Bill Yi
e7aa31539d
Import translations. DO NOT MERGE
...
am: c300be1cf4
2016-12-08 17:13:17 +00:00
Bill Yi
217e5fc476
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: df9a47a79f
2016-12-08 17:12:00 +00:00
Bill Yi
ec82e05e7b
Import translations. DO NOT MERGE
...
am: ef89f62670
2016-12-08 17:11:59 +00:00
Bill Yi
ceb0716eba
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: df9a47a79f
2016-12-08 17:11:44 +00:00
Bill Yi
42318626f2
Import translations. DO NOT MERGE
...
am: ef89f62670
2016-12-08 17:11:41 +00:00
Bill Yi
f7a5a3b0ce
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 3c54cdf15e
2016-12-08 17:10:13 +00:00
Bill Yi
d47bc2f25c
Import translations. DO NOT MERGE
...
am: d4bdbc314b
2016-12-08 17:10:06 +00:00
Bill Yi
19e2b518ff
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 3c54cdf15e
2016-12-08 17:08:12 +00:00
Bill Yi
c52c508e8c
Import translations. DO NOT MERGE
...
am: d4bdbc314b
2016-12-08 17:08:10 +00:00
Aart Bik
2e52bbbf96
Merge "Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 116a4e883d" into nyc-mr2-dev-plus-aosp
...
am: 2e0e9363ac
2016-12-08 17:05:39 +00:00
Aart Bik
9ebb477644
Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 116a4e883d
...
am: 7df8a6dbf3
2016-12-08 17:05:28 +00:00
Aart Bik
1be3422c36
Revert "Fix vulnerability in MemoryIntArray" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793 am: 7eb917d5eb
...
am: a0c8b340be
2016-12-08 17:04:03 +00:00
TreeHugger Robot
c0b7e766b0
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-12-08 17:00:40 +00:00
TreeHugger Robot
e1add91fa1
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-12-08 17:00:14 +00:00
TreeHugger Robot
7e212ae873
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-12-08 16:59:47 +00:00
TreeHugger Robot
df9a47a79f
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-12-08 16:59:19 +00:00
TreeHugger Robot
3c54cdf15e
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-12-08 16:58:52 +00:00
Jason Monk
9abca5e9f8
Cleanup and refactoring of test utilities
...
- Make leak checking faster by converting to fakes
- Requires making clean interfaces for all CallbackControllers
- Integrate leak checking into the TestableContext
Test: runtest systemui
Change-Id: Ic57a06360d01a0323ef26735a543e9d1805459e2
2016-12-08 11:41:59 -05:00
Adrian Roos
a91407f65b
Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev am: 1e1d5b07a6
...
am: c1afd37135
2016-12-08 16:27:07 +00:00
Adrian Roos
077396733a
EmergencyCryptkeeperText: Make sure we update if airplane mode changes am: 72abcdaec7
...
am: 889c64a30b
2016-12-08 16:26:03 +00:00
Svetoslav Ganov
d1002aede0
Merge "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53" into nyc-mr2-dev-plus-aosp
...
am: b7e7eb2e0f
2016-12-08 16:24:23 +00:00
Svetoslav Ganov
93fabcf7df
Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53
...
am: 5c465313aa
2016-12-08 16:24:17 +00:00
Svetoslav Ganov
53a0ba667c
Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 63499946b0
...
am: cd92cc49d2
2016-12-08 16:22:49 +00:00
TreeHugger Robot
2add99d066
Merge "LayoutInflaterBuilder helper in systemui util"
2016-12-08 16:18:16 +00:00
Jeff Sharkey
c98c7bccdc
Prepare to move dexopt calls to Binder.
...
Since InstallerConnection is about to be replaced by a new installd
Binder interface, this change moves OtaDexoptService to override and
manually cook up the 'dexopt' command line that it expects to collect
from PackageDexOptimizer.
Since OtaDexoptService is designed to be run in isolation, add a new
mode to Installer which ignores calls that aren't being intercepted.
Also moves to a single dexopt() method instead of having overloads.
Test: builds, boots, fake OTA works
Bug: 13758960, 30944031
Change-Id: I3a6a115289f1542d6df3e2993b9720118b7d1e8d
2016-12-08 09:11:50 -07:00
Tobias Thierer
9fa05c25c9
API changes for updating Locale to OpenJDK8u60, part 2
...
This adds APIs for RFC 4647 Matching of Language Tags
Bug: 29935305
Test: make update-api
Change-Id: I58fc9481578a63ecd9528a62377fa9414cc836d4
2016-12-08 15:43:37 +00:00
