Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes unused mAwaitingDelegateResponse

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

Change-Id: I11025165dae1e855781b5a59c46e0ffa3d768cfd
This commit is contained in:
Mark Renouf
2022-03-09 10:39:45 -05:00
parent 3782660d73
commit 871b78954a
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1160,9 +1160,7 @@ public class ChooserActivity extends ResolverActivity implements
-1);
// Action bar is user-independent, always start as primary
safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());
if (!mAwaitingDelegateResponse) {
finish();
}
finish();
}
);
b.setId(R.id.chooser_nearby_button);
@@ -1184,9 +1182,7 @@ public class ChooserActivity extends ResolverActivity implements
-1);
// Action bar is user-independent, always start as primary
safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());
if (!mAwaitingDelegateResponse) {
finish();
}
finish();
}
);
b.setId(R.id.chooser_edit_button);
@@ -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();
}
finish();
return;
}
}

16
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -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,9 +682,7 @@ public class ResolverActivity extends Activity implements
mProfileSwitchMessage = null;
onTargetSelected(dri, false);
if (!mAwaitingDelegateResponse) {
finish();
}
finish();
}
/**
@@ -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,9 +1141,7 @@ 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();
}
finish();
}
}
@@ -2365,9 +2361,7 @@ public class ResolverActivity extends Activity implements
.getItem(selections[0].getIndex());
if (ra.onTargetSelected(ti, false)) {
ra.mPickOptionRequest = null;
if (!ra.mAwaitingDelegateResponse) {
ra.finish();
}
ra.finish();
}
}
}