summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2014-07-28 14:03:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:36:21 +0000
commitea4f01070a9c8f5147eb228c413a84de78d98973 (patch)
tree4bd17f77bd7f4baa199d4f1f7a5e8eed58d0207a /core
parent14f2abff289e4a13d0a096cd73744c6366106f52 (diff)
parent401de1785eccc946ed6c35e9b7fccab92b2022af (diff)
downloadframeworks_base-ea4f01070a9c8f5147eb228c413a84de78d98973.zip
frameworks_base-ea4f01070a9c8f5147eb228c413a84de78d98973.tar.gz
frameworks_base-ea4f01070a9c8f5147eb228c413a84de78d98973.tar.bz2
Merge "Remove the profile/device owner user restriction bypass." into lmp-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/app/IAppOpsService.aidl2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl
index 9ff2cf4..a52dd48 100644
--- a/core/java/com/android/internal/app/IAppOpsService.aidl
+++ b/core/java/com/android/internal/app/IAppOpsService.aidl
@@ -40,8 +40,6 @@ interface IAppOpsService {
int checkAudioOperation(int code, int usage, int uid, String packageName);
void setAudioRestriction(int code, int usage, int uid, int mode, in String[] exceptionPackages);
- void setDeviceOwner(String packageName);
- void setProfileOwner(String packageName, int userHandle);
void setUserRestrictions(in Bundle restrictions, int userHandle);
void removeUser(int userHandle);