Snap for 11819167 from a2b5e22b07935168825b1120c729832df3f4611c to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: I6847439e517f779a627b49d46d547333dbd634f4

3 files changed, 65 insertions, 39 deletions

diff --git a/Android.bp b/Android.bp
index 0eab8ec..f846c3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,27 +5,27 @@ package {
 java_library {
     name: "ConnectedAppsSDK_Annotations",
     srcs: [
-        "annotations/src/main/java/**/*.java"
+        "annotations/src/main/java/**/*.java",
     ],
-    host_supported: true
+    host_supported: true,
 }
 
 java_library {
     name: "ConnectedAppsSDK_Test_Annotations",
     srcs: [
-        "testing/annotations/src/main/java/**/*.java"
+        "testing/annotations/src/main/java/**/*.java",
     ],
-    host_supported: true
+    host_supported: true,
 }
 
 filegroup {
     name: "ConnectedAppsSDK_Resources",
 
     srcs: [
-        "processor/src/main/resources/**/*"
+        "processor/src/main/resources/**/*",
     ],
 
-    path: "processor/src/main/resources"
+    path: "processor/src/main/resources",
 }
 
 java_plugin {
@@ -40,27 +40,30 @@ java_plugin {
         "error_prone_annotations",
         "guava",
         "ConnectedAppsSDK_Annotations",
-        "ConnectedAppsSDK_Test_Annotations"
+        "ConnectedAppsSDK_Test_Annotations",
     ],
     srcs: [
-        "processor/src/main/java/**/*.java"
+        "processor/src/main/java/**/*.java",
     ],
     java_resources: [
-        ":ConnectedAppsSDK_Resources"
+        ":ConnectedAppsSDK_Resources",
+    ],
+    plugins: [
+        "auto_service_plugin",
+        "auto_value_plugin",
     ],
-    plugins: ["auto_service_plugin", "auto_value_plugin"],
     generates_api: true,
-    use_tools_jar: true
+    use_tools_jar: true,
 }
 
 filegroup {
     name: "ConnectedAppsSDK_AIDL",
 
     srcs: [
-        "sdk/src/main/aidl/**/*.aidl"
+        "sdk/src/main/aidl/**/*.aidl",
     ],
 
-    path: "sdk/src/main/aidl"
+    path: "sdk/src/main/aidl",
 }
 
 android_library {
@@ -68,7 +71,7 @@ android_library {
     sdk_version: "test_current",
     srcs: [
         "sdk/src/main/java/**/*.java",
-        ":ConnectedAppsSDK_AIDL"
+        ":ConnectedAppsSDK_AIDL",
     ],
     static_libs: [
         "ConnectedAppsSDK_Annotations",
@@ -91,4 +94,44 @@ android_library {
     ],
     manifest: "testing/sdk/src/main/AndroidManifest.xml",
     min_sdk_version: "28",
-}
\ No newline at end of file
+}
+
+android_library {
+    name: "ConnectedAppsSDK_SharedTestApp",
+    sdk_version: "test_current",
+    srcs: [
+        "tests/shared/src/main/java/**/*.java",
+    ],
+    manifest: "tests/shared/src/main/AndroidManifest.xml",
+    min_sdk_version: "28",
+    static_libs: [
+        "ConnectedAppsSDK_Annotations",
+        "ConnectedAppsSDK",
+        "guava",
+        "truth",
+    ],
+    plugins: ["ConnectedAppsSDK_Processor"],
+}
+
+// We only run instrumented tests in AOSP
+android_test {
+    name: "ConnectedAppsSDKTest",
+    srcs: [
+        "tests/instrumented/src/main/java/**/*.java",
+    ],
+    test_suites: [
+        "general-tests",
+    ],
+    static_libs: [
+        "ConnectedAppsSDK",
+        "ConnectedAppsSDK_Annotations",
+        "ConnectedAppsSDK_SharedTestApp",
+        "ConnectedAppsSDK_Testing",
+        "androidx.test.ext.junit",
+        "ctstestrunner-axt",
+        "truth",
+        "testng", // for assertThrows
+    ],
+    manifest: "tests/instrumented/src/AndroidManifest.xml",
+    min_sdk_version: "28",
+}
diff --git a/connectedappssdk.iml b/connectedappssdk.iml
deleted file mode 100644
index 5fa0513..0000000
--- a/connectedappssdk.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager" inherit-compiler-output="true">
-        <exclude-output />
-        <content url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk">
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/annotations/src/main/java" isTestSource="false" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/processor/src/main/java" isTestSource="false" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/sdk/src/main/java" isTestSource="false" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/testing/annotations/src/main/java" isTestSource="false" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/testing/sdk/src/main/java" isTestSource="false" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/tests/instrumented/src/main/java" isTestSource="true" />
-            <sourceFolder url="file:///usr/local/google/home/scottjonathan/android-master/external/connectedappssdk/tests/shared/src/main/java" isTestSource="true" />
-        </content>
-        <orderEntry type="sourceFolder" forTests="false" />
-        <orderEntry type="module" module-name="framework_srcjars" />
-        <orderEntry type="module" module-name="base" />
-        <orderEntry type="module" module-name="cts" />
-        <orderEntry type="module" module-name="dependencies" />
-        <orderEntry type="inheritedJdk" />
-    </component>
-</module>
diff --git a/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java b/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java
index 0432696..91aaadc 100644
--- a/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java
+++ b/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java
@@ -49,11 +49,13 @@ import com.google.android.enterprise.connectedapps.internal.CrossProfileBundleCa
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.WeakHashMap;
+import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.CountDownLatch;
@@ -283,13 +285,15 @@ public final class CrossProfileSender {
   // This is synchronized which isn't massively performant but it only gets accessed once straight
   // after creating a Sender, and once each time availability changes
   private static final Set<CrossProfileSender> senders =
-      synchronizedSet(newSetFromMap(new WeakHashMap<>()));
+     synchronizedSet(newSetFromMap(new WeakHashMap<>()));
 
   private static final BroadcastReceiver profileAvailabilityReceiver = new BroadcastReceiver() {
     @Override
     public void onReceive(Context context, Intent intent) {
-      for (CrossProfileSender sender : senders) {
-        sender.scheduledExecutorService.execute(sender::checkAvailability);
+      synchronized (senders) {
+        for (CrossProfileSender sender : senders) {
+          sender.scheduledExecutorService.execute(sender::checkAvailability);
+        }
       }
     }
   };