diff options
author | Paul Duffin <paulduffin@google.com> | 2015-01-06 16:18:11 +0000 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2015-01-09 11:55:57 +0000 |
commit | b8311a3338949748a9c3e208c0a9329255d57d35 (patch) | |
tree | 512166948886f887d64cd2e59db59f0745c0a63d /guava/src/com/google/common/util/concurrent/ServiceManager.java | |
parent | 3c77433663281544363151bf284b0240dfd22a42 (diff) | |
download | android_external_guava-b8311a3338949748a9c3e208c0a9329255d57d35.tar.gz android_external_guava-b8311a3338949748a9c3e208c0a9329255d57d35.tar.bz2 android_external_guava-b8311a3338949748a9c3e208c0a9329255d57d35.zip |
Remove usages of the jsr-330 annotations
Fixes a build error on Android.
Backport of commit 53a99310959a8d91420162a1116225acce5082dd
from guava source repository
See https://code.google.com/p/guava-libraries/issues/detail?id=1433
for the hilariously depressing rationale.
Change-Id: Ia73665db516f8366cd766e686958c0d09955b614
Diffstat (limited to 'guava/src/com/google/common/util/concurrent/ServiceManager.java')
-rw-r--r-- | guava/src/com/google/common/util/concurrent/ServiceManager.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/guava/src/com/google/common/util/concurrent/ServiceManager.java b/guava/src/com/google/common/util/concurrent/ServiceManager.java index c779b23..9b1bfcd 100644 --- a/guava/src/com/google/common/util/concurrent/ServiceManager.java +++ b/guava/src/com/google/common/util/concurrent/ServiceManager.java @@ -46,8 +46,6 @@ import java.util.logging.Logger; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.Immutable; -import javax.inject.Inject; -import javax.inject.Singleton; /** * A manager for monitoring and controlling a set of {@link Service services}. This class provides @@ -101,7 +99,6 @@ import javax.inject.Singleton; * @since 14.0 */ @Beta -@Singleton public final class ServiceManager { private static final Logger logger = Logger.getLogger(ServiceManager.class.getName()); @@ -182,7 +179,7 @@ public final class ServiceManager { * * @throws IllegalStateException if not all services are {@link State#NEW new}. */ - @Inject ServiceManager(Set<Service> services) { + ServiceManager(Set<Service> services) { this((Iterable<Service>) services); } |