Merge "Settings: Fix settings force close in monkey test." (6aa77fb3) · Commits · e / os / android_packages_apps_Settings

res/xml/sound_settings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,10 +84,10 @@
		android:key="cell_broadcast_settings"
		android:title="@string/cell_broadcast_settings"
		settings:useAdminDisabledSummary="true">
		<intent
		<!--intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.cellbroadcastreceiver"
		android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
		android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" /-->
		</com.android.settingslib.RestrictedPreference>

		<!-- Other sounds -->

+15 −0

Original line number	Diff line number	Diff line
		@@ -240,7 +240,22 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
		mRequestPreference.onPrepareRingtonePickerIntent(mRequestPreference.getIntent());
		startActivityForResult(preference.getIntent(), REQUEST_CODE);
		return true;
		} else if (preference == findPreference(KEY_CELL_BROADCAST_SETTINGS)) {
		final Intent intent = new Intent(Intent.ACTION_MAIN);
		intent.setComponent(new ComponentName(
		"com.android.cellbroadcastreceiver",
		"com.android.cellbroadcastreceiver.CellBroadcastSettings"));

		if (mContext.getPackageManager()
		.queryIntentActivities(intent, 0).isEmpty()) {
		Log.d(TAG, "Activity com.android.cellbroadcastreceiver" +
		".CellBroadcastSettings does not exist");
		return false;
		}
		startActivity(intent);
		return true;
		}

		return super.onPreferenceTreeClick(preference);
		}