From 6138ecf117d69693d25ba0c877ec2fcb3ae5f6bb Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Sat, 20 Jul 2019 08:44:49 -0700
Subject: [PATCH] Fix Android compile warning

---
 packages/firebase_core/CHANGELOG.md                           | 4 ++++
 .../io/flutter/plugins/firebase/core/FirebaseCorePlugin.java  | 4 ++--
 packages/firebase_core/pubspec.yaml                           | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
index 0f573c5afad3..aaae8721e850 100644
--- a/packages/firebase_core/CHANGELOG.md
+++ b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+7
+
+* Fix Android compilation warning.
+
 ## 0.4.0+6
 
 * Automatically use version from pubspec.yaml when reporting usage to Firebase.
diff --git a/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java b/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
index 3d60df1bfeb3..ef82fbf92573 100644
--- a/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
+++ b/packages/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FirebaseCorePlugin.java
@@ -32,7 +32,7 @@ private FirebaseCorePlugin(Context context) {
     this.context = context;
   }
 
-  private Map asMap(FirebaseApp app) {
+  private Map<String, Object> asMap(FirebaseApp app) {
     Map<String, Object> appMap = new HashMap<>();
     appMap.put("name", app.getName());
     FirebaseOptions options = app.getOptions();
@@ -80,7 +80,7 @@ public void onMethodCall(MethodCall call, final Result result) {
         }
       case "FirebaseApp#appNamed":
         {
-          String name = (String) call.arguments();
+          String name = call.arguments();
           try {
             FirebaseApp app = FirebaseApp.getInstance(name);
             result.success(asMap(app));
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 36972e90ba26..db6da67197af 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
-version: 0.4.0+6
+version: 0.4.0+7
 
 flutter:
   plugin: