Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/pl… #1

Open
wants to merge 12 commits into
base: fire
Choose a base branch
from
Open

Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/pl… #1

wants to merge 12 commits into from

Conversation

jaichiranjeeva
Copy link

…atform/system/core into fire

Android 11.0.0 Release 48 (RD2A.211001.002)

android-build-team Robot and others added 12 commits August 6, 2020 07:32
Snap for 6741352 from 3a7a8b8 to rvc-d2-release
e5ea01c 
Change-Id: I6661ce9d91e707ebc08e87f4a4b361d64599875f
Snap for 6792403 from e689b93 to rvc-d2-release
b93b473 
Change-Id: I1ab44388ec6ac207c8ced19dd3af8e023b6575fd
Snap for 6824415 from f719e75 to rvc-d2-release
ab7db23 
Change-Id: Idcde804c9fb76b7d6cb183d4b0baed2694cc8086
Snap for 6856668 from c3f71bc to rvc-d2-release
3ecaca7 
Change-Id: Icc71e892563be240aeb597d4761cbaaa7a7f906e
Snap for 6870886 from 46ef208 to rvc-d2-release
e5b21e3 
Change-Id: Id9112a895167a2e5075984d9457f8357269233ae
Snap for 6880680 from f11b01f to rvc-d2-release
b984891 
Change-Id: Ia91111d225b161bfc4166547853680096dd149bf
Snap for 7015057 from 71945f2 to rvc-d2-release
9171416 
Change-Id: I6172f047cf2dada93705a49954991f5af13ae668
Snap for 7022639 from bcf476d to rvc-d2-release
1c48171 
Change-Id: I5b7cfbce59f37f78aac70caebf190b126ae43f44
Snap for 7155236 from 7e4ce2b to rvc-d2-release
f7ce64d 
Change-Id: Ibd74922914a4fb003bb5cf3d1d50c0903a8debb5
@dvandercorp
Use std::shared_ptr in Epoll's callback list.
965aa46 
Ignore-AOSP-First: Awaiting security triage
Bug: 187862380
Bug: 184569329
Test: CtsInitTestCases
Change-Id: Ibb34a6b8a5675dbc515b7f8a43d7eecf2084510c
(cherry picked from commit aea9781)
(cherry picked from commit 2cf268a)
Merge cherrypicks of [15581311, 15581312, 15581313, 15581314, 1558132…
348efca 
…6, 15581327, 15581138, 15581139, 15581140, 15581341, 15581342, 15581343, 15581344, 15581095, 15581315, 15581316, 15581317, 15581345, 15581328] into rvc-d2-release

Change-Id: I1496925408cda443781ca9167ccf5dee3d1232b5
@jaichiranjeeva
Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/pl…
95c3bda 
…atform/system/core into fire

