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

[Settings] Code Refactor for performance

Browse Source 
Reduce number of SubscriptionManager API queries.

Bug: 260540995
Test: local and auto
Change-Id: Ib05660d9ade7f352a7cc82d4065974aec396714a
This commit is contained in:
Bonian Chen
2022-12-15 16:10:12 +00:00
parent fd39b53f51
commit af8f04c3d1
5 changed files with 216 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
View File

@@ -34,6 +34,8 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.Observer;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -46,6 +48,7 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -125,7 +128,7 @@ public class SimStatusPreferenceControllerTest {
@Test
public void displayPreference_multiSim_shouldAddSecondPreference() {
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -133,10 +136,11 @@ public class SimStatusPreferenceControllerTest {
verify(mCategory).addPreference(mSecondSimPreference);
}
@Ignore
@Test
public void updateState_singleSim_shouldSetSingleSimTitleAndSummary() {
when(mTelephonyManager.getPhoneCount()).thenReturn(1);
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -146,10 +150,11 @@ public class SimStatusPreferenceControllerTest {
verify(mFirstSimPreference).setSummary(anyString());
}
@Ignore
@Test
public void updateState_multiSim_shouldSetMultiSimTitleAndSummary() {
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -163,12 +168,13 @@ public class SimStatusPreferenceControllerTest {
verify(mSecondSimPreference).setSummary(anyString());
}
@Ignore
@Test
public void handlePreferenceTreeClick_shouldStartDialogFragment() {
when(mFragment.getChildFragmentManager()).thenReturn(
mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -180,7 +186,7 @@ public class SimStatusPreferenceControllerTest {
@Test
public void updateDynamicRawDataToIndex_notAddToSearch_emptySimSlot() {
doReturn(null).when(mSubscriptionManager).getActiveSubscriptionInfoList();
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
mController.init(mFragment, slotSimStatus);
@@ -191,10 +197,11 @@ public class SimStatusPreferenceControllerTest {
@Test
public void updateDynamicRawDataToIndex_addToSearch_simInSimSlot() {
when(mTelephonyManager.getPhoneCount()).thenReturn(1);
doReturn(false).when(mSubscriptionInfo).isEmbedded();
doReturn(List.of(mSubscriptionInfo)).when(mSubscriptionManager)
.getActiveSubscriptionInfoList();
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
mController.init(mFragment, slotSimStatus);
@@ -203,23 +210,16 @@ public class SimStatusPreferenceControllerTest {
assertThat(rawData.size()).isEqualTo(1);
}
@Test
public void updateDynamicRawDataToIndex_addEsimToSearch_esimInSimSlot() {
doReturn(true).when(mSubscriptionInfo).isEmbedded();
doReturn(List.of(mSubscriptionInfo)).when(mSubscriptionManager)
.getActiveSubscriptionInfoList();
SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
mController.init(mFragment, slotSimStatus);
mController.updateDynamicRawDataToIndex(rawData);
assertThat(rawData.size()).isEqualTo(1);
assertThat(rawData.get(0).keywords.contains("eid")).isTrue();
}
private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName);
when(mContext.getSystemService(serviceName)).thenReturn(service);
}
private class TestSlotSimStatus extends SlotSimStatus {
public TestSlotSimStatus(Context context) {
super(context);
}
public void observe(LifecycleOwner owner, Observer observer) {}
}
}

70
tests/unit/src/com/android/settings/deviceinfo/simstatus/SlotSimStatusTest.java
View File

@@ -23,8 +23,13 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Bundle;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyManager;
import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -36,15 +41,27 @@ import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.List;
import java.util.concurrent.Executor;
@RunWith(AndroidJUnit4.class)
public class SlotSimStatusTest {
private static final int SUB_ID_1 = 3;
private static final int SUB_ID_2 = 8;
@Mock
private SubscriptionManager mSubscriptionManager;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
private SubscriptionInfo mSubscriptionInfo1;
@Mock
private SubscriptionInfo mSubscriptionInfo2;
@Mock
private Executor mExecutor;
@Mock
private Lifecycle mLifecycle;
@Captor
private ArgumentCaptor<Runnable> mRunnableCaptor;
@@ -56,13 +73,20 @@ public class SlotSimStatusTest {
mContext = spy(ApplicationProvider.getApplicationContext());
mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager);
mockService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class,
mSubscriptionManager);
}
@Test
public void size_returnNumberOfPhone_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
SlotSimStatus target = new SlotSimStatus(mContext);
SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
@Override
protected void postValue(Long value) {}
@Override
protected void setValue(Long value) {}
};
assertEquals(new Integer(target.size()), new Integer(2));
}
@@ -71,7 +95,12 @@ public class SlotSimStatusTest {
public void size_returnNumberOfPhone_whenQueryInBackgroundThread() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
SlotSimStatus target = new SlotSimStatus(mContext, mExecutor);
SlotSimStatus target = new SlotSimStatus(mContext, mExecutor, mLifecycle) {
@Override
protected void postValue(Long value) {}
@Override
protected void setValue(Long value) {}
};
verify(mExecutor).execute(mRunnableCaptor.capture());
mRunnableCaptor.getValue().run();
@@ -83,7 +112,12 @@ public class SlotSimStatusTest {
public void getPreferenceOrdering_returnOrdering_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
SlotSimStatus target = new SlotSimStatus(mContext);
SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
@Override
protected void postValue(Long value) {}
@Override
protected void setValue(Long value) {}
};
target.setBasePreferenceOrdering(30);
assertEquals(new Integer(target.getPreferenceOrdering(1)), new Integer(32));
@@ -93,10 +127,36 @@ public class SlotSimStatusTest {
public void getPreferenceKey_returnKey_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
SlotSimStatus target = new SlotSimStatus(mContext);
SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
@Override
protected void postValue(Long value) {}
@Override
protected void setValue(Long value) {}
};
target.setBasePreferenceOrdering(50);
assertEquals(target.getPreferenceKey(1), "sim_status52");
assertEquals(target.getPreferenceKey(1), "sim_status2");
}
@Test
public void getSubscriptionInfo_returnSubscriptionInfo_whenActive() {
doReturn(SUB_ID_1).when(mSubscriptionInfo1).getSubscriptionId();
doReturn(0).when(mSubscriptionInfo1).getSimSlotIndex();
doReturn(SUB_ID_2).when(mSubscriptionInfo2).getSubscriptionId();
doReturn(1).when(mSubscriptionInfo2).getSimSlotIndex();
doReturn(List.of(mSubscriptionInfo1, mSubscriptionInfo2))
.when(mSubscriptionManager).getActiveSubscriptionInfoList();
doReturn(2).when(mTelephonyManager).getPhoneCount();
SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
@Override
protected void postValue(Long value) {}
@Override
protected void setValue(Long value) {}
};
assertEquals(target.getSubscriptionInfo(1), mSubscriptionInfo2);
}
private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {