Follow storage refactoring in system.
Also add entry point for SystemUI unmounting, and require permissions
when launching into those flows.
Bug: 19993667
Change-Id: I703d2e5f118848a2e2e96ce1d7f970e5705a288a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6b96ef9..9ed8fab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1494,7 +1494,8 @@
<activity android:name=".deviceinfo.StorageWizardInit"
android:theme="@style/SuwThemeMaterial.Light"
android:taskAffinity="com.android.settings.storage_wizard"
- android:exported="true" />
+ android:exported="true"
+ android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardFormatConfirm"
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
@@ -1521,6 +1522,11 @@
android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
+ <!-- Exported for SystemUI to trigger -->
+ <receiver android:name=".deviceinfo.StorageUnmountReceiver"
+ android:exported="true"
+ android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+
<activity android:name="ApnEditor"
android:label="@string/apn_edit">
<intent-filter>