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

Commit 7f0e4d9f authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Notify rcs config as needed when RCS service ready" am: a340c35a am: 18fb42d6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ec6a9aaf0fae912be8819fb2e0b522a127ca18
parents 30ec6207 18fb42d6

telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.telephony.util.RemoteCallbackListExt; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.HashMap;



/**
@@ -368,7 +369,13 @@ public class ImsConfigImplBase { 
    }



    private void onNotifyRcsAutoConfigurationReceived(byte[] config, boolean isCompressed) {

        mRcsConfigData = isCompressed ? RcsConfig.decompressGzip(config) : config;

        // cache uncompressed config

        config = isCompressed ? RcsConfig.decompressGzip(config) : config;

        if (Arrays.equals(mRcsConfigData, config)) {

            return;

        }

        mRcsConfigData = config;



        // can be null in testing

        if (mRcsCallbacks != null) {

            mRcsCallbacks.broadcastAction(c -> {