diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-25 22:24:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 22:24:09 +0000 |
| commit | e4b1d57dfd89035a67984e1a295d5ef5b97953be (patch) | |
| tree | e77671dbbc5a463fba8b412d32c0e97799650ade /core/java/android | |
| parent | 5480b3746af1efcd94b2d05c477324de7878b1e9 (diff) | |
| parent | 0eb1e402c7e612887e38dc5516f11506b11fd835 (diff) | |
| download | frameworks_base-e4b1d57dfd89035a67984e1a295d5ef5b97953be.zip frameworks_base-e4b1d57dfd89035a67984e1a295d5ef5b97953be.tar.gz frameworks_base-e4b1d57dfd89035a67984e1a295d5ef5b97953be.tar.bz2 | |
Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index da343ac..884b046 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -122,7 +122,6 @@ import android.os.SystemVibrator; import android.os.UserManager; import android.os.storage.IMountService; import android.os.storage.StorageManager; -import android.phone.PhoneManager; import android.print.IPrintManager; import android.print.PrintManager; import android.service.fingerprint.IFingerprintService; @@ -570,11 +569,6 @@ class ContextImpl extends Context { return new TelecommManager(ctx.getOuterContext()); }}); - registerService(PHONE_SERVICE, new ServiceFetcher() { - public Object createService(ContextImpl ctx) { - return new PhoneManager(ctx.getOuterContext()); - }}); - registerService(UI_MODE_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { return new UiModeManager(); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a13a928..ebb1f77 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2203,8 +2203,6 @@ public abstract class Context { * @see android.media.MediaRouter * @see #TELEPHONY_SERVICE * @see android.telephony.TelephonyManager - * @see #PHONE_SERVICE - * @see android.phone.PhoneManager * @see #INPUT_METHOD_SERVICE * @see android.view.inputmethod.InputMethodManager * @see #UI_MODE_SERVICE @@ -2558,16 +2556,6 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a - * {@link android.phone.PhoneManager} to manage phone-related features - * of the device. - * - * @see #getSystemService - * @see android.phone.PhoneManager - */ - public static final String PHONE_SERVICE = "phone_service"; // "phone" used by telephony. - - /** - * Use with {@link #getSystemService} to retrieve a * {@link android.text.ClipboardManager} for accessing and modifying * the contents of the global clipboard. * |