Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdcfaa80 authored by Andy Wickham's avatar Andy Wickham
Browse files

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
parent 2ae01adf

quickstep/src/com/android/quickstep/OverviewComponentObserver.java

+3 −9
Original line number Diff line number Diff line
@@ -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) {

                new ComponentName(context.getPackageName(), info.activityInfo.name);

        mMyHomeIntent.setComponent(myHomeComponent);

            mConfigChangesMap.append(myHomeComponent.hashCode(), myHomeConfigChanges);

        }

        mConfigChangesMap.append(myHomeComponent.hashCode(), info.activityInfo.configChanges);

        mSetupWizardPkg = context.getString(R.string.setup_wizard_pkg);



        ComponentName fallbackComponent = new ComponentName(mContext, RecentsActivity.class);