Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
426,600 Commits 3 Branches 0 Tags
4641cd14aac9c91fcd0472e3fe1007169668d98b
Commit Graph

426600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James O'Leary
4641cd14aa Merge "Render invocation lights as beziers, not circles" into qt-dev am: 18fff17455 
am: 8ca77b32f0

Change-Id: I05322d349c5cc0862307ac7040745a866b49e209
 2019-06-24 10:27:07 -07:00
Robert Snoeberger
fd3e44fdc5 Merge "Retry auth during tap on lock screen." into qt-r1-dev 
am: f67706c43a

Change-Id: I97afd99b91d7c0dbafa38cf4c6fa6b044890b7f3
 2019-06-24 10:23:22 -07:00
James O'Leary
8ca77b32f0 Merge "Render invocation lights as beziers, not circles" into qt-dev 
am: 18fff17455

Change-Id: Ib663b275918c1b0a237a58177a1a4853d26cfa8c
 2019-06-24 10:11:12 -07:00
James O'Leary
18fff17455 Merge "Render invocation lights as beziers, not circles" into qt-dev 2019-06-24 16:44:31 +00:00
TreeHugger Robot
f67706c43a Merge "Retry auth during tap on lock screen." into qt-r1-dev 2019-06-24 16:35:42 +00:00
Robert Snoeberger
18b63b847f Merge "Final position of animation is independent of starting postiion." into qt-r1-dev 
am: a0f26da016

Change-Id: I8900363d5503a678fd0e8e9f13b145ea827f01b2
 2019-06-24 09:17:30 -07:00
TreeHugger Robot
a0f26da016 Merge "Final position of animation is independent of starting postiion." into qt-r1-dev 2019-06-24 16:12:08 +00:00
Lorenzo Colitti
1ad11e4b66 [automerger skipped] Merge "Don't auto-connect to networks that have no/limited connectivity." am: a5b124cce3 am: ebdd783a9b -s ours 
am: 7bc9c7df4e -s ours
am skip reason: change_id I5413393529c4bad3a707df229307542486bcff33 with SHA1 c0e461f2d9 is in history

Change-Id: I44723afb20ec488e620fe792d7268ba0bcd6de9c
 2019-06-24 09:11:15 -07:00
Beverly
baf9faca98 Merge "Don't update dark boot setting onStart" into qt-dev am: 2e967bf7e2 
am: 2afa89c638

Change-Id: I815cd7f7fcdb284ada476118840a76c3d5fbc583
 2019-06-24 09:09:03 -07:00
Ioannis Ilkos
f665ac1fb0 Merge "Add anon RSS + swap metric" into qt-dev am: 9af8d15783 
am: 689148acc6

Change-Id: I6a09daefd1e2da64881fb23765752c27e285a410
 2019-06-24 09:06:07 -07:00
Beverly
94e37d5762 Merge "Don't update dark boot setting onStart" into qt-dev am: 2e967bf7e2 
am: a0fd871682

Change-Id: Iae1a21b505327e17e800d4d116f004f2d8d58a15
 2019-06-24 09:02:36 -07:00
Android Build Merger (Role)
d3f2c2bf8b Merge "Merge "Add anon RSS + swap metric" into qt-dev am: 9af8d15783 am: 83270da58c" into qt-r1-dev-plus-aosp 2019-06-24 16:00:05 +00:00
Ioannis Ilkos
c724ee2de3 Merge "Add anon RSS + swap metric" into qt-dev am: 9af8d15783 
am: 83270da58c

Change-Id: I059f5a51d7a7399df9ec4fd26989fc77eb03c734
 2019-06-24 08:59:34 -07:00
Hyundo Moon
26a8b7ddc8 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 
am: b535723ff5

Change-Id: Iff36c79b9e4f72510f8b3f9434648a9649bf95c9
 2019-06-24 08:59:09 -07:00
