Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev

This commit is contained in:
TreeHugger Robot
2021-01-29 01:42:55 +00:00
committed by Android (Google) Code Review

View File

@@ -29,6 +29,8 @@ import static android.content.Intent.CATEGORY_DEFAULT;
import static android.content.Intent.CATEGORY_HOME;
import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;
import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
import static android.content.Intent.CATEGORY_BROWSABLE;
import static android.content.Intent.CATEGORY_DEFAULT;
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
@@ -7780,6 +7782,13 @@ public class PackageManagerService extends IPackageManager.Stub
Slog.i(TAG, " + always: " + info.activityInfo.packageName
+ " : linkgen=" + linkGeneration);
}
if (!intent.hasCategory(CATEGORY_BROWSABLE)
|| !intent.hasCategory(CATEGORY_DEFAULT)) {
undefinedList.add(info);
continue;
}
// Use link-enabled generation as preferredOrder, i.e.
// prefer newly-enabled over earlier-enabled.
info.preferredOrder = linkGeneration;