Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
491,937 Commits 3 Branches 0 Tags
d3e6b6d0d0bf613c71466779886cb367e79c0786
Commit Graph

491937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimir Marko
d3e6b6d0d0 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 5ede7b15e3 am: 866dcfbbba -s ours am: 67aa40bdd1 -s ours am: 308a623d81 -s ours 
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 c8ad37247f is in history

Change-Id: I470446e56363acbd3c4016f93ad9400abf9432b7
 2020-03-25 18:01:18 +00:00
TreeHugger Robot
64f58e55be Merge "Let Home activity restart during first few crashes" into rvc-dev am: d0db17a1c2 am: 581667d61e am: 334b6a3e96 
Change-Id: If9cb1a90f0de5d2b385f03734e170e62b869d1fa
 2020-03-25 18:00:50 +00:00
Muhammad Qureshi
a5b148b95f Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e2e am: e440df36bb am: 6604c0361c 
Change-Id: Id9074ab72de2b4c3c17d61cfa2960e9725ead506
 2020-03-25 18:00:39 +00:00
Tiger Huang
174f6d283d Merge "Make canBeImeTarget be compatible with legacy behavior" into rvc-dev am: d10a12cf27 am: 657fc7118b am: 2a4d9c01ec 
Change-Id: I88573828ef51c65b5b9ef845f03d7714e323117d
 2020-03-25 18:00:25 +00:00
Automerger Merge Worker
895363e96f Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 189336319f" into rvc-d1-dev-plus-aosp am: b4e0e04f37 
Change-Id: Ief50876a2ca935070d06a0d20ca3876e4f1f3131
 2020-03-25 18:00:16 +00:00
TreeHugger Robot
b5cd565796 Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev am: 8910bf95c6 am: 2783274cbe am: 1beaab1399 
Change-Id: I94b93e1508be507ac8d30d904e0018e8b8f35173
 2020-03-25 17:59:50 +00:00
Dmitri Plotnikov
4dacc75262 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10e5 am: 84a2bbf8b9 am: 15ff963c63 
Change-Id: Ifea8f2930c578bfcc5c575b9e0240480e451be62
 2020-03-25 17:59:36 +00:00
Automerger Merge Worker
6f4d36e95b Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 1bfe8d5609" into rvc-d1-dev-plus-aosp am: 9659bb9b3b 
Change-Id: I247039e3a6413c8c585c9b4d8d70494c402c3f2e
 2020-03-25 17:59:10 +00:00
TreeHugger Robot
38bf7ed360 Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 37eb8e6043 am: 0540a62e3a 
Change-Id: I29d21a6a87bd9c355b56957ec3cb5b1acf0c31c1
 2020-03-25 17:58:48 +00:00
Automerger Merge Worker
62c4eea466 Merge "Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 4520d4806c" into rvc-d1-dev-plus-aosp am: 1466cb4588 
Change-Id: Ia9294db3862fb137c1dc22cc0e324bbeff5671a1
 2020-03-25 17:58:16 +00:00
Christine Tsai
9705ec5d47 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 am: 696319f65d am: f27b60c486 
Change-Id: Ib797f4ccbee311587f2fbe7e268b04f0a265a495
 2020-03-25 17:57:16 +00:00
Vladimir Marko
308a623d81 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 5ede7b15e3 am: 866dcfbbba -s ours am: 67aa40bdd1 -s ours 
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 c8ad37247f is in history

Change-Id: Id4e3a2c46530170bb32b199191a58fbef6bcc537
 2020-03-25 17:48:51 +00:00
TreeHugger Robot
334b6a3e96 Merge "Let Home activity restart during first few crashes" into rvc-dev am: d0db17a1c2 am: 581667d61e 
Change-Id: I63b46d76e14b8d628c70033a5a428cd449de2613
 2020-03-25 17:48:25 +00:00
Muhammad Qureshi
6604c0361c Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e2e am: e440df36bb 
Change-Id: I0df36e8f3ac037134fa5eee02655680add0258a6
 2020-03-25 17:48:18 +00:00
