Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
428,337 Commits 3 Branches 0 Tags
35880e3611c8a7eb7793d5aed2709e285fb2226e
Commit Graph

428337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Salo
35880e3611 Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 am: fc94f97a98 
am: c07bfd6f0c

Change-Id: Icda642ee4d0ea4da4a8bc0def497fc6d3db0304b
 2019-06-04 20:48:43 -07:00
Mathieu Chartier
47bd079e99 Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 am: f5ae9a62da 
am: bbffcf3416

Change-Id: Ie97112b428884a885cb7c203e681dca03d3f4d67
 2019-06-04 20:47:07 -07:00
Bill Yi
02495d0b46 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours am: e4aa0a8d1f -s ours 
am: 42560dcfde -s ours
am skip reason: subject contains skip directive

Change-Id: I871f87196f75db329987936a6cf8a3c14fc49a74
 2019-06-04 20:45:46 -07:00
Bill Yi
6346f4b433 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours am: c358eca34b -s ours 
am: e7797175c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I99400283028f029eeee29027cd5f795242c388bd
 2019-06-04 20:44:23 -07:00
Tracy Zhou
5f52d16dba Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a am: a676a30ae5 
am: 0390fb2bb7

Change-Id: I935bab0c22fe69402baae5d8ec55632972e9f14b
 2019-06-04 20:43:04 -07:00
Hui Yu
32d6239872 Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 am: 33add786a6 
am: 47d968bebb

Change-Id: Idb6ddda3c5a336253078186cfd5edeeb3d3747b0
 2019-06-04 20:41:37 -07:00
David Sehr
a3cda96592 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a -s ours am: e698002e22 -s ours 
am: 10d1f2e5c9 -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I2570d404f91b9c7cf5b35634ed3df0e540ff84ed
 2019-06-04 20:40:08 -07:00
Winson Chung
8dc0b30f93 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a am: 8d8dcec593 
am: 8c0084a538

Change-Id: I7ebe55e93bdabe6e84cca6c418f06d2a6de69c1d
 2019-06-04 20:38:35 -07:00
Jovana Knezevic
8394a7b5c3 Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee am: dcb4951fea 
am: a6fe66985c

Change-Id: Ic6946bb361537dde5183345050f87a583f4ea5ff
 2019-06-04 20:37:06 -07:00
Mady Mellor
173b7ce7c3 Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90 am: b2bcff6769 
am: b07f107196

Change-Id: I491d82d6b3f94a133008a935d67fe654400a1f5d
 2019-06-04 20:35:37 -07:00
Wale Ogunwale
58d6fb4f3c Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 am: ef2a04ad41 
am: d04ecf01c6

Change-Id: Iccbb3ce3d8ca313a05c283ab13a07906dfa8706c
 2019-06-04 20:33:52 -07:00
Matt Casey
400c253790 Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b am: 05e8a22ab1 
am: cc229b18e5

Change-Id: I4e62ac4a26528312257e3af844121b5bb5d1b2bf
 2019-06-04 20:32:14 -07:00
Lorenzo Colitti
fd799860c7 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41 am: e0348e5a6f 
am: 3a19df0784

Change-Id: I516f47609c552e8213c218ba9fc0f665fed4b63a
 2019-06-04 20:29:05 -07:00
Makoto Onuki
ced94c8a6a Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: 231b70ce96 
am: f5053e7a0d

Change-Id: I96e48d61b6a2c98ad30a0760466fe6ffe9007b9c
 2019-06-04 20:26:44 -07:00
Hongyi Zhang
f5363321f0 Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 am: 887d09db5f 
am: a3790b9a35

Change-Id: I8ccd5f250cf165e2e1a041c58296ae895efd73db
 2019-06-04 20:19:45 -07:00
Victor Hsieh
c0c0e0cea4 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 am: 6ebd3bf5e8 
am: 71cd9d6671

