Merge "Support getVersion() of satellite access config" into main (f4f49361) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/SatelliteConfig.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,17 @@ public class SatelliteConfig {
		return null;
		}

		/**
		* Get the version of satellite config data
		*
		* @return version corresponding version number of satellite config data.
		*/
		@NonNull
		public int getSatelliteConfigDataVersion() {
		Log.d(TAG, "getSatelliteConfigDataVersion: mVersion: " + mVersion);
		return mVersion;
		}

		/**
		* @param context the Context
		* @param byteArrayFile byte array type of protobuffer config data

+17 −0

Original line number	Diff line number	Diff line
		@@ -362,4 +362,21 @@ public class SatelliteConfigParserTest extends TelephonyTest {
		}
		}
		}

		@Test
		public void testGetSatelliteConfigVersion() {
		SatelliteConfigParser satelliteConfigParserNull = new SatelliteConfigParser((byte[]) null);
		assertNotNull(satelliteConfigParserNull);
		assertNull(satelliteConfigParserNull.getConfig());

		SatelliteConfigParser satelliteConfigParserPlaceholder =
		new SatelliteConfigParser("test".getBytes());
		assertNotNull(satelliteConfigParserPlaceholder);
		assertNull(satelliteConfigParserPlaceholder.getConfig());

		SatelliteConfigParser satelliteConfigParser = new SatelliteConfigParser(mBytesProtoBuffer);
		assertNotNull(satelliteConfigParser);
		assertNotNull(satelliteConfigParser.getConfig());
		assertEquals(4, satelliteConfigParser.getConfig().getSatelliteConfigDataVersion());
		}
		}