summaryrefslogtreecommitdiff
path: root/tests/LockTaskTests
diff options
context:
space:
mode:
author Ashwini Oruganti <ashfall@google.com> 2020-03-18 15:46:39 -0700
committer Jeff Sharkey <jsharkey@google.com> 2020-03-23 18:34:09 +0000
commite178c24db3abb8d1ebaba5052b05c99204dc6c88 (patch)
treeb924d8b82d314091dd19dce280b4df3179cdf197 /tests/LockTaskTests
parented91e9135b957debeeb18b3267c2761912101ff5 (diff)
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: I4457ff2bd466a4c56fed2570e110f251031c2385
Diffstat (limited to 'tests/LockTaskTests')
-rw-r--r--tests/LockTaskTests/AndroidManifest.xml79
1 files changed, 37 insertions, 42 deletions
diff --git a/tests/LockTaskTests/AndroidManifest.xml b/tests/LockTaskTests/AndroidManifest.xml
index e349c9248263..3ffdc4712b0e 100644
--- a/tests/LockTaskTests/AndroidManifest.xml
+++ b/tests/LockTaskTests/AndroidManifest.xml
@@ -1,56 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.android.example.locktasktests"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="com.google.android.example.locktasktests"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk
- android:minSdkVersion="22"
- android:targetSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="22"
+ android:targetSdkVersion="22"/>
<uses-permission android:name="android.permission.INTERNET"/>
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme"
- android:allowBackup="true" >
- <activity
- android:name="com.google.android.example.locktasktests.MainActivity"
- android:label="@string/app_name"
- android:screenOrientation="portrait"
- android:theme="@style/AppTheme" >
+ <application android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme"
+ android:allowBackup="true">
+ <activity android:name="com.google.android.example.locktasktests.MainActivity"
+ android:label="@string/app_name"
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity
- android:name="com.google.android.example.locktasktests.LockDefaultActivity"
- android:label="@string/title_activity_default"
- android:taskAffinity=""
- android:documentLaunchMode="always"
- android:lockTaskMode="normal" >
+ <activity android:name="com.google.android.example.locktasktests.LockDefaultActivity"
+ android:label="@string/title_activity_default"
+ android:taskAffinity=""
+ android:documentLaunchMode="always"
+ android:lockTaskMode="normal">
</activity>
- <activity
- android:name="com.google.android.example.locktasktests.LockTaskNeverActivity"
- android:label="@string/title_activity_never"
- android:taskAffinity=""
- android:documentLaunchMode="always"
- android:lockTaskMode="never" >
+ <activity android:name="com.google.android.example.locktasktests.LockTaskNeverActivity"
+ android:label="@string/title_activity_never"
+ android:taskAffinity=""
+ android:documentLaunchMode="always"
+ android:lockTaskMode="never">
</activity>
- <activity
- android:name="com.google.android.example.locktasktests.LockWhitelistedActivity"
- android:label="@string/title_activity_whitelist"
- android:taskAffinity=""
- android:documentLaunchMode="always"
- android:lockTaskMode="if_whitelisted" >
+ <activity android:name="com.google.android.example.locktasktests.LockWhitelistedActivity"
+ android:label="@string/title_activity_whitelist"
+ android:taskAffinity=""
+ android:documentLaunchMode="always"
+ android:lockTaskMode="if_whitelisted">
</activity>
- <activity
- android:name="com.google.android.example.locktasktests.LockAtLaunchActivity"
- android:label="@string/title_activity_always"
- android:taskAffinity=""
- android:documentLaunchMode="always"
- android:lockTaskMode="always" >
+ <activity android:name="com.google.android.example.locktasktests.LockAtLaunchActivity"
+ android:label="@string/title_activity_always"
+ android:taskAffinity=""
+ android:documentLaunchMode="always"
+ android:lockTaskMode="always">
</activity>
</application>