Raph Levien
b22b5d7e60
Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev
...
am: 78dd08d
2016-04-27 19:46:25 +00:00
Peng Xu
893b42e4f8
Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
...
am: 7b0a3be
2016-04-27 19:46:21 +00:00
Raph Levien
78dd08d5dd
Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev
2016-04-27 19:42:23 +00:00
Clara Bayarri
4852f67ccd
Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev
...
am: b639ae6
2016-04-27 19:41:09 +00:00
Peng Xu
7b0a3be001
Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
2016-04-27 19:37:59 +00:00
Raph Levien
b639ae697a
Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev
2016-04-27 19:31:12 +00:00
Adam Powell
dd587993ae
Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
...
am: 596a4a1
2016-04-27 19:18:31 +00:00
TreeHugger Robot
596a4a1592
Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
2016-04-27 19:12:51 +00:00
Bo Liu
7dc710d564
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
...
am: 08ca2e3
2016-04-27 18:06:25 +00:00
Raph Levien
b163870d46
Give guidance on alternatives to deprecated locale field
...
The deprecation message for the "locale" field should clearly state
what to do instead when only the primary locale is needed.
Bug: 27532422
Change-Id: I3e83cc1e9054d4e199d7e34b1a42b7bcd6c77f62
2016-04-27 11:02:12 -07:00
Bo Liu
08ca2e3a75
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
2016-04-27 17:58:34 +00:00
Hui Shu
b69b8c414e
Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev
...
am: 9a5f9c2
2016-04-27 17:56:55 +00:00
Selim Gurun
9a5f9c2087
Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev
2016-04-27 17:48:32 +00:00
Adam Powell
e5552be22a
Fix a bug where restartLoader would result in a stuck loader
...
Framework edition
In some cases restartLoader calls that happen in quick succession
could cause the new loader to become stuck and never run. Treat loader
restarts for loaders that have not yet started the same as starting a
brand new loader.
Bug 27437287
https://code.google.com/p/android/issues/detail?id=56464
Change-Id: Ia4e276fc8e63d43b9c52c6155cea827b194d8b19
2016-04-27 10:42:19 -07:00
Clara Bayarri
d608a0adcb
Fix TextUtils#getReverse deprecated doc
...
Note there is no alternative method to use.
Bug: 28296055
Change-Id: I1e44c1dad6009434a92c6a53862e6f061114bc56
2016-04-27 10:28:03 -07:00
Phil Weaver
85c5bf935f
Merge "Fix crash with a11y set text with text filters." into nyc-dev
...
am: 7a61d60
2016-04-27 16:55:15 +00:00
Phil Weaver
7a61d6031b
Merge "Fix crash with a11y set text with text filters." into nyc-dev
2016-04-27 16:49:27 +00:00
Hangyu Kuang
61734544d1
Merge changes from topic \'atv-hdr\' into nyc-dev
...
am: 39bb2c2
* commit '39bb2c29b427b0cf2396a8691176584094ae805c':
Unhide getHdrCapabilities and HdrCapabilities.
Plumb HDR capabilities to Display
Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
Change-Id: I53f0414c0a408edeae8ffe7161a035e45b8670b7
2016-04-27 16:46:30 +00:00
Hangyu Kuang
39bb2c29b4
Merge changes from topic 'atv-hdr' into nyc-dev
...
* changes:
Unhide getHdrCapabilities and HdrCapabilities.
Plumb HDR capabilities to Display
Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
2016-04-27 16:38:21 +00:00
Clara Bayarri
ad63540b01
Merge "Cleanup LocaleList docs given API review" into nyc-dev
...
am: 4dc63f7
2016-04-27 15:42:57 +00:00
Clara Bayarri
4dc63f78a9
Merge "Cleanup LocaleList docs given API review" into nyc-dev
2016-04-27 15:32:58 +00:00
John Reck
f97dca612e
Merge "API tweaks to PixelCopy and make it public" into nyc-dev
...
am: 7f209d3
* commit '7f209d37f17d4df09475137c38b84a3338c84023':
API tweaks to PixelCopy and make it public
Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1
Merge "API tweaks to PixelCopy and make it public" into nyc-dev
2016-04-27 14:36:53 +00:00
Clara Bayarri
66f6bd32d8
Cleanup LocaleList docs given API review
...
-- Remove default constructor from public API since getEmptyLocaleList exists
-- Merge the Locale and Locale[] constructors by providing a single Locale… varargs constructor
-- forLanguageTags, get, toLanguageTags, size, need docs
-- get(int location) should be get(int index)
Plus general docs improvements
Bug: 28296200
Change-Id: I8b4e67184f8c723daebcd251f04947d48bbb5478
2016-04-27 14:55:45 +01:00
Julia Reynolds
bf5fff9059
Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev
...
am: 9fa8b54
2016-04-27 13:08:59 +00:00
Julia Reynolds
9fa8b54589
Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev
2016-04-27 12:59:05 +00:00
Kevin Hufnagle
c959843546
Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8 am: 3c8a59f
...
am: 48a4930
2016-04-27 05:53:10 +00:00
Kevin Hufnagle
48a4930ef6
Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8
...
am: 3c8a59f
2016-04-27 05:39:08 +00:00
Kevin Hufnagle
376fc03553
Merge "resolve merge conflicts of 70adfe3 to nyc-dev" into nyc-dev
...
am: 5dcd5e5
2016-04-27 05:36:52 +00:00
Kevin Hufnagle
8ce7d79c64
resolve merge conflicts of 70adfe3 to nyc-dev
...
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
2016-04-26 22:14:38 -07:00
Hugo Benichi
74db646778
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
...
am: 24b6e2b
2016-04-27 01:57:13 +00:00
TreeHugger Robot
24b6e2bcc8
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
...
* changes:
Remove unused event tags of IpConnectivityEvent
Better ConnectivityMetricsEvent printing
2016-04-27 01:49:53 +00:00
Todd Kennedy
9a50b6abf1
Merge "Don\'t override pre-release target sdk" into nyc-dev
...
am: 97ef0e7
2016-04-27 00:58:47 +00:00
Robert Carr
3c0de7768f
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
...
am: 69a6fe3
2016-04-27 00:54:54 +00:00
TreeHugger Robot
97ef0e77af
Merge "Don't override pre-release target sdk" into nyc-dev
2016-04-27 00:53:19 +00:00
Rob Carr
69a6fe321c
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
2016-04-27 00:47:59 +00:00
Hugo Benichi
61cbccc2bf
Remove unused event tags of IpConnectivityEvent
...
Bug: 28204408
Change-Id: I8de95add30cdf5c35c8129ee1b95d2d648b3316d
2016-04-27 09:12:40 +09:00
Hugo Benichi
5df9d729f6
Better ConnectivityMetricsEvent printing
...
This patch adds more information printing for IpConnectivity event
classes in android.net.metrics.
example:
ConnectivityMetricsEvent(14:36:35.799, 0, 1026): DhcpClientEvent(wlan0, DhcpRequestingState)
ConnectivityMetricsEvent(14:36:35.805, 0, 1026): DhcpClientEvent(wlan0, DhcpHaveAddressState)
ConnectivityMetricsEvent(14:36:35.809, 0, 4096): IpManagerEvent(wlan0, PROVISIONING_OK, 155ms)
ConnectivityMetricsEvent(14:36:35.810, 0, 1026): DhcpClientEvent(wlan0, DhcpBoundState)
ConnectivityMetricsEvent(14:36:35.871, 0, 2048): NetworkEvent(101, NETWORK_CONNECTED, 0ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:599, 3ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2048): NetworkEvent(101, NETWORK_VALIDATION_FAILED, 0ms)
ConnectivityMetricsEvent(14:36:35.928, 0, 3072): DefaultNetworkEvent(0 -> 101, [WIFI], IPv4: false, IPv6: false)
ConnectivityMetricsEvent(14:36:37.008, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:204, 134ms)
ConnectivityMetricsEvent(14:36:37.008, 0, 2050): NetworkEvent(101, NETWORK_VALIDATED, 1137ms)
Also fixes a couple of event logging issues:
- do no record spurious receive DhcpErrorEvent when a network goes down.
- add an eventType field to IpManagerEvent instead of using the
loggger component tag.
Bug: 28204408
Change-Id: Ia6f4ccfd7a0c63a5ccec18825f226c0b5781217b
2016-04-27 09:11:29 +09:00
Phil Weaver
6dde7e75e8
Fix crash with a11y set text with text filters.
...
A text filter may shorten the text, so we need to use the text
that's actually in the View, not the text we requested, to move
the selection.
Also removing the override of performAccessibilityActionInternal,
which should have been done as part of adding text actions initially.
Bug: 28253708
Change-Id: I184f49dcba0238f4ccc222597cefca258393b263
2016-04-26 17:01:29 -07:00
Todd Kennedy
b107271813
Don't override pre-release target sdk
...
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.
Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
2016-04-26 16:25:43 -07:00
Hangyu Kuang
da802f5100
Unhide getHdrCapabilities and HdrCapabilities.
...
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00
Michael Wright
9ff94c0251
Plumb HDR capabilities to Display
...
Bug: 25684127
Change-Id: I0a4fcdc59aa1a7b295c8df03699466685300e735
2016-04-26 23:04:30 +00:00
Oren Blasberg
00c82a9b98
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
...
am: c71b630
2016-04-26 22:53:56 +00:00
Oren Blasberg
27e0f35620
Merge "Accommodate NaN in new context menu methods." into nyc-dev
...
am: a86d1e0
2016-04-26 22:53:40 +00:00
Oren Blasberg
4f561a4748
Merge "Don\'t show icons for top level menus unless forced." into nyc-dev
...
am: 0967da3
2016-04-26 22:53:34 +00:00
Ruben Brunk
5b89eb592b
Merge "Add manifest attribute for VR activities." into nyc-dev
...
am: f84b3e0
2016-04-26 22:53:26 +00:00
Oren Blasberg
c71b6302fe
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
2016-04-26 22:43:39 +00:00
John Reck
e94cbc76d5
API tweaks to PixelCopy and make it public
...
Bug: 27708453
2016-04-26 15:41:43 -07:00
Oren Blasberg
a86d1e0b59
Merge "Accommodate NaN in new context menu methods." into nyc-dev
2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989
Merge "Don't show icons for top level menus unless forced." into nyc-dev
2016-04-26 22:38:58 +00:00