Android 11.0.0 Release 48 (RD2A.211001.002)
Albinoman887 pushed a commit to Albinoman887/system_core that referenced this pull request Jun 6, 2022
@rokusenpaii @ArianK16a @neobuddy89
Revert "libfs_avb: verifying vbmeta digest early" (Spark-Rom#1)
0f04835 
This reverts commit ec10d3c.

Co-authored-by: Arian <[email protected]>
Signed-off-by: Pranav Vashi <[email protected]>
Viktor-Hermann pushed a commit to RavZen/android_system_core that referenced this pull request Jul 26, 2022
@raymanfx @NurKeinNeid
utils: Threads: Handle empty thread names
b5308cd 
* Fixes camera for Samsung Exynos devices:

08-30 18:07:03.585  2729  2729 I ExynosCameraFrameFactory: INFO(startThread[1608]):pipeId=0
08-30 18:07:03.585  2729  2729 F libutils.threads: thread name not provided to Thread::run
08-30 18:07:03.586  2729  2729 F libc    : Fatal signal 6 (SIGABRT), code -6 in tid 2729 (cameraserver)
08-30 18:07:03.587  2548  2548 W         : debuggerd: handling request: pid=2729 uid=1047 gid=1005 tid=2729
08-30 18:07:03.656  6489  6489 F DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
08-30 18:07:03.656  6489  6489 F DEBUG   : Build fingerprint: 'samsung/aosp_gts210ltexx/gts210ltexx:7.0/NYC/chris08292135:userdebug/test-keys'
08-30 18:07:03.656  6489  6489 F DEBUG   : Revision: '0'
08-30 18:07:03.657  6489  6489 F DEBUG   : ABI: 'arm'
08-30 18:07:03.657  6489  6489 F DEBUG   : pid: 2729, tid: 2729, name: cameraserver  >>> /system/bin/cameraserver <<<
08-30 18:07:03.658  6489  6489 F DEBUG   : signal 6 (SIGABRT), code -6 (SI_TKILL), fault addr --------
08-30 18:07:03.673  6489  6489 F DEBUG   : Abort message: 'thread name not provided to Thread::run'
08-30 18:07:03.673  6489  6489 F DEBUG   :     r0 00000000  r1 00000aa9  r2 00000006  r3 00000008
08-30 18:07:03.674  6489  6489 F DEBUG   :     r4 b5a2c58c  r5 00000006  r6 b5a2c534  r7 0000010c
08-30 18:07:03.674  6489  6489 F DEBUG   :     r8 b28b5380  r9 00000000  sl 00000000  fp b2a92800
08-30 18:07:03.674  6489  6489 F DEBUG   :     ip 00000016  sp be90b350  lr b4f7e537  pc b4f80d94  cpsr 200f0010
08-30 18:07:03.694  6489  6489 F DEBUG   :
08-30 18:07:03.694  6489  6489 F DEBUG   : backtrace:
08-30 18:07:03.694  6489  6489 F DEBUG   :     #00 pc 00049d94  /system/lib/libc.so (tgkill+12)
08-30 18:07:03.694  6489  6489 F DEBUG   :     Spark-Rom#1 pc 00047533  /system/lib/libc.so (pthread_kill+34)
08-30 18:07:03.694  6489  6489 F DEBUG   :     Spark-Rom#2 pc 0001d885  /system/lib/libc.so (raise+10)
08-30 18:07:03.694  6489  6489 F DEBUG   :     Spark-Rom#3 pc 000193d1  /system/lib/libc.so (__libc_android_abort+34)
08-30 18:07:03.694  6489  6489 F DEBUG   :     Spark-Rom#4 pc 00017014  /system/lib/libc.so (abort+4)
08-30 18:07:03.695  6489  6489 F DEBUG   :     Spark-Rom#5 pc 0000bfd5  /system/lib/libcutils.so (__android_log_assert+112)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#6 pc 0000e265  /system/lib/libutils.so (_ZN7android6Thread3runEPKcij+212)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#7 pc 00045903  /system/lib/libexynoscamera.so (_ZN7android16ExynosCameraPipe11startThreadEv+74)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#8 pc 0007b1c3  /system/lib/libexynoscamera.so (_ZN7android24ExynosCameraFrameFactory11startThreadEj+70)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#9 pc 0007bcef  /system/lib/libexynoscamera.so (_ZN7android24ExynosCameraFrameFactory19startInitialThreadsEv+70)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#10 pc 0006231d  /system/lib/libexynoscamera.so (_ZN7android12ExynosCamera22m_startPreviewInternalEv+1140)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#11 pc 0006b897  /system/lib/libexynoscamera.so (_ZN7android12ExynosCamera12startPreviewEv+1666)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#12 pc 000037b1  /system/lib/hw/camera.universal5433.so
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#13 pc 0006094f  /system/lib/libcameraservice.so (_ZN7android12CameraClient16startPreviewModeEv+102)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#14 pc 00060825  /system/lib/libcameraservice.so (_ZN7android12CameraClient15startCameraModeENS0_11camera_modeE+68)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#15 pc 000282f9  /system/lib/libcamera_client.so (_ZN7android8hardware8BnCamera10onTransactEjRKNS_6ParcelEPS2_j+724)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#16 pc 000359b3  /system/lib/libbinder.so (_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j+70)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#17 pc 0003d159  /system/lib/libbinder.so (_ZN7android14IPCThreadState14executeCommandEi+684)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#18 pc 0003cdb7  /system/lib/libbinder.so (_ZN7android14IPCThreadState20getAndExecuteCommandEv+114)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#19 pc 0003d2bb  /system/lib/libbinder.so (_ZN7android14IPCThreadState14joinThreadPoolEb+46)
08-30 18:07:03.695  6489  6489 F DEBUG   :     aosp-mirror#20 pc 00000b4d  /system/bin/cameraserver
08-30 18:07:03.696  6489  6489 F DEBUG   :     aosp-mirror#21 pc 00016c2d  /system/lib/libc.so (__libc_init+48)
08-30 18:07:03.696  6489  6489 F DEBUG   :     aosp-mirror#22 pc 00000a18  /system/bin/cameraserver

Change-Id: Ib6234260a5fc5798eea580e0ac594313650de933
Signed-off-by: SagarMakhar <[email protected]>
Viktor-Hermann pushed a commit to RavZen/android_system_core that referenced this pull request Jul 26, 2022
@NurKeinNeid
Merge pull request Spark-Rom#1 from kud-workspace/is-normal-boot
0c3b613 
init: Also use `IsRecoveryMode()` for normal boot checks
Albinoman887 pushed a commit to Albinoman887/system_core that referenced this pull request May 20, 2023
@ebiggers @travarilo
libsparse: fix double free after block splitting
2366fb7 
Due to https://r.android.com/1310496, sparse_file_write() splits all
blocks larger than 64 MiB.  However, the code that splits file-backed
blocks copies the pointer to the filename without duplicating the
underlying memory, causing a double free in backed_block_destroy()
later.  Fix this by using strdup().  Also, as long as that is being
fixed, also check for failure.

Test: SANITIZE_HOST=address mmm external/e2fsprogs
      mkdir mnt
      mkfs.ext4 img 1G
      sudo mount img mnt
      sudo cp /dev/urandom mnt/file
      sudo umount mnt
      ext2simg img simg

Before this fix it gave:

    ==2216498==ERROR: AddressSanitizer: attempting double-free on 0x602000000090 in thread T0:
        #0 0x55a52454c9a2 in free out/stage2/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/out/llvm-project/compiler-rt/lib/asan/asan_malloc_linux.cpp:52:3
        Spark-Rom#1 0x7ffa247c82ee in backed_block_destroy(backed_block*) system/core/libsparse/backed_block.cpp:106:5
        Spark-Rom#2 0x7ffa247c82ee in backed_block_list_destroy(backed_block_list*) system/core/libsparse/backed_block.cpp:124:7
        Spark-Rom#3 0x7ffa247cd055 in sparse_file_destroy system/core/libsparse/sparse.cpp:49:3
        Spark-Rom#4 0x55a524587b75 in main external/e2fsprogs/contrib/android/ext2simg.c:239:2

Google: 2506666
Change-Id: I4607ef5adcf6512645342beaf91aff6033414e54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jaichiranjeeva @dvandercorp