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

2367dc86

Commit 2367dc86 authored 1 year ago by Yurii Zubrytskyi Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465"...

Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed813

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

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

parents da845a7d 76eed813

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/jni/android_util_AssetManager.cpp 90 additions, 64 deletions

core/jni/android_util_AssetManager.cpp
libs/androidfw/AssetManager2.cpp 95 additions, 42 deletions

libs/androidfw/AssetManager2.cpp
libs/androidfw/include/androidfw/AssetManager2.h 27 additions, 4 deletions

libs/androidfw/include/androidfw/AssetManager2.h
libs/androidfw/tests/AssetManager2_test.cpp 27 additions, 5 deletions

libs/androidfw/tests/AssetManager2_test.cpp
libs/androidfw/tests/Idmap_test.cpp 2 additions, 2 deletions

libs/androidfw/tests/Idmap_test.cpp
tools/aapt2/process/SymbolTable.cpp 2 additions, 1 deletion

tools/aapt2/process/SymbolTable.cpp

with 243 additions and 118 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