Commit Graph

58769 Commits

Author SHA1 Message Date
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
2016-05-05 13:12:45 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
2016-05-05 12:00:50 +01:00
Alan Viverette
1a1301286c Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
2016-05-05 02:30:18 +00:00
Alan Viverette
a11c21b412 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 2016-05-05 02:26:45 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
2016-05-04 22:52:55 +00:00
Dianne Hackborn
5081e36897 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
2016-05-04 22:52:52 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Dianne Hackborn
6eb119c7cb Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 2016-05-04 22:49:59 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
2016-05-04 22:30:30 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
2016-05-04 15:09:01 -07:00
Chet Haase
512c406be9 Merge "Force second measure pass when there is a configuration change" into nyc-dev
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I2586fe3605461b2e6e4d9678afd6436078dab21c
2016-05-04 21:51:38 +00:00
Chet Haase
c381c4e8e7 Merge "Force second measure pass when there is a configuration change" into nyc-dev 2016-05-04 21:49:11 +00:00
Yohei Yukawa
3af9c01322 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: I9b2f1e2ac8c595c3b19daab8b4ccb763ab700203
2016-05-04 21:42:45 +00:00
Yohei Yukawa
68c1e1935d Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 2016-05-04 21:39:15 +00:00
Alan Viverette
cc26636f08 Always assign leftover pixels to last weighted child
Bug: 27690033
Change-Id: Ibee51d49d3f7aa923750ce330df2e1aa2156f2bd
2016-05-04 16:59:38 -04:00
Wale Ogunwale
506a604200 Merge "Make sure to pause activity before stopping" into nyc-dev
am: 5f81a3f84c

* commit '5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
  Make sure to pause activity before stopping

Change-Id: I24e550abc72f78904d04d1c0bd2c3a004328555f
2016-05-04 20:48:54 +00:00
Dianne Hackborn
d8e877d27d Maybe fix issue #28457907: Pebble app crash + reboot
Fix this long-standing multi-threading issue in Bundle
when multiple threads are trying to read from a Bundle
and conflict to due unparceling.

