Commit graph

57629 commits

Author SHA1 Message Date
Marissa Wall
dd377ccefd libadf: delete libadf & libadfhwc
libadf is a helper library for adf (android display framework)
kernel drivers. The last Android Common Kernel to support adf was
4.4. Delete this helper library since we do not support any kernels
that can use it.

If a vendor needs this library, they can fork it.

If you have any concerns, please contact adelva@google.com.

Bug: 150467766
Test: Compiles
Change-Id: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255
2020-02-28 11:02:07 -08:00
Automerger Merge Worker
893ed15e4c Merge "liblog: use default tag for loggability checks if no tag is provided" am: 347d6406f0 am: f74ad17a65 am: dfe32fe67b
Change-Id: I7fffc21fdd0cac5822c3fbaea2954a1bcc3c2144
2020-01-27 21:15:18 +00:00
Automerger Merge Worker
dfe32fe67b Merge "liblog: use default tag for loggability checks if no tag is provided" am: 347d6406f0 am: f74ad17a65
Change-Id: Iaa30fc06b81ff9edaf658aeaf679b719d90918cd
2020-01-27 20:59:18 +00:00
Tom Cherry
f74ad17a65 Merge "liblog: use default tag for loggability checks if no tag is provided"
am: 347d6406f0

Change-Id: Ib1df6a955d2420c050e7876898df32e31636f4b4
2020-01-27 12:41:22 -08:00
Tom Cherry
347d6406f0 Merge "liblog: use default tag for loggability checks if no tag is provided" 2020-01-27 20:36:28 +00:00
Automerger Merge Worker
35277fd978 Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp" am: 16604b4141 am: e1b817abd3 am: d85177a18c
Change-Id: I32eb4df196edcb7f1c147b0419cd8407e4fbdd0a
2020-01-27 18:47:22 +00:00
Automerger Merge Worker
d85177a18c Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp" am: 16604b4141 am: e1b817abd3
Change-Id: Ie74b6afdaa8d79ad5aeca31733da64fdfbc2453d
2020-01-27 18:34:03 +00:00
Quentin Perret
e1b817abd3 Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp"
am: 16604b4141

Change-Id: Ib43b0aef04eba827977f496bd3a81b650a52c26f
2020-01-27 10:18:51 -08:00
Automerger Merge Worker
743bc544f3 Merge "Fix mounting /data on Virtual A/B devices without metadata encryption." am: 21394f6e85 am: 3f52b42db0 am: 593c5eb8cb
Change-Id: Ib268eff0da9c5c4119924d9a5ff50599e4d59527
2020-01-27 17:42:41 +00:00
Tom Cherry
2ec6a53a46 liblog: use default tag for loggability checks if no tag is provided
Bug: 116329414
Bug: 119867234
Test: new unit tests
Change-Id: I92a3f4f95e5f482f6fe20f17ed83c8ed367b06dc
2020-01-27 09:38:54 -08:00
Automerger Merge Worker
593c5eb8cb Merge "Fix mounting /data on Virtual A/B devices without metadata encryption." am: 21394f6e85 am: 3f52b42db0
Change-Id: Ic49aeb48693985d0b2ee38230c9e3a55698d3a83
2020-01-27 17:27:03 +00:00
Quentin Perret
16604b4141 Merge "libprocessgroup: ensure schedboost_enabled is true with uclamp" 2020-01-27 17:24:06 +00:00
David Anderson
3f52b42db0 Merge "Fix mounting /data on Virtual A/B devices without metadata encryption."
am: 21394f6e85

Change-Id: I6b413b57485f56cc31091a03dddbd78be4239fa3
2020-01-27 09:10:29 -08:00
David Anderson
21394f6e85 Merge "Fix mounting /data on Virtual A/B devices without metadata encryption." 2020-01-27 16:01:59 +00:00
Automerger Merge Worker
6dad3e0524 Merge "add NOLINTNEXTLINE(google-explicit-constructor)" am: e32697ee3e am: 9b2e06a4ff am: f2d289d25a
Change-Id: I728dd3045c3e92221084278d6e9f5751b8c13347
2020-01-27 15:26:35 +00:00
Automerger Merge Worker
f2d289d25a Merge "add NOLINTNEXTLINE(google-explicit-constructor)" am: e32697ee3e am: 9b2e06a4ff
Change-Id: If0bb1f98e0f262ff3eee2ecdf342ea8a09e55283
2020-01-27 15:16:01 +00:00
Maciej Żenczykowski
9b2e06a4ff Merge "add NOLINTNEXTLINE(google-explicit-constructor)"
am: e32697ee3e

