summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2018-01-08 23:01:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-08 23:01:15 +0000
commit9c53dba9a39e4e56d3b37da68d20ed96f28a6df7 (patch)
tree0a2beec9af01804653496080cac3cc758e604898
parent720fced0cb3d823a8d83c208fea2616a070d4924 (diff)
parentddf216440d3a9a7582f7dc3c51afc6d0447ffd6c (diff)
Merge "Sigh, people wrote tests with weird assumptions."
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index a49479916f24..2396a9eee92f 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -548,7 +548,8 @@ public class SubscriptionManager {
*/
@Deprecated
public static SubscriptionManager from(Context context) {
- return context.getSystemService(SubscriptionManager.class);
+ return (SubscriptionManager) context
+ .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
}
/**