Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 189dab3d authored by Maggie Benthall's avatar Maggie Benthall Committed by Android (Google) Code Review
Browse files

Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev

parents 119a9ff2 9d6c40e5
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -854,6 +854,18 @@
                android:resource="@id/security_settings" />
        </activity>

        <activity android:name="MonitoringCertInfoActivity"
                android:label="@string/ssl_ca_cert_dialog_title"
                android:theme="@style/Transparent"
                android:taskAffinity=""
                android:excludeFromRecents="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <activity android:name="Settings$TrustedCredentialsSettingsActivity"
                android:label="@string/trusted_credentials"
                android:taskAffinity=""
+1.76 KiB
Loading image diff...
+1.22 KiB
Loading image diff...
+2.49 KiB
Loading image diff...
+2.97 KiB
Loading image diff...
Loading