Change-Id: Id80e6fa820ac9f604f38883b726ae81f469f5bc8
2020-01-27 07:05:08 -08:00
Treehugger Robot
e32697ee3e Merge "add NOLINTNEXTLINE(google-explicit-constructor)" 2020-01-27 14:52:49 +00:00
Automerger Merge Worker
5aa27753bc Merge "Change gid bit of /mnt/media_rw to external_storage" am: 4858f38514 am: 0a93a2edd9 am: 60b7ca77c4
Change-Id: I2a27e88c21e482b74723d11a4a99375961dc1fe8
2020-01-27 13:28:48 +00:00
Automerger Merge Worker
60b7ca77c4 Merge "Change gid bit of /mnt/media_rw to external_storage" am: 4858f38514 am: 0a93a2edd9
Change-Id: I67e51f5ed0301a6303a1f59f154f5bf3f60114f8
2020-01-27 13:16:35 +00:00
Zimuzo Ezeozue
0a93a2edd9 Merge "Change gid bit of /mnt/media_rw to external_storage"
am: 4858f38514

Change-Id: I83cf3d38d056ad3550edf399ae756a44253c062b
2020-01-27 05:05:06 -08:00
Zimuzo Ezeozue
4858f38514 Merge "Change gid bit of /mnt/media_rw to external_storage" 2020-01-27 13:01:52 +00:00
Automerger Merge Worker
3d81374fd5 Merge "Add external_storage gid" am: 8e4cf5b436 am: ed326eafc0 am: 92fe152517
Change-Id: If39cab9fa0cbab8d997492c2be9962ea519eaef7
2020-01-27 12:51:13 +00:00
Automerger Merge Worker
5fc0c0d3ab Merge "unwindstack: RegsArm64: fix harmless off by 1 + iterate GPRs contiguously" am: 98b185a8b1 am: 6f29c7aa13 am: f805d48239
Change-Id: I955c9fee337429873d680adfd6f6c609404434f0
2020-01-27 12:50:59 +00:00
Automerger Merge Worker
92fe152517 Merge "Add external_storage gid" am: 8e4cf5b436 am: ed326eafc0
Change-Id: I5561270960b2fb4170498c9cb107de279b887163
2020-01-27 12:38:33 +00:00
Automerger Merge Worker
f805d48239 Merge "unwindstack: RegsArm64: fix harmless off by 1 + iterate GPRs contiguously" am: 98b185a8b1 am: 6f29c7aa13
Change-Id: I1db52f23f713dbd1969a172b273fc79bddfa7ee3
2020-01-27 12:38:26 +00:00
Zimuzo Ezeozue
ed326eafc0 Merge "Add external_storage gid"
am: 8e4cf5b436

Change-Id: I875dfb09a68457b9144ac5c8583af44b5e6b94f1
2020-01-27 04:25:00 -08:00
Zimuzo Ezeozue
8e4cf5b436 Merge "Add external_storage gid" 2020-01-27 12:22:16 +00:00
Ryan Savitski
6f29c7aa13 Merge "unwindstack: RegsArm64: fix harmless off by 1 + iterate GPRs contiguously"
am: 98b185a8b1

Change-Id: Ica6b555de66f43a747b730f622ff43feb47565e1
2020-01-27 04:21:00 -08:00
Ryan Savitski
98b185a8b1 Merge "unwindstack: RegsArm64: fix harmless off by 1 + iterate GPRs contiguously" 2020-01-27 12:18:53 +00:00
Quentin Perret
64811b7b13 libprocessgroup: ensure schedboost_enabled is true with uclamp
In the current state, schedboost_enabled() is true if and only if
schedtune is in use. As a result, all tests conditioned by
schedboost_enabled() will be skipped on devices using uclamp since it is
and extension of the CPU controller.

Fix this by making schedboost_enabled() return true if either schedtune
or the CPU controller is enabled.

Bug: 44953631
Change-Id: Idaadf252c9cf411a176180ab8988d559ca8a1332
Signed-off-by: Quentin Perret <qperret@google.com>
2020-01-27 11:04:03 +00:00
Maciej Żenczykowski
041f8f5054 add NOLINTNEXTLINE(google-explicit-constructor)
Test: builds without warnings
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iac7c63816dd7bf2536c0d465ef1e845330be505b
2020-01-26 20:15:07 -08:00
David Anderson
671bd812cf Fix mounting /data on Virtual A/B devices without metadata encryption.
When using partitions backed by /data, for example during a Virtual A/B
merge or "adb remount" on a Virtual A/B device, the userdata block
device is seen as in-use when /data mounts in second-stage init. This
subsequently prevents mount() or e2fsck from working. Metadata-encrypted
devices are not affected, because dm-default-key provides a wrapping
block device that can be used exclusively.

This patch addresses the problem by detecting when userdata has
device-mapper dependencies. If it does, and the device is not
metadata-encrypted, we introduce a dm-linear wrapper around userdata.
It is created on demand, but like logical partitions, it exists until
the device reboots.

