From a477daa48051d11859f3dc588f74a3b0fa31eb9c Mon Sep 17 00:00:00 2001
From: Xiao Yu <xiao@xster.net>
Date: Tue, 22 Sep 2020 17:17:34 -0700
Subject: [PATCH 1/4] Add deprecation suppression for plugins marked with
 -Werror

---
 packages/android_alarm_manager/CHANGELOG.md   |  4 ++++
 .../androidalarmmanager/AlarmService.java     | 11 ++++++-----
 .../AndroidAlarmManagerPlugin.java            | 10 +++++-----
 .../FlutterBackgroundExecutor.java            | 19 ++++++++++---------
 .../Application.java                          |  4 +---
 .../EmbeddingV1Activity.java                  |  4 ++--
 packages/android_alarm_manager/pubspec.yaml   |  2 +-
 packages/android_intent/CHANGELOG.md          | 10 +++++++---
 .../androidintent/AndroidIntentPlugin.java    |  5 +++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 packages/android_intent/pubspec.yaml          |  2 +-
 packages/battery/battery/CHANGELOG.md         |  4 ++++
 .../plugins/battery/BatteryPlugin.java        |  3 +--
 packages/battery/battery/pubspec.yaml         |  2 +-
 packages/camera/CHANGELOG.md                  |  4 ++++
 .../plugins/camera/CameraPermissions.java     |  9 +++++----
 .../flutter/plugins/camera/CameraPlugin.java  |  8 ++++----
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../cameraexample/EmbeddingV1Activity.java    |  4 ++--
 packages/camera/pubspec.yaml                  |  2 +-
 .../connectivity/connectivity/CHANGELOG.md    |  4 ++++
 .../connectivity/ConnectivityPlugin.java      |  4 ++--
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../ios/Classes/FLTConnectivityPlugin.m       |  4 +++-
 .../connectivity/connectivity/pubspec.yaml    |  2 +-
 packages/device_info/device_info/CHANGELOG.md |  4 ++++
 .../plugins/deviceinfo/DeviceInfoPlugin.java  |  4 ++--
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 packages/device_info/device_info/pubspec.yaml |  2 +-
 packages/espresso/CHANGELOG.md                |  4 ++++
 .../com/example/espresso/EspressoPlugin.java  |  4 ++--
 packages/espresso/pubspec.yaml                |  2 +-
 .../CHANGELOG.md                              |  4 ++++
 .../FlutterAndroidLifecyclePlugin.java        |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../pubspec.yaml                              |  2 +-
 .../google_maps_flutter/CHANGELOG.md          |  4 ++++
 .../plugins/googlemaps/GoogleMapsPlugin.java  |  4 ++--
 .../googlemaps/EmbeddingV1ActivityTest.java   |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../google_maps_flutter/pubspec.yaml          |  2 +-
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../google_sign_in/CHANGELOG.md               |  4 ++++
 .../googlesignin/GoogleSignInPlugin.java      |  2 +-
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../google_sign_in/pubspec.yaml               |  2 +-
 .../image_picker/image_picker/CHANGELOG.md    |  4 ++++
 .../imagepicker/ImagePickerPlugin.java        |  2 +-
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../imagepicker/ImagePickerPluginTest.java    |  4 ++--
 .../image_picker/image_picker/pubspec.yaml    |  2 +-
 packages/in_app_purchase/CHANGELOG.md         |  6 ++++++
 .../inapppurchase/InAppPurchasePlugin.java    |  4 ++--
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 packages/in_app_purchase/pubspec.yaml         |  2 +-
 packages/integration_test/CHANGELOG.md        |  4 ++++
 .../IntegrationTestPlugin.java                |  4 ++--
 packages/integration_test/pubspec.yaml        |  2 +-
 packages/local_auth/CHANGELOG.md              |  4 ++++
 .../plugins/localauth/LocalAuthPlugin.java    |  4 ++--
 .../localauth/EmbeddingV1ActivityTest.java    |  1 +
 .../localauthexample/EmbeddingV1Activity.java |  1 +
 packages/local_auth/pubspec.yaml              |  2 +-
 .../packageinfo/PackageInfoPlugin.java        |  4 ++--
 .../path_provider/path_provider/CHANGELOG.md  |  4 ++++
 .../pathprovider/PathProviderPlugin.java      |  4 ++--
 .../java/EmbeddingV1ActivityTest.java         |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../path_provider/path_provider/pubspec.yaml  |  2 +-
 packages/quick_actions/CHANGELOG.md           |  4 ++++
 .../quickactions/QuickActionsPlugin.java      |  4 ++--
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 packages/quick_actions/pubspec.yaml           |  2 +-
 packages/sensors/CHANGELOG.md                 |  4 ++++
 .../plugins/sensors/SensorsPlugin.java        |  4 ++--
 .../sensorsexample/EmbeddingV1Activity.java   |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 packages/sensors/pubspec.yaml                 |  2 +-
 packages/share/CHANGELOG.md                   |  4 ++++
 .../io/flutter/plugins/share/SharePlugin.java |  4 ++--
 .../shareexample/EmbeddingV1Activity.java     |  4 ++--
 .../shareexample/EmbeddingV1ActivityTest.java |  1 +
 packages/share/pubspec.yaml                   |  2 +-
 .../shared_preferences/CHANGELOG.md           |  4 ++++
 .../SharedPreferencesPlugin.java              |  3 +--
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../shared_preferences/pubspec.yaml           |  2 +-
 .../url_launcher/url_launcher/CHANGELOG.md    |  4 ++++
 .../urllauncher/UrlLauncherPlugin.java        |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../url_launcher/url_launcher/pubspec.yaml    |  2 +-
 .../video_player/video_player/CHANGELOG.md    |  4 ++++
 .../videoplayer/VideoPlayerPlugin.java        | 15 +++++++++------
 .../EmbeddingV1Activity.java                  |  4 ++--
 .../video_player/video_player/pubspec.yaml    |  2 +-
 packages/webview_flutter/CHANGELOG.md         |  4 ++++
 .../webviewflutter/WebViewFlutterPlugin.java  |  4 ++--
 .../EmbeddingV1ActivityTest.java              |  1 +
 .../EmbeddingV1Activity.java                  |  4 ++--
 packages/webview_flutter/pubspec.yaml         |  2 +-
 111 files changed, 254 insertions(+), 140 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 22c3d822ec04..aff0e4a30982 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5+14
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.5+13
 
 * Android Code Inspection and Clean up.
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 107d76738fe3..841628074e84 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -13,7 +13,6 @@
 import android.util.Log;
 import androidx.core.app.AlarmManagerCompat;
 import androidx.core.app.JobIntentService;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -91,15 +90,17 @@ public static void setCallbackDispatcher(Context context, long callbackHandle) {
   }
 
   /**
-   * Sets the {@link PluginRegistrantCallback} used to register the plugins used by an application
-   * with the newly spawned background isolate.
+   * Sets the {@link io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} used to
+   * register the plugins used by an application with the newly spawned background isolate.
    *
    * <p>This should be invoked in {@link Application.onCreate} with {@link
    * GeneratedPluginRegistrant} in applications using the V1 embedding API in order to use other
    * plugins in the background isolate. For applications using the V2 embedding API, it is not
-   * necessary to set a {@link PluginRegistrantCallback} as plugins are registered automatically.
+   * necessary to set a {@link io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} as
+   * plugins are registered automatically.
    */
