Merge changes Ie6c38a4c,I436609d9
* changes:
Makes settings provider queryable by all
Makes forceQueryable public
diff --git a/api/current.txt b/api/current.txt
index e765013..b33599e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -641,6 +641,7 @@
field public static final int footerDividersEnabled = 16843311; // 0x101022f
field public static final int forceDarkAllowed = 16844172; // 0x101058c
field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521
+ field public static final int forceQueryable = 16844296; // 0x1010608
field public static final int forceUriPermissions = 16844191; // 0x101059f
field public static final int foreground = 16843017; // 0x1010109
field public static final int foregroundGravity = 16843264; // 0x1010200
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 036d959..2067735 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2927,6 +2927,7 @@
<public type="attr" name="enforceStatusBarContrast" id="0x01010604" />
<public type="attr" name="enforceNavigationBarContrast" id="0x01010605" />
<public type="attr" name="identifier" id="0x01010606" />
+ <public type="attr" name="forceQueryable" id="0x01010608" />
<!-- @hide @SystemApi -->
<public type="drawable" name="ic_info" id="0x010800b4" />
diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml
index 9bc2d75..839899e 100644
--- a/packages/SettingsProvider/AndroidManifest.xml
+++ b/packages/SettingsProvider/AndroidManifest.xml
@@ -11,6 +11,7 @@
android:restoreAnyVersion="true"
android:icon="@mipmap/ic_launcher_settings"
android:defaultToDeviceProtectedStorage="true"
+ android:forceQueryable="true"
android:directBootAware="true">
<provider android:name="SettingsProvider"