Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7a03fb2c

Commit 7a03fb2c authored 11 months ago by Pawan Wagh Committed by Automerger Merge Worker 11 months ago

Downloads
- Plain Diff

Merge changes from topic "punch_holes_apk" into main am: b402f570 am: 528d77f3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039899

Change-Id: I842490539e661e6cddcd5b9110c08fda7e7fc1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents fe51b492 528d77f3

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/jni/com_android_internal_content_FileSystemUtils.cpp 114 additions, 3 deletions

core/jni/com_android_internal_content_FileSystemUtils.cpp
core/jni/com_android_internal_content_FileSystemUtils.h 7 additions, 0 deletions

core/jni/com_android_internal_content_FileSystemUtils.h
core/jni/com_android_internal_content_NativeLibraryHelper.cpp 29 additions, 2 deletions

.../jni/com_android_internal_content_NativeLibraryHelper.cpp
libs/androidfw/ZipFileRO.cpp 18 additions, 7 deletions

libs/androidfw/ZipFileRO.cpp
libs/androidfw/include/androidfw/ZipFileRO.h 4 additions, 0 deletions

libs/androidfw/include/androidfw/ZipFileRO.h

with 172 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment