Fix crash when TestingSettingsBroadcastReceiver handling intent
Bug: 159625330 Test: robotest & adb shell "am broadcast -n com.android.settings/.TestingSettingsBroadcastReceiver" Change-Id: I6e46c30274937bd672d20a6786cc70615aaaefd9
This commit is contained in:
@@ -1,3 +1,19 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
@@ -15,7 +31,8 @@ public class TestingSettingsBroadcastReceiver extends BroadcastReceiver {
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)) {
|
||||
if (intent != null && intent.getAction() != null
|
||||
&& intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)) {
|
||||
Intent i = new Intent(Intent.ACTION_MAIN);
|
||||
i.setClass(context, TestingSettingsActivity.class);
|
||||
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
|
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.Shadows;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class TestingSettingsBroadcastReceiverTest {
|
||||
|
||||
private Context mContext;
|
||||
private Application mApplication;
|
||||
private TestingSettingsBroadcastReceiver mReceiver;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mApplication = RuntimeEnvironment.application;
|
||||
mReceiver = new TestingSettingsBroadcastReceiver();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onReceive_nullIntent_shouldNotCrash() {
|
||||
final Intent intent = new Intent();
|
||||
|
||||
mReceiver.onReceive(mContext, null);
|
||||
mReceiver.onReceive(mContext, intent);
|
||||
|
||||
final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
|
||||
assertThat(next).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onReceive_wrongIntent_shouldNotStartActivity() {
|
||||
final Intent intent = new Intent();
|
||||
intent.setAction("");
|
||||
|
||||
mReceiver.onReceive(mContext, intent);
|
||||
|
||||
final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
|
||||
assertThat(next).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onReceive_correctIntent_shouldStartActivity() {
|
||||
final Intent intent = new Intent();
|
||||
intent.setAction(TelephonyManager.ACTION_SECRET_CODE);
|
||||
|
||||
mReceiver.onReceive(mContext, intent);
|
||||
|
||||
final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
|
||||
assertThat(next).isNotNull();
|
||||
final String dest = next.getComponent().getClassName();
|
||||
assertThat(dest).isEqualTo(Settings.TestingSettingsActivity.class.getName());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user