Android Build Merger (Role)
9741440ab9 Merge "Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 am: d762136f02" into qt-r1-dev-plus-aosp 2019-06-24 15:52:08 +00:00
Android Build Merger (Role)
615b6cf5d7 Merge "Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c am: 9d75e2fd79" into qt-r1-dev-plus-aosp 2019-06-24 15:51:25 +00:00
Hyundo Moon
0a29885ea8 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 
am: d762136f02

Change-Id: I57d4319c30cd92b0df4d72f112b8f36c50eac1fa
 2019-06-24 08:50:50 -07:00
Chiayu Pei
6ef19439ed Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c 
am: 9d75e2fd79

Change-Id: I1a3ef5aa695206716d0aacc4010d12cd73550a8f
 2019-06-24 08:50:41 -07:00
Android Build Merger (Role)
b8344d6d40 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: c05f11a0b6 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:50:27 +00:00
Android Build Merger (Role)
d6851e4ac6 Merge "Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c am: 5e6adcbfe7" into qt-r1-dev-plus-aosp 2019-06-24 15:50:24 +00:00
Lorenzo Colitti
7bc9c7df4e [automerger skipped] Merge "Don't auto-connect to networks that have no/limited connectivity." am: a5b124cce3 
am: ebdd783a9b -s ours
am skip reason: change_id I5413393529c4bad3a707df229307542486bcff33 with SHA1 c0e461f2d9 is in history

Change-Id: I116cea63ccbfd5346ca218486671abae5176c273
 2019-06-24 08:50:02 -07:00
Bill Yi
9f0df18195 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours 
am: c05f11a0b6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6bd2d37a6e7f438c8d30b5ec1149e99d807703b
 2019-06-24 08:49:39 -07:00
Android Build Merger (Role)
3c78aefb41 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: c185e17a25 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:49:34 +00:00
Chiayu Pei
6dfd141615 Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c 
am: 5e6adcbfe7

Change-Id: I776d3c0853ad8d18723b31100acecba518f6e55f
 2019-06-24 08:49:26 -07:00
Android Build Merger (Role)
619b9befbb Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: 067f9816b1 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:49:19 +00:00
Bill Yi
6eafacb8b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours 
am: c185e17a25 -s ours
am skip reason: subject contains skip directive

Change-Id: I5860e36942041c1d6070c0c7b84dc2b8a3b2ee5a
 2019-06-24 08:48:30 -07:00
Android Build Merger (Role)
49377c15f0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours am: 4c20c8c114 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:48:26 +00:00
Bill Yi
e6cea478e9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours 
am: 067f9816b1 -s ours
am skip reason: subject contains skip directive

Change-Id: I11064f60646733b0bfc4721f94a84b9e160d5ac1
 2019-06-24 08:48:24 -07:00
Android Build Merger (Role)
18c98d52b6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: a9cd5d94f3 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:48:20 +00:00
Bill Yi
a210d428f3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours 
am: 4c20c8c114 -s ours
am skip reason: subject contains skip directive

Change-Id: I38ede1e35baec53683c2721013cf52ff8232ff43
 2019-06-24 08:47:26 -07:00
Bill Yi
e3943cdd29 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours 
am: a9cd5d94f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I46f8087bac81d03cdbda77b07423d514d5ef109d
 2019-06-24 08:47:24 -07:00
Android Build Merger (Role)
12258e0a31 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: d1809212c4 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-24 15:47:22 +00:00
Bill Yi
60534a8d17 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours 
am: d1809212c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibdbcf6f0094782d13c57be50582b6671cd41dfa4
 2019-06-24 08:46:29 -07:00
Bill Yi
157a81d905 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours 
am: 49a60e6b40 -s ours
am skip reason: subject contains skip directive

Change-Id: If902517cdbff58fe1f091e50aa6e9de836af376c
 2019-06-24 08:46:29 -07:00
Bill Yi
75f383fa25 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours 
am: 453efcb333 -s ours
am skip reason: subject contains skip directive

