Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,863 Commits 3 Branches 0 Tags
0180997cbfe4dac46c6aedd690a10ec71a80cb0a
Commit Graph

13667 Commits

Author SHA1 Message Date
Amit Mahajan
2c14a5886a Merge "Marking @SystemApi permissions @hide too." into nyc-dev am: 441da79d8a am: 8f04f5f3ba 
am: 075ceeda01

* commit '075ceeda01dd9890d7464492a291a94113a19e11':
  Marking @SystemApi permissions @hide too.

Change-Id: Ic8da194de3b1a405ed72a9c04e44a04f79e66eba
 2016-05-04 22:30:19 +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

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1
 2016-05-04 22:04:40 +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

* commit 'f473ee9ebc992737ef226ae78b46b6e9fef3563f':
  Voice Messaging Intent API.

Change-Id: I8017d7b1f39cc7c21feb98f4a469dd5c5de77cb4
 2016-05-04 21:59:57 +00:00
Amit Mahajan
075ceeda01 Merge "Marking @SystemApi permissions @hide too." into nyc-dev am: 441da79d8a 
am: 8f04f5f3ba

* commit '8f04f5f3ba790fd0c240600075bdc7ed44a5ae4c':
  Marking @SystemApi permissions @hide too.

Change-Id: Icfe04551aa2feac7351a4489a8516e79026b1b83
 2016-05-04 21:55:01 +00:00
Dongwon Kang
2eb31889a1 Revert "TIF: add signal detection feature for HW inputs" 
am: 2375a2e415

* commit '2375a2e4157cc0c887959976036c60443bfcf908':
  Revert "TIF: add signal detection feature for HW inputs"

Change-Id: Ib5129f0828a15333e9b7d5c995dea6a360a2c1b0
 2016-05-04 21:43:40 +00:00
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
TreeHugger Robot
441da79d8a Merge "Marking @SystemApi permissions @hide too." into nyc-dev 2016-05-04 20:50:16 +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
c699a02479 Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12 am: 09bad50ef4 
am: fa1f49c504

* commit 'fa1f49c504abe7a7eefe87fac54f775f22e301f4':
  use 'int' for min sdk version

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

* 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
Amit Mahajan
a895559a41 Marking @SystemApi permissions @hide too. 
Bug: 28287631
Change-Id: Ie0375620689263ebafd6850f2261e090f09521b1
 2016-05-02 14:45:46 -07:00
Hangyu Kuang
6d494f3dc4 Merge "media: Add missing dobly-vision profile." into nyc-dev am: 66496d0d6d am: 77a326e5f3 
am: 7de6c8f781

* commit '7de6c8f78112dac5ced1d7151a10456ac9d03dd4':
  media: Add missing dobly-vision profile.

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

* 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
4ee52f8b93 Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:27696581" into nyc-dev am: f4810f5506 am: 18210edc88 
am: c09542b84e

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

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

* 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
29f17b38a7 Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea am: 573042aab2 
am: 94f562671c

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

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

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

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

* 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
ffb555b039 Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315 
am: 76a560c

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f
 2016-04-28 13:54:08 +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
53e7852f0b Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983 
am: bd7a5a1

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

Change-Id: I55e8eb1f6ae9308abf90d30bac434fc81ed18c7a
 2016-04-28 05:49:29 +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
f77b381b9b Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594 am: 7146d02 
am: c097c93

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

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

* commit '7146d02910808367f30c82b7b05d757b47a2bc66':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

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

* 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
e58aa16282 Merge "Fix several accessibility magnification issues." into nyc-dev am: 1f70f0b am: 44e272b 
am: 5a4be4d

* commit '5a4be4d8a26e844ade76f836163de6c4047ca263':
  Fix several accessibility magnification issues.

Change-Id: I362ed6a9717465668120e75d63ca3e07ab7c7c4d
 2016-04-28 00:53:24 +00: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
b1229186d1 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776 
am: 7d3c51c

* commit '7d3c51cfdd6e54b157ad62a3dd85856dad758513':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I258f3ad08c23dac94f3679813188ec715b9635ac
 2016-04-27 18:19:44 +00:00
Bo Liu
7d3c51cfdd Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 
am: 55f3776

* commit '55f3776d82c2ebc9831868bcc068d53ceb38565f':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I6aa64553e7dfec0757bcd5b6d3299289185c5c6c
 2016-04-27 18:11:30 +00: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
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