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

Commit 3c19f166 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by android-build-merger
Browse files

Merge "Check for component availability before all AppPrediction logic" into... 

Merge "Check for component availability before all AppPrediction logic" into qt-qpr1-dev am: ae4ab469
am: 40a6b47f

Change-Id: I0d767a124368b4bfae33f3dc1a41a2b8c2217ca4
parents cce8843d 40a6b47f

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

+3 −3
Original line number Diff line number Diff line
@@ -493,6 +493,9 @@ public class ChooserActivity extends ResolverActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        final long intentReceivedTime = System.currentTimeMillis();

        // This is the only place this value is being set. Effectively final.

        mIsAppPredictorComponentAvailable = isAppPredictionServiceAvailable();



        mIsSuccessfullySelected = false;

        Intent intent = getIntent();

        Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);
@@ -619,9 +622,6 @@ public class ChooserActivity extends ResolverActivity { 
                .addTaggedData(MetricsEvent.FIELD_SHARESHEET_MIMETYPE, target.getType())

                .addTaggedData(MetricsEvent.FIELD_TIME_TO_APP_TARGETS, systemCost));



        // This is the only place this value is being set. Effectively final.

        mIsAppPredictorComponentAvailable = isAppPredictionServiceAvailable();



        AppPredictor appPredictor = getAppPredictorForDirectShareIfEnabled();

        if (appPredictor != null) {

            mDirectShareAppTargetCache = new HashMap<>();