Snap for 8474529 from 30b52e806449340e743f791dbae515fdcdc05a13 to tm-d1-release (3ff167d8) · Commits · e / os / android_frameworks_opt_telephony

proto/src/persist_atoms.proto

+22 −2

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:
		@@ -347,12 +353,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;

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

+29 −20

Original line number	Diff line number	Diff line
		@@ -139,16 +139,17 @@ public class CarrierPrivilegesTracker extends Handler {
		private static final int ACTION_SIM_STATE_UPDATED = 4;

		/**
		* Action for tracking when a package is installed or replaced on the device.
		* obj: String package name that was installed or replaced on the device.
		* Action for tracking when a package is installed, replaced or changed (exclude the case
		* disabled by user) on the device.
		* obj: String package name that was installed, replaced or changed on the device.
		*/
		private static final int ACTION_PACKAGE_ADDED_OR_REPLACED = 5;
		private static final int ACTION_PACKAGE_ADDED_REPLACED_OR_CHANGED = 5;

		/**
		* Action for tracking when a package is uninstalled on the device.
		* obj: String package name that was installed on the device.
		* Action for tracking when a package is uninstalled or disabled by user on the device.
		* obj: String package name that was installed or disabled by user on the device.
		*/
		private static final int ACTION_PACKAGE_REMOVED = 6;
		private static final int ACTION_PACKAGE_REMOVED_OR_DISABLED_BY_USER = 6;

		/**
		* Action used to initialize the state of the Tracker.
		@@ -306,11 +307,8 @@ public class CarrierPrivilegesTracker extends Handler {
		}
		case Intent.ACTION_PACKAGE_ADDED: // fall through
		case Intent.ACTION_PACKAGE_REPLACED: // fall through
		case Intent.ACTION_PACKAGE_REMOVED: {
		int what =
		(action.equals(Intent.ACTION_PACKAGE_REMOVED))
		? ACTION_PACKAGE_REMOVED
		: ACTION_PACKAGE_ADDED_OR_REPLACED;
		case Intent.ACTION_PACKAGE_REMOVED: // fall through
		case Intent.ACTION_PACKAGE_CHANGED: {
		Uri uri = intent.getData();
		String pkgName = (uri != null) ? uri.getSchemeSpecificPart() : null;
		if (TextUtils.isEmpty(pkgName)) {
		@@ -318,6 +316,16 @@ public class CarrierPrivilegesTracker extends Handler {
		return;
		}

		boolean removed = action.equals(Intent.ACTION_PACKAGE_REMOVED);
		// When a package is explicitly disabled by the user, we take the
		// same action as if it was removed: clear it from the cache
		boolean disabledByUser = action.equals(Intent.ACTION_PACKAGE_CHANGED)
		&& mPackageManager.getApplicationEnabledSetting(pkgName)
		== PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
		int what = (removed \|\| disabledByUser)
		? ACTION_PACKAGE_REMOVED_OR_DISABLED_BY_USER
		: ACTION_PACKAGE_ADDED_REPLACED_OR_CHANGED;

		sendMessage(obtainMessage(what, pkgName));
		break;
		}
		@@ -349,6 +357,7 @@ public class CarrierPrivilegesTracker extends Handler {
		packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
		packageFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
		packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
		packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);

		// For package-related broadcasts, specify the data scheme for "package" to receive the
		// package name along with the broadcast
		@@ -379,14 +388,14 @@ public class CarrierPrivilegesTracker extends Handler {
		handleSimStateChanged(msg.arg1, msg.arg2);
		break;
		}
		case ACTION_PACKAGE_ADDED_OR_REPLACED: {
		case ACTION_PACKAGE_ADDED_REPLACED_OR_CHANGED: {
		String pkgName = (String) msg.obj;
		handlePackageAddedOrReplaced(pkgName);
		handlePackageAddedReplacedOrChanged(pkgName);
		break;
		}
		case ACTION_PACKAGE_REMOVED: {
		case ACTION_PACKAGE_REMOVED_OR_DISABLED_BY_USER: {
		String pkgName = (String) msg.obj;
		handlePackageRemoved(pkgName);
		handlePackageRemovedOrDisabledByUser(pkgName);
		break;
		}
		case ACTION_INITIALIZE_TRACKER: {
		@@ -530,7 +539,7 @@ public class CarrierPrivilegesTracker extends Handler {
		return uiccProfile.getCarrierPrivilegeAccessRules();
		}

		private void handlePackageAddedOrReplaced(@Nullable String pkgName) {
		private void handlePackageAddedReplacedOrChanged(@Nullable String pkgName) {
		if (pkgName == null) return;

		PackageInfo pkg;
		@@ -546,7 +555,7 @@ public class CarrierPrivilegesTracker extends Handler {
		// installed for a user it wasn't installed in before, which means there will be an
		// additional UID.
		getUidsForPackage(pkg.packageName, /* invalidateCache= */ true);
		mLocalLog.log("Package added/replaced:"
		mLocalLog.log("Package added/replaced/changed:"
		+ " pkg=" + Rlog.pii(TAG, pkgName)
		+ " cert hashes=" + mInstalledPackageCerts.get(pkgName));

		@@ -567,15 +576,15 @@ public class CarrierPrivilegesTracker extends Handler {
		mInstalledPackageCerts.put(pkg.packageName, certs);
		}

		private void handlePackageRemoved(@Nullable String pkgName) {
		private void handlePackageRemovedOrDisabledByUser(@Nullable String pkgName) {
		if (pkgName == null) return;

		if (mInstalledPackageCerts.remove(pkgName) == null \|\| mCachedUids.remove(pkgName) == null) {
		Rlog.e(TAG, "Unknown package was uninstalled: " + pkgName);
		Rlog.e(TAG, "Unknown package was uninstalled or disabled by user: " + pkgName);
		return;
		}

		mLocalLog.log("Package removed: pkg=" + Rlog.pii(TAG, pkgName));
		mLocalLog.log("Package removed or disabled by user: pkg=" + Rlog.pii(TAG, pkgName));

		maybeUpdatePrivilegedPackagesAndNotifyRegistrants();
		}

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

+1 −23

Original line number	Diff line number	Diff line
		@@ -31,13 +31,11 @@ import android.telephony.PreciseCallState;
		import android.telephony.PreciseDataConnectionState;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyDisplayInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.TelephonyManager.DataEnabledReason;
		import android.telephony.TelephonyRegistryManager;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.ims.ImsReasonInfo;

		import com.android.internal.telephony.PhoneInternalInterface.DataActivityState;
		import com.android.telephony.Rlog;

		import java.util.List;
		@@ -123,8 +121,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		@Override
		public void notifyDataActivity(Phone sender) {
		int subId = sender.getSubId();
		mTelephonyRegistryMgr.notifyDataActivityChanged(subId,
		convertDataActivityState(sender.getDataActivityState()));
		mTelephonyRegistryMgr.notifyDataActivityChanged(subId, sender.getDataActivityState());
		}

		@Override
		@@ -265,25 +262,6 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		sender.getSubId(), linkCapacityEstimateList);
		}

		/**
		* Convert the {@link DataActivityState} enum into the TelephonyManager.DATA_* constants for the
		* public API.
		*/
		public static int convertDataActivityState(DataActivityState state) {
		switch (state) {
		case DATAIN:
		return TelephonyManager.DATA_ACTIVITY_IN;
		case DATAOUT:
		return TelephonyManager.DATA_ACTIVITY_OUT;
		case DATAINANDOUT:
		return TelephonyManager.DATA_ACTIVITY_INOUT;
		case DORMANT:
		return TelephonyManager.DATA_ACTIVITY_DORMANT;
		default:
		return TelephonyManager.DATA_ACTIVITY_NONE;
		}
		}

		/**
		* Convert the {@link Call.State} enum into the PreciseCallState.PRECISE_CALL_STATE_* constants
		* for the public API.

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ import android.telecom.PhoneAccountHandle;
		import android.telecom.TelecomManager;
		import android.telecom.VideoProfile;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.Annotation.DataActivityType;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.BarringInfo;
		import android.telephony.CarrierConfigManager;
		@@ -780,34 +781,33 @@ public class GsmCdmaPhone extends Phone {
		}

		@Override
		public DataActivityState getDataActivityState() {
		public @DataActivityType int getDataActivityState() {
		if (isUsingNewDataStack()) {
		// TODO: Support it correctly.
		return DataActivityState.NONE;
		return getDataNetworkController().getDataActivity();
		}
		DataActivityState ret = DataActivityState.NONE;
		int ret = TelephonyManager.DATA_ACTIVITY_NONE;

		if (mSST.getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE
		&& getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN) != null) {
		switch (getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).getActivity()) {
		case DATAIN:
		ret = DataActivityState.DATAIN;
		ret = TelephonyManager.DATA_ACTIVITY_IN;
		break;

		case DATAOUT:
		ret = DataActivityState.DATAOUT;
		ret = TelephonyManager.DATA_ACTIVITY_OUT;
		break;

		case DATAINANDOUT:
		ret = DataActivityState.DATAINANDOUT;
		ret = TelephonyManager.DATA_ACTIVITY_INOUT;
		break;

		case DORMANT:
		ret = DataActivityState.DORMANT;
		ret = TelephonyManager.DATA_ACTIVITY_DORMANT;
		break;

		default:
		ret = DataActivityState.NONE;
		ret = TelephonyManager.DATA_ACTIVITY_NONE;
		break;
		}
		}

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -725,8 +725,12 @@ public class MultiSimSettingController extends Handler {
		&& (!dataSelected \|\| !smsSelected \|\| !voiceSelected)) {
		dialogType = EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;
		} else if (mPrimarySubList.size() > 1 && (isUserVisibleChange(change)
		\|\| (change == PRIMARY_SUB_INITIALIZED && !dataSelected))) {
		\|\| (change == PRIMARY_SUB_INITIALIZED && !dataSelected
		&& Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.DEVICE_PROVISIONED, 0) != 0))) {
		// If change is SWAPPED_IN_GROUP or MARKED_OPPT, don't ask user again.
		// In default DSDS devices, do not show data selection dialog during SuW as there is
		// fullscreen activity to choose data preference.
		dialogType = EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
		}