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

Commit efa735c3 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Remove identifier that causes warnings under OpenJDK 8 compiler" 

am: 9615a578

* commit '9615a578':
  Remove identifier that causes warnings under OpenJDK 8 compiler
parents 8dc729a5 9615a578

src/java/com/google/android/mms/pdu/EncodedStringValue.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ public class EncodedStringValue implements Cloneable { 
            	}

            	}

            	try {

            	try {

                    return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);

                    return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);

                } catch (UnsupportedEncodingException _) {

                } catch (UnsupportedEncodingException e2) {

                    return new String(mData); // system default encoding.

                    return new String(mData); // system default encoding.

                }

                }

            }

            }
@@ -216,7 +216,7 @@ public class EncodedStringValue implements Cloneable { 
            try {

            try {

                ret[i] = new EncodedStringValue(mCharacterSet,

                ret[i] = new EncodedStringValue(mCharacterSet,

                        temp[i].getBytes());

                        temp[i].getBytes());

            } catch (NullPointerException _) {

            } catch (NullPointerException e) {

                // Can't arrive here

                // Can't arrive here

                return null;

                return null;

            }

            }