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

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

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

Change-Id: Id4a9e15a146dfa7dd2fa8c9362b6a6270478fc68
This commit is contained in:
TreeHugger Robot
2021-12-09 22:10:31 +00:00
committed by Automerger Merge Worker
parent 0bc6757b9b 21ac89fa4c
commit 1c87a2e720
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}