Todd Kennedy
c699a02479
Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12 am: 09bad50ef4
...
am: fa1f49c504
2016-05-02 23:46:55 +00:00
Todd Kennedy
fa1f49c504
Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12
...
am: 09bad50ef4
2016-05-02 23:40:50 +00:00
TreeHugger Robot
6a3948bc12
Merge "use 'int' for min sdk version" into nyc-dev
2016-05-02 23:19:44 +00:00
Todd Kennedy
6e2e7f585b
use 'int' for min sdk version
...
per api council
Change-Id: Id3c1191534f61a0d511a6e9932f50ee613830999
2016-05-02 15:07:32 -07:00
Hangyu Kuang
6d494f3dc4
Merge "media: Add missing dobly-vision profile." into nyc-dev am: 66496d0d6d am: 77a326e5f3
...
am: 7de6c8f781
2016-05-02 17:17:11 +00:00
Hangyu Kuang
7de6c8f781
Merge "media: Add missing dobly-vision profile." into nyc-dev am: 66496d0d6d
...
am: 77a326e5f3
2016-05-02 17:12:46 +00:00
Hangyu Kuang
66496d0d6d
Merge "media: Add missing dobly-vision profile." into nyc-dev
2016-05-02 16:55:38 +00:00
Nadia Benbernou
4ee52f8b93
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev am: f4810f5506 am: 18210edc88
...
am: c09542b84e
2016-05-02 14:35:35 +00:00
Nadia Benbernou
18210edc88
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev
...
am: f4810f5506
2016-05-02 14:26:46 +00:00
Nadia Benbernou
948627eeaa
Add api to WearableExtender for setting and getting the dismissal id.
...
Bug:27696581
Change-Id: Idf37234a9fd1d54e2fab0a4d5bfab70bbb1a3ba5
2016-04-28 17:57:25 -04:00
Hangyu Kuang
29f17b38a7
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea am: 573042aab2
...
am: 94f562671c
2016-04-28 19:33:03 +00:00
Hangyu Kuang
94f562671c
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea
...
am: 573042aab2
2016-04-28 19:25:06 +00:00
Hangyu Kuang
418b5fcf55
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
...
am: a516aea7c5
2016-04-28 19:24:42 +00:00
Hangyu Kuang
f939e4adf1
media: Add missing dobly-vision profile.
...
Bug:28411120
Change-Id: I92eecd7436365fab2668e66b8759c68e7d7af298
2016-04-28 11:57:40 -07:00
Hangyu Kuang
a516aea7c5
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
2016-04-28 18:33:06 +00:00
Alex Hills
ffb555b039
Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315
...
am: 76a560c
2016-04-28 13:54:08 +00:00
Alex Hills
2a1a315713
Merge "Move allowGeneratedReplies to Action" into nyc-dev
...
am: 9de0f87
2016-04-28 13:46:34 +00:00
TreeHugger Robot
9de0f87e97
Merge "Move allowGeneratedReplies to Action" into nyc-dev
2016-04-28 13:41:49 +00:00
Martijn Coenen
53e7852f0b
Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983
...
am: bd7a5a1
2016-04-28 05:49:29 +00:00
Martijn Coenen
1b65983aa9
Merge "Fix API review comments, add remove callback." into nyc-dev
...
am: d19191d
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc
Merge "Fix API review comments, add remove callback." into nyc-dev
2016-04-28 05:34:05 +00:00
Lorenzo Colitti
f77b381b9b
Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594 am: 7146d02
...
am: c097c93
2016-04-28 05:30:58 +00:00
TreeHugger Robot
c097c9377e
Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594
...
am: 7146d02
2016-04-28 05:28:03 +00:00
Lorenzo Colitti
40ead811e0
Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
...
am: 1d3c594
2016-04-28 05:25:22 +00:00
Lorenzo Colitti
c5be12e7ac
Make isCaptivePortal perform both HTTP and HTTPS probes.
...
Also a couple of minor cleanups and logging tweaks.
Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
2016-04-28 11:23:10 +09:00
Phil Weaver
e58aa16282
Merge "Fix several accessibility magnification issues." into nyc-dev am: 1f70f0b am: 44e272b
...
am: 5a4be4d
2016-04-28 00:53:24 +00:00
Phil Weaver
44e272b469
Merge "Fix several accessibility magnification issues." into nyc-dev
...
am: 1f70f0b
2016-04-27 23:31:54 +00:00
Phil Weaver
1f70f0b7d6
Merge "Fix several accessibility magnification issues." into nyc-dev
2016-04-27 22:50:37 +00:00
Phil Weaver
70439244ba
Fix several accessibility magnification issues.
...
Clarifying region used for magnification as "magnificationRegion",
both in the public API and in the code. There's been significant
confusion about what "magnfifiedRegion" means. Removing
"availableRegion" from everywhere except where it's required, as
that region was identical to magnified/magnification region.
Trying to shut down magnification was a complex situation where
animations in progress and new magnification requests were tricky to
handle correctly. It was not possible to guarantee that the
magnification callbacks were unregistered consistently. There were
at least two situations that led to phone restarts:
1. If a triple tap was detected between unregistering the callbacks
and shutting down the input filter. In this case the magnification
request would go through.
2. If an animation had just started when magnification was turned
off, so the current magnification was 1.0 but the animator was
about to change it. In this case the callbacks would be unregistered,
and then the animator would start changing the magnification.
This change makes registering and unregistering magnification atomic.
It also makes MagnificationController stick around indefinitely once it
is created, registering and unregistering as needed to support
magnification gestures and services that control magnification. Services
that merely query the status of magnification no longer register for
callbacks.
One part of shutting down is turning off the animation and guaranteeing
that it won't try to make further changes. Adding a flag to
SpecAnimationBridge and a lock in that class so we can guarantee that
nothing happens when we aren't registered for magnification callbacks.
Also reconfiguring all accessibility options when a service stops to
make sure that only the features required by the current configuration
are enabled.
Bug: 27497138
Bug: 27821103
Change-Id: If697cbd34b117d82c8eee1ba7d0254089ee4241d
2016-04-27 13:57:43 -07:00
Bo Liu
b1229186d1
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776
...
am: 7d3c51c
2016-04-27 18:19:44 +00:00
Bo Liu
7d3c51cfdd
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3
...
am: 55f3776
2016-04-27 18:11:30 +00:00
Bo Liu
7dc710d564
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
...
am: 08ca2e3
2016-04-27 18:06:25 +00:00
Bo Liu
08ca2e3a75
Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
2016-04-27 17:58:34 +00:00
The Android Automerger
8bdf39e19c
Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115
2016-04-27 17:58:24 +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
Alex Hills
42b0c4dcf0
Move allowGeneratedReplies to Action
...
Bug:28044251
Change-Id: If25d63a32f82537432858b1a31e78292638631b7
2016-04-27 10:48:52 -04: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
Shubham Ajmera
3277f3c916
Merge "Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188" into nyc-dev-plus-aosp
2016-04-27 09:44:57 +00:00
Hugo Benichi
9b7a3b5d53
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 24b6e2b am: 74db646
...
am: 37aa948
2016-04-27 02:51:44 +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
Ruben Brunk
dd1a9e05ef
Merge "Add manifest attribute for VR activities." into nyc-dev am: f84b3e0 am: 45d6192
...
am: 842d0d4
2016-04-27 01:21:14 +00:00
Hangyu Kuang
9186c38fce
media: Change VP9 ProfileLevel to start from 0x1.
...
Bug:28380207
Related to Bug: 25684127
Change-Id: I9f18358744e9406b34dc880e6eb533945eabe104
2016-04-26 17:51:59 -07: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
Hangyu Kuang
da802f5100
Unhide getHdrCapabilities and HdrCapabilities.
...
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00
