From 297a6f70479cf676e23f6f4a0d18ee5f58e8fab0 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Mon, 22 Jun 2020 18:52:14 +0900 Subject: [PATCH] Fix app initialization issue if no permissions Call onRequiredPermissionsAcquired() before calling redirect() so that BugleApplication initialization can be done completed always even PermissionCheckActivity#onResume() case. Test: Manual Signed-off-by: Taesu Lee Change-Id: I01bb681442e0b391238bc162ce139ff40d947eaf --- src/com/android/messaging/ui/PermissionCheckActivity.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/messaging/ui/PermissionCheckActivity.java b/src/com/android/messaging/ui/PermissionCheckActivity.java index e992a10..1b8cedb 100644 --- a/src/com/android/messaging/ui/PermissionCheckActivity.java +++ b/src/com/android/messaging/ui/PermissionCheckActivity.java @@ -106,10 +106,7 @@ public class PermissionCheckActivity extends Activity { if (requestCode == REQUIRED_PERMISSIONS_REQUEST_CODE) { // We do not use grantResults as some of the granted permissions might have been // revoked while the permissions dialog box was being shown for the missing permissions. - if (OsUtil.hasRequiredPermissions()) { - Factory.get().onRequiredPermissionsAcquired(); - redirect(); - } else { + if (!redirectIfNeeded()) { final long currentTimeMillis = SystemClock.elapsedRealtime(); // If the permission request completes very quickly, it must be because the system // automatically denied. This can happen if the user had previously denied it @@ -130,6 +127,7 @@ public class PermissionCheckActivity extends Activity { return false; } + Factory.get().onRequiredPermissionsAcquired(); redirect(); return true; }