diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2022-03-15 19:47:58 -0700 |
|---|---|---|
| committer | Dana Dahlstrom <dahlstrom@google.com> | 2022-03-16 16:00:00 -0700 |
| commit | 9bf4d6e1dfbc4f17717edf4fabc9941824071ce6 (patch) | |
| tree | 1f0d7b68ed5afcca24cb237af57ca75d2c482a24 | |
| parent | c2ff0f4f2b573f1ba91612848b7608b018cb7440 (diff) | |
| download | idea-9bf4d6e1dfbc4f17717edf4fabc9941824071ce6.tar.gz | |
Remove jsr305 annotations
... erroneously picked up through a transitive dependency of
grpc_core version 1.21.1 in the platform.
Bug: 176938468
Change-Id: Ied0be7f9af4d6d25eda116bfe9ee04b7738caabc
3 files changed, 3 insertions, 3 deletions
diff --git a/android/src/com/android/tools/idea/configurations/ResourceResolverCache.java b/android/src/com/android/tools/idea/configurations/ResourceResolverCache.java index daba1068af0..b41f155cb66 100644 --- a/android/src/com/android/tools/idea/configurations/ResourceResolverCache.java +++ b/android/src/com/android/tools/idea/configurations/ResourceResolverCache.java @@ -19,6 +19,7 @@ import static com.android.SdkConstants.PREFIX_RESOURCE_REF; import com.android.SdkConstants; import com.android.annotations.concurrency.Slow; +import com.android.annotations.concurrency.GuardedBy; import com.android.ide.common.rendering.api.ResourceNamespace; import com.android.ide.common.rendering.api.ResourceReference; import com.android.ide.common.resources.ResourceRepository; @@ -42,7 +43,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.concurrent.GuardedBy; import org.jetbrains.android.sdk.AndroidPlatform; import org.jetbrains.android.sdk.AndroidTargetData; import org.jetbrains.android.sdk.CompatibilityRenderTarget; diff --git a/emulator/src/com/android/tools/idea/device/VideoDecoder.kt b/emulator/src/com/android/tools/idea/device/VideoDecoder.kt index 3ee786d03c9..a1275badfd2 100644 --- a/emulator/src/com/android/tools/idea/device/VideoDecoder.kt +++ b/emulator/src/com/android/tools/idea/device/VideoDecoder.kt @@ -16,6 +16,7 @@ package com.android.tools.idea.device import com.android.annotations.concurrency.AnyThread +import com.android.annotations.concurrency.GuardedBy import com.android.tools.idea.emulator.coerceAtMost import com.intellij.openapi.diagnostic.thisLogger import com.intellij.util.containers.ContainerUtil @@ -75,7 +76,6 @@ import java.nio.ByteBuffer import java.nio.ByteOrder.LITTLE_ENDIAN import java.nio.channels.ClosedChannelException import java.util.function.Consumer -import javax.annotation.concurrent.GuardedBy internal class VideoDecoder(private val videoChannel: SuspendingSocketChannel, @Volatile var maxOutputSize: Dimension) { diff --git a/logcat/src/com/android/tools/idea/logcat/ProjectAppMonitor.kt b/logcat/src/com/android/tools/idea/logcat/ProjectAppMonitor.kt index 3b302ebaa1d..4b7cce170b1 100644 --- a/logcat/src/com/android/tools/idea/logcat/ProjectAppMonitor.kt +++ b/logcat/src/com/android/tools/idea/logcat/ProjectAppMonitor.kt @@ -16,6 +16,7 @@ package com.android.tools.idea.logcat import com.android.annotations.concurrency.AnyThread +import com.android.annotations.concurrency.GuardedBy import com.android.ddmlib.AndroidDebugBridge.IClientChangeListener import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener import com.android.ddmlib.Client @@ -28,7 +29,6 @@ import com.android.tools.idea.concurrency.AndroidDispatchers import com.jetbrains.rd.util.concurrentMapOf import kotlinx.coroutines.launch import org.jetbrains.annotations.VisibleForTesting -import javax.annotation.concurrent.GuardedBy /** * Listens to [IDeviceChangeListener.deviceChanged] and [IClientChangeListener.clientChanged] and monitors project related client processes |