Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,285 Commits 3 Branches 0 Tags
a02fbe1ea00a9b6a5df5bd965be74ada7e496c8a
Commit Graph

9841 Commits

Author SHA1 Message Date
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
 2016-05-12 20:58:55 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Tingting Wang
2fc6bf3936 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
 2016-05-12 17:16:17 +00:00
Tingting Wang
752129929f Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 2016-05-12 17:11:44 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev 
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
 2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
Chris Wren
08eb83f8b0 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I03bb7490b62e749e16a417297a672769283aebdd
 2016-05-12 13:00:50 +00:00
Chris Wren
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager 
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
 2016-05-11 14:25:55 -07:00
Adrian Roos
7f06eed7f5 DPM control for remote input when locked 
Bug: 26981262
Change-Id: I84f26ebe807e89fd56ffc3bbc7fc20f12e2f7391
 2016-05-11 19:54:09 +00:00
Chris Wren
5ab5c748a8 document the return type of getImportance 
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
 2016-05-11 12:44:58 -04:00
Joachim Sauer
6fcdca255a Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 
am: 5b40d70ced

* commit '5b40d70ced417f1f29f8ce36bed3ecfb26278486':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I46085f856170dd21069934ce9f7a1b8a991bc84d
 2016-05-11 09:35:16 +00:00
Joachim Sauer
5b40d70ced Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 2016-05-11 09:25:09 +00:00
Tingting Wang
e0cbda454c Rename CONTACT_METADATA_SYNC GService Flag. 
Rename it to CONTACT_METADATA_SYNC_ENABLED.

BUG 28295805

Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d
 2016-05-10 17:29:00 -07:00
Antonio Cansado
7598ac2aa7 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev 
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
 2016-05-10 21:05:17 +00:00
Antonio Cansado
6965c1869a Addressing API council comments on NetworkStatsManager. 
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
 2016-05-10 13:24:16 -07:00
Joachim Sauer
91f4aec3cc Fix AbstractStringBuilder gaining extra APIs. 
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).

Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.

@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).

Bug: 27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
 2016-05-10 15:15:17 +01:00
Yi Kong
5d831a8004 Merge "Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4" am: 4c7169fadf 
am: 90aac416fa

* commit '90aac416fab1cdfb91d25f6c6be75654cba67c4f':
  Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4

Change-Id: I65ebb5bf234c2a50193642ba05acc9560bff3e26
 2016-05-09 16:56:05 +00:00
Yi Kong
c2b4f49241 Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
 2016-05-09 16:04:55 +00:00
Ricky Wai
de1e4a1048 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I22bd5f8f3d71ae19a2fcac139531243f2546033e
 2016-05-06 12:19:00 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +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
8bea855f75 Track external/icu API changes for factory registration 
Bug: 28583844
(cherry picked from commit e7fda97fff)

Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842
 2016-05-05 11:38:45 +01:00
Paul Duffin
bd63ae8c83 ICU4J: Hide constants that can change between releases 
Bug: 27830659
(cherry picked from commit 71498f107c)

Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c
 2016-05-05 11:34:01 +01:00
Paul Duffin
2391234242 Remove RawCollationKey/ByteArrayWrapper from the public API 
Bug: 22023363
(cherry picked from commit baa72515f6)

Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c
 2016-05-05 11:33:15 +01: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
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