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

Commit c845b2a2 authored by Chad Brubaker's avatar Chad Brubaker Committed by Alex Klyubin
Browse files

Use an attribute for the network security config resource 

Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
parent 212fe6c0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ package android { 
    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843830; // 0x1010436

    field public static final int networkSecurityConfig = 16844074; // 0x101052a

    field public static final int nextFocusDown = 16842980; // 0x10100e4

    field public static final int nextFocusForward = 16843580; // 0x101033c

    field public static final int nextFocusLeft = 16842977; // 0x10100e1

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -982,6 +982,7 @@ package android { 
    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843830; // 0x1010436

    field public static final int networkSecurityConfig = 16844074; // 0x101052a

    field public static final int nextFocusDown = 16842980; // 0x10100e4

    field public static final int nextFocusForward = 16843580; // 0x101033c

    field public static final int nextFocusLeft = 16842977; // 0x10100e1

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ package android { 
    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843830; // 0x1010436

    field public static final int networkSecurityConfig = 16844074; // 0x101052a

    field public static final int nextFocusDown = 16842980; // 0x10100e4

    field public static final int nextFocusForward = 16843580; // 0x101033c

    field public static final int nextFocusLeft = 16842977; // 0x10100e1

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -5221,7 +5221,7 @@ public final class ActivityThread { 
        // code is loaded to prevent issues with instances of TLS objects being created before

        // the provider is installed.

        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "NetworkSecurityConfigProvider.install");

        NetworkSecurityConfigProvider.install(appContext);

        NetworkSecurityConfigProvider.install(appContext, data.appInfo);

        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



        // Continue loading instrumentation.

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

+13 −0
Original line number Diff line number Diff line
@@ -764,6 +764,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public int installLocation = PackageInfo.INSTALL_LOCATION_UNSPECIFIED;



    /**

     * Resource file providing the application's Network Security Config.

     * @hide

     */

    public int networkSecurityConfigRes;



    public void dump(Printer pw, String prefix) {

        dump(pw, prefix, DUMP_FLAG_ALL);

    }
@@ -835,6 +841,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
                pw.println(prefix + "fullBackupContent="

                        + (fullBackupContent < 0 ? "false" : "true"));

            }

            if (networkSecurityConfigRes != 0) {

                pw.println(prefix + "networkSecurityConfigRes=0x"

                        + Integer.toHexString(networkSecurityConfigRes));

            }

        }

        super.dumpBack(pw, prefix);

    }
@@ -921,6 +931,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        uiOptions = orig.uiOptions;

        backupAgentName = orig.backupAgentName;

        fullBackupContent = orig.fullBackupContent;

        networkSecurityConfigRes = orig.networkSecurityConfigRes;

    }



    public String toString() {
@@ -976,6 +987,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeInt(descriptionRes);

        dest.writeInt(uiOptions);

        dest.writeInt(fullBackupContent);

        dest.writeInt(networkSecurityConfigRes);

    }



    public static final Parcelable.Creator<ApplicationInfo> CREATOR
@@ -1031,6 +1043,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        descriptionRes = source.readInt();

        uiOptions = source.readInt();

        fullBackupContent = source.readInt();

        networkSecurityConfigRes = source.readInt();

    }



    /**