Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,500 Commits 3 Branches 0 Tags
a2ca55ecb64993eee2fc8e720dcceaadd47c6e4a
Commit Graph

13155 Commits

Author SHA1 Message Date
Tony Mak
a31f37dc1c Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e 
am: ecab71c9f7

* commit 'ecab71c9f77cb0386a1be1c78e73bedf2524a536':
  Fix enterprise contacts APIs naming and docs

Change-Id: Idad8e3ee643ba955951a58185f4a8640579db206
 2016-05-06 12:23:58 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
Vladislav Kaznacheev
cae475563a Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: f1febf2700

* commit 'f1febf27006a98adc5de584e7703338b85208ed3':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I13c413b1f0520262c271a397751a1a055e464655
 2016-05-05 23:21:04 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
 2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId 
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
 2016-05-05 09:32:27 -07:00
Neil Fuller
bd6e38e6b7 Merge "Track external/icu API changes for factory registration" into nyc-dev 
am: 00e8fef0ba

* commit '00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf':
  Track external/icu API changes for factory registration

Change-Id: Ic4633d63e4d659b20eeeb4502a278a6fe365fd2a
 2016-05-05 10:00:42 +00:00
Neil Fuller
00e8fef0ba Merge "Track external/icu API changes for factory registration" into nyc-dev 2016-05-05 09:54:46 +00:00
Amit Mahajan
562c9ce030 Merge "Marking @SystemApi permissions @hide too." into nyc-dev 
am: 441da79d8a

* commit '441da79d8aa7b873f23227d10ecd425671b85506':
  Marking @SystemApi permissions @hide too.

Change-Id: Iabcd167da951ff487f3fa143c65b32af94a46592
 2016-05-04 21:37:35 +00:00
TreeHugger Robot
441da79d8a Merge "Marking @SystemApi permissions @hide too." into nyc-dev 2016-05-04 20:50:16 +00:00
Robin Lee
cc1c55051c Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 
am: 7ec93a1ee2

* commit '7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07
 2016-05-04 18:55:54 +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
967d99f033 Merge "Voice Messaging Intent API." into nyc-dev 
am: d516e30b91

* commit 'd516e30b915ffabd0c09f5726d44c1f51fdeceec':
  Voice Messaging Intent API.

Change-Id: Id1665e31f427a81c8052456226e0383473793682
 2016-05-04 18:09:17 +00:00
Neil Fuller
e7fda97fff Track external/icu API changes for factory registration 
Bug: 28583844
Change-Id: I202e2eee5cd7e4c7f84eebf0ff9852552fc6bf96
 2016-05-04 19:06:07 +01:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
Dongwon Kang
e530644bb6 Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev 
am: b69b5b4a6d

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

Change-Id: I88dbff74104a5d905c2b68188ba5d7739ae41fcb
 2016-05-04 17:42:50 +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
Jason Monk
42d0121441 Add action to launch webview implementation settings 
Bug: 28554048
Change-Id: I5ccdf5350c216949890d79b2b306b935a5949824
 2016-05-03 14:16:56 -04: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
8522739ad6 Merge "use \'int\' for min sdk version" into nyc-dev 
am: 6a3948bc12

* commit '6a3948bc1268f84faac81d65f43670c30f83746a':
  use 'int' for min sdk version

Change-Id: Id9aede51d6b87c357cb82242e5fc4980d16679f2
 2016-05-02 23:35:26 +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
0d231c708b Merge "media: Add missing dobly-vision profile." into nyc-dev 
am: 66496d0d6d

* commit '66496d0d6d179116af5218d409ca64c5f0f16ed4':
  media: Add missing dobly-vision profile.

Change-Id: I6d91bdc3da539e12c6e58e4b4c762fec0f68fc8c
 2016-05-02 17:08:21 +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