From 306ae9551a21d668a26afeec8d5f494a30a992eb Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Thu, 23 Jan 2020 18:05:51 -0800 Subject: [PATCH 1/2] Delete unused reference of a hidden constant. SimInfo.SIM_PROVISIONING_STATUS is accessed but not used. Test: basic sanity Bug: 140908357 Merged-in: Idce09cff62411f38ac4b88437f1cfefce39e7e95 Change-Id: Idce09cff62411f38ac4b88437f1cfefce39e7e95 --- telephony/java/android/telephony/SubscriptionManager.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 1cf8f1e72a275..630815c72bbb7 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -513,13 +513,6 @@ public class SubscriptionManager { */ public static final String ISO_COUNTRY_CODE = SimInfo.ISO_COUNTRY_CODE; - /** - * TelephonyProvider column name for the sim provisioning status associated with a SIM. - *

Type: INTEGER (int)

- * @hide - */ - public static final String SIM_PROVISIONING_STATUS = SimInfo.SIM_PROVISIONING_STATUS; - /** * TelephonyProvider column name for whether a subscription is embedded (that is, present on an * eSIM). From f035fd91aa865f05adc800a5861edeb4ebbc6bc5 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Thu, 23 Jan 2020 18:13:02 -0800 Subject: [PATCH 2/2] Move euicc related file to telephony. All other files were moved earlier. This is a newly added file that was added in the old location. Test: basic sanity Bug: 140908357 Merged-in: I756b5834ddb1031627168a17dc49ce93b5af8219 Change-Id: I756b5834ddb1031627168a17dc49ce93b5af8219 (cherry picked from commit 235289719b93f68df1d2d59a9aaa4e7e67bebf69) --- .../android/service/euicc/IEuiccServiceDumpResultCallback.aidl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {core => telephony}/java/android/service/euicc/IEuiccServiceDumpResultCallback.aidl (100%) diff --git a/core/java/android/service/euicc/IEuiccServiceDumpResultCallback.aidl b/telephony/java/android/service/euicc/IEuiccServiceDumpResultCallback.aidl similarity index 100% rename from core/java/android/service/euicc/IEuiccServiceDumpResultCallback.aidl rename to telephony/java/android/service/euicc/IEuiccServiceDumpResultCallback.aidl