Sync nnbd branch (#3157)

* Android Code Inspection and Clean up (#3117)

* [in_app_purchase] Android Code Inspection and Clean up (#3120)

* Android Code Inspection and Clean up

* Format

* [video_player] Fix SSLProtocolException for low API version (#3122)

* [camera] Set audio encoding bitrate when recording video (#3124)

Fixes flutter/flutter#38787

* Fix links in package example readmes (#3130)

http://flutter.io/ -> https://flutter.dev/

* [integration_test] Add watchPerformance (#3116)

* add watchPerformance

* [wifi_info_flutter] [wifi_info_flutter_platform_interface] Initial commit for `wifi_info_flutter` plugin and platform interface (#3129)

* [video_player] fix Timer Leak (#3119)

* [in_app_purchase] Add example test target to Podfile, add OCMock dependency (#3145)

* Add linux directory to examples (#3064)

When Linux support was added to these plugins, the app template wasn't
yet stabilized, so was not checked in. Now that it is stable, this adds
them so that the plugin_tools workaround that created them on each run
can be removed.

Other than CHANGELOG.md updates and updating the verison in
pubspec.yaml, this is purely the result of running 'flutter create .' in
the example/ folders and adding the resulting linux/ directories.

* [wifi_info_flutter_plugin_interface] implement wifi platform interface (#3134)

* [share] Replace deprecated Environment.getExternalStorageDirectory() call on Android. (#3152)

* Android API 29 & 30

* Update Version

* Update android sdk version to 29 for all mobile plugins. (#3042)

* [google_sign_in]  fix merge error in CHANGELOG (#3153)

Co-authored-by: Hamdi Kahloun <[email protected]>
Co-authored-by: Maurits van Beusekom <[email protected]>
Co-authored-by: Kevin Moore <[email protected]>
Co-authored-by: Ming Lyu (CareF) <[email protected]>
Co-authored-by: Maurice Parrish <[email protected]>
Co-authored-by: creativecreatorormaybenot <[email protected]>
Co-authored-by: Jenn Magder <[email protected]>
Co-authored-by: stuartmorgan <[email protected]>
Co-authored-by: Chris Yang <[email protected]>

Author: 10 people

packages/android_alarm_manager/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.5+15
+
+* Update android compileSdkVersion to 29.
+
 ## 0.4.5+14
 
 * Keep handling deprecated Android v1 classes for backward compatibility.

packages/android_alarm_manager/android/build.gradle

@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

packages/android_alarm_manager/example/README.md

@@ -5,4 +5,4 @@ Demonstrates how to use the android_alarm_manager plugin.
 ## Getting Started
 
 For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
+[documentation](https://flutter.dev/).

packages/android_alarm_manager/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'

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+14
+version: 0.4.5+15
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:

packages/android_intent/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.7+6
+
+* Update android compileSdkVersion to 29.
+
 ## 0.3.7+5
 
 * Android Code Inspection and Clean up.

packages/android_intent/android/build.gradle

@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16

packages/android_intent/example/README.md

@@ -5,4 +5,4 @@ Demonstrates how to use the android_intent plugin.
 ## Getting Started
 
 For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
+[documentation](https://flutter.dev/).

packages/android_intent/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'

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+5
+version: 0.3.7+6
 
 flutter:
   plugin:

packages/battery/battery/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.7
+
+* Update android compileSdkVersion to 29.
+
 ## 1.0.6
 
 * Keep handling deprecated Android v1 classes for backward compatibility.

packages/battery/battery/android/build.gradle

@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16

packages/battery/battery/example/README.md

@@ -5,4 +5,4 @@ Demonstrates how to use the battery plugin.
 ## Getting Started
 
 For help getting started with Flutter, view our online
-[documentation](http://flutter.io/).
+[documentation](https://flutter.dev/).

packages/battery/battery/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'

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.6
+version: 1.0.7
 
 flutter:
   plugin:

packages/camera/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.8+9
+
+* Update android compileSdkVersion to 29.
+
+## 0.5.8+8
+
+* Fixed garbled audio (in video) by setting audio encoding bitrate.
+
 ## 0.5.8+7
 
 * Keep handling deprecated Android v1 classes for backward compatibility.

packages/camera/android/build.gradle

@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
@@ -51,4 +51,5 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:3.5.13'
 }

packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -28,6 +28,7 @@
 import androidx.annotation.NonNull;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugins.camera.media.MediaRecorderBuilder;
 import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -82,7 +83,6 @@ public Camera(
     if (activity == null) {
       throw new IllegalStateException("No activity available!");
     }
-
     this.cameraName = cameraName;
     this.enableAudio = enableAudio;
     this.flutterTexture = flutterTexture;
@@ -120,23 +120,12 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
     if (mediaRecorder != null) {
       mediaRecorder.release();
     }
-    mediaRecorder = new MediaRecorder();
-
-    // There's a specific order that mediaRecorder expects. Do not change the order
-    // of these function calls.
-    if (enableAudio) mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-    mediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
-    mediaRecorder.setOutputFormat(recordingProfile.fileFormat);
-    if (enableAudio) mediaRecorder.setAudioEncoder(recordingProfile.audioCodec);
-    mediaRecorder.setVideoEncoder(recordingProfile.videoCodec);
-    mediaRecorder.setVideoEncodingBitRate(recordingProfile.videoBitRate);
-    if (enableAudio) mediaRecorder.setAudioSamplingRate(recordingProfile.audioSampleRate);
-    mediaRecorder.setVideoFrameRate(recordingProfile.videoFrameRate);
-    mediaRecorder.setVideoSize(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
-    mediaRecorder.setOutputFile(outputFilePath);
-    mediaRecorder.setOrientationHint(getMediaOrientation());
-
-    mediaRecorder.prepare();
+
+    mediaRecorder =
+        new MediaRecorderBuilder(recordingProfile, outputFilePath)
+            .setEnableAudio(enableAudio)
+            .setMediaOrientation(getMediaOrientation())
+            .build();
   }
 
   @SuppressLint("MissingPermission")

packages/camera/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java

@@ -0,0 +1,73 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+package io.flutter.plugins.camera.media;
+
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder;
+import androidx.annotation.NonNull;
+import java.io.IOException;
+
+public class MediaRecorderBuilder {
+  static class MediaRecorderFactory {
+    MediaRecorder makeMediaRecorder() {
+      return new MediaRecorder();
+    }
+  }
+
+  private final String outputFilePath;
+  private final CamcorderProfile recordingProfile;
+  private final MediaRecorderFactory recorderFactory;
+
+  private boolean enableAudio;
+  private int mediaOrientation;
+
+  public MediaRecorderBuilder(
+      @NonNull CamcorderProfile recordingProfile, @NonNull String outputFilePath) {
+    this(recordingProfile, outputFilePath, new MediaRecorderFactory());
+  }
+
+  MediaRecorderBuilder(
+      @NonNull CamcorderProfile recordingProfile,
+      @NonNull String outputFilePath,
+      MediaRecorderFactory helper) {
+    this.outputFilePath = outputFilePath;
+    this.recordingProfile = recordingProfile;
+    this.recorderFactory = helper;
+  }
+
+  public MediaRecorderBuilder setEnableAudio(boolean enableAudio) {
+    this.enableAudio = enableAudio;
+    return this;
+  }
+
+  public MediaRecorderBuilder setMediaOrientation(int orientation) {
+    this.mediaOrientation = orientation;
+    return this;
+  }
+
+  public MediaRecorder build() throws IOException {
+    MediaRecorder mediaRecorder = recorderFactory.makeMediaRecorder();
+
+    // There's a specific order that mediaRecorder expects. Do not change the order
+    // of these function calls.
+    if (enableAudio) {
+      mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+      mediaRecorder.setAudioEncodingBitRate(recordingProfile.audioBitRate);
+    }
+    mediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
+    mediaRecorder.setOutputFormat(recordingProfile.fileFormat);
+    if (enableAudio) mediaRecorder.setAudioEncoder(recordingProfile.audioCodec);
+    mediaRecorder.setVideoEncoder(recordingProfile.videoCodec);
+    mediaRecorder.setVideoEncodingBitRate(recordingProfile.videoBitRate);
+    if (enableAudio) mediaRecorder.setAudioSamplingRate(recordingProfile.audioSampleRate);
+    mediaRecorder.setVideoFrameRate(recordingProfile.videoFrameRate);
+    mediaRecorder.setVideoSize(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
+    mediaRecorder.setOutputFile(outputFilePath);
+    mediaRecorder.setOrientationHint(this.mediaOrientation);
+
+    mediaRecorder.prepare();
+
+    return mediaRecorder;
+  }
+}

packages/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java

@@ -95,6 +95,7 @@ public void sendCameraClosingEvent() {
 
   private Map<String, String> decodeSentMessage(ByteBuffer sentMessage) {
     sentMessage.position(0);
+    //noinspection unchecked
     return (Map<String, String>) StandardMethodCodec.INSTANCE.decodeEnvelope(sentMessage);
   }
 

packages/camera/android/src/test/java/io/flutter/plugins/camera/media/MediaRecorderBuilderTest.java

@@ -0,0 +1,102 @@
+package io.flutter.plugins.camera.media;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.*;
+
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import org.junit.Test;
+import org.mockito.InOrder;
+
+public class MediaRecorderBuilderTest {
+  @Test
+  public void ctor_test() {
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(CamcorderProfile.get(CamcorderProfile.QUALITY_1080P), "");
+
+    assertNotNull(builder);
+  }
+
+  @Test
+  public void build_Should_set_values_in_correct_order_When_audio_is_disabled() throws IOException {
+    CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    MediaRecorderBuilder.MediaRecorderFactory mockFactory =
+        mock(MediaRecorderBuilder.MediaRecorderFactory.class);
+    MediaRecorder mockMediaRecorder = mock(MediaRecorder.class);
+    String outputFilePath = "mock_video_file_path";
+    int mediaOrientation = 1;
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
+            .setEnableAudio(false)
+            .setMediaOrientation(mediaOrientation);
+
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
+
+    MediaRecorder recorder = builder.build();
+
+    InOrder inOrder = inOrder(recorder);
+    inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
+    inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
+    inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
+    inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
+    inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
+    inOrder
+        .verify(recorder)
+        .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
+    inOrder.verify(recorder).setOutputFile(outputFilePath);
+    inOrder.verify(recorder).setOrientationHint(mediaOrientation);
+    inOrder.verify(recorder).prepare();
+  }
+
+  @Test
+  public void build_Should_set_values_in_correct_order_When_audio_is_enabled() throws IOException {
+    CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    MediaRecorderBuilder.MediaRecorderFactory mockFactory =
+        mock(MediaRecorderBuilder.MediaRecorderFactory.class);
+    MediaRecorder mockMediaRecorder = mock(MediaRecorder.class);
+    String outputFilePath = "mock_video_file_path";
+    int mediaOrientation = 1;
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
+            .setEnableAudio(true)
+            .setMediaOrientation(mediaOrientation);
+
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
+
+    MediaRecorder recorder = builder.build();
+
+    InOrder inOrder = inOrder(recorder);
+    inOrder.verify(recorder).setAudioSource(MediaRecorder.AudioSource.MIC);
+    inOrder.verify(recorder).setAudioEncodingBitRate(recorderProfile.audioBitRate);
+    inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
+    inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
+    inOrder.verify(recorder).setAudioEncoder(recorderProfile.audioCodec);
+    inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
+    inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
+    inOrder.verify(recorder).setAudioSamplingRate(recorderProfile.audioSampleRate);
+    inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
+    inOrder
+        .verify(recorder)
+        .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
+    inOrder.verify(recorder).setOutputFile(outputFilePath);
+    inOrder.verify(recorder).setOrientationHint(mediaOrientation);
+    inOrder.verify(recorder).prepare();
+  }
+
+  private CamcorderProfile getEmptyCamcorderProfile() {
+    try {
+      Constructor<CamcorderProfile> constructor =
+          CamcorderProfile.class.getDeclaredConstructor(
+              int.class, int.class, int.class, int.class, int.class, int.class, int.class,
+              int.class, int.class, int.class, int.class, int.class);
+
+      constructor.setAccessible(true);
+      return constructor.newInstance(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    } catch (Exception ignored) {
+    }
+
+    return null;
+  }
+}

packages/camera/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'

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+7
+version: 0.5.8+9
 
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera