PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icf8c731883e9c37d164f7867c2749437a6005f56
This commit is contained in:
TreeHugger Robot
2021-06-29 07:58:45 +00:00
committed by Automerger Merge Worker
parent 921860c4bd c24d5621de
commit 601b7b38f4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -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" />