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

Commit 23af34eb authored by Nate Myren's avatar Nate Myren
Browse files

Add ADB command to disable the redaction of OTP notifications 

Bug: 382172273
Test: manual
Flag: EXEMPT see comments
Change-Id: I7ed3f8936706c3074e9cf9f766561cc768ff385a
parent d60188b2

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -19789,6 +19789,14 @@ public final class Settings { 
         */

        public static final String REPAIR_MODE_ACTIVE = "repair_mode_active";













        /**













         * Whether the notification manager service should redact notifications that contain otps













         * from untrusted listeners. Defaults to 1/true.













         * @hide













         */













        public static final String REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS =













                "redact_otp_notifications_from_untrusted_listeners";



























        /**















         * Settings migrated from Wear OS settings provider.















         * @hide

























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -567,6 +567,7 @@ public class SettingsBackupTest {













                    Settings.Global.REVIEW_PERMISSIONS_NOTIFICATION_STATE,















                    Settings.Global.HEARING_DEVICE_LOCAL_AMBIENT_VOLUME, // cache per hearing device















                    Settings.Global.HEARING_DEVICE_LOCAL_NOTIFICATION, // cache per hearing device













                    Settings.Global.REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS,















                    Settings.Global.Wearable.COMBINED_LOCATION_ENABLE,















                    Settings.Global.Wearable.HAS_PAY_TOKENS,















                    Settings.Global.Wearable.GMS_CHECKIN_TIMEOUT_MIN,

































services/core/java/com/android/server/notification/NotificationManagerService.java



+14
−4




























Original line number
Diff line number
Diff line








@@ -764,6 +764,8 @@ public class NotificationManagerService extends SystemService {













    private long mLastOverRateLogTime;















    private float mMaxPackageEnqueueRate = DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE;



























    private boolean mRedactOtpNotifications = true;



























    private NotificationHistoryManager mHistoryManager;















    protected SnoozeHelper mSnoozeHelper;















    private TimeToLiveHelper mTtlHelper;










@@ -2410,6 +2412,8 @@ public class NotificationManagerService extends SystemService {













                = Secure.getUriFor(Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS);















        private final Uri SHOW_NOTIFICATION_SNOOZE















                = Secure.getUriFor(Secure.SHOW_NOTIFICATION_SNOOZE);













        private final Uri REDACT_OTP_NOTIFICATIONS = Settings.Global.getUriFor(













                Settings.Global.REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS);





























        SettingsObserver(Handler handler) {















            super(handler);









@@ -2435,6 +2439,8 @@ public class NotificationManagerService extends SystemService {



























            resolver.registerContentObserver(SHOW_NOTIFICATION_SNOOZE,















                    false, this, USER_ALL);













            resolver.registerContentObserver(REDACT_OTP_NOTIFICATIONS,













                    false, this, USER_ALL);





























            update(null);















        }










@@ -2481,6 +2487,10 @@ public class NotificationManagerService extends SystemService {













                    unsnoozeAll();















                }















            }













            if (REDACT_OTP_NOTIFICATIONS.equals(uri)) {













                mRedactOtpNotifications = Settings.Global.getInt(resolver,













                        Settings.Global.REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS, 1) != 0;













            }















        }





























        public void update(Uri uri, int userId) {










@@ -13453,13 +13463,13 @@ public class NotificationManagerService extends SystemService {













                StatusBarNotification oldRedactedSbn = null;















                boolean isNewSensitive = hasSensitiveContent(r);















                boolean isOldSensitive = hasSensitiveContent(old);













                boolean redactionEnabled = redactSensitiveNotificationsFromUntrustedListeners()













                        && mRedactOtpNotifications;





























                for (final ManagedServiceInfo info : getServices()) {















                    boolean isTrusted = isUidTrusted(info.uid);













                    boolean sendRedacted = redactSensitiveNotificationsFromUntrustedListeners()













                            && isNewSensitive && !isTrusted;













                    boolean sendOldRedacted = redactSensitiveNotificationsFromUntrustedListeners()













                            && isOldSensitive && !isTrusted;













                    boolean sendRedacted = redactionEnabled && isNewSensitive && !isTrusted;













                    boolean sendOldRedacted = redactionEnabled && isOldSensitive && !isTrusted;















                    boolean sbnVisible = isVisibleToListener(sbn, r.getNotificationType(), info);















                    boolean oldSbnVisible = (oldSbn != null)















                            && isVisibleToListener(oldSbn, old.getNotificationType(), info);

























services/core/java/com/android/server/notification/NotificationShellCmd.java



+10
−0




























Original line number
Diff line number
Diff line








@@ -45,6 +45,7 @@ import android.os.Process;













import android.os.RemoteException;















import android.os.ShellCommand;















import android.os.UserHandle;













import android.provider.Settings;















import android.service.notification.NotificationListenerService;















import android.service.notification.StatusBarNotification;















import android.text.TextUtils;










@@ -81,6 +82,7 @@ public class NotificationShellCmd extends ShellCommand {













            + "  snooze --for <msec> <notification-key>\n"















            + "  unsnooze <notification-key>\n"















            + "  set_exempt_th_force_grouping [true|false]\n"













            + "  redact_otp_from_untrusted_listeners [true|false]\n"















            ;































    private static final String NOTIFY_USAGE =










@@ -431,6 +433,14 @@ public class NotificationShellCmd extends ShellCommand {













                    mDirectService.setTestHarnessExempted(exemptTestHarnessFromForceGrouping);















                    break;















                }













                case "redact_otp_from_untrusted_listeners": {













                    String arg = getNextArgRequired();













                    final int allow = "true".equals(arg) || "1".equals(arg) ? 1 : 0;













                    Settings.Global.putInt(mDirectService.getContext().getContentResolver(),













                            Settings.Global.REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS,













                            allow);













                    break;













                }















                default:















                    return handleDefaultCommands(cmd);















            }