Merge "Remove identifier that causes warnings under OpenJDK 8 compiler" (9615a578) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ public class EncodedStringValue implements Cloneable {
		}
		try {
		return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);
		} catch (UnsupportedEncodingException _) {
		} catch (UnsupportedEncodingException e2) {
		return new String(mData); // system default encoding.
		}
		}
		@@ -216,7 +216,7 @@ public class EncodedStringValue implements Cloneable {
		try {
		ret[i] = new EncodedStringValue(mCharacterSet,
		temp[i].getBytes());
		} catch (NullPointerException _) {
		} catch (NullPointerException e) {
		// Can't arrive here
		return null;
		}