Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
495,431 Commits 3 Branches 0 Tags
06f64d44d4299935cd6573964ab504dfd8fcbd74
Commit Graph

495431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aran Ink
06f64d44d4 Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07ca am: beae6de446 
Change-Id: I6357bc9342217fa2dbbf0b70077de8421469e2c4
 2020-04-28 17:03:04 +00:00
TreeHugger Robot
37831bc20f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6952230a8d -s ours am: df32a9338b -s ours 
am skip reason: subject contains skip directive

Change-Id: I7a1b9068f8852b3c176daee0c4c95706252cb0bd
 2020-04-28 17:02:29 +00:00
TreeHugger Robot
cfcf9fec37 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05994d3f8b -s ours am: e7c48df79c -s ours 
am skip reason: subject contains skip directive

Change-Id: I65e4c444186fceb6b6433ca849d214d523c8b6b0
 2020-04-28 17:02:13 +00:00
TreeHugger Robot
3aa99c76d3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d9f -s ours am: 40bd90c384 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie4d34d46dc3020615ecd85a0b63433527b84aef2
 2020-04-28 17:02:00 +00:00
Selim Cinek
c0ae083fc3 Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e048 am: e5b21c7812 
Change-Id: Ia7c90880bfcb2c15c65fa396e589a6ad9ea62c98
 2020-04-28 17:01:45 +00:00
Aran Ink
beae6de446 Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07ca 
Change-Id: I656da38236b158e6f997d63f71250d9c10e09c36
 2020-04-28 17:01:31 +00:00
Sarah Chin
7489e40f97 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d am: 88e7e04e61 
Change-Id: I7e3b0ab2d179f115965322d734bd106365b129b6
 2020-04-28 17:01:22 +00:00
Aran Ink
d41bdc07ca Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev 2020-04-28 16:57:58 +00:00
TreeHugger Robot
52de0789a6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d9f -s ours am: 116f248c8d -s ours 
am skip reason: subject contains skip directive

Change-Id: I16c9dd2d1263924c0dd53c7fb242aefa7c0dc74d
 2020-04-28 16:57:24 +00:00
Selim Cinek
61ceb722b6 Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e048 am: 95581cca4e 
Change-Id: Ia3693a7665a20f286043c79b660dd73f259552c9
 2020-04-28 16:57:16 +00:00
TreeHugger Robot
df32a9338b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6952230a8d -s ours 
am skip reason: subject contains skip directive

Change-Id: I0678c73fd47b451748210d347f8df0c73efedcb5
 2020-04-28 16:56:59 +00:00
TreeHugger Robot
6952230a8d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-28 16:56:51 +00:00
TreeHugger Robot
e7c48df79c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05994d3f8b -s ours 
am skip reason: subject contains skip directive

Change-Id: I532b57cf86d62c7c36f3ee4668e6e3279793be37
 2020-04-28 16:56:50 +00:00
Sarah Chin
45ceb92314 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d am: d6d2e5c1a8 
Change-Id: I0fa9a951ccf3c0c9ce774f366bfb526367639da9
 2020-04-28 16:56:41 +00:00
TreeHugger Robot
40bd90c384 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d9f -s ours 
am skip reason: subject contains skip directive

Change-Id: I4bed6b2c833e267f95ae06e07102bc12ffd4d295
 2020-04-28 16:56:39 +00:00
Selim Cinek
e5b21c7812 Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e048 
Change-Id: Ia92a0dbbd6a0d39f4929c1219a07545dd54337bf
 2020-04-28 16:56:29 +00:00
Sarah Chin
88e7e04e61 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d 
Change-Id: I18da5ac00d8db7c224596606bd6be56be4a08a5b
 2020-04-28 16:56:08 +00:00
TreeHugger Robot
05994d3f8b Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-28 16:56:01 +00:00
TreeHugger Robot
116f248c8d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d9f -s ours 
am skip reason: subject contains skip directive

Change-Id: I9e52b658efa4622b6de34d327d0afeeac588e586
 2020-04-28 16:55:57 +00:00
TreeHugger Robot
ca0c1f6191 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca47e7b0cc -s ours am: f108d31f19 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia2c3719b6758758a08cbe74f07a18892e53d227b
 2020-04-28 16:55:41 +00:00
TreeHugger Robot
a157147d9f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-28 16:51:31 +00:00
Selim Cinek
95581cca4e Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e048 
Change-Id: I0c9df8ef02b7b62bfaad8e7f22100c5e0138919e
 2020-04-28 16:51:21 +00:00
Sarah Chin
d6d2e5c1a8 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d 
Change-Id: I727196619e88bdcebc4dfee128ed9677bed9b44a
 2020-04-28 16:50:34 +00:00
