Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e81bf4 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge changes from topic 'aosp-merge-24-12' 

* changes:
  Special case system_server to not create the JIT code cache.
  Don't use IntegralToString
  Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
  Track API changes to java.lang.ref.Reference.
  Remove merge markers from preloaded-classes
  Move StrictJarFile from libcore to framework
  Switch RecoverySystem impl to use sun.security.pkcs
  API update for OpenJdk based libcore
  Use libcore/known_oj_tags for the javadoc stage.
  Stop preloading fortress classes
  Use HexDump instead of java.lang.IntegralToString
  Add core-oj to the list of core library jars.
parents 76a9e55a a8772351

Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext

LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext



LOCAL_MODULE := framework
@@ -710,6 +710,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
	$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	core-oj \

	core-libart \

	conscrypt \

	bouncycastle \
@@ -733,6 +734,7 @@ framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html 
# not be referenced in the documentation.

framework_docs_LOCAL_DROIDDOC_OPTIONS := \

    -knowntags ./frameworks/base/docs/knowntags.txt \

    -knowntags ./libcore/known_oj_tags.txt \

    -hidePackage com.android.org.conscrypt \

    -since $(SRC_API_DIR)/1.xml 1 \

    -since $(SRC_API_DIR)/2.xml 2 \
@@ -1093,7 +1095,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := $(ext_src_files)



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-libart

LOCAL_JAVA_LIBRARIES := core-oj core-libart

LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext

api/current.txt

+1976 −808

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+1976 −808

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/pm/ManifestDigest.java

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.content.pm;



import com.android.internal.util.HexDump;



import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -118,7 +120,7 @@ public class ManifestDigest implements Parcelable { 
        final int N = mDigest.length;

        for (int i = 0; i < N; i++) {

            final byte b = mDigest[i];

            IntegralToString.appendByteAsHex(sb, b, false);

            HexDump.appendByteAsHex(sb, b, false);

            sb.append(',');

        }

        sb.append('}');

core/java/android/content/pm/PackageParser.java

+2 −1
Original line number Diff line number Diff line
@@ -81,9 +81,10 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Set;

import java.util.concurrent.atomic.AtomicReference;

import java.util.jar.StrictJarFile;

import java.util.zip.ZipEntry;



import android.util.jar.StrictJarFile;



/**

 * Parser for package files (APKs) on disk. This supports apps packaged either

 * as a single "monolithic" APK, or apps packaged as a "cluster" of multiple