PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce am: a428e704e0

Browse Source 
am: 6f1bc8a28e

* commit '6f1bc8a28ecf769fcc0208e5e5d13c32ebeac98a':
  Should forward the intent even if its activity is disabled in Settings

Change-Id: I08a99bd1b013174ef83fb109e1bc38fcf8ffc419
This commit is contained in:
Tony Mak
2016-05-05 14:02:03 +00:00
committed by android-build-merger
parent 6783190473 6f1bc8a28e
commit 0f197a1c24
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ManagedProfileSetup.java
View File

@@ -32,6 +32,7 @@ import java.util.List;
import static android.content.pm.PackageManager.GET_ACTIVITIES;
import static android.content.pm.PackageManager.GET_META_DATA;
import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;
import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
/**
* Listens to {@link Intent.ACTION_BOOT_COMPLETED} and {@link Intent.ACTION_PRE_BOOT_COMPLETED}
@@ -63,7 +64,7 @@ public class ManagedProfileSetup extends BroadcastReceiver {
// Resolves activities for the managed profile (which we're running as)
List<ResolveInfo> resolvedIntents = pm.queryIntentActivities(intent,
GET_ACTIVITIES | GET_META_DATA | GET_RESOLVED_FILTER);
GET_ACTIVITIES | GET_META_DATA | GET_RESOLVED_FILTER | MATCH_DISABLED_COMPONENTS);
final int count = resolvedIntents.size();
for (int i = 0; i < count; i++) {
ResolveInfo info = resolvedIntents.get(i);