EN: Add latest API details, improve performance

play-services-basement/src/main/java/com/google/android/gms/common/api/ApiException.java

@@ -1,6 +1,12 @@
-package com.google.android.gms.common.api;
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
 
-import com.google.android.gms.common.api.Status;
+package com.google.android.gms.common.api;
 
 import org.microg.gms.common.PublicApi;
 

play-services-basement/src/main/java/com/google/android/gms/common/api/ResolvableApiException.java

@@ -1,3 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
 package com.google.android.gms.common.api;
 
 import android.app.Activity;

play-services-nearby-api/build.gradle

@@ -23,6 +23,5 @@ android {
 
 dependencies {
     api project(':play-services-basement')
-
     api project(':play-services-base-api')
 }

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/DailySummary.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification;
+
+parcelable DailySummary;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/DiagnosisKeysDataMapping.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification;
+
+parcelable DiagnosisKeysDataMapping;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/ExposureWindow.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification;
+
+parcelable ExposureWindow;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/GetCalibrationConfidenceParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable GetCalibrationConfidenceParams;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/GetDailySummariesParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable GetDailySummariesParams;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/GetDiagnosisKeysDataMappingParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable GetDiagnosisKeysDataMappingParams;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/GetExposureWindowsParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable GetExposureWindowsParams;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/GetVersionParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable GetVersionParams;

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/IDailySummaryListCallback.aidl

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.nearby.exposurenotification.DailySummary;
+
+interface IDailySummaryListCallback {
+    void onResult(in Status status, in List<DailySummary> result);
+}

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/IDiagnosisKeysDataMappingCallback.aidl

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.nearby.exposurenotification.DiagnosisKeysDataMapping;
+
+interface IDiagnosisKeysDataMappingCallback {
+    void onResult(in Status status, in DiagnosisKeysDataMapping result);
+}

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/IExposureWindowListCallback.aidl

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.nearby.exposurenotification.ExposureWindow;
+
+interface IExposureWindowListCallback {
+    void onResult(in Status status, in List<ExposureWindow> result);
+}

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/IIntCallback.aidl

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+import com.google.android.gms.common.api.Status;
+
+interface IIntCallback {
+    void onResult(in Status status, int result);
+}

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/ILongCallback.aidl

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+import com.google.android.gms.common.api.Status;
+
+interface ILongCallback {
+    void onResult(in Status status, long result);
+}

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/INearbyExposureNotificationService.aidl

@@ -12,6 +12,12 @@ import com.google.android.gms.nearby.exposurenotification.internal.GetTemporaryE
 import com.google.android.gms.nearby.exposurenotification.internal.ProvideDiagnosisKeysParams;
 import com.google.android.gms.nearby.exposurenotification.internal.GetExposureSummaryParams;
 import com.google.android.gms.nearby.exposurenotification.internal.GetExposureInformationParams;
+import com.google.android.gms.nearby.exposurenotification.internal.GetExposureWindowsParams;
+import com.google.android.gms.nearby.exposurenotification.internal.GetVersionParams;
+import com.google.android.gms.nearby.exposurenotification.internal.GetCalibrationConfidenceParams;
+import com.google.android.gms.nearby.exposurenotification.internal.GetDailySummariesParams;
+import com.google.android.gms.nearby.exposurenotification.internal.SetDiagnosisKeysDataMappingParams;
+import com.google.android.gms.nearby.exposurenotification.internal.GetDiagnosisKeysDataMappingParams;
 
 interface INearbyExposureNotificationService{
     void start(in StartParams params) = 0;
@@ -22,4 +28,11 @@ interface INearbyExposureNotificationService{
 
     void getExposureSummary(in GetExposureSummaryParams params) = 6;
     void getExposureInformation(in GetExposureInformationParams params) = 7;
+
+    void getExposureWindows(in GetExposureWindowsParams params) = 12;
+    void getVersion(in GetVersionParams params) = 13;
+    void getCalibrationConfidence(in GetCalibrationConfidenceParams params) = 14;
+    void getDailySummaries(in GetDailySummariesParams params) = 15;
+    void setDiagnosisKeysDataMapping(in SetDiagnosisKeysDataMappingParams params) = 16;
+    void getDiagnosisKeysDataMapping(in GetDiagnosisKeysDataMappingParams params) = 17;
 }

play-services-nearby-api/src/main/aidl/com/google/android/gms/nearby/exposurenotification/internal/SetDiagnosisKeysDataMappingParams.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.nearby.exposurenotification.internal;
+
+parcelable SetDiagnosisKeysDataMappingParams;

play-services-nearby-api/src/main/java/com/google/android/gms/nearby/exposurenotification/CalibrationConfidence.java

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ * Notice: Portions of this file are reproduced from work created and shared by Google and used
+ *         according to terms described in the Creative Commons 4.0 Attribution License.
+ *         See https://developers.google.com/readme/policies for details.
+ */
+
+package com.google.android.gms.nearby.exposurenotification;
+
+import org.microg.gms.common.PublicApi;
+
+/**
+ * Calibration confidence defined for an {@link ExposureWindow}.
+ */
+@PublicApi
+public @interface CalibrationConfidence {
+    /**
+     * No calibration data, using fleet-wide as default options.
+     */
+    int LOWEST = 0;
+    /**
+     * Using average calibration over models from manufacturer.
+     */
+    int LOW = 1;
+    /**
+     * Using single-antenna orientation for a similar model.
+     */
+    int MEDIUM = 2;
+    /**
+     * Using significant calibration data for this model.
+     */
+    int HIGH = 3;
+
+    @PublicApi(exclude = true)
+    int VALUES = 4;
+}