Colin Cross
0433fc4e98
Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp
2018-05-31 22:53:13 +00:00
Andrii Kulian
0ad1df7817
Merge "Don't pause non-top activities when making visible" into pi-dev
...
am: a798833075
2018-05-31 15:52:00 -07:00
Andrii Kulian
a798833075
Merge "Don't pause non-top activities when making visible" into pi-dev
2018-05-31 22:35:10 +00:00
Yin-Chia Yeh
e384ef8768
Merge "Camera: add new detailed error callback" into pi-dev
...
am: d4c5d1e448
2018-05-31 15:12:00 -07:00
Shuzhen Wang
7696265ef6
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
...
am: fe8c263011
2018-05-31 15:04:52 -07:00
Todd Kennedy
87fbe89e5d
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
...
am: 2f898c4df5
2018-05-31 14:56:10 -07:00
Hall Liu
b7e5cd58ac
Merge "Fix MbmsDownloadSession documentation" into pi-dev
...
am: 73942715f3
2018-05-31 14:51:26 -07:00
Jason Monk
b9e5da09b5
Merge "Don't use stable providers for slices" into pi-dev
...
am: de8e3c227c
2018-05-31 14:46:38 -07:00
Mady Mellor
6f4f0da87e
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
...
am: 1031bf5f76
2018-05-31 14:41:33 -07:00
Paul Lawrence
3dc6c2b6cd
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
...
am: 89e1217c8f
2018-05-31 14:21:39 -07:00
TreeHugger Robot
d4c5d1e448
Merge "Camera: add new detailed error callback" into pi-dev
2018-05-31 21:11:24 +00:00
Brad Ebinger
f122c22c50
Merge "IMS: Support for Implicit Call Rejection" am: 19d032b695
...
am: 982ceb81a9
2018-05-31 14:02:10 -07:00
TreeHugger Robot
fe8c263011
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
2018-05-31 20:50:33 +00:00
TreeHugger Robot
2f898c4df5
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
2018-05-31 20:41:01 +00:00
Hall Liu
73942715f3
Merge "Fix MbmsDownloadSession documentation" into pi-dev
2018-05-31 20:34:42 +00:00
TreeHugger Robot
de8e3c227c
Merge "Don't use stable providers for slices" into pi-dev
2018-05-31 20:21:16 +00:00
Yin-Chia Yeh
a07cd32684
Camera: add new detailed error callback
...
For the legacy shim layer to tell the difference between evction
and disable error.
Test: CTS CameraEvictionTest + IdleUidTest
Bug: 77486868
Change-Id: I5b68f55460287634903c9b8b42188d9dec8744d5
2018-05-31 12:24:55 -07:00
Shuzhen Wang
e7d3cd0a76
Camera: Document getNumberOfCameras behavior for logical camera
...
For camera1 API, framework only exposes one camera id for every
logical/physical camera id group. Document this behavior accordingly.
Test: Build
Bug: 80075565
Change-Id: I32c2de84d27a603d485014255bf1fad5031aa08e
2018-05-31 12:21:37 -07:00
Calin Juravle
97208b949b
Merge "Update the boot image profile and preloaded classes" into pi-dev
...
am: a78334f80c
2018-05-31 12:16:38 -07:00
Jason Monk
f65e34a95b
Merge "Protect broadcasts we use to talk to settings" into pi-dev
...
am: 3dbd752246
2018-05-31 12:11:28 -07:00
Brad Ebinger
982ceb81a9
Merge "IMS: Support for Implicit Call Rejection"
...
am: 19d032b695
2018-05-31 12:10:05 -07:00
Mady Mellor
1031bf5f76
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
2018-05-31 18:50:26 +00:00
TreeHugger Robot
89e1217c8f
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
2018-05-31 18:49:38 +00:00
Android Build Merger (Role)
358c593f33
Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp
2018-05-31 18:34:00 +00:00
Pavel Maltsev
d400338c6b
Merge "Fix comments to reflect changes in eth service" into pi-dev
...
am: 44f7147084
2018-05-31 11:33:20 -07:00
Android Build Merger (Role)
8ea57c6592
Merge "Merge "Updates to shared lib for Launcher" into pi-dev am: f4833c4fb2" into pi-dev-plus-aosp
2018-05-31 18:27:13 +00:00
Jorim Jaggi
4edb110569
Merge "Updates to shared lib for Launcher" into pi-dev
...
am: f4833c4fb2
2018-05-31 11:26:41 -07:00
Remi NGUYEN VAN
e6657a0cca
Merge "Add missing dependencies for libdexfile" am: 286aa939af
...
am: e78185076c
2018-05-31 11:25:40 -07:00
Adrian Roos
d955cdf889
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
...
am: aceee95fa0
2018-05-31 11:22:16 -07:00
David Brazdil
a782e5dbbf
More additions to hidden API list greylist
...
am: 132e75bd51
2018-05-31 11:17:46 -07:00
David Brazdil
e084cb25c1
[automerger skipped] Merge "Build dark greylist from public + light grey API" into pi-dev
...
am: abed288a08
2018-05-31 11:15:46 -07:00
Jason Monk
ce1beadc09
Don't use stable providers for slices
...
Because they aren't what we want.
Test: manual + existing tests
Bug: 80532760
Change-Id: Ib69799a2ef9440d0d67cea02e6b3c61844535755
2018-05-31 14:12:52 -04:00
David Brazdil
b39e4589c7
[automerger skipped] Build dark greylist from public + light grey API
...
am: 94c2ab6562
2018-05-31 11:02:28 -07:00
Nicolas Geoffray
c657c961dc
Merge "Add MediaMuxer APIs to light grey." into pi-dev
...
am: cbe39d1a56
2018-05-31 10:56:29 -07:00
Felka Chang
fdae858850
Merge "Fix text is cut off in corner cut out condition" into pi-dev
...
am: 544cbc9b97
2018-05-31 10:52:02 -07:00
Nicolas Geoffray
3428cbf8fe
Merge "Hidden API bugbot update" into pi-dev
...
am: b50d9f8123
2018-05-31 10:47:28 -07:00
Bill Yi
ae790fc733
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 737d83180e
2018-05-31 10:42:55 -07:00
Lorenzo Colitti
fc9df9896c
Merge "Don't complain if a VPN changes capabilities." into pi-dev
...
am: 0a93a3530d
2018-05-31 10:41:34 -07:00
Calin Juravle
a78334f80c
Merge "Update the boot image profile and preloaded classes" into pi-dev
2018-05-31 17:31:48 +00:00
Remi NGUYEN VAN
e78185076c
Merge "Add missing dependencies for libdexfile"
...
am: 286aa939af
2018-05-31 10:27:22 -07:00
TreeHugger Robot
3dbd752246
Merge "Protect broadcasts we use to talk to settings" into pi-dev
2018-05-31 17:20:21 +00:00
Brad Ebinger
19d032b695
Merge "IMS: Support for Implicit Call Rejection"
2018-05-31 16:45:20 +00:00
TreeHugger Robot
44f7147084
Merge "Fix comments to reflect changes in eth service" into pi-dev
2018-05-31 16:40:36 +00:00
Jorim Jaggi
f4833c4fb2
Merge "Updates to shared lib for Launcher" into pi-dev
2018-05-31 15:50:31 +00:00
TreeHugger Robot
aceee95fa0
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
2018-05-31 15:40:16 +00:00
Jason Monk
636741f84a
Protect broadcasts we use to talk to settings
...
Test: manual
Change-Id: If383f94caccc0221e4a34a388142ff9ca4c00d29
Fixes: 80245419
2018-05-31 10:32:57 -04:00
David Brazdil
132e75bd51
More additions to hidden API list greylist
...
Bug: 80456099
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: Iee44f02c83e5d2c68e09b6c4f62c8faff2e74df8
2018-05-31 14:21:32 +01:00
David Brazdil
abed288a08
Merge "Build dark greylist from public + light grey API" into pi-dev
2018-05-31 12:20:57 +00:00
Adrian Roos
8b29a8407e
Cutout Overlay: Flip color in inverted color mode
...
Flips the color when the screen is inverted such
that it will end up black again after composition.
Change-Id: I8800c666b60061a58f1345a2609a088a02e82f48
Fixes: 80102202
Test: Enable cutout overlay, enable color inversion, verify overlay is black.
2018-05-31 14:14:13 +02:00
TreeHugger Robot
cbe39d1a56
Merge "Add MediaMuxer APIs to light grey." into pi-dev
2018-05-31 10:27:18 +00:00
