Commit graph

68950 commits

Author SHA1 Message Date
Ulyana Trafimovich
8dd2ea72df Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a467 am: f3f2655023
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671708

Change-Id: I98082b166a27f080e645bca8923ea3d14329f169
2021-04-09 16:45:24 +00:00
Ulyana Trafimovich
f3f2655023 Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a467
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671708

Change-Id: Id627b0324fd88d069182059a566e353c06c5705b
2021-04-09 15:59:44 +00:00
Ulyana Trafimovich
60b9b4a467 Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" 2021-04-09 15:24:58 +00:00
Jaegeuk Kim
55fbcb3a7b Merge "fs_mgr: add readahead_size_kb in fstab" am: 748a701853 am: 0541141771
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663844

Change-Id: Ia862d6e53f1bf5ff9a682618b3d5eb134a55b3e7
2021-04-09 13:10:27 +00:00
Jaegeuk Kim
0541141771 Merge "fs_mgr: add readahead_size_kb in fstab" am: 748a701853
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663844

Change-Id: I878d4320049d6fcdb533ed3686bf7956d26b03d0
2021-04-09 12:26:46 +00:00
Jaegeuk Kim
748a701853 Merge "fs_mgr: add readahead_size_kb in fstab" 2021-04-09 11:39:36 +00:00
Ulyana Trafimovich
9cfeb70f97 Revert "libdexfile_external is replaced by libdexfile (reland)."
Revert "Merge libdexfile_external into libdexfile (reland)."

Revert "Rename libdexfile_external_static to libdexfile_static (..."

Revert "Rename libdexfile_external_static to libdexfile_static (..."

Revert submission 1666119-libdexfile-noext-2

