Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.
These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.
Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: Ief7e423fd78375c263c4b582fdf230fd1ac43ec9
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cdd1c59..cf8c9ef 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,101 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.android.wallpaper">
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.android.wallpaper">
<!-- Custom permission to enforce that only this app can notify the running live wallpaper that
- the rotating wallpaper image data changed. -->
- <permission
- android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"
- android:protectionLevel="signature"/>
+ the rotating wallpaper image data changed. -->
+ <permission android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"
+ android:protectionLevel="signature"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.SET_WALLPAPER" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission
- android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+ <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"/>
- <application
- tools:replace="android:icon,android:name"
- android:allowBackup="true"
- android:icon="@mipmap/product_logo_wallpapers_launcher_color_48"
- android:label="@string/app_name"
- android:name="com.android.wallpaper.picker.WallpapersApplication"
- android:requiredForAllUsers="true"
- android:restoreAnyVersion="true"
- android:supportsRtl="true"
- android:extractNativeLibs="false">
+ <application tools:replace="android:icon,android:name"
+ android:allowBackup="true"
+ android:icon="@mipmap/product_logo_wallpapers_launcher_color_48"
+ android:label="@string/app_name"
+ android:name="com.android.wallpaper.picker.WallpapersApplication"
+ android:requiredForAllUsers="true"
+ android:restoreAnyVersion="true"
+ android:supportsRtl="true"
+ android:extractNativeLibs="false">
- <meta-data
- android:name="com.android.wallpaper.asset.WallpaperGlideModule"
- android:value="GlideModule" />
+ <meta-data android:name="com.android.wallpaper.asset.WallpaperGlideModule"
+ android:value="GlideModule"/>
<activity android:name="com.android.wallpaper.picker.TopLevelPickerActivity"
- android:label="@string/app_name"
- android:theme="@style/WallpaperTheme.NoBackground"
- android:resizeableActivity="false">
+ android:label="@string/app_name"
+ android:theme="@style/WallpaperTheme.NoBackground"
+ android:resizeableActivity="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SET_WALLPAPER"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity-alias
- android:name="com.android.wallpaper.picker.CategoryPickerActivity"
- android:targetActivity="com.android.wallpaper.picker.TopLevelPickerActivity"
- android:label="@string/app_name">
+ <activity-alias android:name="com.android.wallpaper.picker.CategoryPickerActivity"
+ android:targetActivity="com.android.wallpaper.picker.TopLevelPickerActivity"
+ android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity-alias>
<activity android:name="com.android.wallpaper.picker.individual.IndividualPickerActivity"
- android:label="@string/app_name"
- android:theme="@style/WallpaperTheme"
- android:resizeableActivity="false"
- android:parentActivityName="com.android.wallpaper.picker.TopLevelPickerActivity">
+ android:label="@string/app_name"
+ android:theme="@style/WallpaperTheme"
+ android:resizeableActivity="false"
+ android:parentActivityName="com.android.wallpaper.picker.TopLevelPickerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.wallpaper.picker.DEEP_LINK" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.wallpaper.picker.DEEP_LINK"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name="com.android.wallpaper.picker.PreviewActivity"
- android:resizeableActivity="false"
- android:theme="@style/WallpaperTheme.Preview">
+ android:resizeableActivity="false"
+ android:theme="@style/WallpaperTheme.Preview">
</activity>
<activity android:name="com.android.wallpaper.picker.StandalonePreviewActivity"
- android:resizeableActivity="false"
- android:theme="@style/WallpaperTheme.Preview">
+ android:resizeableActivity="false"
+ android:theme="@style/WallpaperTheme.Preview"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="image/*" />
+ <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="image/*"/>
</intent-filter>
</activity>
<activity android:name="com.android.wallpaper.picker.ViewOnlyPreviewActivity"
- android:resizeableActivity="false"
- android:theme="@style/WallpaperTheme.Preview">
+ android:resizeableActivity="false"
+ android:theme="@style/WallpaperTheme.Preview">
</activity>
- <service
- android:name="com.android.wallpaper.module.NoBackupImageWallpaper"
- android:enabled="@bool/enable_no_backup_image_wallpaper"
- android:label="@string/no_backup_image_wallpaper_label"
- android:permission="android.permission.BIND_WALLPAPER"
- android:process=":live_wallpaper">
+ <service android:name="com.android.wallpaper.module.NoBackupImageWallpaper"
+ android:enabled="@bool/enable_no_backup_image_wallpaper"
+ android:label="@string/no_backup_image_wallpaper_label"
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:process=":live_wallpaper"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.wallpaper.WallpaperService" />
+ <action android:name="android.service.wallpaper.WallpaperService"/>
</intent-filter>
- <meta-data
- android:name="android.service.wallpaper"
- android:resource="@xml/no_backup_image_wallpaper" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/no_backup_image_wallpaper"/>
</service>
</application>