commit bfa146b6486c2ac93ded3adefeffdeb1afd254df
author Varun Shah <varunshah@google.com> Mon May 18 18:10:59 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 10 14:33:21 2020 +0000
tree c0f916b4f1d24e743b3bded3c48c2da853e9d7c0
parent 34cf812e21ffeca570a32d557822c29fc791c2f4

Fix writeable mode bug with CP2 contact photo.

Bug: 150857116
Test: atest ContactsProvider2Test
Test: atest android.permission.cts.ContactsProviderTest
Test: atest android.permission2.cts.ContactsProviderTest
Change-Id: I4d81971cb562b130d5edfdaa77444969fbf315af
(cherry picked from commit 1a449253b3f9c7c6fba3bd5c122a9659be7d5090)
(cherry picked from commit 1cc4a8a35bcba0056e788d24a9a87a56d0a8f57d)

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 4fc9bfc..3a0f7db 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -8639,7 +8639,7 @@
 
             case RAW_CONTACTS_ID_DISPLAY_PHOTO: {
                 long rawContactId = Long.parseLong(uri.getPathSegments().get(1));
-                boolean writeable = !mode.equals("r");
+                boolean writeable = mode.contains("w");
 
                 // Find the primary photo data record for this raw contact.
                 SQLiteQueryBuilder qb = new SQLiteQueryBuilder();