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

13732 Commits

Author SHA1 Message Date
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
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
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
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
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
Tyler Gunn
2cbe2b5816 Un-@hide multi-endpoint APIs. 
Bug: 28621640
This reverts commit 1bf206b766.
Change-Id: If8c85e4adeb017eec2b7e8199010deae2a920c6a
 2016-05-06 03:07:45 +00:00
Vladislav Kaznacheev
70400ba52e Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 am: f1febf2700 
am: cae475563a

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

Change-Id: I462fc13ea64f72cfbf620f473f8d55d9a532eb24
 2016-05-05 23:26:33 +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
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
 2016-05-05 23:16: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
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
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId 
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
 2016-05-05 09:32:27 -07: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
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