diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-07-20 17:47:12 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2014-07-21 01:43:30 +0000 |
| commit | 5c6fa95e378f54b3b144614110584dc79822f004 (patch) | |
| tree | 83c58e1a7b0c42e54df5a7a15be1ec494a1d32ca /telecomm | |
| parent | a37cb8b6e3b48784e460d5d30bc3d827e3b4cafc (diff) | |
| download | frameworks_base-5c6fa95e378f54b3b144614110584dc79822f004.zip frameworks_base-5c6fa95e378f54b3b144614110584dc79822f004.tar.gz frameworks_base-5c6fa95e378f54b3b144614110584dc79822f004.tar.bz2 | |
Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
Bug: 16416927
Change-Id: If2d1c19134d2245677f7e0b3d94b118d9b50e751
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecomm/ConnectionService.java | 10 | ||||
| -rw-r--r-- | telecomm/java/android/telecomm/TelecommManager.java | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java index c8a548d..968bd88 100644 --- a/telecomm/java/android/telecomm/ConnectionService.java +++ b/telecomm/java/android/telecomm/ConnectionService.java @@ -16,10 +16,12 @@ package android.telecomm; +import android.annotation.SdkConstant; +import android.annotation.SdkConstant.SdkConstantType; import android.app.PendingIntent; import android.app.Service; -import android.content.Intent; import android.content.ComponentName; +import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -42,6 +44,12 @@ import java.util.Map; * Android device. */ public abstract class ConnectionService extends Service { + /** + * The {@link Intent} that must be declared as handled by the service. + */ + @SdkConstant(SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE = "android.telecomm.ConnectionService"; + // Flag controlling whether PII is emitted into the logs private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); private static final Connection NULL_CONNECTION = new Connection() {}; diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index aaf959e..c76d670 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -49,12 +49,6 @@ public class TelecommManager { public static final String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL"; /** - * The service action used to bind to {@link android.telecomm.ConnectionService} - * implementations. - */ - public static final String ACTION_CONNECTION_SERVICE = ConnectionService.class.getName(); - - /** * The {@link android.content.Intent} action used to configure a * {@link android.telecomm.ConnectionService}. */ |