From b8e87a2b63147b1dbafa16f892c1ee6cbf482ae3 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 17 Aug 2017 11:16:39 -0700 Subject: Compile out geo location library for Dialer Go. This will reduce apk size ~1.5MB and memory use ~3MB. This will cause incall ui not showing geo location information for numbers not in contact. Location information in call log is not affected. Bug: 64398241,64394643 Test: manual PiperOrigin-RevId: 165602483 Change-Id: Iccace5b4eb3c3bcef971b1b63f21761ad19a92b1 --- .../binary/aosp/AospDialerRootComponent.java | 2 + .../basecomponent/BaseDialerRootComponent.java | 2 + .../google/GoogleStubDialerRootComponent.java | 2 + .../phonenumbergeoutil/PhoneNumberGeoUtil.java | 24 +++++++ .../PhoneNumberGeoUtilComponent.java | 39 +++++++++++ .../impl/PhoneNumberGeoUtilImpl.java | 76 ++++++++++++++++++++++ .../impl/PhoneNumberGeoUtilModule.java | 31 +++++++++ .../stub/PhoneNumberGeoUtilStub.java | 32 +++++++++ .../stub/StubPhoneNumberGeoUtilModule.java | 30 +++++++++ .../dialer/phonenumberutil/PhoneNumberHelper.java | 44 ++----------- 10 files changed, 242 insertions(+), 40 deletions(-) create mode 100644 java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java create mode 100644 java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java create mode 100644 java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java create mode 100644 java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java create mode 100644 java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java create mode 100644 java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java index c4adb37ef..50db7f751 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -23,6 +23,7 @@ import com.android.dialer.configprovider.SharedPrefConfigProviderModule; import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule; import com.android.dialer.inject.ContextModule; import com.android.dialer.lightbringer.stub.StubLightbringerModule; +import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.storage.StorageModule; import com.android.incallui.calllocation.stub.StubCallLocationModule; @@ -38,6 +39,7 @@ import javax.inject.Singleton; CallLogModule.class, ContextModule.class, DialerExecutorModule.class, + PhoneNumberGeoUtilModule.class, SharedPrefConfigProviderModule.class, SimulatorModule.class, StorageModule.class, diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java index 1349564c8..30b1e8a15 100644 --- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java +++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java @@ -23,6 +23,7 @@ import com.android.dialer.configprovider.ConfigProviderComponent; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.lightbringer.LightbringerComponent; import com.android.dialer.main.MainComponent; +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.storage.StorageComponent; import com.android.incallui.calllocation.CallLocationComponent; @@ -42,6 +43,7 @@ public interface BaseDialerRootComponent MainComponent.HasComponent, EnrichedCallComponent.HasComponent, MapsComponent.HasComponent, + PhoneNumberGeoUtilComponent.HasComponent, SimulatorComponent.HasComponent, StorageComponent.HasComponent, VoicemailComponent.HasComponent, diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index 570b5695c..cf513777c 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -23,6 +23,7 @@ import com.android.dialer.configprovider.SharedPrefConfigProviderModule; import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule; import com.android.dialer.inject.ContextModule; import com.android.dialer.lightbringer.stub.StubLightbringerModule; +import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.storage.StorageModule; import com.android.incallui.calllocation.impl.CallLocationModule; @@ -42,6 +43,7 @@ import javax.inject.Singleton; CallLogModule.class, ContextModule.class, DialerExecutorModule.class, + PhoneNumberGeoUtilModule.class, SharedPrefConfigProviderModule.class, SimulatorModule.class, StorageModule.class, diff --git a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java new file mode 100644 index 000000000..2005abc68 --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil; + +import android.content.Context; + +/** Interface for getting geo information for phone number. */ +public interface PhoneNumberGeoUtil { + String getGeoDescription(Context context, String number); +} diff --git a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java new file mode 100644 index 000000000..a49005ea0 --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil; + +import android.content.Context; +import com.android.dialer.inject.HasRootComponent; +import dagger.Subcomponent; + +/** Dagger component for phone number geo util. */ +@Subcomponent +public abstract class PhoneNumberGeoUtilComponent { + + public abstract PhoneNumberGeoUtil getPhoneNumberGeoUtil(); + + public static PhoneNumberGeoUtilComponent get(Context context) { + return ((PhoneNumberGeoUtilComponent.HasComponent) + ((HasRootComponent) context.getApplicationContext()).component()) + .phoneNumberGeoUtilComponent(); + } + + /** Used to refer to the root application component. */ + public interface HasComponent { + PhoneNumberGeoUtilComponent phoneNumberGeoUtilComponent(); + } +} diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java new file mode 100644 index 000000000..86736b0a4 --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil.impl; + +import android.content.Context; +import android.text.TextUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; +import com.google.i18n.phonenumbers.NumberParseException; +import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.Phonenumber; +import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; +import java.util.Locale; +import javax.inject.Inject; + +/** Implementation of {@link PhoneNumberGeoUtil}. */ +public class PhoneNumberGeoUtilImpl implements PhoneNumberGeoUtil { + + @Inject + public PhoneNumberGeoUtilImpl() {} + + @Override + public String getGeoDescription(Context context, String number) { + LogUtil.v("PhoneNumberGeoUtilImpl.getGeoDescription", "" + LogUtil.sanitizePii(number)); + + if (TextUtils.isEmpty(number)) { + return null; + } + + PhoneNumberUtil util = PhoneNumberUtil.getInstance(); + PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance(); + + Locale locale = context.getResources().getConfiguration().getLocales().get(0); + String countryIso = PhoneNumberHelper.getCurrentCountryIso(context, locale); + Phonenumber.PhoneNumber pn = null; + try { + LogUtil.v( + "PhoneNumberGeoUtilImpl.getGeoDescription", + "parsing '" + LogUtil.sanitizePii(number) + "' for countryIso '" + countryIso + "'..."); + pn = util.parse(number, countryIso); + LogUtil.v( + "PhoneNumberGeoUtilImpl.getGeoDescription", + "- parsed number: " + LogUtil.sanitizePii(pn)); + } catch (NumberParseException e) { + LogUtil.e( + "PhoneNumberGeoUtilImpl.getGeoDescription", + "getGeoDescription: NumberParseException for incoming number '" + + LogUtil.sanitizePii(number) + + "'"); + } + + if (pn != null) { + String description = geocoder.getDescriptionForNumber(pn, locale); + LogUtil.v( + "PhoneNumberGeoUtilImpl.getGeoDescription", "- got description: '" + description + "'"); + return description; + } + + return null; + } +} diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java new file mode 100644 index 000000000..3878ac508 --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil.impl; + +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; +import dagger.Binds; +import dagger.Module; +import javax.inject.Singleton; + +/** Module which binds {@link PhoneNumberGeoUtilImpl}. */ +@Module +public abstract class PhoneNumberGeoUtilModule { + + @Binds + @Singleton + public abstract PhoneNumberGeoUtil bindPhoneNumberGeoUtil(PhoneNumberGeoUtilImpl impl); +} diff --git a/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java new file mode 100644 index 000000000..4c5b3b0b3 --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil.stub; + +import android.content.Context; +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; +import javax.inject.Inject; + +/** Stub implementation of {@link PhoneNumberGeoUtil}. */ +public final class PhoneNumberGeoUtilStub implements PhoneNumberGeoUtil { + @Inject + public PhoneNumberGeoUtilStub() {} + + @Override + public String getGeoDescription(Context context, String number) { + return null; + } +} diff --git a/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java new file mode 100644 index 000000000..82252cc2f --- /dev/null +++ b/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2017 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.dialer.phonenumbergeoutil.stub; + +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; +import dagger.Binds; +import dagger.Module; +import javax.inject.Singleton; + +/** Module which binds {@link PhoneNumberGeoUtilStub}. */ +@Module +public abstract class StubPhoneNumberGeoUtilModule { + @Binds + @Singleton + public abstract PhoneNumberGeoUtil bindPhoneNumberGeoUtil(PhoneNumberGeoUtilStub stub); +} diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java index cc4ec2da8..1189a9b24 100644 --- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java +++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java @@ -24,11 +24,8 @@ import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.TextUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent; import com.android.dialer.telecom.TelecomUtil; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber; -import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; import java.util.Arrays; import java.util.HashSet; import java.util.Locale; @@ -96,43 +93,11 @@ public class PhoneNumberHelper { /** * @return a geographical description string for the specified number. - * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder */ public static String getGeoDescription(Context context, String number) { - LogUtil.v("PhoneNumberHelper.getGeoDescription", "" + LogUtil.sanitizePii(number)); - - if (TextUtils.isEmpty(number)) { - return null; - } - - PhoneNumberUtil util = PhoneNumberUtil.getInstance(); - PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance(); - - Locale locale = context.getResources().getConfiguration().locale; - String countryIso = getCurrentCountryIso(context, locale); - Phonenumber.PhoneNumber pn = null; - try { - LogUtil.v( - "PhoneNumberHelper.getGeoDescription", - "parsing '" + LogUtil.sanitizePii(number) + "' for countryIso '" + countryIso + "'..."); - pn = util.parse(number, countryIso); - LogUtil.v( - "PhoneNumberHelper.getGeoDescription", "- parsed number: " + LogUtil.sanitizePii(pn)); - } catch (NumberParseException e) { - LogUtil.e( - "PhoneNumberHelper.getGeoDescription", - "getGeoDescription: NumberParseException for incoming number '" - + LogUtil.sanitizePii(number) - + "'"); - } - - if (pn != null) { - String description = geocoder.getDescriptionForNumber(pn, locale); - LogUtil.v("PhoneNumberHelper.getGeoDescription", "- got description: '" + description + "'"); - return description; - } - - return null; + return PhoneNumberGeoUtilComponent.get(context) + .getPhoneNumberGeoUtil() + .getGeoDescription(context, number); } /** @@ -211,7 +176,6 @@ public class PhoneNumberHelper { return number.substring(0, delimiterIndex); } - private static boolean isVerizon(Context context) { // Verizon MCC/MNC codes copied from com/android/voicemailomtp/res/xml/vvm_config.xml. // TODO(sail): Need a better way to do per carrier and per OEM configurations. -- cgit v1.2.3