Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
415,668 Commits 3 Branches 0 Tags
1d1af32f72dd3c968f13cd087b2f87d959cd4dbe
Commit Graph

415668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiuyu Sun
1d1af32f72 Merge "Address comments from API review." into qt-dev am: b5b7312195 
am: 388485d09d

Change-Id: I0e8565e79456d229ff5d90114a9df3e14aea314c
 2019-04-15 15:33:35 -07:00
Adam Powell
0d222a6804 Merge "Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev am: 472893443d" into qt-dev-plus-aosp 
am: 52d8fd98aa

Change-Id: Ie57f74c1b24aa59798e2bc1239924661fb138d1f
 2019-04-15 15:19:24 -07:00
John Reck
64562c105f Merge "Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev am: 8d8d704cf7" into qt-dev-plus-aosp 
am: 9a50fa5ceb

Change-Id: Ibf157e442dabe29ca8e625ec7c6e63875d536416
 2019-04-15 14:53:51 -07:00
Matthew Ng
ba8093b532 Merge "Merge "End button fade animation when its visiblity changes" into qt-dev am: ab662fe8a5" into qt-dev-plus-aosp 
am: c14e98906a

Change-Id: Ibb9f6bde96a436fdd328d746374c6c1bc4d66141
 2019-04-15 14:41:43 -07:00
Jiuyu Sun
388485d09d Merge "Address comments from API review." into qt-dev 
am: b5b7312195

Change-Id: I03264085fd6aa0e3d250c6535354c1b5bef68596
 2019-04-15 14:35:03 -07:00
Android Build Merger (Role)
52d8fd98aa Merge "Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev am: 472893443d" into qt-dev-plus-aosp 2019-04-15 21:28:10 +00:00
Adam Powell
3d83ec9640 Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev 
am: 472893443d

Change-Id: I22f0968e01cdd8ab20a7abaecc1050f4a1dbbab4
 2019-04-15 14:27:12 -07:00
Ugo Yu
08fc2656e2 [automerger skipped] Merge "Refine Bluetooth Metadata API" am: e5cf74326d am: 4359aa933f -s ours 
am: 54ff9b2ab4 -s ours
am skip reason: change_id I79460071c7693f648e92cf849738c24f8bc269d9 with SHA1 4741a8bd53 is in history

Change-Id: Ia9690a8837a8c6aa0e538df7b89968369695a9c1
 2019-04-15 14:27:10 -07:00
Tyler Gunn
b3bb382a1a Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS." 2019-04-15 21:21:40 +00:00
Android Build Merger (Role)
9a50fa5ceb Merge "Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev am: 8d8d704cf7" into qt-dev-plus-aosp 2019-04-15 21:20:02 +00:00
John Reck
a4c39fc2d1 Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev 
am: 8d8d704cf7

Change-Id: Ib81492cd9f86c7a76eb20144ac26170af33eb9c6
 2019-04-15 14:19:37 -07:00
Android Build Merger (Role)
c14e98906a Merge "Merge "End button fade animation when its visiblity changes" into qt-dev am: ab662fe8a5" into qt-dev-plus-aosp 2019-04-15 21:14:54 +00:00
Matthew Ng
f829d58845 Merge "End button fade animation when its visiblity changes" into qt-dev 
am: ab662fe8a5

Change-Id: Ib89d68724cc8d1c57304f3cae257b96e6b73dbbc
 2019-04-15 14:14:29 -07:00
Ugo Yu
54ff9b2ab4 [automerger skipped] Merge "Refine Bluetooth Metadata API" am: e5cf74326d 
am: 4359aa933f -s ours
am skip reason: change_id I79460071c7693f648e92cf849738c24f8bc269d9 with SHA1 4741a8bd53 is in history

Change-Id: Ibc44e25bbc5a2c0d920f64bb39ac36b4455d2377
 2019-04-15 14:13:35 -07:00
Qiao (Adora) Zhang
3020965a4c Merge "Merge "Revert "Make notification effects for automotive configurable."" into qt-dev am: 094171bccc" into qt-dev-plus-aosp 
am: c687e2c1a3

