Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
431,663 Commits 3 Branches 0 Tags
ea2ae672972061691e8b253deb608dbb7c2b81da
Commit Graph

431663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
ea2ae67297 Merge "LockAgent: Add crasher binary" am: a6874fccb6 am: 6c3f50dc6d am: 5b72cd1af6 
am: fe7f7a286c

Change-Id: I968f3439d51bbe63944bcf297810725b184513d8
 2019-06-20 17:16:42 -07:00
Fabian Kozynski
c6b67e1e96 Merge "Safeguard against no tiles in QS" into qt-dev am: 60aabc40a2 am: b82e0027f5 
am: 12e28a4c17

Change-Id: I7c7a0e3e74ccea22cc3107b2bb96f01f4c83330c
 2019-06-20 16:54:35 -07:00
Andreas Gampe
fe7f7a286c Merge "LockAgent: Add crasher binary" am: a6874fccb6 am: 6c3f50dc6d 
am: 5b72cd1af6

Change-Id: Ib893970f715032d739a35f013091e56b674fe9b8
 2019-06-20 16:34:33 -07:00
Andreas Gampe
5b72cd1af6 Merge "LockAgent: Add crasher binary" am: a6874fccb6 
am: 6c3f50dc6d

Change-Id: Ib65d7e5a6c02653eb9d815d4a0b1536d9fc6cbbe
 2019-06-20 16:27:24 -07:00
Fabian Kozynski
12e28a4c17 Merge "Safeguard against no tiles in QS" into qt-dev am: 60aabc40a2 
am: b82e0027f5

Change-Id: I169b5f68e07d0b9d042b23a86c3b7be828b8ec31
 2019-06-20 16:15:44 -07:00
Fabian Kozynski
770a6156f0 Merge "Safeguard against no tiles in QS" into qt-dev am: 60aabc40a2 am: d4202413af 
am: f967481a12

Change-Id: I8d70cf931dfbf23ebe9fd0e57d52b9be03d51617
 2019-06-20 16:15:23 -07:00
Ray Essick
6ceeb9d2df Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767 am: 27d23af2d9 
am: 338af00cc8

Change-Id: I2c15bdd1b9e6a40476196ebac54a3e24c6788d16
 2019-06-20 16:09:35 -07:00
Fabian Kozynski
f967481a12 Merge "Safeguard against no tiles in QS" into qt-dev am: 60aabc40a2 
am: d4202413af

Change-Id: Ia4131b27e4e3622b4e2babfc6ddd43919109b027
 2019-06-20 16:05:16 -07:00
Robert Snoeberger
921e0b1627 Merge "Remove the custom clock from LS during transition from AOD" into qt-r1-dev am: 5fccfe7491 
am: 90509b2d16

Change-Id: I2a62766c01cc5bbc5803d114a59ec5c51cb06c46
 2019-06-20 16:05:12 -07:00
Andreas Gampe
6c3f50dc6d Merge "LockAgent: Add crasher binary" 
am: a6874fccb6

Change-Id: Iacf6a51f14908777bd022374d90471e9e4c6a378
 2019-06-20 15:58:43 -07:00
Vishwath Mohan
eeea914eef Merge "Switch trust agents to extend unlock mode by default." 2019-06-20 22:56:25 +00:00
Fabian Kozynski
d4202413af Merge "Safeguard against no tiles in QS" into qt-dev 
am: 60aabc40a2

Change-Id: Ia491010fffb08f66d2f2f89e6ac9ffb818a71e1b
 2019-06-20 15:33:30 -07:00
Fabian Kozynski
b82e0027f5 Merge "Safeguard against no tiles in QS" into qt-dev 
am: 60aabc40a2

Change-Id: If5bde9600167a3d508bef5377d31e6d8db2635c2
 2019-06-20 15:32:29 -07:00
agathaman
2f6389b5e7 Merge "Modified AudioService to broadcast ACTION_MICROPHONE_MUTE_CHANGE intent to all users" am: cc96c57f1a am: 9a9f6902a7 am: 92226cde71 
am: f78e6f7f73

Change-Id: I857974a27deb8b4fa7f3b611dd78465115b93602
 2019-06-20 15:27:21 -07:00
Andreas Gampe
a6874fccb6 Merge "LockAgent: Add crasher binary" 2019-06-20 22:12:03 +00:00
Ray Essick
338af00cc8 Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767 
am: 27d23af2d9

Change-Id: I6db3437431e1f4cc8602f6c79e7822596907d4c0
 2019-06-20 14:59:47 -07:00
