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

Merge changes I96574a79,I74681222 into main

Browse Source 
* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
This commit is contained in:
SongFerng Wang
2024-03-04 12:27:37 +00:00
committed by Android (Google) Code Review
parent 3b856490e8 c9a3eeb792
commit 71c6c3e557
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/SwitchSlotSidecar.java
View File

@@ -130,11 +130,13 @@ public class SwitchSlotSidecar
} catch (UiccSlotsException e) { } catch (UiccSlotsException e) {
result.exception = e; result.exception = e;
} }
Log.i(TAG, "return command.");
return result; return result;
} }
@Override @Override
protected void onPostExecute(Result result) { protected void onPostExecute(Result result) {
Log.i(TAG, "onPostExecute: get result");
if (result.exception == null) { if (result.exception == null) {
setState(State.SUCCESS, Substate.UNUSED); setState(State.SUCCESS, Substate.UNUSED);
} else { } else {

1
tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
View File

@@ -78,6 +78,7 @@ public class MobileNetworkPreferenceControllerTest {
mContext = spy(ApplicationProvider.getApplicationContext()); mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mSubscriptionManager.createForAllUserProfiles()).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
if (Looper.myLooper() == null) { if (Looper.myLooper() == null) {
Looper.prepare(); Looper.prepare();