Commit Graph

13140 Commits

Author SHA1 Message Date
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
2016-05-04 21:41:23 +00:00
Renat Aksitov
09f9bc73f4 Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91
am: 032c1a9299

* commit '032c1a92994e251336114c6b600040bf86991772':
  Voice Messaging Intent API.

Change-Id: Iad7c03099fae00d3c1c2bea0f8100608af33851d
2016-05-04 21:39:47 +00:00
Dongwon Kang
2375a2e415 Revert "TIF: add signal detection feature for HW inputs"
This reverts commit 102d0b7b69.

Change-Id: I50a66d7bd1baaea134ddd6638c3cfe65860e681d
(cherry picked from commit 4a3a601082)
2016-05-04 21:23:39 +00:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
Dongwon Kang
4a3a601082 Revert "TIF: add signal detection feature for HW inputs"
This reverts commit 102d0b7b69.

Change-Id: I50a66d7bd1baaea134ddd6638c3cfe65860e681d
2016-05-03 16:52:55 -07:00
Robin Lee
dc67971a99 Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2
2016-05-03 13:24:42 +01:00
Todd Kennedy
fa1f49c504 Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12
am: 09bad50ef4

* commit '09bad50ef43d72b4d2ca05227af0619703e601f6':
  use 'int' for min sdk version

Change-Id: Ib4968452de3892d59772d4c7317b67e13b6e9691
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
7de6c8f781 Merge "media: Add missing dobly-vision profile." into nyc-dev am: 66496d0d6d
am: 77a326e5f3

* commit '77a326e5f366742577cb939746be1a0c8ce80965':
  media: Add missing dobly-vision profile.

Change-Id: Id09ac400cab0e90871739a6f860e6df45bbaf87f
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
Renat Aksitov
c8dd93d4c8 Voice Messaging Intent API.
Adding missing items about MIME type and account type to the
"integration with the Contacts Provider" section.

Bug 28295510

Change-Id: I890458e62a714519be70e930fd53315c141ba354
2016-05-02 09:22:02 -07:00
Nadia Benbernou
18210edc88 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev
am: f4810f5506

* commit 'f4810f5506203ac03439d1ed6e33e021540568f8':
  Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581

Change-Id: I3a16e15adaf26be3528224c265be9a0e82957a38
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
418b5fcf55 Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
am: a516aea7c5

* commit 'a516aea7c588845fba49fa2dc0dffcde4448670c':
  media: Change VP9 ProfileLevel to start from 0x1.

Change-Id: Iea77c49a0a9c4cf04c705ba3ac22efb3beeafaa0
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
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
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
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
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
40ead811e0 Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7
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
44e272b469 Merge "Fix several accessibility magnification issues." into nyc-dev
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc
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
7dc710d564 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
am: 08ca2e3

* commit '08ca2e3a7593ced4967c56709a1fe675408d42dc':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I4bba52ddc4b89273eceb2627facbb9091eb341c0
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
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

* commit '4dc63f78a910e421d106cffc105b085f1ab1e2ae':
  Cleanup LocaleList docs given API review

Change-Id: Ic48021bdd5d021abd7eb8a10fa8540defdeb51bf
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
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
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
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Shubham Ajmera
1810bf4595 Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188
Bug: 27214236
(cherry-picked from commit 002be4e7b0)
Change-Id: I3074436baaa16fe19a158aa3aafdb79b534f792b
2016-04-26 17:09:39 +00:00
Julia Reynolds
a0676c9207 Merge changes from topic 'api_review' into nyc-dev
* changes:
  Api review: Settings.
  Reduce spacing.
2016-04-26 15:29:11 +00:00
Ruben Brunk
f56c9f432b Add manifest attribute for VR activities.
- Allow jank-free VR->VR activity transitions, even during
  long activity transitions.

Bug: 28115931
Change-Id: I1e3fd1a5245bac3433ea6282cb1c7a71f0e0266f
2016-04-25 13:32:03 -07:00