Merge "DO NOT MERGE - Merge Android 13" (1ec345f2) · Commits · e / os / android_frameworks_opt_telephony

TEST_MAPPING

+0 −8

Original line number	Diff line number	Diff line
		@@ -11,14 +11,6 @@
		{
		"name": "CarrierAppIntegrationTestCases"
		},
		{
		"name": "CtsTelephonySdk28TestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsTelephony2TestCases",
		"options": [

jarjar-rules-shared.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ rule com.android.internal.util.FastXmlSerializer* com.android.internal.telephony
		rule com.android.internal.util.HexDump* com.android.internal.telephony.HexDump@1
		rule com.android.internal.util.IState* com.android.internal.telephony.IState@1
		rule com.android.internal.util.IndentingPrintWriter* com.android.internal.telephony.IndentingPrintWriter@1
		rule com.android.internal.util.Preconditions* com.android.internal.telephony.Preconditions@1
		rule com.android.internal.util.State* com.android.internal.telephony.State@1
		rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1
		rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1

proto/src/persist_atoms.proto

+26 −3

Original line number	Diff line number	Diff line
		@@ -89,10 +89,10 @@ message PersistAtoms {
		optional string build_fingerprint = 21;

		/* Summary of received network requests. */
		repeated NetworkRequests network_requests = 22;
		repeated NetworkRequests network_requests = 22 [deprecated = true];

		/* Timestamp of last network_requests pull. */
		optional int64 network_requests_pull_timestamp_millis = 23;
		optional int64 network_requests_pull_timestamp_millis = 23 [deprecated = true];

		/* RCS single registrtions feature tag information. */
		repeated ImsRegistrationFeatureTagStats ims_registration_feature_tag_stats = 24;
		@@ -171,6 +171,12 @@ message PersistAtoms {

		/* Timestamp of last gba_event pull. */
		optional int64 gba_event_pull_timestamp_millis = 49;

		/* Summary of received network requests. */
		repeated NetworkRequestsV2 network_requests_v2 = 50;

		/* Timestamp of last network_requests_v2 pull. */
		optional int64 network_requests_v2_pull_timestamp_millis = 51;
		}

		// The canonical versions of the following enums live in:
		@@ -255,6 +261,7 @@ message OutgoingSms {
		optional int32 carrier_id = 11;
		optional int64 message_id = 12;
		optional int32 retry_id = 13;
		optional int64 interval_millis = 14;
		}

		message CarrierIdMismatch {
		@@ -284,6 +291,7 @@ message DataCallSession {
		optional int64 duration_minutes = 17;
		optional bool ongoing = 18;
		optional int32 band_at_end = 19;
		repeated int32 handover_failure_causes = 20;
		}

		message CellularServiceState {
		@@ -296,6 +304,7 @@ message CellularServiceState {
		optional bool is_multi_sim = 7;
		optional int32 carrier_id = 8;
		optional int64 total_time_millis = 9; // Duration needs to be rounded when pulled
		optional bool is_emergency_only = 10;

		// Internal use only
		optional int64 last_used_millis = 10001;
		@@ -346,12 +355,26 @@ message ImsRegistrationStats {
		optional int64 last_used_millis = 10001;
		}

		// deprecated - please use NetworkRequestsV2 instead
		message NetworkRequests {
		optional int32 carrier_id = 1;
		optional int32 enterprise_request_count = 2;
		optional int32 enterprise_release_count = 3;
		}

		message NetworkRequestsV2 {
		enum NetworkCapability {
		UNKNOWN = 0;
		PRIORITIZE_LATENCY = 1;
		PRIORITIZE_BANDWIDTH = 2;
		CBS = 3;
		ENTERPRISE = 4;
		}
		optional int32 carrier_id = 1;
		optional NetworkCapability capability = 2;
		optional int32 request_count = 3;
		}

		message ImsRegistrationFeatureTagStats {
		optional int32 carrier_id = 1;
		optional int32 slot_id = 2;

proto/src/telephony.proto

+22 −0

Original line number	Diff line number	Diff line
		@@ -2297,6 +2297,28 @@ message TelephonyCallSession {
		// after call is connected
		optional bool tx_silence_detected = 14;

		// the number of Voice frames sent by jitter buffer to audio
		optional int32 voice_frames = 15;

		// the number of NO_DATA frames sent by jitter buffer to audio
		optional int32 no_data_frames = 16;

		// the number of RTP voice packets dropped by jitter buffer
		optional int32 rtp_dropped_packets = 17;

		// the minimum playout delay in the reporting interval, in milliseconds
		optional int64 min_playout_delay_millis = 18;

		// the maximum playout delay in the reporting interval, in milliseconds
		optional int64 max_playout_delay_millis = 19;

		// the total number of RTP SID packets received by this device
		// for an ongoing call
		optional int32 rx_rtp_sid_packets = 20;

		// the total number of RTP duplicate packets received by this device
		// for an ongoing call
		optional int32 rtp_duplicate_packets = 21;
		}

		message CallQualitySummary {

src/java/com/android/internal/telephony/AppSmsManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -33,11 +33,11 @@ import android.util.Base64;
		import android.util.Log;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.Preconditions;

		import java.security.SecureRandom;
		import java.util.Iterator;
		import java.util.Map;
		import java.util.Objects;
		import java.util.concurrent.TimeUnit;


		@@ -116,9 +116,10 @@ public class AppSmsManager {
		@NonNull String callingPackageName,
		@Nullable String prefixes,
		@NonNull PendingIntent intent) {
		Preconditions.checkStringNotEmpty(callingPackageName,
		"callingPackageName cannot be null or empty.");
		Preconditions.checkNotNull(intent, "intent cannot be null");
		if (TextUtils.isEmpty(callingPackageName)) {
		throw new IllegalArgumentException("callingPackageName cannot be null or empty.");
		}
		Objects.requireNonNull(intent, "intent cannot be null");
		// Check calling uid matches callingpkg.
		AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
		appOps.checkPackage(Binder.getCallingUid(), callingPackageName);