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

Commit ee72fe49 authored by rambowang's avatar rambowang
Browse files

Update CarrierKeyDownloadManager with new CarrierConfigManager APIs 

- Replace carrier config change broadcast receiver with listener
  which has much lower lagency
- Retrieve subset of carrier config to reduce memory consumption

Bug: 263267340
Test: atest CarrierKeyDownloadMgrTest
Change-Id: I713fb48214c7785c1d261bf5e837d97e0b6c39b5
parent 1a97619c

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

+22 −13
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.telephony;



import static android.telephony.CarrierConfigManager.KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL;



import static java.nio.charset.StandardCharsets.UTF_8;



import android.app.AlarmManager;
@@ -32,7 +30,6 @@ import android.net.Uri; 
import android.os.Handler;

import android.os.Message;

import android.os.PersistableBundle;

import android.provider.Telephony;

import android.telephony.CarrierConfigManager;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.SubscriptionManager;
@@ -122,13 +119,22 @@ public class CarrierKeyDownloadManager extends Handler { 
        mPhone = phone;

        mContext = phone.getContext();

        IntentFilter filter = new IntentFilter();

        filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        filter.addAction(INTENT_KEY_RENEWAL_ALARM_PREFIX);

        filter.addAction(TelephonyIntents.ACTION_CARRIER_CERTIFICATE_DOWNLOAD);

        mContext.registerReceiver(mBroadcastReceiver, filter, null, phone);

        mDownloadManager = (DownloadManager) mContext.getSystemService(Context.DOWNLOAD_SERVICE);

        mTelephonyManager = mContext.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(mPhone.getSubId());

        CarrierConfigManager carrierConfigManager = mContext.getSystemService(

                CarrierConfigManager.class);

        // Callback which directly handle config change should be executed on handler thread

        carrierConfigManager.registerCarrierConfigChangeListener(this::post,

                (slotIndex, subId, carrierId, specificCarrierId) -> {

                    if (slotIndex == mPhone.getPhoneId()) {

                        Log.d(LOG_TAG, "Carrier Config changed: slotIndex=" + slotIndex);

                        handleAlarmOrConfigChange();

                    }

                });

    }



    private final BroadcastReceiver mDownloadReceiver = new BroadcastReceiver() {
@@ -161,12 +167,6 @@ public class CarrierKeyDownloadManager extends Handler { 
                    Log.d(LOG_TAG, "Handling reset intent: " + action);

                    sendEmptyMessage(EVENT_ALARM_OR_CONFIG_CHANGE);

                }

            } else if (action.equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {

                if (phoneId == intent.getIntExtra(PhoneConstants.PHONE_KEY,

                        SubscriptionManager.INVALID_SIM_SLOT_INDEX)) {

                    Log.d(LOG_TAG, "Carrier Config changed: " + action);

                    sendEmptyMessage(EVENT_ALARM_OR_CONFIG_CHANGE);

                }

            }

        }

    };
