Merge "Add Settings.Global.Wearable to pre-defined keys list." into main (8813848c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17103,6 +17103,12 @@ public final class Settings {
	ArrayMap<String, Integer> readableKeysWithMaxTargetSdk) {		ArrayMap<String, Integer> readableKeysWithMaxTargetSdk) {
	getPublicSettingsForClass(Global.class, allKeys, readableKeys,		getPublicSettingsForClass(Global.class, allKeys, readableKeys,
	readableKeysWithMaxTargetSdk);		readableKeysWithMaxTargetSdk);
			// Add Global.Wearable keys on watches.
			if (ActivityThread.currentApplication().getApplicationContext().getPackageManager()
			.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
			getPublicSettingsForClass(Global.Wearable.class, allKeys, readableKeys,
			readableKeysWithMaxTargetSdk);
			}
	}		}

	/**		/**
	@@ -18287,7 +18293,7 @@ public final class Settings {
	* Settings migrated from Wear OS settings provider.		* Settings migrated from Wear OS settings provider.
	* @hide		* @hide
	*/		*/
	public static class Wearable {		public static final class Wearable extends NameValueTable {
	/**		/**
	* Whether the user has any pay tokens on their watch.		* Whether the user has any pay tokens on their watch.
	* @hide		* @hide