PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prepare tests for impending robolectric merge"

Browse Source
This commit is contained in:
James Lemieux
2018-11-21 05:16:08 +00:00
committed by Android (Google) Code Review
parent afc09c5234 3a55de44c5
commit bbb4e91b3f
31 changed files with 125 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -94,8 +94,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
void finishIfAccountMissing() {
final Context context = getContext();
final UserManager um = context.getSystemService(UserManager.class);
final AccountManager accountManager = (AccountManager) context.getSystemService(
AccountManager.class);
final AccountManager accountManager = context.getSystemService(AccountManager.class);
for (UserHandle userHandle : um.getUserProfiles()) {
for (Account account : accountManager.getAccountsAsUser(userHandle.getIdentifier())) {
if (account.equals(mAccount)) {

2
src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
View File

@@ -128,7 +128,7 @@ public class ImeiInfoDialogController {
private SubscriptionInfo getSubscriptionInfo(Context context, int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(context)
.getActiveSubscriptionInfoList();
if (subscriptionInfoList == null) {
if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return null;
}

2
src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
View File

@@ -131,7 +131,7 @@ public class DeviceInfoSlice implements CustomSliceable {
SubscriptionInfo getFirstSubscriptionInfo() {
final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptionInfoList == null) {
if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return null;
}
return subscriptionInfoList.get(0);