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

Commit 5d15fd10 authored by Allen Xu's avatar Allen Xu Committed by Automerger Merge Worker
Browse files

Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" am: 4797e99e 

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



Change-Id: I857a4660a339cb10ba5cca1c0860b2ce0b859fc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d85933c 4797e99e

telephony/java/android/telephony/CarrierConfigManager.java

+11 −27
Original line number Diff line number Diff line
@@ -6836,42 +6836,26 @@ public class CarrierConfigManager { 
    private void addConfig(String key, Object value, PersistableBundle configs) {

        if (value instanceof String) {

            configs.putString(key, (String) value);

        }



        if (value instanceof String[]) {

        } else if (value instanceof String[]) {

            configs.putStringArray(key, (String[]) value);

        }



        if (value instanceof Integer) {

        } else if (value instanceof Integer) {

            configs.putInt(key, (Integer) value);

        }



        if (value instanceof Long) {

        } else if (value instanceof Long) {

            configs.putLong(key, (Long) value);

        }



        if (value instanceof Double) {

        } else if (value instanceof Double) {

            configs.putDouble(key, (Double) value);

        }



        if (value instanceof Boolean) {

        } else if (value instanceof Boolean) {

            configs.putBoolean(key, (Boolean) value);

        }



        if (value instanceof int[]) {

        } else if (value instanceof int[]) {

            configs.putIntArray(key, (int[]) value);

        }



        if (value instanceof double[]) {

        } else if (value instanceof double[]) {

            configs.putDoubleArray(key, (double[]) value);

        }



        if (value instanceof boolean[]) {

        } else if (value instanceof boolean[]) {

            configs.putBooleanArray(key, (boolean[]) value);

        }



        if (value instanceof long[]) {

        } else if (value instanceof long[]) {

            configs.putLongArray(key, (long[]) value);

        } else if (value instanceof PersistableBundle) {

            configs.putPersistableBundle(key, (PersistableBundle) value);

        }

    }

}