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

Commit 71a661ec authored by Xin Li's avatar Xin Li
Browse files

Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 

Bug: 248070379
Merged-In: Ie61f2488a0bad23807f84cb55fcdcb2aae407191
Change-Id: Ia265376d6d729c261518baa162dccd5e4ffdd5e2
parents 57c1ccac 0594b617

src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ public class DeviceCapabilityListener { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        filter.addAction(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);

        mContext.registerReceiver(mReceiver, filter);

        mContext.registerReceiver(mReceiver, filter, android.Manifest.permission.MODIFY_PHONE_STATE,

                null);



        ContentResolver resolver = mContext.getContentResolver();

        if (resolver != null) {

tests/src/com/android/ims/ContextFixture.java

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.IntentFilter; 
import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.os.Handler;

import android.os.PersistableBundle;

import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;
@@ -130,6 +131,12 @@ public class ContextFixture { 
            return null;

        }



        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {

            return null;

        }



        @Override

        public void unregisterReceiver(BroadcastReceiver receiver) {

        }

tests/src/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListenerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ public class DeviceCapabilityListenerTest extends ImsTestBase { 


        deviceCapListener.initialize();



        verify(mContext).registerReceiver(any(), any());

        verify(mContext).registerReceiver(any(), any(),

            eq(android.Manifest.permission.MODIFY_PHONE_STATE), any());

        verify(mProvisioningManager).registerProvisioningChangedCallback(any(), any());

    }