Make change and version bump to aml_cbr_331710020 for mainline module file: apex/apex_manifest.jsonaml_cbr_331710020android13-mainline-cellbroadcast-release

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22391030'] into sparse-9840872-L17000000959546492.
SPARSE_CHANGE: Ida90227e1fdba7118abad6ad36c2807e445a5c7b

Change-Id: Ib6b8e701ee4472d1c6ddca5433ecbd41a0da7954

2 files changed, 1 insertions, 39 deletions

diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 54a105b26..3ac4c909d 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -3,5 +3,5 @@
 
   // Placeholder module version to be replaced during build.
   // Do not change!
-  "version": 331710010
+  "version": 331710020
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
index 2ace0ae10..c01a64df5 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
@@ -58,7 +58,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.UserManager;
 import android.provider.Telephony;
-import android.telephony.SmsCbMessage;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.view.ActionMode;
@@ -645,41 +644,4 @@ public class CellBroadcastListActivityTest extends
         actionMode = adapter2.getIsActionMode();
         assertEquals(true, actionMode);
     }
-
-    public void testCursorAdaptorBindViewForWatch() {
-        // Watch layout misses checkbox.
-        // mockListItemView.findViewById(R.id.checkBox) returns null as default setting up this
-        // usecase.
-        CellBroadcastListItem mockListItemView = mock(CellBroadcastListItem.class);
-        ListView mockListView = mock(ListView.class);
-        MatrixCursor data = makeTestCursor();
-        data.moveToFirst();
-        CellBroadcastCursorAdapter adapter = new CellBroadcastCursorAdapter(mContext,
-                mockListView);
-
-        adapter.bindView(mockListItemView, mContext, data);
-
-        ArgumentCaptor<SmsCbMessage> messageCaptor = ArgumentCaptor.forClass(SmsCbMessage.class);
-        verify(mockListItemView).bind(messageCaptor.capture());
-        assertEquals("testAlert", messageCaptor.getValue().getMessageBody());
-    }
-
-    public void testCursorAdaptorBindView() {
-        CellBroadcastListItem mockListItemView = mock(CellBroadcastListItem.class);
-        ListView mockListView = mock(ListView.class);
-        CheckedTextView mockCheckbox = mock(CheckedTextView.class);
-        doReturn(mockCheckbox).when(mockListItemView).findViewById(R.id.checkBox);
-        MatrixCursor data = makeTestCursor();
-        data.moveToFirst();
-        CellBroadcastCursorAdapter adapter = new CellBroadcastCursorAdapter(mContext,
-                mockListView);
-
-        adapter.setIsActionMode(true);
-        adapter.bindView(mockListItemView, mContext, data);
-        verify(mockCheckbox).setVisibility(View.VISIBLE);
-
-        adapter.setIsActionMode(false);
-        adapter.bindView(mockListItemView, mContext, data);
-        verify(mockCheckbox).setVisibility(View.GONE);
-    }
 }