diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-09-06 09:53:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-06 09:53:04 -0700 |
| commit | a53fb42f31e509ed175cbbc5a7474502f8a205b6 (patch) | |
| tree | f813a9cf11585eaa652253bd11e7fde373bb82e3 /packages/SettingsProvider | |
| parent | 010bbf42ffe2bb03d615e7169fbbf7008d62a811 (diff) | |
| parent | 775bdbdb11ad790f45ee66e8fdf8dca3fcba969a (diff) | |
| download | frameworks_base-a53fb42f31e509ed175cbbc5a7474502f8a205b6.zip frameworks_base-a53fb42f31e509ed175cbbc5a7474502f8a205b6.tar.gz frameworks_base-a53fb42f31e509ed175cbbc5a7474502f8a205b6.tar.bz2 | |
am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev
* commit '775bdbdb11ad790f45ee66e8fdf8dca3fcba969a':
Provide calling package to ContentProviders.
Separate root and document management.
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index a5dab33..bc02b0d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -567,8 +567,7 @@ public class SettingsProvider extends ContentProvider { * Fast path that avoids the use of chatty remoted Cursors. */ @Override - public Bundle callFromPackage(String callingPackage, String method, String request, - Bundle args) { + public Bundle call(String method, String request, Bundle args) { int callingUser = UserHandle.getCallingUserId(); if (args != null) { int reqUser = args.getInt(Settings.CALL_METHOD_USER_KEY, callingUser); @@ -623,7 +622,7 @@ public class SettingsProvider extends ContentProvider { // Also need to take care of app op. if (getAppOpsManager().noteOp(AppOpsManager.OP_WRITE_SETTINGS, Binder.getCallingUid(), - callingPackage) != AppOpsManager.MODE_ALLOWED) { + getCallingPackage()) != AppOpsManager.MODE_ALLOWED) { return null; } |