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

Commit 3b3f307a authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Revert registerReceiver change until bug fixed 

Bug: 141323834
Test: atest GtsTelephonyTestCases
Change-Id: I2ae6e46c2be8f1e1db7f974e442ffd50aaaf8d52
parent 058c514a

src/java/com/android/internal/telephony/ims/ImsResolver.java

+3 −8
Original line number Diff line number Diff line
@@ -532,14 +532,9 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
            appChangedFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);

            appChangedFilter.addAction(Intent.ACTION_PACKAGE_ADDED);

            appChangedFilter.addDataScheme("package");

            try {

                Context contextAsUser = context.createPackageContextAsUser(

                    context.getPackageName(), 0, UserHandle.ALL);

                contextAsUser.registerReceiver(mAppChangedReceiver, appChangedFilter,

                    null /* broadcastPermission */, null);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "Package name not found: " + e.getMessage());

            }

            context.registerReceiverAsUser(mAppChangedReceiver, UserHandle.ALL, appChangedFilter,

                    null,

                    null);

            context.registerReceiver(mConfigChangedReceiver, new IntentFilter(

                    CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));

            context.registerReceiver(mBootCompleted, new IntentFilter(

tests/telephonytests/src/com/android/internal/telephony/ims/ImsResolverTest.java

+2 −11
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static junit.framework.Assert.assertEquals; 
import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.assertNull;

import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;

import static junit.framework.TestCase.assertFalse;



import static org.mockito.ArgumentMatchers.argThat;
@@ -40,7 +39,6 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.net.Uri;
@@ -925,13 +923,6 @@ public class ImsResolverTest extends ImsTestBase { 


    private void setupResolver(int numSlots) {

        when(mMockContext.getPackageManager()).thenReturn(mMockPM);

        try {

            when(mMockContext.createPackageContextAsUser(any(), eq(0), any()))

                .thenReturn(mMockContext);

        } catch (NameNotFoundException ex) {

            fail("Package name not found: " + ex.getMessage());

        }



        when(mMockContext.getSystemService(eq(Context.CARRIER_CONFIG_SERVICE))).thenReturn(

                mMockCarrierConfigManager);

        mCarrierConfigs = new PersistableBundle[numSlots];
@@ -952,8 +943,8 @@ public class ImsResolverTest extends ImsTestBase { 
                ArgumentCaptor.forClass(BroadcastReceiver.class);

        ArgumentCaptor<BroadcastReceiver> receiversCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);

        verify(mMockContext).registerReceiver(packageBroadcastCaptor.capture(), any(),

                any(), any());

        verify(mMockContext).registerReceiverAsUser(packageBroadcastCaptor.capture(), any(),

                any(), any(), any());

        mTestPackageBroadcastReceiver = packageBroadcastCaptor.getValue();

        verify(mMockContext, times(2)).registerReceiver(receiversCaptor.capture(), any());

        mTestCarrierConfigReceiver = receiversCaptor.getAllValues().get(0);