There are two critical sections this protects: writing
the bundle in to a parcel (when it is doing this from
the bundle's already parcelled representation), and
unparcelling a bundle into its map of entries.

Change-Id: I5470002f090e63dd623a573da6c204d3b5b661f4
2016-05-04 13:43:58 -07:00
Chris Craik
fc56377178 Fix View leakage from mPreSortedChildren
bug:28553824

Change-Id: I62bfa3dcb121792dff7d00be1f4b018a99c96e1d
2016-05-04 13:40:07 -07:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Yohei Yukawa
d0d0797474 Fix a behavior change in "Show software keyboard".
This bug was a corner case of stopping lying about
Configuration#keyboard when "Show software keyboard" is turned on, which
was done by my CL [1] in Android N development cycle.

Previous implementation

  if (config.keyboard != Configuration.KEYBOARD_NOKEYS) {

had relied on the fact that the system was lying about config.keyboard,
which is no longer valid.  We need to change the behavior of
InputMethodService#onShowInputRequested() depending on
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD like we did for
InputMethodService#onEvaluateInputViewShown() in [1] to minimize the
impact on stopping lying about Configuration#keyboard.

 [1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
      7b739a802c

Bug: 28423439
Change-Id: I8a774cbf61ac706d8446be91b17bceee57a13656
2016-05-04 11:56:35 -07:00
Robin Lee
cc1c55051c Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am: 7ec93a1ee2

* commit '7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07
2016-05-04 18:55:54 +00:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
2016-05-04 11:46:29 -07:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Abhijith Shastry
71048da608 Merge "Update BlockedNumberContract documentation." into nyc-dev
am: 9a2384a7a6

* commit '9a2384a7a6ad4ff630f125e844f7b202ec3cc649':
  Update BlockedNumberContract documentation.

Change-Id: Ia5962709e57374db6f01c7ba97d4a2dcf26a7b6e
2016-05-04 18:22:39 +00:00
Chet Haase
d86fb2ce37 Force second measure pass when there is a configuration change
It's possible for a call to updateConfiguration() to happen in the middle
of performTraversals(), after the measure phase has happened, but before
the layout phase. During the configuration call, it's possible for views to
have requestLayout() called on them. This can result in the request flag
not getting cleared, because views that have had layout requested, but which
have not yet been measured, may not be told to layout.

The correct flow should be that any code path causing requestLayout() (which
could be anything that calls out to user/app code) should happen before the
measure phase (or cause a second measure to occur). For now, causing the second
measure to occur is a low-risk simple change that fixes the immediate problem.

Issue #28152259  Calling requestLayout from inside View.onConfigurationChanged can cause problems

Change-Id: I3b532eeacc3784d8d21193d01ddd7fa15ac0684e
2016-05-04 18:14:46 +00:00
Abhijith Shastry
9a2384a7a6 Merge "Update BlockedNumberContract documentation." into nyc-dev 2016-05-04 18:14:38 +00:00
Renat Aksitov
967d99f033 Merge "Voice Messaging Intent API." into nyc-dev
am: d516e30b91

* commit 'd516e30b915ffabd0c09f5726d44c1f51fdeceec':
  Voice Messaging Intent API.

Change-Id: Id1665e31f427a81c8052456226e0383473793682
2016-05-04 18:09:17 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
Vladislav Kaznacheev
92986d3372 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev
am: 221c6e6db7

* commit '221c6e6db77c99351d65db29c432caa077613124':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: I01b835050c56321681a72705c7fd8e71ed420610
2016-05-04 17:30:26 +00:00
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Tim Volodine
8e11bff55e Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev
am: 42791eca7d

* commit '42791eca7dd70a077bca554b708c65794afdde92':
  [WebView] Update ServiceWorker related documentation.

Change-Id: I88a8fdb21afead0c268754ba2b459eb75a2de90f
2016-05-04 12:52:16 +00:00
TreeHugger Robot
42791eca7d Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev 2016-05-04 12:37:21 +00:00
Tony Mak
aded4dbf5e New settings key and policy transparency for managed profile settings
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: I5e5d30e39e1ba3c25a589fd6123f3a926b5745ba
2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
2016-05-04 09:33:08 +00:00
Keisuke Kuroyanagi
5496ec1875 Merge "Show drag handles after finishing batch edit if needed." into nyc-dev
am: be1cd9f5ce

* commit 'be1cd9f5ce6eb2bc37b15258c6ab22e2fc5592e1':
  Show drag handles after finishing batch edit if needed.

Change-Id: Ie831efddf37c32c003936d5214d30f7d59878fb8
2016-05-04 00:30:11 +00:00
Amith Yamasani
ae4ecce1ef Merge "Clear active requests on switching voice interactor" into nyc-dev
am: ec07352007

* commit 'ec07352007812eeb70c5f47bbac54e9816a30b55':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
2016-05-04 00:30:06 +00:00
Keisuke Kuroyanagi
be1cd9f5ce Merge "Show drag handles after finishing batch edit if needed." into nyc-dev 2016-05-04 00:22:58 +00:00
Abhijith Shastry
1705fc4767 Update BlockedNumberContract documentation.
For secondary users, a SecurityException is thrown instead of UnsupportedOperationException.

BUG: 28294786
Change-Id: I6402b856eeb02c4c1d940606ae7e69f3ae9cb45d
2016-05-03 17:18:02 -07:00
TreeHugger Robot
ec07352007 Merge "Clear active requests on switching voice interactor" into nyc-dev 2016-05-04 00:13:30 +00:00
Vladislav Kaznacheev
f67661cc7a Fix ClipData JavaDoc and behavior that contradicts JavaDoc
1. Expand JavaDoc for ClipData.addItem to clarify how MIME types are affected.
2. Add "text/uri-list" to MIME type list only for non-content URIs (as JavaDoc explicitly says).

Bug: 28564003
Change-Id: I074daf34310323725690a9ba2c7dff0542ed6349
2016-05-03 16:48:24 -07:00
Amith Yamasani
eeed06c108 Clear active requests on switching voice interactor
When voice interactor goes null or changes, cancel all existing
active requests and clear them so that they can be re-submitted.

Bug: 28487567
Change-Id: Ibcf024efcc81ff18ef3babfa9a169292207bc816
2016-05-03 15:07:03 -07:00
Siyamed Sinir
938055b122 Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev
am: c18009e6dd

* commit 'c18009e6dd32f04fdad7f1b27a0a6b52ee5c875c':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I2c0b8b910f5cd5de82f3b6831b9dd9166a280dc1
2016-05-03 21:32:28 +00:00
Siyamed Sinir
c18009e6dd Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev 2016-05-03 21:22:18 +00:00
Siyamed Sinir
1f575b890e Revert "Request re-layout after setText if layout width is 0"
This reverts commit 375366cb2d. 

Bug: 28523980
Change-Id: Ib4dd00eabaf7b5630b18373cc1d7bec61c0e155d
2016-05-03 20:35:35 +00:00
Abodunrinwa Toki
98f91884ff Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev
am: f62dd564ed

* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
2016-05-03 20:20:05 +00:00