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

am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev

Browse Source 
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
This commit is contained in:
Nicolas Prevot
2015-01-14 13:38:21 +00:00
committed by Android Git Automerger
parent be61ffa4fe 42ebaa434f
commit 206d31f598
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -465,20 +465,20 @@ public class DevicePolicyManager {
= "android.app.action.SET_NEW_PASSWORD";
/**
* Flag used by {@link #addCrossProfileIntentFilter} to allow access
* <em>from</em> a managed profile <em>to</em> its parent. That is, any
* matching activities in the parent profile are included in the
* disambiguation list shown when an app in the managed profile calls
* {@link Activity#startActivity(Intent)}.
* Flag used by {@link #addCrossProfileIntentFilter} to allow activities in
* the parent profile to access intents sent from the managed profile.
* That is, when an app in the managed profile calls
* {@link Activity#startActivity(Intent)}, the intent can be resolved by a
* matching activity in the parent profile.
*/
public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 0x0001;
/**
* Flag used by {@link #addCrossProfileIntentFilter} to allow access
* <em>from</em> a parent <em>to</em> its managed profile. That is, any
* matching activities in the managed profile are included in the
* disambiguation list shown when an app in the parent profile calls
* {@link Activity#startActivity(Intent)}.
* Flag used by {@link #addCrossProfileIntentFilter} to allow activities in
* the managed profile to access intents sent from the parent profile.
* That is, when an app in the parent profile calls
* {@link Activity#startActivity(Intent)}, the intent can be resolved by a
* matching activity in the managed profile.
*/
public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 0x0002;