diff options
author | Karishma Vakil <kvakil@google.com> | 2023-02-17 06:22:13 +0000 |
---|---|---|
committer | Karishma Vakil <kvakil@google.com> | 2023-02-18 00:00:16 +0000 |
commit | ca448c4a6c399bafdc9fc41676501afd1f90e7e5 (patch) | |
tree | 87e145092a8351a8985cf1849151358ae1373206 /PermissionController/src/com/android/permissioncontroller/permission/service | |
parent | 0e7d12dbe09eed833dfd18014d6f9fb479cc38fc (diff) | |
download | Permission-ca448c4a6c399bafdc9fc41676501afd1f90e7e5.tar.gz |
[Safety Labels] Change notification header to say "Settings" instead of
"Permission Controller"
Also fix paddings for app icon in update preference.
Bug:261666772
Test: atest CtsPermission3TestCases
Change-Id: If29150a6de2fc3b018c7b212f3486f7d658c472a
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/service')
-rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt index 5b6c833d9..b289d4f38 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt @@ -17,6 +17,7 @@ package com.android.permissioncontroller.permission.service.v34 import android.Manifest +import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent @@ -30,6 +31,7 @@ import android.content.Context import android.content.Intent import android.content.Intent.ACTION_BOOT_COMPLETED import android.os.Build +import android.os.Bundle import android.os.PersistableBundle import android.os.Process import android.os.UserHandle @@ -55,6 +57,7 @@ import com.android.permissioncontroller.permission.model.livedatatypes.AppPermGr import com.android.permissioncontroller.permission.model.livedatatypes.AppPermGroupUiInfo.PermGrantState.PERMS_ALLOWED_FOREGROUND_ONLY import com.android.permissioncontroller.permission.model.v34.AppDataSharingUpdate import com.android.permissioncontroller.permission.utils.KotlinUtils +import com.android.permissioncontroller.permission.utils.Utils import com.android.permissioncontroller.permission.utils.Utils.getSystemServiceSafe import com.android.permissioncontroller.safetylabel.AppsSafetyLabelHistory import com.android.permissioncontroller.safetylabel.AppsSafetyLabelHistory.AppInfo @@ -412,7 +415,7 @@ class SafetyLabelChangesJobService : JobService() { val title = context.getString(R.string.safety_label_changes_notification_title) val text = context.getString(R.string.safety_label_changes_notification_desc) - val notification = + var notificationBuilder = NotificationCompat.Builder(context, PERMISSION_REMINDER_CHANNEL_ID) .setSmallIcon(R.drawable.ic_info) .setContentTitle(title) @@ -422,9 +425,23 @@ class SafetyLabelChangesJobService : JobService() { .setAutoCancel(true) .setSilent(true) .setContentIntent(createIntentToOpenAppDataSharingUpdates(context)) - .build() - notificationManager.notify(SAFETY_LABEL_CHANGES_NOTIFICATION_ID, notification) + val settingsAppLabel = + Utils.getSettingsLabelForNotifications(applicationContext.packageManager) + if (settingsAppLabel != null) { + notificationBuilder = + notificationBuilder + .setSmallIcon(R.drawable.ic_settings_24dp) + .addExtras( + Bundle().apply { + putString( + Notification.EXTRA_SUBSTITUTE_APP_NAME, settingsAppLabel.toString()) + }) + } + + notificationManager.notify( + SAFETY_LABEL_CHANGES_NOTIFICATION_ID, notificationBuilder.build()) + if (DEBUG) { Log.v(LOG_TAG, "Safety label change notification sent.") } |