Bug: 134949511
Test: adb remount, cuttlefish boots
Change-Id: Ifbfea1591a6e58978fdaffd6ef889afabd10e270
2020-01-25 10:39:47 -08:00
Automerger Merge Worker
fb6adb6ffc Merge changes from topic "ramdisk" am: d66e442c21 am: 49e66cc894 am: 635c64fb58
Change-Id: I9ecbf4ad764d0f96ddc34ccd24ce0fea9836ac04
2020-01-25 01:14:13 +00:00
Automerger Merge Worker
06478a7bb1 Make ramdisk_available. am: 7dd4553991 am: 31bd607f6c am: bfffd8f2f8
Change-Id: I2e92fc7744092243a0c1efbb0fa00e2fb223649f
2020-01-25 01:14:09 +00:00
Automerger Merge Worker
635c64fb58 Merge changes from topic "ramdisk" am: d66e442c21 am: 49e66cc894
Change-Id: I84171e2f324c953aee403f95761fed62e555dab7
2020-01-25 00:59:21 +00:00
Automerger Merge Worker
bfffd8f2f8 Make ramdisk_available. am: 7dd4553991 am: 31bd607f6c
Change-Id: Ic08c9193eb7a066b8326f57ce7026c3926c0e3db
2020-01-25 00:59:19 +00:00
Yifan Hong
49e66cc894 Merge changes from topic "ramdisk"
am: d66e442c21

Change-Id: If16d9e37a50ff3de093f37c6200d29f9f22e3703
2020-01-24 16:38:51 -08:00
Yifan Hong
31bd607f6c Make ramdisk_available.
am: 7dd4553991

Change-Id: I161449e90ad91359cb7bb98c91078ab51e3b54b5
2020-01-24 16:38:26 -08:00
Yifan Hong
d66e442c21 Merge changes from topic "ramdisk"
* changes:
  Add e2fsck to fs_config
  Make ramdisk_available.
2020-01-24 22:39:35 +00:00
Zim
c1b53de450 Change gid bit of /mnt/media_rw to external_storage
To allow apps with MANAGE_EXTERNAL_STORAGE permission and therefore
external_storage gid to access unreliable volumes directly on
/mnt/media_rw/<volume>, they need access to the /mnt/media_rw path.

This change doesn't break the FUSE daemon, the only process that should
have media_rw gid in R because the FUSE daemon accesses the lower
filesystem from the pass_through bind mounts of the public volume mount
itself so it doesn't need to walk the /mnt/media_rw path itself

Test: With FUSE enabled, a reliably mounted public volume is accessible
on /storage
Bug: 144914977

Change-Id: Ia3fc9e7483894402c14fb520024e2acca821a24d
2020-01-24 22:13:58 +00:00
Ryan Savitski
92237bad6a unwindstack: RegsArm64: fix harmless off by 1 + iterate GPRs contiguously
The memcpy should be for 31 GPRs, [x0, x30]. Currently it (accidentally)
also copies over the SP register (which ends up being harmless, as the
layouts match, and the value is reassigned again anyway).

Separately, I'm including an optional change for the iteration order,
since LR is the x30 GPR, it makes slightly more sense to print it
immediately after x29. However, this is a change in behaviour, so I can
undo the change if you think it's not worth it.

Tested: atest libunwindstack_unit_test
Change-Id: Ib6b81f8ee3a9a526bfabe4b09b327f083c855fb8
2020-01-24 19:50:45 +00:00
Zim
bdeaf57da3 Add external_storage gid
This gid allows processes full access to public areas of external
storage. This includes the following:
1. EmulatedVolumes: All files and directories excluding the app
specific directories under Android/
2. PublicVolumes: Including 'unreliable' volumes (USB OTG) that are
not typically accesible to ordinary apps

Apps with the MANAGE_EXTERNAL_STORAGE permission will automatically
have this gid

Test: m
Bug: 144914977
Change-Id: I17da0b2367e356edc031d063e214574463afc985
2020-01-24 16:54:03 +00:00
Automerger Merge Worker
174da55100 Merge "Support casefolded encryption" am: be27975fff am: db35eb2c53 am: 5cb8245e5b
Change-Id: Ia7c0ed474f11fff8d8a25cf72e406599c4c3789b
2020-01-24 02:54:18 +00:00
Automerger Merge Worker
5cb8245e5b Merge "Support casefolded encryption" am: be27975fff am: db35eb2c53
Change-Id: I648288ddce8bf6a97f10a6ea7e3f74ab0e56fd77
2020-01-24 02:42:08 +00:00
Automerger Merge Worker
db35eb2c53 Merge "Support casefolded encryption" am: be27975fff
Change-Id: Ic5d84fb0c33f612d486358b2c4b780069a6eec10
2020-01-24 02:26:51 +00:00
Daniel Rosenberg
be27975fff Merge "Support casefolded encryption" 2020-01-24 02:09:55 +00:00
Automerger Merge Worker
69d7be9662 Merge "libsnapshot: fix null pointer deref" am: f3700b9e42 am: a996f11aac am: 75e39bc646
Change-Id: I581342c005f01386fbe047ba5f798c12ed0f22a1
2020-01-24 01:49:05 +00:00
Automerger Merge Worker
33a033b71b Merge "Relax permissions on /data/misc/logd" am: e3a7783686 am: a554e96622 am: cce7f2374b
Change-Id: I94ccc2b3349a8b23315791355e8cfa4b7b0fae78
2020-01-24 01:48:51 +00:00
Automerger Merge Worker
75e39bc646 Merge "libsnapshot: fix null pointer deref" am: f3700b9e42 am: a996f11aac
Change-Id: I20b73717f2f3ea41a57193f8c670cb26b7c66e25
2020-01-24 01:36:21 +00:00