Hyundo Moon
08e1c031f5
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
...
am: 007bb68bdb
2019-04-23 19:10:59 -07:00
Shuzhen Wang
578e1637bd
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
...
am: b9177522ff
2019-04-23 18:59:19 -07:00
Yao Chen
3583bd2e8f
Merge "Add encryption in incidentd." into qt-dev
...
am: a35c2f1224
2019-04-23 18:44:44 -07:00
Steve Elliott
36e25edae0
Merge "Initialize Global Actions Panel when one is available" into qt-dev
...
am: 5acc240320
2019-04-23 18:38:45 -07:00
Hyundo Moon
007bb68bdb
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
2019-04-24 01:31:39 +00:00
Lucas Dupin
db88ab8d29
Merge "Fix click and long click lock behavior" into qt-dev
...
am: 15ee32b208
2019-04-23 18:29:29 -07:00
TreeHugger Robot
b9177522ff
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
2019-04-24 01:19:09 +00:00
Anil Admal
6a6d68eb04
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
...
am: 5bcdc825ed
2019-04-23 18:02:02 -07:00
TreeHugger Robot
a35c2f1224
Merge "Add encryption in incidentd." into qt-dev
2019-04-24 01:01:25 +00:00
TreeHugger Robot
5acc240320
Merge "Initialize Global Actions Panel when one is available" into qt-dev
2019-04-24 00:51:06 +00:00
Lucas Dupin
15ee32b208
Merge "Fix click and long click lock behavior" into qt-dev
2019-04-24 00:41:45 +00:00
Marissa Wall
4824732ebc
Merge "ASurfaceControl: fix surface damage" into qt-dev
...
am: 9a205d9b12
2019-04-23 17:28:05 -07:00
Mike Digman
bb2e0b9a03
Merge "Sharesheet - update direct share loading animation" into qt-dev
...
am: b8c3309a64
2019-04-23 17:21:26 -07:00
Steven Wu
763eeda8c0
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
...
am: 991aff4191
2019-04-23 17:13:13 -07:00
Anil Admal
5bcdc825ed
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
2019-04-24 00:12:41 +00:00
TreeHugger Robot
9a205d9b12
Merge "ASurfaceControl: fix surface damage" into qt-dev
2019-04-23 23:57:19 +00:00
TreeHugger Robot
b8c3309a64
Merge "Sharesheet - update direct share loading animation" into qt-dev
2019-04-23 23:48:41 +00:00
Steven Wu
991aff4191
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
2019-04-23 23:46:43 +00:00
Dianne Hackborn
3578b71b0f
Merge "Finish up Intent identifier implementation." into qt-dev
...
am: 3f5447d8ae
2019-04-23 16:14:05 -07:00
Amin Shaikh
b4f32637ab
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
...
am: 7f127b9c56
2019-04-23 15:57:23 -07:00
Dianne Hackborn
3f5447d8ae
Merge "Finish up Intent identifier implementation." into qt-dev
2019-04-23 22:43:34 +00:00
TreeHugger Robot
7f127b9c56
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
2019-04-23 22:39:55 +00:00
Yao Chen
43706b4470
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
2019-04-23 15:20:38 -07:00
Chenbo Feng
4d09aa86b6
[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev
...
am: 32b47dece4f729cb5fd6
2019-04-23 15:13:56 -07:00
Julia Reynolds
915d5cbec1
Merge "Notification guts redesign" into qt-dev
...
am: 388f6726ea
2019-04-23 15:08:30 -07:00
Tyler Gunn
49b166a171
Merge "Update API docs for country ISO APIs." am: 990053e552
...
am: d60707b4ea
2019-04-23 14:58:24 -07:00
TreeHugger Robot
32b47dece4
Merge "Ask netd to swap stats map before reading" into qt-dev
2019-04-23 21:57:09 +00:00
Tyler Gunn
d60707b4ea
Merge "Update API docs for country ISO APIs."
...
am: 990053e552
2019-04-23 14:49:19 -07:00
TreeHugger Robot
388f6726ea
Merge "Notification guts redesign" into qt-dev
2019-04-23 21:45:25 +00:00
Matthew Ng
110c3f3831
Merge "Removed the experimental code for gestural mode" into qt-dev
...
am: 04f13b4288
2019-04-23 14:43:39 -07:00
Tyler Gunn
990053e552
Merge "Update API docs for country ISO APIs."
2019-04-23 21:40:12 +00:00
Mady Mellor
7acc3301e6
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
...
am: aebf984d90
2019-04-23 14:34:37 -07:00
Hyunyoung Song
b033545b2f
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
...
am: c51ef32c2b
2019-04-23 14:21:00 -07:00
Jordan Liu
cd47318cfb
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
...
am: 5a3afc8ce7
2019-04-23 14:12:37 -07:00
TreeHugger Robot
04f13b4288
Merge "Removed the experimental code for gestural mode" into qt-dev
2019-04-23 21:11:28 +00:00
Marissa Wall
bb9b14f020
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
2019-04-23 14:10:15 -07:00
Mady Mellor
aebf984d90
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
2019-04-23 21:07:05 +00:00
TreeHugger Robot
c51ef32c2b
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
2019-04-23 21:03:36 +00:00
Steve Elliott
c59eb34962
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
2019-04-23 17:03:05 -04:00
Matthew Ng
bbe9c4b226
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
...
am: 6db82f8965
2019-04-23 13:57:06 -07:00
Pengquan Meng
bb57759766
[automerger skipped] Merge "Add carrier display name related CarrierConfig" am: 570f5dcae1
...
am: 9bc0b85dae057b94f43b
2019-04-23 13:51:29 -07:00
Matt Pape
88df035282
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
...
am: b4a49aa45b
2019-04-23 13:46:04 -07:00
Yin-Chia Yeh
67dc3a6490
Merge "Camera: fix null pointer dereference" into qt-dev
...
am: dc7de27113
2019-04-23 13:40:33 -07:00
Jordan Liu
5a3afc8ce7
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
2019-04-23 20:40:09 +00:00
Pengquan Meng
9bc0b85dae
Merge "Add carrier display name related CarrierConfig"
...
am: 570f5dcae1
2019-04-23 13:39:26 -07:00
Howard Ro
fb856af45a
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
...
am: 14e7eb7108
2019-04-23 13:34:43 -07:00
Makoto Onuki
c2e06412fa
Merge "pm set-home-activity waits until completion" into qt-dev
...
am: ec41ca2aa7
2019-04-23 13:28:56 -07:00
Pengquan Meng
570f5dcae1
Merge "Add carrier display name related CarrierConfig"
2019-04-23 20:23:20 +00:00
Nick Chalko
3caecda521
Merge "Don't start an observer without an extcon device" into qt-dev
...
am: 9c505c5572
2019-04-23 13:22:45 -07:00
Lucas Dupin
0df60fe702
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
2019-04-23 13:21:15 -07:00
