Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose SmsCbLocation and SmsCbMessage constructors

Browse Source 
Bug: 135956699
Test: manual
Change-Id: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
This commit is contained in:
Jordan Liu
2019-11-06 12:48:51 -08:00
parent 77e3859ab9
commit 0d76fbd0d9
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -8371,7 +8371,7 @@ package android.telephony {
}
public final class SmsCbMessage implements android.os.Parcelable {
ctor public SmsCbMessage(int, int, int, @NonNull android.telephony.SmsCbLocation, int, @Nullable String, @Nullable String, int, @Nullable android.telephony.SmsCbEtwsInfo, @Nullable android.telephony.SmsCbCmasInfo, int);
ctor public SmsCbMessage(int, int, int, @NonNull android.telephony.SmsCbLocation, int, @Nullable String, @Nullable String, int, @Nullable android.telephony.SmsCbEtwsInfo, @Nullable android.telephony.SmsCbCmasInfo, int, @Nullable java.util.List<android.telephony.CbGeoUtils.Geometry>, long, int);
method @NonNull public static android.telephony.SmsCbMessage createFromCursor(@NonNull android.database.Cursor);
method public int describeContents();
method @Nullable public android.telephony.SmsCbCmasInfo getCmasWarningInfo();
@@ -8398,6 +8398,7 @@ package android.telephony {
field public static final int GEOGRAPHICAL_SCOPE_CELL_WIDE_IMMEDIATE = 0; // 0x0
field public static final int GEOGRAPHICAL_SCOPE_LOCATION_AREA_WIDE = 2; // 0x2
field public static final int GEOGRAPHICAL_SCOPE_PLMN_WIDE = 1; // 0x1
field public static final int MAXIMUM_WAIT_TIME_NOT_SET = 255; // 0xff
field public static final int MESSAGE_FORMAT_3GPP = 1; // 0x1
field public static final int MESSAGE_FORMAT_3GPP2 = 2; // 0x2
field public static final int MESSAGE_PRIORITY_EMERGENCY = 3; // 0x3

4
telephony/java/android/telephony/SmsCbLocation.java
View File

@@ -65,6 +65,10 @@ public final class SmsCbLocation implements Parcelable {
/**
* Construct a location object for the PLMN, LAC, and Cell ID. This class is immutable, so
* the same object can be reused for multiple broadcasts.
*
* @param plmn the MCC/MNC of the network
* @param lac the GSM location area code, or UMTS service area code
* @param cid the GSM or UMTS cell ID
*/
public SmsCbLocation(@NonNull String plmn, int lac, int cid) {
mPlmn = plmn;

17
telephony/java/android/telephony/SmsCbMessage.java
View File

@@ -138,8 +138,8 @@ public final class SmsCbMessage implements Parcelable {
public @interface MessagePriority {}
/**
* ATIS-0700041 Section 5.2.8 WAC Geo-Fencing Maximum Wait Time Table 12.
* @hide
* Integer indicating that the maximum wait time is not set.
* Based on ATIS-0700041 Section 5.2.8 WAC Geo-Fencing Maximum Wait Time Table 12.
*/
public static final int MAXIMUM_WAIT_TIME_NOT_SET = 255;
@@ -209,6 +209,7 @@ public final class SmsCbMessage implements Parcelable {
/**
* Create a new SmsCbMessage with the specified data.
* @hide
*/
public SmsCbMessage(int messageFormat, int geographicalScope, int serialNumber,
@NonNull SmsCbLocation location, int serviceCategory, @Nullable String language,
@@ -221,14 +222,14 @@ public final class SmsCbMessage implements Parcelable {
}
/**
* Create a new {@link SmsCbMessage} with the warning area coordinates information.
* @hide
* Create a new {@link SmsCbMessage} with the specified data, including warning area
* coordinates information.
*/
public SmsCbMessage(int messageFormat, int geographicalScope, int serialNumber,
SmsCbLocation location, int serviceCategory, String language, String body,
int priority, SmsCbEtwsInfo etwsWarningInfo, SmsCbCmasInfo cmasWarningInfo,
int maximumWaitTimeSec, List<Geometry> geometries, long receivedTimeMillis,
int slotIndex) {
@NonNull SmsCbLocation location, int serviceCategory, @Nullable String language,
@Nullable String body, int priority, @Nullable SmsCbEtwsInfo etwsWarningInfo,
@Nullable SmsCbCmasInfo cmasWarningInfo, int maximumWaitTimeSec,
@Nullable List<Geometry> geometries, long receivedTimeMillis, int slotIndex) {
mMessageFormat = messageFormat;
mGeographicalScope = geographicalScope;
mSerialNumber = serialNumber;