Robert Snoeberger
90509b2d16 Merge "Remove the custom clock from LS during transition from AOD" into qt-r1-dev 
am: 5fccfe7491

Change-Id: I22231b3f8e51bdca1d2c5e79c17b764bd96ab5e9
 2019-06-20 14:53:53 -07:00
Ray Essick
5604a69f57 Merge "Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767" into qt-dev-plus-aosp am: 351764bda0 
am: 50aa2adfd8

Change-Id: I6b747374acf3be5472ba5ad2957a15215598690a
 2019-06-20 14:48:03 -07:00
Benedict Wong
ac8b047849 Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a70051 am: df3deaf33d am: af8b64a11f 
am: 810b42f039

Change-Id: I5ddc834a7c50ae260704ce9d53c954cfb55bec7b
 2019-06-20 14:46:35 -07:00
Andreas Gampe
2d2ba35ee4 Merge "LockAgent: Refactor violation data" am: afb660cb49 am: bea5f08d86 am: 01e03da60a 
am: ca374124d0

Change-Id: I3432e17a08c0a76fb3f40f07a880aa9354b6149d
 2019-06-20 14:44:52 -07:00
Neil Fuller
2350886e09 Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f am: 9ec43cc7fe 
am: dcf7d6e377

Change-Id: I999d61e1086f9a1cfcf9cf38522eb4c2779b607c
 2019-06-20 14:42:30 -07:00
TreeHugger Robot
60aabc40a2 Merge "Safeguard against no tiles in QS" into qt-dev 2019-06-20 21:42:23 +00:00
Neil Fuller
a8b7b88c24 Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp 
am: 7d84adaf44

Change-Id: I771fadd49889a0906a304c20d5ad5f7a7e25e3bb
 2019-06-20 14:40:55 -07:00
agathaman
f78e6f7f73 Merge "Modified AudioService to broadcast ACTION_MICROPHONE_MUTE_CHANGE intent to all users" am: cc96c57f1a am: 9a9f6902a7 
am: 92226cde71

Change-Id: I90286997420e0b5302440669ed52b0bd72030894
 2019-06-20 14:40:31 -07:00
Mehdi Alizadeh
5bc8ef9cc4 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev am: 60f7b58a9a am: b97947dc2c 
am: 9059f5cd57

Change-Id: Ia68f0729e17f137dd47492f28412129033dbe0f0
 2019-06-20 14:39:25 -07:00
