OSDN Git Service
Seigo Nonaka [Wed, 24 Apr 2019 05:41:21 +0000 (22:41 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev am:
5f873a09a0
am:
995bf1e3e6
Change-Id: I2245df4205a28af10fa08eee592176bc6a73ae8e
Emilian Peev [Wed, 24 Apr 2019 05:36:07 +0000 (22:36 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev am:
f8d04b2d2f
am:
6c0d305f35
Change-Id: Icd858aff2e6e8fadc9834d2aeeb9da18b83ce034
Matt Pietal [Wed, 24 Apr 2019 05:31:00 +0000 (22:31 -0700)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev am:
c35533726d
am:
c7ad0f52cc
Change-Id: Ic5e3d6455ca25d68ec790751d48c90050961e3ae
Robert Snoeberger [Wed, 24 Apr 2019 05:25:42 +0000 (22:25 -0700)]
Merge "Transition to bold when shrinking clock" into qt-dev am:
993e5dacd7
am:
208fd6731c
Change-Id: Id3c1729daa0b0af5ef815b0626267c6cf92e70c4
Hyundo Moon [Wed, 24 Apr 2019 05:18:38 +0000 (22:18 -0700)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev am:
007bb68bdb
am:
08e1c031f5
Change-Id: Ie337f75a530143cea81089180b677a319f873780
Shuzhen Wang [Wed, 24 Apr 2019 04:48:02 +0000 (21:48 -0700)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev am:
b9177522ff
am:
578e1637bd
Change-Id: Ie1f96c91c50e56294e13475e976cb085cb129884
Yao Chen [Wed, 24 Apr 2019 04:41:41 +0000 (21:41 -0700)]
Merge "Add encryption in incidentd." into qt-dev am:
a35c2f1224
am:
3583bd2e8f
Change-Id: I1ce9b81dcd1890649418548b51a37f594e7c2025
Steve Elliott [Wed, 24 Apr 2019 04:36:29 +0000 (21:36 -0700)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev am:
5acc240320
am:
36e25edae0
Change-Id: I42a3a5a7ebb92e22841df0c0e7d5531210521291
Lucas Dupin [Wed, 24 Apr 2019 04:31:32 +0000 (21:31 -0700)]
Merge "Fix click and long click lock behavior" into qt-dev am:
15ee32b208
am:
db88ab8d29
Change-Id: Ic1469b7599ca075eedcee3cf43d8f166adfd7861
Anil Admal [Wed, 24 Apr 2019 04:26:26 +0000 (21:26 -0700)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev am:
5bcdc825ed
am:
6a6d68eb04
Change-Id: Iaaf1e9e14444d16875d017745d553f6a035337bc
Seigo Nonaka [Wed, 24 Apr 2019 04:16:08 +0000 (21:16 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
am:
5f873a09a0
Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5
Marissa Wall [Wed, 24 Apr 2019 03:41:46 +0000 (20:41 -0700)]
Merge "ASurfaceControl: fix surface damage" into qt-dev am:
9a205d9b12
am:
4824732ebc
Change-Id: Id7d39a922cf4fc96d32302985e8de6af03a4384c
Mike Digman [Wed, 24 Apr 2019 03:35:30 +0000 (20:35 -0700)]
Merge "Sharesheet - update direct share loading animation" into qt-dev am:
b8c3309a64
am:
bb2e0b9a03
Change-Id: I51fa71dae4d9e6401e61a57f067825ad105b9a04
TreeHugger Robot [Wed, 24 Apr 2019 03:35:15 +0000 (03:35 +0000)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
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
Emilian Peev [Wed, 24 Apr 2019 02:50:00 +0000 (19:50 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
am:
f8d04b2d2f
Change-Id: I5a99fd6443d6c5dbd85b65a14297cc83a8bce34e
TreeHugger Robot [Wed, 24 Apr 2019 02:28:39 +0000 (02:28 +0000)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
Matt Pietal [Wed, 24 Apr 2019 02:23:43 +0000 (19:23 -0700)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
am:
c35533726d
Change-Id: I7fe474e9c3311e1d009ca419b3ac6883707a2c49
Robert Snoeberger [Wed, 24 Apr 2019 02:17:49 +0000 (19:17 -0700)]
Merge "Transition to bold when shrinking clock" into qt-dev
am:
993e5dacd7
Change-Id: Iedd2231047baa4ff38537f560a9ac554f247699b
Hyundo Moon [Wed, 24 Apr 2019 02:10:59 +0000 (19:10 -0700)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
am:
007bb68bdb
Change-Id: Iee3057e1d9db477461e2d341c46bad1ef0377cb4
Shuzhen Wang [Wed, 24 Apr 2019 01:59:19 +0000 (18:59 -0700)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
am:
b9177522ff
Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
TreeHugger Robot [Wed, 24 Apr 2019 01:56:52 +0000 (01:56 +0000)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
Yao Chen [Wed, 24 Apr 2019 01:44:44 +0000 (18:44 -0700)]
Merge "Add encryption in incidentd." into qt-dev
am:
a35c2f1224
Change-Id: Ifb13a0ea562cdf1d5ada037c38b21094aaf7ad59
Steve Elliott [Wed, 24 Apr 2019 01:38:45 +0000 (18:38 -0700)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
am:
5acc240320
Change-Id: I8afee65f1cdf7e42c3eb2dba47d099b3ed3467f2
TreeHugger Robot [Wed, 24 Apr 2019 01:34:32 +0000 (01:34 +0000)]
Merge "Transition to bold when shrinking clock" into qt-dev
Hyundo Moon [Wed, 24 Apr 2019 01:31:39 +0000 (01:31 +0000)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
Lucas Dupin [Wed, 24 Apr 2019 01:29:29 +0000 (18:29 -0700)]
Merge "Fix click and long click lock behavior" into qt-dev
am:
15ee32b208
Change-Id: I58636ae462e780e9914633507739cbd6f2cf6515
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
TreeHugger Robot [Wed, 24 Apr 2019 01:19:09 +0000 (01:19 +0000)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
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
Anil Admal [Wed, 24 Apr 2019 01:02:02 +0000 (18:02 -0700)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
am:
5bcdc825ed
Change-Id: I12fd7c9fd636aaa6b9338b6eb82d1a44e5cf39fb
TreeHugger Robot [Wed, 24 Apr 2019 01:01:25 +0000 (01:01 +0000)]
Merge "Add encryption in incidentd." into qt-dev
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
TreeHugger Robot [Wed, 24 Apr 2019 00:51:06 +0000 (00:51 +0000)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
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
Lucas Dupin [Wed, 24 Apr 2019 00:41:45 +0000 (00:41 +0000)]
Merge "Fix click and long click lock behavior" into qt-dev
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
Marissa Wall [Wed, 24 Apr 2019 00:28:05 +0000 (17:28 -0700)]
Merge "ASurfaceControl: fix surface damage" into qt-dev
am:
9a205d9b12
Change-Id: Ied67a955418972f18e17885a2dbbb665b55fad3e
Mike Digman [Wed, 24 Apr 2019 00:21:26 +0000 (17:21 -0700)]
Merge "Sharesheet - update direct share loading animation" into qt-dev
am:
b8c3309a64
Change-Id: I08681e4844dd5c1e2ed652f9f5bbb8156e3c3f0e
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
Anil Admal [Wed, 24 Apr 2019 00:12:41 +0000 (00:12 +0000)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 23:57:19 +0000 (23:57 +0000)]
Merge "ASurfaceControl: fix surface damage" into qt-dev
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
TreeHugger Robot [Tue, 23 Apr 2019 23:48:41 +0000 (23:48 +0000)]
Merge "Sharesheet - update direct share loading animation" into qt-dev
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
Yao Chen [Sun, 21 Apr 2019 21:34:30 +0000 (14:34 -0700)]
Add encryption in incidentd.
+ Sections which require encryption will be encryted on disk.
+ When the sections are requested by clients (e.g., permission controller, report assignee),
incidentd will decrypte the data.
+ For efficiency, encryption is done ONLY for sections that require encryption.
+ Use Keystore API for key management.
Bug:
131084614
Test: incidentd_test
Change-Id: I84d6b86807ba5bbde1051e847b2df6e79e6b5be5
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
Marissa Wall [Tue, 23 Apr 2019 21:10:15 +0000 (14:10 -0700)]
ASurfaceControl: fix surface damage
There are two problems with surface control.
1) By merging the rects, the Region turned into 0,0,0,0 instead of
an or of the Rects.
2) In the case where an app intends to have a region of 0,0,0,0,
we should treat it the same as a region of 0,0,-1,-1.
Bug:
131175047
Test: ASurfaceControl
Change-Id: Ib2e3b90ac215e069d3d3c2eca81ff1013b4287aa
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
Steve Elliott [Tue, 23 Apr 2019 20:59:06 +0000 (16:59 -0400)]
Initialize Global Actions Panel when one is available
This bug was accidentally introduced when the dialog initialization
logic was modified in ag/
6925312.
Test: manual
Bug:
129964234
Change-Id: I7a1a01c22e556b362bbb850be94464530e5a3a96
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
Seigo Nonaka [Tue, 23 Apr 2019 20:21:27 +0000 (13:21 -0700)]
Fix performance regression by fixing keys used in Typeface.Builder
The key used in Typeface.Builder is different from the key used in
findFromCache method. The problem is key generation in Typeface.Builder
since the key should be created from requested parameters not the actual
font styles.
Here is the raw performance differences on walleye-userdebug
android.graphics.perftests.TypefaceCreatePerfTest(us):
createFromResources: 248 -> 23: (-225, -90.7%)
Bug:
131167183
Test: manually collected perf test result.
Change-Id: Idea25095979707ac84b7f4bc1ede0c2daefd6127
Lucas Dupin [Tue, 23 Apr 2019 17:19:27 +0000 (10:19 -0700)]
Fix click and long click lock behavior
Accessibility clicks should unlock the phone and long presses should
disable trust agents.
Fixes:
131059420
Fixes:
130326686
Test: long press with trust agent
Test: double tap with TalkBack on lock screen
Test: double tap with TalkBack on bouncer
Change-Id: Ib2df54c540ebed0adf6c3cbcb82376c02e54d540
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
OSDN Git Service
