Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
412,844 Commits 3 Branches 0 Tags
7039de7e09dddc0816e4eea08ffddbd88b77e30a
Commit Graph

412844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
7039de7e09 Merge "Merge "zygote: initialize ashmem early" am: 6c155a2cf7 am: 38326bd809" into qt-dev-plus-aosp 2019-04-05 10:58:55 +00:00
Tim Murray
00d9f15842 Merge "zygote: initialize ashmem early" am: 6c155a2cf7 
am: 38326bd809

Change-Id: I6997125bdd2e14b66a0b7d9d918793432d4a1794
 2019-04-05 03:58:00 -07:00
Android Build Merger (Role)
ec5db12440 Merge "Merge "Fix BT keeping wrong state issue" am: 7cd490c941 am: 4f73919dd7" into qt-dev-plus-aosp 2019-04-05 10:52:48 +00:00
Joonghong Park
5488beb415 Merge "Fix BT keeping wrong state issue" am: 7cd490c941 
am: 4f73919dd7

Change-Id: Ib54b81c69ec3c3ae6d0b9306459d512f43925d27
 2019-04-05 03:52:17 -07:00
Android Build Merger (Role)
199e67ea82 Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 am: 47c803e334" into qt-dev-plus-aosp 2019-04-05 10:48:02 +00:00
Remi NGUYEN VAN
d0fe9b1a9d Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba74 
am: 47c803e334

Change-Id: I5dc4c3f4a31e65409e86f059c727abe665708b3b
 2019-04-05 03:47:33 -07:00
Android Build Merger (Role)
d61c984e06 Merge "Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d am: 2e74de0a31" into qt-dev-plus-aosp 2019-04-05 10:43:22 +00:00
Remi NGUYEN VAN
d280d6ae72 Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e958d 
am: 2e74de0a31

Change-Id: I51bdb26d5c58a6a97e3a22711a822452985f4f95
 2019-04-05 03:42:54 -07:00
Android Build Merger (Role)
b99d71f607 Merge "Merge "Add Vts test for xsd_config" am: fd7bbebeaa am: 8cf6ace11d" into qt-dev-plus-aosp 2019-04-05 10:38:50 +00:00
Sundong Ahn
3b04ea319a Merge "Add Vts test for xsd_config" am: fd7bbebeaa 
am: 8cf6ace11d

Change-Id: I5f8420571e2465048bc5b959da5dea2d66d35d05
 2019-04-05 03:36:28 -07:00
Android Build Merger (Role)
d77d95df7a Merge "Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 1ddf974859 am: 6652f5242a" into qt-dev-plus-aosp 2019-04-05 10:32:06 +00:00
Remi NGUYEN VAN
5059e03eb6 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 1ddf974859 
am: 6652f5242a

Change-Id: If5c236c85585a440bfb645cff9d3cb0bb4e11102
 2019-04-05 03:31:36 -07:00
