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

Commit a19bea8b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d81 

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

Change-Id: I05037ee2090fe5a68818d6d53d4c4dac3b114537
parents cc8325d3 6d410d81

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

+0 −4
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ public class ChooserActivity extends ResolverActivity implements 
    private AppPredictor.Callback createAppPredictorCallback(

            ChooserListAdapter chooserListAdapter) {

        return resultList -> {

            //TODO(arangelov) Take care of edge case when callback called after swiping tabs

            if (isFinishing() || isDestroyed()) {

                return;

            }
@@ -802,8 +801,6 @@ public class ChooserActivity extends ResolverActivity implements 
            }

            if (resultList.isEmpty()) {

                // APS may be disabled, so try querying targets ourselves.

                //TODO(arangelov) queryDirectShareTargets indirectly uses mIntents.

                // Investigate implications for work tab.

                queryDirectShareTargets(chooserListAdapter, true);

                return;

            }
@@ -1976,7 +1973,6 @@ public class ChooserActivity extends ResolverActivity implements 
            }

        }

        // 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();

        if (filter == null) {

            return;

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

+0 −3
Original line number Diff line number Diff line
@@ -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_CHOOSER = "intent_chooser";



    /**

     * TODO(arangelov): Remove a couple of weeks after work/personal tabs are finalized.

     */

    @VisibleForTesting

    public static boolean ENABLE_TABBED_VIEW = true;

    private static final String TAB_TAG_PERSONAL = "personal";

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

+0 −1
Original line number Diff line number Diff line
@@ -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

    // targetUserId which we're going to use.

    private void addResolveInfo(DisplayResolveInfo dri) {

        // TODO(arangelov): Is that UserHandle.USER_CURRENT check okay?

        if (dri != null && dri.getResolveInfo() != null

                && dri.getResolveInfo().targetUserId == UserHandle.USER_CURRENT) {

            if (shouldAddResolveInfo(dri)) {