Vladimir Marko
67aa40bdd1 [automerger skipped] Merge "Add permitted_packages to framework-tethering." am: 5ede7b15e3 am: 866dcfbbba -s ours 
am skip reason: Change-Id I248c36b2cf2f5776978c4fd2322d3b73ade309ff with SHA-1 c8ad37247f is in history

Change-Id: Ib63bf9c7be1419b8f9b5bd6a2230733480786266
 2020-03-25 17:48:18 +00:00
TreeHugger Robot
581667d61e Merge "Let Home activity restart during first few crashes" into rvc-dev am: d0db17a1c2 
Change-Id: If3e1987728588aad0efed692f1a99f934bac8c83
 2020-03-25 17:40:58 +00:00
Muhammad Qureshi
e440df36bb Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e2e 
Change-Id: Ibd751ce32cc1ed3bec08712bf019af81fc595985
 2020-03-25 17:40:28 +00:00
Tiger Huang
2a4d9c01ec Merge "Make canBeImeTarget be compatible with legacy behavior" into rvc-dev am: d10a12cf27 am: 657fc7118b 
Change-Id: Ic9eaeece5284751448bd12f9f42853f92d580a70
 2020-03-25 17:40:18 +00:00
Automerger Merge Worker
b4e0e04f37 Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 189336319f" into rvc-d1-dev-plus-aosp 2020-03-25 17:40:16 +00:00
Eugene Susla
050c0372b0 Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 189336319f 
Change-Id: I2c73abcc877a2428c0e7524d57f20df0464a76b0
 2020-03-25 17:40:06 +00:00
TreeHugger Robot
1beaab1399 Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev am: 8910bf95c6 am: 2783274cbe 
Change-Id: I286adeca0c258a8e6557a4125e15a903d3c1c5db
 2020-03-25 17:40:02 +00:00
Dmitri Plotnikov
15ff963c63 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10e5 am: 84a2bbf8b9 
Change-Id: Iabc1ea0e689a99609a9f364c0cc06601914d6cb9
 2020-03-25 17:39:45 +00:00
Automerger Merge Worker
9659bb9b3b Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 1bfe8d5609" into rvc-d1-dev-plus-aosp 2020-03-25 17:39:31 +00:00
Tiger Huang
657fc7118b Merge "Make canBeImeTarget be compatible with legacy behavior" into rvc-dev am: d10a12cf27 
Change-Id: If0040c3acf44440c0319301a0e633cd275f30327
 2020-03-25 17:39:30 +00:00
Eugene Susla
86c5aee216 Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 am: 1bfe8d5609 
Change-Id: Ib29c3fc2512d6b1f0f7c7561fdacf40f882cabf7
 2020-03-25 17:39:25 +00:00
TreeHugger Robot
0540a62e3a Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 37eb8e6043 
Change-Id: I290a923c97724fe638b99346b6f02390037e2024
 2020-03-25 17:39:18 +00:00
Automerger Merge Worker
1466cb4588 Merge "Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 4520d4806c" into rvc-d1-dev-plus-aosp 2020-03-25 17:38:44 +00:00
TreeHugger Robot
2783274cbe Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev am: 8910bf95c6 
Change-Id: Ic47b08af8e5db157372684542050a0d83a60812a
 2020-03-25 17:38:39 +00:00
TreeHugger Robot
d0db17a1c2 Merge "Let Home activity restart during first few crashes" into rvc-dev 2020-03-25 17:38:37 +00:00
TreeHugger Robot
5e91c5d145 Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb am: 4520d4806c 
Change-Id: Ib14aea80cf0c8ee44e7d750763798de8e9a9f804
 2020-03-25 17:38:36 +00:00
Christine Tsai
f27b60c486 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 am: 696319f65d 
Change-Id: I55441579336b2983654725bac434decf203e9263
 2020-03-25 17:38:32 +00:00
