From 9507e30c5b8784e84643fad284a668628c01a6ad Mon Sep 17 00:00:00 2001 From: Ahaan Ugale Date: Sat, 10 Feb 2024 00:51:42 +0000 Subject: [PATCH] Update sensitiveNotificationAppProtection reference after move. Bug: 309564730 Test: builds Change-Id: I256eb8bd9e80a481ef1bffe22053f6fa668e5ee2 --- .../SensitiveContentProtectionPreferenceController.kt | 2 +- .../SensitiveContentProtectionPreferenceControllerTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/SensitiveContentProtectionPreferenceController.kt b/src/com/android/settings/development/SensitiveContentProtectionPreferenceController.kt index 6fe56c8beea..e627f81a60d 100644 --- a/src/com/android/settings/development/SensitiveContentProtectionPreferenceController.kt +++ b/src/com/android/settings/development/SensitiveContentProtectionPreferenceController.kt @@ -16,11 +16,11 @@ package com.android.settings.development import android.content.Context +import android.permission.flags.Flags.sensitiveNotificationAppProtection import android.provider.Settings import androidx.annotation.VisibleForTesting import androidx.preference.Preference import androidx.preference.TwoStatePreference -import com.android.server.notification.Flags.sensitiveNotificationAppProtection import com.android.server.notification.Flags.screenshareNotificationHiding import com.android.settings.core.PreferenceControllerMixin import com.android.settingslib.development.DeveloperOptionsPreferenceController diff --git a/tests/spa_unit/src/com/android/settings/development/SensitiveContentProtectionPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/development/SensitiveContentProtectionPreferenceControllerTest.kt index bb306197919..18acbbaba65 100644 --- a/tests/spa_unit/src/com/android/settings/development/SensitiveContentProtectionPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/development/SensitiveContentProtectionPreferenceControllerTest.kt @@ -16,6 +16,7 @@ package com.android.settings.development import android.content.Context +import android.permission.flags.Flags.FLAG_SENSITIVE_NOTIFICATION_APP_PROTECTION import android.platform.test.annotations.RequiresFlagsDisabled import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.DeviceFlagsValueProvider @@ -27,7 +28,6 @@ import androidx.preference.SwitchPreference import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.android.server.notification.Flags.FLAG_SCREENSHARE_NOTIFICATION_HIDING -import com.android.server.notification.Flags.FLAG_SENSITIVE_NOTIFICATION_APP_PROTECTION import com.android.settings.development.SensitiveContentProtectionPreferenceController.Companion.SETTING_VALUE_OFF import com.android.settings.development.SensitiveContentProtectionPreferenceController.Companion.SETTING_VALUE_ON import org.junit.Assert.assertEquals