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

Commit 7abe4c05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add framework-conscrypt-nsc to Conscrypt apex" into main

parents a9bc7865 37b195c4

api/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ combined_apis { 
        default: [

            "framework-ondeviceintelligence-platform",

        ],

    }) + select(release_flag("RELEASE_CONSCRYPT_NSC"), {

        true: [

            "framework-conscrypt-nsc",

        ],

        default: [],

    }) + select(release_flag("RELEASE_RANGING_STACK"), {

        true: [

            "framework-ranging",

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ package android.content { 
package android.content.pm {



  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    method @FlaggedApi("android.security.conscrypt_network_security_config") @XmlRes public int getNetworkSecurityConfigResourceId();

    method @FlaggedApi("android.content.pm.sdk_lib_independence") @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getOptionalSharedLibraryInfos();

    method @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraryInfos();

    field public static final int HIDDEN_API_ENFORCEMENT_DEFAULT = -1; // 0xffffffff

core/java/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -339,6 +339,26 @@ filegroup { 
    ],

}



filegroup {

    name: "xml-utils-shared-srcs",

    visibility: ["//visibility:public"],

    srcs: [

        "android/util/EmptyArray.java",

        "android/util/CharsetUtils.java",

        "android/util/XmlPullAttributes.java",

        "android/util/Xml.java",

        "com/android/internal/util/ArrayUtils.java",

        "com/android/internal/util/ArtFastDataInput.java",

        "com/android/internal/util/ArtFastDataOutput.java",

        "com/android/internal/util/ArtBinaryXmlPullParser.java",

        "com/android/internal/util/ArtBinaryXmlSerializer.java",

        "com/android/internal/util/HexDump.java",

        "com/android/internal/util/XmlSerializerWrapper.java",

        "com/android/internal/util/XmlPullParserWrapper.java",

        "com/android/internal/util/XmlUtils.java",

    ]

}



// keep these files in sync with the apex/jobscheduler/service jarjar-rules.txt for

// the jobscheduler module.

filegroup {

core/java/android/content/pm/ApplicationInfo.java

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.XmlRes;

import android.app.compat.CompatChanges;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -2533,6 +2534,18 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        return HIDDEN_API_ENFORCEMENT_ENABLED;

    }



    /**

     * Get the resource Id of the network security config file for this app.

     *

     * @return the resource Id of the NSC.

     * @hide

     */

    @FlaggedApi(android.security.Flags.FLAG_CONSCRYPT_NETWORK_SECURITY_CONFIG)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public @XmlRes int getNetworkSecurityConfigResourceId() {

        return networkSecurityConfigRes;

    }



    /**

     * @hide

     */

core/java/android/security/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ flag { 
    bug: "28746284"

}



flag {

    name: "conscrypt_network_security_config"

    is_exported: true

    namespace: "network_security"

    description: "Enable the frameworks APIs required by the NSC implementation in Conscrypt"

    bug: "404518910"

}



flag {

    name: "fsverity_api"

    is_exported: true