Change-Id: I26226aa007bfa1126e0a4ba4870549b98646db89
 2019-06-04 20:06:27 -07:00
Alex Salo
c07bfd6f0c Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 
am: fc94f97a98

Change-Id: I66a76f47b514aafc82a62abc4bacd96f3621d4a1
 2019-06-04 19:34:32 -07:00
Mathieu Chartier
bbffcf3416 Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 
am: f5ae9a62da

Change-Id: I7f535b5aba2b81c123c1dd29bf14717373f3c173
 2019-06-04 19:32:58 -07:00
Bill Yi
42560dcfde [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours 
am: e4aa0a8d1f -s ours
am skip reason: subject contains skip directive

Change-Id: Id6e9a49530add170669188a00f25055c3ff11b2c
 2019-06-04 19:31:21 -07:00
Brad Ebinger
a62010acfd Merge "Switch DDS during MSIM emergency call" 2019-06-05 02:30:42 +00:00
Bill Yi
e7797175c7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours 
am: c358eca34b -s ours
am skip reason: subject contains skip directive

Change-Id: I0f39b0dbcdc9d13982f6e1ddf3f817b4859cc95f
 2019-06-04 19:29:50 -07:00
Tracy Zhou
0390fb2bb7 Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a 
am: a676a30ae5

Change-Id: I5b49c17d2c7fcfeb7ea02f08d9c347e55bfb5a51
 2019-06-04 19:28:18 -07:00
Hui Yu
47d968bebb Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 
am: 33add786a6

Change-Id: Ic5f8e1de1ab227a631af9564dfcc1fc0054c2612
 2019-06-04 19:26:49 -07:00
David Sehr
10d1f2e5c9 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a -s ours 
am: e698002e22 -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I6e0311852015edd916b65e3ac0e4a8930c366a3d
 2019-06-04 19:25:30 -07:00
Winson Chung
8c0084a538 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a 
am: 8d8dcec593

Change-Id: Ic2141908c4fccedce0990920c79a1acb40d6d26d
 2019-06-04 19:23:53 -07:00
Jovana Knezevic
a6fe66985c Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee 
am: dcb4951fea

Change-Id: Id8cbc83c1fdc5eb76989e220436ed82bb0de01ff
 2019-06-04 19:22:30 -07:00
Mady Mellor
b07f107196 Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90 
am: b2bcff6769

Change-Id: I700ebe857de98fc6514e6842ae05c4afb04cf14e
 2019-06-04 19:20:48 -07:00
Wale Ogunwale
d04ecf01c6 Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 
am: ef2a04ad41

Change-Id: I09cb1dfa5f2e6c9e909d8806b001c339f02be0f4
 2019-06-04 19:18:28 -07:00
Matt Casey
cc229b18e5 Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b 
am: 05e8a22ab1

Change-Id: I610f010494d5fa56e458968036aff594969414ca
 2019-06-04 19:16:39 -07:00
Lorenzo Colitti
3a19df0784 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41 
am: e0348e5a6f

Change-Id: I8e499af0eb8e37f93ba2fa29a0c9510a4e7163db
 2019-06-04 19:15:01 -07:00
Makoto Onuki
f5053e7a0d Merge "Fix slow query log." into qt-dev am: dee07f5d7f 
am: 231b70ce96

Change-Id: Ia45192af629f2bd695b8c21240e7935bfd7220c5
 2019-06-04 19:13:33 -07:00
Hongyi Zhang
a3790b9a35 Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 
am: 887d09db5f

Change-Id: Id100676b439dc4e15063adc9d7822d89f352c86f
 2019-06-04 19:11:09 -07:00
Victor Hsieh
71cd9d6671 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 
am: 6ebd3bf5e8

Change-Id: Ie135ad897405c56175719d722bd29a963e778830
 2019-06-04 19:05:54 -07:00
Alex Salo
fc94f97a98 Merge "Don't call ActivityManagerService on main thread" into qt-dev 
am: 9a01bb4280

Change-Id: Idbe5e2f729b45f9918c7f0a9f16bccf959427dbc
 2019-06-04 18:48:21 -07:00
Mathieu Chartier
f5ae9a62da Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev 
am: 652b445c07

Change-Id: I26dd2413b054c9dae00cc0f4f53e5a99bf81740a
 2019-06-04 18:46:31 -07:00
Bill Yi
e4aa0a8d1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 0906e02aa3 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd1105544ab2bf55f3172fa5a34257b7665b628c
 2019-06-04 18:44:50 -07:00
Bill Yi
c358eca34b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 452be4963c -s ours
am skip reason: subject contains skip directive

Change-Id: I106a94415dac25a75d16ccaf45aa83970d39d15e
 2019-06-04 18:43:21 -07:00
Tracy Zhou
a676a30ae5 Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev 
am: 289583ec1a

Change-Id: Ibf42ec24d16c0510e27673f12700e9493562b759
 2019-06-04 18:41:56 -07:00
Hui Yu
33add786a6 Merge "Only set mStartClockTime when device is fully charged." into qt-dev 
am: 28d28a4ee5

Change-Id: Ied83bb528362c96477c365b60f00a301d7de39d6
 2019-06-04 18:40:22 -07:00
David Sehr
e698002e22 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev 
am: 10d9320c3a -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I0679d8d82dd7fc2fa4f772c01e6c0b0c21f84631
 2019-06-04 18:39:03 -07:00
Winson Chung
8d8dcec593 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev 
am: c8120d6d6a

Change-Id: Iaacee648ff9535231701b07592da69a98d529d14
 2019-06-04 18:37:24 -07:00
Jovana Knezevic
dcb4951fea Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev 
am: e45e09fcee

Change-Id: I5c1599e060dd60126eff28b47304dff8c2d194b8
 2019-06-04 18:35:58 -07:00
Mady Mellor
b2bcff6769 Merge "Post finishing after transition in onBackPressed" into qt-dev 
am: 57854d3b90

Change-Id: I7969cfef79133979c5b738496ec2a7c2360e9f11
 2019-06-04 18:34:24 -07:00
Wale Ogunwale
ef2a04ad41 Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev 
am: 2aa255a746

Change-Id: I66ed29edc5c3079984ec205d629bb1d3f587a09c
 2019-06-04 18:32:53 -07:00
Matt Casey
05e8a22ab1 Merge "Rendering fixes for assist handles." into qt-dev 
am: 075baa2e9b

Change-Id: Id6e48daf7de9267873bc335f8847f686a1bfc669
 2019-06-04 18:31:29 -07:00
Lorenzo Colitti
e0348e5a6f Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev 
am: e2fb127e41

Change-Id: Ifd9dbc9c83e426e66417247cbf1fa594193e000f
 2019-06-04 18:29:51 -07:00
Makoto Onuki
231b70ce96 Merge "Fix slow query log." into qt-dev 
am: dee07f5d7f

Change-Id: If0b3a8caf1563fdcf25f8d38e3b5c6b1d183e3a2
 2019-06-04 18:27:43 -07:00
Hongyi Zhang
887d09db5f Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev 
am: a1d0453641

Change-Id: I572fa4eebc9b4597e1c7af54030d999c41184c93
 2019-06-04 18:24:47 -07:00
Amin Shaikh
47ea2dabec Merge "Update themed icons." into qt-r1-dev am: a1da7a4ef5 
am: 51a92914df

Change-Id: If01a0ad08c4f593f169f0061b76518fea0ae8f8e
 2019-06-04 18:20:18 -07:00
Victor Hsieh
6ebd3bf5e8 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev 
am: 4fd5870662

Change-Id: Ia74ba2d310e67c025ca76683caa9d93d2fcefc40
 2019-06-04 18:14:26 -07:00