Reason for revert: broken build 7270939 on aosp-master on full-eng
Reverted Changes:
I582e49ae7:Merge libdexfile_external into libdexfile (reland)...
Iaa6a90f41:Rename libdexfile_external_static to libdexfile_st...
I4315189b2:libdexfile_external is replaced by libdexfile (rel...
Ia065119c2:Rename libdexfile_external_static to libdexfile_st...

Bug: 184929782
Change-Id: Id4830ded68e6fb3e9da0bcd8e428c46a79df3ff8
Test: forrest build for aosp-master on full-eng
2021-04-09 11:35:11 +00:00
Martin Stjernholm
c5dc64adf5 Merge "libdexfile_external is replaced by libdexfile (reland)." am: e29c64b029 am: e7cd98c643
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664030

Change-Id: I4760d6996ad0a191da9292e402ace4c2eb454ebe
2021-04-09 11:17:05 +00:00
Martin Stjernholm
e7cd98c643 Merge "libdexfile_external is replaced by libdexfile (reland)." am: e29c64b029
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664030

Change-Id: I654d697aff777433becdda067a9a1ec61e703e5c
2021-04-09 10:38:51 +00:00
Martin Stjernholm
e29c64b029 Merge "libdexfile_external is replaced by libdexfile (reland)." 2021-04-09 09:18:32 +00:00
Jaegeuk Kim
05ca915431 fs_mgr: add readahead_size_kb in fstab
This patch adds an option, readahead_size_kb in fstab entry option. It supports
to set a proper readahead_size per block/dm devices before using them by mount,
which is useful for low/high-end devices when addressing memory pressure issue.

Bug: 181567573
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I549962e68f8488417d76bcfb283958bc33fd5d7a
2021-04-09 04:54:11 +00:00
Andrew Chant
73dfdb0082 Merge "fastboot: use --force to bypass requirements" am: ce61fb390a am: d00f46074a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666085

Change-Id: I39e9bbcfab416d21566e196ca83002cda88dca39
2021-04-09 04:05:08 +00:00
Andrew Chant
d00f46074a Merge "fastboot: use --force to bypass requirements" am: ce61fb390a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666085

Change-Id: Id640d90d9a2b8dac3a6bee293b8fb7369a2d4ef2
2021-04-09 03:21:01 +00:00
Andrew Chant
ce61fb390a Merge "fastboot: use --force to bypass requirements" 2021-04-09 02:45:32 +00:00
Treehugger Robot
dc7776d8e1 Merge "Remove String16::makeLower()." am: c33f57b7f9 am: d5da89bd7e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666087

Change-Id: Icd438a430815e03d302b9be57fcb853a807c746c
2021-04-09 01:46:59 +00:00
Treehugger Robot
d5da89bd7e Merge "Remove String16::makeLower()." am: c33f57b7f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666087

Change-Id: I4f2085a36f0f62c19497310ba34c8730e08b4616
2021-04-09 01:03:29 +00:00
Treehugger Robot
c33f57b7f9 Merge "Remove String16::makeLower()." 2021-04-09 00:35:09 +00:00
Treehugger Robot
debdf364bd Merge changes I66c97386,Id205c88d am: 05a7dfa104 am: 25d87e4419
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668805

Change-Id: I3b48cc428b332122b8e445eef9b9e1e23152e9e2
2021-04-08 19:00:31 +00:00
Treehugger Robot
d792f77c12 Merge "Add MockSnapshotMergeStats" am: 05e6076ceb am: 75834672a4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666039

Change-Id: I3b7f374cff81903534ab12b438d3096cb3cc957f
2021-04-08 19:00:20 +00:00
Treehugger Robot
f69c016c5b Merge "Populate ro.boot.dalvik.vm.checkjni from android.checkjni" am: cd52a78472 am: a50cdc1d0a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668586

Change-Id: If7a517f810c619092c71b68dc9ec95eee8420dd7
2021-04-08 19:00:12 +00:00
Treehugger Robot
5e496f269b Merge "Populate ro.boot.debug.sf.nobootanimation from android.bootanim" am: a8b2ac4b30 am: 1e9abd4fff
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666095

Change-Id: I87b1ddc9510247ddcbbf8133d18dcb165c65b3e2
2021-04-08 19:00:02 +00:00
Treehugger Robot
25d87e4419 Merge changes I66c97386,Id205c88d am: 05a7dfa104
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668805

Change-Id: I5182d03b7a44b9034ea096233d07708b5de24ad2
2021-04-08 18:39:22 +00:00
Treehugger Robot
05a7dfa104 Merge changes I66c97386,Id205c88d
* changes:
  libutils: wp::fromExisting bugfix
  libutils: add sp::cast method
2021-04-08 18:20:38 +00:00
Treehugger Robot
75834672a4 Merge "Add MockSnapshotMergeStats" am: 05e6076ceb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666039

Change-Id: I44e546ac312cf3be41ae62f49c7cf775a762c565
2021-04-08 18:12:18 +00:00
Treehugger Robot
a50cdc1d0a Merge "Populate ro.boot.dalvik.vm.checkjni from android.checkjni" am: cd52a78472
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668586

Change-Id: I446bb76914b91ad277455138cc86f35961d60ca1
2021-04-08 18:11:34 +00:00
Treehugger Robot
1e9abd4fff Merge "Populate ro.boot.debug.sf.nobootanimation from android.bootanim" am: a8b2ac4b30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666095

Change-Id: I0bd2a2df2f155a2526cdf66ed75bfa01f7b98571
2021-04-08 18:11:07 +00:00
Treehugger Robot
05e6076ceb Merge "Add MockSnapshotMergeStats" 2021-04-08 18:05:25 +00:00
Treehugger Robot
cd52a78472 Merge "Populate ro.boot.dalvik.vm.checkjni from android.checkjni" 2021-04-08 17:42:25 +00:00
Treehugger Robot
a8b2ac4b30 Merge "Populate ro.boot.debug.sf.nobootanimation from android.bootanim" 2021-04-08 17:42:18 +00:00
Steven Moreland
dc43fb279f libutils: wp::fromExisting bugfix
This API was tested before, but it wasn't used until it is needed in
libbinder. Previously it passed the tests because wp::operator==
compares weak_ptrs which are never deleted, but it doesn't check the
value of m_ptr as well. This assumes that the RefBase implementation is
self-consistent.

Future considerations:
- add additional CHECK (perf?)
- add an additional optional CHECK?
- update all refbase tests to use an embellished form of this operator

Bug: 184190315
Test: libutils_test, boot and kill process when libbinder is using this
API

Change-Id: I66c97386d769529d5efae48e06775d4b4a344025
2021-04-07 23:06:09 +00:00
Roman Kiryanov
0312c20a71 Populate ro.boot.dalvik.vm.checkjni from android.checkjni
emulator passes `android.checkjni` in the kernel
command which we want to use in
frameworks/base/core/jni/AndroidRuntime.cpp

Bug: 182291166
Test: getprop ro.boot.dalvik.vm.checkjni
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: If9473aa9492fa09d8de7cc8fb08614380e4e15f3
2021-04-07 15:55:21 -07:00
Elliott Hughes
016beb8559 Remove String16::makeLower().
If you need to do a case transformation for a Unicode string, you need
to use icu4c. This only worked for ASCII, which is just silly. Luckily
it doesn't seem to be used anywhere.

Test: treehugger
Change-Id: I4a864823ec35a0b57b50909587cc3efac3f531a7
Merged-In: I4a864823ec35a0b57b50909587cc3efac3f531a7
2021-04-07 22:38:20 +00:00
Steven Moreland
1d68548823 libutils: add sp::cast method
Previously, sp::sp(T*) internally had a static cast, and people
frequently wrote code like this:

    sp<A> a = ...;
    sp<B> b(a.get()); // implicit static cast

Luckily, none of the other sp constructors have this implicit cast. So,
for explicit code, rather than making those use static_cast internally,
adding an sp::cast function.

Bug: 184190315
Test: use in libbinder
Change-Id: Id205c88d03e16cf85ccb8f493ce88b4bbc65a688
2021-04-07 20:30:21 +00:00
Yo Chiang
15c3a91fc7 Merge "fs_mgr: SkipMountingPartitions() support glob patterns" am: b20e9a3606 am: d56f6e14cd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660038

Change-Id: I269cb08492c1f84217eba216d683e8717afce266
2021-04-07 06:00:43 +00:00
Yo Chiang
d56f6e14cd Merge "fs_mgr: SkipMountingPartitions() support glob patterns" am: b20e9a3606
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660038

Change-Id: I5c2bcaa4bd5ade9efb43e2e8449aca75a706a93b
2021-04-07 05:38:47 +00:00
Yo Chiang
b20e9a3606 Merge "fs_mgr: SkipMountingPartitions() support glob patterns" 2021-04-07 05:04:21 +00:00
Treehugger Robot
006db0e7f5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 02c97e837d am: 908ec8b03b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666093

Change-Id: Ie2cc311031e48547375b0d64c2176b76805e7310
2021-04-07 04:37:15 +00:00
Treehugger Robot
908ec8b03b Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 02c97e837d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666093

Change-Id: I7fb14e61ef2ecb6c09826d527cf627da3e9ea733
2021-04-07 04:16:45 +00:00
Treehugger Robot
02c97e837d Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2021-04-07 03:46:57 +00:00
Roman Kiryanov
c755e5edf9 Populate ro.boot.debug.sf.nobootanimation from android.bootanim
emulator passes `android.bootanim=0` in the kernel
command line to disable boot animation.

Bug: 182336906
Test: boot emulator with -np-boot-anim
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Id89a6c92dd4724cac414ffbf8ee731b2bfcc7195
2021-04-06 20:44:57 -07:00
Bob Badour
8c2fe15b47 [LSC] Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  libstats/pull_rust/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I362f72ab99850558ddc7b50108c1ec6a212cb258
2021-04-06 17:46:33 -07:00
Treehugger Robot
aec92150f2 Merge "ueventd: Fix wrong argument index in devpath comparison" am: 0cf8af6860 am: deca6caf46
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664601

Change-Id: I1064e69d61b26af47919e26f1de13ce8f3782e0d
2021-04-07 00:32:24 +00:00
Treehugger Robot
deca6caf46 Merge "ueventd: Fix wrong argument index in devpath comparison" am: 0cf8af6860
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664601

Change-Id: I2c165867af3e8e0b99427f185a77632c0071da4b
2021-04-06 23:47:23 +00:00
Treehugger Robot
0cf8af6860 Merge "ueventd: Fix wrong argument index in devpath comparison" 2021-04-06 23:10:05 +00:00
David Anderson
6a9b8d0c9b Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2 am: 3b7cf575f0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665501

Change-Id: I62819572f7c0ffc7fae73ceeebb1992d55bda958
2021-04-06 23:06:28 +00:00
Ulyana Trafimovich
8d7a612f69 Revert "Set earlyBootEnded before apex starts" am: 82cfe66794 am: 6e6e200706
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665500

Change-Id: I36d1c2c3f15c4fadc6fcc4d06c40dad57682eb0e
2021-04-06 23:06:27 +00:00
David Anderson
3b7cf575f0 Merge changes from topic "revert-1660531-max-boot-level-crypto-KFMCEDKSIV" am: 0da1d617d2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665501

Change-Id: I8af99bce75b91cfb0a61daef1983fceda153fc83
2021-04-06 22:35:48 +00:00
Ulyana Trafimovich
6e6e200706 Revert "Set earlyBootEnded before apex starts" am: 82cfe66794
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1665500

Change-Id: I5a5cb6e6d073ddbf5daad345003d885dc7232671
2021-04-06 22:35:37 +00:00
TreeHugger Robot
25c011d3e3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" into rvc-qpr-dev-plus-aosp 2021-04-06 22:29:55 +00:00
Andrew Chant
d64b988959 fastboot: use --force to bypass requirements
Allow using --force to bypass flashing requirements
from android-info.txt.

We often provide builds to deviceholders who don't have
an exact matching bootloader or radio image and it is
unimportant.  Having the option to override is useful.

This shouldn't affect bootloader.img so should never
prevent a device from returning to fastboot in case of
gross error.

Test: Downloaded a build w/ different radio.

Got the following output:

...
Checking 'version-baseband'                        FAILED

Device version-baseband is 'xyz'.
Update requires 'abc' or '123'.

requirements not met! but proceeding due to --force
Setting current slot to 'a'                        OKAY [  0.065s]

Bug: 184661990
Change-Id: I8680b8275b854304026cff3b2e663b7ef2594383
2021-04-06 15:28:41 -07:00