From 3eb1e653007e18b36026bd7a934466a6bad248b6 Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Wed, 11 Dec 2019 17:07:22 -0800
Subject: [PATCH] Remove hidden API usage: TelephonyManager#getSimOperator(int
 subId)

Replaced with TelephonyManager.createForSubscriptionId(subId).getSimOperator().

Bug: 140908357
Test: make
Change-Id: Ieab38e89bd9c3b8d734cc4544d2905cf88e12dbf
---
 .../android/server/emergency/EmergencyAffordanceService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java b/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
index a91fe773a5cfc..1cf27ffd1903d 100644
--- a/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
+++ b/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
@@ -231,7 +231,8 @@ public class EmergencyAffordanceService extends SystemService {
                 // a Sim with a different mcc code was found
                 neededNow = false;
             }
-            String simOperator  = mTelephonyManager.getSimOperator(info.getSubscriptionId());
+            String simOperator = mTelephonyManager
+                    .createForSubscriptionId(info.getSubscriptionId()).getSimOperator();
             mcc = 0;
             if (simOperator != null && simOperator.length() >= 3) {
                 mcc = Integer.parseInt(simOperator.substring(0, 3));