From 6125d11bd49a35fee3ef1f79de5b968e969b4bcf Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Fri, 11 Sep 2020 12:40:50 +0100
Subject: [PATCH 1/9] [android_alarm_manager] Code Inspection

---
 .../androidalarmmanager/AlarmService.java     | 47 +++++++------
 .../AndroidAlarmManagerPlugin.java            | 69 ++++++++++---------
 .../FlutterBackgroundExecutor.java            | 13 ++--
 3 files changed, 69 insertions(+), 60 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 fb6e7f85b317..197c4f5dfad1 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
@@ -17,7 +17,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -76,9 +75,9 @@ public static void startBackgroundIsolate(Context context, long callbackHandle)
     synchronized (alarmQueue) {
       // Handle all the alarm events received before the Dart isolate was
       // initialized, then clear the queue.
-      Iterator<Intent> i = alarmQueue.iterator();
-      while (i.hasNext()) {
-        flutterBackgroundExecutor.executeDartCallbackInBackgroundIsolate(i.next(), null);
+      /// 'while' loop replaceable with enhanced 'for'
+      for (Intent intent : alarmQueue) {
+        flutterBackgroundExecutor.executeDartCallbackInBackgroundIsolate(intent, null);
       }
       alarmQueue.clear();
     }
@@ -231,7 +230,8 @@ public static void cancel(Context context, int requestCode) {
   }
 
   private static String getPersistentAlarmKey(int requestCode) {
-    return "android_alarm_manager/persistent_alarm_" + Integer.toString(requestCode);
+    /// Unnecessary 'Integer.toString()' call
+    return "android_alarm_manager/persistent_alarm_" + requestCode;
   }
 
   private static void addPersistentAlarm(
@@ -276,13 +276,15 @@ private static void addPersistentAlarm(
   }
 
   private static void clearPersistentAlarm(Context context, int requestCode) {
+    String request = String.valueOf(requestCode);
     SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
     synchronized (persistentAlarmsLock) {
       Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
-      if ((persistentAlarms == null) || !persistentAlarms.contains(requestCode)) {
+      /// 'Set' may not contain objects of type 'Integer'
+      if ((persistentAlarms == null) || !persistentAlarms.contains(request)) {
         return;
       }
-      persistentAlarms.remove(requestCode);
+      persistentAlarms.remove(request);
       String key = getPersistentAlarmKey(requestCode);
       p.edit().remove(key).putStringSet(PERSISTENT_ALARMS_SET_KEY, persistentAlarms).apply();
 
@@ -301,14 +303,15 @@ public static void reschedulePersistentAlarms(Context context) {
         return;
       }
 
-      Iterator<String> it = persistentAlarms.iterator();
-      while (it.hasNext()) {
-        int requestCode = Integer.parseInt(it.next());
+      /// 'while' loop replaceable with enhanced 'for'
+      for (String persistentAlarm : persistentAlarms) {
+        int requestCode = Integer.parseInt(persistentAlarm);
         String key = getPersistentAlarmKey(requestCode);
         String json = p.getString(key, null);
         if (json == null) {
+          /// Unnecessary 'Integer.toString()' call
           Log.e(
-              TAG, "Data for alarm request code " + Integer.toString(requestCode) + " is invalid.");
+                  TAG, "Data for alarm request code " + requestCode + " is invalid.");
           continue;
         }
         try {
@@ -322,17 +325,17 @@ public static void reschedulePersistentAlarms(Context context) {
           long intervalMillis = alarm.getLong("intervalMillis");
           long callbackHandle = alarm.getLong("callbackHandle");
           scheduleAlarm(
-              context,
-              requestCode,
-              alarmClock,
-              allowWhileIdle,
-              repeating,
-              exact,
-              wakeup,
-              startMillis,
-              intervalMillis,
-              false,
-              callbackHandle);
+                  context,
+                  requestCode,
+                  alarmClock,
+                  allowWhileIdle,
+                  repeating,
+                  exact,
+                  wakeup,
+                  startMillis,
+                  intervalMillis,
+                  false,
+                  callbackHandle);
         } catch (JSONException e) {
           Log.e(TAG, "Data for alarm request code " + requestCode + " is invalid: " + json);
         }
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 2f3f5f9f2925..e85eadd33761 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
@@ -107,37 +107,44 @@ public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
     Object arguments = call.arguments;
     try {
-      if (method.equals("AlarmService.start")) {
-        // This message is sent when the Dart side of this plugin is told to initialize.
-        long callbackHandle = ((JSONArray) arguments).getLong(0);
-        // In response, this (native) side of the plugin needs to spin up a background
-        // Dart isolate by using the given callbackHandle, and then setup a background
-        // method channel to communicate with the new background isolate. Once completed,
-        // this onMethodCall() method will receive messages from both the primary and background
-        // method channels.
-        AlarmService.setCallbackDispatcher(context, callbackHandle);
-        AlarmService.startBackgroundIsolate(context, callbackHandle);
-        result.success(true);
-      } else if (method.equals("Alarm.periodic")) {
-        // This message indicates that the Flutter app would like to schedule a periodic
-        // task.
-        PeriodicRequest periodicRequest = PeriodicRequest.fromJson((JSONArray) arguments);
-        AlarmService.setPeriodic(context, periodicRequest);
-        result.success(true);
-      } else if (method.equals("Alarm.oneShotAt")) {
-        // This message indicates that the Flutter app would like to schedule a one-time
-        // task.
-        OneShotRequest oneShotRequest = OneShotRequest.fromJson((JSONArray) arguments);
-        AlarmService.setOneShot(context, oneShotRequest);
-        result.success(true);
-      } else if (method.equals("Alarm.cancel")) {
-        // This message indicates that the Flutter app would like to cancel a previously
-        // scheduled task.
-        int requestCode = ((JSONArray) arguments).getInt(0);
-        AlarmService.cancel(context, requestCode);
-        result.success(true);
-      } else {
-        result.notImplemented();
+      /// 'if' statement replaceable with 'switch' statement
+      switch (method) {
+        case "AlarmService.start":
+          // This message is sent when the Dart side of this plugin is told to initialize.
+          long callbackHandle = ((JSONArray) arguments).getLong(0);
+          // In response, this (native) side of the plugin needs to spin up a background
+          // Dart isolate by using the given callbackHandle, and then setup a background
+          // method channel to communicate with the new background isolate. Once completed,
+          // this onMethodCall() method will receive messages from both the primary and background
+          // method channels.
+          AlarmService.setCallbackDispatcher(context, callbackHandle);
+          AlarmService.startBackgroundIsolate(context, callbackHandle);
+          result.success(true);
+          break;
+        case "Alarm.periodic":
+          // This message indicates that the Flutter app would like to schedule a periodic
+          // task.
+          PeriodicRequest periodicRequest = PeriodicRequest.fromJson((JSONArray) arguments);
+          AlarmService.setPeriodic(context, periodicRequest);
+          result.success(true);
+          break;
+        case "Alarm.oneShotAt":
+          // This message indicates that the Flutter app would like to schedule a one-time
+          // task.
+          OneShotRequest oneShotRequest = OneShotRequest.fromJson((JSONArray) arguments);
+          AlarmService.setOneShot(context, oneShotRequest);
+          result.success(true);
+          break;
+        case "Alarm.cancel":
+          // This message indicates that the Flutter app would like to cancel a previously
+          // scheduled task.
+          int requestCode = ((JSONArray) arguments).getInt(0);
+          AlarmService.cancel(context, requestCode);
+          result.success(true);
+          break;
+        default:
+          result.notImplemented();
+          break;
       }
     } catch (JSONException e) {
       result.error("error", "JSON error: " + e.getMessage(), null);
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 4e755c315528..3f7a3bd4e0e0 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
@@ -78,7 +78,7 @@ private void onInitialized() {
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
-    Object arguments = call.arguments;
+    /// Variable 'arguments' is never used
     try {
       if (method.equals("AlarmService.initialized")) {
         // This message is sent by the background method channel as soon as the background isolate
@@ -152,20 +152,19 @@ public void startBackgroundIsolate(Context context, long callbackHandle) {
     }
 
     Log.i(TAG, "Starting AlarmService...");
-    String appBundlePath = FlutterMain.findAppBundlePath(context);
+    /// findAppBundlePath(context) is deprecated
+    /// findAppBundlePath() return NonNull value
+    String appBundlePath = FlutterMain.findAppBundlePath();
     AssetManager assets = context.getAssets();
-    if (appBundlePath != null && !isRunning()) {
+    if (!isRunning()) {
       backgroundFlutterEngine = new FlutterEngine(context);
 
       // We need to create an instance of `FlutterEngine` before looking up the
       // callback. If we don't, the callback cache won't be initialized and the
       // lookup will fail.
+      /// lookupCallbackInformation(callbackHandle) return NonNull value
       FlutterCallbackInformation flutterCallback =
           FlutterCallbackInformation.lookupCallbackInformation(callbackHandle);
-      if (flutterCallback == null) {
-        Log.e(TAG, "Fatal: failed to find callback");
-        return;
-      }
 
       DartExecutor executor = backgroundFlutterEngine.getDartExecutor();
       initializeMethodChannel(executor);

From 168b6e91935cea62c0e17b4683a9375417a3404f Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Fri, 11 Sep 2020 12:53:34 +0100
Subject: [PATCH 2/9] [android_alarm_manager] Update changelog & pubspec

---
 packages/android_alarm_manager/CHANGELOG.md | 4 ++++
 packages/android_alarm_manager/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index faa2c731873d..22c3d822ec04 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5+13
+
+* Android Code Inspection and Clean up.
+
 ## 0.4.5+12
 
 * Update package:e2e reference to use the local version in the flutter/plugins
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 8e46b8c202eb..90dcbf1f7819 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+11
+version: 0.4.5+13
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:

From 319fd991f5f51396e0630450afc6bd61bb43f5fe Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Fri, 11 Sep 2020 13:30:40 +0100
Subject: [PATCH 3/9] [android_alarm_manager] Format Code

---
 .../androidalarmmanager/AlarmService.java     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 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 197c4f5dfad1..e29f68297883 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
@@ -310,8 +310,7 @@ public static void reschedulePersistentAlarms(Context context) {
         String json = p.getString(key, null);
         if (json == null) {
           /// Unnecessary 'Integer.toString()' call
-          Log.e(
-                  TAG, "Data for alarm request code " + requestCode + " is invalid.");
+          Log.e(TAG, "Data for alarm request code " + requestCode + " is invalid.");
           continue;
         }
         try {
@@ -325,17 +324,17 @@ public static void reschedulePersistentAlarms(Context context) {
           long intervalMillis = alarm.getLong("intervalMillis");
           long callbackHandle = alarm.getLong("callbackHandle");
           scheduleAlarm(
-                  context,
-                  requestCode,
-                  alarmClock,
-                  allowWhileIdle,
-                  repeating,
-                  exact,
-                  wakeup,
-                  startMillis,
-                  intervalMillis,
-                  false,
-                  callbackHandle);
+              context,
+              requestCode,
+              alarmClock,
+              allowWhileIdle,
+              repeating,
+              exact,
+              wakeup,
+              startMillis,
+              intervalMillis,
+              false,
+              callbackHandle);
         } catch (JSONException e) {
           Log.e(TAG, "Data for alarm request code " + requestCode + " is invalid: " + json);
         }

From c48594a2ba2d56a2dfef8ee4b2738adb8b44f04f Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Fri, 11 Sep 2020 13:40:58 +0100
Subject: [PATCH 4/9] [android_alarm_manager] Update changelog & pubspec

---
 packages/android_alarm_manager/CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index 22c3d822ec04..ef3bd2155f35 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,11 +1,8 @@
-## 0.4.5+13
-
-* Android Code Inspection and Clean up.
-
 ## 0.4.5+12
 
 * Update package:e2e reference to use the local version in the flutter/plugins
   repository.
+* Android Code Inspection and Clean up.  
 
 ## 0.4.5+11
 

From b7ca834399029f45d08ce8f2c31f7367964de7b0 Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Fri, 11 Sep 2020 13:52:37 +0100
Subject: [PATCH 5/9] [android_alarm_manager] Update changelog & pubspec

---
 packages/android_alarm_manager/CHANGELOG.md | 5 ++++-
 packages/android_alarm_manager/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
index ef3bd2155f35..22c3d822ec04 100644
--- a/packages/android_alarm_manager/CHANGELOG.md
+++ b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,8 +1,11 @@
+## 0.4.5+13
+
+* Android Code Inspection and Clean up.
+
 ## 0.4.5+12
 
 * Update package:e2e reference to use the local version in the flutter/plugins
   repository.
-* Android Code Inspection and Clean up.  
 
 ## 0.4.5+11
 
diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
index 90dcbf1f7819..85c6609d5780 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+12
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:

From 56b875c2e462ee1c2b43682a1132cea6c4ddaae3 Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Sat, 12 Sep 2020 18:44:33 +0100
Subject: [PATCH 6/9] Handle deprecation & unchecked warning as error

---
 packages/android_alarm_manager/android/build.gradle          | 5 +++++
 packages/android_alarm_manager/android/gradle.properties     | 1 +
 .../android/gradle/wrapper/gradle-wrapper.properties         | 5 +++++
 packages/android_alarm_manager/android/xlint.gradle          | 5 +++++
 4 files changed, 16 insertions(+)
 create mode 100644 packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 packages/android_alarm_manager/android/xlint.gradle

diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
index 04d09f62d936..8a59fed74438 100644
--- a/packages/android_alarm_manager/android/build.gradle
+++ b/packages/android_alarm_manager/android/build.gradle
@@ -1,5 +1,6 @@
 group 'io.flutter.plugins.androidalarmmanager'
 version '1.0-SNAPSHOT'
+def args = ["-Xlint:deprecation","-Xlint:unchecked","-Werror"]
 
 buildscript {
     repositories {
@@ -19,6 +20,10 @@ rootProject.allprojects {
     }
 }
 
+project.getTasks().withType(JavaCompile){
+    options.compilerArgs.addAll(args)
+}
+
 apply plugin: 'com.android.library'
 
 android {
diff --git a/packages/android_alarm_manager/android/gradle.properties b/packages/android_alarm_manager/android/gradle.properties
index 8bd86f680510..7be3d8b46841 100644
--- a/packages/android_alarm_manager/android/gradle.properties
+++ b/packages/android_alarm_manager/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
diff --git a/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..01a286e96a21
--- /dev/null
+++ b/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/packages/android_alarm_manager/android/xlint.gradle b/packages/android_alarm_manager/android/xlint.gradle
new file mode 100644
index 000000000000..6d039bb5a867
--- /dev/null
+++ b/packages/android_alarm_manager/android/xlint.gradle
@@ -0,0 +1,5 @@
+def args = ["-Xlint:deprecation","-Xlint:unchecked","-Werror"]
+
+project.getTasks().withType(JavaCompile){
+    options.compilerArgs.addAll(args)
+}
\ No newline at end of file

From 22f3d8f0a7fcac40e58f2b280696385b8ab27c32 Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Sat, 12 Sep 2020 18:45:06 +0100
Subject: [PATCH 7/9] Handle deprecation & unchecked warning as error

---
 packages/android_alarm_manager/android/xlint.gradle | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 packages/android_alarm_manager/android/xlint.gradle

diff --git a/packages/android_alarm_manager/android/xlint.gradle b/packages/android_alarm_manager/android/xlint.gradle
deleted file mode 100644
index 6d039bb5a867..000000000000
--- a/packages/android_alarm_manager/android/xlint.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-def args = ["-Xlint:deprecation","-Xlint:unchecked","-Werror"]
-
-project.getTasks().withType(JavaCompile){
-    options.compilerArgs.addAll(args)
-}
\ No newline at end of file

From 73dbdfcb5d8720f870e57e17798453ee542464a7 Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <hamdikahlounacil@gmail.com>
Date: Sat, 12 Sep 2020 19:05:24 +0100
Subject: [PATCH 8/9] Handle deprecation & unchecked warning as error

---
 .../android/gradle/wrapper/gradle-wrapper.properties         | 5 -----
 .../io/flutter/plugins/androidalarmmanager/AlarmService.java | 5 -----
 .../androidalarmmanager/AndroidAlarmManagerPlugin.java       | 1 -
 .../androidalarmmanager/FlutterBackgroundExecutor.java       | 4 ----
 4 files changed, 15 deletions(-)
 delete mode 100644 packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties

diff --git a/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 01a286e96a21..000000000000
--- a/packages/android_alarm_manager/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
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 e29f68297883..107d76738fe3 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
@@ -75,7 +75,6 @@ public static void startBackgroundIsolate(Context context, long callbackHandle)
     synchronized (alarmQueue) {
       // Handle all the alarm events received before the Dart isolate was
       // initialized, then clear the queue.
-      /// 'while' loop replaceable with enhanced 'for'
       for (Intent intent : alarmQueue) {
         flutterBackgroundExecutor.executeDartCallbackInBackgroundIsolate(intent, null);
       }
@@ -230,7 +229,6 @@ public static void cancel(Context context, int requestCode) {
   }
 
   private static String getPersistentAlarmKey(int requestCode) {
-    /// Unnecessary 'Integer.toString()' call
     return "android_alarm_manager/persistent_alarm_" + requestCode;
   }
 
@@ -280,7 +278,6 @@ private static void clearPersistentAlarm(Context context, int requestCode) {
     SharedPreferences p = context.getSharedPreferences(SHARED_PREFERENCES_KEY, 0);
     synchronized (persistentAlarmsLock) {
       Set<String> persistentAlarms = p.getStringSet(PERSISTENT_ALARMS_SET_KEY, null);
-      /// 'Set' may not contain objects of type 'Integer'
       if ((persistentAlarms == null) || !persistentAlarms.contains(request)) {
         return;
       }
@@ -303,13 +300,11 @@ public static void reschedulePersistentAlarms(Context context) {
         return;
       }
 
-      /// 'while' loop replaceable with enhanced 'for'
       for (String persistentAlarm : persistentAlarms) {
         int requestCode = Integer.parseInt(persistentAlarm);
         String key = getPersistentAlarmKey(requestCode);
         String json = p.getString(key, null);
         if (json == null) {
-          /// Unnecessary 'Integer.toString()' call
           Log.e(TAG, "Data for alarm request code " + requestCode + " is invalid.");
           continue;
         }
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 e85eadd33761..5a135f95e631 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
@@ -107,7 +107,6 @@ public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
     Object arguments = call.arguments;
     try {
-      /// 'if' statement replaceable with 'switch' statement
       switch (method) {
         case "AlarmService.start":
           // This message is sent when the Dart side of this plugin is told to initialize.
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 3f7a3bd4e0e0..8d5290842e14 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
@@ -78,7 +78,6 @@ private void onInitialized() {
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
-    /// Variable 'arguments' is never used
     try {
       if (method.equals("AlarmService.initialized")) {
         // This message is sent by the background method channel as soon as the background isolate
@@ -152,8 +151,6 @@ public void startBackgroundIsolate(Context context, long callbackHandle) {
     }
 
     Log.i(TAG, "Starting AlarmService...");
-    /// findAppBundlePath(context) is deprecated
-    /// findAppBundlePath() return NonNull value
     String appBundlePath = FlutterMain.findAppBundlePath();
     AssetManager assets = context.getAssets();
     if (!isRunning()) {
@@ -162,7 +159,6 @@ public void startBackgroundIsolate(Context context, long callbackHandle) {
       // We need to create an instance of `FlutterEngine` before looking up the
       // callback. If we don't, the callback cache won't be initialized and the
       // lookup will fail.
-      /// lookupCallbackInformation(callbackHandle) return NonNull value
       FlutterCallbackInformation flutterCallback =
           FlutterCallbackInformation.lookupCallbackInformation(callbackHandle);
 

From 0e3b4e52a2058acaf54aeff164a7188115807d2b Mon Sep 17 00:00:00 2001
From: Hamdi Kahloun <32666446+hamdikahloun@users.noreply.github.com>
Date: Sat, 12 Sep 2020 19:07:35 +0100
Subject: [PATCH 9/9] Update gradle.properties

---
 packages/android_alarm_manager/android/gradle.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/android_alarm_manager/android/gradle.properties b/packages/android_alarm_manager/android/gradle.properties
index 7be3d8b46841..8bd86f680510 100644
--- a/packages/android_alarm_manager/android/gradle.properties
+++ b/packages/android_alarm_manager/android/gradle.properties
@@ -1,2 +1 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true