Merge "Fix possible NPE seen in invalid grant dialogs" into udc-dev

1 files changed, 1 insertions, 1 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
index 7c4f197b2..a475a89ac 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
@@ -741,7 +741,7 @@ public class GrantPermissionsActivity extends SettingsActivity
             removeActivityFromMap();
             // If a new merge request came in before we managed to remove this activity from the
             // map, then cancel the result set for now.
-            if (!oldRequestedPermissions.equals(mRequestedPermissions)) {
+            if (!Objects.equals(oldRequestedPermissions, mRequestedPermissions)) {
                 return false;
             }