summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2019-08-01 16:28:14 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-01 16:28:14 -0700
commit00de76a6c1ff3b97031d539ceb9978504a5a6113 (patch)
tree9800340bf40265dbb528bead4b826a24dde8722a /core/java/android
parent3d7207827b31f5a1cf17b7d02017a8fa9319351b (diff)
parent3a2c7a7fa38dda833ca1f7691ce30041ae653134 (diff)
Merge "Fix lint error getSystemService for EuiccManager" am: 97245795e7 am: 3856b9e7d4
am: 3a2c7a7fa3 Change-Id: Ifa4750a2b3e42745541de9317818e876a0275acb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Context.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 7a013f176691..73bc908632b2 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3197,6 +3197,7 @@ public abstract class Context {
TELEPHONY_SERVICE,
TELEPHONY_SUBSCRIPTION_SERVICE,
CARRIER_CONFIG_SERVICE,
+ EUICC_SERVICE,
TELECOM_SERVICE,
CLIPBOARD_SERVICE,
INPUT_METHOD_SERVICE,
@@ -3387,6 +3388,8 @@ public abstract class Context {
* @see android.telephony.SubscriptionManager
* @see #CARRIER_CONFIG_SERVICE
* @see android.telephony.CarrierConfigManager
+ * @see #EUICC_SERVICE
+ * @see android.telephony.euicc.EuiccManager
* @see #INPUT_METHOD_SERVICE
* @see android.view.inputmethod.InputMethodManager
* @see #UI_MODE_SERVICE