Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c20544f1 authored by Roman Birg's avatar Roman Birg
Browse files

Telephony: remove libphonenumbergoogle dependency



This was breaking some apps which bundle libphonenumbergoogle.

Change-Id: Iaabb7463ff4dd91da9b310672d5d5dc1014a81f0
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent ebb11e80
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ LOCAL_SRC_FILES += $(call find-other-java-files,$(BOARD_RIL_CLASS))
endif

LOCAL_JAVA_LIBRARIES := voip-common
LOCAL_STATIC_JAVA_LIBRARIES := libphonenumbergoogle
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := telephony-common

+19 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.util.Patterns;

import com.android.internal.telephony.MSimConstants;
import com.android.internal.telephony.SmsApplication;
import com.google.i18n.phonenumbers.PhoneNumberUtil;


import java.util.ArrayList;
@@ -1165,12 +1164,29 @@ public final class Telephony {
                for (int i = 0; i < pduCount; i++) {
                    byte[] pdu = (byte[]) pdus[i];
                    msgs[i] = SmsMessage.createFromPdu(pdu, format);
                    String normalized = PhoneNumberUtil
                            .normalizeDigitsOnly(msgs[i].getOriginatingAddress());
                    String normalized = normalizeDigitsOnly(msgs[i].getOriginatingAddress());
                    addresses.add(normalized);
                }
                return addresses;
            }


            private static String normalizeDigitsOnly(String number) {
                return normalizeDigits(number, false /* strip non-digits */).toString();
            }

            private static StringBuilder normalizeDigits(String number, boolean keepNonDigits) {
                StringBuilder normalizedDigits = new StringBuilder(number.length());
                for (char c : number.toCharArray()) {
                    int digit = Character.digit(c, 10);
                    if (digit != -1) {
                        normalizedDigits.append(digit);
                    } else if (keepNonDigits) {
                        normalizedDigits.append(c);
                    }
                }
                return normalizedDigits;
            }
        }
    }

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import com.android.internal.telephony.PhoneBase;
import com.android.internal.util.HexDump;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
import com.google.i18n.phonenumbers.PhoneNumberUtil;

import java.io.ByteArrayOutputStream;
import java.util.ArrayList;