Revert "CellBroadcast metrics improvement"
Revert "CellBroadcast metrics improvement"
Revert submission 19562831-cb_metrics_frameworks
Reason for revert: <Broken test : b/242821270>
Reverted Changes:
I4d99df44b:CellBroadcast metrics improvement
I60fe13b73:CellBroadcast metrics improvement
Change-Id: I1f3b08193d9e45941c602b018ed8df3cf870fdcf
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 4c8bb28..2d65e63 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -709,10 +709,6 @@
ProviderAcquisitionEventReported provider_acquisition_event_reported =
477 [(module) = "framework"];
BluetoothDeviceNameReported bluetooth_device_name_reported = 478 [(module) = "bluetooth"];
- CellBroadcastConfigUpdated cb_config_updated = 479 [(module) = "cellbroadcast"];
- CellBroadcastModuleError cb_module_error = 480 [(module) = "cellbroadcast"];
- CellBroadcastServiceFeature cb_service_feature= 481 [(module) = "cellbroadcast"];
- CellBroadcastReceiverFeature cb_receiver_feature= 482 [(module) = "cellbroadcast"];
VibrationReported vibration_reported = 487 [(module) = "framework"];
// reserved 492
DisplayBrightnessChanged display_brightness_changed = 494 [(module) = "framework"];
@@ -13736,7 +13732,7 @@
*
* Logged from Cell Broadcast module and platform:
* packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice/
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
+ * packages/apps/CellBroadcastReceiver/
* frameworks/opt/telephony/src/java/com/android/internal/telephony/CellBroadcastServiceManager.java
*/
message CellBroadcastMessageReported {
@@ -13758,60 +13754,31 @@
// GSM, CDMA, CDMA-SCP
optional CbType type = 1;
+
// The source of the report
optional ReportSource source = 2;
- // The Message Identifier, as defined in 3GPP 23.041 clause 9.4.1.2.1
- optional int32 serial_number = 3;
- // The Message Identifier, as defined in 3GPP 23.041 clause 9.4.1.2.2
- optional int32 message_id = 4;
}
/**
- * Logs when a cell broadcast message is filtered out,
- * or otherwise intentionally not sent to CBR, or not shown to users for reason
+ * Logs when a cell broadcast message is filtered out, or otherwise intentionally not sent to CBR.
*
- * Logged from Cell Broadcast module:
+ * Logged from CellBroadcastService module:
* packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice/
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
*/
message CellBroadcastMessageFiltered {
enum FilterReason {
- // shown message to the user
NOT_FILTERED = 0;
- // filtered message due to duplication (message body, service category, cross sim)
DUPLICATE_MESSAGE = 1;
- // filtered message due to outside of coordinate range
GEOFENCED_MESSAGE = 2;
- // filtered message due to not using for emergency alert but for update cell information on Setting Menu
AREA_INFO_MESSAGE = 3;
- // filtered message due to OEM set config value ‘filtered message for duplication’ as ‘true’
DISABLED_BY_OEM = 4;
- // when in ECBM(Emergency CallBack Mode) status
- NOTSHOW_ECBM = 5;
- // when user turn off preference of channel
- NOTSHOW_USER_PREF = 6;
- // when Empty content or Unsupported charset
- NOTSHOW_EMPTY_BODY = 7;
- // when language code in message is not same with preference of second language
- NOTSHOW_MISMATCH_PREF_SECOND_LANG = 8;
- // when user turn off preference of second language
- NOTSHOW_PREF_SECONDLANG_OFF = 9;
- // when language code in message is not same with device language setting
- NOTSHOW_MISMATCH_DEVICE_LANG_SETTING = 10;
- // when channel has feature ‘testing_mode = true’ and device is not in cb test_mode
- NOTSHOW_MESSAGE_FOR_TESTMODE = 11;
- // when the message contains ‘filter’ string from properties
- NOTSHOW_FILTER_STRING = 12;
}
// GSM, CDMA, CDMA-SCP
optional CellBroadcastMessageReported.CbType type = 1;
+
// The source of the report
optional FilterReason filter = 2;
- // The Message Identifier, as defined in 3GPP 23.041 clause 9.4.1.2.1
- optional int32 serial_number = 3;
- // The Message Identifier, as defined in 3GPP 23.041 clause 9.4.1.2.2
- optional int32 message_id = 4;
}
/**
@@ -13843,125 +13810,12 @@
// What kind of error occurred
optional ErrorType type = 1;
+
// Exception message (or log message) associated with the error (max 1000 chars)
optional string exception_message = 2;
}
/**
- * CellBroadcast channel range
- * Refer from CellBroadcastConfigUpdated, CellBroadcastReceiverFeature
- * Logged from Cell Broadcast module:
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
- */
-message CellBroadcastChannelRange {
- optional int32 start = 1;
- optional int32 end = 2;
-}
-/**
- * CellBroadcast channel ranges
- * Nested field for repeated
- * Logged from Cell Broadcast module:
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
- */
-message CellBroadcastChannelRanges {
- repeated CellBroadcastChannelRange channel_ranges = 1;
-}
-
-/**
- * Logs when an channel configuration is updated with mcc-mnc
- *
- * Logged from Cell Broadcast module:
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
- */
-message CellBroadcastConfigUpdated {
- // mcc_mnc value of Network operator for the roaming case
- optional string roaming_mcc_mnc = 1;
- // The channel ranges to be updated logged as bytes
- optional CellBroadcastChannelRanges channel_ranges = 2 [(log_mode) = MODE_BYTES];
-}
-
-/**
- * Logs when a cell broadcast message is activated with the feature below
- * or when channel configuration is changed with the feature below
- *
- * Logged from Cell Broadcast module:
- * packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice
- */
-message CellBroadcastServiceFeature {
- // Not for mainline devices, but for android-go devices, OEM can register package names.
- // if there is a data then true otherwise false
- optional bool overlay_additional_cbr_packages = 1;
- // package name which will get area info message
- // if there is a data except “com.android.settings” then true, or false
- optional bool overlay_area_info_packages = 2;
- // Reset Area Info when device goes out of service
- optional bool reset_area_info = 3;
-}
-
-/**
- * Logs when a cell broadcast message is activated with the feature below
- * or when channel configuration is changed with the feature below
- *
- * Logged from Cell Broadcast module:
- * packages/apps/CellBroadcastReceiver/src/com/android/cellbroadcastreceiver/
- */
-message CellBroadcastReceiverFeature {
- // Whether to enable alert handling during active voice call
- optional bool alert_during_call = 1;
- // Play alert sound in full volume regardless DND is on
- // [none:0][all:Integer.MAX_VALUE][partial:4370 4380 50]
- optional CellBroadcastChannelRanges override_dnd = 2 [(log_mode) = MODE_BYTES];
- // Whether to Support roaming for attached network operator
- optional bool roaming_support = 3;
- // Whether to save alerts to sms inbox database
- optional bool store_sms = 4;
- // whether the device is in test mode through *#*#CMAS#*#*
- optional bool testing_mode = 5;
- // whether Text To Speech is on/off
- optional bool tts_mode = 6;
- // whether the device is able to enter test mode even on user build
- optional bool testing_mode_on_user_build = 7;
-}
-
-/**
- * Logs when exception is occurred in the device
- *
- * Logged from Cell Broadcast module:
- * packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice/
- * packages/apps/CellBroadcastReceiver/
- */
-message CellBroadcastModuleError {
- enum ErrorType {
- ERROR_UNKNOWN = 0;
- ERROR_BAD_CONFIG = 1;
- ERROR_DB_MIGRATION = 2;
- ERROR_DEFAULT_RES = 3;
- ERROR_ENABLE_CHANNEL = 4;
- ERROR_GET_LOCATION = 5;
- ERROR_MISSING_RES = 6;
- ERROR_PLAY_FLASH = 7;
- ERROR_PLAY_SOUND = 8;
- ERROR_PLAY_TTS = 9;
- ERROR_PREF_MIGRATION = 10;
- ERROR_PROVIDER_INIT = 11;
- ERROR_RESET_CHANNEL_R = 12;
- ERROR_STATUS_BAR = 13;
- ERROR_REMINDER_INTERVAL = 14;
- ERROR_ICON_RESOURCE = 15;
- ERROR_CHANNEL_RANGE_PARSE = 16;
- ERROR_DB_INIT = 17;
- ERROR_NOT_FOUND_DEFAULT_CBR_PKGS = 18;
- ERROR_FOUND_MULTIPLE_CBR_PKGS = 19;
- }
-
- // The source of the report
- optional CellBroadcastMessageReported.ReportSource source = 1;
-
- // The error type
- optional ErrorType type = 2;
-}
-
-/**
* Logs when a TV Input Service Session changes tune state
* This is atom ID 327.
*
