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

Commit 338f9a47 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash on notifcations/device admin add pages" into sc-dev am: c24d5621 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109304

Change-Id: Ib2167fc1bdd4307f94a5518c7fca0c0e8ffd71c8
parents ecb39532 c24d5621

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -1323,7 +1323,8 @@ 
        <activity

            android:name=".notification.history.NotificationHistoryActivity"

            android:exported="true"

            android:label="@string/notification_history_title">

            android:label="@string/notification_history_title"

            android:theme="@style/Theme.Settings.NoActionBar">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NOTIFICATION_HISTORY" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -1517,7 +1518,8 @@ 
        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"

                  android:label="@string/device_admin_add_title"

                  android:exported="true"

                  android:clearTaskOnLaunch="true">

                  android:clearTaskOnLaunch="true"

                  android:theme="@style/Theme.Settings.NoActionBar">

            <intent-filter>

                <action android:name="android.app.action.ADD_DEVICE_ADMIN" />

                <category android:name="android.intent.category.DEFAULT" />