Remove redundant null check.
mDefaultSimCallManagerRequests was null-checked twice due to an old
merge conflict. Removing the redundant null check.
Test: Compile.
Test: Run unit tests.
Fixes: 227203109
Change-Id: I43f9e55789ba5bf607e77cf38574075df326d6cb
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);
}
}
}