Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notify rcs config as needed when RCS service ready" am: a340c35a86 am: 18fb42d639

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ec6a9aaf0fae912be8819fb2e0b522a127ca18
This commit is contained in:
Hui Wang
2021-03-02 21:30:58 +00:00
committed by Automerger Merge Worker
parent 30ec6207cf 18fb42d639
commit 7f0e4d9f78
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
View File

@@ -37,6 +37,7 @@ import com.android.internal.telephony.util.RemoteCallbackListExt;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
/** /**
@@ -368,7 +369,13 @@ public class ImsConfigImplBase {
} }
private void onNotifyRcsAutoConfigurationReceived(byte[] config, boolean isCompressed) { 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 // can be null in testing
if (mRcsCallbacks != null) { if (mRcsCallbacks != null) {
mRcsCallbacks.broadcastAction(c -> { mRcsCallbacks.broadcastAction(c -> {