OSDN Git Service
TreeHugger Robot [Mon, 4 Jun 2018 01:47:52 +0000 (01:47 +0000)]
Merge "Let drag down to dismiss for PIP be configurable by an XML option."
TreeHugger Robot [Sun, 3 Jun 2018 05:32:33 +0000 (05:32 +0000)]
Merge "Dump activities that handle when USB devices get plugged in"
John Reck [Fri, 1 Jun 2018 23:02:30 +0000 (16:02 -0700)]
Merge "Ensure picture isn't recording in createBitmap" into pi-dev am:
c4f520ddb6
am:
39636318ca
Change-Id: If964e798cf39c03cb6d2232d103dbd7bf4941d5a
John Reck [Fri, 1 Jun 2018 22:46:52 +0000 (15:46 -0700)]
Merge "Ensure picture isn't recording in createBitmap" into pi-dev
am:
c4f520ddb6
Change-Id: Ia5170bac1cb32c1ce860c01ee499aab134e22ed0
John Reck [Fri, 1 Jun 2018 22:25:52 +0000 (22:25 +0000)]
Merge "Ensure picture isn't recording in createBitmap" into pi-dev
Alan Viverette [Fri, 1 Jun 2018 20:55:36 +0000 (13:55 -0700)]
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev am:
4eca92d579
am:
feff976273
Change-Id: Ic65bbb9a62243682a3a7815120c04074140fc54f
Alan Viverette [Fri, 1 Jun 2018 20:41:12 +0000 (13:41 -0700)]
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev
am:
4eca92d579
Change-Id: Iba6e9fcf6e697cc630e36b81b27ad1c80a6aa2d6
Alan Viverette [Fri, 1 Jun 2018 20:29:04 +0000 (20:29 +0000)]
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev
Bill Yi [Fri, 1 Jun 2018 19:59:37 +0000 (12:59 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
ce67e5d1d5 -s ours
am:
66e3c8428c -s ours
Change-Id: I0f00ed9d07d325cf76e4c0abda30d99dedab2e1d
John Reck [Fri, 1 Jun 2018 19:39:50 +0000 (12:39 -0700)]
Ensure picture isn't recording in createBitmap
Picture#draw() will silently due an #endRecording() if it
wasn't called. Bitmap.createBitmap doesn't do this until
after it's too late.
So do an up-front #endRecording() to ensure state is
good to go
Bug:
80539264
Test: HardwareBitmapTests#testReadbackThroughPictureNoEndRecording
Change-Id: Ic66c41462e88880b73c5093d7541c4ce3d71adeb
Bill Yi [Fri, 1 Jun 2018 19:52:05 +0000 (12:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ce67e5d1d5 -s ours
Change-Id: I793e236feb2666c7ec2081b6cab4cc474eda7a1f
TreeHugger Robot [Fri, 1 Jun 2018 19:35:37 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Pavel Maltsev [Fri, 1 Jun 2018 18:52:25 +0000 (11:52 -0700)]
[automerger skipped] Merge "Fix comments to reflect changes in eth service" am:
1f392c468a am:
967ee98726 -s ours
am:
828e428b6b -s ours
Change-Id: Ibb2e554cffe4d2a114548ed44910f8267b20b2de
Bill Yi [Fri, 1 Jun 2018 18:42:04 +0000 (11:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
1c0fac386f -s ours
am:
19e8bae596 -s ours
Change-Id: I94e42a405120c90c58e9f340db42295575c8bb14
Pavel Maltsev [Fri, 1 Jun 2018 18:40:16 +0000 (11:40 -0700)]
[automerger skipped] Merge "Fix comments to reflect changes in eth service" am:
1f392c468a
am:
967ee98726 -s ours
Change-Id: Ia330744195e2e4ac9182b762ae3c89c1602d3727
Bill Yi [Fri, 1 Jun 2018 18:32:11 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1c0fac386f -s ours
Change-Id: I525a8a78e4fd17b533505e2d5fed9de0d1e5e5d9
Bill Yi [Fri, 1 Jun 2018 18:28:39 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e1475f7ceb9b2b0b37ff52297f550c2b2b6cb0d
Pavel Maltsev [Fri, 1 Jun 2018 18:28:04 +0000 (11:28 -0700)]
Merge "Fix comments to reflect changes in eth service"
am:
1f392c468a
Change-Id: I542f43603ef19387c57b74cdadf0900548256c39
TreeHugger Robot [Fri, 1 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Hongming Jin [Fri, 1 Jun 2018 17:48:38 +0000 (10:48 -0700)]
Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug:
77821568" into pi-dev am:
dbc6052022
am:
e2304c2ed4
Change-Id: I4a9f0c4fae6dc286fd671c007e3ff39ac357282f
Hongming Jin [Fri, 1 Jun 2018 17:36:14 +0000 (10:36 -0700)]
Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug:
77821568" into pi-dev
am:
dbc6052022
Change-Id: I137f5df296a05d7ec128427d8aafd5ae66b519f7
Treehugger Robot [Fri, 1 Jun 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Fix comments to reflect changes in eth service"
Aurimas Liutikas [Fri, 1 Jun 2018 17:16:09 +0000 (17:16 +0000)]
Merge "Fix broken links in @see tags in framework docs."
Aurimas Liutikas [Fri, 1 Jun 2018 04:07:32 +0000 (21:07 -0700)]
Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.
Test: make docs
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
Change-Id: I767e9fb9842494e5eccef2a7bdeee3877c488b5d
Hongming Jin [Fri, 1 Jun 2018 17:15:21 +0000 (17:15 +0000)]
Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug:
77821568" into pi-dev
Lucas Dupin [Fri, 1 Jun 2018 16:29:26 +0000 (16:29 +0000)]
Merge "Update scrim during sensor event"
Bill Yi [Fri, 1 Jun 2018 13:50:46 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I35f7064ae1d2f8bde001b3b201a9107736a077e5
Nicolas Geoffray [Fri, 1 Jun 2018 13:44:18 +0000 (06:44 -0700)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev am:
f225af4f6c
am:
c28b26d24c
Change-Id: Ic369dcda7e881c4f64eba2a7a17ef4035c04cf53
Tiger Huang [Fri, 1 Jun 2018 13:38:50 +0000 (06:38 -0700)]
[automerger skipped] Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev am:
a41c75d6d0
am:
85a2ecd99a -s ours
Change-Id: Idbb741af07855683da59fa8e07768e335047f734
Bill Yi [Fri, 1 Jun 2018 13:33:10 +0000 (06:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
a70ada7ebd -s ours
am:
2aa9dc1174 -s ours
Change-Id: I7ece335938cf8909642ed646d63d5428603e17c0
Erik Kline [Fri, 1 Jun 2018 13:31:36 +0000 (06:31 -0700)]
Merge "Clear IPv4 address on tethering teardown." into pi-dev am:
36d41793e2
am:
91368ac791
Change-Id: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd
Makoto Onuki [Fri, 1 Jun 2018 13:25:46 +0000 (06:25 -0700)]
Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev am:
079f6d7fa6
am:
137f9f65a9
Change-Id: I58fa7dc25171e959d2467578bdc2bf428fab6187
Robert Carr [Fri, 1 Jun 2018 13:20:41 +0000 (06:20 -0700)]
Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev am:
7d2d403a83
am:
0371d71029
Change-Id: I8c01261634198040fd9dab3f6f5582476d40f246
John Reck [Fri, 1 Jun 2018 13:14:33 +0000 (06:14 -0700)]
[automerger skipped] Merge "Attempting to fix the black flicker" into pi-dev am:
b559512508
am:
8b3480c667 -s ours
Change-Id: Ic8925870444b241610bd500a7f4d6ceedc989df8
Nicolas Geoffray [Fri, 1 Jun 2018 12:04:23 +0000 (05:04 -0700)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev
am:
f225af4f6c
Change-Id: I024d5569d7b8ffb1105e9c78f16c7e2ad814e24b
Tiger Huang [Fri, 1 Jun 2018 11:58:42 +0000 (04:58 -0700)]
Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
am:
a41c75d6d0
Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd
Bill Yi [Fri, 1 Jun 2018 11:53:17 +0000 (04:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a70ada7ebd -s ours
Change-Id: I60e1afeade49ea7180987d7c67674c98ad3502a2
Erik Kline [Fri, 1 Jun 2018 11:51:36 +0000 (04:51 -0700)]
Merge "Clear IPv4 address on tethering teardown." into pi-dev
am:
36d41793e2
Change-Id: Ie898adc4efbb7376f0297abacdfe39c8700f0722
Makoto Onuki [Fri, 1 Jun 2018 11:46:08 +0000 (04:46 -0700)]
Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
am:
079f6d7fa6
Change-Id: I299267e20b78810002bab56488b9436456936d11
Robert Carr [Fri, 1 Jun 2018 11:40:41 +0000 (04:40 -0700)]
Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev
am:
7d2d403a83
Change-Id: I583fc7299ddd319e90a33c1f8d07157f52e0975a
John Reck [Fri, 1 Jun 2018 11:31:50 +0000 (04:31 -0700)]
Merge "Attempting to fix the black flicker" into pi-dev
am:
b559512508
Change-Id: I95ee7346a8d2f10c07185d3c386a7ee778f6bd98
TreeHugger Robot [Fri, 1 Jun 2018 09:39:35 +0000 (09:39 +0000)]
Merge "DisplayCutout: make cutout info available on Display object"
Derek Sollenberger [Fri, 1 Jun 2018 09:08:18 +0000 (02:08 -0700)]
[automerger skipped] Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev am:
6a1df0d541
am:
fe1c990a57 -s ours
Change-Id: I0ca0757882af23f1655994ed62ce1691fed7e105
Nicolas Geoffray [Fri, 1 Jun 2018 08:57:34 +0000 (08:57 +0000)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev
Winson Chung [Fri, 1 Jun 2018 08:56:55 +0000 (01:56 -0700)]
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev am:
83bf0877b8
am:
5ccabc2c66
Change-Id: I74d3441e12366638a7cf5219e4db6bc24b1d367c
Hall Liu [Fri, 1 Jun 2018 08:50:30 +0000 (01:50 -0700)]
Merge "Move the "repeated calls" caveat" into pi-dev am:
7897fa3b9a
am:
7236332a74
Change-Id: Id9988e67a0ac70ec71da92cb6ae8e914fbc66361
Winson Chung [Fri, 1 Jun 2018 08:39:34 +0000 (01:39 -0700)]
Merge "Fix regression in virtual key haptics" into pi-dev am:
c197176cd2
am:
29218b8fc7
Change-Id: Ic763bc85534ec34082b50aeacef26786ce234161
Colin Cross [Fri, 1 Jun 2018 08:28:11 +0000 (01:28 -0700)]
[automerger skipped] Merge "Add support for --replace-version to aapt2" am:
186be90eb6 am:
5c0601d65a -s ours
am:
a0a864e571 -s ours
Change-Id: Idab3c2644f91a6e42b6e25a75b1cdaf4cb152f37
Hall Liu [Fri, 1 Jun 2018 08:14:44 +0000 (01:14 -0700)]
Merge "Merge "Fix MbmsDownloadSession documentation" am:
bb2ce1010e am:
76f1bd4979" into pi-dev-plus-aosp
am:
273d167d62
Change-Id: Ia5c8b5fbc7c6b30249efb38493cbdfac8012bb3a
Winson Chung [Fri, 1 Jun 2018 07:56:03 +0000 (00:56 -0700)]
Merge "Skip task overlay in calcuating task description" into pi-dev am:
d17d5a487d
am:
b11ca32c54
Change-Id: I52aa3ec9151d905008af771c77e7ba486cf870c8
Tiger Huang [Fri, 1 Jun 2018 07:49:56 +0000 (07:49 +0000)]
Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
Eeshan Shrimali [Fri, 1 Jun 2018 07:43:09 +0000 (00:43 -0700)]
Merge "DCB whitelist shortcode for user association" am:
b17d1962b7 am:
53f46128a0
am:
2ea7cf2299
Change-Id: I5360c4741789fccb4b8e38e970db39bdc31613bf
TreeHugger Robot [Fri, 1 Jun 2018 06:00:23 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 1 Jun 2018 05:53:35 +0000 (05:53 +0000)]
Merge "Clear IPv4 address on tethering teardown." into pi-dev
Makoto Onuki [Fri, 1 Jun 2018 05:35:02 +0000 (05:35 +0000)]
Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
Eliot Courtney [Fri, 1 Jun 2018 05:26:26 +0000 (14:26 +0900)]
Let drag down to dismiss for PIP be configurable by an XML option.
Bug:
80111808
Test: PIP functions as before when the option is true, and can't be dragged down
to dismiss when it is false.
Change-Id: I9f719c3d6fa7c81c8f437fc4917cb2d8754183b5
Erik Kline [Fri, 18 May 2018 07:09:24 +0000 (16:09 +0900)]
Clear IPv4 address on tethering teardown.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- wlan0 in STA mode, wlan1 up/down in AP mode
no lingering IPv4 mode
- USB tethering up/down works
- bluetooth tethering yields:
05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
which is acceptable (no actual crash, just a log message)
Bug:
79905644
Change-Id: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
Derek Sollenberger [Fri, 1 Jun 2018 03:51:45 +0000 (20:51 -0700)]
Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev
am:
6a1df0d541
Change-Id: Idd4a3432df50e502a84747d240a1940bf3cb6b8c
Winson Chung [Fri, 1 Jun 2018 03:43:09 +0000 (20:43 -0700)]
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev
am:
83bf0877b8
Change-Id: Ic5af6c8eb39025f76c89ea8900ca2302c00ff209
Hall Liu [Fri, 1 Jun 2018 03:33:01 +0000 (20:33 -0700)]
Merge "Move the "repeated calls" caveat" into pi-dev
am:
7897fa3b9a
Change-Id: Ifbc5e1ffb1093ae9e5abd398dbb3eb190d67142f
Winson Chung [Fri, 1 Jun 2018 03:23:26 +0000 (20:23 -0700)]
Merge "Fix regression in virtual key haptics" into pi-dev
am:
c197176cd2
Change-Id: Ifef4e6978d0731b6270eb0fc0b1fe23fe27d1d3b
TreeHugger Robot [Fri, 1 Jun 2018 03:21:19 +0000 (03:21 +0000)]
Merge "Make startDrag protected."
Colin Cross [Fri, 1 Jun 2018 03:19:27 +0000 (20:19 -0700)]
[automerger skipped] Merge "Add support for --replace-version to aapt2" am:
186be90eb6
am:
5c0601d65a -s ours
Change-Id: I7614f591744a46274e657f38dcf9ee364c274d1a
TreeHugger Robot [Fri, 1 Jun 2018 03:15:13 +0000 (03:15 +0000)]
Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev
Android Build Merger (Role) [Fri, 1 Jun 2018 03:14:52 +0000 (03:14 +0000)]
Merge "Merge "Fix MbmsDownloadSession documentation" am:
bb2ce1010e am:
76f1bd4979" into pi-dev-plus-aosp
Hall Liu [Fri, 1 Jun 2018 03:14:22 +0000 (20:14 -0700)]
Merge "Fix MbmsDownloadSession documentation" am:
bb2ce1010e
am:
76f1bd4979
Change-Id: I10d8c3edbb2c2a9940d5f4f7ee8486a490ad4a5e
Winson Chung [Fri, 1 Jun 2018 03:11:17 +0000 (20:11 -0700)]
Merge "Skip task overlay in calcuating task description" into pi-dev
am:
d17d5a487d
Change-Id: Ib135f9d0c3a5ccf3aace66996659264d99dc71ab
Tiger Huang [Thu, 17 May 2018 08:45:56 +0000 (16:45 +0800)]
Prevent infinite layout while hiding nav bar on keyguard
By the original logic, if there is a focused window which hides
navigation bar while keyguard is showing, PhoneWindowManager would
hide/show navigation bar frequently, which caused infinite layout.
Bug:
78681867
Bug:
79896018
Bug:
80113279
Test: 1. a. Open a photo in fullscreen mode (hiding navigation bar)
b. Press power key to bring up keyguard
c. See if there is "Performed 6 layouts in a row. Skipping"
log
2. go/wm-smoke
3. Open a video in YouTube in fullscreen mode and then expand
status bar, and see if navigation bar would show; collapse
status bar, and see if navigation bar would hide
Change-Id: Id8c49ac8fc45b98294e48017308dce3117ed1cf8
Merged-In: Id8c49ac8fc45b98294e48017308dce3117ed1cf8
(cherry picked from commit
53e8cfe794ef0e1295e526b21c557c2a17e597ad)
Eeshan Shrimali [Fri, 1 Jun 2018 03:07:12 +0000 (20:07 -0700)]
Merge "DCB whitelist shortcode for user association" am:
b17d1962b7
am:
53f46128a0
Change-Id: I5ae2ed05ffd2bc2c73bed7c4e223ab1cbd24c870
John Reck [Fri, 1 Jun 2018 03:05:51 +0000 (03:05 +0000)]
Merge "Attempting to fix the black flicker" into pi-dev
Derek Sollenberger [Fri, 1 Jun 2018 02:51:51 +0000 (02:51 +0000)]
Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev
Bill Yi [Fri, 1 Jun 2018 02:29:24 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id3ec2d329e661c984e51de0960c46c136ca69627
Winson Chung [Fri, 1 Jun 2018 01:35:27 +0000 (01:35 +0000)]
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev
Colin Cross [Fri, 1 Jun 2018 01:21:46 +0000 (18:21 -0700)]
[automerger skipped] Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp
am:
0433fc4e98 -s ours
Change-Id: I60236002788bb781ee524b5058761e3c57a622c1
Hall Liu [Fri, 1 Jun 2018 01:14:37 +0000 (01:14 +0000)]
Merge "Move the "repeated calls" caveat" into pi-dev
Andrii Kulian [Fri, 1 Jun 2018 01:12:35 +0000 (18:12 -0700)]
Merge "Don't pause non-top activities when making visible" into pi-dev am:
a798833075
am:
0ad1df7817
Change-Id: I7c436e801112bf4455fb3aa64b56b061148d7d98
Derek Sollenberger [Wed, 30 May 2018 22:08:57 +0000 (18:08 -0400)]
Bind correct FBO when drawing a WebView into a layer.
The WebView was unable to draw into either a standard clipped
layer or the "fading edges" unclipped layer. This CL and its
companion test cases ensure that both work with simple and
complex clips.
Bug:
79619253
Bug:
80443556
Bug:
80477645
Test: atest CtsUiRenderingTestCases:.LayerTests
Merged-In: I0e16b724f74415a61cc2a841ccf4a491f293ac94
Change-Id: I4900222975fc841b11828916878fb0ea6d87dcda
Fyodor Kupolov [Fri, 1 Jun 2018 01:06:23 +0000 (01:06 +0000)]
Merge "Use sampling for faster measuring of CPU time"
Winson Chung [Fri, 1 Jun 2018 00:40:46 +0000 (00:40 +0000)]
Merge "Fix regression in virtual key haptics" into pi-dev
Colin Cross [Fri, 1 Jun 2018 00:38:48 +0000 (17:38 -0700)]
Merge "Add support for --replace-version to aapt2"
am:
186be90eb6
Change-Id: I6397623d883af229a8941bd26a084d09d40f48c9
Lucas Dupin [Fri, 1 Jun 2018 00:34:32 +0000 (17:34 -0700)]
Update scrim during sensor event
Scheduling the next frame might not be enough
since we must fade out right after the screen
turns on.
Test: systrace
Change-Id: I1bcdd0a99445d0f15f9021bcb393fae7a7c3a4bc
Fixes:
80350698
Hall Liu [Fri, 1 Jun 2018 00:33:55 +0000 (17:33 -0700)]
Merge "Fix MbmsDownloadSession documentation"
am:
bb2ce1010e
Change-Id: Ibe39e6526e7cc89dc95eac90fcb0a431938ca307
Daichi Hirono [Thu, 31 May 2018 03:32:23 +0000 (12:32 +0900)]
Make startDrag protected.
CL I62688119eafd8bbc4760236c0f4b453dca74dc80 changed the visibility of
startDrag from package to private. However the method is used by a child
class of TaskPositioner.
The CL changes the visibility of startDrag to protected.
Bug: None
Test: make
Merged-In: I7d827d639a681eec9f8fbbd5fd976710d87cf1cc
Change-Id: I7d827d639a681eec9f8fbbd5fd976710d87cf1cc
Android Build Merger (Role) [Fri, 1 Jun 2018 00:25:17 +0000 (00:25 +0000)]
Merge "Merge "Camera: add new detailed error callback" into pi-dev am:
d4c5d1e448 am:
e384ef8768"
Yin-Chia Yeh [Fri, 1 Jun 2018 00:23:42 +0000 (17:23 -0700)]
Merge "Camera: add new detailed error callback" into pi-dev am:
d4c5d1e448
am:
e384ef8768
Change-Id: I51f4468eb6ac33a861459be2850554a7e0117a4a
Eeshan Shrimali [Fri, 1 Jun 2018 00:23:12 +0000 (17:23 -0700)]
Merge "DCB whitelist shortcode for user association"
am:
b17d1962b7
Change-Id: I802a1ecd1ff23e15860ed03e22491476aec2d3ed
TreeHugger Robot [Fri, 1 Jun 2018 00:21:45 +0000 (00:21 +0000)]
Merge "Fix magnification offset min and max calculation"
Hongming Jin [Fri, 18 May 2018 17:47:57 +0000 (10:47 -0700)]
Enforce permission check before returning application info
Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest
Bug:
77821568
Change-Id: I7554805c36c0c2552163dad7b07cfc5f552b624e
Shuzhen Wang [Fri, 1 Jun 2018 00:17:39 +0000 (17:17 -0700)]
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev am:
fe8c263011
am:
7696265ef6
Change-Id: I5e5ab8aaf98e55a2ebd512b41b8caa25c8232024
TreeHugger Robot [Fri, 1 Jun 2018 00:08:58 +0000 (00:08 +0000)]
Merge "Skip task overlay in calcuating task description" into pi-dev
Todd Kennedy [Fri, 1 Jun 2018 00:04:34 +0000 (17:04 -0700)]
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev am:
2f898c4df5
am:
87fbe89e5d
Change-Id: Id80937d84f4e1b28673b1e6b6ee6c4741b01efb0
Hall Liu [Thu, 31 May 2018 23:45:09 +0000 (16:45 -0700)]
Merge "Fix MbmsDownloadSession documentation" into pi-dev am:
73942715f3
am:
b7e5cd58ac
Change-Id: I66e3e6ebbd087cc08ce06231a8bb5502e210e373
Jason Monk [Thu, 31 May 2018 23:40:50 +0000 (16:40 -0700)]
Merge "Don't use stable providers for slices" into pi-dev am:
de8e3c227c
am:
b9e5da09b5
Change-Id: Ia10ee4f9ca75d4bba58aa33e386fb929e987a68a
Mady Mellor [Thu, 31 May 2018 23:35:21 +0000 (16:35 -0700)]
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev am:
1031bf5f76
am:
6f4f0da87e
Change-Id: I0a9c0243b87bad281776b5560c8c57945934f855
Paul Lawrence [Thu, 31 May 2018 23:30:49 +0000 (16:30 -0700)]
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev am:
89e1217c8f
am:
3dc6c2b6cd
Change-Id: I8c43da05791e5eda0517c4b97318280e67fec7f2
Hall Liu [Thu, 31 May 2018 23:26:01 +0000 (16:26 -0700)]
Move the "repeated calls" caveat
Previous CL put the "repeated calls will replace the listener" comment
on the wrong method. Fixing.
Bug:
80493663
Test: None, doc change
Change-Id: I2736a582d79b3b2f204519c649d82d9ba912e1e5
TreeHugger Robot [Thu, 31 May 2018 23:19:51 +0000 (23:19 +0000)]
Merge "Attempting to fix the black flicker"
Brad Ebinger [Thu, 31 May 2018 23:18:39 +0000 (16:18 -0700)]
Merge "IMS: Support for Implicit Call Rejection" am:
19d032b695 am:
982ceb81a9
am:
f122c22c50
Change-Id: Ia98671f03e7ba6eac03c0d2cdbac949ecb76cca4
Winson Chung [Thu, 31 May 2018 22:51:47 +0000 (15:51 -0700)]
Update the task stack state when resizing the tasks after the PiP animation
- When the animation into PiP ends, we clear the task stack state and
request a layout prior to resizing the the stack to update the task
bounds to the stack bounds. This triggers a relayout from the client,
which fetches the new configuration prior to handling the PiP mode/config
change scheduled as a part of the PiP mode change.
We can instead update the task stack state when we resize the tasks to
ensure that we don't relayout multiple times.
Bug:
75995355
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests
Change-Id: I58a6e30651f16b85ec160e977554b8d091b461ec
Calin Juravle [Thu, 31 May 2018 23:00:58 +0000 (16:00 -0700)]
Merge "Update the boot image profile and preloaded classes" into pi-dev am:
a78334f80c
am:
97208b949b
Change-Id: I539fa2b2d617db3c4d9c0dfab49ab424cba241b6