Commit Graph

59638 Commits

Author SHA1 Message Date
TreeHugger Robot b6ae75ef00 Merge "stats: Set min_sdk_version" into rvc-dev am: 4cfdfef1bf am: 2574b305a8 am: 21a07332eb
Change-Id: I76ecbbdb8869211c6cb342165e104e5037b35c1e
2020-05-04 23:59:11 +00:00
TreeHugger Robot 21a07332eb Merge "stats: Set min_sdk_version" into rvc-dev am: 4cfdfef1bf am: 2574b305a8
Change-Id: I1467b5818c660dc2f974c6d25f647f6b748210c0
2020-05-04 23:44:05 +00:00
TreeHugger Robot 2574b305a8 Merge "stats: Set min_sdk_version" into rvc-dev am: 4cfdfef1bf
Change-Id: I9960b0c64a2c41ff07acfac71d2caee7a1130805
2020-05-04 23:30:00 +00:00
TreeHugger Robot 4cfdfef1bf Merge "stats: Set min_sdk_version" into rvc-dev 2020-05-04 23:11:27 +00:00
David Anderson f2f5edd9d5 fastboot: Fix snapshot-update merge behavior.
When merging in recovery, the "imminent data wipe" code was used, which
made the assumption the /metadata and /data state would be zapped. This
caused future OTAs to error because the old snapshots were detected.

This CL allows OTAs to proceed even if unexpected snapshots are present.
It also forces the state to "MergeCompleted" after a merge in recovery,
so that the next normal boot can perform cleanup.

Bug: 155339165
Test: fastboot snapshot-update merge, then take another OTA
      vts_libsnapshot_test
Change-Id: Ief6dea3ba76323044e61307272dda320a4494aea
Merged-In: Ief6dea3ba76323044e61307272dda320a4494aea
2020-05-04 15:53:06 -07:00
android-build-team Robot 7b58652479 Snap for 6456462 from 81584cab85 to mainline-release
Change-Id: I685eef3e485bf707d00b20003b1e959c3112af71
2020-05-03 07:00:47 +00:00
Christopher Ferris 81584cab85 Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev am: 64021d834a am: 2273266944 am: 7ae951c333
Change-Id: Ib878f9c405f34942149a22304dbe4818896fcb46
2020-05-02 17:04:31 +00:00
Christopher Ferris 7ae951c333 Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev am: 64021d834a am: 2273266944
Change-Id: Ief08752efe3670d39f54f27e26966cf06ef8cf4a
2020-05-02 16:52:17 +00:00
Christopher Ferris 2273266944 Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev am: 64021d834a
Change-Id: I23e337eb2b6705e07b2d93f3561285923544d4f0
2020-05-02 16:36:18 +00:00
Christopher Ferris 64021d834a Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev 2020-05-02 16:28:23 +00:00
Yifan Hong 02df85cff6 Merge "Handle zero snapshot size appropriately." into rvc-dev am: 5b182952de am: c3b037686d am: a06d79852a
Change-Id: I5a0e7e51de0af0754fa4cd6a3b601ad832435eee
2020-05-02 05:25:07 +00:00
Yifan Hong a06d79852a Merge "Handle zero snapshot size appropriately." into rvc-dev am: 5b182952de am: c3b037686d
Change-Id: I21499287085f7f12050063df4ca542ac9b666f7f
2020-05-02 05:13:21 +00:00
Yifan Hong c3b037686d Merge "Handle zero snapshot size appropriately." into rvc-dev am: 5b182952de
Change-Id: Ia2794499c5fc9cbbb7b09b1c0f7f73e4729cf2f7
2020-05-02 05:01:37 +00:00
Yifan Hong 5b182952de Merge "Handle zero snapshot size appropriately." into rvc-dev 2020-05-02 04:47:00 +00:00
Sim Sun ce0f3201d1 Fix dangling pointer issue in LocalUpdatbleMaps
Libunwindstack would remove duplicated items and update the `prev_map`
during reparsing `/proc/self/maps`. But we leave `prev_real_map`
pointing toward a MapInfo that will be deleted soon. It will cause a
dangling pointer issue.

Add new tests to cover this dangling pointer issue.

Bug: 155511785