Change-Id: Iae6541eeea5a65bedb33d88c36b55ad08a6e5295
 2019-04-15 14:03:17 -07:00
Jiuyu Sun
b5b7312195 Merge "Address comments from API review." into qt-dev 2019-04-15 21:02:42 +00:00
TreeHugger Robot
472893443d Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev 2019-04-15 21:02:19 +00:00
Ugo Yu
4359aa933f Merge "Refine Bluetooth Metadata API" 
am: e5cf74326d

Change-Id: I8b7e9137f67dfa27dd1556f49bdd4cc702015150
 2019-04-15 14:01:00 -07:00
TreeHugger Robot
8d8d704cf7 Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev 2019-04-15 21:00:08 +00:00
TreeHugger Robot
ab662fe8a5 Merge "End button fade animation when its visiblity changes" into qt-dev 2019-04-15 20:56:29 +00:00
calvinpan
4ca22ccda5 [automerger skipped] Merge "Merge "Add NonNull in Carriers constant" am: 40c918b924 am: 2c9b7a4a2f" into qt-dev-plus-aosp 
am: 4a19a94b67 -s ours
am skip reason: change_id I428ff623d46d3891b05882df5774343bfe3234c0 with SHA1 28f2ead85b is in history

Change-Id: I0f93434d01a96229e5fcb1d0ba7ac5beab143ddf
 2019-04-15 13:46:56 -07:00
Treehugger Robot
e5cf74326d Merge "Refine Bluetooth Metadata API" 2019-04-15 20:37:28 +00:00
George Hodulik
6836a1b9d1 Merge "Add AppPredictionServiceExists check." into qt-dev am: bd8c161d8d 
am: 84f39b7ef0

Change-Id: I3ea0b8bd92338c61ee233dced866461a110c8ff3
 2019-04-15 13:31:22 -07:00
Rob Carr
12ac1ced38 Merge "More SurfaceAnimator lifetime fixes." into qt-dev am: ed5d40cf26 
am: 5314f79bd9

Change-Id: Ife2904e47d2f41dcbe6f1221bb72ebf0e2bc076e
 2019-04-15 13:25:35 -07:00
Android Build Merger (Role)
c687e2c1a3 Merge "Merge "Revert "Make notification effects for automotive configurable."" into qt-dev am: 094171bccc" into qt-dev-plus-aosp 2019-04-15 20:23:48 +00:00
Qiao (Adora) Zhang
995eebc314 Merge "Revert "Make notification effects for automotive configurable."" into qt-dev 
am: 094171bccc

Change-Id: Iba84f539a8d2de805c5c8f82fc78933eec6cd7fd
 2019-04-15 13:23:24 -07:00
Android Build Merger (Role)
4a19a94b67 Merge "Merge "Add NonNull in Carriers constant" am: 40c918b924 am: 2c9b7a4a2f" into qt-dev-plus-aosp 2019-04-15 20:20:59 +00:00
calvinpan
769276f554 Merge "Add NonNull in Carriers constant" am: 40c918b924 
am: 2c9b7a4a2f

Change-Id: I06136ab9434fbc89fbbaaf99995469dcf34050e0
 2019-04-15 13:20:28 -07:00
George Hodulik
84f39b7ef0 Merge "Add AppPredictionServiceExists check." into qt-dev 
am: bd8c161d8d

Change-Id: Id7c20e1e1baa970eec5727f2d41216d91e57d954
 2019-04-15 13:17:40 -07:00
Jorim Jaggi
ffd3824eb2 Merge "Revert "Fix issue in attached layouting"" into qt-dev am: 0a510f8bbf 
am: b73f0f5b8a

Change-Id: I3cacf2dd44738dc48264ea10edcea00883ce9235
 2019-04-15 13:13:53 -07:00
Rob Carr
5314f79bd9 Merge "More SurfaceAnimator lifetime fixes." into qt-dev 
am: ed5d40cf26

Change-Id: Iea26915848f87f0c905491abb6aaa5968c84ca94
 2019-04-15 13:11:40 -07:00