-  public static void setPluginRegistrant(PluginRegistrantCallback callback) {
+  @SuppressWarnings("deprecation")
+  public static void setPluginRegistrant(io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     // Indirectly set in FlutterBackgroundExecutor for backwards compatibility.
     FlutterBackgroundExecutor.setPluginRegistrant(callback);
   }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 5a135f95e631..74d903dcc02b 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -6,6 +6,7 @@
 
 import android.content.Context;
 import android.util.Log;
+import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.JSONMethodCodec;
@@ -13,8 +14,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-import io.flutter.view.FlutterNativeView;
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -28,7 +27,7 @@
  *   <li>The Dart side of this plugin sends the Android side a "AlarmService.start" message, along
  *       with a Dart callback handle for a Dart callback that should be immediately invoked by a
  *       background Dart isolate.
- *   <li>The Android side of this plugin spins up a background {@link FlutterNativeView}, which
+ *   <li>The Android side of this plugin spins up a background {@link FlutterEngine}, which
  *       includes a background Dart isolate.
  *   <li>The Android side of this plugin instructs the new background Dart isolate to execute the
  *       callback that was received in the "AlarmService.start" message.
@@ -49,12 +48,13 @@ public class AndroidAlarmManagerPlugin implements FlutterPlugin, MethodCallHandl
 
   /**
    * Registers this plugin with an associated Flutter execution context, represented by the given
-   * {@link Registrar}.
+   * {@link io.flutter.plugin.common.PluginRegistry.Registrar}.
    *
    * <p>Once this method is executed, an instance of {@code AndroidAlarmManagerPlugin} will be
    * connected to, and running against, the associated Flutter execution context.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     if (instance == null) {
       instance = new AndroidAlarmManagerPlugin();
     }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
index 8d5290842e14..0483765377ed 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
@@ -19,9 +19,7 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import io.flutter.view.FlutterCallbackInformation;
-import io.flutter.view.FlutterMain;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -32,7 +30,8 @@
 public class FlutterBackgroundExecutor implements MethodCallHandler {
   private static final String TAG = "FlutterBackgroundExecutor";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
-  private static PluginRegistrantCallback pluginRegistrantCallback;
+  @SuppressWarnings("deprecation")
+  private static io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback pluginRegistrantCallback;
 
   /**
    * The {@link MethodChannel} that connects the Android side of this plugin with the background
@@ -45,14 +44,15 @@ public class FlutterBackgroundExecutor implements MethodCallHandler {
   private AtomicBoolean isCallbackDispatcherReady = new AtomicBoolean(false);
 
   /**
-   * Sets the {@code PluginRegistrantCallback} used to register plugins with the newly spawned
-   * isolate.
+   * Sets the {@code io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback} used to
+   * register plugins with the newly spawned isolate.
    *
    * <p>Note: this is only necessary for applications using the V1 engine embedding API as plugins
    * are automatically registered via reflection in the V2 engine embedding API. If not set, alarm
    * callbacks will not be able to utilize functionality from other plugins.
    */
-  public static void setPluginRegistrant(PluginRegistrantCallback callback) {
+  @SuppressWarnings("deprecation")
+  public static void setPluginRegistrant(io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     pluginRegistrantCallback = callback;
   }
 
@@ -101,7 +101,7 @@ public void onMethodCall(MethodCall call, Result result) {
    * <p>The isolate is configured as follows:
    *
    * <ul>
-   *   <li>Bundle Path: {@code FlutterMain.findAppBundlePath(context)}.
+   *   <li>Bundle Path: {@code io.flutter.view.FlutterMain.findAppBundlePath(context)}.
    *   <li>Entrypoint: The Dart method used the last time this plugin was initialized in the
    *       foreground.
    *   <li>Run args: none.
@@ -130,7 +130,7 @@ public void startBackgroundIsolate(Context context) {
    * <p>The isolate is configured as follows:
    *
    * <ul>
-   *   <li>Bundle Path: {@code FlutterMain.findAppBundlePath(context)}.
+   *   <li>Bundle Path: {@code io.flutter.view.FlutterMain.findAppBundlePath(context)}.
    *   <li>Entrypoint: The Dart method represented by {@code callbackHandle}.
    *   <li>Run args: none.
    * </ul>
@@ -151,7 +151,8 @@ public void startBackgroundIsolate(Context context, long callbackHandle) {
     }
 
     Log.i(TAG, "Starting AlarmService...");
-    String appBundlePath = FlutterMain.findAppBundlePath();
+    @SuppressWarnings("deprecation")
+    String appBundlePath = io.flutter.view.FlutterMain.findAppBundlePath();
     AssetManager assets = context.getAssets();
     if (!isRunning()) {
       backgroundFlutterEngine = new FlutterEngine(context);
diff --git a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
index 53cf6b6f179a..e97324873ff4 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
+++ b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
@@ -1,8 +1,6 @@
 package io.flutter.plugins.androidalarmmanagerexample;
 
 import io.flutter.app.FlutterApplication;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import io.flutter.plugins.androidalarmmanager.AlarmService;
 import io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin;
 
@@ -14,7 +12,7 @@ public void onCreate() {
   }
 
   @Override
-  public void registerWith(PluginRegistry registry) {
+  public void registerWith(io.flutter.plugin.common.PluginRegistry registry) {
     AndroidAlarmManagerPlugin.registerWith(
         registry.registrarFor("io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin"));
   }
diff --git a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/EmbeddingV1Activity.java b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/EmbeddingV1Activity.java
index 61bcd67d2a9b..26a542be2598 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/EmbeddingV1Activity.java
+++ b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/EmbeddingV1Activity.java
@@ -5,10 +5,10 @@
 package io.flutter.plugins.androidalarmmanagerexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   public static final String TAG = "AlarmExampleMainActivity";
 
   @Override
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 90dcbf1f7819..d4292a0dc940 100644
--- a/packages/android_alarm_manager/pubspec.yaml
+++ b/packages/android_alarm_manager/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for accessing the Android AlarmManager service, and
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.5+13
+version: 0.4.5+14
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:
diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index f06652e71931..a216f165bf9a 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.7+4
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.3.7+3
 
 * Update the `platform` package dependency to resolve the conflict with the latest flutter.
@@ -12,8 +16,8 @@
 
 ## 0.3.7
 
-* Add a `Future<bool> canResolveActivity` method to the AndroidIntent class. It 
-  can be used to determine whether a device supports a particular intent or has 
+* Add a `Future<bool> canResolveActivity` method to the AndroidIntent class. It
+  can be used to determine whether a device supports a particular intent or has
   an app installed that can resolve it. It is based on PackageManager
   [resolveActivity](https://developer.android.com/reference/android/content/pm/PackageManager#resolveActivity(android.content.Intent,%20int)).
 
@@ -36,7 +40,7 @@
 
 ## 0.3.5
 
-* Add support for [setType](https://developer.android.com/reference/android/content/Intent.html#setType(java.lang.String)) and [setDataAndType](https://developer.android.com/reference/android/content/Intent.html#setDataAndType(android.net.Uri,%20java.lang.String)) parameters. 
+* Add support for [setType](https://developer.android.com/reference/android/content/Intent.html#setType(java.lang.String)) and [setDataAndType](https://developer.android.com/reference/android/content/Intent.html#setDataAndType(android.net.Uri,%20java.lang.String)) parameters.
 
 ##  0.3.4+8
 
diff --git a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
index 2f35dfcf0372..0664e426db30 100644
--- a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
+++ b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
@@ -4,7 +4,6 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * Plugin implementation that uses the new {@code io.flutter.embedding} package.
@@ -32,7 +31,9 @@ public AndroidIntentPlugin() {
    * <p>Calling this automatically initializes the plugin. However plugins initialized this way
    * won't react to changes in activity or context, unlike {@link AndroidIntentPlugin}.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     IntentSender sender = new IntentSender(registrar.activity(), registrar.context());
     MethodCallHandlerImpl impl = new MethodCallHandlerImpl(sender);
     impl.startListening(registrar.messenger());
diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
index 7ab0e87e7c5a..60c11095cd53 100644
--- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
+++ b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java
index 1bbe89a4a4cb..f64ae47a7656 100644
--- a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java
+++ b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java
@@ -5,10 +5,10 @@
 package io.flutter.plugins.androidintentexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.androidintent.AndroidIntentPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index 166a73dfcb4d..c56f855f0c7e 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
 # 0.3.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.3.7+3
+version: 0.3.7+4
 
 flutter:
   plugin:
diff --git a/packages/battery/battery/CHANGELOG.md b/packages/battery/battery/CHANGELOG.md
index a36ee67172bb..3e10348000ed 100644
--- a/packages/battery/battery/CHANGELOG.md
+++ b/packages/battery/battery/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.5+1
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 1.0.5
 
 * Ported to use platform interface.
diff --git a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
index c17cfc133176..20062db7fb94 100644
--- a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
+++ b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
@@ -21,7 +21,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry;
 
 /** BatteryPlugin */
 public class BatteryPlugin implements MethodCallHandler, StreamHandler, FlutterPlugin {
@@ -32,7 +31,7 @@ public class BatteryPlugin implements MethodCallHandler, StreamHandler, FlutterP
   private EventChannel eventChannel;
 
   /** Plugin registration. */
-  public static void registerWith(PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final BatteryPlugin instance = new BatteryPlugin();
     instance.onAttachedToEngine(registrar.context(), registrar.messenger());
   }
diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml
index 7cd1b761f0f8..0d7c286bcccb 100644
--- a/packages/battery/battery/pubspec.yaml
+++ b/packages/battery/battery/pubspec.yaml
@@ -2,7 +2,7 @@ name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery
-version: 1.0.5
+version: 1.0.5+1
 
 flutter:
   plugin:
diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index d405812bce6a..81774679389d 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.8+7
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.5.8+6
 
 * Avoiding uses or overrides a deprecated API in CameraPlugin.java.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
index c1c3fa893317..b4569d2fec07 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
@@ -7,12 +7,12 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
 
 final class CameraPermissions {
   interface PermissionsRegistry {
-    void addListener(RequestPermissionsResultListener handler);
+    @SuppressWarnings("deprecation")
+    void addListener(
+        io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener handler);
   }
 
   interface ResultCallback {
@@ -61,8 +61,9 @@ private boolean hasAudioPermission(Activity activity) {
   }
 
   @VisibleForTesting
+  @SuppressWarnings("deprecation")
   static final class CameraRequestPermissionsListener
-      implements PluginRegistry.RequestPermissionsResultListener {
+      implements io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener {
 
     // There's no way to unregister permission listeners in the v1 embedding, so we'll be called
     // duplicate times in cases where the user denies and then grants a permission. Keep track of if
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 4c08b222ba77..93183bb7c0a7 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -12,7 +12,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.plugins.camera.CameraPermissions.PermissionsRegistry;
 import io.flutter.view.TextureRegistry;
 
@@ -22,8 +21,8 @@
  * <p>Instantiate this in an add to app scenario to gracefully handle activity and context changes.
  * See {@code io.flutter.plugins.camera.MainActivity} for an example.
  *
- * <p>Call {@link #registerWith(Registrar)} to register an implementation of this that uses the
- * stable {@code io.flutter.plugin.common} package.
+ * <p>Call {@link #registerWith(io.flutter.plugin.common.PluginRegistry.Registrar)} to register an
+ * implementation of this that uses the stable {@code io.flutter.plugin.common} package.
  */
 public final class CameraPlugin implements FlutterPlugin, ActivityAware {
 
@@ -45,7 +44,8 @@ public CameraPlugin() {}
    * <p>Calling this automatically initializes the plugin. However plugins initialized this way
    * won't react to changes in activity or context, unlike {@link CameraPlugin}.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     CameraPlugin plugin = new CameraPlugin();
     plugin.maybeStartListening(
         registrar.activity(),
diff --git a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java
index 3149191b478d..8a97e47072e9 100644
--- a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java
+++ b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java
index c0ef7d891bfc..a53dd6b756ad 100644
--- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java
+++ b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java
@@ -2,12 +2,12 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.camera.CameraPlugin;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
 import io.flutter.plugins.videoplayer.VideoPlayerPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 9d1f7880df2d..cbe1b1b6d9dd 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.5.8+6
+version: 0.5.8+7
 
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera
 
diff --git a/packages/connectivity/connectivity/CHANGELOG.md b/packages/connectivity/connectivity/CHANGELOG.md
index 27a1bb100e74..bdc4dbc32e29 100644
--- a/packages/connectivity/connectivity/CHANGELOG.md
+++ b/packages/connectivity/connectivity/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.9+3
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.9+2
 
 * Update package:e2e to use package:integration_test
diff --git a/packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
index b458fa97e203..9acf64755ba8 100644
--- a/packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
+++ b/packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
@@ -11,7 +11,6 @@
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** ConnectivityPlugin */
 public class ConnectivityPlugin implements FlutterPlugin {
@@ -20,7 +19,8 @@ public class ConnectivityPlugin implements FlutterPlugin {
   private EventChannel eventChannel;
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
 
     ConnectivityPlugin plugin = new ConnectivityPlugin();
     plugin.setupChannels(registrar.messenger(), registrar.context());
diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java
index fa10cd5b7f52..591f1ec604d7 100644
--- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java
+++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java
@@ -5,10 +5,10 @@
 package io.flutter.plugins.connectivityexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.connectivity.ConnectivityPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java
index 048da070991e..2adc0c268bde 100644
--- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java
+++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
index 526bee25d561..0a65409b3828 100644
--- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
+++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
@@ -156,7 +156,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status
     case kCLAuthorizationStatusAuthorizedWhenInUse: {
       return @"authorizedWhenInUse";
     }
-    default: { return @"unknown"; }
+    default: {
+      return @"unknown";
+    }
   }
 }
 
diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml
index dc9d90827169..95c9ec280394 100644
--- a/packages/connectivity/connectivity/pubspec.yaml
+++ b/packages/connectivity/connectivity/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/c
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.9+2
+version: 0.4.9+3
 
 flutter:
   plugin:
diff --git a/packages/device_info/device_info/CHANGELOG.md b/packages/device_info/device_info/CHANGELOG.md
index 4f5e1d927c10..9e627f90b30f 100644
--- a/packages/device_info/device_info/CHANGELOG.md
+++ b/packages/device_info/device_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2+8
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.2+7
 
 * Port device_info plugin to use platform interface.
diff --git a/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
index 8061959c2047..137daf508ac2 100644
--- a/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
+++ b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
@@ -8,7 +8,6 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** DeviceInfoPlugin */
 public class DeviceInfoPlugin implements FlutterPlugin {
@@ -16,7 +15,8 @@ public class DeviceInfoPlugin implements FlutterPlugin {
   MethodChannel channel;
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     DeviceInfoPlugin plugin = new DeviceInfoPlugin();
     plugin.setupMethodChannel(registrar.messenger(), registrar.context());
   }
diff --git a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
index 48678a7e6ad1..0256c6b8a1fb 100644
--- a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
+++ b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
@@ -5,10 +5,10 @@
 package io.flutter.plugins.deviceinfoexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.deviceinfo.DeviceInfoPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
index 797c06aa50b2..8fa880842d51 100644
--- a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
+++ b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/device_info/device_info/pubspec.yaml b/packages/device_info/device_info/pubspec.yaml
index 8cb058751fd1..967a5bb0b585 100644
--- a/packages/device_info/device_info/pubspec.yaml
+++ b/packages/device_info/device_info/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/device_info
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.2+7
+version: 0.4.2+8
 
 flutter:
   plugin:
diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index bc9d93e3bd6d..edc6bd6d2ba1 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+6
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.0.1+5
 
 * Replace deprecated `getFlutterEngine` call on Android.
diff --git a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
index a2ada5c530f5..e1b1e3ac86db 100644
--- a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
+++ b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java
@@ -6,7 +6,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** EspressoPlugin */
 public class EspressoPlugin implements FlutterPlugin, MethodCallHandler {
@@ -26,7 +25,8 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
   // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
   // depending on the user's project. onAttachedToEngine or registerWith must both be defined
   // in the same class.
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final MethodChannel channel = new MethodChannel(registrar.messenger(), "espresso");
     channel.setMethodCallHandler(new EspressoPlugin());
   }
diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index e84ef5e5b8d1..6eb371337e01 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -1,6 +1,6 @@
 name: espresso
 description: Java classes for testing Flutter apps using Espresso.
-version: 0.0.1+5
+version: 0.0.1+6
 homepage: https://github.com/flutter/plugins/espresso
 
 environment:
diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
index 1b6388a0433d..401be5f5278a 100644
--- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
+++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.11
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 1.0.10
 
 * Update android compileSdkVersion to 29.
diff --git a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
index cb346f7c20fe..bd77c1545ac7 100644
--- a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
+++ b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java
@@ -6,7 +6,6 @@
 
 import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * Plugin class that exists because the Flutter tool expects such a class to exist for every Android
@@ -15,7 +14,8 @@
  * <p><strong>DO NOT USE THIS CLASS.</strong>
  */
 public class FlutterAndroidLifecyclePlugin implements FlutterPlugin {
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     // no-op
   }
 
diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java
index 4f1435fb1b33..e61cadd3a9d3 100644
--- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java
+++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java
index 63602ddb05e6..f303f4c61d20 100644
--- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java
+++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java
@@ -2,10 +2,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/flutter_plugin_android_lifecycle/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/pubspec.yaml
index 416b484a54b6..a671381b3f47 100644
--- a/packages/flutter_plugin_android_lifecycle/pubspec.yaml
+++ b/packages/flutter_plugin_android_lifecycle/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_plugin_android_lifecycle
 description: Flutter plugin for accessing an Android Lifecycle within other plugins.
-version: 1.0.10
+version: 1.0.11
 homepage: https://github.com/flutter/plugins/tree/master/packages/flutter_plugin_android_lifecycle
 
 environment:
diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
index 32cb61c3661a..a37cb839c66b 100644
--- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.33
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.5.32
 
 * Fix typo in google_maps_flutter/example/map_ui.dart.
diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
index 9f9f378737df..f434a05bf1b7 100644
--- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
+++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
@@ -15,7 +15,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.plugins.lifecycle.FlutterLifecycleAdapter;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -42,7 +41,8 @@ public class GoogleMapsPlugin
 
   private static final String VIEW_TYPE = "plugins.flutter.io/google_maps";
 
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     if (registrar.activity() == null) {
       // When a background flutter view tries to register the plugin, the registrar has no activity.
       // We stop the registration process as this plugin is foreground only.
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
index d8064e441fbd..76dc5df3422a 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
+++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
@@ -7,6 +7,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
index 18b107d47620..3853b5d2d4df 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
+++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
@@ -2,10 +2,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.googlemaps.GoogleMapsPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index 42033770e46e..9b87828c84d9 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter
-version: 0.5.32
+version: 0.5.33
 
 dependencies:
   flutter:
diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
index f7ea0c4043a6..5ec19822734c 100644
--- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
+++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.googlesigninexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.googlesignin.GoogleSignInPlugin;
 import io.flutter.view.FlutterMain;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     FlutterMain.startInitialization(this);
diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
index 4d872e7eb5a1..3e7250cea0ee 100644
--- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
+++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
index e0212458a549..8de8a3badc1b 100644
--- a/packages/google_sign_in/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.5.4
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 4.5.3
 
 * Update package:e2e -> package:integration_test
diff --git a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
index ce04e595080b..502cde5da609 100755
--- a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
+++ b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
@@ -60,7 +60,7 @@ public class GoogleSignInPlugin implements MethodCallHandler, FlutterPlugin, Act
   private MethodChannel channel;
   private ActivityPluginBinding activityPluginBinding;
 
-  public static void registerWith(PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     GoogleSignInPlugin instance = new GoogleSignInPlugin();
     instance.initInstance(registrar.messenger(), registrar.context(), new GoogleSignInWrapper());
     instance.setUpRegistrar(registrar);
diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
index f7ea0c4043a6..5ec19822734c 100644
--- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
+++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1Activity.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.googlesigninexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.googlesignin.GoogleSignInPlugin;
 import io.flutter.view.FlutterMain;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     FlutterMain.startInitialization(this);
diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
index 4d872e7eb5a1..3e7250cea0ee 100644
--- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
+++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
index c5bc15f037c5..2b7aea7cc95c 100644
--- a/packages/google_sign_in/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_sign_in
 description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
-version: 4.5.3
+version: 4.5.4
 
 flutter:
   plugin:
diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index fc7b11b69aed..f8dbee9417cf 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.7+11
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.6.7+10
 
 * Updated documentation with code that does not throw an error when image is not picked.
diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index ed509fc515e8..d501a83c144c 100644
--- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -111,7 +111,7 @@ public void onActivityStopped(Activity activity) {
   private Lifecycle lifecycle;
   private LifeCycleObserver observer;
 
-  public static void registerWith(PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     if (registrar.activity() == null) {
       // If a background flutter view tries to register the plugin, there will be no activity from the registrar,
       // we stop the registering process immediately because the ImagePicker requires an activity.
diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
index ddda89ca2e58..55f3f92eef7c 100644
--- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
+++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
@@ -5,11 +5,11 @@
 package io.flutter.plugins.imagepickerexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.imagepicker.ImagePickerPlugin;
 import io.flutter.plugins.videoplayer.VideoPlayerPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
index 0a8330d734bd..e7fcd25142ad 100644
--- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
+++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
index 59ae23d562bb..46e7b82a79f3 100644
--- a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
+++ b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
@@ -11,7 +11,6 @@
 import android.app.Application;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
@@ -29,7 +28,8 @@ public class ImagePickerPluginTest {
 
   @Rule public ExpectedException exception = ExpectedException.none();
 
-  @Mock PluginRegistry.Registrar mockRegistrar;
+  @SuppressWarnings("deprecation")
+  @Mock io.flutter.plugin.common.PluginRegistry.Registrar mockRegistrar;
   @Mock Activity mockActivity;
   @Mock Application mockApplication;
   @Mock ImagePickerDelegate mockImagePickerDelegate;
diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 47c3e5e205c4..6eaa0d685bd8 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.6.7+10
+version: 0.6.7+11
 
 flutter:
   plugin:
diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
index fe601c2d5728..734d2f5ab9fa 100644
--- a/packages/in_app_purchase/CHANGELOG.md
+++ b/packages/in_app_purchase/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.3.4+9
+
+* [iOS] Fixed: purchase dialog not showing always.
+* [iOS] Fixed: completing purchases could fail.
+* [iOS] Fixed: restorePurchases caused hang (call never returned).
+
 ## 0.3.4+8
 
 * [iOS] Fixed: purchase dialog not showing always.
diff --git a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
index de2080cfebf2..65904b12da28 100644
--- a/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
+++ b/packages/in_app_purchase/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java
@@ -14,7 +14,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** Wraps a {@link BillingClient} instance and responds to Dart calls for it. */
 public class InAppPurchasePlugin implements FlutterPlugin, ActivityAware {
@@ -47,7 +46,8 @@ static final class MethodNames {
   private MethodCallHandlerImpl methodCallHandler;
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     InAppPurchasePlugin plugin = new InAppPurchasePlugin();
     plugin.setupMethodChannel(registrar.activity(), registrar.messenger(), registrar.context());
     ((Application) registrar.context().getApplicationContext())
diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java
index e157950e5bec..f6849a867b0a 100644
--- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java
+++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java
@@ -6,11 +6,11 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.inapppurchase.InAppPurchasePlugin;
 import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java
index b8ca3ae96e2c..4b5a14472b4f 100644
--- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java
+++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
index 52abe9680329..2cca81f00f35 100644
--- a/packages/in_app_purchase/pubspec.yaml
+++ b/packages/in_app_purchase/pubspec.yaml
@@ -1,7 +1,7 @@
 name: in_app_purchase
 description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play.
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.3.4+8
+version: 0.3.4+9
 
 dependencies:
   async: ^2.0.8
diff --git a/packages/integration_test/CHANGELOG.md b/packages/integration_test/CHANGELOG.md
index 3bed2b8b73b4..d6ef143666e6 100644
--- a/packages/integration_test/CHANGELOG.md
+++ b/packages/integration_test/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.1
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.9.0
 
 * Add screenshot capability to web tests.
diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
index efe1028b6836..919eb7add9ba 100644
--- a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
+++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
@@ -12,7 +12,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.util.Map;
 import java.util.concurrent.Future;
 
@@ -27,7 +26,8 @@ public class IntegrationTestPlugin implements MethodCallHandler, FlutterPlugin {
   private static final String CHANNEL = "plugins.flutter.io/integration_test";
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final IntegrationTestPlugin instance = new IntegrationTestPlugin();
     instance.onAttachedToEngine(registrar.context(), registrar.messenger());
   }
diff --git a/packages/integration_test/pubspec.yaml b/packages/integration_test/pubspec.yaml
index 6e0412924748..39a48d1675da 100644
--- a/packages/integration_test/pubspec.yaml
+++ b/packages/integration_test/pubspec.yaml
@@ -1,6 +1,6 @@
 name: integration_test
 description: Runs tests that use the flutter_test API as integration tests.
-version: 0.9.0
+version: 0.9.1
 homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test
 
 environment:
diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index 222014af2153..a1dc7aaa4e16 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.3+2
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.6.3+1
 
 * Update package:e2e -> package:integration_test
diff --git a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
index ff0234708f37..0f93f40e947a 100644
--- a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
+++ b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java
@@ -17,7 +17,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.plugins.localauth.AuthenticationHelper.AuthCompletionHandler;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -49,7 +48,8 @@ public class LocalAuthPlugin implements MethodCallHandler, FlutterPlugin, Activi
    *     io.flutter.plugin.common.MethodChannel.MethodCallHandler} to the registrar's {@link
    *     io.flutter.plugin.common.BinaryMessenger}.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL_NAME);
     channel.setMethodCallHandler(new LocalAuthPlugin(registrar.activity()));
   }
diff --git a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java
index 6b125e4cf8e2..30d2126f0609 100644
--- a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java
+++ b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java
@@ -7,6 +7,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java
index 456d5407c4be..91bef9dd13d7 100644
--- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java
+++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java
@@ -6,6 +6,7 @@
 import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin;
 import io.flutter.plugins.localauth.LocalAuthPlugin;
 
+@SuppressWarnings("deprecation")
 public class EmbeddingV1Activity extends FlutterFragmentActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml
index 57bf9fa37b6c..db34a461e0d8 100644
--- a/packages/local_auth/pubspec.yaml
+++ b/packages/local_auth/pubspec.yaml
@@ -2,7 +2,7 @@ name: local_auth
 description: Flutter plugin for Android and iOS device authentication sensors
   such as Fingerprint Reader and Touch ID.
 homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth
-version: 0.6.3+1
+version: 0.6.3+2
 
 flutter:
   plugin:
diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
index ca1041467262..645b8dd075c6 100644
--- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
+++ b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java
@@ -14,7 +14,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,7 +23,8 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin {
   private MethodChannel methodChannel;
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final PackageInfoPlugin instance = new PackageInfoPlugin();
     instance.onAttachedToEngine(registrar.context(), registrar.messenger());
   }
diff --git a/packages/path_provider/path_provider/CHANGELOG.md b/packages/path_provider/path_provider/CHANGELOG.md
index abcb0f2d051c..f2835c62ec6f 100644
--- a/packages/path_provider/path_provider/CHANGELOG.md
+++ b/packages/path_provider/path_provider/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.18
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 1.6.17
 
 * Update Windows endorsement verison again, to pick up the fix for
diff --git a/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
index 2dbf4f75f12b..d091d549b68e 100644
--- a/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
+++ b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
@@ -13,7 +13,6 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.util.PathUtils;
 import java.io.File;
 import java.util.ArrayList;
@@ -26,7 +25,8 @@ public class PathProviderPlugin implements FlutterPlugin, MethodCallHandler {
 
   public PathProviderPlugin() {}
 
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     PathProviderPlugin instance = new PathProviderPlugin();
     instance.channel = new MethodChannel(registrar.messenger(), "plugins.flutter.io/path_provider");
     instance.context = registrar.context();
diff --git a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
index 50cb342715cb..385740db166d 100644
--- a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
+++ b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
index 6c4a6185359c..2ff41b25a4fc 100644
--- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
+++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
@@ -3,10 +3,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
index ada80e10931b..ec8fd855df54 100644
--- a/packages/path_provider/path_provider/pubspec.yaml
+++ b/packages/path_provider/path_provider/pubspec.yaml
@@ -1,7 +1,7 @@
 name: path_provider
 description: Flutter plugin for getting commonly used locations on host platform file systems, such as the temp and app data directories.
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
-version: 1.6.17
+version: 1.6.18
 
 flutter:
   plugin:
diff --git a/packages/quick_actions/CHANGELOG.md b/packages/quick_actions/CHANGELOG.md
index b850014e2bf0..49815fc68b29 100644
--- a/packages/quick_actions/CHANGELOG.md
+++ b/packages/quick_actions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+9
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.0+8
 
 * Update package:e2e -> package:integration_test
diff --git a/packages/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java b/packages/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
index c2ebad1ddcdc..14e59951cf5e 100644
--- a/packages/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
+++ b/packages/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java
@@ -11,7 +11,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** QuickActionsPlugin */
 public class QuickActionsPlugin implements FlutterPlugin, ActivityAware {
@@ -25,7 +24,8 @@ public class QuickActionsPlugin implements FlutterPlugin, ActivityAware {
    *
    * <p>Must be called when the application is created.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final QuickActionsPlugin plugin = new QuickActionsPlugin();
     plugin.setupChannel(registrar.messenger(), registrar.context(), registrar.activity());
   }
diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1Activity.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1Activity.java
index 3cbd168e620a..4a77793da48a 100644
--- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1Activity.java
+++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1Activity.java
@@ -5,10 +5,10 @@
 package io.flutter.plugins.quickactionsexample;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.quickactions.QuickActionsPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java
index 6fc6778159e5..e9e9401128a4 100644
--- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java
+++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java
@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml
index 0468bbfd2e00..f612ecdafa63 100644
--- a/packages/quick_actions/pubspec.yaml
+++ b/packages/quick_actions/pubspec.yaml
@@ -2,7 +2,7 @@ name: quick_actions
 description: Flutter plugin for creating shortcuts on home screen, also known as
   Quick Actions on iOS and App Shortcuts on Android.
 homepage: https://github.com/flutter/plugins/tree/master/packages/quick_actions
-version: 0.4.0+8
+version: 0.4.0+9
 
 flutter:
   plugin:
diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md
index cd70351e1c2b..aa9f2bc4fbc5 100644
--- a/packages/sensors/CHANGELOG.md
+++ b/packages/sensors/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2+5
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.4.2+4
 
 * Update package:e2e -> package:integration_test
diff --git a/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java b/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java
index 5c9cad2dd6f8..e01c80d1cdd2 100644
--- a/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java
+++ b/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java
@@ -10,7 +10,6 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** SensorsPlugin */
 public class SensorsPlugin implements FlutterPlugin {
@@ -25,7 +24,8 @@ public class SensorsPlugin implements FlutterPlugin {
   private EventChannel gyroscopeChannel;
 
   /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     SensorsPlugin plugin = new SensorsPlugin();
     plugin.setupEventChannels(registrar.context(), registrar.messenger());
   }
diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java
index 390819ba0e49..7813e7e8e43f 100644
--- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java
+++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.sensors.SensorsPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java
index ace170bb78ac..65a4dca981aa 100644
--- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java
+++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml
index 0daaf08521bc..3e44f1e1ea8e 100644
--- a/packages/sensors/pubspec.yaml
+++ b/packages/sensors/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/sensors
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.2+4
+version: 0.4.2+5
 
 flutter:
   plugin:
diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md
index 8037c75943df..f13e819b8b74 100644
--- a/packages/share/CHANGELOG.md
+++ b/packages/share/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.5+2
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.6.5+1
 
 * Avoiding uses unchecked or unsafe Object Type Casting
diff --git a/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java b/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java
index bd7dfc22a3cd..af4a02eaba47 100644
--- a/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java
+++ b/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java
@@ -11,7 +11,6 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** Plugin method host for presenting a share sheet via Intent */
 public class SharePlugin implements FlutterPlugin, ActivityAware {
@@ -21,7 +20,8 @@ public class SharePlugin implements FlutterPlugin, ActivityAware {
   private Share share;
   private MethodChannel methodChannel;
 
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     SharePlugin plugin = new SharePlugin();
     plugin.setUpChannel(registrar.context(), registrar.activity(), registrar.messenger());
   }
diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java
index 70b1a8d8f09e..d14e39781c2b 100644
--- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java
+++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.share.SharePlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java
index b5ae4ef061b6..489b224a62ea 100644
--- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java
+++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml
index f9c1f4bad4e6..dc55ed765453 100644
--- a/packages/share/pubspec.yaml
+++ b/packages/share/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/share
 # 0.6.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.6.5+1
+version: 0.6.5+2
 
 flutter:
   plugin:
diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md
index 5a6a030a35ee..139df388ec73 100644
--- a/packages/shared_preferences/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.12
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.5.11
 
 * Support Windows by default.
diff --git a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
index 859610e3d66a..eacf0164c113 100644
--- a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
+++ b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
@@ -8,14 +8,13 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry;
 
 /** SharedPreferencesPlugin */
 public class SharedPreferencesPlugin implements FlutterPlugin {
   private static final String CHANNEL_NAME = "plugins.flutter.io/shared_preferences";
   private MethodChannel channel;
 
-  public static void registerWith(PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final SharedPreferencesPlugin plugin = new SharedPreferencesPlugin();
     plugin.setupChannel(registrar.messenger(), registrar.context());
   }
diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java
index 7a748792f566..3857aea6ce6b 100644
--- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java
+++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java
index d37f5549e3ec..5b090d0f52c2 100644
--- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java
+++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java
@@ -7,6 +7,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml
index a27fce29f202..91404eced74d 100644
--- a/packages/shared_preferences/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/shared_prefere
 # 0.5.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.5.11
+version: 0.5.12
 
 flutter:
   plugin:
diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md
index d803ddf57ccb..c3f176ab3c84 100644
--- a/packages/url_launcher/url_launcher/CHANGELOG.md
+++ b/packages/url_launcher/url_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.7.1
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 5.7.0
 
 * Handle WebView multi-window support.
diff --git a/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
index 0ff2fd4aac3b..17af0abda23c 100644
--- a/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
+++ b/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java
@@ -6,7 +6,6 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * Plugin implementation that uses the new {@code io.flutter.embedding} package.
@@ -25,7 +24,8 @@ public final class UrlLauncherPlugin implements FlutterPlugin, ActivityAware {
    * <p>Calling this automatically initializes the plugin. However plugins initialized this way
    * won't react to changes in activity or context, unlike {@link UrlLauncherPlugin}.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     MethodCallHandlerImpl handler =
         new MethodCallHandlerImpl(new UrlLauncher(registrar.context(), registrar.activity()));
     handler.startListening(registrar.messenger());
diff --git a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java
index fb66478feed8..b144786fe925 100644
--- a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java
+++ b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java
index 39afc642ddb9..9fd4871c0711 100644
--- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java
+++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.urllauncher.UrlLauncherPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml
index a4061af8eadc..a3c5427ace30 100644
--- a/packages/url_launcher/url_launcher/pubspec.yaml
+++ b/packages/url_launcher/url_launcher/pubspec.yaml
@@ -2,7 +2,7 @@ name: url_launcher
 description: Flutter plugin for launching a URL on Android and iOS. Supports
   web, phone, SMS, and email schemes.
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
-version: 5.7.0
+version: 5.7.1
 
 flutter:
   plugin:
diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
index fb26e31c4a45..4e2df4ebaef3 100644
--- a/packages/video_player/video_player/CHANGELOG.md
+++ b/packages/video_player/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.12+4
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.10.12+3
 
 * Avoiding uses or overrides a deprecated API in `VideoPlayerPlugin` class.
diff --git a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index 77fd10a7a69b..9352d456504b 100644
--- a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -7,10 +7,11 @@
 import android.content.Context;
 import android.util.Log;
 import android.util.LongSparseArray;
+import io.flutter.FlutterInjector;
+import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import io.flutter.plugins.videoplayer.Messages.CreateMessage;
 import io.flutter.plugins.videoplayer.Messages.LoopingMessage;
 import io.flutter.plugins.videoplayer.Messages.MixWithOthersMessage;
@@ -18,7 +19,6 @@
 import io.flutter.plugins.videoplayer.Messages.TextureMessage;
 import io.flutter.plugins.videoplayer.Messages.VideoPlayerApi;
 import io.flutter.plugins.videoplayer.Messages.VolumeMessage;
-import io.flutter.view.FlutterMain;
 import io.flutter.view.TextureRegistry;
 
 /** Android platform implementation of the VideoPlayerPlugin. */
@@ -31,7 +31,8 @@ public class VideoPlayerPlugin implements FlutterPlugin, VideoPlayerApi {
   /** Register this with the v2 embedding for the plugin to respond to lifecycle callbacks. */
   public VideoPlayerPlugin() {}
 
-  private VideoPlayerPlugin(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  private VideoPlayerPlugin(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     this.flutterState =
         new FlutterState(
             registrar.context(),
@@ -43,7 +44,8 @@ private VideoPlayerPlugin(Registrar registrar) {
   }
 
   /** Registers this with the stable v1 embedding. Will not respond to lifecycle events. */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final VideoPlayerPlugin plugin = new VideoPlayerPlugin(registrar);
     registrar.addViewDestroyListener(
         view -> {
@@ -54,12 +56,13 @@ public static void registerWith(Registrar registrar) {
 
   @Override
   public void onAttachedToEngine(FlutterPluginBinding binding) {
+    final FlutterLoader flutterLoader = FlutterInjector.instance().flutterLoader();
     this.flutterState =
         new FlutterState(
             binding.getApplicationContext(),
             binding.getBinaryMessenger(),
-            FlutterMain::getLookupKeyForAsset,
-            FlutterMain::getLookupKeyForAsset,
+            flutterLoader::getLookupKeyForAsset,
+            flutterLoader::getLookupKeyForAsset,
             binding.getTextureRegistry());
     flutterState.startListening(this, binding.getBinaryMessenger());
   }
diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java
index b21435f82fde..841853dbd758 100644
--- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java
+++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.videoplayer.VideoPlayerPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml
index 1d46ea7ebbf9..6eac285006a9 100644
--- a/packages/video_player/video_player/pubspec.yaml
+++ b/packages/video_player/video_player/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for displaying inline video with other Flutter
 # 0.10.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.10.12+3
+version: 0.10.12+4
 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
 
 flutter:
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
index e1f4c3c2d1c8..5e32e4952799 100644
--- a/packages/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.24
+
+* Keep handling deprecated Android v1 classes for backward compatibility.
+
 ## 0.3.23
 
 * Handle WebView multi-window support.
diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
index a43128c680d5..5ed2da3046c3 100644
--- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
+++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
@@ -6,7 +6,6 @@
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * Java platform implementation of the webview_flutter plugin.
@@ -41,7 +40,8 @@ public WebViewFlutterPlugin() {}
    * <p>Calling this automatically initializes the plugin. However plugins initialized this way
    * won't react to changes in activity or context, unlike {@link CameraPlugin}.
    */
-  public static void registerWith(Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     registrar
         .platformViewRegistry()
         .registerViewFactory(
diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java
index 8f253d8dc74f..07f9bf2f7802 100644
--- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java
@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
+@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java
index 3a88496594a3..dbdb1d7f72f9 100644
--- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java
+++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java
@@ -6,10 +6,10 @@
 
 import android.os.Bundle;
 import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin;
 
-public class EmbeddingV1Activity extends FlutterActivity {
+@SuppressWarnings("deprecation")
+public class EmbeddingV1Activity extends io.flutter.app.FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml
index 8a4a62ea76a6..2212ef6c4059 100644
--- a/packages/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.23
+version: 0.3.24
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
 
 environment:

From 9b383b73c88718f664e35a4724bd6cb031b8cc50 Mon Sep 17 00:00:00 2001
From: Xiao Yu <xiao@xster.net>
Date: Tue, 22 Sep 2020 18:05:43 -0700
Subject: [PATCH 2/4] make video player use apis available on stable

---
 .../flutter/plugins/androidalarmmanager/AlarmService.java  | 3 ++-
 .../androidalarmmanager/AndroidAlarmManagerPlugin.java     | 4 ++--
 .../androidalarmmanager/FlutterBackgroundExecutor.java     | 7 +++++--
 .../java/io/flutter/plugins/battery/BatteryPlugin.java     | 3 ++-
 .../flutter/plugins/googlesignin/GoogleSignInPlugin.java   | 3 ++-
 .../io/flutter/plugins/imagepicker/ImagePickerPlugin.java  | 3 ++-
 .../flutter/plugins/imagepicker/ImagePickerPluginTest.java | 4 +++-
 .../plugins/sharedpreferences/SharedPreferencesPlugin.java | 3 ++-
 .../io/flutter/plugins/videoplayer/VideoPlayerPlugin.java  | 4 ++--
 9 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
index 841628074e84..3287789f6c3d 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java
@@ -100,7 +100,8 @@ public static void setCallbackDispatcher(Context context, long callbackHandle) {
    * plugins are registered automatically.
    */
   @SuppressWarnings("deprecation")
-  public static void setPluginRegistrant(io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
+  public static void setPluginRegistrant(
+      io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     // Indirectly set in FlutterBackgroundExecutor for backwards compatibility.
     FlutterBackgroundExecutor.setPluginRegistrant(callback);
   }
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
index 74d903dcc02b..557913a626d5 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java
@@ -27,8 +27,8 @@
  *   <li>The Dart side of this plugin sends the Android side a "AlarmService.start" message, along
  *       with a Dart callback handle for a Dart callback that should be immediately invoked by a
  *       background Dart isolate.
- *   <li>The Android side of this plugin spins up a background {@link FlutterEngine}, which
- *       includes a background Dart isolate.
+ *   <li>The Android side of this plugin spins up a background {@link FlutterEngine}, which includes
+ *       a background Dart isolate.
  *   <li>The Android side of this plugin instructs the new background Dart isolate to execute the
  *       callback that was received in the "AlarmService.start" message.
  *   <li>The Dart side of this plugin, running within the new background isolate, executes the
diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
index 0483765377ed..86010ff3f089 100644
--- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
+++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java
@@ -30,8 +30,10 @@
 public class FlutterBackgroundExecutor implements MethodCallHandler {
   private static final String TAG = "FlutterBackgroundExecutor";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
+
   @SuppressWarnings("deprecation")
-  private static io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback pluginRegistrantCallback;
+  private static io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+      pluginRegistrantCallback;
 
   /**
    * The {@link MethodChannel} that connects the Android side of this plugin with the background
@@ -52,7 +54,8 @@ public class FlutterBackgroundExecutor implements MethodCallHandler {
    * callbacks will not be able to utilize functionality from other plugins.
    */
   @SuppressWarnings("deprecation")
-  public static void setPluginRegistrant(io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
+  public static void setPluginRegistrant(
+      io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback callback) {
     pluginRegistrantCallback = callback;
   }
 
diff --git a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
index 20062db7fb94..f16d219291d1 100644
--- a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
+++ b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
@@ -31,7 +31,8 @@ public class BatteryPlugin implements MethodCallHandler, StreamHandler, FlutterP
   private EventChannel eventChannel;
 
   /** Plugin registration. */
-  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final BatteryPlugin instance = new BatteryPlugin();
     instance.onAttachedToEngine(registrar.context(), registrar.messenger());
   }
diff --git a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
index 502cde5da609..dab6f4c4db8e 100755
--- a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
+++ b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
@@ -60,7 +60,8 @@ public class GoogleSignInPlugin implements MethodCallHandler, FlutterPlugin, Act
   private MethodChannel channel;
   private ActivityPluginBinding activityPluginBinding;
 
-  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     GoogleSignInPlugin instance = new GoogleSignInPlugin();
     instance.initInstance(registrar.messenger(), registrar.context(), new GoogleSignInWrapper());
     instance.setUpRegistrar(registrar);
diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index d501a83c144c..74556f9cd6cc 100644
--- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -111,7 +111,8 @@ public void onActivityStopped(Activity activity) {
   private Lifecycle lifecycle;
   private LifeCycleObserver observer;
 
-  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     if (registrar.activity() == null) {
       // If a background flutter view tries to register the plugin, there will be no activity from the registrar,
       // we stop the registering process immediately because the ImagePicker requires an activity.
diff --git a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
index 46e7b82a79f3..de1623e93db4 100644
--- a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
+++ b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
@@ -29,7 +29,9 @@ public class ImagePickerPluginTest {
   @Rule public ExpectedException exception = ExpectedException.none();
 
   @SuppressWarnings("deprecation")
-  @Mock io.flutter.plugin.common.PluginRegistry.Registrar mockRegistrar;
+  @Mock
+  io.flutter.plugin.common.PluginRegistry.Registrar mockRegistrar;
+
   @Mock Activity mockActivity;
   @Mock Application mockApplication;
   @Mock ImagePickerDelegate mockImagePickerDelegate;
diff --git a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
index eacf0164c113..be627f3ce613 100644
--- a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
+++ b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java
@@ -14,7 +14,8 @@ public class SharedPreferencesPlugin implements FlutterPlugin {
   private static final String CHANNEL_NAME = "plugins.flutter.io/shared_preferences";
   private MethodChannel channel;
 
-  @SuppressWarnings("deprecation") public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
+  @SuppressWarnings("deprecation")
+  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     final SharedPreferencesPlugin plugin = new SharedPreferencesPlugin();
     plugin.setupChannel(registrar.messenger(), registrar.context());
   }
diff --git a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
index 9352d456504b..329370a47477 100644
--- a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
+++ b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
@@ -7,7 +7,6 @@
 import android.content.Context;
 import android.util.Log;
 import android.util.LongSparseArray;
-import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
@@ -56,7 +55,8 @@ public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registra
 
   @Override
   public void onAttachedToEngine(FlutterPluginBinding binding) {
-    final FlutterLoader flutterLoader = FlutterInjector.instance().flutterLoader();
+    @SuppressWarnings("deprecation")
+    final FlutterLoader flutterLoader = FlutterLoader.getInstance();
     this.flutterState =
         new FlutterState(
             binding.getApplicationContext(),

From 5b210f02761c9ed08e245fd755ba83eda4a6c901 Mon Sep 17 00:00:00 2001
From: Xiao Yu <xiao@xster.net>
Date: Tue, 22 Sep 2020 22:34:38 -0700
Subject: [PATCH 3/4] fix version lint

---
 .../plugins/androidalarmmanagerexample/Application.java      | 5 ++++-
 .../flutter/plugins/androidintent/AndroidIntentPlugin.java   | 1 -
 .../androidintentexample/EmbeddingV1ActivityTest.java        | 1 -
 packages/battery/battery/CHANGELOG.md                        | 2 +-
 packages/battery/battery/pubspec.yaml                        | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
index e97324873ff4..55b789bcb6a4 100644
--- a/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
+++ b/packages/android_alarm_manager/example/android/app/src/main/java/io/flutter/plugins/androidalarmmanagerexample/Application.java
@@ -4,7 +4,9 @@
 import io.flutter.plugins.androidalarmmanager.AlarmService;
 import io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin;
 
-public class Application extends FlutterApplication implements PluginRegistrantCallback {
+@SuppressWarnings("deprecation")
+public class Application extends FlutterApplication
+    implements io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback {
   @Override
   public void onCreate() {
     super.onCreate();
@@ -12,6 +14,7 @@ public void onCreate() {
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void registerWith(io.flutter.plugin.common.PluginRegistry registry) {
     AndroidAlarmManagerPlugin.registerWith(
         registry.registrarFor("io.flutter.plugins.androidalarmmanager.AndroidAlarmManagerPlugin"));
diff --git a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
index 0664e426db30..30e0915aed1f 100644
--- a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
+++ b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java
@@ -32,7 +32,6 @@ public AndroidIntentPlugin() {
    * won't react to changes in activity or context, unlike {@link AndroidIntentPlugin}.
    */
   @SuppressWarnings("deprecation")
-  @SuppressWarnings("deprecation")
   public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
     IntentSender sender = new IntentSender(registrar.activity(), registrar.context());
     MethodCallHandlerImpl impl = new MethodCallHandlerImpl(sender);
diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
index 60c11095cd53..7ab0e87e7c5a 100644
--- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
+++ b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java
@@ -6,7 +6,6 @@
 import org.junit.runner.RunWith;
 
 @RunWith(FlutterTestRunner.class)
-@SuppressWarnings("deprecation")
 public class EmbeddingV1ActivityTest {
   @Rule
   public ActivityTestRule<EmbeddingV1Activity> rule =
diff --git a/packages/battery/battery/CHANGELOG.md b/packages/battery/battery/CHANGELOG.md
index 3e10348000ed..8acfb5b075ad 100644
--- a/packages/battery/battery/CHANGELOG.md
+++ b/packages/battery/battery/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.0.5+1
+## 1.0.6
 
 * Keep handling deprecated Android v1 classes for backward compatibility.
 
diff --git a/packages/battery/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml
index 0d7c286bcccb..147d62ae46cd 100644
--- a/packages/battery/battery/pubspec.yaml
+++ b/packages/battery/battery/pubspec.yaml
@@ -2,7 +2,7 @@ name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery
-version: 1.0.5+1
+version: 1.0.6
 
 flutter:
   plugin:

From 5421984fe87447d9bdff743e636c60280dceeab9 Mon Sep 17 00:00:00 2001
From: Xiao Yu <xiao@xster.net>
Date: Tue, 22 Sep 2020 22:47:33 -0700
Subject: [PATCH 4/4] formatter insists I change a file I didn't touch for some
 reason

---
 .../connectivity/ios/Classes/FLTConnectivityPlugin.m          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
index 0a65409b3828..526bee25d561 100644
--- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
+++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m
@@ -156,9 +156,7 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status
     case kCLAuthorizationStatusAuthorizedWhenInUse: {
       return @"authorizedWhenInUse";
     }
-    default: {
-      return @"unknown";
-    }
+    default: { return @"unknown"; }
   }
 }