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

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

Browse Source 
* commit 'f0ac3a6b04cb23aa5b7e0c1e307e3dea7de6dcc9':
  Fix issue #10650718: Camera DOA on KLP
This commit is contained in:
Dianne Hackborn
2013-09-06 13:45:10 -07:00
committed by Android Git Automerger
parent dfd7e1d3e9 f0ac3a6b04
commit c268c442a1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/IAppOpsService.aidl
View File

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