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

Merge "Change reference to Bundle.filterValues" am: 598b5d5340 am: 16e27b9a3e

Browse Source 
Change-Id: I7b2eaa1c24d15e18287d5c2c313b91c54b324276
This commit is contained in:
Automerger Merge Worker
2019-12-20 22:38:46 +00:00
parent 8d0af4a6a9 16e27b9a3e
commit 43079efe9f
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/ims/ImsCallProfile.java
View File

@@ -32,6 +32,7 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.util.TelephonyUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -833,7 +834,7 @@ public final class ImsCallProfile implements Parcelable {
}
int startSize = extras.size();
Bundle filtered = extras.filterValues();
Bundle filtered = TelephonyUtils.filterValues(extras);
int endSize = filtered.size();
if (startSize != endSize) {
Log.i(TAG, "maybeCleanseExtras: " + (startSize - endSize) + " extra values were "

29
telephony/java/com/android/internal/telephony/util/TelephonyUtils.java
View File

@@ -22,6 +22,8 @@ import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Binder;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.SystemProperties;
@@ -71,4 +73,31 @@ public final class TelephonyUtils {
if (resolveInfo.providerInfo != null) return resolveInfo.providerInfo;
throw new IllegalStateException("Missing ComponentInfo!");
}
/**
* Filter values in bundle to only basic types.
*/
public static Bundle filterValues(Bundle bundle) {
Bundle ret = new Bundle(bundle);
for (String key : bundle.keySet()) {
Object value = bundle.get(key);
if ((value instanceof Integer) || (value instanceof Long)
|| (value instanceof Double) || (value instanceof String)
|| (value instanceof int[]) || (value instanceof long[])
|| (value instanceof double[]) || (value instanceof String[])
|| (value instanceof PersistableBundle) || (value == null)
|| (value instanceof Boolean) || (value instanceof boolean[])) {
continue;
}
if (value instanceof Bundle) {
ret.putBundle(key, filterValues((Bundle) value));
continue;
}
if (value.getClass().getName().startsWith("android.")) {
continue;
}
ret.remove(key);
}
return ret;
}
}