calvinpan
2c9b7a4a2f Merge "Add NonNull in Carriers constant" 
am: 40c918b924

Change-Id: Ia7cc8c0bdd2c513d969ea29c2de55797f9c7e035
 2019-04-15 13:10:13 -07:00
Nathan Harold
bff3ac7d5c Merge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev am: 078d4d1475 -s ours 
am: f97ba0e29c -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history

Change-Id: I710810f585f19ce0d854c40c7dd71e6ba8f82efd
 2019-04-15 12:55:33 -07:00
Treehugger Robot
40c918b924 Merge "Add NonNull in Carriers constant" 2019-04-15 19:53:50 +00:00
TreeHugger Robot
094171bccc Merge "Revert "Make notification effects for automotive configurable."" into qt-dev 2019-04-15 19:49:28 +00:00
TreeHugger Robot
bd8c161d8d Merge "Add AppPredictionServiceExists check." into qt-dev 2019-04-15 19:49:19 +00:00
Rob Carr
ed5d40cf26 Merge "More SurfaceAnimator lifetime fixes." into qt-dev 2019-04-15 19:44:08 +00:00
Ryan Mitchell
97a2c617c0 Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp 
am: 9202886cbf

Change-Id: Ie96fc31615d4e60dbbf7050b1a15e8fa14ecd722
 2019-04-15 12:41:01 -07:00
Jorim Jaggi
b73f0f5b8a Merge "Revert "Fix issue in attached layouting"" into qt-dev 
am: 0a510f8bbf

Change-Id: If31e0ec393905ba24e26af0d7e1f035b4fd813ab
 2019-04-15 12:37:10 -07:00
Jean-Michel Trivi
6df797ed86 AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY am: c1adecd66a 
am: 5a2f0790ab

Change-Id: Id0495d0533be72276167a6af010cfc0ab91c3d7a
 2019-04-15 12:22:06 -07:00
Jakub Pawlowski
e1eeabdbf6 [automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev am: f98ada2290 -s ours 
am: 1e577c1ce5 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history

Change-Id: I777456067e4fbf1cdbd9d069a0c3488dcfd2a150
 2019-04-15 12:16:00 -07:00
Jorim Jaggi
0a510f8bbf Merge "Revert "Fix issue in attached layouting"" into qt-dev 2019-04-15 19:14:41 +00:00
Android Build Merger (Role)
f97ba0e29c Merge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev am: 078d4d1475 -s ours am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history" into qt-dev-plus-aosp 2019-04-15 19:09:49 +00:00
Nathan Harold
095678adb0 [automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev 
am: 078d4d1475 -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history

Change-Id: I10b999bd28d4625915e53ae3bedf7fcf74df4c6b
 2019-04-15 12:09:08 -07:00
Ryan Mitchell
9202886cbf Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp 2019-04-15 19:07:10 +00:00
David Anderson
486720e8ac [automerger skipped] Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev am: 9a73912aec 
am: da439d4abb -s ours
am skip reason: change_id Ib2e0c05575d07496792188716b962ca622df28e6 with SHA1 f55f5d83de is in history

Change-Id: I25d958a9a511bb145f372f7c6b4d1cfa379456af
 2019-04-15 12:03:54 -07:00
Jean-Michel Trivi
5a2f0790ab AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY 
am: c1adecd66a

Change-Id: Ie2a7f82f97605c4e3684cecb128ad64bf14b9dc3
 2019-04-15 12:03:53 -07:00
John Reck
b10b60f04c Merge "Support render-ahead in vulkan" into qt-dev am: 08ca2a2560 
am: a2e9ec9f2e

Change-Id: Icca706c923c87278c0a9910dd1746272c0da3e3d
 2019-04-15 11:57:00 -07:00
Jakub Pawlowski
1e577c1ce5 [automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev 
am: f98ada2290 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history

Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05
 2019-04-15 11:55:42 -07:00
Nathan Harold
078d4d1475 Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev 2019-04-15 18:51:37 +00:00