diff --git a/android/app/build.gradle b/android/app/build.gradle
index 140e804f3..eb4d5cce7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -53,6 +53,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        checkAllWarnings true
+        warningsAsErrors true
+        disable 'InvalidPackage'
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }
@@ -165,10 +171,6 @@ android {
             }
         }
     }
-
-    lint {
-        disable 'InvalidPackage'
-    }
 }
 
 flutter {
@@ -200,7 +202,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
     implementation 'androidx.media:media:1.6.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha05'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.commonsware.cwac:document:0.5.0'
diff --git a/plugins/aves_platform_meta/android/build.gradle b/plugins/aves_platform_meta/android/build.gradle
index fa9883741..6af507be5 100644
--- a/plugins/aves_platform_meta/android/build.gradle
+++ b/plugins/aves_platform_meta/android/build.gradle
@@ -32,6 +32,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        checkAllWarnings true
+        warningsAsErrors true
+        disable 'InvalidPackage'
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }
diff --git a/plugins/aves_screen_state/android/build.gradle b/plugins/aves_screen_state/android/build.gradle
index 299a834b4..a5a3ea845 100644
--- a/plugins/aves_screen_state/android/build.gradle
+++ b/plugins/aves_screen_state/android/build.gradle
@@ -32,6 +32,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        checkAllWarnings true
+        warningsAsErrors true
+        disable 'InvalidPackage'
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }
diff --git a/pubspec.lock b/pubspec.lock
index 81b5a3a90..437acf3fd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -333,7 +333,7 @@ packages:
     description:
       path: "."
       ref: aves
-      resolved-ref: c12d794ff60c7309358955d69c5ed55f9028b052
+      resolved-ref: "1f4da7b300eb0d3532330eb86edd4e99621ed4bb"
       url: "https://github.com/deckerst/fijkplayer.git"
     source: git
     version: "0.10.0"
@@ -571,10 +571,10 @@ packages:
     dependency: transitive
     description:
       name: google_maps_flutter_android
-      sha256: ee3c1a63983b8ba17a9a7c1233c3542fbfbc0ebf540d3aa9b8fd5162681e0219
+      sha256: e2415bdf73f8453461fe4c3ba9e93608f03f26492a96c39e4d51158ba53f758d
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.12"
   google_maps_flutter_ios:
     dependency: transitive
     description:
diff --git a/scripts/fix_android_log_levels.bat b/scripts/fix_android_log_levels.bat
index 12d5967b2..ee9d7b46d 100644
--- a/scripts/fix_android_log_levels.bat
+++ b/scripts/fix_android_log_levels.bat
@@ -11,6 +11,12 @@ adb.exe shell setprop log.tag.ACodec WARN
 adb.exe shell setprop log.tag.AHierarchicalStateMachine ERROR
 adb.exe shell setprop log.tag.AudioCapabilities ERROR
 adb.exe shell setprop log.tag.AudioTrack INFO
+adb.exe shell setprop log.tag.BufferPoolAccessor2.0 INFO
+adb.exe shell setprop log.tag.CCodec INFO
+adb.exe shell setprop log.tag.CCodecBufferChannel INFO
+adb.exe shell setprop log.tag.CCodecBuffers INFO
+adb.exe shell setprop log.tag.CCodecConfig INFO
+adb.exe shell setprop log.tag.Codec2Client INFO
 adb.exe shell setprop log.tag.CompatibilityChangeReporter INFO
 adb.exe shell setprop log.tag.Counters WARN
 adb.exe shell setprop log.tag.CustomizedTextParser INFO
@@ -24,6 +30,8 @@ adb.exe shell setprop log.tag.MediaCodec WARN
 adb.exe shell setprop log.tag.MediaMetadataRetriever INFO
 adb.exe shell setprop log.tag.MediaMetadataRetrieverJNI INFO
 adb.exe shell setprop log.tag.NuMediaExtractor INFO
+adb.exe shell setprop log.tag.PipelineWatcher INFO
+adb.exe shell setprop log.tag.ReflectedParamUpdater INFO
 adb.exe shell setprop log.tag.skia INFO
 adb.exe shell setprop log.tag.SurfaceControl WARN
 adb.exe shell setprop log.tag.SurfaceUtils INFO
diff --git a/scripts/fix_android_log_levels.sh b/scripts/fix_android_log_levels.sh
index 3771741a1..1e525225e 100755
--- a/scripts/fix_android_log_levels.sh
+++ b/scripts/fix_android_log_levels.sh
@@ -3,6 +3,12 @@ adb shell setprop log.tag.ACodec WARN
 adb shell setprop log.tag.AHierarchicalStateMachine ERROR
 adb shell setprop log.tag.AudioCapabilities ERROR
 adb shell setprop log.tag.AudioTrack INFO
+adb shell setprop log.tag.BufferPoolAccessor2.0 INFO
+adb shell setprop log.tag.CCodec INFO
+adb shell setprop log.tag.CCodecBufferChannel INFO
+adb shell setprop log.tag.CCodecBuffers INFO
+adb shell setprop log.tag.CCodecConfig INFO
+adb shell setprop log.tag.Codec2Client INFO
 adb shell setprop log.tag.CompatibilityChangeReporter INFO
 adb shell setprop log.tag.Counters WARN
 adb shell setprop log.tag.CustomizedTextParser INFO
@@ -16,6 +22,8 @@ adb shell setprop log.tag.MediaCodec WARN
 adb shell setprop log.tag.MediaMetadataRetriever INFO
 adb shell setprop log.tag.MediaMetadataRetrieverJNI INFO
 adb shell setprop log.tag.NuMediaExtractor INFO
+adb shell setprop log.tag.PipelineWatcher INFO
+adb shell setprop log.tag.ReflectedParamUpdater INFO
 adb shell setprop log.tag.skia INFO
 adb shell setprop log.tag.SurfaceControl WARN
 adb shell setprop log.tag.SurfaceUtils INFO