Selim Cinek
755bf9e048 Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev 2020-04-28 16:50:30 +00:00
TreeHugger Robot
3d58ec39de [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca47e7b0cc -s ours am: 99fd4cf8ca -s ours 
am skip reason: subject contains skip directive

Change-Id: I9312b8487bb6183034287c434e3807cf20d79aca
 2020-04-28 16:50:07 +00:00
Sarah Chin
5227e8441d Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev 
* changes:
  Remove constants for DisplayInfo logic from DcTracker
  Add carrier configs for 5G timer requirements
 2020-04-28 16:48:19 +00:00
TreeHugger Robot
99fd4cf8ca [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca47e7b0cc -s ours 
am skip reason: subject contains skip directive

Change-Id: I2c260067d23b19d80df7d203cca6b5aa83fbfaca
 2020-04-28 16:42:18 +00:00
TreeHugger Robot
f108d31f19 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca47e7b0cc -s ours 
am skip reason: subject contains skip directive

Change-Id: I6f74433eead6fa726700d6d7623596f2f39edf08
 2020-04-28 16:42:06 +00:00
TreeHugger Robot
ca47e7b0cc Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-28 16:40:20 +00:00
TreeHugger Robot
4acc6f5aaf Merge "No scrolling in overflow" into rvc-dev am: e01e3a69ad am: 4f7782b33a 
Change-Id: Ie7a25c8f9fe6a935fffb8f92962aca5d55c02d6d
 2020-04-28 16:39:32 +00:00
Automerger Merge Worker
ec36ea8c2e Merge "Merge "No scrolling in overflow" into rvc-dev am: e01e3a69ad am: b63d39c5eb" into rvc-d1-dev-plus-aosp 2020-04-28 16:39:05 +00:00
TreeHugger Robot
5ad4b957c3 Merge "No scrolling in overflow" into rvc-dev am: e01e3a69ad am: b63d39c5eb 
Change-Id: I2dad4b5517a006312a38a7b365381cab352b35a7
 2020-04-28 16:38:59 +00:00
Automerger Merge Worker
56c175e00c Merge "Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaada am: 3c64f5635c" into rvc-d1-dev-plus-aosp 2020-04-28 16:38:58 +00:00
Mady Mellor
828b45c97c Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaada am: 3c64f5635c 
Change-Id: I6c96b7d3f7a8479d4f1510526eff1201e2fa525e
 2020-04-28 16:38:52 +00:00
Mady Mellor
66991223a9 Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaada am: 55cafb55a0 
Change-Id: I1bdda311c50fb6282301fa325f3599da35de4308
 2020-04-28 16:38:50 +00:00
Automerger Merge Worker
4cd65d1160 Merge "[automerger skipped] Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev am: f2f45653b4 am: bdc04234a7 -s ours" into rvc-d1-dev-plus-aosp 2020-04-28 16:38:47 +00:00
Collin Fijalkovich
02ada7c14b [automerger skipped] Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev am: f2f45653b4 am: bdc04234a7 -s ours 
am skip reason: Change-Id Ifbd380a9281d7bc9c3a9b35c5e93207acabf8d15 with SHA-1 ce43a5985e is in history

Change-Id: Icedddfe24b7af8e9caf376fa3111620cf491da25
 2020-04-28 16:38:43 +00:00
Chen Xu
aac7e73e81 Merge "Fix WebView vulnerability by disallowing file access" am: 57c1da45bf am: e422c51bd3 am: c676bb6630 
Change-Id: Id1f299d203b2549cc8c3cc2cc2e90b404aacb650
 2020-04-28 16:38:41 +00:00
Collin Fijalkovich
6e07a5e269 Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev am: f2f45653b4 am: b5ee33d74c 
Change-Id: I5594137dc5b05c452b2286f378f52b9b111cb7e5
 2020-04-28 16:38:22 +00:00
Automerger Merge Worker
b7a563817d Merge "Merge "Make SystemUI config extendable" into rvc-dev am: d5b5453d18 am: 1bf1b07ed2" into rvc-d1-dev-plus-aosp 2020-04-28 16:38:08 +00:00
TreeHugger Robot
b63d39c5eb Merge "No scrolling in overflow" into rvc-dev am: e01e3a69ad 
Change-Id: I15bd25d702792176b4e586d2939d31e84030eebc
 2020-04-28 16:38:02 +00:00
Heemin Seog
77e7bb2206 Merge "Make SystemUI config extendable" into rvc-dev am: d5b5453d18 am: 1bf1b07ed2 
Change-Id: I5ed4e14450743795072850e6d172958a97ad620c
 2020-04-28 16:37:59 +00:00
Automerger Merge Worker
8c0122d881 Merge "Merge "Make SystemUI config extendable" into rvc-dev am: d5b5453d18 am: 11c54a7a10" into rvc-d1-dev-plus-aosp 2020-04-28 16:37:58 +00:00
Mady Mellor
55cafb55a0 Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaada 
Change-Id: I0122de502efdb991352198cef9a3abff5a6d4812
 2020-04-28 16:37:55 +00:00
TreeHugger Robot
4f7782b33a Merge "No scrolling in overflow" into rvc-dev am: e01e3a69ad 
Change-Id: Ib102097ba44dd70fe966cd8dae597bc54eff1611
 2020-04-28 16:37:49 +00:00
Fan Zhang
d4d83696df Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 2171cc9535 
Change-Id: I85c101b43c789182f521670119e18474aef15638
 2020-04-28 16:37:47 +00:00
Heemin Seog
dc906f8b02 Merge "Make SystemUI config extendable" into rvc-dev am: d5b5453d18 am: 11c54a7a10 
Change-Id: Iede5b97efc7675cf76f7dff3385359afce1e6074
 2020-04-28 16:37:46 +00:00
Mady Mellor
3c64f5635c Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaada 
Change-Id: I29d8236f09ea1c11b7823cb01e16b5fe41c02592
 2020-04-28 16:37:36 +00:00
Fan Zhang
f22d19b1ff Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 64750d74ea 
Change-Id: I75b6e977fa3a33ab23aa80a6f1c5e97c23e4de40
 2020-04-28 16:37:25 +00:00
TreeHugger Robot
e01e3a69ad Merge "No scrolling in overflow" into rvc-dev 2020-04-28 16:35:20 +00:00