ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
66782 commits 1 branch 0 tags 217 MiB
Commit graph

66782 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Biggers
a11cb03201 Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" am: 64d1a3d60e am: 4a15f52193 am: 56b43bc0a2 am: 9ec80e3ced am: ce3c9b6dd1 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387869

Change-Id: I9aff4993e2b22375b6bcfdc5ab9742f26c5fc3ed
 2020-08-06 00:09:12 +00:00
Eric Biggers
ce3c9b6dd1 Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" am: 64d1a3d60e am: 4a15f52193 am: 56b43bc0a2 am: 9ec80e3ced 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387869

Change-Id: I3819766cfcf98ec988edbb2bb331b6105ad9e6fc
 2020-08-05 23:49:04 +00:00
Eric Biggers
9ec80e3ced Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" am: 64d1a3d60e am: 4a15f52193 am: 56b43bc0a2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387869

Change-Id: I5776f598e4893a15b10d6c84912b1ce873c6bb32
 2020-08-05 23:33:16 +00:00
Eric Biggers
56b43bc0a2 Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" am: 64d1a3d60e am: 4a15f52193 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387869

Change-Id: Id2d127aadb30dbf70030e6c1665a06c3b9cfaf76
 2020-08-05 23:05:30 +00:00
Eric Biggers
4a15f52193 Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" am: 64d1a3d60e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387869

Change-Id: I99c68fb21b55aadb6f6ed3c82efb05e5d1d3ceb6
 2020-08-05 22:46:31 +00:00
Eric Biggers
64d1a3d60e Merge "fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock"" 2020-08-05 22:28:53 +00:00
Kazuhiro Inaba
c7a1d75796 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf am: 3a7a8b871a am: 4163cbbf95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I71601628f4ad4c09ba87bb505a1d01a55a015e12
 2020-08-05 20:38:09 +00:00
Tom Cherry
4448431dfc Merge "liblog: add a timeout for logd command socket operations" am: 368c70daba am: 1c99963351 am: a44090fb87 am: ec35efbbc6 am: f3b9f63ec0 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389398

Change-Id: I8317122c3649b10d2a3269ca3b524dbe2da47f55
 2020-08-05 20:38:03 +00:00
Kazuhiro Inaba
94ecfb372e cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: c32d879a94 am: 4269056029 am: 77c42fda7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I35af9882dc3b9c45dd45f279a8bf9657da474fb7
 2020-08-05 20:37:57 +00:00
Kazuhiro Inaba
be47f0eb21 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf am: bcbc6cb719 am: 39593c4310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: Ida229c2a38f5eaaec1ea56fe4efa03e8e5c37550
 2020-08-05 20:37:46 +00:00
Kazuhiro Inaba
4163cbbf95 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf am: 3a7a8b871a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I5ca75c311869eff11cf020c5ffaea6c204efe99e
 2020-08-05 20:16:17 +00:00
Tom Cherry
f3b9f63ec0 Merge "liblog: add a timeout for logd command socket operations" am: 368c70daba am: 1c99963351 am: a44090fb87 am: ec35efbbc6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389398

Change-Id: Ia136ddd87867cc4dadcb7c7e0838a4c10a8d1beb
 2020-08-05 20:16:05 +00:00
Kazuhiro Inaba
77c42fda7e cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: c32d879a94 am: 4269056029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I9dfa0598c2a3095f5356b799c3f9cfccd2c2949c
 2020-08-05 20:15:52 +00:00
Kazuhiro Inaba
39593c4310 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf am: bcbc6cb719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: If6277ab14c8df1ff47e5dad65acf5d139c3ac725
 2020-08-05 20:15:17 +00:00
Tom Cherry
ec35efbbc6 Merge "liblog: add a timeout for logd command socket operations" am: 368c70daba am: 1c99963351 am: a44090fb87 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389398

Change-Id: I47d315c962466d3b9db747640701f06682290115
 2020-08-05 20:01:04 +00:00
Kazuhiro Inaba
4269056029 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: c32d879a94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: Iabc8a2957efe486300c77e5cd595cd635b84d031
 2020-08-05 20:00:36 +00:00
Kazuhiro Inaba
bcbc6cb719 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: Icfd5e62a54e14de0ded43fecdb89295b80a9e121
 2020-08-05 19:58:50 +00:00
Kazuhiro Inaba
3a7a8b871a cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 am: df2e518ccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I60ebd26191d4d2e431a113c82b3243419c7aa507
 2020-08-05 19:57:58 +00:00
