OSDN Git Service
Steven Wu [Wed, 24 Apr 2019 03:13:48 +0000 (20:13 -0700)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev am:
991aff4191
am:
763eeda8c0
Change-Id: I3cc6d6cd204c13496961a483396293ce47f36216
Dianne Hackborn [Wed, 24 Apr 2019 03:07:59 +0000 (20:07 -0700)]
Merge "Finish up Intent identifier implementation." into qt-dev am:
3f5447d8ae
am:
3578b71b0f
Change-Id: I8667a0528e6c4afbe20a750683b7ea789b01a432
Amin Shaikh [Wed, 24 Apr 2019 02:54:27 +0000 (19:54 -0700)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev am:
7f127b9c56
am:
b4f32637ab
Change-Id: If0474ff73a4db7a188c25ba3160624750fefaa6a
Chenbo Feng [Wed, 24 Apr 2019 01:23:54 +0000 (18:23 -0700)]
[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev am:
32b47dece4 -s ours
am:
4d09aa86b6 -s ours
am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1
f729cb5fd6 is in history
Change-Id: I863180a63bcbaa7f7ed76fc759e2f8f2dae1d764
Julia Reynolds [Wed, 24 Apr 2019 01:17:27 +0000 (18:17 -0700)]
Merge "Notification guts redesign" into qt-dev am:
388f6726ea
am:
915d5cbec1
Change-Id: I9afe280b79cc63e6eed9482b0cba6308cdba48bb
Tyler Gunn [Wed, 24 Apr 2019 01:12:13 +0000 (18:12 -0700)]
Merge "Update API docs for country ISO APIs." am:
990053e552 am:
d60707b4ea
am:
49b166a171
Change-Id: Ifc88a2b883bea810edba5c604078d40c658d49c2
Matthew Ng [Wed, 24 Apr 2019 01:05:53 +0000 (18:05 -0700)]
Merge "Removed the experimental code for gestural mode" into qt-dev am:
04f13b4288
am:
110c3f3831
Change-Id: Iedee2d2063fae46e33ff1cf2fa118cba4f68af8a
Mady Mellor [Wed, 24 Apr 2019 01:00:40 +0000 (18:00 -0700)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev am:
aebf984d90
am:
7acc3301e6
Change-Id: I3e74c363060533ef9a5264aada3bbcfb72c31138
Hyunyoung Song [Wed, 24 Apr 2019 00:55:23 +0000 (17:55 -0700)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev am:
c51ef32c2b
am:
b033545b2f
Change-Id: I35397b48198994436759e9b2af3dc18c3c0967a3
Jordan Liu [Wed, 24 Apr 2019 00:43:04 +0000 (17:43 -0700)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev am:
5a3afc8ce7
am:
cd47318cfb
Change-Id: Id886c853fb532dc0a894acb4e2d8d0a31df182bc
Matthew Ng [Wed, 24 Apr 2019 00:36:55 +0000 (17:36 -0700)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev am:
6db82f8965
am:
bbe9c4b226
Change-Id: I2cfbe2806d08f79e240eef6243bb7d7ab35ec19a
Pengquan Meng [Wed, 24 Apr 2019 00:31:44 +0000 (17:31 -0700)]
[automerger skipped] Merge "Add carrier display name related CarrierConfig" am:
570f5dcae1 am:
9bc0b85dae -s ours
am:
bb57759766 -s ours
am skip reason: change_id I79836b2912be5223a2269e660bfaadf4aa72b930 with SHA1
057b94f43b is in history
Change-Id: I74c0a2b7315e1f7d14154e50663f0284c85db877
Steven Wu [Wed, 24 Apr 2019 00:13:13 +0000 (17:13 -0700)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
am:
991aff4191
Change-Id: I23e99f892bee5fa797ba0cc7c4f0a5d2fc879411
Matt Pape [Tue, 23 Apr 2019 23:54:21 +0000 (16:54 -0700)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev am:
b4a49aa45b
am:
88df035282
Change-Id: I14b35315b78e675caee8e8b03e1f97dacb1f2067
Yin-Chia Yeh [Tue, 23 Apr 2019 23:49:14 +0000 (16:49 -0700)]
Merge "Camera: fix null pointer dereference" into qt-dev am:
dc7de27113
am:
67dc3a6490
Change-Id: I7a294e2a067a7681ceb734f26d67798a0a8044db
Steven Wu [Tue, 23 Apr 2019 23:46:43 +0000 (23:46 +0000)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
Howard Ro [Tue, 23 Apr 2019 23:44:13 +0000 (16:44 -0700)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev am:
14e7eb7108
am:
fb856af45a
Change-Id: Ide5ebb9676d413d356cd9efabaccefaf0c99cf80
Makoto Onuki [Tue, 23 Apr 2019 23:39:05 +0000 (16:39 -0700)]
Merge "pm set-home-activity waits until completion" into qt-dev am:
ec41ca2aa7
am:
c2e06412fa
Change-Id: Ifb4d7eaeb3b3f1c45d5074039f77124405408716
Nick Chalko [Tue, 23 Apr 2019 23:34:01 +0000 (16:34 -0700)]
Merge "Don't start an observer without an extcon device" into qt-dev am:
9c505c5572
am:
3caecda521
Change-Id: I6d77e3abf1c4fa40da84ddeb9022e9fa2a876e48
Mike Digman [Tue, 23 Apr 2019 23:19:54 +0000 (16:19 -0700)]
Merge "Sharesheet - make work profile badges render" into qt-dev am:
aabebff4b8
am:
285250a826
Change-Id: I249dddf536d00234018c1974ef7b699ca550751e
Dianne Hackborn [Tue, 23 Apr 2019 23:14:05 +0000 (16:14 -0700)]
Merge "Finish up Intent identifier implementation." into qt-dev
am:
3f5447d8ae
Change-Id: I85f95d1def8edf1c61a5f741ccd25ee717fbe985
Amin Shaikh [Tue, 23 Apr 2019 22:57:23 +0000 (15:57 -0700)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
am:
7f127b9c56
Change-Id: I9134d51489a4231892a818ada19a2f5d112cbb31
Dianne Hackborn [Tue, 23 Apr 2019 22:43:34 +0000 (22:43 +0000)]
Merge "Finish up Intent identifier implementation." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 22:39:55 +0000 (22:39 +0000)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
Joel Galenson [Tue, 23 Apr 2019 22:39:26 +0000 (15:39 -0700)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev am:
5bac48f7c0
am:
b070dcf5ce
Change-Id: I21b37902f568637a35d64b0b6e49956aa7c904e3
Sunny Goyal [Tue, 23 Apr 2019 22:33:23 +0000 (15:33 -0700)]
Merge "Adding callback when surface params are applied" into qt-dev am:
8cb5228673
am:
0b4dea9809
Change-Id: I9967123991fde314b50203c322bd50aec7c7c297
Chenbo Feng [Tue, 23 Apr 2019 22:27:25 +0000 (15:27 -0700)]
[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev am:
ac8913be19 -s ours
am:
a5b48c10dc -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1
25243b4eb9 is in history
Change-Id: Id3eca996369f20b684f2d3d0436a79288193c7b0
Michael Groover [Tue, 23 Apr 2019 22:18:55 +0000 (15:18 -0700)]
Merge "Add content description to sensors off icon in status bar" into qt-dev am:
fa7a24ef8e
am:
ece28e1afa
Change-Id: Ic01f4618324ea98e8970b8121b2b90734699af36
Chenbo Feng [Tue, 23 Apr 2019 22:13:56 +0000 (15:13 -0700)]
[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev
am:
32b47dece4 -s ours
am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1
f729cb5fd6 is in history
Change-Id: I48dc5783885a97a0b0c975202c5878c058695524
Julia Reynolds [Tue, 23 Apr 2019 22:08:30 +0000 (15:08 -0700)]
Merge "Notification guts redesign" into qt-dev
am:
388f6726ea
Change-Id: I469344fe5a8f9a5487177eac7d1225d42c9ba7ed
Arc Wang [Tue, 23 Apr 2019 22:00:57 +0000 (15:00 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev am:
831dc426f1
am:
f460464eeb
Change-Id: I8bf3f2b22488ce1632ccc19a3943bda3aedaf089
Tyler Gunn [Tue, 23 Apr 2019 21:58:24 +0000 (14:58 -0700)]
Merge "Update API docs for country ISO APIs." am:
990053e552
am:
d60707b4ea
Change-Id: I570e639397645d121f5f9ef60fbd3bd97ae93d2f
TreeHugger Robot [Tue, 23 Apr 2019 21:57:09 +0000 (21:57 +0000)]
Merge "Ask netd to swap stats map before reading" into qt-dev
Shuo Qian [Tue, 23 Apr 2019 21:54:40 +0000 (14:54 -0700)]
[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev am:
8fb57ca86c -s ours
am:
03b6250d66 -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1
3b35404279 is in history
Change-Id: I5ae36080b61e1a9387b65f1ae36d88dc2b994180
Tyler Gunn [Tue, 23 Apr 2019 21:49:19 +0000 (14:49 -0700)]
Merge "Update API docs for country ISO APIs."
am:
990053e552
Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
TreeHugger Robot [Tue, 23 Apr 2019 21:45:25 +0000 (21:45 +0000)]
Merge "Notification guts redesign" into qt-dev
Matthew Ng [Tue, 23 Apr 2019 21:43:39 +0000 (14:43 -0700)]
Merge "Removed the experimental code for gestural mode" into qt-dev
am:
04f13b4288
Change-Id: I47d96024a90b12b657ec09d72bed1a822e546c93
Christopher Ferris [Tue, 23 Apr 2019 21:41:10 +0000 (14:41 -0700)]
Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours
am:
58722b4558 -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: I11d68de26dbcc95869609440f0ca491493805d71
Tyler Gunn [Tue, 23 Apr 2019 21:40:12 +0000 (21:40 +0000)]
Merge "Update API docs for country ISO APIs."
Mady Mellor [Tue, 23 Apr 2019 21:34:37 +0000 (14:34 -0700)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
am:
aebf984d90
Change-Id: I3eb7cf64b3d3507927bf93c372ef803c5adc2717
Hyunyoung Song [Tue, 23 Apr 2019 21:21:00 +0000 (14:21 -0700)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
am:
c51ef32c2b
Change-Id: I4307434d56d5776bccb7ba977e3dde5883b55c8e
Christopher Ferris [Tue, 23 Apr 2019 21:19:47 +0000 (14:19 -0700)]
[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours
am:
8e0431be66 -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: Id9f81cb5187623bf44ca0c73189b29b8e386e842
Jordan Liu [Tue, 23 Apr 2019 21:12:37 +0000 (14:12 -0700)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
am:
5a3afc8ce7
Change-Id: I7bea85b6f657a24b7d8b4292f83ef2f27d79da1e
TreeHugger Robot [Tue, 23 Apr 2019 21:11:28 +0000 (21:11 +0000)]
Merge "Removed the experimental code for gestural mode" into qt-dev
Mady Mellor [Tue, 23 Apr 2019 21:07:05 +0000 (21:07 +0000)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 21:03:36 +0000 (21:03 +0000)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
Matthew Ng [Tue, 23 Apr 2019 20:57:06 +0000 (13:57 -0700)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
am:
6db82f8965
Change-Id: I5e0a9ddb6fbaaf4bf61e43335ad24b01070bf19f
Pengquan Meng [Tue, 23 Apr 2019 20:51:29 +0000 (13:51 -0700)]
[automerger skipped] Merge "Add carrier display name related CarrierConfig" am:
570f5dcae1
am:
9bc0b85dae -s ours
am skip reason: change_id I79836b2912be5223a2269e660bfaadf4aa72b930 with SHA1
057b94f43b is in history
Change-Id: Ib323032763a0521745e1d2ffb4f9484afc7fd107
Matt Pape [Tue, 23 Apr 2019 20:46:04 +0000 (13:46 -0700)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
am:
b4a49aa45b
Change-Id: Ic5700c6044fb1a1cd57803fe5269bf5428a39d07
Yin-Chia Yeh [Tue, 23 Apr 2019 20:40:33 +0000 (13:40 -0700)]
Merge "Camera: fix null pointer dereference" into qt-dev
am:
dc7de27113
Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8
Jordan Liu [Tue, 23 Apr 2019 20:40:09 +0000 (20:40 +0000)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
Pengquan Meng [Tue, 23 Apr 2019 20:39:26 +0000 (13:39 -0700)]
Merge "Add carrier display name related CarrierConfig"
am:
570f5dcae1
Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
Howard Ro [Tue, 23 Apr 2019 20:34:43 +0000 (13:34 -0700)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
am:
14e7eb7108
Change-Id: I3e36cb4117118e0e62c2718d5e42144c210f93cd
Makoto Onuki [Tue, 23 Apr 2019 20:28:56 +0000 (13:28 -0700)]
Merge "pm set-home-activity waits until completion" into qt-dev
am:
ec41ca2aa7
Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425
Pengquan Meng [Tue, 23 Apr 2019 20:23:20 +0000 (20:23 +0000)]
Merge "Add carrier display name related CarrierConfig"
Nick Chalko [Tue, 23 Apr 2019 20:22:45 +0000 (13:22 -0700)]
Merge "Don't start an observer without an extcon device" into qt-dev
am:
9c505c5572
Change-Id: Ied990b9c3cf425a182242ea163565dc77af8769b
Mike Digman [Tue, 23 Apr 2019 20:13:17 +0000 (13:13 -0700)]
Merge "Sharesheet - make work profile badges render" into qt-dev
am:
aabebff4b8
Change-Id: Ia61d8663873fb2ab60a67167f7d4c66e9eac9c06
TreeHugger Robot [Tue, 23 Apr 2019 20:12:16 +0000 (20:12 +0000)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
Greg Daniel [Tue, 23 Apr 2019 20:11:53 +0000 (13:11 -0700)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev am:
68406a2dd5
am:
663ab50411
Change-Id: I7e22af48449386dde99a9ce222414376a96b6958
Steven Moreland [Tue, 23 Apr 2019 20:06:37 +0000 (20:06 +0000)]
Merge "HwBlob: s/malloc/calloc/"
Matt Pape [Tue, 23 Apr 2019 19:54:38 +0000 (19:54 +0000)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 19:48:25 +0000 (19:48 +0000)]
Merge "use colormatrix w/o legacy apis"
Joel Galenson [Tue, 23 Apr 2019 19:47:52 +0000 (12:47 -0700)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
am:
5bac48f7c0
Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365
Santos Cordon [Tue, 23 Apr 2019 19:46:00 +0000 (12:46 -0700)]
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am:
65cf57bf6c" into qt-dev-plus-aosp
am:
d2877e3209
Change-Id: I498597d62688429c5dc7c1471c3dcdabd5a2fc19
TreeHugger Robot [Tue, 23 Apr 2019 19:37:25 +0000 (19:37 +0000)]
Merge "Camera: fix null pointer dereference" into qt-dev
Howard Ro [Tue, 23 Apr 2019 19:36:25 +0000 (19:36 +0000)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
Makoto Onuki [Tue, 23 Apr 2019 19:36:08 +0000 (19:36 +0000)]
Merge "pm set-home-activity waits until completion" into qt-dev
Howard Ro [Tue, 23 Apr 2019 18:59:33 +0000 (18:59 +0000)]
Revert "Add apex packages to uid_mapping"
This reverts commit
67b1e54327e828a39a0706740d3898a8b561a81f.
Bug:
131167067
Reason for revert: b/
131167067
Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5
TreeHugger Robot [Tue, 23 Apr 2019 19:33:35 +0000 (19:33 +0000)]
Merge "Don't start an observer without an extcon device" into qt-dev
Sunny Goyal [Tue, 23 Apr 2019 19:30:13 +0000 (12:30 -0700)]
Merge "Adding callback when surface params are applied" into qt-dev
am:
8cb5228673
Change-Id: I399ae23877efc46ff02d43c1804440fd388cd127
Fabian Kozynski [Tue, 23 Apr 2019 19:28:45 +0000 (12:28 -0700)]
Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am:
aeb929a3f9" into qt-dev-plus-aosp
am:
8a8be29510
Change-Id: I38db76b9b0e71b4f7f7b6895bcb656c0f49d09a1
Chenbo Feng [Tue, 23 Apr 2019 19:23:12 +0000 (12:23 -0700)]
[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev
am:
ac8913be19 -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1
25243b4eb9 is in history
Change-Id: I30d66ea36a7beee9ccf940c547c47a6f7220e0a2
TreeHugger Robot [Tue, 23 Apr 2019 19:20:56 +0000 (19:20 +0000)]
Merge "Sharesheet - make work profile badges render" into qt-dev
Steven Wu [Tue, 23 Apr 2019 17:27:33 +0000 (13:27 -0400)]
Add logging for dozing on or off due to sensor wake up.
Test: manual
Bug:
117215619
Change-Id: Ic112fdcf05c934543698d9b6e3b98d56965c64e2
Michael Groover [Tue, 23 Apr 2019 19:17:36 +0000 (12:17 -0700)]
Merge "Add content description to sensors off icon in status bar" into qt-dev
am:
fa7a24ef8e
Change-Id: I7dde4ab81d058514b88a41f747473508074c9898
Lucas Dupin [Tue, 23 Apr 2019 19:17:31 +0000 (12:17 -0700)]
Merge "Merge "Add ID field to the Callback" into qt-dev am:
14d351d41b" into qt-dev-plus-aosp
am:
dd57e9dcec
Change-Id: I3f2f183bb37d02110ec12ae25636e434ed190299
TreeHugger Robot [Tue, 23 Apr 2019 19:11:26 +0000 (19:11 +0000)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
Jack Yu [Tue, 23 Apr 2019 19:05:44 +0000 (12:05 -0700)]
[automerger skipped] Merge "Fixed that emergency alert dialog not popped up" am:
4da7f91b23 am:
480903bbcb -s ours
am:
044ae8a5b6 -s ours
am skip reason: change_id Ie563a8f11ac991ab9568f65df6a4d14eebe47c5e with SHA1
974607aac8 is in history
Change-Id: I29119046d1bcd10c286b5d970e90638b783e9269
Arc Wang [Tue, 23 Apr 2019 19:04:46 +0000 (12:04 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am:
831dc426f1
Change-Id: If2b162dd82a0d6c8fd48989ad6a31f0368534047
Amin Shaikh [Tue, 23 Apr 2019 18:56:46 +0000 (11:56 -0700)]
Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev am:
4a81a539f4
am:
ef80b3408f
Change-Id: Iefae6a58bd1ffa3591e891d3d1c6d68e38b8d131
Shuo Qian [Tue, 23 Apr 2019 18:47:00 +0000 (11:47 -0700)]
[automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev
am:
8fb57ca86c -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1
3b35404279 is in history
Change-Id: Ic36dba3e62e26f0699467d1ccbfe9087c5d19c29
Android Build Merger (Role) [Tue, 23 Apr 2019 18:34:17 +0000 (18:34 +0000)]
Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0 am:
df4acb4d8c -s ours am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history" into qt-dev-plus-aosp
Hyunyoung Song [Tue, 23 Apr 2019 18:24:55 +0000 (11:24 -0700)]
3->1 binder calls to OverlayManager for Navbar settings
Bug:
131112014
Test: builds
Change-Id: I2518ccd28493ef82793c9af192e72ee6521e6fd6
TreeHugger Robot [Tue, 23 Apr 2019 18:32:26 +0000 (18:32 +0000)]
Merge "Adding callback when surface params are applied" into qt-dev
Christopher Ferris [Tue, 23 Apr 2019 18:31:49 +0000 (11:31 -0700)]
[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am:
aba4de21e0
am:
df4acb4d8c -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1
4740d54243 is in history
Change-Id: Idaf690cb8b3050a0109a50f036024341a03dd3cc
Greg Daniel [Tue, 23 Apr 2019 18:31:47 +0000 (11:31 -0700)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev
am:
68406a2dd5
Change-Id: I67a9c2e15ec9b6691befec3cd8d439924fbfa5b4
Julia Reynolds [Fri, 19 Apr 2019 19:46:13 +0000 (15:46 -0400)]
Notification guts redesign
Test: atest
Fixes:
130766408
Fixes:
129453207
Bug:
127992400
Fixes:
129507783
Fixes:
130342795
Fixes:
130805969
Change-Id: I93984698c5380badb162774c818a1d040ccf9c1c
Vishnu Nair [Tue, 23 Apr 2019 18:27:11 +0000 (11:27 -0700)]
Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev am:
f243662ba3
am:
7ba3da51a6
Change-Id: Ic27cc31f9bfe5a44e4460ddd3cad93bb46dc785a
Amin Shaikh [Wed, 17 Apr 2019 19:24:42 +0000 (15:24 -0400)]
Add overlayable_icons_test to framework/SystemUI
This ensures that developers do not accidentally delete/rename overlayed icons
without updating overlayable_icons_text.xml and renaming overlayed assets.
Bug:
130438597
Bug:
128571899
Test: make tests
Change-Id: I54411b3a587c4798a190f49071d5a8aa399cd824
Mady Mellor [Thu, 18 Apr 2019 20:26:18 +0000 (13:26 -0700)]
Let NoMan know when something is no longer a bubble
This is needed for some of the notification group summary stuff to work.
More importantly, this is needed so that we can properly report to apps
if their notification is bubbled or not, e.g. if the user dismisses the
bubble & the notification is in the shade, that shouldn't be reported as
'FLAG_BUBBLE' as that notification is not actually being shown as a bubble.
* Adds onBubbleNotificationChanged to NotificationDelegate to pipe through
changes in bubble state, currently we only ever change it to 'false' but
this CL includes ability to flip it to 'true' (and also checks if the
notif should actually be able to bubble)
* Factors code that indicates something is approved to bubble into own
method
* Adds way to set BubbleMetadata on a notification (hidden !!)
Bug:
130250809
Test: atest NotificationManagerServiceTest
Change-Id: I8df4cc1231ed5d078ce4d50a70d2631f82fd2306
Android Build Merger (Role) [Tue, 23 Apr 2019 18:21:49 +0000 (18:21 +0000)]
Merge "Merge "Merge "Add a timeout for the DNS probe." am:
e721b4b83e am:
133fe15fc0" into qt-dev-plus-aosp am:
3c8c88e2da"
Lorenzo Colitti [Tue, 23 Apr 2019 18:21:19 +0000 (11:21 -0700)]
Merge "Merge "Add a timeout for the DNS probe." am:
e721b4b83e am:
133fe15fc0" into qt-dev-plus-aosp
am:
3c8c88e2da
Change-Id: I2fc69f26c4df366b6ff407dda386145bf9e0528e
TreeHugger Robot [Tue, 23 Apr 2019 18:19:06 +0000 (18:19 +0000)]
Merge "Add a lock to protect persistent stats snapshot" into qt-dev
Jordan Liu [Mon, 22 Apr 2019 20:58:02 +0000 (13:58 -0700)]
Do not populate SLOT_KEY with wrong slot info
The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).
For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/
130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.
Bug:
130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
(cherry picked from commit
21c3aeb49de064b011a452143f99b623acb94786)
Jordan Liu [Tue, 23 Apr 2019 18:12:57 +0000 (18:12 +0000)]
Merge "Do not populate SLOT_KEY with wrong slot info"
Anil Admal [Tue, 23 Apr 2019 18:06:49 +0000 (11:06 -0700)]
Merge "Add separate hasCapabilityName() methods in GnssCapabilities" into qt-dev am:
d4203ddebf
am:
ca2e942b7f
Change-Id: I10248f220686f1edbdfa00d5be322bfccba01496
Christopher Ferris [Tue, 23 Apr 2019 18:03:08 +0000 (11:03 -0700)]
Merge "Move to android_mallopt for malloc debug calls."
am:
aba4de21e0
Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
Paul Hu [Tue, 23 Apr 2019 18:00:58 +0000 (11:00 -0700)]
Merge "Merge "Add tests for DhcpErrorEvent" am:
367c758601 am:
faef1f66ed" into qt-dev-plus-aosp
am:
2a9ec5525d
Change-Id: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2
Android Build Merger (Role) [Tue, 23 Apr 2019 18:00:43 +0000 (18:00 +0000)]
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am:
65cf57bf6c" into qt-dev-plus-aosp
Santos Cordon [Tue, 23 Apr 2019 17:59:51 +0000 (10:59 -0700)]
Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev
am:
65cf57bf6c
Change-Id: I063e124f45cf7d55d04217ad1123db9ce9b14bf0
OSDN Git Service
