Create a separate ConsumerWrapper for experimental APIs.
Add experimental/ConsumerWrapper.java that contans the experimental APIs in addition to the ones from the stable SDK.
Conditionally replace ConsumerWrapper.java with it if the experimental SDK is set.
PiperOrigin-RevId: 294556436
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ConsumerWrapper.java b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ConsumerWrapper.java
index d4ed03e..c2f4f73 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ConsumerWrapper.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ConsumerWrapper.java
@@ -13,9 +13,7 @@
// limitations under the License.
package com.google.devtools.build.android.desugar.runtime;
-import android.accessibilityservice.AccessibilityService;
import android.app.DirectAction;
-import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.service.voice.VoiceInteractionSession;
@@ -95,13 +93,4 @@
resultExecutor,
callback != null ? new ConsumerWrapper<List<DirectAction>>(callback) : null);
}
-
- public static boolean takeScreenshot(
- AccessibilityService receiver,
- int displayId,
- Executor resultExecutor,
- j$.util.function.Consumer<Bitmap> callback) {
- return receiver.takeScreenshot(
- displayId, resultExecutor, callback != null ? new ConsumerWrapper<Bitmap>(callback) : null);
- }
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/experimental/ConsumerWrapper.java b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/experimental/ConsumerWrapper.java
new file mode 100644
index 0000000..6f5f9b6
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/experimental/ConsumerWrapper.java
@@ -0,0 +1,107 @@
+// Copyright 2018 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.android.desugar.runtime;
+
+import android.accessibilityservice.AccessibilityService;
+import android.app.DirectAction;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.service.voice.VoiceInteractionSession;
+import android.telephony.AvailableNetworkInfo;
+import android.telephony.TelephonyManager;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+
+/**
+ * Conversion from desugared to built-in {@link Consumer} for calling built-in Android APIs (see
+ * b/128638076). Includes the APIs that are only available in the experimental SDK.
+ */
+// TODO(b/74087778): Unnecessary when j$.u.f.Consumer becomes subtype of built-in j.u.f.Consumer
+@SuppressWarnings("AndroidJdkLibsChecker")
+public final class ConsumerWrapper<T> implements Consumer<T> {
+
+ private final j$.util.function.Consumer<T> wrapped;
+
+ private ConsumerWrapper(j$.util.function.Consumer<T> wrapped) {
+ this.wrapped = wrapped;
+ }
+
+ @Override
+ public void accept(T t) {
+ wrapped.accept(t);
+ }
+
+ public static void setPreferredOpportunisticDataSubscription(
+ TelephonyManager receiver,
+ int subId,
+ boolean needValidation,
+ Executor executor,
+ j$.util.function.Consumer<Integer> callback) {
+ receiver.setPreferredOpportunisticDataSubscription(
+ subId,
+ needValidation,
+ executor,
+ callback != null ? new ConsumerWrapper<Integer>(callback) : null);
+ }
+
+ public static void updateAvailableNetworks(
+ TelephonyManager receiver,
+ List<AvailableNetworkInfo> availableNetworks,
+ Executor executor,
+ j$.util.function.Consumer<Integer> callback) {
+ receiver.updateAvailableNetworks(
+ availableNetworks,
+ executor,
+ callback != null ? new ConsumerWrapper<Integer>(callback) : null);
+ }
+
+ public static void performDirectAction(
+ VoiceInteractionSession receiver,
+ DirectAction action,
+ Bundle extras,
+ CancellationSignal cancellationSignal,
+ Executor resultExecutor,
+ j$.util.function.Consumer<Bundle> resultListener) {
+ receiver.performDirectAction(
+ action,
+ extras,
+ cancellationSignal,
+ resultExecutor,
+ resultListener != null ? new ConsumerWrapper<Bundle>(resultListener) : null);
+ }
+
+ public static void requestDirectActions(
+ VoiceInteractionSession receiver,
+ VoiceInteractionSession.ActivityId activityId,
+ CancellationSignal cancellationSignal,
+ Executor resultExecutor,
+ j$.util.function.Consumer<List<DirectAction>> callback) {
+ receiver.requestDirectActions(
+ activityId,
+ cancellationSignal,
+ resultExecutor,
+ callback != null ? new ConsumerWrapper<List<DirectAction>>(callback) : null);
+ }
+
+ public static boolean takeScreenshot(
+ AccessibilityService receiver,
+ int displayId,
+ Executor resultExecutor,
+ j$.util.function.Consumer<Bitmap> callback) {
+ return receiver.takeScreenshot(
+ displayId, resultExecutor, callback != null ? new ConsumerWrapper<Bitmap>(callback) : null);
+ }
+}
