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

Revert "[Settings] Code Refactor - ActiveSubscip..."

Browse Source 
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
This commit is contained in:
Bonian Chen
2021-06-28 05:39:18 +00:00
parent bc51750bf1
commit d9bf670725
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java → tests/unit/src/com/android/settings/network/ActiveSubscriptionsListenerTest.java
View File

@@ -49,7 +49,7 @@ import java.util.ArrayList;
import java.util.List;
@RunWith(AndroidJUnit4.class)
public class ActiveSubsciptionsListenerTest {
public class ActiveSubscriptionsListenerTest {
private static final int SUB_ID1 = 3;
private static final int SUB_ID2 = 7;
@@ -68,7 +68,7 @@ public class ActiveSubsciptionsListenerTest {
private SubscriptionManager mSubscriptionManager;
private List<SubscriptionInfo> mActiveSubscriptions;
private ActiveSubsciptionsListenerImpl mListener;
private ActiveSubscriptionsListenerImpl mListener;
private BroadcastReceiver mReceiver;
@Before
@@ -83,7 +83,7 @@ public class ActiveSubsciptionsListenerTest {
addMockSubscription(SUB_ID2);
doReturn(mActiveSubscriptions).when(mSubscriptionManager).getActiveSubscriptionInfoList();
mListener = spy(new ActiveSubsciptionsListenerImpl(Looper.getMainLooper(), mContext));
mListener = spy(new ActiveSubscriptionsListenerImpl(Looper.getMainLooper(), mContext));
doReturn(mSubscriptionManager).when(mListener).getSubscriptionManager();
mReceiver = mListener.getSubscriptionChangeReceiver();
}
@@ -99,8 +99,8 @@ public class ActiveSubsciptionsListenerTest {
mListener.close();
}
public class ActiveSubsciptionsListenerImpl extends ActiveSubsciptionsListener {
public ActiveSubsciptionsListenerImpl(Looper looper, Context context) {
public class ActiveSubscriptionsListenerImpl extends ActiveSubscriptionsListener {
public ActiveSubscriptionsListenerImpl(Looper looper, Context context) {
super(looper, context);
}