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

60515 Commits

Author SHA1 Message Date
Adrian Roos
e5b0923a02 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00 
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
 2016-05-17 21:38:31 +00:00
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
 2016-05-17 21:22:39 +00:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
 2016-05-17 21:17:33 +00:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
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
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
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00: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
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
Clara Bayarri
d1ad651149 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 am: 60d0910dc8 
am: 4cfd27f9aa

* commit '4cfd27f9aa10bcbf272935e142d1171730e7c7b9':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Ia8c7ede8cf8ebd706cfdf51024c001a9538be49a
 2016-05-17 09:27:59 +00:00
Clara Bayarri
4cfd27f9aa Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 
am: 60d0910dc8

* commit '60d0910dc8754a9e661ab9b68cdac0b316c35753':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Ia917dd039f7ecde4bc3d093fe7f4900c66dfc590
 2016-05-17 09:24:52 +00:00
Clara Bayarri
60d0910dc8 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
 2016-05-17 09:21:15 +00:00
Clara Bayarri
ec200415f5 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
 2016-05-17 09:20:43 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Martijn Coenen
6136730e3b Adddress NFC API review comments. 
Bug: 28775492
Change-Id: I01befba3435f0d882787fecabd3c1041fe7260d7
 2016-05-17 09:09:15 +02:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717 
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
 2016-05-17 01:10:44 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
 2016-05-17 01:05:00 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
 2016-05-17 00:59:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
 2016-05-17 00:57:25 +00:00