Test: libunwindstack_test
Change-Id: I62e1b97bcb73f07e9349671f0b758f5ec9de16c0
(cherry picked from commit a7a194beb4)
2020-05-01 17:24:57 -07:00
TreeHugger Robot a314341df7 Merge "first_stage_init: add support to skip module load failures" into rvc-d1-dev am: 427e663b96 am: 9f42e0d770
Change-Id: Ibbd2e1a78faca7207a22929f899ef811b63781db
2020-05-02 00:00:06 +00:00
TreeHugger Robot 9f42e0d770 Merge "first_stage_init: add support to skip module load failures" into rvc-d1-dev am: 427e663b96
Change-Id: I661d19db45513f1c5c3a943b8bbbc2b482fdea5a
2020-05-01 23:43:01 +00:00
TreeHugger Robot 427e663b96 Merge "first_stage_init: add support to skip module load failures" into rvc-d1-dev 2020-05-01 23:27:42 +00:00
Suren Baghdasaryan cb178b7067 task_profiles.json: add a new task profile used by camera HAL am: 0b4313fede am: 78b82bec83 am: bb10d53c09
Change-Id: I89f1673d4ffe2bd38d785189413c4019771835d1
2020-05-01 23:27:10 +00:00
Suren Baghdasaryan 77d259ede6 init: Add task_profiles init command am: 21ae541691 am: 90910f5489 am: 4b3feddde4
Change-Id: I583410f6021d47db3bc493d6fbb462cba51bea88
2020-05-01 23:27:09 +00:00
Suren Baghdasaryan bb10d53c09 task_profiles.json: add a new task profile used by camera HAL am: 0b4313fede am: 78b82bec83
Change-Id: If4c5150f9c5e117ba253397804922a56b80d7a99
2020-05-01 23:02:03 +00:00
Suren Baghdasaryan 4b3feddde4 init: Add task_profiles init command am: 21ae541691 am: 90910f5489
Change-Id: Idaa6f6555eef81aacce1bb2db63f011303da0616
2020-05-01 23:02:00 +00:00
Suren Baghdasaryan 78b82bec83 task_profiles.json: add a new task profile used by camera HAL am: 0b4313fede
Change-Id: I008253a87cc8a7b77c41c94745cc9ee1c65229bf
2020-05-01 22:43:22 +00:00
Suren Baghdasaryan 90910f5489 init: Add task_profiles init command am: 21ae541691
Change-Id: I5a175d44ad5c88dcf245374d9a12ed424b1b7d3e
2020-05-01 22:43:20 +00:00
Suren Baghdasaryan 0b4313fede task_profiles.json: add a new task profile used by camera HAL
Add new CameraServicePerformance task profile used by camera HAL.

Bug: 155419956
Test: confirm profile applies correctly
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I21cf942eca279a5ad4c1ff75c735560954f4ebc1
Merged-In: I21cf942eca279a5ad4c1ff75c735560954f4ebc1
2020-05-01 22:21:09 +00:00
Suren Baghdasaryan 21ae541691 init: Add task_profiles init command
Introduce new command to allow setting task profiles from inside .rc
script. This is to replace usage of writepid when a service is trying
to join a cgroup. Usage example from a .rc file:

service surfaceflinger /system/bin/surfaceflinger
    task_profiles HighPerformance

Bug: 155419956
Test: change .rc file and confirm task profile is applied
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I0add9c3b363a7cb1ea89778780896cae1c8a303c
Merged-In: I0add9c3b363a7cb1ea89778780896cae1c8a303c
2020-05-01 22:20:57 +00:00
Will McVicker 6c5f82642b first_stage_init: add support to skip module load failures
Extend androidboot.first_stage_console cmdline property to enable
skipping module load failures without stopping at a serial console. This
is useful for GKI development.

Set androidboot.first_stage_console=2 for this behavior.

Bug: 155296582
Test: verify behavior for values 0, 1, and 2
Change-Id: I068c631a22c848e45a421b297b1acae1b3deb3c1
2020-05-01 13:48:33 -07:00
TreeHugger Robot a6c5f91269 Merge "liblog: require root for multi_connect_dgram_socket test" into rvc-dev am: 67a92651a2 am: b7da236617 am: 8331d6ad81
Change-Id: Ibb52abbc7aedc782825e6f7837cc94da91d6a76f
2020-05-01 20:04:33 +00:00
TreeHugger Robot 8331d6ad81 Merge "liblog: require root for multi_connect_dgram_socket test" into rvc-dev am: 67a92651a2 am: b7da236617
Change-Id: I9688da63e59733c4558550f2e4c05f72960676c9
2020-05-01 19:49:26 +00:00
TreeHugger Robot b7da236617 Merge "liblog: require root for multi_connect_dgram_socket test" into rvc-dev am: 67a92651a2
Change-Id: I1273e42167586a73eb4cebf5e863ffa0cd519204
2020-05-01 19:34:32 +00:00
TreeHugger Robot 67a92651a2 Merge "liblog: require root for multi_connect_dgram_socket test" into rvc-dev 2020-05-01 19:15:43 +00:00
Yifan Hong c2a048e2ed Handle zero snapshot size appropriately.
This won't happen in practice because device size is never
zero. Hypothetically, if it is, PartitionCowCreator still
suggests that a CoW size of 8192 bytes needs to be created. In
reality, it is not necessary.