Change-Id: I4fc34749c532d0d261089b697e87267fadb16765
 2019-06-24 08:45:40 -07:00
Bill Yi
c9f3d2d6fe [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7e5f2498f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I18f8076c0ad79a680a0b35bff5f13724a55eecb2
 2019-06-24 08:20:12 -07:00
Dave Mankoff
e13ad7b621 Merge "Clear authentication data whenever the phone transitions to DOZE_AOD or DOZE." into qt-r1-dev 
am: e28cd16002

Change-Id: Ie2fbd51f96e874e270a51bd5af04af355a1583c7
 2019-06-24 08:19:17 -07:00
Beverly
2afa89c638 Merge "Don't update dark boot setting onStart" into qt-dev 
am: 2e967bf7e2

Change-Id: I39fe2796e930cb2dc6b7af49c7d34c80349bef7c
 2019-06-24 08:17:47 -07:00
Lorenzo Colitti
537554f3fd [automerger skipped] Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev 
am: f80234a9b0 -s ours
am skip reason: change_id If2ef8d8f038f32c8cf974aa02cfc1dc7e44dbad3 with SHA1 8c9d8c5e05 is in history

Change-Id: I5b525feb1e7df2a89dea4f38b521973ccaac0746
 2019-06-24 08:17:26 -07:00
Ioannis Ilkos
689148acc6 Merge "Add anon RSS + swap metric" into qt-dev 
am: 9af8d15783

Change-Id: I00f58e98bb7c162032bf381348a63be4bd77ac0f
 2019-06-24 08:16:21 -07:00
Julia Reynolds
6b1c7ceded Merge "Handle USER_ALL in instant apps call" into qt-dev am: 58b7cf731d 
am: df1e8c9cf3

Change-Id: Iee40c614daf3f416459957f76260023aeaa6ab84
 2019-06-24 08:15:20 -07:00
Lucas Dupin
e8dec1fb96 [automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 9b47581ea4 -s ours 
am: d749a78120 -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history

Change-Id: I1bc34cb9169b5daf417d827ea68fc61ca2464a77
 2019-06-24 08:13:24 -07:00
Beverly
a0fd871682 Merge "Don't update dark boot setting onStart" into qt-dev 
am: 2e967bf7e2

Change-Id: I3b9d5069fb0f97562dd848b40ea92a5c4dcd07fd
 2019-06-24 08:12:03 -07:00
Ioannis Ilkos
83270da58c Merge "Add anon RSS + swap metric" into qt-dev 
am: 9af8d15783

Change-Id: Icdc2f66054c9f1450a731f051707b3824c487865
 2019-06-24 08:11:08 -07:00
Bill Yi
1f87082fdd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 25a43f362a -s ours 
am: 37caf4810e -s ours
am skip reason: subject contains skip directive

Change-Id: If600d8980c99becda73d77b6fb1e652cf538c109
 2019-06-24 08:09:55 -07:00
Hyundo Moon
b535723ff5 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev 
am: 1348399885

Change-Id: Ibca40676bb609379cda3797b5120be76a62041d3
 2019-06-24 08:09:54 -07:00
Chiayu Pei
9d75e2fd79 Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev 
am: a5be28971c

Change-Id: I7cf114751ff0c2ae1f24301485a52052c42f53b7
 2019-06-24 08:09:09 -07:00
Bill Yi
c05f11a0b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: e0c262b7da -s ours
am skip reason: subject contains skip directive

Change-Id: If15eb1005a3100bb104ff094b21bb0100232429a
 2019-06-24 08:08:44 -07:00
Bill Yi
c185e17a25 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 4ffaa9a225 -s ours
am skip reason: subject contains skip directive

Change-Id: I494b1a51fcc57ad0f1f82bbf4522055360e5919f
 2019-06-24 08:08:20 -07:00
Bill Yi
4c20c8c114 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: cc13f9ed66 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7f0f5eadb66cb0389b29d792831d1f546bafc92
 2019-06-24 08:07:48 -07:00