Muhammad Qureshi
6fe5fd6e2e Merge changes Iad76baea,I3db5f4ff into rvc-dev 
* changes:
  Run clang-format in stats_log_api_gen
  Add truncate_timestamp annotation
 2020-03-25 17:38:05 +00:00
Tiger Huang
d10a12cf27 Merge "Make canBeImeTarget be compatible with legacy behavior" into rvc-dev 2020-03-25 17:36:56 +00:00
TreeHugger Robot
8910bf95c6 Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev 2020-03-25 17:32:55 +00:00
Dmitri Plotnikov
84a2bbf8b9 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10e5 
Change-Id: Ie8d5a35e9c0c8d52555578c720b423c5ebe12b73
 2020-03-25 17:26:28 +00:00
Vladimir Marko
866dcfbbba Merge "Add permitted_packages to framework-tethering." am: 5ede7b15e3 
Change-Id: If6038fd99d049bbeb752fa39cda36b6908a4a214
 2020-03-25 17:26:24 +00:00
Dmitri Plotnikov
f903ef10e5 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev 2020-03-25 17:24:31 +00:00
Ned Burns
4b97b91c8a Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: ccb5630b3c am: 7bc4be572b am: 7d56613cb5 
Change-Id: I70333a69e20951315b9dd23d4101b74c3e7f9a34
 2020-03-25 17:19:15 +00:00
TreeHugger Robot
d6e3d68921 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 am: bcfd0170f1 am: 44c3a3aada 
Change-Id: Ib5a5d4194b43b2edeb22322b2119fcd2c038027f
 2020-03-25 17:19:01 +00:00
Winson Chung
a3e81e9357 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24 am: 517c476695 am: 9544a24b6a 
Change-Id: I0f4cb63285d1e1b10272464f347fe9c73f842829
 2020-03-25 17:18:51 +00:00
Eugene Susla
1bfe8d5609 Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 
Change-Id: If829d3cee8c03c4e18b1ba58e4f90a798c6d9d97
 2020-03-25 17:18:39 +00:00
Winson Chung
c424c97bdf Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: 7cc2b1f149 am: 6db905a7a0 am: c1b107d6b3 
Change-Id: I6e6cb14460abc15c0575bdb2d4446ace824baa98
 2020-03-25 17:18:29 +00:00
Ned Burns
d1ccb8f419 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: ccb5630b3c am: edab3f9c7b 
Change-Id: Ib7fc9d2f554b339ed9e963751e6263fe36536286
 2020-03-25 17:18:05 +00:00
Eugene Susla
189336319f Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864d5 
Change-Id: Ib9b8d81487c1b6770b0d39187a2ac8c7ade4fdc9
 2020-03-25 17:17:45 +00:00
Christine Tsai
e3b0037e92 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 am: 819aa0f9f0 am: 7563df3f4d 
Change-Id: Icbed443f99ba25bd580fdc57301b619a91a3ff99
 2020-03-25 17:17:30 +00:00
TreeHugger Robot
37eb8e6043 Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb 
Change-Id: I51455b4b2ce3c5c2c5d7f7ef85f24f46cf2c2ef7
 2020-03-25 17:17:26 +00:00
Ned Burns
7d56613cb5 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: ccb5630b3c am: 7bc4be572b 
Change-Id: I30b728d7513ed6a185b3c7bbf6de0d378dd87e36
 2020-03-25 17:17:26 +00:00
TreeHugger Robot
4520d4806c Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev am: 0e503e5ebb 
Change-Id: I44ab58c1989150c865641f66488dd75e95b51c6d
 2020-03-25 17:17:24 +00:00
Rubin Xu
f0056c3061 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 2d0d3ce038 am: 754d6901be am: ad51413452 
Change-Id: I6d9e911c7b0b3bbecc93aad0b4e65aae908b767a
 2020-03-25 17:17:04 +00:00
TreeHugger Robot
44c3a3aada Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 am: bcfd0170f1 
Change-Id: I6d02a53b5d03991c3d41da8c300d7c74c194e51c
 2020-03-25 17:16:52 +00:00