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

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

Merge "Tweak the way to get the enabled component" into sc-v2-dev am: 21ac89fa 

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

Change-Id: Id4a9e15a146dfa7dd2fa8c9362b6a6270478fc68
parents 0bc6757b 21ac89fa

packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java

+4 −6
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settingslib.activityembedding; 




import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.ResolveInfo;





import com.android.settingslib.utils.BuildCompatUtils;

import com.android.settingslib.utils.BuildCompatUtils;
@@ -37,11 +36,10 @@ public class ActivityEmbeddingUtils { 
        if (BuildCompatUtils.isAtLeastS()) {

        if (BuildCompatUtils.isAtLeastS()) {

            final Intent intent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);

            final Intent intent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);

            intent.setPackage(PACKAGE_NAME_SETTINGS);

            intent.setPackage(PACKAGE_NAME_SETTINGS);

            final ResolveInfo resolveInfo =

            final boolean isEmbeddingActivityEnabled =

                    context.getPackageManager().resolveActivity(intent, 0 /* flags */);

                    intent.resolveActivity(context.getPackageManager()) != null;

            return resolveInfo != null



                    && resolveInfo.activityInfo != null

            return isEmbeddingActivityEnabled;

                    && resolveInfo.activityInfo.enabled;

        }

        }

        return false;

        return false;

    }

    }