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

Commit 9bc7373c authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Android (Google) Code Review
Browse files

Merge "Move the sensitiveNotificationAppProtection flag to permissions." into main

parents ae24bc2e e3fb369d

core/java/android/permission/flags.aconfig

+10 −1
Original line number Diff line number Diff line
@@ -95,6 +95,15 @@ flag { 
  bug: "308573169"

}



flag {

  name: "sensitive_notification_app_protection"

  namespace: "permissions"

  description: "This flag controls the sensitive notification app protections while screen sharing"

  bug: "312784351"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true

}



flag {

    name: "device_aware_permissions_enabled"

    is_fixed_read_only: true

services/core/java/com/android/server/SensitiveContentProtectionManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package com.android.server;



import static android.permission.flags.Flags.sensitiveNotificationAppProtection;

import static android.provider.Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS;



import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.server.notification.Flags.sensitiveNotificationAppProtection;



import android.annotation.NonNull;

import android.annotation.Nullable;

services/core/java/com/android/server/notification/flags.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -49,15 +49,6 @@ flag { 
    bug: "312784809"

}



flag {

  name: "sensitive_notification_app_protection"

  namespace: "systemui"

  description: "This flag controls the sensitive notification app protections while screen sharing"

  bug: "312784351"

  # Referenced in WM where WM starts before DeviceConfig

  is_fixed_read_only: true

}



flag {

  name: "notification_reduce_messagequeue_usage"

  namespace: "systemui"

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            return true;

        }



        if (com.android.server.notification.Flags.sensitiveNotificationAppProtection()) {

        if (android.permission.flags.Flags.sensitiveNotificationAppProtection()) {

            if (mWmService.mSensitiveContentPackages

                    .shouldBlockScreenCaptureForApp(getOwningPackage(), getOwningUid())) {

                return true;

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -3014,7 +3014,7 @@ public final class SystemServer implements Dumpable { 
            t.traceEnd();

        }



        if (com.android.server.notification.Flags.sensitiveNotificationAppProtection()

        if (android.permission.flags.Flags.sensitiveNotificationAppProtection()

                || android.view.flags.Flags.sensitiveContentAppProtection()) {

            t.traceBegin("StartSensitiveContentProtectionManager");

            mSystemServiceManager.startService(SensitiveContentProtectionManagerService.class);