Tom Cherry
a44090fb87 Merge "liblog: add a timeout for logd command socket operations" am: 368c70daba am: 1c99963351 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389398

Change-Id: I59e929223199b96013ba7009223bda85d5336dcc
 2020-08-05 19:57:51 +00:00
Kazuhiro Inaba
df2e518ccf cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I5d73d554acf98fc661fee827c37c9a9d9059e8ef
 2020-08-05 19:38:35 +00:00
Kazuhiro Inaba
c32d879a94 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a am: 49ddb673c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I293e4b2817e06874ab049a0043bb2b4fb866c755
 2020-08-05 19:38:29 +00:00
Tom Cherry
1c99963351 Merge "liblog: add a timeout for logd command socket operations" am: 368c70daba 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389398

Change-Id: I1361f77d0436fc8596e94c3a30d7b05b209ce612
 2020-08-05 19:37:43 +00:00
Tom Cherry
368c70daba Merge "liblog: add a timeout for logd command socket operations" 2020-08-05 19:18:07 +00:00
Kazuhiro Inaba
49ddb673c5 cts: Skip CtsInitTestCases over a native bridge. am: 9cecf8422a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12263311

Change-Id: I9d208b96945f99b64da031d03e09a570862bcc1b
 2020-08-05 19:10:41 +00:00
Christopher Ferris
29f20d367b Merge "Fix fuzzer so it doesn't add overlapping maps." am: a39e39fe31 am: 46f2a82271 am: f11daa5dfb am: 203472d10a am: 13d7436851 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387875

Change-Id: I5b5d295717758ebb44321e0d9f672ba4ffe13781
 2020-08-05 18:09:45 +00:00
Christopher Ferris
13d7436851 Merge "Fix fuzzer so it doesn't add overlapping maps." am: a39e39fe31 am: 46f2a82271 am: f11daa5dfb am: 203472d10a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387875

Change-Id: I8f3e2c4ec5caac7cf884fb30435595260479c302
 2020-08-05 17:46:15 +00:00
Christopher Ferris
203472d10a Merge "Fix fuzzer so it doesn't add overlapping maps." am: a39e39fe31 am: 46f2a82271 am: f11daa5dfb 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387875

Change-Id: Ifbbc9d368745f4c09ff3e1fc18ec969f9aba142e
 2020-08-05 17:26:25 +00:00
Christopher Ferris
f11daa5dfb Merge "Fix fuzzer so it doesn't add overlapping maps." am: a39e39fe31 am: 46f2a82271 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387875

Change-Id: I022825db56d21d77a8b8826ad0c7cbb266daaa9b
 2020-08-05 17:09:57 +00:00
Joshua Duong
47e1b822ca Merge "[adb] Correctly read host/user name on Windows." am: a65d905b4a am: a0c115a38b am: 56eb247d3a am: 176c1e097d am: 5538671804 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1380298

Change-Id: I0dbf8b3912697593734c7645d97e9861730a3134
 2020-08-05 16:59:29 +00:00
Christopher Ferris
46f2a82271 Merge "Fix fuzzer so it doesn't add overlapping maps." am: a39e39fe31 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1387875

Change-Id: Ib671925c2226490e586ec152a2d6c1f38005b2ba
 2020-08-05 16:52:33 +00:00
Joshua Duong
5538671804 Merge "[adb] Correctly read host/user name on Windows." am: a65d905b4a am: a0c115a38b am: 56eb247d3a am: 176c1e097d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1380298

Change-Id: Ibff61d51d32294943c6322c1249fc248830fc610
 2020-08-05 16:43:54 +00:00
Christopher Ferris
a39e39fe31 Merge "Fix fuzzer so it doesn't add overlapping maps." 2020-08-05 16:32:04 +00:00
Joshua Duong
176c1e097d Merge "[adb] Correctly read host/user name on Windows." am: a65d905b4a am: a0c115a38b am: 56eb247d3a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1380298

Change-Id: I4e6cfc8323f0533f99657133c26b9fb960a1b3a0
 2020-08-05 16:22:39 +00:00
Joshua Duong
56eb247d3a Merge "[adb] Correctly read host/user name on Windows." am: a65d905b4a am: a0c115a38b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1380298

Change-Id: I7c74450e5485824fee0ab04eaca8fb4f91f84823
 2020-08-05 16:03:06 +00:00
