Fix app initialization issue if no permissions am: 297a6f7047

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345448

Change-Id: If592a8e5431035c8a369917f24dbdd73e28bae4d
This commit is contained in:
Taesu Lee
2020-06-22 16:53:14 +00:00
committed by Automerger Merge Worker

View File

@@ -106,10 +106,7 @@ public class PermissionCheckActivity extends Activity {
if (requestCode == REQUIRED_PERMISSIONS_REQUEST_CODE) { if (requestCode == REQUIRED_PERMISSIONS_REQUEST_CODE) {
// We do not use grantResults as some of the granted permissions might have been // 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. // revoked while the permissions dialog box was being shown for the missing permissions.
if (OsUtil.hasRequiredPermissions()) { if (!redirectIfNeeded()) {
Factory.get().onRequiredPermissionsAcquired();
redirect();
} else {
final long currentTimeMillis = SystemClock.elapsedRealtime(); final long currentTimeMillis = SystemClock.elapsedRealtime();
// If the permission request completes very quickly, it must be because the system // 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 // automatically denied. This can happen if the user had previously denied it
@@ -130,6 +127,7 @@ public class PermissionCheckActivity extends Activity {
return false; return false;
} }
Factory.get().onRequiredPermissionsAcquired();
redirect(); redirect();
return true; return true;
} }