Snap for 6342437 from 49bab605e118c26f96de0b064732b8b6334ac402 to rvc-release (0478e8ac) · Commits · e / os / android_frameworks_opt_telephony

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

0 → 100644

+323 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import static android.telephony.CarrierConfigManager.EXTRA_SLOT_INDEX;
		import static android.telephony.CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX;
		import static android.telephony.CarrierConfigManager.KEY_CARRIER_CERTIFICATE_STRING_ARRAY;
		import static android.telephony.SubscriptionManager.INVALID_SIM_SLOT_INDEX;
		import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		import static android.telephony.TelephonyManager.EXTRA_SIM_STATE;
		import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
		import static android.telephony.TelephonyManager.SIM_STATE_LOADED;
		import static android.telephony.TelephonyManager.SIM_STATE_NOT_READY;
		import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;

		import android.annotation.NonNull;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.os.PersistableBundle;
		import android.os.Registrant;
		import android.os.RegistrantList;
		import android.os.UserManager;
		import android.telephony.CarrierConfigManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.IntArray;
		import android.util.Log;

		import java.util.Arrays;
		import java.util.List;
		import java.util.Map;
		import java.util.Set;

		/**
		* CarrierPrivilegesTracker will track the Carrier Privileges for a specific {@link Phone}.
		* Registered Telephony entities will receive notifications when the UIDs with these privileges
		* change.
		*/
		public class CarrierPrivilegesTracker extends Handler {
		private static final String TAG = CarrierPrivilegesTracker.class.getSimpleName();

		/**
		* Action to register a Registrant with this Tracker.
		* obj: Registrant that will be notified of Carrier Privileged UID changes.
		*/
		private static final int ACTION_REGISTER_LISTENER = 1;

		/**
		* Action to unregister a Registrant with this Tracker.
		* obj: Handler used by the Registrant that will be removed.
		*/
		private static final int ACTION_UNREGISTER_LISTENER = 2;

		/**
		* Action for tracking when Carrier Configs are updated.
		* arg1: Subscription Id for the Carrier Configs update being broadcast
		* arg2: Slot Index for the Carrier Configs update being broadcast
		*/
		private static final int ACTION_CARRIER_CONFIG_CERTS_UPDATED = 3;

		/**
		* Action for tracking when the Phone's SIM state changes.
		* arg1: slotId that this Action applies to
		* arg2: simState reported by this Broadcast
		*/
		private static final int ACTION_SIM_STATE_UPDATED = 4;

		private final Context mContext;
		private final Phone mPhone;
		private final CarrierConfigManager mCarrierConfigManager;
		private final PackageManager mPackageManager;
		private final UserManager mUserManager;
		private final TelephonyManager mTelephonyManager;
		private final RegistrantList mRegistrantList;
		private final Set<String> mCarrierConfigCerts;

		// TODO(b/151981841): Use Set<UiccAccessRule> to also check for package names loaded from SIM
		private final Set<String> mUiccCerts;

		// Map of PackageName -> Certificate hashes for that Package
		private final Map<String, Set<String>> mInstalledPackageCerts;
		private int[] mPrivilegedUids;

		private final BroadcastReceiver mIntentReceiver =
		new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (action == null) return;

		switch (action) {
		case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED: {
		Bundle extras = intent.getExtras();
		int slotIndex = extras.getInt(EXTRA_SLOT_INDEX);
		int subId =
		extras.getInt(
		EXTRA_SUBSCRIPTION_INDEX, INVALID_SUBSCRIPTION_ID);
		sendMessage(
		obtainMessage(
		ACTION_CARRIER_CONFIG_CERTS_UPDATED,
		subId,
		slotIndex));
		break;
		}
		case TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED: // fall through
		case TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED: {
		Bundle extras = intent.getExtras();
		int simState = extras.getInt(EXTRA_SIM_STATE, SIM_STATE_UNKNOWN);
		int slotId =
		extras.getInt(PhoneConstants.PHONE_KEY, INVALID_SIM_SLOT_INDEX);

		if (simState != SIM_STATE_ABSENT
		&& simState != SIM_STATE_NOT_READY
		&& simState != SIM_STATE_LOADED) return;

		sendMessage(obtainMessage(ACTION_SIM_STATE_UPDATED, slotId, simState));
		break;
		}
		}
		}
		};

		public CarrierPrivilegesTracker(
		@NonNull Looper looper, @NonNull Phone phone, @NonNull Context context) {
		super(looper);
		mContext = context;
		mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
		mPackageManager = context.getSystemService(PackageManager.class);
		mUserManager = context.getSystemService(UserManager.class);
		mTelephonyManager = context.getSystemService(TelephonyManager.class);
		mPhone = phone;

		IntentFilter filter = new IntentFilter();
		filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
		filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);
		filter.addAction(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);
		mContext.registerReceiver(mIntentReceiver, filter);

		mRegistrantList = new RegistrantList();
		mCarrierConfigCerts = new ArraySet<>();
		mUiccCerts = new ArraySet<>();
		mInstalledPackageCerts = new ArrayMap<>();
		mPrivilegedUids = new int[0];
		}

		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case ACTION_REGISTER_LISTENER: {
		handleRegisterListener((Registrant) msg.obj);
		break;
		}
		case ACTION_UNREGISTER_LISTENER: {
		handleUnregisterListener((Handler) msg.obj);
		break;
		}
		case ACTION_CARRIER_CONFIG_CERTS_UPDATED: {
		handleCarrierConfigUpdated(msg.arg1, msg.arg2);
		break;
		}
		case ACTION_SIM_STATE_UPDATED: {
		handleSimStateChanged(msg.arg1, msg.arg2);
		break;
		}
		default: {
		Log.e(TAG, "Received unknown msg type: " + msg.what);
		break;
		}
		}
		}

		private void handleRegisterListener(Registrant registrant) {
		mRegistrantList.add(registrant);
		registrant.notifyResult(mPrivilegedUids);
		}

		private void handleUnregisterListener(Handler handler) {
		mRegistrantList.remove(handler);
		}

		private void handleCarrierConfigUpdated(int subId, int slotIndex) {
		if (slotIndex != mPhone.getPhoneId()) return;

		Set<String> updatedCarrierConfigCerts = new ArraySet<>();

		// Carrier Config broadcasts with INVALID_SUBSCRIPTION_ID when the SIM is removed. This is
		// an expected event. When this happens, clear the certificates from the previous configs.
		if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		PersistableBundle carrierConfigs = mCarrierConfigManager.getConfigForSubId(subId);
		if (mCarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfigs)) {
		String[] carrierConfigCerts =
		carrierConfigs.getStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY);

		if (carrierConfigCerts != null) {
		for (String cert : carrierConfigCerts) {
		updatedCarrierConfigCerts.add(cert.toUpperCase());
		}
		}
		}
		}

		maybeUpdateCertsAndNotifyRegistrants(mCarrierConfigCerts, updatedCarrierConfigCerts);
		}

		private void handleSimStateChanged(int slotId, int simState) {
		if (slotId != mPhone.getPhoneId()) return;

		Set<String> updatedUiccCerts = new ArraySet<>();

		// Only include the UICC certs if the SIM is fully loaded
		if (simState == SIM_STATE_LOADED) {
		TelephonyManager telMan = mTelephonyManager.createForSubscriptionId(mPhone.getSubId());
		if (telMan.hasIccCard(mPhone.getPhoneId())) {
		List<String> uiccCerts = telMan.getCertsFromCarrierPrivilegeAccessRules();
		if (uiccCerts != null) {
		for (String cert : uiccCerts) {
		updatedUiccCerts.add(cert.toUpperCase());
		}
		}
		}
		}

		maybeUpdateCertsAndNotifyRegistrants(mUiccCerts, updatedUiccCerts);
		}

		private void maybeUpdateCertsAndNotifyRegistrants(
		Set<String> currentCerts, Set<String> updatedCerts) {
		if (!currentCerts.equals(updatedCerts)) {
		currentCerts.clear();
		currentCerts.addAll(updatedCerts);

		int[] currentPrivilegedUids = getCurrentPrivilegedUids();

		// Sort UIDs for the equality check
		Arrays.sort(currentPrivilegedUids);
		if (!Arrays.equals(mPrivilegedUids, currentPrivilegedUids)) {
		mPrivilegedUids = currentPrivilegedUids;
		mRegistrantList.notifyResult(mPrivilegedUids);
		}
		}
		}

		private int[] getCurrentPrivilegedUids() {
		Set<Integer> privilegedUids = new ArraySet<>();
		for (Map.Entry<String, Set<String>> e : mInstalledPackageCerts.entrySet()) {
		if (isPackagePrivileged(e.getValue())) {
		List<UserInfo> users = mUserManager.getUsers();
		for (UserInfo user : users) {
		try {
		int uid =
		mPackageManager.getPackageUidAsUser(
		e.getKey(), user.getUserHandle().getIdentifier());
		privilegedUids.add(uid);
		} catch (NameNotFoundException exception) {
		// Didn't find package. Continue looking at other packages
		Log.e(TAG, "Unable to find uid for package: " + e.getKey());
		}
		}
		}
		}

		IntArray result = new IntArray(privilegedUids.size());
		for (int uid : privilegedUids) {
		result.add(uid);
		}
		return result.toArray();
		}

		private boolean isPackagePrivileged(Set<String> certs) {
		for (String cert : certs) {
		if (mCarrierConfigCerts.contains(cert) \|\| mUiccCerts.contains(cert)) {
		return true;
		}
		}
		return false;
		}

		/**
		* Registers the given Registrant with this tracker.
		*
		* <p>After being registered, the Registrant will be notified with the current Carrier
		* Privileged UIDs for this Phone.
		*
		* @hide
		*/
		public void registerCarrierPrivilegesListener(Handler h, int what, Object obj) {
		sendMessage(obtainMessage(ACTION_REGISTER_LISTENER, new Registrant(h, what, obj)));
		}

		/**
		* Unregisters the given listener with this tracker.
		*
		* @hide
		*/
		public void unregisterCarrierPrivilegesListener(Handler handler) {
		sendMessage(obtainMessage(ACTION_UNREGISTER_LISTENER, handler));
		}
		}

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

