Commit Graph

445265 Commits

Author SHA1 Message Date
Ned Burns
bcdc643704 Merge "Add basic initializer for new notification pipeline" 2019-09-25 19:26:16 +00:00
TreeHugger Robot
fe638b220c Merge "Statsd unit tests: clear data on disk after tests" 2019-09-25 19:10:40 +00:00
Ricky Wai
2fb1f3b006 Merge "Do not return synthetic launcher activity for completely headless apps" am: 835504011f am: ede2e771f5 am: 125fa919fa
am: 2736876f48

Change-Id: I57c52b7c92d499f79b3c7e41a2035031fa35932f
2019-09-25 11:47:45 -07:00
TreeHugger Robot
be0f335f5a Merge "Whitelist packages for user types" 2019-09-25 18:45:13 +00:00
Android Build Merger (Role)
4591d1d425 Merge "Merge "Use APEX boot image for profilebootclasspath" am: 0726986b7c am: d10fe94410 am: 572ba49fd3 am: 9051b2d6c0" 2019-09-25 18:43:21 +00:00
TreeHugger Robot
d6fa3a49d1 Merge "Use res value for max bubbles & elevation" 2019-09-25 18:43:11 +00:00
Mathieu Chartier
5de75e749d Merge "Use APEX boot image for profilebootclasspath" am: 0726986b7c am: d10fe94410 am: 572ba49fd3
am: 9051b2d6c0

Change-Id: Ifddb243151e4cccc29d332564133a7008c8958a3
2019-09-25 11:42:36 -07:00
Philip P. Moltmann
b60166813c Merge "Put package name in extra not data" into qt-qpr1-dev am: f94fa065d1
am: f33b6733c7

Change-Id: I30c6056d3e99addaae9b27046b1bbcbd74fe2f86
2019-09-25 11:39:34 -07:00
Evan Laird
d0d5257baa [automerger skipped] Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev am: 99c07af2bf
am: bf54f5ec8b -s ours
am skip reason: subject contains skip directive

Change-Id: Icc982cf37d14446ad0a988bcf46def7b7387d56b
2019-09-25 11:36:45 -07:00
Ricky Wai
2736876f48 Merge "Do not return synthetic launcher activity for completely headless apps" am: 835504011f am: ede2e771f5
am: 125fa919fa

