Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
47fb5ee20c
@@ -26,6 +26,8 @@ import static android.Manifest.permission.SET_HARMFUL_APP_WARNINGS;
|
||||
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
|
||||
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;
|
||||
@@ -7150,6 +7152,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;
|
||||
|
||||
Reference in New Issue
Block a user