+6 −7

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ import com.android.internal.telephony.dataconnection.TransportManager;
		import com.android.internal.telephony.emergency.EmergencyNumberTracker;
		import com.android.internal.telephony.gsm.GsmMmiCode;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.imsphone.ImsPhoneMmiCode;
		import com.android.internal.telephony.test.SimulatedRadioControl;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
		import com.android.internal.telephony.uicc.IccCardStatus;
		@@ -106,7 +107,6 @@ import com.android.internal.telephony.uicc.UiccProfile;
		import com.android.internal.telephony.uicc.UiccSlot;
		import com.android.internal.telephony.util.ArrayUtils;
		import com.android.telephony.Rlog;
		import com.android.internal.telephony.imsphone.ImsPhoneMmiCode;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -3144,7 +3144,7 @@ public class GsmCdmaPhone extends Phone {
		simOperatorNumeric);
		}
		}
		updateDataConnectionTracker();
		updateCurrentCarrierInProvider();
		}
		}

		@@ -4015,10 +4015,9 @@ public class GsmCdmaPhone extends Phone {
		return dialString;
		}

		/**
		* @return operator numeric.
		*/
		private String getOperatorNumeric() {
		@Override
		@NonNull
		public String getOperatorNumeric() {
		String operatorNumeric = null;
		if (isPhoneTypeGsm()) {
		IccRecords r = mIccRecords.get();
		@@ -4060,7 +4059,7 @@ public class GsmCdmaPhone extends Phone {
		+ " operatorNumeric = " + operatorNumeric);

		}
		return operatorNumeric;
		return TextUtils.emptyIfNull(operatorNumeric);
		}

		/**

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SharedPreferences;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.Looper;
		@@ -126,6 +127,10 @@ public class LocaleTracker extends Handler {
		/** The maximum fail count to prevent delay time overflow */
		private static final int MAX_FAIL_COUNT = 30;

		/** The last known country iso */
		private static final String LAST_KNOWN_COUNTRY_ISO_SHARED_PREFS_KEY =
		"last_known_country_iso";

		private String mTag;

		private final Phone mPhone;
		@@ -577,6 +582,11 @@ public class LocaleTracker extends Handler {
		mLocalLog.log(msg);
		mCurrentCountryIso = countryIso;

		// Update the last known country ISO
		if (!TextUtils.isEmpty(mCurrentCountryIso)) {
		updateLastKnownCountryIso(mCurrentCountryIso);
		}

		int phoneId = mPhone.getPhoneId();
		if (SubscriptionManager.isValidPhoneId(phoneId)) {
		List<String> newProp = new ArrayList<>(
		@@ -588,6 +598,8 @@ public class LocaleTracker extends Handler {

		Intent intent = new Intent(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);
		intent.putExtra(TelephonyManager.EXTRA_NETWORK_COUNTRY, countryIso);
		intent.putExtra(TelephonyManager.EXTRA_LAST_KNOWN_NETWORK_COUNTRY,
		getLastKnownCountryIso());
		SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());
		mPhone.getContext().sendBroadcast(intent);
		}
		@@ -624,6 +636,30 @@ public class LocaleTracker extends Handler {
		return mIsTracking;
		}

		private void updateLastKnownCountryIso(String countryIso) {
		if (!TextUtils.isEmpty(countryIso)) {
		final SharedPreferences prefs = mPhone.getContext().getSharedPreferences(
		LAST_KNOWN_COUNTRY_ISO_SHARED_PREFS_KEY, Context.MODE_PRIVATE);
		final SharedPreferences.Editor editor = prefs.edit();
		editor.putString(LAST_KNOWN_COUNTRY_ISO_SHARED_PREFS_KEY, countryIso);
		editor.commit();
		log("update country iso in sharedPrefs " + countryIso);
		}
		}

		/**
		* Return the last known country ISO before device is not camping on a network
		* (e.g. Airplane Mode)
		*
		* @return The device's last known country ISO.
		*/
		@NonNull
		public String getLastKnownCountryIso() {
		final SharedPreferences prefs = mPhone.getContext().getSharedPreferences(
		LAST_KNOWN_COUNTRY_ISO_SHARED_PREFS_KEY, Context.MODE_PRIVATE);
		return prefs.getString(LAST_KNOWN_COUNTRY_ISO_SHARED_PREFS_KEY, "");
		}

		private void log(String msg) {
		Rlog.d(mTag, msg);
		}

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -4033,16 +4033,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return getLocaleFromCarrierProperties();
		}

		public void updateDataConnectionTracker() {
		if (mTransportManager != null) {
		for (int transport : mTransportManager.getAvailableTransports()) {
		if (getDcTracker(transport) != null) {
		getDcTracker(transport).update();
		}
		}
		}
		}

		public boolean updateCurrentCarrierInProvider() {
		return false;
		}
		@@ -4237,6 +4227,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return RIL.RADIO_HAL_VERSION_UNKNOWN;
		}

		/**
		* Get the SIM's MCC/MNC
		*
		* @return MCC/MNC in string format, empty string if not available.
		*/
		@NonNull
		public String getOperatorNumeric() {
		return "";
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("Phone: subId=" + getSubId());
		pw.println(" mPhoneId=" + mPhoneId);

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import android.hardware.radio.V1_0.RadioResponseInfo;
		import android.hardware.radio.V1_0.SendSmsResult;
		import android.hardware.radio.V1_0.VoiceRegStateResult;
		import android.hardware.radio.V1_4.CarrierRestrictionsWithPriority;
		import android.hardware.radio.V1_4.IRadioResponse;
		import android.hardware.radio.V1_4.SimLockMultiSimPolicy;
		import android.hardware.radio.V1_5.IRadioResponse;
		import android.os.AsyncResult;
		import android.os.Message;
		import android.os.SystemClock;
		@@ -2629,4 +2629,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		mRil.processResponseDone(rr, responseInfo, bi);
		}
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param sms Response to sms sent as defined by SendSmsResult in types.hal
		*/
		public void sendCdmaSmsExpectMoreResponse(RadioResponseInfo responseInfo,
		SendSmsResult sms) {
		responseSms(responseInfo, sms);
		}
		}