Joshua Duong
a0c115a38b Merge "[adb] Correctly read host/user name on Windows." am: a65d905b4a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1380298

Change-Id: I95aefaaf1a599266532149e848c4bc0d373dc926
 2020-08-05 15:45:29 +00:00
Joshua Duong
a65d905b4a Merge "[adb] Correctly read host/user name on Windows." 2020-08-05 15:25:47 +00:00
Tom Cherry
0d847fb4cb liblog: add a timeout for logd command socket operations 
Add a 2s timeout for logd command socket operations:
  android_logger_clear
  android_logger_get_log_readable_size
  android_logger_get_log_size
  android_logger_set_log_size
  android_logger_get_statistics
  android_logger_get_prune_list
  android_logger_set_prune_list

That correspond to:
  logcat -c
  logcat -g
  logcat -G
  logcat -S
  logcat -p
  logcat -P

These operations should return immediately in typical circumstances,
but if logd is stuck, they would otherwise block indefinitely.  This
allows the commands to gracefully timeout instead.

Test: kill -s STOP `pidof logd`; logcat -g (and other options)
      times out appropriately
Test: logcat -g (and other options) work successfully otherwise
Change-Id: I6c4671a9b3daa4a454c0a14ae7d0b7d3b08be77a
 2020-08-04 17:41:47 -07:00
Steven Moreland
a5edde2552 [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 am: b6b96398f4 -s ours am: a7b4476ac7 -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 ee22384c54 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I7e2bd084cefbb70ad59705a457e4215aef55252a
 2020-08-05 00:38:58 +00:00
Steven Moreland
504c23b69b [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: f1c0be76ab -s ours am: 34d119cf10 -s ours am: e08102816c -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 ee22384c54 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: If6d2c3e37644517777e5e4dc21ab5cae0d8299b5
 2020-08-05 00:38:46 +00:00
Steven Moreland
1fa711510e [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 am: 990cdd687f am: 4f479f861e -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 0f0cb957b2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I0ea9423e6b12bee638aaf97079ea7d00d1d49ddc
 2020-08-05 00:38:29 +00:00
Steven Moreland
a7b4476ac7 [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 am: b6b96398f4 -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 ee22384c54 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: Idcb148427d85aab5dffa56a207a39f8116ac77bd
 2020-08-05 00:28:08 +00:00
Steven Moreland
e08102816c [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: f1c0be76ab -s ours am: 34d119cf10 -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 ee22384c54 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I70b3b11191775d1627fe14e212023ede5af189b4
 2020-08-05 00:18:49 +00:00
Steven Moreland
4f479f861e Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 am: 990cdd687f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I01b5f0aa3e4c78cd8e1528dd30fe9a57d90df422
 2020-08-05 00:18:37 +00:00
Steven Moreland
b6b96398f4 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: Id855ccb8767afbc80338315d8a0522054855a749
 2020-08-05 00:08:49 +00:00
Steven Moreland
34d119cf10 [automerger skipped] Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: f1c0be76ab -s ours 
am skip reason: Change-Id Ia85067d4258bde4b875c832d6223db5dd26b8838 with SHA-1 ee22384c54 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I67d383e0e91758a494e6d5bf9ac218d59810790e
 2020-08-04 23:57:20 +00:00
Steven Moreland
990cdd687f Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c am: 1db089dc83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: Iff7d2369ae16046560092265db6adf95a0176603
 2020-08-04 23:56:05 +00:00
Steven Moreland
f1c0be76ab Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I6fb2a6370b202cbe476aee558e09c702605d8328
 2020-08-04 23:38:00 +00:00
Steven Moreland
1db089dc83 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I51d7fd41157708b398888aac7f70dd09c397ee81
 2020-08-04 23:37:56 +00:00
Steven Moreland
ce44c8ac3c Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I1cb83a4a22e205dddd10536f61392215d5cb33dc
 2020-08-04 23:19:46 +00:00
Christopher Ferris
63525c8d6c Fix fuzzer so it doesn't add overlapping maps. 
The fuzzer was creating individual maps that overlapped with other maps.
Since this is not possible in the real world unless the kernel is broken,
do not let the fuzzer do this. This resulted in memory leaks, because some
parts of the code have this assumption baked in.

Bug: 160895854

Test: Ran fuzzer test case that leaked memory and verified it no longer does.
Change-Id: I9f3c1e28781093b041b747e1566fb51d40d2bf71
 2020-08-04 16:08:12 -07:00