1 files changed, 36 insertions, 4 deletions
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
index 966ed39a..5ac36b4e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonemetadata.java
@@ -113,7 +113,9 @@ public final class Phonemetadata {
       return leadingDigitsPattern_;
     }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); }
+    @Deprecated
+    public int leadingDigitsPatternSize() { return getLeadingDigitsPatternCount(); }
+    public int getLeadingDigitsPatternCount() { return leadingDigitsPattern_.size(); }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
     public String getLeadingDigitsPattern(int index) {
       return leadingDigitsPattern_.get(index);
@@ -384,6 +386,16 @@ public final class Phonemetadata {
       public PhoneMetadata build() {
         return this;
       }
+
+      public Builder setId(String value) {
+        super.setId(value);
+        return this;
+      }
+
+      public Builder setInternationalPrefix(String value) {
+        super.setInternationalPrefix(value);
+        return this;
+      }
     }
     public static Builder newBuilder() {
       return new Builder();
@@ -395,6 +407,12 @@ public final class Phonemetadata {
     public boolean hasGeneralDesc() { return hasGeneralDesc; }
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
     public PhoneNumberDesc getGeneralDesc() { return generalDesc_; }
+    public PhoneNumberDesc getGeneralDescBuilder() {
+      if (generalDesc_ == null) {
+        generalDesc_ = new PhoneNumberDesc();
+      }
+      return generalDesc_ ;
+    }
     public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) {
       if (value == null) {
         throw new NullPointerException();
@@ -761,10 +779,16 @@ public final class Phonemetadata {
     // repeated NumberFormat number_format = 19;
     private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>();
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
+    @Deprecated
     public java.util.List<NumberFormat> numberFormats() {
+      return getNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getNumberFormatList() {
       return numberFormat_;
     }
-    public int numberFormatSize() { return numberFormat_.size(); }
+    @Deprecated
+    public int numberFormatSize() { return getNumberFormatCount(); }
+    public int getNumberFormatCount() { return numberFormat_.size(); }
     public NumberFormat getNumberFormat(int index) {
       return numberFormat_.get(index);
     }
@@ -780,10 +804,16 @@ public final class Phonemetadata {
     private java.util.List<NumberFormat> intlNumberFormat_ =
         new java.util.ArrayList<NumberFormat>();
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
+    @Deprecated
     public java.util.List<NumberFormat> intlNumberFormats() {
+      return getIntlNumberFormatList();
+    }
+    public java.util.List<NumberFormat> getIntlNumberFormatList() {
       return intlNumberFormat_;
     }
-    public int intlNumberFormatSize() { return intlNumberFormat_.size(); }
+    @Deprecated
+    public int intlNumberFormatSize() { return getIntlNumberFormatCount(); }
+    public int getIntlNumberFormatCount() { return intlNumberFormat_.size(); }
     public NumberFormat getIntlNumberFormat(int index) {
       return intlNumberFormat_.get(index);
     }
@@ -850,7 +880,9 @@ public final class Phonemetadata {
     private boolean hasMobileNumberPortableRegion;
     private boolean mobileNumberPortableRegion_ = false;
     public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; }
-    public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
+    @Deprecated
+    public boolean isMobileNumberPortableRegion() { return getMobileNumberPortableRegion(); }
+    public boolean getMobileNumberPortableRegion() { return mobileNumberPortableRegion_; }
     public PhoneMetadata setMobileNumberPortableRegion(boolean value) {
       hasMobileNumberPortableRegion = true;
       mobileNumberPortableRegion_ = value;