Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
482,460 Commits 3 Branches 0 Tags
6604c0361ceaf1aead8a3085915c5da606e46108
Commit Graph

482460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dmitri Plotnikov
f903ef10e5 Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev 2020-03-25 17:24:31 +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
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
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
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
Christine Tsai
696319f65d Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 
Change-Id: If284577a07cc8c2bd55786d8064b017ecddbb2ff
 2020-03-25 17:16:20 +00:00
Eugene Susla
2f54a864d5 Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev 2020-03-25 17:03:32 +00:00
TreeHugger Robot
0e503e5ebb Merge "Don't dispatch IME insets if the target is above IME" into rvc-dev 2020-03-25 17:01:33 +00:00
Ned Burns
edab3f9c7b Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: ccb5630b3c 
Change-Id: If4a07aeec09d2eb40bfdefc8ae41fd1a561a458a
 2020-03-25 16:49:36 +00:00
Christine Tsai
7563df3f4d Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 am: 819aa0f9f0 
Change-Id: I1bc44318bbf2ad11a29d1964b91ab1de01650667
 2020-03-25 16:49:28 +00:00
TreeHugger Robot
63c45b2c9b Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 
Change-Id: I3c7787b4e45128ec437b9d3b8aaebf2da83b8878
 2020-03-25 16:49:13 +00:00
Christine Tsai
819aa0f9f0 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev am: be88f7df21 
Change-Id: I72ee6099c39454d5cc601fa337249aad4ba2972f
 2020-03-25 16:43:16 +00:00
Christine Tsai
be88f7df21 Merge "Update the cc_benchmark to use the new socket schema" into rvc-dev 2020-03-25 16:41:20 +00:00
Ned Burns
13b4c04ce5 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 am: 5da7d04fe0 
Change-Id: I37a5fcf27595c91ca0a6b0de0bb988d363c04c91
 2020-03-25 16:38:02 +00:00
TreeHugger Robot
a4926600a6 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 35bbfae5e7 
Change-Id: I14b2caf450f18ec2d8bc9f351c244bb26b49840d
 2020-03-25 16:37:55 +00:00
Ned Burns
ccb5630b3c Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 
Change-Id: I348640d5422a0a3a501773be47481c585cab59f0
 2020-03-25 16:37:39 +00:00
Anton Hansson
e51bc391b7 [automerger skipped] Merge "Add module_lib and system-server artifacts to sdk dist" am: 33d6fda1e0 am: c2c4454d89 -s ours am: 7570fa1fe2 -s ours 
am skip reason: Change-Id Ia1064e50e987433e5e308527c6770ba2d3e8bde3 with SHA-1 7b0414beb7 is in history

Change-Id: I79c4e0601152e216b319b0ca94ad744073c720ef
 2020-03-25 16:37:38 +00:00
TreeHugger Robot
9893288b79 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da 
Change-Id: I8fb4d7f609173edb436175338f26bc79d6fa834e
 2020-03-25 16:37:20 +00:00
Ned Burns
5da7d04fe0 Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab66 
Change-Id: I3be9e6735723ef1932622fc3cd6859c06cc11f52
 2020-03-25 16:30:52 +00:00
TreeHugger Robot
35bbfae5e7 Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da 
Change-Id: I60d203a26ea175db12845a710c75caae65aa90e8
 2020-03-25 16:30:30 +00:00
Winson Chung
08941e5c2d Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: b5c15eab24 
Change-Id: Ia2fe4cd03ccf69ff9508a559d2c196c177ec1100
 2020-03-25 16:29:57 +00:00
Anton Hansson
7570fa1fe2 [automerger skipped] Merge "Add module_lib and system-server artifacts to sdk dist" am: 33d6fda1e0 am: c2c4454d89 -s ours 
am skip reason: Change-Id Ia1064e50e987433e5e308527c6770ba2d3e8bde3 with SHA-1 7b0414beb7 is in history

Change-Id: I0ff8faa85c915497c103053fe81c493669fabe55
 2020-03-25 16:29:51 +00:00
Winson Chung
4d4c220aaa Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: 7cc2b1f149 
Change-Id: Ib592f9f4685c3a5653acf3ebad7f25982b5237d1
 2020-03-25 16:29:25 +00:00
Ned Burns
dc3919ab66 Merge "Move inactive user filtering to its own filter" into rvc-dev 2020-03-25 16:29:21 +00:00
Rubin Xu
170770e49c Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 2d0d3ce038 
Change-Id: Ifb5c7ca431c3be8c7593f2721004693a625f07ff
 2020-03-25 16:29:14 +00:00
TreeHugger Robot
aa9b7407da Merge "Don't include the data dir in zygote library paths." into rvc-dev 2020-03-25 16:27:52 +00:00
Winson Chung
ade9f06e73 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: a87cb3c6a6 
Change-Id: I682e272747398cf33424d60170f921880e6f1540
 2020-03-25 16:24:34 +00:00
Winson Chung
6b1169b66a Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141 am: b18c003146 
Change-Id: I70c7b5d2902c36a6b29a031fb113600901e359eb
 2020-03-25 16:24:26 +00:00
Winson Chung
a87cb3c6a6 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f 
Change-Id: Iaca30c58a3393374fd90d88caa404059717ae9c9
 2020-03-25 16:24:23 +00:00
Rubin Xu
c84f4530a4 Merge "Clear no_remove_managed_profile retriction when removing test PO" into rvc-dev am: 9747684a07 am: 8ab1a41a5f 
Change-Id: If8985a4f78020a22dd15959594a7b8bcaffa883e
 2020-03-25 16:24:15 +00:00
Winson Chung
b5c15eab24 Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f 
Change-Id: I1fc934d1a6d601d36fed3a6f2e2f3477f1bc5228
 2020-03-25 16:24:12 +00:00