commit 94a9a3258564d62e367e9e61ddeb7a707338ea49
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 28 19:33:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 28 19:33:24 2023 +0000
tree 7cab0974101f2dc35a727b463de59f0dfc8529a4
parent 3dad1cabd086cd3b19be48a39cfcd26198991da3
parent 0ca0039118acb8ebbd313451068a40c2e82283c9

Merge "Renamed name source to display name source" am: 0ca0039118

Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2459268

Change-Id: I5b835f981c6873fb08b00e7d15d67f18b8899f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java

diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index bb90c69..aead597 100644
--- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -1085,7 +1085,7 @@
         msg.put("iccId", data.getIccId());
         msg.put("simSlotIndex", data.getSimSlotIndex());
         msg.put("displayName", data.getDisplayName());
-        msg.put("nameSource", data.getNameSource());
+        msg.put("nameSource", data.getDisplayNameSource());
         msg.put("iconTint", data.getIconTint());
         msg.put("number", data.getNumber());
         msg.put("dataRoaming", data.getDataRoaming());