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

Merge "Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS" into qt-dev

Browse Source
This commit is contained in:
Ritwika Mitra
2019-06-03 19:15:49 +00:00
committed by Android (Google) Code Review
parent 7a9a83f6a1 19afd4690f
commit d1ca4823d5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/com/android/internal/telephony/SmsApplication.java
View File

@@ -465,7 +465,11 @@ public final class SmsApplication {
int userId) { int userId) {
TelephonyManager tm = (TelephonyManager) TelephonyManager tm = (TelephonyManager)
context.getSystemService(Context.TELEPHONY_SERVICE); context.getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isSmsCapable()) { RoleManager roleManager = (RoleManager) context.getSystemService(Context.ROLE_SERVICE);
// (b/134400042) RoleManager might be null in unit tests running older mockito versions
// that do not support mocking final classes.
if (!tm.isSmsCapable() && (roleManager == null || !roleManager.isRoleAvailable(
RoleManager.ROLE_SMS))) {
// No phone, no SMS // No phone, no SMS
return null; return null;
} }
@@ -584,7 +588,11 @@ public final class SmsApplication {
public static void setDefaultApplicationAsUser(String packageName, Context context, public static void setDefaultApplicationAsUser(String packageName, Context context,
int userId) { int userId) {
TelephonyManager tm = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); TelephonyManager tm = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isSmsCapable()) { RoleManager roleManager = (RoleManager) context.getSystemService(Context.ROLE_SERVICE);
// (b/134400042) RoleManager might be null in unit tests running older mockito versions
// that do not support mocking final classes.
if (!tm.isSmsCapable() && (roleManager == null || !roleManager.isRoleAvailable(
RoleManager.ROLE_SMS))) {
// No phone, no SMS // No phone, no SMS
return; return;
} }