Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bde4e9a authored Nov 28, 2018 by Hongyi Zhang Committed by Android (Google) Code Review Nov 28, 2018

Merge "add native_flags_health_check_enabled to Settings.Global"

parents 2b2a6f4c a02118df

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -13753,6 +13753,15 @@ public final class Settings {
		*/
		public static final String LAST_ACTIVE_USER_ID = "last_active_persistent_user_id";


		/**
		* Whether we've enabled native flags health check on this device. Takes effect on
		* reboot. The value "1" enables native flags health check; otherwise it's disabled.
		* @hide
		*/
		public static final String NATIVE_FLAGS_HEALTH_CHECK_ENABLED =
		"native_flags_health_check_enabled";

		}

		/**

core/proto/android/providers/settings/global.proto

+5 −1

Original line number	Diff line number	Diff line
		@@ -550,6 +550,10 @@ message GlobalSettingsProto {
		}
		optional MultiSim multi_sim = 76;

		// Whether we've enabled native flags health check on this device. Takes effect on
		// reboot. The value "1" enables native flags health check; otherwise it's disabled.
		optional SettingProto native_flags_health_check_enabled = 144 [ (android.privacy).dest = DEST_AUTOMATIC ];

		message Netstats {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		@@ -987,5 +991,5 @@ message GlobalSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 144;
		// Next tag = 145;
		}

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ public class SettingsBackupTest {
		Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION,
		Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION,
		Settings.Global.MULTI_SIM_VOICE_PROMPT,
		Settings.Global.NATIVE_FLAGS_HEALTH_CHECK_ENABLED,
		Settings.Global.NETSTATS_DEV_BUCKET_DURATION,
		Settings.Global.NETSTATS_DEV_DELETE_AGE,
		Settings.Global.NETSTATS_DEV_PERSIST_BYTES,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -855,6 +855,10 @@ class SettingsProtoDumpUtil {
		GlobalSettingsProto.MultiSim.SMS_PROMPT);
		p.end(multiSimToken);

		dumpSetting(s, p,
		Global.NATIVE_FLAGS_HEALTH_CHECK_ENABLED,
		GlobalSettingsProto.NATIVE_FLAGS_HEALTH_CHECK_ENABLED);

		final long netstatsToken = p.start(GlobalSettingsProto.NETSTATS);
		dumpSetting(s, p,
		Settings.Global.NETSTATS_ENABLED,

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ class SettingsToPropertiesMapper {
		// permission in the corresponding .te file your feature belongs to.
		@VisibleForTesting
		static final String[] sGlobalSettings = new String[] {
		Settings.Global.NATIVE_FLAGS_HEALTH_CHECK_ENABLED,
		};

		@VisibleForTesting