Dianne Hackborn
4e1fa3c476
resolve merge conflicts of a14aac9 to master
...
Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923
2016-05-04 16:53:38 -07:00
Dianne Hackborn
a14aac9a2d
Merge "Maybe fix issue #28457907 : Pebble app crash + reboot" into nyc-dev am: 6eb119c7cb
...
am: 5081e36897#28457907 : Pebble app crash + reboot
Change-Id: I0db52017c4a351341b0823381e7b85b0c641a16d
2016-05-04 22:57:53 +00:00
Chris Craik
0af20e8385
Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 am: 2f66d0a849
...
am: 115f86846b
2016-05-04 22:55:37 +00:00
Dianne Hackborn
5081e36897
Merge "Maybe fix issue #28457907 : Pebble app crash + reboot" into nyc-dev
...
am: 6eb119c7cb#28457907 : Pebble app crash + reboot
Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
2016-05-04 22:52:52 +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
115f86846b
Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537
...
am: 2f66d0a849
2016-05-04 22:33:13 +00:00
Chet Haase
426e872d35
Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 am: 26a4627102
...
am: c96a245e1a
2016-05-04 22:31:34 +00:00
Yohei Yukawa
f08b176da4
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d am: 8e0e5e8a88
...
am: 1cdcbcbc8f
2016-05-04 22:31:11 +00:00
Chris Craik
2f66d0a849
Merge "Fix View leakage from mPreSortedChildren" into nyc-dev
...
am: 4e34cd0537
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
Makoto Onuki
0e86dfb802
Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp
...
am: ccf9c83765
2016-05-04 22:09:57 +00:00
Wale Ogunwale
d622b932fa
Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp
...
am: c2bef7c6e2
2016-05-04 22:09:41 +00:00
Robin Lee
4632c0c9a8
Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp
...
am: 062a28b6a4
2016-05-04 22:04:40 +00:00
Abhijith Shastry
00dc230a09
Merge "Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 am: c7e32aba8d" into nyc-mr1-dev-plus-aosp
...
am: d843f04cd3
2016-05-04 22:01:52 +00:00
Renat Aksitov
c1b6e2db3f
Merge "Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 am: 032c1a9299" into nyc-mr1-dev-plus-aosp
...
am: f473ee9ebc
2016-05-04 21:59:57 +00:00
Chet Haase
c96a245e1a
Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7
...
am: 26a4627102
2016-05-04 21:55:13 +00:00
Yohei Yukawa
1cdcbcbc8f
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d
...
am: 8e0e5e8a88
2016-05-04 21:55:10 +00:00
Vladislav Kaznacheev
9f842251b0
Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 am: 423c902258
...
am: 040646bb08
2016-05-04 21:54:46 +00:00
Chet Haase
512c406be9
Merge "Force second measure pass when there is a configuration change" into nyc-dev
...
am: c381c4e8e7
2016-05-04 21:51:38 +00:00
Chet Haase
26a4627102
Merge "Force second measure pass when there is a configuration change" into nyc-dev
...
am: c381c4e8e7
2016-05-04 21:51:33 +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
2016-05-04 21:42:45 +00:00
Yohei Yukawa
8e0e5e8a88
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
...
am: 68c1e1935d
2016-05-04 21:42:43 +00:00
Makoto Onuki
bdfb3aada3
Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev
...
am: 5b9d876ef5
2016-05-04 21:42:26 +00:00
Wale Ogunwale
8fa700675d
Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev
...
am: 75179ada54
2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2
...
am: 78d0888e8c
2016-05-04 21:41:23 +00:00
Abhijith Shastry
0734be2f3e
Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6
...
am: c7e32aba8d
2016-05-04 21:40:04 +00:00
Renat Aksitov
09f9bc73f4
Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91
...
am: 032c1a9299
2016-05-04 21:39:47 +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
Vladislav Kaznacheev
040646bb08
Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7
...
am: 423c902258
2016-05-04 21:38:17 +00:00
Makoto Onuki
5b9d876ef5
Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev
2016-05-04 21:28:17 +00:00
Wale Ogunwale
506a604200
Merge "Make sure to pause activity before stopping" into nyc-dev
...
am: 5f81a3f84c
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
Makoto Onuki
8569452603
ShortcutManaegr: bug fixes
...
Fixes 28590035
Fixes 28586105
Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
2016-05-04 13:00:41 -07: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
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
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
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
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
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
Gustav Sennton
17757f8e37
Nicer rethrowing of RemoteExceptions from WebViewUpdateService
...
Bug: 28437506
Change-Id: I413334efa3d2ca16ee8fe8822fdbcddfdc250a21
2016-05-04 14:32:31 +00:00
Tim Volodine
28aec4fdd2
Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev am: 42791eca7d am: 8e11bff55e
...
am: 0685396eac
2016-05-04 13:06:38 +00:00
Tim Volodine
8e11bff55e
Merge "[WebView] Update ServiceWorker related documentation." into nyc-dev
...
am: 42791eca7d
2016-05-04 12:52:16 +00:00
