Commit Graph

363986 Commits

Author SHA1 Message Date
Yi Jin
4876868997 Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
am: 32ca41d028

Change-Id: I73b1ed0210f01ad6bf81089fef408765f34426a1
2018-03-21 21:49:17 +00:00
Malcolm Chen
d70f55fd62 Merge "By default, turn on signal strength update in power save mode." into pi-dev
am: b1223f4525

Change-Id: I209d99add22a23329537d3474b7f4a0565b7a8b2
2018-03-21 21:39:59 +00:00
Nathan Harold
fddd390045 Merge changes I4c26aea7,I79911434 into pi-dev
am: 095b9e8e1c  -s ours

Change-Id: I19626bf87d31c759939c6aafc42ae679f6cb18e4
2018-03-21 21:35:13 +00:00
Brad Ebinger
f6f8be9f9e Merge "Define phone process as a constant" into pi-dev
am: 025cb0c392  -s ours

Change-Id: Iab4ce6f2b1cc069d1aa00b0865a67e191131fb9e
2018-03-21 21:32:06 +00:00
TreeHugger Robot
32ca41d028 Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev 2018-03-21 21:24:19 +00:00
TreeHugger Robot
b1223f4525 Merge "By default, turn on signal strength update in power save mode." into pi-dev 2018-03-21 21:11:39 +00:00
Brad Ebinger
3113a10afd Define phone process as a constant
am: 1078b3a36b  -s ours

Change-Id: I36a9ef7016c3ea684bf8a0a02ff446727f3074ee
2018-03-21 21:10:46 +00:00
Yao Chen
a40fe4946a Merge "Enable sanitizer on statsd eng build." into pi-dev
am: dc5677336c

Change-Id: I4418b07d55e01eabfca0aabd6a54ea79ca456370
2018-03-21 21:06:54 +00:00
Lujiang Xue
0ce159ffa2 Merge "add car volume dialog" into pi-dev
am: f2e00697a5

Change-Id: Idf420b47057eda6c759f40e9ce9ed9b7b55ec730
2018-03-21 21:00:11 +00:00
Nathan Harold
095b9e8e1c Merge changes I4c26aea7,I79911434 into pi-dev
* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces
2018-03-21 20:59:02 +00:00
Adrian Roos
5ef5aa580e Merge "Screenshot: extend scrim under cutout" into pi-dev
am: 113f9f85f4

Change-Id: If37d3ceb5c98c85e9d2b4aae6dd27fe7151bfc9c
2018-03-21 20:46:51 +00:00
Brad Ebinger
025cb0c392 Merge "Define phone process as a constant" into pi-dev 2018-03-21 20:38:00 +00:00
nharold
66bce84357 Merge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1
am: 08949e354f

Change-Id: I1aa2077978eba9e13586aeb4501769e2dd42728a
2018-03-21 20:37:59 +00:00
Christopher Tate
5ff2ac76ce Merge "Suppress all background-state services in user-forced app standby" into pi-dev
am: 431cd97bd8

Change-Id: I0d26a1eabe7d4ca6a9922bc7dc7f30488b5ba8d0
2018-03-21 20:32:22 +00:00
nharold
08949e354f Merge "Add NonNull Annotations To IpSec API Surface"
am: baa4bf51c1

Change-Id: I1393526aca627b430868816a83c8a40452521fc2
2018-03-21 20:28:55 +00:00
Lenka Trochtova
bc9f74c83e Merge "Return a boolean from the mandatory backup transport setter." into pi-dev
am: 2f81559d29

Change-Id: Ibb77d5f16312f03504e7ced961b92e48f37342bc
2018-03-21 20:13:51 +00:00
TreeHugger Robot
dc5677336c Merge "Enable sanitizer on statsd eng build." into pi-dev 2018-03-21 20:09:10 +00:00
TreeHugger Robot
f2e00697a5 Merge "add car volume dialog" into pi-dev 2018-03-21 20:07:41 +00:00
Jovana Knezevic
9510846409 Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
am: c7034f7ab1

Change-Id: Ief0abc0585a1b929a45ea78ef5264419f89e9caf
2018-03-21 20:07:41 +00:00
Christopher Tate
d877106e84 Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
am: 1948f20312

Change-Id: Ie63cad3619772af031b329e643ea499f1adfcabb
2018-03-21 20:03:08 +00:00
Bryce Lee
9c60073b5a Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
am: 3ebf5e3507

Change-Id: Ib9213703a04f4b6cbf483b2fb3a62b88531d3adc
2018-03-21 19:59:01 +00:00
Brad Ebinger
224e4e0daf Merge "Added Locking for MmTelFeature" into pi-dev
am: fb241e2250  -s ours

Change-Id: I0cb8337a5d2e02f2d0e9003b841fd9fe4aef8ebd
2018-03-21 19:54:46 +00:00
Winson Chung
35a97e1a0b Merge "Fix issue with slippery state for quickstep button case." into pi-dev
am: d0bf944c3d

