From ff0c431cd226d7f629e7d7031e948dbc6123b810 Mon Sep 17 00:00:00 2001 From: Ren You Date: Wed, 25 Mar 2020 16:32:55 -0700 Subject: [PATCH 1/4] Android change to match the google internal changes. --- .../android/io/flutter/app/FlutterFragmentActivity.java | 1 + .../io/flutter/embedding/android/FlutterFragmentActivity.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index 2e881b6148673..d21f1e5787e64 100644 --- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -128,6 +128,7 @@ protected void onPostResume() { // @Override - added in API level 23 public void onRequestPermissionsResult( int requestCode, String[] permissions, int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); eventDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults); } diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java index 9a7b6aa7d0925..ebd1af1760113 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java @@ -293,7 +293,8 @@ private void switchLaunchThemeForNormalTheme() { } catch (PackageManager.NameNotFoundException exception) { Log.e( TAG, - "Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal theme."); + "Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal" + + " theme."); } } From 4369e21d4cdf09f83705bbd84b25af2ddfabc8e2 Mon Sep 17 00:00:00 2001 From: Ren You Date: Wed, 25 Mar 2020 17:01:07 -0700 Subject: [PATCH 2/4] Fix format. --- .../io/flutter/embedding/android/FlutterFragmentActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java index ebd1af1760113..0a6c5f989752a 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java @@ -294,7 +294,7 @@ private void switchLaunchThemeForNormalTheme() { Log.e( TAG, "Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal" - + " theme."); + + " theme."); } } From 72214d1198339ce974dd444a20c4bf315581a06d Mon Sep 17 00:00:00 2001 From: Ren You Date: Wed, 25 Mar 2020 17:05:44 -0700 Subject: [PATCH 3/4] Revert format change, add super call. --- .../io/flutter/embedding/android/FlutterFragmentActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java index 0a6c5f989752a..4215d4d2c39c4 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java @@ -293,8 +293,7 @@ private void switchLaunchThemeForNormalTheme() { } catch (PackageManager.NameNotFoundException exception) { Log.e( TAG, - "Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal" - + " theme."); + "Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal theme."); } } @@ -490,6 +489,7 @@ public void onBackPressed() { @Override public void onRequestPermissionsResult( int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); flutterFragment.onRequestPermissionsResult(requestCode, permissions, grantResults); } From 416a44de0e534f766431b65aca36ab59c62b0074 Mon Sep 17 00:00:00 2001 From: Ren You Date: Wed, 25 Mar 2020 17:08:24 -0700 Subject: [PATCH 4/4] Remove comment for API version. --- .../android/io/flutter/app/FlutterFragmentActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index d21f1e5787e64..3fc80cf703bb8 100644 --- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -125,7 +125,7 @@ protected void onPostResume() { eventDelegate.onPostResume(); } - // @Override - added in API level 23 + @Override public void onRequestPermissionsResult( int requestCode, String[] permissions, int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults);