Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e933821 authored by arunvoddu's avatar arunvoddu Committed by Arun kumar Voddu
Browse files

Added carrier_id support to the carrier_key table in CarrierInformation DB 

Update the test cases accordingly

Bug: 191919168
Test: aTest verification passed
Change-Id: Ia5c8abdb86a45f62e0b265ef0d95e34bfca8abff
parent 0d99325e

testapps/src/com/android/server/telecom/testapps/TestCertActivity.java

+8 −18
Original line number Diff line number Diff line
@@ -16,21 +16,19 @@ 
package com.android.server.telecom.testapps;



import android.app.Activity;

import android.app.ProgressDialog;

import android.content.Context;

import android.os.AsyncTask;

import android.os.Bundle;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Base64;

import android.util.Log;

import android.telephony.TelephonyManager;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.ArrayAdapter;

import android.widget.EditText;

import android.widget.Toast;



import android.app.ProgressDialog;

import android.os.AsyncTask;

import android.util.Log;

import android.widget.ListView;

import android.widget.Toast;
@@ -38,12 +36,6 @@ import org.json.JSONArray; 
import org.json.JSONException;

import org.json.JSONObject;



import java.security.KeyFactory;

import java.security.NoSuchAlgorithmException;

import java.security.PublicKey;

import java.security.spec.InvalidKeySpecException;

import java.security.spec.X509EncodedKeySpec;



import java.io.BufferedInputStream;

import java.io.BufferedReader;

import java.io.IOException;
@@ -56,8 +48,6 @@ import java.net.URL; 
import java.util.ArrayList;

import java.util.Date;



import android.util.Base64;



public class TestCertActivity extends Activity {



    private EditText mCertUrlView;
@@ -149,15 +139,15 @@ public class TestCertActivity extends Activity { 
            String mcc = "";

            String mnc = "";

            String networkOperator = telephonyManager.getNetworkOperator();



            int carrierId = telephonyManager.getSimCarrierId();

            if (!TextUtils.isEmpty(networkOperator)) {

                mcc = networkOperator.substring(0, 3);

                mnc = networkOperator.substring(3);

                Log.i(LOG_TAG, "using values for mnc, mcc: " + mnc + "," + mcc);

                Log.i(LOG_TAG, "using values for mnc, mcc: " + mnc + "," + mcc + ", carrierId = "

                        + carrierId);

            }



            ImsiEncryptionInfo imsiEncryptionInfo = new ImsiEncryptionInfo(mcc,

                    mnc, type, identifier, keyBytes, new Date());

                    mnc, type, identifier, keyBytes, new Date(), carrierId);

            telephonyManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo);

            keyList.add(imsiEncryptionInfo.getKeyType() + "," +

                    imsiEncryptionInfo.getKeyIdentifier());