From 58fb1caa4a4926bfcb2debd5957cb5cb45b4b59d Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 9 Dec 2021 13:32:36 +0800 Subject: [PATCH] Tweak the way to get the enabled component Prior to this cl, we only can get the default value set in the AndroidManifest.xml. It won't return the real enabled state after we modified the component state. Test: Install apk and see if the search highlight works. Bug: 204405245 Change-Id: I9bf0b178c591f2fbbbfc733bb2140a5725a07166 --- .../activityembedding/ActivityEmbeddingUtils.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java index 36c2bda8b03a3..7f17d26b156ae 100644 --- a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java +++ b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java @@ -18,7 +18,6 @@ package com.android.settingslib.activityembedding; import android.content.Context; import android.content.Intent; -import android.content.pm.ResolveInfo; import com.android.settingslib.utils.BuildCompatUtils; @@ -37,11 +36,10 @@ public class ActivityEmbeddingUtils { if (BuildCompatUtils.isAtLeastS()) { final Intent intent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY); intent.setPackage(PACKAGE_NAME_SETTINGS); - final ResolveInfo resolveInfo = - context.getPackageManager().resolveActivity(intent, 0 /* flags */); - return resolveInfo != null - && resolveInfo.activityInfo != null - && resolveInfo.activityInfo.enabled; + final boolean isEmbeddingActivityEnabled = + intent.resolveActivity(context.getPackageManager()) != null; + + return isEmbeddingActivityEnabled; } return false; }