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

Fix crash in getMetricsTag

Browse Source 
SettingsIntelligence put a null in intent extra bundle, caused the
crash. Check the null before use it.

Fixes: 137351833
Test: make RunSettingsRoboTests
Change-Id: I9630760396c72bddf6a11314b869873c3b83b45a
This commit is contained in:
Raff Tsai
2019-07-22 10:13:11 +08:00
parent a2be917dbe
commit 54a5c444da
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SettingsActivity.java
View File

@@ -205,10 +205,14 @@ public class SettingsActivity extends SettingsBaseActivity
}
private String getMetricsTag() {
String tag = getClass().getName();
String tag = null;
if (getIntent() != null && getIntent().hasExtra(EXTRA_SHOW_FRAGMENT)) {
tag = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
}
if (TextUtils.isEmpty(tag)) {
Log.w(LOG_TAG, "MetricsTag is invalid " + tag);
tag = getClass().getName();
}
if (tag.startsWith("com.android.settings.")) {
tag = tag.replace("com.android.settings.", "");
}

14
tests/robotests/src/com/android/settings/SettingsActivityTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -34,6 +36,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
@@ -82,6 +85,17 @@ public class SettingsActivityTest {
verify(mTaskDescription).setIcon(anyInt());
}
@Test
public void getSharedPreferences_intentExtraIsNull_shouldNotCrash() {
final Intent intent = new Intent();
intent.putExtra(EXTRA_SHOW_FRAGMENT, (String)null);
doReturn(intent).when(mActivity).getIntent();
doReturn(mContext.getPackageName()).when(mActivity).getPackageName();
FakeFeatureFactory.setupForTest();
mActivity.getSharedPreferences(mContext.getPackageName() + "_preferences", 0);
}
@Test
public void onActivityResult_shouldDelegateToListener() {
final List<Fragment> fragments = new ArrayList<>();