Merge "Cleanup the null checks added in ag/30408877" into main
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index 3507937..1f6c671 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -87,16 +87,10 @@
mCurrentHomeIntent = createHomeIntent();
mMyHomeIntent = new Intent(mCurrentHomeIntent).setPackage(mContext.getPackageName());
ResolveInfo info = context.getPackageManager().resolveActivity(mMyHomeIntent, 0);
- ActivityInfo myHomeActivityInfo = info == null ? null : info.activityInfo;
- int myHomeConfigChanges = myHomeActivityInfo == null ? 0 : myHomeActivityInfo.configChanges;
ComponentName myHomeComponent =
- myHomeActivityInfo == null
- ? mMyHomeIntent.resolveActivity(context.getPackageManager())
- : new ComponentName(context.getPackageName(), myHomeActivityInfo.name);
- if (myHomeComponent != null) {
- mMyHomeIntent.setComponent(myHomeComponent);
- mConfigChangesMap.append(myHomeComponent.hashCode(), myHomeConfigChanges);
- }
+ new ComponentName(context.getPackageName(), info.activityInfo.name);
+ mMyHomeIntent.setComponent(myHomeComponent);
+ mConfigChangesMap.append(myHomeComponent.hashCode(), info.activityInfo.configChanges);
mSetupWizardPkg = context.getString(R.string.setup_wizard_pkg);
ComponentName fallbackComponent = new ComponentName(mContext, RecentsActivity.class);