summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ContextImpl.java8
-rw-r--r--core/java/android/content/Context.java15
2 files changed, 21 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 425a140..fa2266b 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -113,6 +113,7 @@ 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;
@@ -560,6 +561,13 @@ class ContextImpl extends Context {
ITelecommService.Stub.asInterface(b));
}});
+ registerService(PHONE_SERVICE, new ServiceFetcher() {
+ public Object createService(ContextImpl ctx) {
+ IBinder b = ServiceManager.getService(TELECOMM_SERVICE);
+ return new PhoneManager(ctx.getOuterContext(),
+ ITelecommService.Stub.asInterface(b));
+ }});
+
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 fd19b40..80b6b58 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2164,8 +2164,8 @@ public abstract class Context {
* @see android.media.MediaRouter
* @see #TELEPHONY_SERVICE
* @see android.telephony.TelephonyManager
- * @see #TELECOMM_SERVICE
- * @see android.telecomm.TelecommManager
+ * @see #PHONE_SERVICE
+ * @see android.phone.PhoneManager
* @see #INPUT_METHOD_SERVICE
* @see android.view.inputmethod.InputMethodManager
* @see #UI_MODE_SERVICE
@@ -2502,11 +2502,22 @@ public abstract class Context {
*
* @see #getSystemService
* @see android.telecomm.TelecommManager
+ * @hide
*/
public static final String TELECOMM_SERVICE = "telecomm";
/**
* 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.
*