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

Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-18 09:26:37 +00:00
committed by Android (Google) Code Review
parent 1fc49dc617 6cfb7a9db1
commit 0b2941fb09
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -3557,6 +3557,7 @@ package android.os {
method public boolean isRestrictedProfile();
field public static final java.lang.String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";
field public static final deprecated java.lang.String DISALLOW_OEM_UNLOCK = "no_oem_unlock";
field public static final java.lang.String DISALLOW_RUN_IN_BACKGROUND = "no_run_in_background";
field public static final int RESTRICTION_NOT_SET = 0; // 0x0
field public static final int RESTRICTION_SOURCE_DEVICE_OWNER = 2; // 0x2
field public static final int RESTRICTION_SOURCE_PROFILE_OWNER = 4; // 0x4

1
core/java/android/os/UserManager.java
View File

@@ -791,6 +791,7 @@ public class UserManager {
* @see #getUserRestrictions()
* @hide
*/
@SystemApi
public static final String DISALLOW_RUN_IN_BACKGROUND = "no_run_in_background";
/**