diff options
| author | Judy Chen <judytzchen@google.com> | 2019-01-25 12:35:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-25 12:39:48 +0000 |
| commit | 331fcb62dfb934e0fc29ac7cdafb1a8c30bbe471 (patch) | |
| tree | 4c4cf35e7facfbf99bdc3687edf383c1947c3aaa | |
| parent | 76b7e675938cb2214db44a24cca392a4c31b5709 (diff) | |
| download | base-331fcb62dfb934e0fc29ac7cdafb1a8c30bbe471.tar.gz | |
Revert "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"
This reverts commit 76b7e675938cb2214db44a24cca392a4c31b5709.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I7fd7db5a2b6912db28904b038c69290acf451730
(cherry picked from commit 0e63068d9082389a3302107f851a30637a8575e6)
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 03a2dce56151..c574fb4d6605 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7581,9 +7581,6 @@ 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) { |