Make change and version bump to r_aml_300800200 for mainline module file:... (9bd7a75e) · Commits · e / os / android_frameworks_base

apex/extservices/apex_manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.extservices",
		"version": 300000000
		"version": 300800200
		}

apex/permission/apex_manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.permission",
		"version": 300000000
		"version": 300800200
		}

apex/permission/service/java/com/android/permission/persistence/IoUtils.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.annotation.NonNull;

		/**
		* Utility class for IO.
		*
		* @hide
		*/
		public class IoUtils {

apex/statsd/apex_manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.os.statsd",
		"version": 300000000
		"version": 300800200
		}

cmds/statsd/src/atoms.proto

+93 −1

Original line number	Diff line number	Diff line
		@@ -444,6 +444,11 @@ message Atom {
		TvTunerStateChanged tv_tuner_state_changed = 276 [(module) = "framework"];
		MediaOutputOpSwitchReported mediaoutput_op_switch_reported =
		277 [(module) = "settings"];
		CellBroadcastMessageFiltered cb_message_filtered =
		278 [(module) = "cellbroadcast"];
		TvTunerDvrStatus tv_tuner_dvr_status = 279 [(module) = "framework"];
		TvCasSessionOpenStatus tv_cas_session_open_status =
		280 [(module) = "framework"];

		// StatsdStats tracks platform atoms with ids upto 500.
		// Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.
		@@ -9134,8 +9139,10 @@ message IntegrityRulesPushed {
		/**
		* Logs when a cell broadcast message is received on the device.
		*
		* Logged from CellBroadcastService module:
		* Logged from Cell Broadcast module and platform:
		* packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice/
		* packages/apps/CellBroadcastReceiver/
		* frameworks/opt/telephony/src/java/com/android/internal/telephony/CellBroadcastServiceManager.java
		*/
		message CellBroadcastMessageReported {
		// The type of Cell Broadcast message
		@@ -9146,8 +9153,40 @@ message CellBroadcastMessageReported {
		CDMA_SPC = 3;
		}

		// The parts of the cell broadcast message pipeline
		enum ReportSource {
		UNKNOWN_SOURCE = 0;
		FRAMEWORK = 1;
		CB_SERVICE = 2;
		CB_RECEIVER_APP = 3;
		}

		// GSM, CDMA, CDMA-SCP
		optional CbType type = 1;

		// The source of the report
		optional ReportSource source = 2;
		}

		/**
		* Logs when a cell broadcast message is filtered out, or otherwise intentionally not sent to CBR.
		*
		* Logged from CellBroadcastService module:
		* packages/modules/CellBroadcastService/src/com/android/cellbroadcastservice/
		*/
		message CellBroadcastMessageFiltered {
		enum FilterReason {
		NOT_FILTERED = 0;
		DUPLICATE_MESSAGE = 1;
		GEOFENCED_MESSAGE = 2;
		AREA_INFO_MESSAGE = 3;
		}

		// GSM, CDMA, CDMA-SCP
		optional CellBroadcastMessageReported.CbType type = 1;

		// The source of the report
		optional FilterReason filter = 2;
		}

		/**
		@@ -9174,6 +9213,7 @@ message CellBroadcastMessageError {
		UNEXPECTED_GSM_MESSAGE_TYPE_FROM_FWK = 12;
		UNEXPECTED_CDMA_MESSAGE_TYPE_FROM_FWK = 13;
		UNEXPECTED_CDMA_SCP_MESSAGE_TYPE_FROM_FWK = 14;
		NO_CONNECTION_TO_CB_SERVICE = 15;
		}

		// What kind of error occurred
		@@ -9205,6 +9245,58 @@ message TvTunerStateChanged {
		// new state
		optional State state = 2;
		}

		/**
		* Logs the status of a dvr playback or record.
		* This is atom ID 279.
		*
		* Logged from:
		* frameworks/base/media/java/android/media/tv/tuner/dvr
		*/
		message TvTunerDvrStatus {
		enum Type {
		UNKNOWN_TYPE = 0;
		PLAYBACK = 1; // is a playback
		RECORD = 2; // is a record
		}
		enum State {
		UNKNOWN_STATE = 0;
		STARTED = 1; // DVR is started
		STOPPED = 2; // DVR is stopped
		}
		// The uid of the application that sent this custom atom.
		optional int32 uid = 1 [(is_uid) = true];
		// DVR type
		optional Type type = 2;
		// DVR state
		optional State state = 3;
		// Identify the segment of a record or playback
		optional int32 segment_id = 4;
		// indicate how many overflow or underflow happened between started to stopped
		optional int32 overflow_underflow_count = 5;
		}

		/**
		* Logs when a cas session opened through MediaCas.
		* This is atom ID 280.
		*
		* Logged from:
		* frameworks/base/media/java/android/media/MediaCas.java
		*/
		message TvCasSessionOpenStatus {
		enum State {
		UNKNOWN = 0;
		SUCCEEDED = 1; // indicate that the session is opened successfully.
		FAILED = 2; // indicate that the session isn’t opened successfully.
		}
		// The uid of the application that sent this custom atom.
		optional int32 uid = 1 [(is_uid) = true];
		// Cas system Id
		optional int32 cas_system_id = 2;
		// State of the session
		optional State state = 3;
		}

		/**
		* Logs when an app is frozen or unfrozen.
		*