OSDN Git Service
Bill Yi [Mon, 4 Jun 2018 17:37:50 +0000 (10:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
499ab31d92 -s ours
Change-Id: Ib34d094c16349d566a109cc8ec89607aaccdfacc
Bill Yi [Mon, 4 Jun 2018 17:35:19 +0000 (10:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
eecbf8d318 -s ours
Change-Id: I8ca084bda9030e414fb44c58b441ab23f62215ea
Bill Yi [Mon, 4 Jun 2018 17:32:27 +0000 (10:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
874fab7208 -s ours
Change-Id: I2640ed95dfa28b37365ed77d284c2ce547506b8e
Bill Yi [Mon, 4 Jun 2018 17:26:27 +0000 (10:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aef1031ce6 -s ours
Change-Id: I0409ab5ffae60156820044018b323b5385692aa6
Bill Yi [Mon, 4 Jun 2018 17:07:15 +0000 (10:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0edea4caec -s ours
Change-Id: I6c4f3bea431c06a4f9e0d843a752f1ecb8eac0f0
TreeHugger Robot [Sun, 3 Jun 2018 22:34:21 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:26:29 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:22:26 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 3 Jun 2018 22:22:20 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 3 Jun 2018 14:48:00 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3d8f7c63c86424767ea717511e218c090090a5a2
Bill Yi [Sun, 3 Jun 2018 14:40:47 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie47fd40001b22ebd53a452443a52fb3449c3ee68
Bill Yi [Sun, 3 Jun 2018 12:41:32 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I470dc0700da24f49ea47c107089be2fc91175e87
Bill Yi [Sun, 3 Jun 2018 11:01:15 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ide5351c17e5deb31ebccd586440cf7755bb9b9de
Bill Yi [Sun, 3 Jun 2018 10:47:25 +0000 (03:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b358135c0013b5ba30f5d416fd252d474f090bf
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: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
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: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: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"
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
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 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
Nicolas Geoffray [Fri, 1 Jun 2018 08:57:34 +0000 (08:57 +0000)]
Merge "Greylist bugbot updated - Thursday edition." into pi-dev
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
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
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
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
Hall Liu [Fri, 1 Jun 2018 01:14:37 +0000 (01:14 +0000)]
Merge "Move the "repeated calls" caveat" into pi-dev
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
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
Hall Liu [Fri, 1 Jun 2018 00:33:55 +0000 (17:33 -0700)]
Merge "Fix MbmsDownloadSession documentation"
am:
bb2ce1010e
Change-Id: Ibe39e6526e7cc89dc95eac90fcb0a431938ca307
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
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
TreeHugger Robot [Fri, 1 Jun 2018 00:08:58 +0000 (00:08 +0000)]
Merge "Skip task overlay in calcuating task description" into pi-dev
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
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
Robert Carr [Thu, 31 May 2018 22:39:07 +0000 (15:39 -0700)]
Don't "notifyAppStopping" when going to sleep.
The WindowManager interprets notifyAppStopping as a signal that the
app surface will be destroyed, but in the visible stopped states
of going to sleep this may not necessarily be true. notifyAppStopping
was only recently introduced for the purposes of handling detach children
which isn't needed when turning the screen off. Simply not executing
it when turning the screen off should be safe, if a little confusing.
Test: Manual of bug + mess around with SV apps a bunch
Bug:
80491358
Bug:
72921025
Change-Id: I7dd5d1e144e12ecfba038e15f84f9ae7c02aadd2
Colin Cross [Thu, 31 May 2018 22:53:37 +0000 (22:53 +0000)]
Merge "Add support for --replace-version to aapt2"
Colin Cross [Thu, 31 May 2018 22:53:13 +0000 (22:53 +0000)]
Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp
Andrii Kulian [Thu, 31 May 2018 22:52:00 +0000 (15:52 -0700)]
Merge "Don't pause non-top activities when making visible" into pi-dev
am:
a798833075
Change-Id: I5a6fdcbd513b97f729bd52f87adc40ee25d26730
Andrii Kulian [Thu, 31 May 2018 22:35:10 +0000 (22:35 +0000)]
Merge "Don't pause non-top activities when making visible" into pi-dev
Yin-Chia Yeh [Thu, 31 May 2018 22:12:00 +0000 (15:12 -0700)]
Merge "Camera: add new detailed error callback" into pi-dev
am:
d4c5d1e448
Change-Id: I05c46b7e8558a0877d4274c5dcd86cfa9c4f2917
Shuzhen Wang [Thu, 31 May 2018 22:04:52 +0000 (15:04 -0700)]
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
am:
fe8c263011
Change-Id: I148d73a3232f02ed94234745f436edc7c676b87c
Todd Kennedy [Thu, 31 May 2018 21:56:10 +0000 (14:56 -0700)]
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
am:
2f898c4df5
Change-Id: I3c987d0d74f9f60fe23ab7d1cc815b4343503194
Makoto Onuki [Thu, 31 May 2018 18:03:56 +0000 (11:03 -0700)]
Serialize AM.getContentProvider() calls in client side
Th wait() call in AMS.getContentProviderImpl() can cause a deadlock when it
starts a new process for a target provider and all system server binder threads
are reaching out to the same provider at the same time, because AMS won't be
able to receive a callback from the provider process.
Let's serialize access to AM.getContentProvider() to avoid this scenario.
Longer team, we should stop waiting in the system server and instead do so in
the client side.
Bug:
74523247
Test: Boot, add a google account, and let syncs run and finish.
Test: Watch free video on Coursera
Change-Id: If5be2dc4b6f22f72d1bb3aa1b5b4d49f20c8d94d
Hall Liu [Thu, 31 May 2018 21:51:26 +0000 (14:51 -0700)]
Merge "Fix MbmsDownloadSession documentation" into pi-dev
am:
73942715f3
Change-Id: I9217bcd5d4d70683e788b9afc77686ac2736d429
Jason Monk [Thu, 31 May 2018 21:46:38 +0000 (14:46 -0700)]
Merge "Don't use stable providers for slices" into pi-dev
am:
de8e3c227c
Change-Id: I40b6eef84e5d44b1c185f9818953a6dba8dc9adc
Mady Mellor [Thu, 31 May 2018 21:41:33 +0000 (14:41 -0700)]
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
am:
1031bf5f76
Change-Id: I072c144a846f7eeb14aa7e9c529fb35a3489b42e
Paul Lawrence [Thu, 31 May 2018 21:21:39 +0000 (14:21 -0700)]
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
am:
89e1217c8f
Change-Id: I35b0b5f5b6b083df6be10e78b590341be64eb074
Alan Viverette [Fri, 18 May 2018 13:44:45 +0000 (13:44 +0000)]
Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"
This partially reverts commit
045abe73e2d61700dda3c6655ca2be75df8e9641.
Basically we're just removing the attributes that were explicitly
defined as null, since apparently they don't have fallback values
unless Holo is overlaid atop Material (blergh).
Bug: b/
79725570
Test: manual against from bug APK
Change-Id: I7a5fe3f96a9720e0657042ce8d5a87b2fb590327
Hall Liu [Thu, 31 May 2018 21:16:05 +0000 (21:16 +0000)]
Merge "Fix MbmsDownloadSession documentation"
TreeHugger Robot [Thu, 31 May 2018 21:11:24 +0000 (21:11 +0000)]
Merge "Camera: add new detailed error callback" into pi-dev
Brad Ebinger [Thu, 31 May 2018 21:02:10 +0000 (14:02 -0700)]
Merge "IMS: Support for Implicit Call Rejection" am:
19d032b695
am:
982ceb81a9
Change-Id: Icc22c412ab47c5a4ca895dfc6c3389a3a6202200
TreeHugger Robot [Thu, 31 May 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
Hall Liu [Thu, 31 May 2018 20:34:42 +0000 (20:34 +0000)]
Merge "Fix MbmsDownloadSession documentation" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 20:21:16 +0000 (20:21 +0000)]
Merge "Don't use stable providers for slices" into pi-dev
John Reck [Thu, 17 May 2018 17:44:00 +0000 (10:44 -0700)]
Attempting to fix the black flicker
Bug:
79231206
Test: Repro steps from bug
Merged-In: I4c2810c42a7a4358f64584da3ab0cdf1499e71b6
Change-Id: I4c2810c42a7a4358f64584da3ab0cdf1499e71b6
Yin-Chia Yeh [Thu, 31 May 2018 19:11:42 +0000 (12:11 -0700)]
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
Shuzhen Wang [Thu, 31 May 2018 18:41:39 +0000 (11:41 -0700)]
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
Calin Juravle [Thu, 31 May 2018 19:16:38 +0000 (12:16 -0700)]
Merge "Update the boot image profile and preloaded classes" into pi-dev
am:
a78334f80c
Change-Id: I95ea0fc1dee04d05695eb05f73776c2974a8a232
Jason Monk [Thu, 31 May 2018 19:11:28 +0000 (12:11 -0700)]
Merge "Protect broadcasts we use to talk to settings" into pi-dev
am:
3dbd752246
Change-Id: I0e3edd011cd148a93a5b92b21fb706bc03a8e4b0
Brad Ebinger [Thu, 31 May 2018 19:10:05 +0000 (12:10 -0700)]
Merge "IMS: Support for Implicit Call Rejection"
am:
19d032b695
Change-Id: Ic0238e05ea2682ded8420f739834df94db7c7222
Treehugger Robot [Thu, 31 May 2018 19:01:32 +0000 (19:01 +0000)]
Merge "DCB whitelist shortcode for user association"
Pavel Maltsev [Wed, 30 May 2018 19:31:21 +0000 (12:31 -0700)]
Fix comments to reflect changes in eth service
OEMs should be able to set gateway, DNS and domain for their static IP
configuration.
Cherry picked without conflicts.
Bug:
80090920
Test: m
Merged-in: Id7b6d538e2551cbd188821feb4b4feb102e4c751
(cherry picked from commit
d6b0780628bf4f758fd68534b4ecdf2da0fe2a7f)
Change-Id: I347a91e202fb6d6f1ae893c097c7d2e8856a3593
Mady Mellor [Thu, 31 May 2018 18:50:26 +0000 (18:50 +0000)]
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 18:49:38 +0000 (18:49 +0000)]
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
Hall Liu [Wed, 30 May 2018 23:11:11 +0000 (16:11 -0700)]
Fix MbmsDownloadSession documentation
Fix the TODO from forever ago and update the docs for the listener
registration methods.
Change-Id: I1276d0afe430e1b50c0af1fdfacb12a89ea5aa38
Fixes:
80493663
Test: None, comments only