Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032 am: fdb46441a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678

Change-Id: Ia11c47a85621497f49b8ffb0ffcfee3f078b6419
This commit is contained in:
TreeHugger Robot
2021-10-08 11:51:12 +00:00
committed by Automerger Merge Worker

View File

@@ -34,7 +34,6 @@ import android.content.pm.ShortcutManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -150,10 +149,6 @@ public class SettingsInitialize extends BroadcastReceiver {
} }
private void enableTwoPaneDeepLinkActivityIfNecessary(PackageManager pm, Intent intent) { private void enableTwoPaneDeepLinkActivityIfNecessary(PackageManager pm, Intent intent) {
if (!TextUtils.equals(intent.getAction(), Intent.ACTION_PRE_BOOT_COMPLETED)) {
return;
}
final ComponentName deepLinkHome = new ComponentName(Utils.SETTINGS_PACKAGE_NAME, final ComponentName deepLinkHome = new ComponentName(Utils.SETTINGS_PACKAGE_NAME,
SettingsHomepageActivity.ALIAS_DEEP_LINK); SettingsHomepageActivity.ALIAS_DEEP_LINK);
final int enableState = SplitController.getInstance().isSplitSupported() final int enableState = SplitController.getInstance().isSplitSupported()