@@ -389,14 +389,23 @@ public class CarrierKeyDownloadManager extends Handler { 
            return false;

        }

        int subId = mPhone.getSubId();

        PersistableBundle b = carrierConfigManager.getConfigForSubId(subId);

        if (b == null) {

        PersistableBundle b = null;

        try {

            b = carrierConfigManager.getConfigForSubId(subId,

                    CarrierConfigManager.IMSI_KEY_AVAILABILITY_INT,

                    CarrierConfigManager.IMSI_KEY_DOWNLOAD_URL_STRING,

                    CarrierConfigManager.KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL);

        } catch (RuntimeException e) {

            Log.e(LOG_TAG, "CarrierConfigLoader is not available.");

        }

        if (b == null || b.isEmpty()) {

            return false;

        }



        mKeyAvailability = b.getInt(CarrierConfigManager.IMSI_KEY_AVAILABILITY_INT);

        mURL = b.getString(CarrierConfigManager.IMSI_KEY_DOWNLOAD_URL_STRING);

        mAllowedOverMeteredNetwork = b.getBoolean(

                KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL);

                CarrierConfigManager.KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL);

        if (mKeyAvailability == 0 || TextUtils.isEmpty(mURL)) {

            Log.d(LOG_TAG,

                    "Carrier not enabled or invalid values. mKeyAvailability=" + mKeyAvailability

tests/telephonytests/src/com/android/internal/telephony/CarrierKeyDownloadMgrTest.java

+23 −8
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentMatchers;



import java.security.PublicKey;
@@ -61,6 +62,8 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest { 


    private CarrierKeyDownloadManager mCarrierKeyDM;



    private PersistableBundle mBundle;



    private final String mURL = "http://www.google.com";



    private static final String CERT = "-----BEGIN CERTIFICATE-----\r\nMIIFjzCCBHegAwIBAgIUPxj3SLif82Ky1RlUy8p2EWJCh8MwDQYJKoZIhvcNAQELBQAwgY0xCzAJBgNVBAYTAk5MMRIwEAYDVQQHEwlBbXN0ZXJkYW0xJTAjBgNVBAoTHFZlcml6b24gRW50ZXJwcmlzZSBTb2x1dGlvbnMxEzARBgNVBAsTCkN5YmVydHJ1c3QxLjAsBgNVBAMTJVZlcml6b24gUHVibGljIFN1cmVTZXJ2ZXIgQ0EgRzE0LVNIQTIwHhcNMTcwODE0MTc0MzM4WhcNMTkwODE0MTc0MzM4WjCBmTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFjAUBgNVBAcTDUJhc2tpbmcgUmlkZ2UxIjAgBgNVBAoTGVZlcml6b24gRGF0YSBTZXJ2aWNlcyBMTEMxHzAdBgNVBAsTFk5ldHdvcmsgU3lzdGVtIFN1cHBvcnQxGDAWBgNVBAMTD3ZpMWx2Lmltc3ZtLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUQKWTHi4Hjpd1LQwJ87RXa0Rs3rVonvVevliqdUH5BikjhAzvIqwPSXeRQqkaRTFIyp0NKcNqGdjAaHRo43gdHeWSH331sS6CMZDg988gZznskzCqJJo6ii5FuLC8qe2YDsHxT+CefXev2rn6Bj1ei2X74uZsy5KlkBRZfFHtPdK6/EK5TpzrvcXfDyOK1rn8FTno1bQOTAhL39GPcLhdrXV7AN+lu+EBpdCqlTdcoDxsqavi/91MwUIVEzxJmycKloT6OWfU44r7+L5SYYgc88NTaGL/BvCFwHRIa1ZgYSGeAPes45792MGG7tfr/ttAGp9UEwTv2zWTxzWnRP/UCAwEAAaOCAdcwggHTMAwGA1UdEwEB/wQCMAAwTAYDVR0gBEUwQzBBBgkrBgEEAbE+ATIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly9zZWN1cmUub21uaXJvb3QuY29tL3JlcG9zaXRvcnkwgakGCCsGAQUFBwEBBIGcMIGZMC0GCCsGAQUFBzABhiFodHRwOi8vdnBzc2cxNDIub2NzcC5vbW5pcm9vdC5jb20wMwYIKwYBBQUHMAKGJ2h0dHA6Ly9jYWNlcnQub21uaXJvb3QuY29tL3Zwc3NnMTQyLmNydDAzBggrBgEFBQcwAoYnaHR0cDovL2NhY2VydC5vbW5pcm9vdC5jb20vdnBzc2cxNDIuZGVyMBoGA1UdEQQTMBGCD3ZpMWx2Lmltc3ZtLmNvbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOQtu5EBZSYftHo/oxUlpM6MRDM7MD4GA1UdHwQ3MDUwM6AxoC+GLWh0dHA6Ly92cHNzZzE0Mi5jcmwub21uaXJvb3QuY29tL3Zwc3NnMTQyLmNybDAdBgNVHQ4EFgQUv5SaSyNM/yXw1v0N9TNpjsFCaPcwDQYJKoZIhvcNAQELBQADggEBACNJusTULj1KyV4RwiskKfp4wI9Hsz3ESbZS/ijF9D57BQ0UwkELU9r6rEAhsYLUvMq4sDhDbYIdupgP4MBzFnjkKult7VQm5W3nCcuHgXYFAJ9Y1a4OZAo/4hrHj70W9TsQ1ioSMjUT4F8bDUYZI0kcyH8e/+2DaTsLUpHw3L+Keu8PsJVBLnvcKJjWrZD/Bgd6JuaTX2G84i0rY0GJuO9CxLNJa6n61Mz5cqLYIuwKgiVgTA2n71YITyFICOFPFX1vSx35AWvD6aVYblxtC8mpCdF2h4s1iyrpXeji2GCJLwsNVtTtNQ4zWX3Gnq683wzkYZeyOHUyftIgAQZ+HsY=\r\n-----END CERTIFICATE-----";
@@ -83,11 +86,23 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest { 
            "{ \"carrier-keys\": [ { \"key-identifier\": \"key1=value\", "

                    + "\"public-key\": \"" + CERT + "\"}]}";



    private CarrierConfigManager.CarrierConfigChangeListener mCarrierConfigChangeListener;



    @Before

    public void setUp() throws Exception {

        logd("CarrierActionAgentTest +Setup!");

        super.setUp(getClass().getSimpleName());

        mBundle = mContextFixture.getCarrierConfigBundle();

        when(mCarrierConfigManager.getConfigForSubId(anyInt(), any())).thenReturn(mBundle);



        // Capture listener to emulate the carrier config change notification used later

        ArgumentCaptor<CarrierConfigManager.CarrierConfigChangeListener> listenerArgumentCaptor =

                ArgumentCaptor.forClass(CarrierConfigManager.CarrierConfigChangeListener.class);

        mCarrierKeyDM = new CarrierKeyDownloadManager(mPhone);

        verify(mCarrierConfigManager).registerCarrierConfigChangeListener(any(),

                listenerArgumentCaptor.capture());

        mCarrierConfigChangeListener = listenerArgumentCaptor.getAllValues().get(0);



        processAllMessages();

        logd("CarrierActionAgentTest -Setup!");

    }
@@ -322,7 +337,7 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest { 
    }



    /**

     * Test sending the ACTION_CARRIER_CONFIG_CHANGED intent.

     * Test notifying the carrier config change from listener.

     * Verify that the right mnc/mcc gets stored in the preferences.

     **/

    @Test
@@ -337,16 +352,16 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest { 


        when(mTelephonyManager.getSimOperator(anyInt())).thenReturn("310260");

        when(mTelephonyManager.getSimCarrierId()).thenReturn(1);

        Intent mIntent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mIntent.putExtra(PhoneConstants.PHONE_KEY, 0);

        mContext.sendBroadcast(mIntent);

        mCarrierConfigChangeListener.onCarrierConfigChanged(0 /* slotIndex */,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID,

                TelephonyManager.UNKNOWN_CARRIER_ID, TelephonyManager.UNKNOWN_CARRIER_ID);

        processAllMessages();

        assertEquals("310260", mCarrierKeyDM.mMccMncForDownload);

        assertEquals(1, mCarrierKeyDM.mCarrierId);

    }



    /**

     * Tests sending the ACTION_CARRIER_CONFIG_CHANGED intent with an empty key.

     * Tests notifying carrier config change from listener with an empty key.

     * Verify that the carrier keys are removed if IMSI_KEY_DOWNLOAD_URL_STRING is null.

     */

    @Test
@@ -359,9 +374,9 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest { 
        bundle.putInt(CarrierConfigManager.IMSI_KEY_AVAILABILITY_INT, 3);

        bundle.putString(CarrierConfigManager.IMSI_KEY_DOWNLOAD_URL_STRING, null);



        Intent mIntent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mIntent.putExtra(PhoneConstants.PHONE_KEY, 0);

        mContext.sendBroadcast(mIntent);

        mCarrierConfigChangeListener.onCarrierConfigChanged(0 /* slotIndex */,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID,

                TelephonyManager.UNKNOWN_CARRIER_ID, TelephonyManager.UNKNOWN_CARRIER_ID);

        processAllMessages();

        assertNull(mCarrierKeyDM.mMccMncForDownload);