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

Commit 18fb42d6 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 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86cc208bb12d6d40876d06553f8a70200e8d9fac
parents aa4c7d0f a340c35a

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 -> {