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

Commit e467be5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "copy 'visbileToInstantApps' setting" into oc-dev

parents 77d23337 66b5c042

core/java/android/content/IntentFilter.java

+8 −5
Original line number Original line Diff line number Diff line
@@ -284,8 +284,8 @@ public class IntentFilter implements Parcelable { 




    private int mVerifyState;

    private int mVerifyState;





    /** Whether or not the intent filter is visible to ephemeral apps. */

    /** Whether or not the intent filter is visible to instant apps. */

    private boolean mVisibleToEphemeral;

    private boolean mVisibleToInstantApp;

    // These functions are the start of more optimized code for managing

    // These functions are the start of more optimized code for managing

    // the string sets...  not yet implemented.

    // the string sets...  not yet implemented.
@@ -452,6 +452,7 @@ public class IntentFilter implements Parcelable { 
        }

        }

        mHasPartialTypes = o.mHasPartialTypes;

        mHasPartialTypes = o.mHasPartialTypes;

        mVerifyState = o.mVerifyState;

        mVerifyState = o.mVerifyState;

        mVisibleToInstantApp = o.mVisibleToInstantApp;

    }

    }





    /**

    /**
@@ -654,12 +655,12 @@ public class IntentFilter implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    public void setVisibleToEphemeral(boolean visibleToEmphemeral) {

    public void setVisibleToInstantApp(boolean visibleToInstantApp) {

        mVisibleToEphemeral = visibleToEmphemeral;

        mVisibleToInstantApp = visibleToInstantApp;

    }

    }

    /** @hide */

    /** @hide */

    public boolean isVisibleToInstantApp() {

    public boolean isVisibleToInstantApp() {

        return mVisibleToEphemeral;

        return mVisibleToInstantApp;

    }

    }





    /**

    /**
@@ -1858,6 +1859,7 @@ public class IntentFilter implements Parcelable { 
        dest.writeInt(mPriority);

        dest.writeInt(mPriority);

        dest.writeInt(mHasPartialTypes ? 1 : 0);

        dest.writeInt(mHasPartialTypes ? 1 : 0);

        dest.writeInt(getAutoVerify() ? 1 : 0);

        dest.writeInt(getAutoVerify() ? 1 : 0);

        dest.writeInt(isVisibleToInstantApp() ? 1 : 0);

    }

    }





    /**

    /**
@@ -1926,6 +1928,7 @@ public class IntentFilter implements Parcelable { 
        mPriority = source.readInt();

        mPriority = source.readInt();

        mHasPartialTypes = source.readInt() > 0;

        mHasPartialTypes = source.readInt() > 0;

        setAutoVerify(source.readInt() > 0);

        setAutoVerify(source.readInt() > 0);

        setVisibleToInstantApp(source.readInt() > 0);

    }

    }





    private final boolean findMimeType(String type) {

    private final boolean findMimeType(String type) {

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -4258,7 +4258,7 @@ public class PackageParser { 
                    a.intents.add(intent);

                    a.intents.add(intent);

                }

                }

                // adjust activity flags when we implicitly expose it via a browsable filter

                // adjust activity flags when we implicitly expose it via a browsable filter

                intent.setVisibleToEphemeral(visibleToEphemeral || isWebBrowsableIntent(intent));

                intent.setVisibleToInstantApp(visibleToEphemeral || isWebBrowsableIntent(intent));

                if (intent.isVisibleToInstantApp()) {

                if (intent.isVisibleToInstantApp()) {

                    a.info.flags |= ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                    a.info.flags |= ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                }

                }
@@ -4291,7 +4291,7 @@ public class PackageParser { 
                    owner.preferredActivityFilters.add(intent);

                    owner.preferredActivityFilters.add(intent);

                }

                }

                // adjust activity flags when we implicitly expose it via a browsable filter

                // adjust activity flags when we implicitly expose it via a browsable filter

                intent.setVisibleToEphemeral(visibleToEphemeral || isWebBrowsableIntent(intent));

                intent.setVisibleToInstantApp(visibleToEphemeral || isWebBrowsableIntent(intent));

                if (intent.isVisibleToInstantApp()) {

                if (intent.isVisibleToInstantApp()) {

                    a.info.flags |= ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                    a.info.flags |= ActivityInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                }

                }
@@ -4307,12 +4307,12 @@ public class PackageParser { 
                    owner.visibleToInstantApps = true;

                    owner.visibleToInstantApps = true;

                    // cycle through any filters already seen

                    // cycle through any filters already seen

                    for (int i = a.intents.size() - 1; i >= 0; --i) {

                    for (int i = a.intents.size() - 1; i >= 0; --i) {

                        a.intents.get(i).setVisibleToEphemeral(true /*visibleToEmphemeral*/);

                        a.intents.get(i).setVisibleToInstantApp(true /*visibleToInstantApp*/);

                    }

                    }

                    if (owner.preferredActivityFilters != null) {

                    if (owner.preferredActivityFilters != null) {

                        for (int i = owner.preferredActivityFilters.size() - 1; i >= 0; --i) {

                        for (int i = owner.preferredActivityFilters.size() - 1; i >= 0; --i) {

                            owner.preferredActivityFilters.get(i)

                            owner.preferredActivityFilters.get(i)

                                    .setVisibleToEphemeral(true /*visibleToEmphemeral*/);

                                    .setVisibleToInstantApp(true /*visibleToInstantApp*/);

                        }

                        }

                    }

                    }

                }

                }