Steven Moreland
299938cd9d [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220 am: 738d6b8950 -s ours 
am: 9820b7231b -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I733a5397c12cd6fb226bd7d899fdfb247ba8ce9c
 2019-06-20 14:35:34 -07:00
Steven Moreland
95d36a1a36 libmedia2_jni: remove libhwbinder_noltopgo ref am: e5da40639c am: 82c428c0e3 
am: 8d7225e4ff

Change-Id: I915ef7c7df9d982ee5472694e9ed4e673e4865f8
 2019-06-20 14:35:19 -07:00
Dave Mankoff
3d2866572d Merge changes from topic "b111394067-new-falsing-manager" into qt-dev am: acd240fbb3 am: 4cc68a30de 
am: d10fb72913

Change-Id: I3a51c569dc1d4b64260db8d5585656b2f268af2b
 2019-06-20 14:33:44 -07:00
Christine Franks
5390028b48 Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev am: f351094e88 
am: 8646d29c9d

Change-Id: I0812519acf513664ba058e3c4b6464101fb85fae
 2019-06-20 14:31:53 -07:00
Chalard Jean
aa0d4adc2b Merge "Factorize custom asserts." am: 6c176efa3d am: 99fbb40990 am: f1eab99357 
am: bef7ff11e2

Change-Id: I1eecc5dd9f8c77287b8cca76f5d647a23a9a2f7a
 2019-06-20 14:29:43 -07:00
Paul Duffin
141941ac40 [automerger skipped] Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: ff32698f0f am: daf0bb8611 -s ours am: e150e65301 -s ours 
am: 44dd6138af -s ours
am skip reason: change_id I0260942108a13cc5e9bed1d6005abfb8daffe0ac with SHA1 8fcace4404 is in history

Change-Id: Id51bb0d0c6523cb8daceb6aadeb613cc88352e28
 2019-06-20 14:28:11 -07:00
Mehdi Alizadeh
258ff92471 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev am: 60f7b58a9a am: 865b3b6210 
am: 96675e7619

Change-Id: I99f46577ba3ee6e9edf37e741e4bf104befae412
 2019-06-20 14:26:04 -07:00
Ray Essick
50aa2adfd8 Merge "Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767" into qt-dev-plus-aosp 
am: 351764bda0

Change-Id: I2ca5800c13fd342c94c5e3cb08f919a450788c4c
 2019-06-20 14:25:04 -07:00
Steven Moreland
6945b46263 [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220 -s ours am: b69ccfd949 -s ours 
am: f6e3d461fc -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I42c5dac949a1a3f69c03d154994c5ed0e057c7b9
 2019-06-20 14:24:06 -07:00
Benedict Wong
810b42f039 Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a70051 am: df3deaf33d 
am: af8b64a11f

Change-Id: I9125dc1aa39189a43b3c68618853e0a7a7298fe2
 2019-06-20 14:23:25 -07:00
Andreas Gampe
ca374124d0 Merge "LockAgent: Refactor violation data" am: afb660cb49 am: bea5f08d86 
am: 01e03da60a

Change-Id: I6abf88fd093db914071c0f3d5710c8e3c8bc0dc4
 2019-06-20 14:21:53 -07:00
Steven Moreland
e987855244 [automerger skipped] libhwbinder users use libhidlbase am: 6c65bb208e -s ours am: 306ff7eaa2 -s ours 
am: cd53c193e6 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I1486b96a4c24cf9fbb8d7fda1df3011051de6185
 2019-06-20 14:20:11 -07:00
Steven Moreland
6c4223503d libmedia2_jni: remove libhwbinder_noltopgo ref am: e5da40639c am: c97f01184a 
am: c90ac82bc2

Change-Id: Ib83a47a2f4078587e1d0d8bcae24c298523e696e
 2019-06-20 14:19:55 -07:00
Neil Fuller
dcf7d6e377 Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f 
am: 9ec43cc7fe

Change-Id: Id17253fbe7d22117dff5766ce5b50b4e446e5090
 2019-06-20 14:19:53 -07:00
Android Build Merger (Role)
7d84adaf44 Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp 2019-06-20 21:18:38 +00:00
Dave Mankoff
fbf0006e6a Merge changes from topic "b111394067-new-falsing-manager" into qt-dev am: acd240fbb3 am: 7fd2154d6d 
am: 6fd848c2e3

Change-Id: I5ec41fd9761c2ee706586c45562579e3f430e57d
 2019-06-20 14:18:07 -07:00
agathaman
92226cde71 Merge "Modified AudioService to broadcast ACTION_MICROPHONE_MUTE_CHANGE intent to all users" am: cc96c57f1a 
am: 9a9f6902a7

Change-Id: Id00b186097f61b966e109b5bd4fbc5f9ab2673bd
 2019-06-20 14:17:59 -07:00
Neil Fuller
d5cbad9f53 Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 
am: 15199a5868

Change-Id: I35170185229a0e00f8b8f22f9560e49d844972c6
 2019-06-20 14:17:53 -07:00
Mehdi Alizadeh
9059f5cd57 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev am: 60f7b58a9a 
am: b97947dc2c

Change-Id: I234829c23042d6fd91b73aabb440f02c2b10a6c4
 2019-06-20 14:17:40 -07:00
Ray Essick
27d23af2d9 Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev 
am: 1c0b6aa767

Change-Id: I5b245522b5e6f4d5ee23e6155722c14e4e46bede
 2019-06-20 14:15:50 -07:00
Winson
d134a59df4 Merge "Fix ColorStateListDrawable bounds handling" into qt-dev am: fcbde5243a am: d518618ce9 
am: 7f74fb15e2

Change-Id: I1cb6e793ad4f927bdab58df870eab003a7d4f438
 2019-06-20 14:14:06 -07:00
Android Build Merger (Role)
351764bda0 Merge "Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767" into qt-dev-plus-aosp 2019-06-20 21:12:42 +00:00
agathaman
9a9f6902a7 Merge "Modified AudioService to broadcast ACTION_MICROPHONE_MUTE_CHANGE intent to all users" 
am: cc96c57f1a

Change-Id: Idc8bb0ff7f4242ff430bb9b5fbb0428e6cf14fc5
 2019-06-20 14:12:13 -07:00
Ray Essick
73172af0b2 Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev 
am: 1c0b6aa767

Change-Id: I6a5f9429628f3ee225a5ad2462a032be47a1d864
 2019-06-20 14:11:50 -07:00
Steven Moreland
9820b7231b [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220 
am: 738d6b8950 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I38dc2e57e4bcdf09f4c3a2b08403b3e12cdf41ae
 2019-06-20 14:11:40 -07:00