diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-10-12 10:44:16 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2016-10-12 12:40:32 -0700 |
| commit | 931012409e6a8995f928d644787d588008757c7f (patch) | |
| tree | f56f30f8dd05afef35f66b1ba0d43abd7d2a1c96 /src | |
| parent | d4ed51f955ec1f577bb6f7e61dc2c56f41183ddf (diff) | |
| download | ContactsProvider-931012409e6a8995f928d644787d588008757c7f.tar.gz | |
Pass client package name to GAL providers
Test: Manually tested with a corp account and verified with the log
Bug 32072962
Change-Id: Ib7af131ff3bb9d6f5f373c604d8748bc38ed12ad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 583bedc6..02b6a2ee 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -5596,6 +5596,8 @@ public class ContactsProvider2 extends AbstractContactsProvider if (directoryInfo.accountType != null) { builder.appendQueryParameter(RawContacts.ACCOUNT_TYPE, directoryInfo.accountType); } + // Pass the caller package name. + builder.appendQueryParameter(Directory.CALLER_PACKAGE_PARAM_KEY, getCallingPackage()); String limit = getLimit(uri); if (limit != null) { @@ -5610,6 +5612,14 @@ public class ContactsProvider2 extends AbstractContactsProvider Cursor cursor; try { + if (VERBOSE_LOGGING) { + Log.v(TAG, "Making directory query: uri=" + directoryUri + + " projection=" + Arrays.toString(projection) + + " selection=[" + selection + "] args=" + Arrays.toString(selectionArgs) + + " order=[" + sortOrder + "]" + + " Caller=" + getCallingPackage() + + " User=" + UserUtils.getCurrentUserHandle(getContext())); + } cursor = getContext().getContentResolver().query( directoryUri, projection, selection, selectionArgs, sortOrder); if (cursor == null) { |