Android Build Merger (Role)
a0cae6d209 Merge "[automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 am: e9834d4fbf -s ours am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history" into qt-dev-plus-aosp 2019-04-05 10:27:19 +00:00
Sasha Smundak
8961436581 [automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 
am: e9834d4fbf -s ours
am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history

Change-Id: I5e8c9b4fe35d794d1e050aa38645d55a5ce31643
 2019-04-05 03:26:51 -07:00
Android Build Merger (Role)
55f9b6eaca Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 am: 2d7dbf8ea3" into qt-dev-plus-aosp 2019-04-05 10:22:45 +00:00
Remi NGUYEN VAN
647f26405f Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 
am: 2d7dbf8ea3

Change-Id: I5e3d6aacbeaba7346e014875a457a0ac52977ead
 2019-04-05 03:22:16 -07:00
Android Build Merger (Role)
f99d86e427 Merge "Merge "Change to choice" am: 5baeab86a0 am: a409e9fbb7" into qt-dev-plus-aosp 2019-04-05 10:18:16 +00:00
Sundong Ahn
af2f3a23ad Merge "Change to choice" am: 5baeab86a0 
am: a409e9fbb7

Change-Id: I8daa12509dcaef8af48ba85b4130872f9b1d5952
 2019-04-05 03:17:41 -07:00
Android Build Merger (Role)
44e3a56f93 Merge "Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 am: be708ba226" into qt-dev-plus-aosp 2019-04-05 10:13:58 +00:00
Steven Moreland
6ee6b380b1 Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 
am: be708ba226

Change-Id: I3f92f35cec1222760c584c77c007dd344047d99c
 2019-04-05 03:13:20 -07:00
Android Build Merger (Role)
ed8907bf93 Merge "Merge "Refactor PackageWatchdog explicit health checks" into qt-dev am: e0283ded0a" into qt-dev-plus-aosp 2019-04-05 10:10:04 +00:00
Zimuzo
76194357cb Merge "Refactor PackageWatchdog explicit health checks" into qt-dev 
am: e0283ded0a

Change-Id: Ie34c43aa81fec038e9cd8a17c720336fd09fb1e4
 2019-04-05 03:09:35 -07:00
Tyler Gunn
3fa5ea624f resolve merge conflicts of 37f6620029 to stage-aosp-master 
am: 4d97d127fd

Change-Id: I212ae695fe28d013e2cc960f2032d814eb9eb8e8
 2019-04-05 03:08:48 -07:00
Sasha Smundak
7d6c615c82 Merge "Convert core/tests/**/Android.mk file to Android.bp" am: d0fc8c9d5b 
am: 37c0949bf5

Change-Id: Ia4e91ee9eb77fbd5d9063ce28506fe60b86aec36
 2019-04-05 03:06:44 -07:00
Tim Murray
38326bd809 Merge "zygote: initialize ashmem early" 
am: 6c155a2cf7

Change-Id: Iec7af7e1637c6b16140c20da56581609c26e2550
 2019-04-05 02:48:11 -07:00
TreeHugger Robot
e0283ded0a Merge "Refactor PackageWatchdog explicit health checks" into qt-dev 2019-04-05 09:45:40 +00:00
Joonghong Park
4f73919dd7 Merge "Fix BT keeping wrong state issue" 
am: 7cd490c941

Change-Id: Ia7bb390fb8e90d9fd434b1988fbf2ca66c3e425e
 2019-04-05 02:39:19 -07:00
Treehugger Robot
6c155a2cf7 Merge "zygote: initialize ashmem early" 2019-04-05 09:35:11 +00:00
Treehugger Robot
7cd490c941 Merge "Fix BT keeping wrong state issue" 2019-04-05 09:26:21 +00:00
Sungsoo Lim
1de554dd19 Merge "Fix system_server watchdog timeout" into qt-dev 
am: 4bb49a7b07

Change-Id: I1bdf728e3cad37a66bab21116902a5b15359fb1c
 2019-04-05 02:20:13 -07:00
Sungsoo Lim
4bb49a7b07 Merge "Fix system_server watchdog timeout" into qt-dev 2019-04-05 09:09:21 +00:00
Yifan Hong
ccd94533ba [automerger skipped] Merge "Fix NetworkStackTests." into qt-dev 
am: 841dc62b5a -s ours
am skip reason: change_id I0d60d7a317fa60607d6fdaea15f61b458aefd2f0 with SHA1 0e5459731f is in history

Change-Id: Ia25198b3ed7d4704ffa3bd50a5399a81ff26cb7a
 2019-04-05 01:13:39 -07:00
TreeHugger Robot
841dc62b5a Merge "Fix NetworkStackTests." into qt-dev 2019-04-05 08:02:37 +00:00
Remi NGUYEN VAN
47c803e334 Merge "Add a mechanism to pass the L2Key and group hint to IpClient" 
am: 66d744ba74

Change-Id: I9e2554c4da0b7eb10dabfc414f722dac28dc02dd
 2019-04-05 00:40:24 -07:00
Remi NGUYEN VAN
2e74de0a31 Merge "Remove SocketUtils#setSocketTimeValueOption" 
am: 7fdf4e958d

Change-Id: I64ed8d74f6a508d6a7ba64a601f6c58f23ae6def
 2019-04-05 00:30:28 -07:00
Remi NGUYEN VAN
66d744ba74 Merge "Add a mechanism to pass the L2Key and group hint to IpClient" 2019-04-05 07:30:02 +00:00
Remi NGUYEN VAN
7fdf4e958d Merge "Remove SocketUtils#setSocketTimeValueOption" 2019-04-05 07:13:54 +00:00
Sundong Ahn
8cf6ace11d Merge "Add Vts test for xsd_config" 
am: fd7bbebeaa

Change-Id: I1f04bffed53a360fc9f90ba00d1fc89ea617543f
 2019-04-05 00:02:36 -07:00
Hyunyoung Song
e6b9caf01e Merge "Set sdk_version for PluginCoreLib" into qt-dev 
am: 4787332da4

Change-Id: Ibd868cb4416f2470d3edf3203ff2a241269ca150
 2019-04-05 00:02:36 -07:00
Kevin Chyn
6e5ade0169 Merge "Add secure setting to cache attention" into qt-dev 
am: 12852fdc7d

Change-Id: Ia591d7c0a8b50cb72f1c309f5121e7e542d13e6d
 2019-04-04 23:51:58 -07:00
Treehugger Robot
fd7bbebeaa Merge "Add Vts test for xsd_config" 2019-04-05 06:50:43 +00:00
Remi NGUYEN VAN
6652f5242a Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" 
am: 1ddf974859

Change-Id: I1d6a490a42f68d01e3d0649035cd0015cb522da3
 2019-04-04 23:50:27 -07:00
TreeHugger Robot
4787332da4 Merge "Set sdk_version for PluginCoreLib" into qt-dev 2019-04-05 06:49:33 +00:00
Remi NGUYEN VAN
1ddf974859 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" 2019-04-05 06:38:08 +00:00
Kevin Chyn
12852fdc7d Merge "Add secure setting to cache attention" into qt-dev 2019-04-05 06:33:37 +00:00
Anil Admal
508e9aee08 Merge "Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)" into qt-dev 
am: e79cbfd022

Change-Id: Ie8e2075675d92cadc17452ebf350cfa22928c53f
 2019-04-04 23:27:31 -07:00
Anil Admal
e79cbfd022 Merge "Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)" into qt-dev 2019-04-05 06:15:35 +00:00
Matt Pietal
07f3fa1e2e Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev 
am: 9620e07e4f

Change-Id: I414f4310e255b59f21c829cdec236fa22309a1a2
 2019-04-04 22:51:44 -07:00
TreeHugger Robot
9620e07e4f Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev 2019-04-05 05:33:13 +00:00
Lyn Han
22e579bf1f Merge "Remove unused flags from bubble controller" into qt-dev 
am: 68c570ecbc

Change-Id: Ia754892440f60b386ec78bfe4ad6b7879e9b91a4
 2019-04-04 22:28:28 -07:00