summaryrefslogtreecommitdiff
path: root/telephony/java/com
diff options
context:
space:
mode:
authorXiangyu/Malcolm Chen <refuhoo@google.com>2020-05-09 02:03:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-09 02:03:51 +0000
commit99b0cf2dc8ecccb1f75acadfc662c17f9cb0dbbd (patch)
tree0251b40eaae9a077697e6101b8cb55fcd43521a2 /telephony/java/com
parent9acfd62cff40689cd6dbcb9571a7fbd5a8b8d666 (diff)
parent6a5a8d74a855032836ee231aabc3e1c5a4a8495b (diff)
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8
Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/TelephonyProperties.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
index ff70f8ba3936..29286e8f429e 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
@@ -240,5 +240,5 @@ public interface TelephonyProperties
* two.
* Type: int
*/
- static final String PROPERTY_MAX_ACTIVE_MODEMS = "ro.telephony.max.active.modems";
+ static final String PROPERTY_MAX_ACTIVE_MODEMS = "telephony.active_modems.max_count";
}