Merge branch 'release/8.13.27'

README.md

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'io.michaelrocks:libphonenumber-android:8.13.26'
+  implementation 'io.michaelrocks:libphonenumber-android:8.13.27'
 }
 ```
 
@@ -63,5 +63,5 @@ License
     limitations under the License.
 
  [1]: https://github.com/googlei18n/libphonenumber
- [2]: http://www.methodscount.com/?lib=com.googlecode.libphonenumber%3Alibphonenumber%3A8.13.26
+ [2]: http://www.methodscount.com/?lib=com.googlecode.libphonenumber%3Alibphonenumber%3A8.13.27
  [3]: http://blog.nimbledroid.com/2016/04/06/slow-ClassLoader.getResourceAsStream.html

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   group = 'io.michaelrocks'
-  version = '8.13.26'
+  version = '8.13.27'
 
   ext.projectCompileSdkVersion = 34
   ext.projectBuildToolsVersion = '34.0.0'

library/src/main/java/io/michaelrocks/libphonenumber/android/PhoneNumberUtil.java

@@ -1306,14 +1306,12 @@ private boolean hasValidCountryCallingCode(int countryCallingCode) {
    * @return  the formatted phone number
    */
   public String format(PhoneNumber number, PhoneNumberFormat numberFormat) {
-    if (number.getNationalNumber() == 0 && number.hasRawInput()) {
+    if (number.getNationalNumber() == 0) {
       // Unparseable numbers that kept their raw input just use that.
       // This is the only case where a number can be formatted as E164 without a
       // leading '+' symbol (but the original number wasn't parseable anyway).
-      // TODO: Consider removing the 'if' above so that unparseable
-      // strings without raw input format to the empty string instead of "+00".
       String rawInput = number.getRawInput();
-      if (rawInput.length() > 0) {
+      if (rawInput.length() > 0 || !number.hasCountryCode()) {
         return rawInput;
       }
     }