Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,939 Commits 3 Branches 0 Tags
396da016eda5f7e395c89517e593178dd782eda5
Commit Graph

13754 Commits

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

* commit 'd5bd2b647c8f0acaffae72090748d346cae2351b':
  DPM control for remote input when locked

Change-Id: Ic97f9dbb0f4013709b62ee8dbf7d49c29c5fe807
 2016-05-12 21:04:41 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
 2016-05-12 21:01:32 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

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

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
 2016-05-12 20:58:53 +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
fc48c6a703 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f am: 2fc6bf3936 
am: c8242b22ab

* commit 'c8242b22ab12e0ee5d6c3fd5672bf8b5dd7ac101':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: I5032c5f617e9c4b04893bfd124e6b38196d3dc8e
 2016-05-12 17:29:11 +00:00
Tingting Wang
c8242b22ab Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f 
am: 2fc6bf3936

* commit '2fc6bf3936951764569bef3256bf41823f3986d4':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ib348fbd43a4071156894045e301554ac2631127f
 2016-05-12 17:24:34 +00:00
Tingting Wang
7531057944 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

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

Change-Id: I93f0b86af829eafa6e8425b360a323c48df67776
 2016-05-12 17:24:20 +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
f68f4d298c Merge "document the return type of getImportance" into nyc-dev am: 3041d49d88 am: 08eb83f8b0 
am: 621b459306

* commit '621b45930610e5e4f37936a13f31ace2fe82e83c':
  document the return type of getImportance

Change-Id: I9a208abe9c650f580dea705d33cd45d96d4f5825
 2016-05-12 13:05:46 +00:00
Chris Wren
621b459306 Merge "document the return type of getImportance" into nyc-dev am: 3041d49d88 
am: 08eb83f8b0

* commit '08eb83f8b0498be7f6361113f672eabefbca689b':
  document the return type of getImportance

Change-Id: I9e8522f5a6df34ad12daa43f4ee1502ac6ffc7b7
 2016-05-12 13:03:18 +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
d328afff96 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

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

Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
 2016-05-12 13:00:45 +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
Julia Reynolds
4e3455aebf Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: b15ecad14c" into nyc-mr1-dev-plus-aosp 
am: f5b62afe86

* commit 'f5b62afe86c0118260f5ee82890c12868dcbd90f':
  Do not bundle cross user.

Change-Id: If5163d7bf39f0a086b6b66f39115c366d053d618
 2016-05-11 17:32:57 +00:00
Julia Reynolds
35410a4128 Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: b15ecad14c

* commit 'b15ecad14c8eb9fbf00ffb82c6d5dea37dabcc80':
  Do not bundle cross user.

Change-Id: I54f3d8b36617f5a9294d119a76b19cba0b9793b2
 2016-05-11 17:29:42 +00:00
Julia Reynolds
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 2016-05-11 17:27:03 +00:00
Julia Reynolds
47e0d29473 Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
 2016-05-11 17:26:59 +00:00
Chris Wren
5ab5c748a8 document the return type of getImportance 
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
 2016-05-11 12:44:58 -04:00
Julia Reynolds
eae43fbd17 Do not bundle cross user. 
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
 2016-05-11 10:59:53 -04:00
Joachim Sauer
73933e9f22 Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev am: 5b40d70ced am: 6fcdca255a 
am: ba37cf8959

* commit 'ba37cf895983601a73ec5b40ff2caa8633ea648f':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Idbeb0e128c2f2744f2a9bdb1882d8e2caf41453e
 2016-05-11 09:40:24 +00:00
Joachim Sauer
ba37cf8959 Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev am: 5b40d70ced 
am: 6fcdca255a

* commit '6fcdca255ae055b516fab2c409ce0f2fd573e775':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Id42e935c320e2d57e7f963eef61899e44dd6a66b
 2016-05-11 09:37:52 +00: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
fbba5f6069 Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 
am: 5b40d70ced

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

