Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev

This commit is contained in:
Dianne Hackborn
2013-09-06 20:42:29 +00:00
committed by Android (Google) Code Review

View File

@@ -23,7 +23,6 @@ interface IAppOpsService {
// These first methods are also called by native code, so must
// be kept in sync with frameworks/native/include/binder/IAppOpsService.h
int checkOperation(int code, int uid, String packageName);
int checkPackage(int uid, String packageName);
int noteOperation(int code, int uid, String packageName);
int startOperation(IBinder token, int code, int uid, String packageName);
void finishOperation(IBinder token, int code, int uid, String packageName);
@@ -32,6 +31,7 @@ interface IAppOpsService {
IBinder getToken(IBinder clientToken);
// Remaining methods are only used in Java.
int checkPackage(int uid, String packageName);
List<AppOpsManager.PackageOps> getPackagesForOps(in int[] ops);
List<AppOpsManager.PackageOps> getOpsForPackage(int uid, String packageName, in int[] ops);
void setMode(int code, int uid, String packageName, int mode);