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

Should forward the intent even if its activity is disabled in Settings

Browse Source 
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.

Bug: 28426865

Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
This commit is contained in:
Tony Mak
2016-05-04 13:51:41 +01:00
parent d5b3a5d342
commit 82d9096796
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);