Test: libsnapshot_fuzzer
Bug: 155484992
Change-Id: I6c69f54820522d50c699384eec90c474ca3a9402
(cherry picked from commit bc84824e21acfdc83590d6d0d4827bd9854fc0f5)
Merged-In: I6c69f54820522d50c699384eec90c474ca3a9402
2020-05-01 11:52:01 -07:00
David Anderson db68e061dc Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb96a am: 1a7bb7d724 am: 765aef838b
Change-Id: I933c79e389b1db6466e6211d234f0b6afc0c5566
2020-05-01 18:28:30 +00:00
David Anderson 765aef838b Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb96a am: 1a7bb7d724
Change-Id: Ibd52cb3e3a60586bff78c22124865e4f94d2100d
2020-05-01 18:15:14 +00:00
David Anderson 1a7bb7d724 Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb96a
Change-Id: Ia271ae0ede6597ef12d7727cd35d035d0f2517c8
2020-05-01 18:01:35 +00:00
David Anderson 0d246eb96a Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev 2020-05-01 17:46:02 +00:00
Jooyung Han f2d4dc6b8f stats: Set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Icd184c6fe06a688bd79ef6514bb49dffb706a9a1
Change-Id: Icd184c6fe06a688bd79ef6514bb49dffb706a9a1
(cherry picked from commit cc3588afcb)
2020-05-02 02:29:19 +09:00
Tom Cherry 3ac8ba1820 liblog: require root for multi_connect_dgram_socket test
Bug: 65062446
Test: multi_connect_dgram_socket is skipped for non-root
Test: multi_connect_dgram_socket passes for root
Merged-In: I610bed5987580e0c5a01952efc2e32e7d8cdf9b4
Change-Id: I610bed5987580e0c5a01952efc2e32e7d8cdf9b4
(cherry picked from commit 710825ce47)
2020-05-01 10:27:21 -07:00
TreeHugger Robot 06239deafe Merge "rootdir: init.rc: mount tracefs" into rvc-dev am: 84f253e40a am: 5aeb69cd47 am: 9dcb534fc5
Change-Id: Ic200daf644d18712bfcdd4a7b5c7a6a4d654f5c8
2020-05-01 15:23:00 +00:00
TreeHugger Robot 9dcb534fc5 Merge "rootdir: init.rc: mount tracefs" into rvc-dev am: 84f253e40a am: 5aeb69cd47
Change-Id: Ia04b60fa4d391e596b6f6aabb739009c0312f374
2020-05-01 15:09:18 +00:00
TreeHugger Robot 5aeb69cd47 Merge "rootdir: init.rc: mount tracefs" into rvc-dev am: 84f253e40a
Change-Id: I2257cce38aeedab4acc21b8d140ffb083e6e826c
2020-05-01 14:55:32 +00:00
TreeHugger Robot 84f253e40a Merge "rootdir: init.rc: mount tracefs" into rvc-dev 2020-05-01 14:44:13 +00:00
Alessio Balsini 8a46cdc942 snapshot_test: Fix overflow in statvfs arithmetics am: 2612f9b116 am: 0006be8a6c am: 779c2ce63e
Change-Id: Ieed91a772c843e8141dcfc8620fcf7b23819bb7f
2020-05-01 13:38:47 +00:00
Alessio Balsini 779c2ce63e snapshot_test: Fix overflow in statvfs arithmetics am: 2612f9b116 am: 0006be8a6c
Change-Id: I307564cda654e8a68d80fdc1a450bf39e897b517
2020-05-01 13:23:13 +00:00
Alessio Balsini 0006be8a6c snapshot_test: Fix overflow in statvfs arithmetics am: 2612f9b116
Change-Id: Ifcb544bd30ee55d9d23b54b1e2a8c5f94f8ebb14
2020-05-01 13:06:49 +00:00
Nikita Ioffe ba38e90520 Merge "Add reason why userspace reboot shutdown sequence failed" into rvc-dev am: eb3f92f1ba am: 3143c5c28a am: 47c4dab7a7
Change-Id: I65d808fb3af1671d5ddceb05dd675d0e4fd415e4
2020-05-01 11:31:21 +00:00
Nikita Ioffe a7bcac5922 Merge "Reject services that are both critical and oneshot" into rvc-dev am: d172618e38 am: dc3985f52b am: bbab431213
Change-Id: Ic8cf19dae873b3e951cf6733dbd205489bae5140
2020-05-01 11:31:07 +00:00
Alessio Balsini 2612f9b116 snapshot_test: Fix overflow in statvfs arithmetics
Operations on (unsigned long) f_bsize and f_bfree are correctly handled
on 64 bit architectures, but when switching to 32 bit, the
multiplication between the two could result in an overflow, causing the
test to crash.
Fix by using a uint64_t operand, hinting the compiler to handle the
whole multiplication with 64 bit operands.

Bug: 154355449
Bug: 148889015
Test: vts_libsnapshot_test (32 bit)
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Ief5c03ff7954c4a3e8597ef6e7df467f59428877
Merged-In: Ief5c03ff7954c4a3e8597ef6e7df467f59428877
2020-05-01 12:21:08 +01:00
Nikita Ioffe 47c4dab7a7 Merge "Add reason why userspace reboot shutdown sequence failed" into rvc-dev am: eb3f92f1ba am: 3143c5c28a
Change-Id: I1e30fcbbc4ba2605c37803ae8dcec0d16643c003
2020-05-01 11:17:12 +00:00
Nikita Ioffe bbab431213 Merge "Reject services that are both critical and oneshot" into rvc-dev am: d172618e38 am: dc3985f52b
Change-Id: I7e786ea53f27281eaa9bb5837bdff7b8d5f24d1b
2020-05-01 11:17:03 +00:00