Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,475 Commits 3 Branches 0 Tags
cb334b7c325cc17f9ba989bf19ec059eff82a08e
Commit Graph

66430 Commits

Author SHA1 Message Date
Felipe Leme
b206fa10e7 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 am: 3b91df7ccf 
am: 8b297e554d

* commit '8b297e554df11ee874e01e4bfaa2b64d9af2bc11':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Ieb58dda8f4749ccf5218be5913beb488fd3247cf
 2016-05-17 19:07:18 +00:00
Felipe Leme
8b297e554d Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
 2016-05-17 18:47:41 +00:00
Martijn Coenen
579977f912 Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc am: 68b426a30d 
am: 5832df526f

* commit '5832df526f2fe2804266c662def53b91e9cb62ca':
  Adddress NFC API review comments.

Change-Id: I7123f39e9625ed49674cf51cf3ed58636a283a7c
 2016-05-17 18:45:14 +00:00
Dianne Hackborn
fab87630f3 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 am: a24af982ff 
am: ae5664af28

* commit 'ae5664af28e78c685c4ffec671254d75f1c932fb':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I96430b2073f2aafba489e5d2a0d11822709f4206
 2016-05-17 18:44:56 +00:00
Martijn Coenen
5832df526f Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc 
am: 68b426a30d

* commit '68b426a30d964295360f32defc2b66e6b7247a93':
  Adddress NFC API review comments.

Change-Id: I00acef221305c4cb7aea75c842c1a758cccfb953
 2016-05-17 18:39:50 +00:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
 2016-05-17 18:39:42 +00:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
 2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
 2016-05-17 18:38:40 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
 2016-05-17 18:38:28 +00:00
Martijn Coenen
68b426a30d Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ic36b9392b9475590ba8f75b352d05fba52b1ee02
 2016-05-17 18:33:09 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
 2016-05-17 18:32:46 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Martijn Coenen
1fef88d8dc Merge "Adddress NFC API review comments." into nyc-dev 2016-05-17 18:21:16 +00:00
Michael Kwan
3ffbb6e7f9 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev am: 59bce44aaa 
am: 4fab094b07

* commit '4fab094b0731686d84c09f42f9e2380ce0f85b1b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: I90e8e527d9628d17a8281ad5b2b79d9090841f3b
 2016-05-17 18:20:23 +00:00
Makoto Onuki
1b537cc623 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83 
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808
 2016-05-17 18:20:19 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
 2016-05-17 18:14:47 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
 2016-05-17 18:14:39 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Robin Lee
01b9528983 Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 am: 607fa836b2 
am: 45d4f351ba

* commit '45d4f351ba79e658cb9abc6633b4d7de62e78ffc':
  Make some of the UID-based VPN code reusable

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
 2016-05-17 17:59:59 +00:00
Robin Lee
45d4f351ba Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 607fa836b2

* commit '607fa836b2b60f411ae239bff5391dcaafbbc799':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
 2016-05-17 17:52:45 +00:00
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702 
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
 2016-05-17 17:41:19 +00:00
Sergio Giro
81b1b5463a Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp 
am: 7bc107228c

* commit '7bc107228c0a41882f4202e568f48580d24bb7ba':
  ZygoteInit: remove extra copy of method

Change-Id: I93614394b6c5b97ba804bb7949f3c1b6a41ef510
 2016-05-17 17:41:09 +00:00
Robin Lee
0867543a06 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
 2016-05-17 17:39:14 +00:00
Robin Lee
607fa836b2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
 2016-05-17 17:36:43 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
 2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
 2016-05-17 17:35:24 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
 2016-05-17 17:32:24 +00:00
TreeHugger Robot
4920698e17 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Sergio Giro
d498859c4a ZygoteInit: remove extra copy of method 
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

(cherry picked from commit 57b8a73d0e)

Change-Id: Idbb046ae47d608343ffb5cbf2df8e0c00920c909
 2016-05-17 18:27:56 +01:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
TreeHugger Robot
c16bf253a2 Merge "pm: query both direct boot un/aware activities" 2016-05-17 17:26:51 +00:00
Phil Weaver
1cc8e5f431 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: bc176c4fbf 
am: c0a46cf445

* commit 'c0a46cf445b620156e27b4d24dbd9f8e90c2d8ee':
  Content description for FloatingToobar overflow.

Change-Id: I2b4a10f15b5956de083b92d3e892aa80fa782017
 2016-05-17 17:25:38 +00:00
Phil Weaver
c0a46cf445 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 
am: bc176c4fbf

* commit 'bc176c4fbf3ab075343699f57c5fc2583549e865':
  Content description for FloatingToobar overflow.

Change-Id: Ic8ab8de6fcb433e26e811f87df3ab99e93dc054c
 2016-05-17 17:22:01 +00:00
Phil Weaver
bc176c4fbf Merge "Content description for FloatingToobar overflow." into nyc-dev 
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
 2016-05-17 17:16:46 +00:00
Phil Weaver
efae6e9ff1 Merge "Content description for FloatingToobar overflow." into nyc-dev 
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: Id7656042c60e76a5afa593df1613e1a609366507
 2016-05-17 17:15:25 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
Sergio Giro
57b8a73d0e ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE 
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

Change-Id: I2d91ee38fe93f600bec89651416e84ab83ef9d4a
 2016-05-17 17:55:27 +01:00
Xiaohui Chen
bb803cf2f6 pm: query both direct boot un/aware activities 
Bug: 28762791
Change-Id: I64009c75ae7ac8784e739349b70d0413f0b4681a
 2016-05-17 16:24:18 +00:00
Sergio Giro
d91f7f4e71 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 am: 9d95ab47ff 
am: 093adbb330

* commit '093adbb3304098eb8d336ff2bebef335dc94bbb1':
  ZygoteInit: warm up JCA providers during preload

Change-Id: Ib039242b086ee995e9428db043cce47a13860cba
 2016-05-17 16:12:43 +00:00
Sergio Giro
093adbb330 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 
am: 9d95ab47ff

* commit '9d95ab47ff318ebb30804dce0890b4de414d5844':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I0c987173ffc212581b21958091e288de531e3e97
 2016-05-17 16:06:43 +00:00
Sergio Giro
9d95ab47ff Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 
am: ef42102cf8

* commit 'ef42102cf8d0dd238deb1871bef07f9646622a91':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I7c8ed5394af0c6e1fd25b289ca615125c4e3c38e
 2016-05-17 16:01:45 +00:00
Sergio Giro
ef42102cf8 Merge "ZygoteInit: warm up JCA providers during preload" 
am: aa733e0b41

* commit 'aa733e0b41e4e15908a4c89e935f824cc5908b4d':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If96e2e482e3fc01c2d3be5eee6d405f9bb5a6571
 2016-05-17 15:56:32 +00:00
Sergio Giro
aa733e0b41 Merge "ZygoteInit: warm up JCA providers during preload" 2016-05-17 15:50:50 +00:00
Zoltan Szatmary-Ban
e0267426c2 Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: 07e232371f 
am: 96489e0c2a

* commit '96489e0c2a370b970fc243a23ccfb3e0a73d0298':
  Introduce system API to get source of user restriction

Change-Id: Id368f8b1a096a86195097ba87a18539f0558a72a
 2016-05-17 15:33:28 +00:00
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
 2016-05-17 15:29:25 +00:00
Zoltan Szatmary-Ban
07e232371f Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
 2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
fc66ec971c Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iab98753f85774d741c5126395d56af194c8b0ca8
 2016-05-17 15:23:59 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00