Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,245 Commits 3 Branches 0 Tags
906bf903b4c2160080c53a6103494de40fa00d81
Commit Graph

13681 Commits

Author SHA1 Message Date
Jason Monk
d7216d34a8 Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e2971 am: eb435a3a4c 
am: ef8fd63228

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

Change-Id: I7428a61f23573e2ce91d181c7238195f661ca43a
 2016-05-05 17:15:19 +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
Neil Fuller
e935ca55f4 Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba am: bd6e38e6b7 
am: f1340ad082

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

Change-Id: If01433a85a20625f3f1abf4c20c881f1d5ce0ecd
 2016-05-05 10:05:45 +00: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
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
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
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
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
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
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
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
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
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