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

Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165 am: 0411d1d7e3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755478

Change-Id: I41f7155cfd2c29105b3b4719ba83712a07c1c6f0
This commit is contained in:
TreeHugger Robot
2020-06-05 16:27:07 +00:00
committed by Automerger Merge Worker
parent 12dd16a7f4 0411d1d7e3
commit f80d0e4835
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -793,7 +793,6 @@ public class ChooserActivity extends ResolverActivity implements
private AppPredictor.Callback createAppPredictorCallback( private AppPredictor.Callback createAppPredictorCallback(
ChooserListAdapter chooserListAdapter) { ChooserListAdapter chooserListAdapter) {
return resultList -> { return resultList -> {
//TODO(arangelov) Take care of edge case when callback called after swiping tabs
if (isFinishing() || isDestroyed()) { if (isFinishing() || isDestroyed()) {
return; return;
} }
@@ -802,8 +801,6 @@ public class ChooserActivity extends ResolverActivity implements
} }
if (resultList.isEmpty()) { if (resultList.isEmpty()) {
// APS may be disabled, so try querying targets ourselves. // APS may be disabled, so try querying targets ourselves.
//TODO(arangelov) queryDirectShareTargets indirectly uses mIntents.
// Investigate implications for work tab.
queryDirectShareTargets(chooserListAdapter, true); queryDirectShareTargets(chooserListAdapter, true);
return; return;
} }
@@ -1976,7 +1973,6 @@ public class ChooserActivity extends ResolverActivity implements
} }
} }
// Default to just querying ShortcutManager if AppPredictor not present. // Default to just querying ShortcutManager if AppPredictor not present.
//TODO(arangelov) we're using mIntents here, investicate possible implications on work tab
final IntentFilter filter = getTargetIntentFilter(); final IntentFilter filter = getTargetIntentFilter();
if (filter == null) { if (filter == null) {
return; return;

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

@@ -159,9 +159,6 @@ public class ResolverActivity extends Activity implements
protected static final String METRICS_CATEGORY_RESOLVER = "intent_resolver"; protected static final String METRICS_CATEGORY_RESOLVER = "intent_resolver";
protected static final String METRICS_CATEGORY_CHOOSER = "intent_chooser"; protected static final String METRICS_CATEGORY_CHOOSER = "intent_chooser";
/**
* TODO(arangelov): Remove a couple of weeks after work/personal tabs are finalized.
*/
@VisibleForTesting @VisibleForTesting
public static boolean ENABLE_TABBED_VIEW = true; public static boolean ENABLE_TABBED_VIEW = true;
private static final String TAB_TAG_PERSONAL = "personal"; private static final String TAB_TAG_PERSONAL = "personal";

1
core/java/com/android/internal/app/ResolverListAdapter.java
View File

@@ -423,7 +423,6 @@ public class ResolverListAdapter extends BaseAdapter {
// We assume that at this point we've already filtered out the only intent for a different // We assume that at this point we've already filtered out the only intent for a different
// targetUserId which we're going to use. // targetUserId which we're going to use.
private void addResolveInfo(DisplayResolveInfo dri) { private void addResolveInfo(DisplayResolveInfo dri) {
// TODO(arangelov): Is that UserHandle.USER_CURRENT check okay?
if (dri != null && dri.getResolveInfo() != null if (dri != null && dri.getResolveInfo() != null
&& dri.getResolveInfo().targetUserId == UserHandle.USER_CURRENT) { && dri.getResolveInfo().targetUserId == UserHandle.USER_CURRENT) {
if (shouldAddResolveInfo(dri)) { if (shouldAddResolveInfo(dri)) {