diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-05 19:37:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 19:37:59 -0700 |
| commit | a06ad953a2c44e81ea2d376ffefeae5ffb91de81 (patch) | |
| tree | c348bc86404ff07a76b424079bcdb6df2c2282ce /core | |
| parent | a68a0ebb51fdf00e0be0b77f03c6f3af3095973d (diff) | |
| parent | 7324489f18ee01586931f577f00567092cbf52df (diff) | |
| download | frameworks_base-a06ad953a2c44e81ea2d376ffefeae5ffb91de81.zip frameworks_base-a06ad953a2c44e81ea2d376ffefeae5ffb91de81.tar.gz frameworks_base-a06ad953a2c44e81ea2d376ffefeae5ffb91de81.tar.bz2 | |
am 7324489f: Merge "Add SIP service into system server." into gingerbread
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp
* commit '7324489f18ee01586931f577f00567092cbf52df':
Add SIP service into system server.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Context.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index aecdcb3..0100550 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1546,6 +1546,15 @@ public abstract class Context { public static final String DOWNLOAD_SERVICE = "download"; /** + * Use with {@link #getSystemService} to retrieve a + * {@link android.net.sip.SipManager} for accessing the SIP related service. + * + * @see #getSystemService + */ + /** @hide */ + public static final String SIP_SERVICE = "sip"; + + /** * Determine whether the given permission is allowed for a particular * process and user ID running in the system. * |