Change-Id: Ia3cba740ca5741033d88443534b075805a153f76
 2016-05-11 09:35:13 +00:00
Joachim Sauer
5b40d70ced Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 2016-05-11 09:25:09 +00:00
Tyler Gunn
33636055e0 Merge "Add removeExtras(String...) prototype per API review." into nyc-mr1-dev am: e0605a146a 
am: a9cfd5dce3

* commit 'a9cfd5dce3ead7ed1146212a3516c26b8ac7e09a':
  Add removeExtras(String...) prototype per API review.

Change-Id: If82d7ec485c1c58580ebfa13dd35744746a49edd
 2016-05-11 01:28:32 +00:00
Tyler Gunn
a9cfd5dce3 Merge "Add removeExtras(String...) prototype per API review." into nyc-mr1-dev 
am: e0605a146a

* commit 'e0605a146a97adb5d420c21d3d0430c11789413f':
  Add removeExtras(String...) prototype per API review.

Change-Id: I59113c3ac737b277b422789b328b8307b214ff0d
 2016-05-11 01:23:22 +00:00
Tyler Gunn
e0605a146a Merge "Add removeExtras(String...) prototype per API review." into nyc-mr1-dev 2016-05-11 01:16:36 +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
Tyler Gunn
071be6f42b Add removeExtras(String...) prototype per API review. 
Per API review, adding a convenience prototype of the removeExtras method.

Bug: 28295516
Change-Id: Icc0e040516c06205540c5683bde16882a73a89d6
 2016-05-10 14:52:33 -07:00
Antonio Cansado
f8be7f2a5d Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: 7598ac2aa7 
am: 8b2dd44f2f

* commit '8b2dd44f2f30a9dd22799ee30dd4b9c5a093aae5':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ie6455799758f0bdb67440f72c266effaf412e22f
 2016-05-10 21:14:09 +00:00
Antonio Cansado
8b2dd44f2f Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 
am: 7598ac2aa7

* commit '7598ac2aa79f328e52e58bdaa2d8e8d858c2c463':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ia886e1ce98520c1618ba501097a2c979a628bbb4
 2016-05-10 21:08:25 +00: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
de224ba451 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev 
am: dc5f558640

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

Change-Id: I9d884ed999b507ab172418f068c10483422643d3
 2016-05-10 21:05:16 +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
9067a0965b Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
am: e508826d72

* commit 'e508826d7204249d204b0b17004d85bb32b124cf':
  Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4

Change-Id: I0b69ef351d3b80178788ce2b8d456cf063f03786
 2016-05-09 22:17:06 +00:00
Yi Kong
e508826d72 Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
Fix build.

Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
(cherry picked from commit c2b4f49241)
(cherry picked from commit 3657e7985a)
 2016-05-09 22:04:45 +00:00
Tyler Gunn
0e18a36111 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev am: b6029e3ba5 
am: 824697c339

* commit '824697c33929648e4afec5db69dc85824b2888a4':
  Un-@hide multi-endpoint APIs.

Change-Id: Ib9b8c88fb7aa48031f247bf60deb3dc143ead81d
 2016-05-09 18:23:02 +00:00
Tyler Gunn
824697c339 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev 
am: b6029e3ba5

* commit 'b6029e3ba54a73bd95ef63caa337e00b8951e024':
  Un-@hide multi-endpoint APIs.

Change-Id: I9f8e5f933b12b523a81c40e8ff5ac4b8b972228f
 2016-05-09 18:18:55 +00:00
Tyler Gunn
b6029e3ba5 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev 2016-05-09 18:12:45 +00: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
3657e7985a Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
(cherry picked from commit c2b4f49241)
 2016-05-09 17:39:01 +01:00
Yi Kong
c2b4f49241 Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4 
Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
 2016-05-09 16:04:55 +00:00
Ricky Wai
fefa033295 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e am: ecab71c9f7 
am: a31f37dc1c

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

Change-Id: I5d8dd759805881c6134732be89f1105a727daed5
 2016-05-06 12:29:01 +00:00
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