309fc2d4a8
Added checking size excess in encodeUCS2() and an exception cause in EncodeException to distinguish between unencodable char and size excess. It will prevent wrong userData length and excessive userData issues during encoding userData. Please see below one issue scenario. stringToGsm7BitPackedWithHeader() throws an EncodeException when septeCount > 255. The EncodeException is caught and encoding again through encodeUCS2(). However, the length of encoded userData as UCS-2 is converted as Byte without checking size excess. Thus first byte of userData will be wrong and total userData will exceed maximum User Data. Test: Manual Change-Id: Ib6df5484072d77548e8adcbcbd15ad7a401c99f8 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
55 lines
1.3 KiB
Java
55 lines
1.3 KiB
Java
/*
|
|
* Copyright (C) 2006 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.internal.telephony;
|
|
|
|
import android.annotation.UnsupportedAppUsage;
|
|
|
|
/**
|
|
* {@hide}
|
|
*/
|
|
public class EncodeException extends Exception {
|
|
|
|
private int mError = ERROR_UNENCODABLE;
|
|
|
|
public static final int ERROR_UNENCODABLE = 0;
|
|
public static final int ERROR_EXCEED_SIZE = 1;
|
|
|
|
public EncodeException() {
|
|
super();
|
|
}
|
|
|
|
@UnsupportedAppUsage
|
|
public EncodeException(String s) {
|
|
super(s);
|
|
}
|
|
|
|
public EncodeException(String s, int error) {
|
|
super(s);
|
|
mError = error;
|
|
}
|
|
|
|
@UnsupportedAppUsage
|
|
public EncodeException(char c) {
|
|
super("Unencodable char: '" + c + "'");
|
|
}
|
|
|
|
public int getError() {
|
|
return mError;
|
|
}
|
|
}
|
|
|