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

Commit 08dd510f authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "Deprecate targetSandboxVersion=2"

parents c08ab549 11ecd583

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ package android { 
    field public static final int targetName = 16843853; // 0x101044d

    field public static final int targetPackage = 16842785; // 0x1010021

    field public static final int targetProcesses = 16844097; // 0x1010541

    field public static final int targetSandboxVersion = 16844108; // 0x101054c

    field public static final deprecated int targetSandboxVersion = 16844108; // 0x101054c

    field public static final int targetSdkVersion = 16843376; // 0x1010270

    field public static final int taskAffinity = 16842770; // 0x1010012

    field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be

core/java/android/security/net/config/ManifestConfigSource.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class ManifestConfigSource implements ConfigSource { 
                // should use the network security config.

                boolean usesCleartextTraffic =

                        (mApplicationInfo.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0

                        && mApplicationInfo.targetSandboxVersion < 2;

                        && !mApplicationInfo.isInstantApp();

                source = new DefaultConfigSource(usesCleartextTraffic, mApplicationInfo);

            }

            mConfigSource = source;

core/java/android/security/net/config/NetworkSecurityConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public final class NetworkSecurityConfig { 
                .addCertificatesEntryRef(

                        new CertificatesEntryRef(SystemCertificateSource.getInstance(), false));

        final boolean cleartextTrafficPermitted = info.targetSdkVersion < Build.VERSION_CODES.P

                && info.targetSandboxVersion < 2;

                && !info.isInstantApp();

        builder.setCleartextTrafficPermitted(cleartextTrafficPermitted);

        // Applications targeting N and above must opt in into trusting the user added certificate

        // store.

core/res/res/values/attrs_manifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,10 @@ 
    <!-- Specifies the target sandbox this app wants to use. Higher sandbox versions

         will have increasing levels of security.



         <p>The default value of this attribute is <code>1</code>. -->

         <p>The default value of this attribute is <code>1</code>.

         <p>

         @deprecated The security properties have been moved to

         {@link android.os.Build.VERSION Build.VERSION} 27 and 28. -->

    <attr name="targetSandboxVersion" format="integer" />



    <!-- The user-visible SDK version (ex. 26) of the framework against which the application was

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -6017,10 +6017,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }















            // We deprecated Build.SERIAL and it is not accessible to













            // apps that target the v2 security sandbox and to apps that













            // target APIs higher than O MR1. Since access to the serial













            // Instant Apps and target APIs higher than O MR1. Since access to the serial















            // is now behind a permission we push down the value.













            final String buildSerial = (appInfo.targetSandboxVersion < 2













            final String buildSerial = (!appInfo.isInstantApp()















                    && appInfo.targetSdkVersion < Build.VERSION_CODES.P)















                            ? sTheRealBuildSerial : Build.UNKNOWN;