commit c61d02d2eba14976a3616663bb55b24d345ebed0
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 20 19:00:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 19:00:31 2020 +0000
tree cc7453565c836e751105347753f21fe4bfc6dbef
parent 6f2e5690120cfaf6aec90f35728d4a15eee07441
parent a4e1b7a9a931ccf991abc323dd9d8069896797fa

Merge "Add an exported flag in manifest" am: e4b01a4965 am: a4e1b7a9a9

Change-Id: I2ff9f31f20b4a23ac0c1c122f2cf5d305b659794

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4212254..7d543fb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,61 +1,64 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.certinstaller">
+<?xml version="1.0" encoding="utf-8"?>
 
-    <original-package android:name="com.android.certinstaller" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.certinstaller">
+
+    <original-package android:name="com.android.certinstaller"/>
 
     <permission android:name="com.android.certinstaller.INSTALL_AS_USER"
-                android:protectionLevel="signature" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS" />
-    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
+         android:protectionLevel="signature"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS"/>
+    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
 
     <application android:label="@string/app_name"
-                 android:allowBackup="false">
+         android:allowBackup="false">
         <activity android:name=".CertInstallerMain"
-                  android:theme="@style/Transparent"
-                  android:configChanges="orientation|keyboardHidden|screenSize">
+             android:theme="@style/Transparent"
+             android:configChanges="orientation|keyboardHidden|screenSize"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.credentials.INSTALL" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.credentials.INSTALL"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/x-x509-ca-cert" />
-                <data android:mimeType="application/x-x509-user-cert" />
-                <data android:mimeType="application/x-x509-server-cert" />
-                <data android:mimeType="application/x-pkcs12" />
-                <data android:mimeType="application/x-pem-file" />
-                <data android:mimeType="application/pkix-cert" />
-                <data android:mimeType="application/x-wifi-config" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/x-x509-ca-cert"/>
+                <data android:mimeType="application/x-x509-user-cert"/>
+                <data android:mimeType="application/x-x509-server-cert"/>
+                <data android:mimeType="application/x-pkcs12"/>
+                <data android:mimeType="application/x-pem-file"/>
+                <data android:mimeType="application/pkix-cert"/>
+                <data android:mimeType="application/x-wifi-config"/>
             </intent-filter>
         </activity>
 
         <activity-alias android:name=".InstallCertAsUser"
-                        android:targetActivity=".CertInstallerMain"
-                        android:permission="com.android.certinstaller.INSTALL_AS_USER">
+             android:targetActivity=".CertInstallerMain"
+             android:permission="com.android.certinstaller.INSTALL_AS_USER">
             <intent-filter>
-                <action android:name="android.credentials.INSTALL_AS_USER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.credentials.INSTALL_AS_USER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity-alias>
 
         <activity android:name=".CertInstaller"
-                  android:theme="@style/Transparent"
-                  android:configChanges="orientation|keyboardHidden"
-                  android:exported="false">
+             android:theme="@style/Transparent"
+             android:configChanges="orientation|keyboardHidden"
+             android:exported="false">
         </activity>
         <activity android:name=".WiFiInstaller"
-                  android:theme="@style/Transparent"
-                  android:configChanges="orientation|keyboardHidden"
-                  android:exported="false">
+             android:theme="@style/Transparent"
+             android:configChanges="orientation|keyboardHidden"
+             android:exported="false">
         </activity>
         <activity android:name=".CredentialsInstallDialog"
-                  android:theme="@style/Transparent"
-                  android:configChanges="orientation|keyboardHidden"
-                  android:exported="false">
+             android:theme="@style/Transparent"
+             android:configChanges="orientation|keyboardHidden"
+             android:exported="false">
         </activity>
     </application>
 </manifest>