Merge "ErrorProne: AlmostJavadoc" (7997535a) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ android_app {
		errorprone: {
		javacflags: [
		// "-Xep:AndroidFrameworkRequiresPermission:ERROR",
		"-Xep:AlmostJavadoc:ERROR",
		],
		},
		min_sdk_version: "Tiramisu",

+2 −2

Original line number	Diff line number	Diff line
		@@ -164,9 +164,9 @@ public final class HeadsetClientHalConstants {
		static final int CHLD_FEAT_HOLD_ACC = 0x00000008;
		// 2x Request private mode with specified call (put the rest on hold)
		static final int CHLD_FEAT_PRIV_X = 0x00000010;
		// 3 Add held call to multiparty */
		// 3 Add held call to multiparty
		static final int CHLD_FEAT_MERGE = 0x00000020;
		// 4 Connect two calls and leave (disconnect from) multiparty */
		// 4 Connect two calls and leave (disconnect from) multiparty
		static final int CHLD_FEAT_MERGE_DETACH = 0x00000040;

		// AT Commands

+8 −11

Original line number	Diff line number	Diff line
		@@ -56,20 +56,17 @@ public class BluetoothMapSmsPdu {
		*/
		private static final int MESSAGE_TYPE_DELIVER = 0x01;

		/* We need to handle the SC-address mentioned in errata 4335.
		/**
		* We need to handle the SC-address mentioned in errata 4335.
		* Since the definition could be read in three different ways, I have asked
		* the car working group for clarification, and are awaiting confirmation that
		* this clarification will go into the MAP spec:
		* "The native format should be <sc_addr><tpdu> where <sc_addr> is <length><ton><1..10 octet
		* of address>
		* coded according to 24.011. The IEI is not to be used, as the fixed order of the data
		* makes a type 4 LV
		* information element sufficient. <length> is a single octet which value is the length of
		* the value-field
		* in octets including both the <ton> and the <address>."
		* */


		* The native format should be <sc_addr><tpdu> where <sc_addr> is <length><ton><1..10 octet
		* of address> coded according to 24.011. The IEI is not to be used, as the fixed order of
		* the data makes a type 4 LV information element sufficient. <length> is a single octet
		* which value is the length of the value-field in octets including both the <ton> and the
		* <address>.
		*/
		public static class SmsPdu {
		private byte[] mData;
		private byte[] mScAddress = {0};

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class BmessageParser {

		private static final int CRLF_LEN = 2;

		/*
		/**
		* length of "container" for 'message' in bmessage-body-content:
		* BEGIN:MSG<CRLF> + <CRLF> + END:MSG<CRFL>
		*/