@@ -4618,7 +4618,7 @@ public class PackageParser { 
                            + mArchiveSourcePath + " "

                            + mArchiveSourcePath + " "

                            + parser.getPositionDescription());

                            + parser.getPositionDescription());

                } else {

                } else {

                    intent.setVisibleToEphemeral(

                    intent.setVisibleToInstantApp(

                            visibleToEphemeral || isWebBrowsableIntent(intent));

                            visibleToEphemeral || isWebBrowsableIntent(intent));

                    a.intents.add(intent);

                    a.intents.add(intent);

                }

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

                }

                outInfo.intents.add(intent);

                outInfo.intents.add(intent);

                // adjust provider flags when we implicitly expose it via a browsable filter

                // adjust provider flags when we implicitly expose it via a browsable filter

                intent.setVisibleToEphemeral(visibleToEphemeral || isWebBrowsableIntent(intent));

                intent.setVisibleToInstantApp(visibleToEphemeral || isWebBrowsableIntent(intent));

                if (intent.isVisibleToInstantApp()) {

                if (intent.isVisibleToInstantApp()) {

                    outInfo.info.flags |= ProviderInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                    outInfo.info.flags |= ProviderInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                }

                }
@@ -4838,7 +4838,7 @@ public class PackageParser { 
                    owner.visibleToInstantApps = true;

                    owner.visibleToInstantApps = true;

                    // cycle through any filters already seen

                    // cycle through any filters already seen

                    for (int i = outInfo.intents.size() - 1; i >= 0; --i) {

                    for (int i = outInfo.intents.size() - 1; i >= 0; --i) {

                        outInfo.intents.get(i).setVisibleToEphemeral(true /*visibleToEmphemeral*/);

                        outInfo.intents.get(i).setVisibleToInstantApp(true /*visibleToInstantApp*/);

                    }

                    }

                }

                }
@@ -5126,7 +5126,7 @@ public class PackageParser { 
                    return null;

                    return null;

                }

                }

                // adjust activity flags when we implicitly expose it via a browsable filter

                // adjust activity flags when we implicitly expose it via a browsable filter

                intent.setVisibleToEphemeral(visibleToEphemeral || isWebBrowsableIntent(intent));

                intent.setVisibleToInstantApp(visibleToEphemeral || isWebBrowsableIntent(intent));

                if (intent.isVisibleToInstantApp()) {

                if (intent.isVisibleToInstantApp()) {

                    s.info.flags |= ServiceInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                    s.info.flags |= ServiceInfo.FLAG_VISIBLE_TO_EPHEMERAL;

                }

                }
@@ -5143,7 +5143,7 @@ public class PackageParser { 
                    owner.visibleToInstantApps = true;

                    owner.visibleToInstantApps = true;

                    // cycle through any filters already seen

                    // cycle through any filters already seen

                    for (int i = s.intents.size() - 1; i >= 0; --i) {

                    for (int i = s.intents.size() - 1; i >= 0; --i) {

                        s.intents.get(i).setVisibleToEphemeral(true /*visibleToEmphemeral*/);

                        s.intents.get(i).setVisibleToInstantApp(true /*visibleToInstantApp*/);

                    }

                    }

                }

                }

            } else {

            } else {