diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-25 00:16:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-25 00:16:50 +0000 |
| commit | 76b7e675938cb2214db44a24cca392a4c31b5709 (patch) | |
| tree | 5cfc7d2109a5fa2c88f91530ee29b30586c909f5 | |
| parent | fef9ccf3a3305b25292b10b5ff5b6e83f0d9fd1e (diff) | |
| parent | c88ca3b22b01869ecc26d60075042f5e6a6b5ded (diff) | |
| download | base-76b7e675938cb2214db44a24cca392a4c31b5709.tar.gz | |
Merge cherrypicks of [6161352, 6161353, 6161354, 6161355, 6161236, 6161237, 6161238, 6161759, 6161608, 6161356, 6161760, 6161654, 6161422, 6161423, 6161424, 6161425, 6161426, 6161427, 6161819, 6161357, 6161358, 6161428, 6161429, 6161430, 6159952, 6159858] into pi-b4s4-release
Change-Id: I81b20d954d16be6a5ad083cc5a394b82a80b6f5e
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c574fb4d6605..03a2dce56151 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7581,6 +7581,9 @@ public class TelephonyManager { @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int slotIndex, List<CarrierIdentifier> carriers) { + if (slotIndex < 0 || slotIndex > getPhoneCount()) { + return -1; + } try { ITelephony service = getITelephony(); if (service != null) { |