From a0076bf76b31e8864494b02a755110a40181977d Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Mon, 15 Sep 2014 10:45:20 -0700 Subject: Remove CallerInfoCache update broadcast intent Bug: 17499855 Change-Id: I3d7cacf1418d3df21da3abcb7d69bb5441633640 --- src/com/android/contacts/ContactSaveService.java | 7 --- .../contacts/util/CallerInfoCacheUtils.java | 52 ---------------------- 2 files changed, 59 deletions(-) delete mode 100644 src/com/android/contacts/util/CallerInfoCacheUtils.java diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java index cc687ecb9..bb0370567 100644 --- a/src/com/android/contacts/ContactSaveService.java +++ b/src/com/android/contacts/ContactSaveService.java @@ -53,7 +53,6 @@ import com.android.contacts.common.model.RawContactDelta; import com.android.contacts.common.model.RawContactDeltaList; import com.android.contacts.common.model.RawContactModifier; import com.android.contacts.common.model.account.AccountWithDataSet; -import com.android.contacts.util.CallerInfoCacheUtils; import com.android.contacts.util.ContactPhotoUtils; import com.google.common.collect.Lists; @@ -188,10 +187,8 @@ public class ContactSaveService extends IntentService { String action = intent.getAction(); if (ACTION_NEW_RAW_CONTACT.equals(action)) { createRawContact(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } else if (ACTION_SAVE_CONTACT.equals(action)) { saveContact(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } else if (ACTION_CREATE_GROUP.equals(action)) { createGroup(intent); } else if (ACTION_RENAME_GROUP.equals(action)) { @@ -208,16 +205,12 @@ public class ContactSaveService extends IntentService { clearPrimary(intent); } else if (ACTION_DELETE_CONTACT.equals(action)) { deleteContact(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } else if (ACTION_JOIN_CONTACTS.equals(action)) { joinContacts(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } else if (ACTION_SET_SEND_TO_VOICEMAIL.equals(action)) { setSendToVoicemail(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } else if (ACTION_SET_RINGTONE.equals(action)) { setRingtone(intent); - CallerInfoCacheUtils.sendUpdateCallerInfoCacheIntent(this); } } diff --git a/src/com/android/contacts/util/CallerInfoCacheUtils.java b/src/com/android/contacts/util/CallerInfoCacheUtils.java deleted file mode 100644 index 9e53159d6..000000000 --- a/src/com/android/contacts/util/CallerInfoCacheUtils.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.contacts.util; - -import android.content.Context; -import android.content.Intent; - -/** - * Utilities for managing CallerInfoCache. - * - * The cache lives in Phone package and is used as fallback storage when database lookup is slower - * than expected. It remembers some information necessary for responding to incoming calls - * (e.g. custom ringtone settings, send-to-voicemail). - * - * Even though the cache will be updated periodically, Contacts app can request the cache update - * via broadcast Intent. This class provides that mechanism, and possibly other misc utilities - * for the update mechanism. - */ -public final class CallerInfoCacheUtils { - private static final String UPDATE_CALLER_INFO_CACHE = - "com.android.phone.UPDATE_CALLER_INFO_CACHE"; - - private CallerInfoCacheUtils() { - } - - /** - * Sends an Intent, notifying CallerInfo cache should be updated. - * - * Note: CallerInfo is *not* part of public API, and no guarantee is available around its - * specific behavior. In practice this will only be used by Phone package, but may change - * in the future. - * - * See also CallerInfoCache in Phone package for more information. - */ - public static void sendUpdateCallerInfoCacheIntent(Context context) { - context.sendBroadcast(new Intent(UPDATE_CALLER_INFO_CACHE)); - } -} \ No newline at end of file -- cgit v1.2.3 From 019f6a1623713b9be85ef1a3f3ca60f0a84267e8 Mon Sep 17 00:00:00 2001 From: Paul Soulos Date: Fri, 12 Sep 2014 10:45:43 -0700 Subject: Fixes photo authority issues in Contacts bug: 17462942 Change-Id: Ie67a2a3643cddff7fe83f1a5571ef027617cfa74 --- res/values/strings.xml | 3 +++ src/com/android/contacts/util/ContactPhotoUtils.java | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d3940763..6a903eca5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -722,4 +722,7 @@ You: %s + + com.android.contacts.files + diff --git a/src/com/android/contacts/util/ContactPhotoUtils.java b/src/com/android/contacts/util/ContactPhotoUtils.java index 2b1c19a28..3f79da5b7 100644 --- a/src/com/android/contacts/util/ContactPhotoUtils.java +++ b/src/com/android/contacts/util/ContactPhotoUtils.java @@ -28,6 +28,7 @@ import android.provider.MediaStore; import android.support.v4.content.FileProvider; import android.util.Log; +import com.android.contacts.R; import com.google.common.io.Closeables; import java.io.ByteArrayOutputStream; @@ -49,8 +50,6 @@ public class ContactPhotoUtils { private static final String PHOTO_DATE_FORMAT = "'IMG'_yyyyMMdd_HHmmss"; - public static final String FILE_PROVIDER_AUTHORITY = "com.android.contacts.files"; - /** * Generate a new, unique file to be used as an out-of-band communication * channel, since hi-res Bitmaps are too big to serialize into a Bundle. @@ -58,12 +57,16 @@ public class ContactPhotoUtils { * cropper/etc.), and read by us once they are finished writing it. */ public static Uri generateTempImageUri(Context context) { - return FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, + final String fileProviderAuthority = context.getResources().getString( + R.string.photo_file_provider_authority); + return FileProvider.getUriForFile(context, fileProviderAuthority, new File(pathForTempPhoto(context, generateTempPhotoFileName()))); } public static Uri generateTempCroppedImageUri(Context context) { - return FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, + final String fileProviderAuthority = context.getResources().getString( + R.string.photo_file_provider_authority); + return FileProvider.getUriForFile(context, fileProviderAuthority, new File(pathForTempPhoto(context, generateTempCroppedPhotoFileName()))); } -- cgit v1.2.3