commit 58e0840648c208d3ea2b7ca1a281bfe2da3ee149
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Jan 08 00:00:32 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 08 00:00:32 2023 +0000
tree fdda3056eca9d5946b165a5d898dc4290a1bade4
parent 0a86ed2d3acbfc83b1c8e991a5d5fda027e823e5
parent 93ecd18268a8ce82019ced888ae9636c1943889e

Merge "Remove redundant null check."

services/core/java/com/android/server/telecom/TelecomLoaderService.java

diff --git a/services/core/java/com/android/server/telecom/TelecomLoaderService.java b/services/core/java/com/android/server/telecom/TelecomLoaderService.java
index 32ad702..63a3e5a 100644
--- a/services/core/java/com/android/server/telecom/TelecomLoaderService.java
+++ b/services/core/java/com/android/server/telecom/TelecomLoaderService.java
@@ -72,21 +72,19 @@
                     final LegacyPermissionManagerInternal permissionManager =
                             LocalServices.getService(LegacyPermissionManagerInternal.class);
                     if (mDefaultSimCallManagerRequests != null) {
-                        if (mDefaultSimCallManagerRequests != null) {
-                            TelecomManager telecomManager =
+                        TelecomManager telecomManager =
                                 (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
-                            PhoneAccountHandle phoneAccount = telecomManager.getSimCallManager();
-                            if (phoneAccount != null) {
-                                final int requestCount = mDefaultSimCallManagerRequests.size();
-                                final String packageName =
+                        PhoneAccountHandle phoneAccount = telecomManager.getSimCallManager();
+                        if (phoneAccount != null) {
+                            final int requestCount = mDefaultSimCallManagerRequests.size();
+                            final String packageName =
                                     phoneAccount.getComponentName().getPackageName();
-                                for (int i = requestCount - 1; i >= 0; i--) {
-                                    final int userId = mDefaultSimCallManagerRequests.get(i);
-                                    mDefaultSimCallManagerRequests.remove(i);
-                                    permissionManager
-                                            .grantDefaultPermissionsToDefaultSimCallManager(
-                                                    packageName, userId);
-                                }
+                            for (int i = requestCount - 1; i >= 0; i--) {
+                                final int userId = mDefaultSimCallManagerRequests.get(i);
+                                mDefaultSimCallManagerRequests.remove(i);
+                                permissionManager
+                                        .grantDefaultPermissionsToDefaultSimCallManager(
+                                                packageName, userId);
                             }
                         }
                     }