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

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

Merge "Rename visibleToEphemeral to visibleToInstantApps"

parents 705eedcb 699c7710

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToEphemeral = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToEphemeral = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToEphemeral = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

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

+7 −7
Original line number Diff line number Diff line
@@ -3940,10 +3940,10 @@ public class PackageParser { 
        }



        final boolean hasVisibleToEphemeral =

                sa.hasValue(R.styleable.AndroidManifestActivity_visibleToEphemeral);

                sa.hasValue(R.styleable.AndroidManifestActivity_visibleToInstantApps);

        final boolean isEphemeral = ((flags & PARSE_IS_EPHEMERAL) != 0);

        final boolean visibleToEphemeral = isEphemeral

                || sa.getBoolean(R.styleable.AndroidManifestActivity_visibleToEphemeral, false);

                || sa.getBoolean(R.styleable.AndroidManifestActivity_visibleToInstantApps, false);

        if (visibleToEphemeral) {

            a.info.flags |= ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL;

        }
@@ -4264,7 +4264,7 @@ public class PackageParser { 
            }

        }



        // TODO add visibleToInstantApp attribute to activity alias

        // TODO add visibleToInstantApps attribute to activity alias

        final boolean isEphemeral = ((flags & PARSE_IS_EPHEMERAL) != 0);

        final boolean visibleToEphemeral = isEphemeral

                || ((a.info.flags & ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL) != 0);
@@ -4440,10 +4440,10 @@ public class PackageParser { 
        }



        final boolean hasVisibleToEphemeral =

                sa.hasValue(R.styleable.AndroidManifestProvider_visibleToEphemeral);

                sa.hasValue(R.styleable.AndroidManifestProvider_visibleToInstantApps);

        final boolean isEphemeral = ((flags & PARSE_IS_EPHEMERAL) != 0);

        final boolean visibleToEphemeral = isEphemeral

                || sa.getBoolean(R.styleable.AndroidManifestProvider_visibleToEphemeral, false);

                || sa.getBoolean(R.styleable.AndroidManifestProvider_visibleToInstantApps, false);

        if (visibleToEphemeral) {

            p.info.flags |= ProviderInfo.FLAG_VISIBLE_TO_EPHEMERAL;

        }
@@ -4751,10 +4751,10 @@ public class PackageParser { 
        }



        final boolean hasVisibleToEphemeral =

                sa.hasValue(R.styleable.AndroidManifestService_visibleToEphemeral);

                sa.hasValue(R.styleable.AndroidManifestService_visibleToInstantApps);

        final boolean isEphemeral = ((flags & PARSE_IS_EPHEMERAL) != 0);

        final boolean visibleToEphemeral = isEphemeral

                || sa.getBoolean(R.styleable.AndroidManifestService_visibleToEphemeral, false);

                || sa.getBoolean(R.styleable.AndroidManifestService_visibleToInstantApps, false);

        if (visibleToEphemeral) {

            s.info.flags |= ServiceInfo.FLAG_VISIBLE_TO_EPHEMERAL;

        }

core/res/res/values/attrs_manifest.xml

+5 −5
Original line number Diff line number Diff line
@@ -1233,9 +1233,9 @@ 
         -->

    <attr name="autoVerify" format="boolean" />



    <!-- Specify whether a component should be visible to ephemeral apps.

    <!-- Specify whether a component should be visible to instant apps.

         -->

    <attr name="visibleToEphemeral" format="boolean" />

    <attr name="visibleToInstantApps" format="boolean" />



    <!-- An XML resource with the application's Network Security Config. -->

    <attr name="networkSecurityConfig" format="reference" />
@@ -1783,7 +1783,7 @@ 
        <attr name="exported" />

        <attr name="singleUser" />

        <attr name="directBootAware" />

        <attr name="visibleToEphemeral" />

        <attr name="visibleToInstantApps" />

    </declare-styleable>



    <!-- Attributes that can be supplied in an AndroidManifest.xml
@@ -1873,7 +1873,7 @@ 
             client to bind to the service as if it were running it its own package.  The service

             must also be {@link android.R.attr#exported} if this flag is set. -->

        <attr name="externalService" format="boolean" />

        <attr name="visibleToEphemeral" />

        <attr name="visibleToInstantApps" />

    </declare-styleable>



    <!-- The <code>receiver</code> tag declares an
@@ -1996,7 +1996,7 @@ 
             This attribute is ignored if the activity isn't a launcher. -->

        <attr name="onTopLauncher" format="boolean" />

        <attr name="rotationAnimation" />

        <attr name="visibleToEphemeral" />

        <attr name="visibleToInstantApps" />

    </declare-styleable>



    <!-- The <code>activity-alias</code> tag declares a new