Address IMSI privacy issues. (77fb08c7) · Commits · e / os / android_frameworks_opt_telephony

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

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 android.telephony.ImsiEncryptionInfo;

		/**
		* This class provides methods to retreive information from the CarrierKeyProvider.
		*/
		public class CarrierInfoManager {
		private static final String TAG = "CarrierInfoManager";

		/**
		* Returns Carrier specific information that will be used to encrypt the IMSI and IMPI.
		* @param keyType whether the key is being used for WLAN or ePDG.
		* @return ImsiEncryptionInfo which contains the information including the public key to be
		* used for encryption.
		*/
		public static ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType) {
		//TODO implementation will be done in subsequent CL.
		return null;
		}

		/**
		* Sets the Carrier specific information that will be used to encrypt the IMSI and IMPI.
		* This includes the public key and the key identifier. This information will be stored in the
		* device keystore.
		* @param imsiEncryptionInfo which includes the Key Type, the Public Key
		* {@link java.security.PublicKey} and the Key Identifier.
		* The keyIdentifier Attribute value pair that helps a server locate
		* the private key to decrypt the permanent identity.
		*/
		public static void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo) {
		//TODO implementation will be done in subsequent CL.
		return;
		}
		}

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.provider.Telephony;
		import android.telecom.VideoProfile;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellLocation;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		@@ -1519,6 +1520,16 @@ public class GsmCdmaPhone extends Phone {
		}
		}

		@Override
		public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType) {
		return CarrierInfoManager.getCarrierInfoForImsiEncryption(keyType);
		}

		@Override
		public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo) {
		CarrierInfoManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo);
		}

		@Override
		public String getGroupIdLevel1() {
		if (isPhoneTypeGsm()) {

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

+23 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import android.telephony.CellInfo;
		import android.telephony.CellInfoCdma;
		import android.telephony.CellLocation;
		import android.telephony.ClientRequestStats;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.PhoneStateListener;
		import android.telephony.RadioAccessFamily;
		import android.telephony.Rlog;
		@@ -2948,6 +2949,28 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return mImsPhone;
		}

		/**
		* Returns Carrier specific information that will be used to encrypt the IMSI and IMPI.
		* @param keyType whether the key is being used for WLAN or ePDG.
		* @return ImsiEncryptionInfo which includes the Key Type, the Public Key
		* {@link java.security.PublicKey} and the Key Identifier.
		* The keyIdentifier This is used by the server to help it locate the private key to
		* decrypt the permanent identity.
		*/
		public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType) {
		return null;
		}

		/**
		* Sets the carrier information needed to encrypt the IMSI and IMPI.
		* @param imsiEncryptionInfo Carrier specific information that will be used to encrypt the
		* IMSI and IMPI. This includes the Key type, the Public key
		* {@link java.security.PublicKey} and the Key identifier.
		*/
		public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo) {
		return;
		}

		/**
		* Return if UT capability of ImsPhone is enabled or not
		*/

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.os.ResultReceiver;
		import android.os.WorkSource;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellLocation;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;

		import com.android.internal.telephony.PhoneConstants.*; // ????
		@@ -826,4 +828,22 @@ public interface PhoneInternalInterface {
		* Callback message is empty on completion
		*/
		public void setCellBroadcastSmsConfig(int[] configValuesArray, Message response);

		/*
		* Sets the carrier information needed to encrypt the IMSI and IMPI.
		* @param imsiEncryptionInfo Carrier specific information that will be used to encrypt the
		* IMSI and IMPI. This includes the Key type, the Public key
		* {@link java.security.PublicKey} and the Key identifier.
		*/
		public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo);

		/**
		* Returns Carrier specific information that will be used to encrypt the IMSI and IMPI.
		* @param keyType whether the key is being used for WLAN or ePDG.
		* @return ImsiEncryptionInfo which includes the Key Type, the Public Key
		* {@link java.security.PublicKey} and the Key Identifier.
		* The keyIdentifier This is used by the server to help it locate the private key to
		* decrypt the permanent identity.
		*/
		public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType);
		}

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

+30 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.SubscriptionManager;
		import android.telephony.Rlog;
		@@ -104,6 +105,35 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}
		}

		public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int subId, int keyType,
		String callingPackage) {
		Phone phone = getPhone(subId);
		if (phone != null) {
		if (!checkReadPhoneState(callingPackage, "getCarrierInfoForImsiEncryption")) {
		return null;
		}
		return phone.getCarrierInfoForImsiEncryption(keyType);
		} else {
		loge("getCarrierInfoForImsiEncryption phone is null for Subscription:" + subId);
		return null;
		}
		}

		public void setCarrierInfoForImsiEncryption(int subId, String callingPackage,
		ImsiEncryptionInfo imsiEncryptionInfo) {
		Phone phone = getPhone(subId);
		if (phone != null) {
		if (!checkReadPhoneState(callingPackage, "setCarrierInfoForImsiEncryption")) {
		return;
		}
		phone.setCarrierInfoForImsiEncryption(imsiEncryptionInfo);
		} else {
		loge("setCarrierInfoForImsiEncryption phone is null for Subscription:" + subId);
		return;
		}
		}


		public String getDeviceSvn(String callingPackage) {
		return getDeviceSvnUsingSubId(getDefaultSubscription(), callingPackage);
		}