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

Commit 871b7895 authored by Mark Renouf's avatar Mark Renouf
Browse files

Removes unused mAwaitingDelegateResponse 

These are leftovers from the 'springboard' approach in ChooserActivity
and ResolverActivity.

Change-Id: I11025165dae1e855781b5a59c46e0ffa3d768cfd
parent 3782660d

core/java/com/android/internal/app/ChooserActivity.java

+3 −9
Original line number Diff line number Diff line
@@ -1160,10 +1160,8 @@ public class ChooserActivity extends ResolverActivity implements 
                            -1);

                    // Action bar is user-independent, always start as primary

                    safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());

                    if (!mAwaitingDelegateResponse) {

                    finish();

                }

                }

        );

        b.setId(R.id.chooser_nearby_button);

        return b;
@@ -1184,10 +1182,8 @@ public class ChooserActivity extends ResolverActivity implements 
                            -1);

                    // Action bar is user-independent, always start as primary

                    safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());

                    if (!mAwaitingDelegateResponse) {

                    finish();

                }

                }

        );

        b.setId(R.id.chooser_edit_button);

        return b;
@@ -2233,9 +2229,7 @@ public class ChooserActivity extends ResolverActivity implements 
            TargetInfo clonedTarget = selectedTarget.cloneFilledIn(matchingIntent, 0);

            if (super.onTargetSelected(clonedTarget, false)) {

                updateModelAndChooserCounts(clonedTarget);

                if (!mAwaitingDelegateResponse) {

                finish();

                }

                return;

            }

        }

core/java/com/android/internal/app/ResolverActivity.java

+5 −11
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public class ResolverActivity extends Activity implements 


    private UserHandle mWorkProfileUserHandle;



    protected boolean mAwaitingDelegateResponse;





    /**

     * Get the string resource to be used as a label for the link to the resolver activity for an
@@ -682,10 +682,8 @@ public class ResolverActivity extends Activity implements 
        mProfileSwitchMessage = null;



        onTargetSelected(dri, false);

        if (!mAwaitingDelegateResponse) {

        finish();

    }

    }



    /**

     * Numerous layouts are supported, each with optional ViewGroups.
@@ -974,7 +972,7 @@ public class ResolverActivity extends Activity implements 
        }

        final Intent intent = getIntent();

        if ((intent.getFlags() & FLAG_ACTIVITY_NEW_TASK) != 0 && !isVoiceInteraction()

                && !mResolvingHome && !mRetainInOnStop && !mAwaitingDelegateResponse) {

                && !mResolvingHome && !mRetainInOnStop) {

            // This resolver is in the unusual situation where it has been

            // launched at the top of a new task.  We don't let it be added

            // to the recent tasks shown to the user, and we need to make sure
@@ -1143,11 +1141,9 @@ public class ResolverActivity extends Activity implements 
                    mMultiProfilePagerAdapter.getActiveListAdapter().hasFilteredItem()

                            ? MetricsProto.MetricsEvent.ACTION_HIDE_APP_DISAMBIG_APP_FEATURED

                            : MetricsProto.MetricsEvent.ACTION_HIDE_APP_DISAMBIG_NONE_FEATURED);

            if (!mAwaitingDelegateResponse) {

            finish();

        }

    }

    }



    private String getWorkProfileNotSupportedMsg(String launcherName) {

        return getSystemService(DevicePolicyManager.class).getString(
@@ -2365,13 +2361,11 @@ public class ResolverActivity extends Activity implements 
                        .getItem(selections[0].getIndex());

                if (ra.onTargetSelected(ti, false)) {

                    ra.mPickOptionRequest = null;

                    if (!ra.mAwaitingDelegateResponse) {

                    ra.finish();

                }

            }

        }

    }

    }



    protected void maybeLogProfileChange() {}

}