commit b1af85d15523db44d4fa80c78409069ec691ed0a
author Aurimas Liutikas <aurimas@google.com> Tue Apr 17 11:22:43 2018 -0700
committer Colin Cross <ccross@android.com> Tue Aug 28 11:48:56 2018 -0700
tree 5563667ac3d7f33c83b59931d5894d2d097319ca
parent 6e65a324687c33c8a4ff9b9db2dc41e3fdc28992

Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e6a25e..02f3a8c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -106,7 +106,7 @@
             android:usesCleartextTraffic="true"
             android:defaultToDeviceProtectedStorage="true"
             android:directBootAware="true"
-            android:appComponentFactory="android.support.v4.app.CoreComponentFactory">
+            android:appComponentFactory="androidx.core.app.CoreComponentFactory">
 
         <uses-library android:name="org.apache.http.legacy" />
         <!-- Settings -->
@@ -2821,7 +2821,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="com.android.settings.files"
             android:grantUriPermissions="true"
             android:exported="false">