From acb62a804f8185564f0cb4a8a8274a84bd4ff3ee Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 23 Dec 2021 16:29:32 +0000 Subject: Revert "Change the broadcast intent of START_CONFIG to app inside" Revert submission 16374893-presubmit-am-b104fa7ebd984ff3aecf6e1be8f0a6be Reason for revert: postpone the fix to March train to sync with qpr release. Reverted Changes: I8ffa54de1:Change the broadcast intent of START_CONFIG to app... I9b55987c1:[automerge] Change the broadcast intent of START_C... Change-Id: Icd765839d458c131d3a8d82a9dcdc87d9d54a835 --- AndroidManifest.xml | 1 + AndroidManifest_Platform.xml | 1 + .../cellbroadcastreceiver/CellBroadcastBackupAgent.java | 3 +-- .../CellBroadcastInternalReceiver.java | 12 ------------ .../cellbroadcastreceiver/CellBroadcastReceiver.java | 3 ++- .../unit/CellBroadcastBackupAgentTest.java | 15 ++++----------- .../unit/CellBroadcastInternalReceiverTest.java | 13 ------------- .../unit/CellBroadcastReceiverTest.java | 3 +-- 8 files changed, 10 insertions(+), 41 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0c83fd3b5..41b6cda9f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -151,6 +151,7 @@ + diff --git a/AndroidManifest_Platform.xml b/AndroidManifest_Platform.xml index 5d6b226b0..97fe7231a 100644 --- a/AndroidManifest_Platform.xml +++ b/AndroidManifest_Platform.xml @@ -129,6 +129,7 @@ + diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java b/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java index 185a86a52..620276c83 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java @@ -48,8 +48,7 @@ public class CellBroadcastBackupAgent extends BackupAgentHelper @Override public void onRestoreFinished() { Log.d(TAG, "Restore finished."); - Intent intent = new Intent(getApplicationContext(), CellBroadcastInternalReceiver.class); - intent.setAction(CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION); + Intent intent = new Intent(CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION); // Cell broadcast was configured during boot up before the shared preference is restored, // we need to re-configure it. diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastInternalReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastInternalReceiver.java index 9a7d3f656..455c5b68c 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastInternalReceiver.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastInternalReceiver.java @@ -45,24 +45,12 @@ public class CellBroadcastInternalReceiver extends BroadcastReceiver { }); } - /** - * This method's purpose if to enable unit testing - */ - @VisibleForTesting - public void startConfigServiceToEnableChannels(Context context) { - CellBroadcastReceiver.startConfigService(context, - CellBroadcastConfigService.ACTION_ENABLE_CHANNELS); - } - @Override public void onReceive(Context context, Intent intent) { if (CellBroadcastReceiver.ACTION_MARK_AS_READ.equals(intent.getAction())) { final long deliveryTime = intent.getLongExtra( CellBroadcastReceiver.EXTRA_DELIVERY_TIME, -1); getCellBroadcastTask(context, deliveryTime); - } else if (CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION.equals( - intent.getAction())) { - startConfigServiceToEnableChannels(context); } } } diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java index 0907d15aa..14ebe3b0c 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java @@ -155,7 +155,8 @@ public class CellBroadcastReceiver extends BroadcastReceiver { // going forward. int ss = intent.getIntExtra(EXTRA_VOICE_REG_STATE, ServiceState.STATE_IN_SERVICE); onServiceStateChanged(context, res, ss); - } else if (SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(action)) { + } else if (CELLBROADCAST_START_CONFIG_ACTION.equals(action) + || SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(action)) { startConfigServiceToEnableChannels(); } else if (Telephony.Sms.Intents.ACTION_SMS_EMERGENCY_CB_RECEIVED.equals(action) || Telephony.Sms.Intents.SMS_CB_RECEIVED_ACTION.equals(action)) { diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java index 97365a441..bfba23beb 100644 --- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java +++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java @@ -16,10 +16,9 @@ package com.android.cellbroadcastreceiver.unit; -import static org.junit.Assert.assertEquals; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import android.app.backup.BackupAgentHelper; @@ -29,7 +28,6 @@ import android.content.Intent; import android.os.UserHandle; import com.android.cellbroadcastreceiver.CellBroadcastBackupAgent; -import com.android.cellbroadcastreceiver.CellBroadcastInternalReceiver; import org.junit.Before; import org.junit.Test; @@ -75,17 +73,12 @@ public class CellBroadcastBackupAgentTest { @Test public void testRestoreFinish() throws Exception { - final String packageName = CellBroadcastInternalReceiver.class.getPackage().getName(); - final String className = CellBroadcastInternalReceiver.class.getName(); - doReturn(mMockContext).when(mMockContext).getApplicationContext(); - doReturn(packageName).when(mMockContext).getPackageName(); mockBackupDispatcher(); mBackupAgentUT.attach(mMockContext); - ArgumentCaptor intentArg = ArgumentCaptor.forClass(Intent.class); + ArgumentCaptor intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class); mBackupAgentUT.onRestoreFinished(); - verify(mMockContext).sendBroadcastAsUser(intentArg.capture(), eq(UserHandle.SYSTEM)); - assertEquals(packageName, intentArg.getValue().getComponent().getPackageName()); - assertEquals(className, intentArg.getValue().getComponent().getClassName()); + verify(mMockContext).sendBroadcastAsUser(intentArgumentCaptor.capture(), + eq(UserHandle.SYSTEM)); } } diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastInternalReceiverTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastInternalReceiverTest.java index e89e31f86..713b91b8e 100644 --- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastInternalReceiverTest.java +++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastInternalReceiverTest.java @@ -16,7 +16,6 @@ package com.android.cellbroadcastreceiver.unit; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; @@ -27,7 +26,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; -import android.os.UserManager; import com.android.cellbroadcastreceiver.CellBroadcastInternalReceiver; import com.android.cellbroadcastreceiver.CellBroadcastReceiver; @@ -40,7 +38,6 @@ import org.mockito.MockitoAnnotations; public class CellBroadcastInternalReceiverTest extends CellBroadcastTest { @Mock Intent mIntent; - @Mock UserManager mUserManager; private Configuration mConfiguration = new Configuration(); private CellBroadcastInternalReceiver mReceiver; @@ -52,8 +49,6 @@ public class CellBroadcastInternalReceiverTest extends CellBroadcastTest { doReturn(mConfiguration).when(mResources).getConfiguration(); mReceiver = spy(new CellBroadcastInternalReceiver()); doReturn(mContext).when(mContext).getApplicationContext(); - doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); - doReturn(false).when(mUserManager).isSystemUser(); } @Test @@ -65,12 +60,4 @@ public class CellBroadcastInternalReceiverTest extends CellBroadcastTest { verify(mReceiver).getCellBroadcastTask(nullable(Context.class), anyLong()); } - @Test - public void testOnReceive_cellbroadcastStartConfigAction() { - doReturn(CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION).when(mIntent).getAction(); - mReceiver.onReceive(mContext, mIntent); - - verify(mReceiver).startConfigServiceToEnableChannels(any()); - } - } diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java index 24251920c..8b6377c90 100644 --- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java +++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java @@ -164,9 +164,8 @@ public class CellBroadcastReceiverTest extends CellBroadcastTest { public void testOnReceive_cellbroadcastStartConfigAction() { doReturn(CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION).when(mIntent).getAction(); mCellBroadcastReceiver.onReceive(mContext, mIntent); - verify(mCellBroadcastReceiver, never()).initializeSharedPreference(any(), anyInt()); - verify(mCellBroadcastReceiver, never()).startConfigServiceToEnableChannels(); + verify(mCellBroadcastReceiver).startConfigServiceToEnableChannels(); } @Test -- cgit v1.2.3