Change-Id: Id6e012c28b1d3e5616650ca6ebd30c5d5077ffbf
2018-03-21 19:51:44 +00:00
TreeHugger Robot
113f9f85f4 Merge "Screenshot: extend scrim under cutout" into pi-dev 2018-03-21 19:50:40 +00:00
Chavi Weingarten
2d574c0669 Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
am: ab762775d5

Change-Id: Id3d1d73a691fdfd243315645d5dca552a3cec3b9
2018-03-21 19:48:49 +00:00
TreeHugger Robot
431cd97bd8 Merge "Suppress all background-state services in user-forced app standby" into pi-dev 2018-03-21 19:45:59 +00:00
TreeHugger Robot
2f81559d29 Merge "Return a boolean from the mandatory backup transport setter." into pi-dev 2018-03-21 19:34:52 +00:00
Jovana Knezevic
c7034f7ab1 Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev 2018-03-21 19:34:32 +00:00
Lei Yu
92b8a3810b Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
am: 8e861350de

Change-Id: I3ea6f73962fec662c94a7cd2fa5efdf3f9739a1d
2018-03-21 19:33:05 +00:00
TreeHugger Robot
1948f20312 Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev 2018-03-21 19:12:14 +00:00
Bryce Lee
3ebf5e3507 Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev 2018-03-21 19:01:36 +00:00
Brad Ebinger
fb241e2250 Merge "Added Locking for MmTelFeature" into pi-dev 2018-03-21 18:56:00 +00:00
Lucas Dupin
22ef7b6356 Merge "Renamed config_dozeAfterScreenOff" into pi-dev
am: 425812c8b4

Change-Id: Idbcdb70caeddd08db6246ea79d554aa8fb65bf54
2018-03-21 18:52:23 +00:00
nharold
baa4bf51c1 Merge "Add NonNull Annotations To IpSec API Surface" 2018-03-21 18:49:44 +00:00
Winson Chung
d0bf944c3d Merge "Fix issue with slippery state for quickstep button case." into pi-dev 2018-03-21 18:47:41 +00:00
Andrew Sapperstein
f83c6639f9 Merge "Update material_deep_teal_500 to #008577." into pi-dev
am: 74d9b14f21

Change-Id: Ia8bb80846588b20da5957b6393fb216afed42435
2018-03-21 18:39:12 +00:00
Beverly
ea28fee05d Merge "Category message is sufficient for message notif" into pi-dev
am: b24d84b222

Change-Id: I5502cade1ec859215f76d29966f0663f387cc433
2018-03-21 18:31:47 +00:00
Chavi Weingarten
ab762775d5 Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev 2018-03-21 18:30:13 +00:00
Adrian Roos
d87d2bd657 Merge "Preserve letterbox while dragResizing" into pi-dev
am: 2dae40bfe6

Change-Id: I7756f489afd1d26d63438672d599bfbb0b415bdb
2018-03-21 18:29:12 +00:00
Fyodor Kupolov
07c746cdf3 Merge "Include additional information in the dumpsys" into pi-dev
am: 38e09dd7e1

Change-Id: I3dd0f79193cdb71b46ff9d4477d431ee6a703fb3
2018-03-21 18:25:44 +00:00
Tim Volodine
03d64cdd9e Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
am: 158a18108b

Change-Id: I557685531c2d80fd3eb4792d5b8aacffd9ae7d2e
2018-03-21 18:15:52 +00:00
TreeHugger Robot
8e861350de Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev 2018-03-21 18:05:21 +00:00
Lucas Dupin
425812c8b4 Merge "Renamed config_dozeAfterScreenOff" into pi-dev 2018-03-21 18:04:49 +00:00
Yao Chen
cd7f90053d Enable sanitizer on statsd eng build.
Bug: 74946342

Test: manual
Change-Id: I287def435d077670814db50e4d8398ecee539b74
2018-03-21 11:04:37 -07:00
Svet Ganov
97937b59ab Merge "Make autofill save UI RTL compliant" into pi-dev
am: de51e0c615

Change-Id: I66dcaea04f2867f8984bfc58bd58df567bbb4b45
2018-03-21 17:59:09 +00:00
Android Build Merger (Role)
743d013856 Merge "Merge "Some Slices API refinement" into pi-dev am: 1543171d3e" into pi-dev-plus-aosp 2018-03-21 17:54:22 +00:00
Tej Singh
7adbaa15f1 Merge "Logging: Bluetooth Enabled" am: 8173db40c3
am: 02a75203a0

Change-Id: I72a3a8dc70d9baa18d93aa62d94b3c3b7fac4c76
2018-03-21 17:49:44 +00:00
Jason Monk
e98e31ce3f Merge "Some Slices API refinement" into pi-dev
am: 1543171d3e

Change-Id: Ib921eac77b9154800aa784ec3d3f4846f788a9a7
2018-03-21 17:45:59 +00:00
TreeHugger Robot
74d9b14f21 Merge "Update material_deep_teal_500 to #008577." into pi-dev 2018-03-21 17:45:25 +00:00
TreeHugger Robot
b24d84b222 Merge "Category message is sufficient for message notif" into pi-dev 2018-03-21 17:43:40 +00:00