Revert "Reland "Pass all preferred locales to AssetManager""
This reverts commit 04cf00dc. Reason for revert: causes b/292445325 and b/292321908 Fixes: 292445325 Fixes: 292321908 Change-Id: Idb44723ad7e8b14b737305d194f79dd70630621d
Showing
- core/java/android/app/LocaleConfig.java 2 additions, 3 deletionscore/java/android/app/LocaleConfig.java
- core/java/android/content/pm/PackageParser.java 6 additions, 6 deletionscore/java/android/content/pm/PackageParser.java
- core/java/android/content/res/AssetManager.java 7 additions, 31 deletionscore/java/android/content/res/AssetManager.java
- core/java/android/content/res/ResourcesImpl.java 12 additions, 27 deletionscore/java/android/content/res/ResourcesImpl.java
- core/java/android/os/LocaleList.java 0 additions, 20 deletionscore/java/android/os/LocaleList.java
- core/jni/android_util_AssetManager.cpp 107 additions, 131 deletionscore/jni/android_util_AssetManager.cpp
- libs/androidfw/AssetManager2.cpp 116 additions, 176 deletionslibs/androidfw/AssetManager2.cpp
- libs/androidfw/ResourceTypes.cpp 0 additions, 16 deletionslibs/androidfw/ResourceTypes.cpp
- libs/androidfw/include/androidfw/AssetManager2.h 6 additions, 12 deletionslibs/androidfw/include/androidfw/AssetManager2.h
- libs/androidfw/include/androidfw/ResourceTypes.h 0 additions, 2 deletionslibs/androidfw/include/androidfw/ResourceTypes.h
- libs/androidfw/tests/AssetManager2_bench.cpp 2 additions, 4 deletionslibs/androidfw/tests/AssetManager2_bench.cpp
- libs/androidfw/tests/AssetManager2_test.cpp 10 additions, 10 deletionslibs/androidfw/tests/AssetManager2_test.cpp
- libs/androidfw/tests/BenchmarkHelpers.cpp 1 addition, 1 deletionlibs/androidfw/tests/BenchmarkHelpers.cpp
- libs/androidfw/tests/Theme_test.cpp 1 addition, 1 deletionlibs/androidfw/tests/Theme_test.cpp
- native/android/configuration.cpp 1 addition, 1 deletionnative/android/configuration.cpp
- services/core/java/com/android/server/pm/split/DefaultSplitAssetLoader.java 4 additions, 4 deletions.../com/android/server/pm/split/DefaultSplitAssetLoader.java
- services/core/java/com/android/server/pm/split/SplitAssetDependencyLoader.java 2 additions, 2 deletions...m/android/server/pm/split/SplitAssetDependencyLoader.java
Loading
Please register or sign in to comment