From cdcfaa80b243c42b97013de883a566a9dc629641 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Wed, 27 Nov 2024 15:36:37 -0800 Subject: [PATCH] Cleanup the null checks added in ag/30408877 These checks should be safe, but could be hiding other issues. They were originally added as a workaround for presubmit failures only on mokey_go32 (32 bit Android Go). Bug: NA Flag: EXEMPT cleanup Test: Manual and existing presubmit tests Change-Id: Ifcd136f61c885dba316e492a2408b67b42dcffcf --- .../android/quickstep/OverviewComponentObserver.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index 350793748c..1f6c6717d1 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -87,16 +87,10 @@ public final class OverviewComponentObserver { 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);