Fix deprecation warning

Author: mvanbeusekom

packages/camera/camera/android/build.gradle

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

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

@@ -136,8 +136,7 @@ public Camera(
             cameraCharacteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM));
 
     deviceOrientationListener =
-        new DeviceOrientationManager(
-            activity.getApplicationContext(), dartMessenger, isFrontFacing, sensorOrientation);
+        new DeviceOrientationManager(activity, dartMessenger, isFrontFacing, sensorOrientation);
     deviceOrientationListener.start();
   }
 

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

@@ -1,12 +1,16 @@
 package io.flutter.plugins.camera;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 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;
 import android.view.Surface;
 import android.view.WindowManager;
@@ -17,7 +21,7 @@ class DeviceOrientationManager {
   private static final IntentFilter orientationIntentFilter =
       new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED);
 
-  private final Context context;
+  private final Activity activity;
   private final DartMessenger messenger;
   private final boolean isFrontFacing;
   private final int sensorOrientation;
@@ -26,8 +30,8 @@ class DeviceOrientationManager {
   private BroadcastReceiver broadcastReceiver;
 
   public DeviceOrientationManager(
-      Context context, DartMessenger messenger, boolean isFrontFacing, int sensorOrientation) {
-    this.context = context;
+      Activity activity, DartMessenger messenger, boolean isFrontFacing, int sensorOrientation) {
+    this.activity = activity;
     this.messenger = messenger;
     this.isFrontFacing = isFrontFacing;
     this.sensorOrientation = sensorOrientation;
@@ -70,7 +74,7 @@ public int getMediaOrientation(PlatformChannel.DeviceOrientation orientation) {
   private void startSensorListener() {
     if (orientationEventListener != null) return;
     orientationEventListener =
-        new OrientationEventListener(context, SensorManager.SENSOR_DELAY_NORMAL) {
+        new OrientationEventListener(activity, SensorManager.SENSOR_DELAY_NORMAL) {
           @Override
           public void onOrientationChanged(int angle) {
             if (!isSystemAutoRotationLocked()) {
@@ -102,8 +106,8 @@ public void onReceive(Context context, Intent intent) {
             }
           }
         };
-    context.registerReceiver(broadcastReceiver, orientationIntentFilter);
-    broadcastReceiver.onReceive(context, null);
+    activity.registerReceiver(broadcastReceiver, orientationIntentFilter);
+    broadcastReceiver.onReceive(activity, null);
   }
 
   private void stopSensorListener() {
@@ -114,22 +118,19 @@ private void stopSensorListener() {
 
   private void stopUIListener() {
     if (broadcastReceiver == null) return;
-    context.unregisterReceiver(broadcastReceiver);
+    activity.unregisterReceiver(broadcastReceiver);
     broadcastReceiver = null;
   }
 
   private boolean isSystemAutoRotationLocked() {
     return android.provider.Settings.System.getInt(
-            context.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0)
+            activity.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0)
         != 1;
   }
 
   private PlatformChannel.DeviceOrientation getUIOrientation() {
-    final int rotation =
-        ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE))
-            .getDefaultDisplay()
-            .getRotation();
-    final int orientation = context.getResources().getConfiguration().orientation;
+    final int rotation = getDisplay().getRotation();
+    final int orientation = activity.getResources().getConfiguration().orientation;
 
     switch (orientation) {
       case Configuration.ORIENTATION_PORTRAIT:
@@ -172,9 +173,8 @@ private PlatformChannel.DeviceOrientation calculateSensorOrientation(int angle)
   }
 
   private int getDeviceDefaultOrientation() {
-    WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    Configuration config = context.getResources().getConfiguration();
-    int rotation = windowManager.getDefaultDisplay().getRotation();
+    Configuration config = activity.getResources().getConfiguration();
+    int rotation = getDisplay().getRotation();
     if (((rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180)
             && config.orientation == Configuration.ORIENTATION_LANDSCAPE)
         || ((rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270)
@@ -184,4 +184,14 @@ private int getDeviceDefaultOrientation() {
       return Configuration.ORIENTATION_PORTRAIT;
     }
   }
+
+  @SuppressWarnings("deprecation")
+  private Display getDisplay() {
+    if (VERSION.SDK_INT >= VERSION_CODES.R) {
+      return activity.getDisplay();
+    } else {
+      return ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE))
+          .getDefaultDisplay();
+    }
+  }
 }

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 29
+    compileSdkVersion 30
 
     lintOptions {
         disable 'InvalidPackage'