From af7d56927f5eb0b8773c23899bed0ea7f4a53d04 Mon Sep 17 00:00:00 2001
From: Maurits van Beusekom <maurits@vnbskm.nl>
Date: Tue, 2 Feb 2021 11:08:07 +0100
Subject: [PATCH] Revert compileSdkVersion to 29

---
 packages/camera/camera/CHANGELOG.md                      | 4 ++++
 packages/camera/camera/android/build.gradle              | 2 +-
 .../flutter/plugins/camera/DeviceOrientationManager.java | 9 +--------
 packages/camera/camera/example/android/app/build.gradle  | 2 +-
 packages/camera/camera/pubspec.yaml                      | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
index 35a4d950e510..911d7a1e9920 100644
--- a/packages/camera/camera/CHANGELOG.md
+++ b/packages/camera/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.7.0+3
+
+* Revert compileSdkVersion back to 29 (from 30) as this is causing problems with add-to-app configurations.
+
 ## 0.7.0+2
 
 * Fix example reference in README.
diff --git a/packages/camera/camera/android/build.gradle b/packages/camera/camera/android/build.gradle
index 0606738a0a69..0b88fd10fb71 100644
--- a/packages/camera/camera/android/build.gradle
+++ b/packages/camera/camera/android/build.gradle
@@ -27,7 +27,7 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
index d39a8da55cc8..7c6011b185fb 100644
--- a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
+++ b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
@@ -11,8 +11,6 @@
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.hardware.SensorManager;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 import android.view.Display;
 import android.view.OrientationEventListener;
@@ -191,11 +189,6 @@ private int getDeviceDefaultOrientation() {
 
   @SuppressWarnings("deprecation")
   private Display getDisplay() {
-    if (VERSION.SDK_INT >= VERSION_CODES.R) {
-      return activity.getDisplay();
-    } else {
-      return ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE))
-          .getDefaultDisplay();
-    }
+    return ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
   }
 }
diff --git a/packages/camera/camera/example/android/app/build.gradle b/packages/camera/camera/example/android/app/build.gradle
index c5eeb246fe30..7d0e281b74e8 100644
--- a/packages/camera/camera/example/android/app/build.gradle
+++ b/packages/camera/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 30
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'
diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
index 2b6d163dfbeb..cebbb334c8f2 100644
--- a/packages/camera/camera/pubspec.yaml
+++ b/packages/camera/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.7.0+2
+version: 0.7.0+3
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 
 dependencies: