diff options
| author | Wink Saville <wink@google.com> | 2014-11-22 20:19:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-22 20:19:25 +0000 |
| commit | 12c2136e556b54a717624d8479ec4650f363ce45 (patch) | |
| tree | c622e909ab642ce21030e9f5b860692c26bf31d1 /core/java/android/content | |
| parent | c398f175cdc2ceb31bc45b6541f7cd9c3c52406a (diff) | |
| parent | d09c4cad65c708f2c4810d24295456708a2000d2 (diff) | |
| download | frameworks_base-12c2136e556b54a717624d8479ec4650f363ce45.zip frameworks_base-12c2136e556b54a717624d8479ec4650f363ce45.tar.gz frameworks_base-12c2136e556b54a717624d8479ec4650f363ce45.tar.bz2 | |
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Context.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a73ba74..0daa8e2 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2245,6 +2245,8 @@ public abstract class Context { * @see android.media.MediaRouter * @see #TELEPHONY_SERVICE * @see android.telephony.TelephonyManager + * @see #TELEPHONY_SUBSCRIPTION_SERVICE + * @see android.telephony.SubscriptionManager * @see #INPUT_METHOD_SERVICE * @see android.view.inputmethod.InputMethodManager * @see #UI_MODE_SERVICE @@ -2589,6 +2591,16 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a + * {@link android.telephony.SubscriptionManager} for handling management the + * telephony subscriptions of the device. + * + * @see #getSystemService + * @see android.telephony.SubscriptionManager + */ + public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service"; + + /** + * Use with {@link #getSystemService} to retrieve a * {@link android.telecom.TelecomManager} to manage telecom-related features * of the device. * |