summaryrefslogtreecommitdiff
path: root/core/java/android/os/UserManager.java
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2018-02-14 14:13:49 -0800
committerMakoto Onuki <omakoto@google.com>2018-02-15 00:47:35 +0000
commitacc50461bb7cec5012bb9c58acebeae9ad729232 (patch)
treeea48ac6f56a920b61f09be852a04e55868802f89 /core/java/android/os/UserManager.java
parentf93ae682e1c115216ed5de690039f797da918899 (diff)
[EBS] Don't disable location when DISALLOW_CONFIG_LOCATION is set
If *any* user has DISALLOW_CONFIG_LOCATION set, don't disable location on battery saver. Test: Manual test with TestDPC Test: atest $ANDROID_BUILD_TOP/cts/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java Bug: 73004763 Change-Id: Iea7ddf94703463f0f8f2a92a8e76845b986350c3
Diffstat (limited to 'core/java/android/os/UserManager.java')
-rw-r--r--core/java/android/os/UserManager.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 7e7af1a12299..185620066454 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -1678,6 +1678,18 @@ public class UserManager {
}
/**
+ * @hide
+ * Returns whether any user on the device has the given user restriction set.
+ */
+ public boolean hasUserRestrictionOnAnyUser(String restrictionKey) {
+ try {
+ return mService.hasUserRestrictionOnAnyUser(restrictionKey);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Return the serial number for a user. This is a device-unique
* number assigned to that user; if the user is deleted and then a new
* user created, the new users will not be given the same serial number.