Merge "Remove deprecated ParallelExecutorCompat." into oc-mr1-dev
diff --git a/api/26.1.0-SNAPSHOT.txt b/api/26.1.0-SNAPSHOT.txt
index 338e280..d53066a 100644
--- a/api/26.1.0-SNAPSHOT.txt
+++ b/api/26.1.0-SNAPSHOT.txt
@@ -7017,10 +7017,6 @@
method public static java.lang.String[] matchesMany(java.lang.String[], java.lang.String);
}
- public final deprecated class ParallelExecutorCompat {
- method public static deprecated java.util.concurrent.Executor getParallelExecutor();
- }
-
public final class PermissionChecker {
method public static int checkCallingOrSelfPermission(android.content.Context, java.lang.String);
method public static int checkCallingPermission(android.content.Context, java.lang.String, java.lang.String);
diff --git a/compat/api/26.1.0-SNAPSHOT.txt b/compat/api/26.1.0-SNAPSHOT.txt
index b3b5173..517b03a 100644
--- a/compat/api/26.1.0-SNAPSHOT.txt
+++ b/compat/api/26.1.0-SNAPSHOT.txt
@@ -655,10 +655,6 @@
field public static final deprecated int FLAG_ACTIVITY_TASK_ON_HOME = 16384; // 0x4000
}
- public final deprecated class ParallelExecutorCompat {
- method public static deprecated java.util.concurrent.Executor getParallelExecutor();
- }
-
public final class SharedPreferencesCompat {
}
diff --git a/compat/java/android/support/v4/content/ParallelExecutorCompat.java b/compat/java/android/support/v4/content/ParallelExecutorCompat.java
deleted file mode 100644
index 4dc4168..0000000
--- a/compat/java/android/support/v4/content/ParallelExecutorCompat.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * 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 android.support.v4.content;
-
-import android.os.AsyncTask;
-
-import java.util.concurrent.Executor;
-
-/**
- * Helper for accessing a shared parallel Executor instance.
- *
- * @deprecated Use {@link AsyncTask} directly.
- */
-@Deprecated
-public final class ParallelExecutorCompat {
-
- /**
- * @deprecated Use {@link AsyncTask#THREAD_POOL_EXECUTOR} directly.
- */
- @Deprecated
- public static Executor getParallelExecutor() {
- return AsyncTask.THREAD_POOL_EXECUTOR;
- }
-
- private ParallelExecutorCompat() {}
-}