Change-Id: Ia2d681d6539246a9611e72a66d97c8b3eabb59c2
2019-09-25 11:32:43 -07:00
Evan Laird
60679929e2 [automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: 83c87e50b1
am: e9644676ca -s ours
am skip reason: subject contains skip directive

Change-Id: If80d093b4083a4d98b7ef528012827c3a29f4d8c
2019-09-25 11:32:42 -07:00
Mathieu Chartier
9051b2d6c0 Merge "Use APEX boot image for profilebootclasspath" am: 0726986b7c am: d10fe94410
am: 572ba49fd3

Change-Id: Id9100b957171921dedb9c798d94712e3dd872190
2019-09-25 11:27:40 -07:00
Philip P. Moltmann
f33b6733c7 Merge "Put package name in extra not data" into qt-qpr1-dev
am: f94fa065d1

Change-Id: I56a380f33f454a6aa575a2029cdcceb4470ec89b
2019-09-25 11:24:00 -07:00
Ricky Wai
125fa919fa Merge "Do not return synthetic launcher activity for completely headless apps" am: 835504011f
am: ede2e771f5

Change-Id: I8fc9ed53ec1441411df4a377288e285870815c3a
2019-09-25 11:23:35 -07:00
Evan Laird
bf54f5ec8b Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev
am: 99c07af2bf

Change-Id: I83e8d4e286a5c9e36cafdf537cee31bf0df40657
2019-09-25 11:19:46 -07:00
Evan Laird
e9644676ca DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
am: 83c87e50b1

Change-Id: I8b50847dc8d6150f89d51f52494eb328b4b62f28
2019-09-25 11:19:45 -07:00
Mathieu Chartier
572ba49fd3 Merge "Use APEX boot image for profilebootclasspath" am: 0726986b7c
am: d10fe94410

Change-Id: If36eebf790e97f102667afd5075597844c29e229
2019-09-25 11:19:41 -07:00
Chandan Nath
c4303bdabd Merge "Route backup data through IntermediateEncryptingTransport" 2019-09-25 18:18:28 +00:00
TreeHugger Robot
abb482017a Merge "ProtoLog improvements" 2019-09-25 18:15:04 +00:00
Ricky Wai
ede2e771f5 Merge "Do not return synthetic launcher activity for completely headless apps"
am: 835504011f

Change-Id: I6f3a7ad712fb73c3ec0983dc4ea8bbd11ae4e56c
2019-09-25 11:12:40 -07:00
Mathieu Chartier
d10fe94410 Merge "Use APEX boot image for profilebootclasspath"
am: 0726986b7c

Change-Id: Ia2750e553a0e8e1f019b5fce57dc5817231f9461
2019-09-25 11:06:10 -07:00
Long Ling
db41b79282 Merge "Move AmbientFilter from whitebalance to utils" 2019-09-25 18:04:00 +00:00
Philip P. Moltmann
f94fa065d1 Merge "Put package name in extra not data" into qt-qpr1-dev 2019-09-25 18:02:16 +00:00
Android Build Merger (Role)
d015b0d4c1 Merge "[automerger skipped] Merge "Remove MediaPlayer2" am: 2e51cefc7e am: 068d3c7ec3 am: 41d2d5417f am: c190b7cdca -s ours am skip reason: change_id I1550c14f3a0967910809cc2415d10f62c967bd44 with SHA1 a9a802f976 is in history" 2019-09-25 18:01:58 +00:00
Marco Nelissen
f80131d207 [automerger skipped] Merge "Remove MediaPlayer2" am: 2e51cefc7e am: 068d3c7ec3 am: 41d2d5417f
am: c190b7cdca -s ours
am skip reason: change_id I1550c14f3a0967910809cc2415d10f62c967bd44 with SHA1 a9a802f976 is in history

Change-Id: I967232d362143f04f68ee79bdcc73397eb1e309a
2019-09-25 11:00:49 -07:00
TreeHugger Robot
8722d7db1a Merge "Parse /proc/pid/status for memory only once" 2019-09-25 18:00:43 +00:00
Eric Holk
4a8970e861 Merge "Refactor DexViewBuilder" am: f5617abe09 am: 0ea5d04aff am: 75f7f68128
am: 17a198c638

Change-Id: I1bb9f0d43a6a3e8324dffe4f905404ca8c453bb4
2019-09-25 10:58:55 -07:00
TreeHugger Robot
99c07af2bf Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev 2019-09-25 17:57:10 +00:00
Treehugger Robot
835504011f Merge "Do not return synthetic launcher activity for completely headless apps" 2019-09-25 17:52:37 +00:00
Marco Nelissen
c190b7cdca Merge "Remove MediaPlayer2" am: 2e51cefc7e am: 068d3c7ec3
am: 41d2d5417f

Change-Id: Ia51017c7741a771452bc7942bb84f1e661988b2d
2019-09-25 10:48:02 -07:00
Ned Burns
0ac7555beb Merge "Fix NPE when updating rankings for pending notifs" 2019-09-25 17:45:44 +00:00
Eric Holk
17a198c638 Merge "Refactor DexViewBuilder" am: f5617abe09 am: 0ea5d04aff
am: 75f7f68128

Change-Id: I53afd6879f86b710f272bfa9ee8d45ec908029ce
2019-09-25 10:44:55 -07:00
Mathieu Chartier
0726986b7c Merge "Use APEX boot image for profilebootclasspath" 2019-09-25 17:43:23 +00:00
Marco Nelissen
41d2d5417f Merge "Remove MediaPlayer2" am: 2e51cefc7e
am: 068d3c7ec3

Change-Id: Ic8f248fa2f70b0e84a97950f61640418566498a4
2019-09-25 10:39:43 -07:00
Eric Holk
75f7f68128 Merge "Refactor DexViewBuilder" am: f5617abe09
am: 0ea5d04aff

Change-Id: Ic16bb1298ac85276d1119b3c9a69dc1e527edb39
2019-09-25 10:37:17 -07:00
Marco Nelissen
068d3c7ec3 Merge "Remove MediaPlayer2"
am: 2e51cefc7e

Change-Id: I43f2b99b916bf989025d01495c0d8eeb73762886
2019-09-25 10:30:20 -07:00
TreeHugger Robot
03b7db401a Merge "Fix package shell command" 2019-09-25 17:29:41 +00:00
TreeHugger Robot
32ad4bf075 Merge "New integration test for fs-verity install and on-access verification" 2019-09-25 17:27:29 +00:00
Eric Holk
0ea5d04aff Merge "Refactor DexViewBuilder"
am: f5617abe09

Change-Id: I1a971bd08a0025fdb365724d522ceb16468a8827
2019-09-25 10:24:32 -07:00
Marco Nelissen
2e51cefc7e Merge "Remove MediaPlayer2" 2019-09-25 17:15:59 +00:00
TreeHugger Robot
053cacc6ed Merge "Remove 'no errors' log" 2019-09-25 17:07:32 +00:00
Treehugger Robot
f5617abe09 Merge "Refactor DexViewBuilder" 2019-09-25 16:57:37 +00:00
Chandan Nath
04df96b1f6 Merge "Add BackupEncryptionService which provides an IntermediateEncryptingTransport" 2019-09-25 16:55:19 +00:00
Android Build Merger (Role)
df535a3d9e Merge "Merge "Wait for the profile to not be empty in BootImageProfileTest" am: 37f8bfb2c1 am: fdc8257eae am: a722ba3cb9 am: 5c2bd6ca18" 2019-09-25 16:49:48 +00:00
TreeHugger Robot
c028474191 Merge "Import EncryptedBackupTask" 2019-09-25 16:49:43 +00:00
Mathieu Chartier
2fb7499ed0 Merge "Wait for the profile to not be empty in BootImageProfileTest" am: 37f8bfb2c1 am: fdc8257eae am: a722ba3cb9
am: 5c2bd6ca18

Change-Id: Ibabac66542dfe2e9c49378bb47d9d84d00a3dff1
2019-09-25 09:49:06 -07:00
Mathieu Chartier
5c2bd6ca18 Merge "Wait for the profile to not be empty in BootImageProfileTest" am: 37f8bfb2c1 am: fdc8257eae
am: a722ba3cb9

Change-Id: I79184509eb1c5214be598fc9f27c5bc67c777f3b
2019-09-25 09:37:06 -07:00
Mathieu Chartier
a722ba3cb9 Merge "Wait for the profile to not be empty in BootImageProfileTest" am: 37f8bfb2c1
am: fdc8257eae

Change-Id: I2ecb58144e80cdc44dd260a2dc41e7a1e8e1921d
2019-09-25 09:23:36 -07:00
Mathieu Chartier
fdc8257eae Merge "Wait for the profile to not be empty in BootImageProfileTest"
am: 37f8bfb2c1

Change-Id: Ie83773783fe4f18c3160c126e13266dcb0334274
2019-09-25 09:09:13 -07:00
Mathieu Chartier
a557554def Use APEX boot image for profilebootclasspath
To get profiling info, we need to avoid having compiled code.

Also pass down the --count-hotness-in-compiled-code for measuring
performance in compiled code.

Bug: 139883463
Test: manual
Change-Id: Ib02b476522b7709172fc06d6517446cad59045d4
2019-09-25 15:55:40 +00:00