Merge "Add new intent ACTION_REPORT_RADIO_BUG and setting for radio error" (86c7e98c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -11091,6 +11091,31 @@ public final class Settings {
		/** {@hide} */
		public static final String
		BLUETOOTH_HEARING_AID_PRIORITY_PREFIX = "bluetooth_hearing_aid_priority_";
		/**
		* Enable/disable radio bug detection
		*
		* {@hide}
		*/
		public static final String
		ENABLE_RADIO_BUG_DETECTION = "enable_radio_bug_detection";

		/**
		* Count threshold of RIL wakelock timeout for radio bug detection
		*
		* {@hide}
		*/
		public static final String
		RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD =
		"radio_bug_wakelock_timeout_count_threshold";

		/**
		* Count threshold of RIL system error for radio bug detection
		*
		* {@hide}
		*/
		public static final String
		RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD =
		"radio_bug_system_error_count_threshold";

		/**
		* Activity manager specific settings.

+4 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import static java.lang.reflect.Modifier.isPublic;
		import static java.lang.reflect.Modifier.isStatic;

		import android.platform.test.annotations.Presubmit;
		import android.provider.Settings.Global;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		@@ -555,8 +554,10 @@ public class SettingsBackupTest {
		Settings.Global.APPOP_HISTORY_PARAMETERS,
		Settings.Global.APPOP_HISTORY_MODE,
		Settings.Global.APPOP_HISTORY_INTERVAL_MULTIPLIER,
		Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS);

		Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,
		Settings.Global.ENABLE_RADIO_BUG_DETECTION,
		Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,
		Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD);
		private static final Set<String> BACKUP_BLACKLISTED_SECURE_SETTINGS =
		newHashSet(
		Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE,

+14 −0

Original line number	Diff line number	Diff line
		@@ -501,4 +501,18 @@ public class TelephonyIntents {
		*/
		public static final String ACTION_LINE1_NUMBER_ERROR_DETECTED =
		"com.android.internal.telephony.ACTION_LINE1_NUMBER_ERROR_DETECTED";

		/**
		* Broadcast action to notify radio bug.
		*
		* Requires the READ_PRIVILEGED_PHONE_STATE permission.
		*
		* @hide
		*/
		public static final String ACTION_REPORT_RADIO_BUG =
		"com.android.internal.telephony.ACTION_REPORT_RADIO_BUG";

		// ACTION_REPORT_RADIO_BUG extra keys
		public static final String EXTRA_SLOT_ID = "slotId";
		public static final String EXTRA_RADIO_BUG_TYPE = "radioBugType";
		}