summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlberto97 <albertop2197@gmail.com>2017-08-02 11:26:14 +0200
committerGabriele M <moto.falcon.git@gmail.com>2017-08-02 16:51:57 +0000
commita7ff337980765c9f767fc90df852d503efb22078 (patch)
treee03243e106c39b6a320b5e67bb78640726c6bd39
parentf0fd78ee7c31a4b5bab0daf10dc6d28a72712272 (diff)
downloadandroid_packages_apps_Dialer-a7ff337980765c9f767fc90df852d503efb22078.tar.gz
android_packages_apps_Dialer-a7ff337980765c9f767fc90df852d503efb22078.tar.bz2
android_packages_apps_Dialer-a7ff337980765c9f767fc90df852d503efb22078.zip
Dialer: Provide upgrade path for removed lookup providers
REGRESSION-915 Change-Id: I06d6387043d356e901c500812d1948c8d43e232f
-rw-r--r--src/com/android/dialer/lookup/LookupSettings.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/dialer/lookup/LookupSettings.java b/src/com/android/dialer/lookup/LookupSettings.java
index 747583bfe..2da9dbde0 100644
--- a/src/com/android/dialer/lookup/LookupSettings.java
+++ b/src/com/android/dialer/lookup/LookupSettings.java
@@ -77,6 +77,12 @@ public final class LookupSettings {
String provider = getLookupProvider(context,
CMSettings.System.PEOPLE_LOOKUP_PROVIDER, PLP_DEFAULT);
+ if ("WhitePages".equals(provider)) {
+ CMSettings.System.putString(context.getContentResolver(),
+ CMSettings.System.PEOPLE_LOOKUP_PROVIDER, PLP_DEFAULT);
+ provider = PLP_DEFAULT;
+ }
+
return provider;
}
@@ -84,7 +90,8 @@ public final class LookupSettings {
String provider = getLookupProvider(context,
CMSettings.System.REVERSE_LOOKUP_PROVIDER, RLP_DEFAULT);
- if ("Google".equals(provider)) {
+ if ("Google".equals(provider) || "Gebeld".equals(provider) ||
+ "WhitePages".equals(provider) || "WhitePages_CA".equals(provider)) {
CMSettings.System.putString(context.getContentResolver(),
CMSettings.System.REVERSE_LOOKUP_PROVIDER, RLP_DEFAULT);
provider = RLP_DEFAULT;