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

Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545bd1 am: 74f7d0ffda

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: I5ba10976c1d66ab8404a4dfe60d018575e30d835
This commit is contained in:
Jack Yu
2020-06-04 01:03:51 +00:00
committed by Automerger Merge Worker
parent 2758dc9b50 74f7d0ffda
commit 41e385b90f
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/provider/Telephony.java
View File

@@ -4324,6 +4324,15 @@ public final class Telephony {
*/
public static final String ETWS_WARNING_TYPE = "etws_warning_type";
/**
* ETWS (Earthquake and Tsunami Warning System) primary message or not (ETWS alerts only).
* <p>See {@link android.telephony.SmsCbEtwsInfo}</p>
* <P>Type: BOOLEAN</P>
*
* @hide // TODO: Unhide this for S.
*/
public static final String ETWS_IS_PRIMARY = "etws_is_primary";
/**
* CMAS (Commercial Mobile Alert System) message class (CMAS alerts only).
* <p>See {@link android.telephony.SmsCbCmasInfo}</p>
@@ -4464,37 +4473,6 @@ public final class Telephony {
CMAS_URGENCY,
CMAS_CERTAINTY
};
/**
* Query columns for instantiating {@link android.telephony.SmsCbMessage} objects.
* @hide
*/
public static final String[] QUERY_COLUMNS_FWK = {
_ID,
SLOT_INDEX,
SUBSCRIPTION_ID,
GEOGRAPHICAL_SCOPE,
PLMN,
LAC,
CID,
SERIAL_NUMBER,
SERVICE_CATEGORY,
LANGUAGE_CODE,
MESSAGE_BODY,
MESSAGE_FORMAT,
MESSAGE_PRIORITY,
ETWS_WARNING_TYPE,
CMAS_MESSAGE_CLASS,
CMAS_CATEGORY,
CMAS_RESPONSE_TYPE,
CMAS_SEVERITY,
CMAS_URGENCY,
CMAS_CERTAINTY,
RECEIVED_TIME,
MESSAGE_BROADCASTED,
GEOMETRIES,
MAXIMUM_WAIT_TIME
};
}
/**

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

@@ -594,6 +594,7 @@ public final class SmsCbMessage implements Parcelable {
SmsCbEtwsInfo etwsInfo = getEtwsWarningInfo();
if (etwsInfo != null) {
cv.put(CellBroadcasts.ETWS_WARNING_TYPE, etwsInfo.getWarningType());
cv.put(CellBroadcasts.ETWS_IS_PRIMARY, etwsInfo.isPrimary());
}
SmsCbCmasInfo cmasInfo = getCmasWarningInfo();
@@ -667,9 +668,12 @@ public final class SmsCbMessage implements Parcelable {
SmsCbEtwsInfo etwsInfo;
int etwsWarningTypeColumn = cursor.getColumnIndex(CellBroadcasts.ETWS_WARNING_TYPE);
if (etwsWarningTypeColumn != -1 && !cursor.isNull(etwsWarningTypeColumn)) {
int etwsIsPrimaryColumn = cursor.getColumnIndex(CellBroadcasts.ETWS_IS_PRIMARY);
if (etwsWarningTypeColumn != -1 && !cursor.isNull(etwsWarningTypeColumn)
&& etwsIsPrimaryColumn != -1 && !cursor.isNull(etwsIsPrimaryColumn)) {
int warningType = cursor.getInt(etwsWarningTypeColumn);
etwsInfo = new SmsCbEtwsInfo(warningType, false, false, false, null);
boolean isPrimary = cursor.getInt(etwsIsPrimaryColumn) != 0;
etwsInfo = new SmsCbEtwsInfo(warningType, false, false, isPrimary, null);
} else {
etwsInfo = null;
}