diff options
author | Makoto Onuki <omakoto@google.com> | 2015-05-12 15:58:37 -0700 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2015-05-15 10:38:08 -0700 |
commit | 400e50c1efeb601f6162bd829fdf33e9dc5252f6 (patch) | |
tree | 2811fa8fe6a24bff6b62ba04ea757be9ecb6b976 /tests | |
parent | 61ec18168fea70e5c10a28776fd5b9257d9961bc (diff) | |
download | packages_providers_ContactsProvider-400e50c1efeb601f6162bd829fdf33e9dc5252f6.zip packages_providers_ContactsProvider-400e50c1efeb601f6162bd829fdf33e9dc5252f6.tar.gz packages_providers_ContactsProvider-400e50c1efeb601f6162bd829fdf33e9dc5252f6.tar.bz2 |
Clean up permissions
- All permission checks now always pass if the caller is self.
- Remove uses-permissions that're enforced by self.
Bug 20927020
Change-Id: I985338495ed947d317f37e1a8d674a40c5e6bfe4
Diffstat (limited to 'tests')
-rw-r--r-- | tests/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | tests/src/com/android/providers/contacts/ContactsActor.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 91fceae..e08429a 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -18,8 +18,6 @@ package="com.android.providers.contacts.tests" android:sharedUserId="android.uid.shared"> - <uses-permission android:name="android.permission.READ_CONTACTS" /> - <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java index bad7d5d..3ff4086 100644 --- a/tests/src/com/android/providers/contacts/ContactsActor.java +++ b/tests/src/com/android/providers/contacts/ContactsActor.java @@ -65,6 +65,7 @@ import android.test.mock.MockContentResolver; import android.test.mock.MockContext; import android.util.Log; +import com.android.providers.contacts.util.ContactsPermissions; import com.android.providers.contacts.util.MockSharedPreferences; import com.google.android.collect.Sets; @@ -263,6 +264,10 @@ public class ContactsActor { */ public ContactsActor(final Context overallContext, String packageName, Class<? extends ContentProvider> providerClass, String authority) throws Exception { + + // Force permission check even when called by self. + ContactsPermissions.ALLOW_SELF_CALL = false; + resolver = new MockContentResolver(); context = new RestrictionMockContext(overallContext, packageName, resolver, mGrantedPermissions, mGrantedUriPermissions); |