Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant null check.

Browse Source 
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
This commit is contained in:
Tyler Gunn
2023-01-06 00:13:57 +00:00
parent 89d5abbbe2
commit 93ecd18268
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/telecom/TelecomLoaderService.java
View File

@@ -72,21 +72,19 @@ public class TelecomLoaderService extends SystemService {
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);
}
}
}