diff options
159 files changed, 2456 insertions, 859 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 6d74a840525b..1c9785f34b79 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -51,6 +51,7 @@ aconfig_srcjars = [ ":aconfig_midi_flags_java_lib{.generated_srcjars}", ":android.service.autofill.flags-aconfig-java{.generated_srcjars}", ":com.android.net.flags-aconfig-java{.generated_srcjars}", + ":device_policy_aconfig_flags_lib{.generated_srcjars}", ] filegroup { @@ -523,3 +524,23 @@ java_aconfig_library { aconfig_declarations: "com.android.net.flags-aconfig", defaults: ["framework-minus-apex-aconfig-java-defaults"], } + +// DevicePolicy +aconfig_declarations { + name: "device_policy_aconfig_flags", + package: "android.app.admin.flags", + srcs: [ + "core/java/android/app/admin/flags/flags.aconfig", + ], +} + +java_aconfig_library { + name: "device_policy_aconfig_flags_lib", + aconfig_declarations: "device_policy_aconfig_flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + +cc_aconfig_library { + name: "device_policy_aconfig_flags_c_lib", + aconfig_declarations: "device_policy_aconfig_flags", +} diff --git a/core/api/current.txt b/core/api/current.txt index 66aeb0f7cbaf..ad709391b495 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -9530,7 +9530,7 @@ package android.companion { method @Nullable public CharSequence getDisplayName(); method public int getId(); method public int getSystemDataSyncFlags(); - method @Nullable public String getTag(); + method @FlaggedApi("android.companion.association_tag") @Nullable public String getTag(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.companion.AssociationInfo> CREATOR; } @@ -9600,7 +9600,7 @@ package android.companion { method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException; method @Nullable public android.content.IntentSender buildAssociationCancellationIntent(); method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException; - method public void clearAssociationTag(int); + method @FlaggedApi("android.companion.association_tag") public void clearAssociationTag(int); method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException; method public void disableSystemDataSyncForTypes(int, int); method @Deprecated public void disassociate(@NonNull String); @@ -9610,7 +9610,7 @@ package android.companion { method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations(); method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName); method public void requestNotificationAccess(android.content.ComponentName); - method public void setAssociationTag(int, @NonNull String); + method @FlaggedApi("android.companion.association_tag") public void setAssociationTag(int, @NonNull String); method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException; method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException; method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException; @@ -11719,7 +11719,7 @@ package android.content.om { method @NonNull public void setResourceValue(@NonNull String, @IntRange(from=android.util.TypedValue.TYPE_FIRST_INT, to=android.util.TypedValue.TYPE_LAST_INT) int, int, @Nullable String); method @NonNull public void setResourceValue(@NonNull String, int, @NonNull String, @Nullable String); method @NonNull public void setResourceValue(@NonNull String, @NonNull android.os.ParcelFileDescriptor, @Nullable String); - method @NonNull public void setResourceValue(@NonNull String, @NonNull android.content.res.AssetFileDescriptor, @Nullable String); + method @FlaggedApi("android.content.res.asset_file_descriptor_frro") @NonNull public void setResourceValue(@NonNull String, @NonNull android.content.res.AssetFileDescriptor, @Nullable String); method public void setTargetOverlayable(@Nullable String); } @@ -14352,14 +14352,14 @@ package android.database.sqlite { public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable { method public void beginTransaction(); method public void beginTransactionNonExclusive(); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public void beginTransactionReadOnly(); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionReadOnly(); method public void beginTransactionWithListener(@Nullable android.database.sqlite.SQLiteTransactionListener); method public void beginTransactionWithListenerNonExclusive(@Nullable android.database.sqlite.SQLiteTransactionListener); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener); method public android.database.sqlite.SQLiteStatement compileStatement(String) throws android.database.SQLException; method @NonNull public static android.database.sqlite.SQLiteDatabase create(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory); method @NonNull public static android.database.sqlite.SQLiteDatabase createInMemory(@NonNull android.database.sqlite.SQLiteDatabase.OpenParams); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String); method public int delete(@NonNull String, @Nullable String, @Nullable String[]); method public static boolean deleteDatabase(@NonNull java.io.File); method public void disableWriteAheadLogging(); @@ -14370,13 +14370,13 @@ package android.database.sqlite { method public void execSQL(@NonNull String, @NonNull Object[]) throws android.database.SQLException; method public static String findEditTable(String); method public java.util.List<android.util.Pair<java.lang.String,java.lang.String>> getAttachedDbs(); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public long getLastChangedRowCount(); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public long getLastInsertRowId(); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastChangedRowCount(); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastInsertRowId(); method public long getMaximumSize(); method public long getPageSize(); method public String getPath(); method @Deprecated public java.util.Map<java.lang.String,java.lang.String> getSyncedTables(); - method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public long getTotalChangedRowCount(); + method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getTotalChangedRowCount(); method public int getVersion(); method public boolean inTransaction(); method public long insert(@NonNull String, @Nullable String, @Nullable android.content.ContentValues); @@ -14598,7 +14598,7 @@ package android.database.sqlite { method public int update(@NonNull android.database.sqlite.SQLiteDatabase, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]); } - @FlaggedApi("android.database.sqlite.sqlite_apis_15") public final class SQLiteRawStatement implements java.io.Closeable { + @FlaggedApi("android.database.sqlite.sqlite_apis_35") public final class SQLiteRawStatement implements java.io.Closeable { method public void bindBlob(int, @NonNull byte[]) throws android.database.sqlite.SQLiteException; method public void bindBlob(int, @NonNull byte[], int, int) throws android.database.sqlite.SQLiteException; method public void bindDouble(int, double) throws android.database.sqlite.SQLiteException; diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index b5d3ed7c8a7e..2af3c34bf2c4 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -6,7 +6,7 @@ package android { field public static final String CONTROL_AUTOMOTIVE_GNSS = "android.permission.CONTROL_AUTOMOTIVE_GNSS"; field public static final String GET_INTENT_SENDER_INTENT = "android.permission.GET_INTENT_SENDER_INTENT"; field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE"; - field public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS"; + field @FlaggedApi("android.companion.flags.companion_transport_apis") public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS"; } } @@ -85,21 +85,21 @@ package android.app.admin { package android.companion { public final class CompanionDeviceManager { - method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener(@NonNull java.util.concurrent.Executor, int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener); - method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener); - method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener); - method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener); - method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int, @NonNull byte[], @NonNull int[]); - field public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 1667729539; // 0x63678883 - field public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 1669491075; // 0x63826983 - field public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 1669494629; // 0x63827765 + method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener(@NonNull java.util.concurrent.Executor, int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener); + method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener); + method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener); + method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener); + method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int, @NonNull byte[], @NonNull int[]); + field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 1667729539; // 0x63678883 + field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 1669491075; // 0x63826983 + field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 1669494629; // 0x63827765 } - public static interface CompanionDeviceManager.OnMessageReceivedListener { + @FlaggedApi("android.companion.companion_transport_apis") public static interface CompanionDeviceManager.OnMessageReceivedListener { method public void onMessageReceived(int, @NonNull byte[]); } - public static interface CompanionDeviceManager.OnTransportsChangedListener { + @FlaggedApi("android.companion.companion_transport_apis") public static interface CompanionDeviceManager.OnTransportsChangedListener { method public void onTransportsChanged(@NonNull java.util.List<android.companion.AssociationInfo>); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 5d1f6dc3e675..70f5e2f231c9 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9538,7 +9538,7 @@ package android.net.wifi.sharedconnectivity.app { method public int getDeviceType(); method @NonNull public android.os.Bundle getExtras(); method @NonNull public String getModelName(); - method public boolean isBatteryCharging(); + method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.NetworkProviderInfo> CREATOR; field public static final int DEVICE_TYPE_AUTO = 5; // 0x5 @@ -9552,7 +9552,7 @@ package android.net.wifi.sharedconnectivity.app { public static final class NetworkProviderInfo.Builder { ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String); method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build(); - method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean); + method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean); method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int); method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=4) int); method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String); diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt index 4fb7b6bddaac..a5010312e764 100644 --- a/core/api/system-lint-baseline.txt +++ b/core/api/system-lint-baseline.txt @@ -251,10 +251,6 @@ UnflaggedApi: android.media.audiopolicy.AudioMixingRule#writeToParcel(android.os New API must be flagged with @FlaggedApi: method android.media.audiopolicy.AudioMixingRule.writeToParcel(android.os.Parcel,int) UnflaggedApi: android.media.audiopolicy.AudioPolicy#updateMixingRules(java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>): New API must be flagged with @FlaggedApi: method android.media.audiopolicy.AudioPolicy.updateMixingRules(java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>) -UnflaggedApi: android.net.wifi.sharedconnectivity.app.NetworkProviderInfo#isBatteryCharging(): - New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.isBatteryCharging() -UnflaggedApi: android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder#setBatteryCharging(boolean): - New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder.setBatteryCharging(boolean) UnflaggedApi: android.nfc.cardemulation.AidGroup#CONTENTS_FILE_DESCRIPTOR: New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.AidGroup.CONTENTS_FILE_DESCRIPTOR UnflaggedApi: android.nfc.cardemulation.AidGroup#PARCELABLE_WRITE_RETURN_VALUE: diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 384b9573528e..03a58bed3389 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -541,7 +541,7 @@ package android.app.admin { field public static final String PERMITTED_INPUT_METHODS_POLICY = "permittedInputMethods"; field public static final String PERSONAL_APPS_SUSPENDED_POLICY = "personalAppsSuspended"; field public static final String SCREEN_CAPTURE_DISABLED_POLICY = "screenCaptureDisabled"; - field public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling"; + field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling"; } public class DevicePolicyManager { @@ -851,13 +851,13 @@ package android.companion { method @NonNull public android.companion.AssociationInfo.Builder setRevoked(boolean); method @NonNull public android.companion.AssociationInfo.Builder setSelfManaged(boolean); method @NonNull public android.companion.AssociationInfo.Builder setSystemDataSyncFlags(int); - method @NonNull public android.companion.AssociationInfo.Builder setTag(@Nullable String); + method @FlaggedApi("android.companion.association_tag") @NonNull public android.companion.AssociationInfo.Builder setTag(@Nullable String); method @NonNull public android.companion.AssociationInfo.Builder setTimeApproved(long); } public final class CompanionDeviceManager { method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void enableSecureTransport(boolean); - field public static final int MESSAGE_REQUEST_PING = 1669362552; // 0x63807378 + field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_PING = 1669362552; // 0x63807378 } public abstract class CompanionDeviceService extends android.app.Service { @@ -2117,7 +2117,7 @@ package android.net.wifi.sharedconnectivity.app { public class SharedConnectivityManager { method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String); - method @NonNull public android.content.BroadcastReceiver getBroadcastReceiver(); + method @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api") @NonNull public android.content.BroadcastReceiver getBroadcastReceiver(); method @Nullable public android.content.ServiceConnection getServiceConnection(); method public void setService(@Nullable android.os.IInterface); } @@ -2148,7 +2148,7 @@ package android.os { } public final class BugreportParams { - field public static final int BUGREPORT_MODE_MAX_VALUE = 7; // 0x7 + field @FlaggedApi("android.os.bugreport_mode_max_value") public static final int BUGREPORT_MODE_MAX_VALUE = 7; // 0x7 } public class Build { diff --git a/core/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt index 93e39d5f41f7..105e7645ac4b 100644 --- a/core/api/test-lint-baseline.txt +++ b/core/api/test-lint-baseline.txt @@ -257,8 +257,6 @@ UnflaggedApi: android.media.soundtrigger.SoundTriggerManager#loadSoundModel(andr New API must be flagged with @FlaggedApi: method android.media.soundtrigger.SoundTriggerManager.loadSoundModel(android.hardware.soundtrigger.SoundTrigger.SoundModel) UnflaggedApi: android.media.soundtrigger.SoundTriggerManager.Model#getSoundModel(): New API must be flagged with @FlaggedApi: method android.media.soundtrigger.SoundTriggerManager.Model.getSoundModel() -UnflaggedApi: android.net.wifi.sharedconnectivity.app.SharedConnectivityManager#getBroadcastReceiver(): - New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.SharedConnectivityManager.getBroadcastReceiver() UnflaggedApi: android.os.BatteryManager#BATTERY_PLUGGED_ANY: New API must be flagged with @FlaggedApi: field android.os.BatteryManager.BATTERY_PLUGGED_ANY UnflaggedApi: android.os.BugreportParams#BUGREPORT_MODE_MAX_VALUE: diff --git a/core/java/android/app/admin/DevicePolicyIdentifiers.java b/core/java/android/app/admin/DevicePolicyIdentifiers.java index ad0af72c72b4..84b1ca5c6a61 100644 --- a/core/java/android/app/admin/DevicePolicyIdentifiers.java +++ b/core/java/android/app/admin/DevicePolicyIdentifiers.java @@ -16,10 +16,13 @@ package android.app.admin; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.TestApi; +import android.app.admin.flags.Flags; import android.os.UserManager; + import java.util.Objects; /** @@ -164,6 +167,7 @@ public final class DevicePolicyIdentifiers { * * @hide */ + @FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED) @TestApi public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling"; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/flags/FlagUtils.java b/core/java/android/app/admin/flags/FlagUtils.java index 7e17ef111cf0..7c3c3d5260b4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/flags/FlagUtils.java +++ b/core/java/android/app/admin/flags/FlagUtils.java @@ -14,15 +14,20 @@ * limitations under the License. */ -package com.android.server.devicepolicy.flags; +package android.app.admin.flags; -import static com.android.server.devicepolicy.flags.Flags.devicePolicySizeTrackingEnabled; -import static com.android.server.devicepolicy.flags.Flags.policyEngineMigrationV2Enabled; +import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled; +import static android.app.admin.flags.Flags.policyEngineMigrationV2Enabled; +import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled; import android.os.Binder; +/** + * + * @hide + */ public final class FlagUtils { - private FlagUtils(){} + private FlagUtils() {} public static boolean isPolicyEngineMigrationV2Enabled() { return Binder.withCleanCallingIdentity(() -> { @@ -35,4 +40,10 @@ public final class FlagUtils { return devicePolicySizeTrackingEnabled(); }); } + + public static boolean isOnboardingBugreportV2Enabled() { + return Binder.withCleanCallingIdentity(() -> { + return onboardingBugreportV2Enabled(); + }); + } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 0dde496e7285..c145c0255b0a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -1,4 +1,4 @@ -package: "com.android.server.devicepolicy.flags" +package: "android.app.admin.flags" flag { name: "policy_engine_migration_v2_enabled" @@ -6,9 +6,17 @@ flag { description: "V2 of the policy engine migrations for Android V" bug: "289520697" } + flag { name: "device_policy_size_tracking_enabled" namespace: "enterprise" description: "Add feature to track the total policy size and have a max threshold." bug: "281543351" +} + +flag { + name: "onboarding_bugreport_v2_enabled" + namespace: "enterprise" + description: "Add feature to track required changes for enabled V2 of auto-capturing of onboarding bug reports." + bug: "302517677" }
\ No newline at end of file diff --git a/core/java/android/companion/AssociationInfo.java b/core/java/android/companion/AssociationInfo.java index 6393c456bdcd..8b09bdf2ab17 100644 --- a/core/java/android/companion/AssociationInfo.java +++ b/core/java/android/companion/AssociationInfo.java @@ -144,6 +144,7 @@ public final class AssociationInfo implements Parcelable { * @return the tag of this association. * @see CompanionDeviceManager#setAssociationTag(int, String) */ + @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG) @Nullable public String getTag() { return mTag; @@ -459,6 +460,7 @@ public final class AssociationInfo implements Parcelable { } /** @hide */ + @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG) @TestApi @NonNull public Builder setTag(@Nullable String tag) { diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index a84845a15a79..70811bb329ec 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -23,6 +23,7 @@ import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH; import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -216,12 +217,14 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @TestApi public static final int MESSAGE_REQUEST_PING = 0x63807378; // ?PIN /** * Message header assigned to the remote authentication handshakes. * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 0x63827765; // ?RMA /** @@ -229,6 +232,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 0x63678883; // ?CXS /** @@ -236,6 +240,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 0x63826983; // ?RES @@ -873,6 +878,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) public interface OnTransportsChangedListener { /** @@ -892,6 +898,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener( @@ -913,6 +920,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener( @@ -934,6 +942,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int messageType, @NonNull byte[] data, @NonNull int[] associationIds) { @@ -951,6 +960,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) public interface OnMessageReceivedListener { /** @@ -964,6 +974,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener( @@ -983,6 +994,7 @@ public final class CompanionDeviceManager { * * @hide */ + @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS) @SystemApi(client = MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int messageType, @@ -1423,6 +1435,7 @@ public final class CompanionDeviceManager { * of the companion device recorded by CompanionDeviceManager * @param tag the tag of this association */ + @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG) @UserHandleAware public void setAssociationTag(int associationId, @NonNull String tag) { Objects.requireNonNull(tag, "tag cannot be null"); @@ -1447,6 +1460,7 @@ public final class CompanionDeviceManager { * of the companion device recorded by CompanionDeviceManager * @see CompanionDeviceManager#setAssociationTag(int, String) */ + @FlaggedApi(Flags.FLAG_ASSOCIATION_TAG) @UserHandleAware public void clearAssociationTag(int associationId) { try { diff --git a/core/java/android/companion/flags.aconfig b/core/java/android/companion/flags.aconfig index b9e5609171c3..4f9c849865fc 100644 --- a/core/java/android/companion/flags.aconfig +++ b/core/java/android/companion/flags.aconfig @@ -5,4 +5,18 @@ flag { namespace: "companion" description: "Controls if the new Builder is exposed to test apis." bug: "296251481" +} + +flag { + name: "companion_transport_apis" + namespace: "companion" + description: "Grants access to the companion transport apis." + bug: "288297505" +} + +flag { + name: "association_tag" + namespace: "companion" + description: "Enable Association tag APIs " + bug: "289241123" }
\ No newline at end of file diff --git a/core/java/android/companion/virtual/sensor/VirtualSensor.java b/core/java/android/companion/virtual/sensor/VirtualSensor.java index eaa17925b14b..14c799763a96 100644 --- a/core/java/android/companion/virtual/sensor/VirtualSensor.java +++ b/core/java/android/companion/virtual/sensor/VirtualSensor.java @@ -115,6 +115,11 @@ public final class VirtualSensor implements Parcelable { parcel.writeStrongBinder(mToken); } + @Override + public String toString() { + return "VirtualSensor{ mType=" + mType + ", mName='" + mName + "' }"; + } + /** * Send a sensor event to the system. */ diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index b765562ab587..bb9cc0bef671 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -64,6 +64,7 @@ import android.os.Process; import android.os.ResultReceiver; import android.os.ShellCommand; import android.os.StrictMode; +import android.os.SystemClock; import android.os.UserHandle; import android.os.storage.StorageManager; import android.provider.ContactsContract.QuickContact; @@ -2796,6 +2797,8 @@ public class Intent implements Parcelable, Cloneable { * started and is no longer considered stopped. * <ul> * <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. + * <li> {@link #EXTRA_TIME} containing the {@link SystemClock#elapsedRealtime() + * elapsed realtime} of when the package was unstopped. * </ul> * * <p class="note">This is a protected intent that can only be sent by the system. @@ -2869,9 +2872,15 @@ public class Intent implements Parcelable, Cloneable { * * <p class="note">This is a protected intent that can only be sent * by the system. + * <p> + * Starting in {@link Build.VERSION_CODES#VANILLA_ICE_CREAM Android V}, an extra timestamp + * {@link #EXTRA_TIME} is included with this broadcast to indicate the exact time the package + * was restarted, in {@link SystemClock#elapsedRealtime() elapsed realtime}. + * </p> */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED"; + /** * Broadcast Action: The user has cleared the data of a package. This should * be preceded by {@link #ACTION_PACKAGE_RESTARTED}, after which all of @@ -6578,8 +6587,8 @@ public class Intent implements Parcelable, Cloneable { = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY"; /** - * Optional extra specifying a time in milliseconds since the Epoch. The value must be - * non-negative. + * Optional extra specifying a time in milliseconds. The timebase depends on the Intent + * including this extra. The value must be non-negative. * <p> * Type: long * </p> diff --git a/core/java/android/content/om/FabricatedOverlay.java b/core/java/android/content/om/FabricatedOverlay.java index c4547b8acc2b..df2d7e70880f 100644 --- a/core/java/android/content/om/FabricatedOverlay.java +++ b/core/java/android/content/om/FabricatedOverlay.java @@ -16,6 +16,7 @@ package android.content.om; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; @@ -546,6 +547,7 @@ public class FabricatedOverlay { * @param configuration The string representation of the config this overlay is enabled for */ @NonNull + @FlaggedApi(android.content.res.Flags.FLAG_ASSET_FILE_DESCRIPTOR_FRRO) public void setResourceValue( @NonNull String resourceName, @NonNull AssetFileDescriptor value, diff --git a/core/java/android/content/res/flags.aconfig b/core/java/android/content/res/flags.aconfig index 0c2c0f494257..1b8eb0748737 100644 --- a/core/java/android/content/res/flags.aconfig +++ b/core/java/android/content/res/flags.aconfig @@ -8,3 +8,10 @@ flag { # fixed_read_only or device wont boot because of permission issues accessing flags during boot is_fixed_read_only: true } + +flag { + name: "asset_file_descriptor_frro" + namespace: "resource_manager" + description: "Feature flag for passing in an AssetFileDescriptor to create an frro" + bug: "304478666" +} diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index b003e75b4e50..8a4f678b52f2 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -701,7 +701,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * } * </pre> */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public void beginTransactionReadOnly() { beginTransactionWithListenerReadOnly(null); } @@ -785,7 +785,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * } * </pre> */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public void beginTransactionWithListenerReadOnly( @Nullable SQLiteTransactionListener transactionListener) { beginTransaction(transactionListener, SQLiteSession.TRANSACTION_MODE_DEFERRED); @@ -2224,7 +2224,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * @throws IllegalStateException if a transaction is not in progress. * @throws SQLiteException if the SQL cannot be compiled. */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) @NonNull public SQLiteRawStatement createRawStatement(@NonNull String sql) { Objects.requireNonNull(sql); @@ -2244,7 +2244,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * @return The ROWID of the last row to be inserted under this connection. * @throws IllegalStateException if there is no current transaction. */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public long getLastInsertRowId() { return getThreadSession().getLastInsertRowId(); } @@ -2258,7 +2258,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * @return The number of rows changed by the most recent sql statement * @throws IllegalStateException if there is no current transaction. */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public long getLastChangedRowCount() { return getThreadSession().getLastChangedRowCount(); } @@ -2286,7 +2286,7 @@ public final class SQLiteDatabase extends SQLiteClosable { * @return The number of rows changed on the current connection. * @throws IllegalStateException if there is no current transaction. */ - @FlaggedApi(Flags.FLAG_SQLITE_APIS_15) + @FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public long getTotalChangedRowCount() { return getThreadSession().getTotalChangedRowCount(); } diff --git a/core/java/android/database/sqlite/SQLiteRawStatement.java b/core/java/android/database/sqlite/SQLiteRawStatement.java index 827420f96fed..33f602bbd40e 100644 --- a/core/java/android/database/sqlite/SQLiteRawStatement.java +++ b/core/java/android/database/sqlite/SQLiteRawStatement.java @@ -71,7 +71,7 @@ import java.util.Objects; * * @see <a href="http://sqlite.org/c3ref/stmt.html">sqlite3_stmt</a> */ -@FlaggedApi(Flags.FLAG_SQLITE_APIS_15) +@FlaggedApi(Flags.FLAG_SQLITE_APIS_35) public final class SQLiteRawStatement implements Closeable { private static final String TAG = "SQLiteRawStatement"; diff --git a/core/java/android/database/sqlite/flags.aconfig b/core/java/android/database/sqlite/flags.aconfig index 564df039456b..62a51236a2e2 100644 --- a/core/java/android/database/sqlite/flags.aconfig +++ b/core/java/android/database/sqlite/flags.aconfig @@ -1,7 +1,7 @@ package: "android.database.sqlite" flag { - name: "sqlite_apis_15" + name: "sqlite_apis_35" namespace: "system_performance" is_fixed_read_only: true description: "SQLite APIs held back for Android 15" diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index 8decd50664b3..2b5f5ee35a26 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -220,7 +220,7 @@ public final class DisplayManagerGlobal { registerCallbackIfNeededLocked(); - if (DEBUG || extraLogging()) { + if (DEBUG) { Log.d(TAG, "getDisplayInfo: displayId=" + displayId + ", info=" + info); } return info; @@ -402,7 +402,7 @@ public final class DisplayManagerGlobal { } private void maybeLogAllDisplayListeners() { - if (!sExtraDisplayListenerLogging) { + if (!extraLogging()) { return; } @@ -1222,7 +1222,7 @@ public final class DisplayManagerGlobal { private void handleMessage(Message msg) { if (extraLogging()) { - Slog.i(TAG, "DisplayListenerDelegate(" + eventToString(msg.what) + Slog.i(TAG, "DLD(" + eventToString(msg.what) + ", display=" + msg.arg1 + ", mEventsMask=" + Long.toBinaryString(mEventsMask) + ", mPackageName=" + mPackageName @@ -1231,9 +1231,10 @@ public final class DisplayManagerGlobal { } if (DEBUG) { Trace.beginSection( - "DisplayListenerDelegate(" + eventToString(msg.what) + TextUtils.trimToSize( + "DLD(" + eventToString(msg.what) + ", display=" + msg.arg1 - + ", listener=" + mListener.getClass() + ")"); + + ", listener=" + mListener.getClass() + ")", 127)); } switch (msg.what) { case EVENT_DISPLAY_ADDED: @@ -1422,11 +1423,12 @@ public final class DisplayManagerGlobal { sExtraDisplayListenerLogging = !TextUtils.isEmpty(EXTRA_LOGGING_PACKAGE_NAME) && EXTRA_LOGGING_PACKAGE_NAME.equals(sCurrentPackageName); } - return sExtraDisplayListenerLogging; + // TODO: b/306170135 - return sExtraDisplayListenerLogging instead + return true; } private static boolean extraLogging() { - return sExtraDisplayListenerLogging && EXTRA_LOGGING_PACKAGE_NAME.equals( - sCurrentPackageName); + // TODO: b/306170135 - return sExtraDisplayListenerLogging & package name check instead + return true; } } diff --git a/core/java/android/os/BugreportParams.java b/core/java/android/os/BugreportParams.java index 47ad72fe8d0e..e8ad303c4208 100644 --- a/core/java/android/os/BugreportParams.java +++ b/core/java/android/os/BugreportParams.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.SystemApi; import android.annotation.TestApi; @@ -133,6 +134,7 @@ public final class BugreportParams { * The maximum value of supported bugreport mode. * @hide */ + @FlaggedApi(android.os.Flags.FLAG_BUGREPORT_MODE_MAX_VALUE) @TestApi public static final int BUGREPORT_MODE_MAX_VALUE = BUGREPORT_MODE_ONBOARDING; diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index b7f2e065bac8..c4521c036329 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -27,3 +27,10 @@ flag { description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion." bug: "299069460" } + +flag { + name: "bugreport_mode_max_value" + namespace: "telephony" + description: "Introduce a constant as maximum value of bugreport mode." + bug: "305067125" +} diff --git a/core/java/android/service/rotationresolver/OWNERS b/core/java/android/service/rotationresolver/OWNERS index 5b57fc7fa528..dce874dcd982 100644 --- a/core/java/android/service/rotationresolver/OWNERS +++ b/core/java/android/service/rotationresolver/OWNERS @@ -1,9 +1,7 @@ # Bug component: 814982 asalo@google.com -augale@google.com eejiang@google.com payamp@google.com siddikap@google.com -svetoslavganov@google.com tgadh@google.com diff --git a/core/java/android/speech/SpeechRecognizer.java b/core/java/android/speech/SpeechRecognizer.java index 3ed13bbeeaad..35834fd3886f 100644 --- a/core/java/android/speech/SpeechRecognizer.java +++ b/core/java/android/speech/SpeechRecognizer.java @@ -767,7 +767,7 @@ public class SpeechRecognizer { try { mService.startListening(recognizerIntent, mListener, mContext.getAttributionSource()); if (DBG) Log.d(TAG, "service start listening command succeeded"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "startListening() failed", e); mListener.onError(ERROR_CLIENT); } @@ -781,7 +781,7 @@ public class SpeechRecognizer { try { mService.stopListening(mListener); if (DBG) Log.d(TAG, "service stop listening command succeeded"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "stopListening() failed", e); mListener.onError(ERROR_CLIENT); } @@ -795,7 +795,7 @@ public class SpeechRecognizer { try { mService.cancel(mListener, /*isShutdown*/ false); if (DBG) Log.d(TAG, "service cancel command succeeded"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "cancel() failed", e); mListener.onError(ERROR_CLIENT); } @@ -830,7 +830,7 @@ public class SpeechRecognizer { mContext.getAttributionSource(), new InternalSupportCallback(callbackExecutor, recognitionSupportCallback)); if (DBG) Log.d(TAG, "service support command succeeded"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "checkRecognitionSupport() failed", e); callbackExecutor.execute(() -> recognitionSupportCallback.onError(ERROR_CLIENT)); } @@ -850,7 +850,7 @@ public class SpeechRecognizer { mService.triggerModelDownload( recognizerIntent, mContext.getAttributionSource(), null); if (DBG) Log.d(TAG, "triggerModelDownload() without a listener"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "triggerModelDownload() without a listener failed", e); mListener.onError(ERROR_CLIENT); } @@ -862,7 +862,7 @@ public class SpeechRecognizer { recognizerIntent, mContext.getAttributionSource(), new InternalModelDownloadListener(callbackExecutor, modelDownloadListener)); if (DBG) Log.d(TAG, "triggerModelDownload() with a listener"); - } catch (final RemoteException e) { + } catch (final Exception e) { Log.e(TAG, "triggerModelDownload() with a listener failed", e); callbackExecutor.execute(() -> modelDownloadListener.onError(ERROR_CLIENT)); } @@ -889,7 +889,7 @@ public class SpeechRecognizer { if (mService != null) { try { mService.cancel(mListener, /*isShutdown*/ true); - } catch (final RemoteException e) { + } catch (final Exception e) { // Not important } } diff --git a/core/java/android/view/AttachedSurfaceControl.java b/core/java/android/view/AttachedSurfaceControl.java index 1ed5d3fb6268..71d382e19e2b 100644 --- a/core/java/android/view/AttachedSurfaceControl.java +++ b/core/java/android/view/AttachedSurfaceControl.java @@ -92,6 +92,12 @@ public interface AttachedSurfaceControl { * SurfaceView Surface, the buffer producer will already have access to the transform hint and * no additional work is needed. * + * If the root surface is not available, the API will return {@code BUFFER_TRANSFORM_IDENTITY}. + * The caller should register a listener to listen for any changes. @see + * {@link #addOnBufferTransformHintChangedListener(OnBufferTransformHintChangedListener)}. + * Warning: Calling this API in Android 14 (API Level 34) or earlier will crash if the root + * surface is not available. + * * @see HardwareBuffer */ default @SurfaceControl.BufferTransform int getBufferTransformHint() { diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 506945501609..17c7fcc3a7bb 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -2656,6 +2656,7 @@ public final class Display { if (displayId == getDisplayId()) { float newRatio = getHdrSdrRatio(); if (newRatio != mLastReportedRatio) { + mLastReportedRatio = newRatio; mListener.accept(Display.this); } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 9d15c78a6e9e..50eeed81e16b 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1051,7 +1051,8 @@ public final class ViewRootImpl implements ViewParent, mDisplay = display; mBasePackageName = context.getBasePackageName(); final String name = DisplayProperties.debug_vri_package().orElse(null); - mExtraDisplayListenerLogging = !TextUtils.isEmpty(name) && name.equals(mBasePackageName); + // TODO: b/306170135 - return to using textutils check on package name. + mExtraDisplayListenerLogging = true; mThread = Thread.currentThread(); mLocation = new WindowLeaked(null); mLocation.fillInStackTrace(); @@ -2038,6 +2039,10 @@ public final class ViewRootImpl implements ViewParent, Slog.i(mTag, "DisplayState - old: " + oldDisplayState + ", new: " + newDisplayState); } + if (Trace.isTagEnabled(Trace.TRACE_TAG_WINDOW_MANAGER)) { + Trace.traceCounter(Trace.TRACE_TAG_WINDOW_MANAGER, + "vri#screenState[" + mTag + "] state=", newDisplayState); + } if (oldDisplayState != newDisplayState) { mAttachInfo.mDisplayState = newDisplayState; pokeDrawLockIfNeeded(); @@ -11527,7 +11532,11 @@ public final class ViewRootImpl implements ViewParent, @Override public @SurfaceControl.BufferTransform int getBufferTransformHint() { - return mSurfaceControl.getTransformHint(); + if (mSurfaceControl.isValid()) { + return mSurfaceControl.getTransformHint(); + } else { + return SurfaceControl.BUFFER_TRANSFORM_IDENTITY; + } } @Override diff --git a/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig index 5c86feb3c22c..f6ee061fdd89 100644 --- a/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig +++ b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig @@ -13,3 +13,10 @@ flag { description: "If true, content protection groups config will be parsed." bug: "302187922" } + +flag { + name: "setting_ui_enabled" + namespace: "content_protection" + description: "If true, content protection setting ui is displayed in Settings > Privacy & Security > More security & privacy." + bug: "305792348" +} diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 103725da9af0..f19a2f961391 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -685,8 +685,9 @@ public class RemoteViews implements Parcelable, Filter { return false; } + /** See {@link RemoteViews#visitUris(Consumer)}. **/ public void visitUris(@NonNull Consumer<Uri> visitor) { - // Nothing to visit by default + // Nothing to visit by default. } } @@ -761,9 +762,11 @@ public class RemoteViews implements Parcelable, Filter { } /** - * Note all {@link Uri} that are referenced internally, with the expectation - * that Uri permission grants will need to be issued to ensure the recipient - * of this object is able to render its contents. + * Note all {@link Uri} that are referenced internally, with the expectation that Uri permission + * grants will need to be issued to ensure the recipient of this object is able to render its + * contents. + * See b/281044385 for more context and examples about what happens when this isn't done + * correctly. * * @hide */ @@ -1088,6 +1091,13 @@ public class RemoteViews implements Parcelable, Filter { public String getUniqueKey() { return (SET_REMOTE_ADAPTER_TAG + "_" + mViewId); } + + @Override + public void visitUris(@NonNull Consumer<Uri> visitor) { + for (RemoteViews remoteViews : mList) { + remoteViews.visitUris(visitor); + } + } } /** @@ -1289,6 +1299,12 @@ public class RemoteViews implements Parcelable, Filter { public String getUniqueKey() { return (SET_REMOTE_ADAPTER_TAG + "_" + mViewId); } + + @Override + public void visitUris(@NonNull Consumer<Uri> visitor) { + RemoteCollectionItems items = getCollectionItemsFromFuture(mItemsFuture); + items.visitUris(visitor); + } } private class SetRemoteViewsAdapterIntent extends Action { @@ -1359,6 +1375,13 @@ public class RemoteViews implements Parcelable, Filter { public int getActionTag() { return SET_REMOTE_VIEW_ADAPTER_INTENT_TAG; } + + @Override + public void visitUris(@NonNull Consumer<Uri> visitor) { + // TODO(b/281044385): Maybe visit intent URIs. This may require adding a dedicated + // visitUris method in the Intent class, since it can contain other intents. Otherwise, + // the basic thing to do here would be just visitor.accept(intent.getData()). + } } /** @@ -1434,6 +1457,11 @@ public class RemoteViews implements Parcelable, Filter { public int getActionTag() { return SET_ON_CLICK_RESPONSE_TAG; } + + @Override + public void visitUris(@NonNull Consumer<Uri> visitor) { + // TODO(b/281044385): Maybe visit intent URIs in the RemoteResponse. + } } /** @@ -1504,6 +1532,11 @@ public class RemoteViews implements Parcelable, Filter { public int getActionTag() { return SET_ON_CHECKED_CHANGE_RESPONSE_TAG; } + + @Override + public void visitUris(@NonNull Consumer<Uri> visitor) { + // TODO(b/281044385): Maybe visit intent URIs in the RemoteResponse. + } } /** @hide **/ @@ -2063,6 +2096,7 @@ public class RemoteViews implements Parcelable, Filter { final Icon icon = (Icon) getParameterValue(null); if (icon != null) visitIconUri(icon, visitor); break; + // TODO(b/281044385): Should we do anything about type BUNDLE? } } } @@ -2812,7 +2846,7 @@ public class RemoteViews implements Parcelable, Filter { } @Override - public final void visitUris(@NonNull Consumer<Uri> visitor) { + public void visitUris(@NonNull Consumer<Uri> visitor) { mNestedViews.visitUris(visitor); } } @@ -7262,6 +7296,15 @@ public class RemoteViews implements Parcelable, Filter { Math.max(mViewTypeCount, 1)); } } + + /** + * See {@link RemoteViews#visitUris(Consumer)}. + */ + private void visitUris(@NonNull Consumer<Uri> visitor) { + for (RemoteViews view : mViews) { + view.visitUris(visitor); + } + } } /** diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 73778900399c..7cfd35b07547 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -18,7 +18,7 @@ flag { name: "dimmer_refactor" namespace: "windowing_frontend" description: "Refactor dim to fix flickers" - bug: "281632483,295291019" + bug: "295291019" is_fixed_read_only: true } diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index 4e7bfe50cd30..71bbccb3d989 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -259,7 +259,7 @@ public class PlatLogoActivity extends Activity { } return true; } - return false; + return super.onKeyDown(keyCode,event); } @Override @@ -268,7 +268,7 @@ public class PlatLogoActivity extends Activity { stopWarp(); return true; } - return false; + return super.onKeyUp(keyCode,event); } private void startWarp() { diff --git a/core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java b/core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java index b1d22e069d9d..77e150239803 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java @@ -81,11 +81,6 @@ public class SystemUiSystemPropertiesFlags { public static final Flag PROPAGATE_CHANNEL_UPDATES_TO_CONVERSATIONS = releasedFlag( "persist.sysui.notification.propagate_channel_updates_to_conversations"); - // TODO: b/291907312 - remove feature flags - /** Gating the NMS->NotificationAttentionHelper buzzBeepBlink refactor */ - public static final Flag ENABLE_ATTENTION_HELPER_REFACTOR = devFlag( - "persist.debug.sysui.notification.enable_attention_helper_refactor"); - // TODO b/291899544: for released flags, use resource config values /** Value used by polite notif. feature */ public static final Flag NOTIF_COOLDOWN_T1 = devFlag( diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 6e836e077e44..7e9cef720a13 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -40,6 +40,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_SEARCH_RESULT; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_QUICK_SWITCH; +import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNFOLD_ANIM; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_CLOCK_MOVE_ANIMATION; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_LAUNCH_CAMERA; @@ -273,7 +274,9 @@ public class InteractionJankMonitor { public static final int CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER = 82; - private static final int LAST_CUJ = CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER; + public static final int CUJ_LAUNCHER_UNFOLD_ANIM = 83; + + private static final int LAST_CUJ = CUJ_LAUNCHER_UNFOLD_ANIM; private static final int NO_STATSD_LOGGING = -1; // Used to convert CujType to InteractionType enum value for statsd logging. @@ -366,6 +369,7 @@ public class InteractionJankMonitor { CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_SHOW_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_SHOW_ANIMATION; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_HIDE_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_HIDE_ANIMATION; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_DOUBLE_TAP_DIVIDER; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_UNFOLD_ANIM] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNFOLD_ANIM; } private static class InstanceHolder { @@ -468,6 +472,7 @@ public class InteractionJankMonitor { CUJ_IME_INSETS_SHOW_ANIMATION, CUJ_IME_INSETS_HIDE_ANIMATION, CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER, + CUJ_LAUNCHER_UNFOLD_ANIM, }) @Retention(RetentionPolicy.SOURCE) public @interface CujType { @@ -1101,6 +1106,8 @@ public class InteractionJankMonitor { return "IME_INSETS_HIDE_ANIMATION"; case CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER: return "SPLIT_SCREEN_DOUBLE_TAP_DIVIDER"; + case CUJ_LAUNCHER_UNFOLD_ANIM: + return "LAUNCHER_UNFOLD_ANIM"; } return "UNKNOWN"; } diff --git a/core/java/com/android/internal/widget/ILockSettings.aidl b/core/java/com/android/internal/widget/ILockSettings.aidl index 406505517bcc..82367834f93d 100644 --- a/core/java/com/android/internal/widget/ILockSettings.aidl +++ b/core/java/com/android/internal/widget/ILockSettings.aidl @@ -108,4 +108,5 @@ interface ILockSettings { boolean removeWeakEscrowToken(long handle, int userId); boolean isWeakEscrowTokenActive(long handle, int userId); boolean isWeakEscrowTokenValid(long handle, in byte[] token, int userId); + void unlockUserKeyIfUnsecured(int userId); } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index d5b8f62aaf2b..a3e27062fa7b 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -1933,8 +1933,23 @@ public class LockPatternUtils { } } + /** + * Unlocks the credential-encrypted storage for the given user if the user is not secured, i.e. + * doesn't have an LSKF. + * <p> + * Whether the storage has been unlocked can be determined by + * {@link StorageManager#isUserKeyUnlocked()}. + * + * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. + * + * @param userId the ID of the user whose storage to unlock + */ public void unlockUserKeyIfUnsecured(@UserIdInt int userId) { - getLockSettingsInternal().unlockUserKeyIfUnsecured(userId); + try { + getLockSettings().unlockUserKeyIfUnsecured(userId); + } catch (RemoteException re) { + re.rethrowFromSystemServer(); + } } public void createNewUser(@UserIdInt int userId, int userSerialNumber) { diff --git a/core/java/com/android/internal/widget/LockSettingsInternal.java b/core/java/com/android/internal/widget/LockSettingsInternal.java index 6063c90d6ab9..8114e1fd3bb0 100644 --- a/core/java/com/android/internal/widget/LockSettingsInternal.java +++ b/core/java/com/android/internal/widget/LockSettingsInternal.java @@ -60,17 +60,6 @@ public abstract class LockSettingsInternal { public abstract void onThirdPartyAppsStarted(); /** - * Unlocks the credential-encrypted storage for the given user if the user is not secured, i.e. - * doesn't have an LSKF. - * <p> - * This doesn't throw an exception on failure; whether the storage has been unlocked can be - * determined by {@link StorageManager#isUserKeyUnlocked()}. - * - * @param userId the ID of the user whose storage to unlock - */ - public abstract void unlockUserKeyIfUnsecured(@UserIdInt int userId); - - /** * Creates the locksettings state for a new user. * <p> * This includes creating a synthetic password and protecting it with an empty LSKF. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index cffbaa75ab76..6daa5b934284 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5668,7 +5668,8 @@ android:description="@string/permdesc_deliverCompanionMessages" android:protectionLevel="normal" /> - <!-- @hide @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES) + <!-- @hide @FlaggedApi("android.companion.flags.companion_transport_apis") + @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES) Allows an application to send and receive messages via CDM transports. --> <permission android:name="android.permission.USE_COMPANION_TRANSPORTS" @@ -7143,7 +7144,7 @@ {@link ActivityOptions#makeRemoteAnimation} @hide <p>Not for use by third-party applications. --> <permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" - android:protectionLevel="signature|privileged" /> + android:protectionLevel="signature|privileged|recents" /> <!-- Allows an application to watch changes and/or active state of app ops. @hide <p>Not for use by third-party applications. --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 929133f792c0..5a1f2d1ae680 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5548,6 +5548,14 @@ <!-- Add packages here --> </string-array> + <!-- Enable pause wallpaper rendering upon state change such as app launch --> + <bool name="config_pauseWallpaperRenderWhenStateChangeEnabled">false</bool> + + <!-- The list of packages to pause wallpaper rendering upon state change such as app launch --> + <string-array name="pause_wallpaper_render_when_state_change" translatable="false"> + <!-- Add packages here --> + </string-array> + <!-- Whether or not to hide the navigation bar when the soft keyboard is visible in order to create additional screen real estate outside beyond the keyboard. Note that the user needs to have a confirmed way to dismiss the keyboard when desired. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2b9194f8c54e..8e1c09ede581 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4308,6 +4308,8 @@ <java-symbol type="string" name="config_factoryResetPackage" /> <java-symbol type="array" name="config_highRefreshRateBlacklist" /> <java-symbol type="array" name="config_forceSlowJpegModeList" /> + <java-symbol type="array" name="pause_wallpaper_render_when_state_change" /> + <java-symbol type="bool" name="config_pauseWallpaperRenderWhenStateChangeEnabled" /> <java-symbol type="array" name="config_smallAreaDetectionAllowlist" /> diff --git a/core/tests/coretests/src/android/view/OWNERS b/core/tests/coretests/src/android/view/OWNERS index 2ca99943a8a0..23668a4b2afb 100644 --- a/core/tests/coretests/src/android/view/OWNERS +++ b/core/tests/coretests/src/android/view/OWNERS @@ -20,4 +20,7 @@ per-file *ContentRecord* = file:/services/core/java/com/android/server/wm/OWNER per-file *ScrollCapture*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS # Stylus -per-file stylus/* = file:/core/java/android/text/OWNERS
\ No newline at end of file +per-file stylus/* = file:/core/java/android/text/OWNERS + +# View +file:/core/java/android/view/OWNERS
\ No newline at end of file diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index c72a42cce2bd..187964947b94 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -151,6 +151,7 @@ android_library { static_libs: [ "androidx.appcompat_appcompat", "androidx.core_core-animation", + "androidx.core_core-ktx", "androidx.arch.core_core-runtime", "androidx-constraintlayout_constraintlayout", "androidx.dynamicanimation_dynamicanimation", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java index 389db62ef9d2..dadd264596fb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java @@ -18,6 +18,7 @@ package com.android.wm.shell.windowdecor; import android.graphics.PointF; import android.graphics.Rect; +import android.view.Surface; import android.view.SurfaceControl; import android.window.WindowContainerTransaction; @@ -45,6 +46,7 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { private final int mDisallowedAreaForEndBoundsHeight; private boolean mHasDragResized; private int mCtrlType; + @Surface.Rotation private int mRotation; FluidResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, WindowDecoration windowDecoration, DisplayController displayController, int disallowedAreaForEndBoundsHeight) { @@ -78,7 +80,10 @@ class FluidResizeTaskPositioner implements DragPositioningCallback { mTaskOrganizer.applyTransaction(wct); } mRepositionTaskBounds.set(mTaskBoundsAtDragStart); - if (mStableBounds.isEmpty()) { + int rotation = mWindowDecoration + .mTaskInfo.configuration.windowConfiguration.getDisplayRotation(); + if (mStableBounds.isEmpty() || mRotation != rotation) { + mRotation = rotation; mDisplayController.getDisplayLayout(mWindowDecoration.mDisplay.getDisplayId()) .getStableBounds(mStableBounds); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java index 303954a2d9fb..852c037baad5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java @@ -21,6 +21,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE; import android.graphics.PointF; import android.graphics.Rect; import android.os.IBinder; +import android.view.Surface; import android.view.SurfaceControl; import android.window.TransitionInfo; import android.window.TransitionRequestInfo; @@ -58,6 +59,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, private final int mDisallowedAreaForEndBoundsHeight; private final Supplier<SurfaceControl.Transaction> mTransactionSupplier; private int mCtrlType; + @Surface.Rotation private int mRotation; public VeiledResizeTaskPositioner(ShellTaskOrganizer taskOrganizer, DesktopModeWindowDecoration windowDecoration, DisplayController displayController, @@ -98,7 +100,10 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, } mDragStartListener.onDragStart(mDesktopWindowDecoration.mTaskInfo.taskId); mRepositionTaskBounds.set(mTaskBoundsAtDragStart); - if (mStableBounds.isEmpty()) { + int rotation = mDesktopWindowDecoration + .mTaskInfo.configuration.windowConfiguration.getDisplayRotation(); + if (mStableBounds.isEmpty() || mRotation != rotation) { + mRotation = rotation; mDisplayController.getDisplayLayout(mDesktopWindowDecoration.mDisplay.getDisplayId()) .getStableBounds(mStableBounds); } diff --git a/libs/WindowManager/Shell/tests/flicker/Android.bp b/libs/WindowManager/Shell/tests/flicker/Android.bp index 7f020725d61f..e111edc96580 100644 --- a/libs/WindowManager/Shell/tests/flicker/Android.bp +++ b/libs/WindowManager/Shell/tests/flicker/Android.bp @@ -39,7 +39,25 @@ filegroup { } filegroup { - name: "WMShellFlickerTestsPip-src", + name: "WMShellFlickerTestsPip1-src", + srcs: [ + "src/com/android/wm/shell/flicker/pip/A*.kt", + "src/com/android/wm/shell/flicker/pip/B*.kt", + "src/com/android/wm/shell/flicker/pip/C*.kt", + "src/com/android/wm/shell/flicker/pip/D*.kt", + "src/com/android/wm/shell/flicker/pip/S*.kt", + ], +} + +filegroup { + name: "WMShellFlickerTestsPip2-src", + srcs: [ + "src/com/android/wm/shell/flicker/pip/E*.kt", + ], +} + +filegroup { + name: "WMShellFlickerTestsPip3-src", srcs: ["src/com/android/wm/shell/flicker/pip/*.kt"], } @@ -176,7 +194,9 @@ android_test { ], exclude_srcs: [ ":WMShellFlickerTestsBubbles-src", - ":WMShellFlickerTestsPip-src", + ":WMShellFlickerTestsPip1-src", + ":WMShellFlickerTestsPip2-src", + ":WMShellFlickerTestsPip3-src", ":WMShellFlickerTestsPipCommon-src", ":WMShellFlickerTestsPipApps-src", ":WMShellFlickerTestsSplitScreenGroup1-src", @@ -207,12 +227,55 @@ android_test { instrumentation_target_package: "com.android.wm.shell.flicker.pip", srcs: [ ":WMShellFlickerTestsBase-src", - ":WMShellFlickerTestsPip-src", + ":WMShellFlickerTestsPip3-src", ":WMShellFlickerTestsPipCommon-src", ], } android_test { + name: "WMShellFlickerTestsPip1", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestPip.xml"], + package_name: "com.android.wm.shell.flicker.pip", + instrumentation_target_package: "com.android.wm.shell.flicker.pip", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsPip1-src", + ":WMShellFlickerTestsPipCommon-src", + ], +} + +android_test { + name: "WMShellFlickerTestsPip2", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestPip.xml"], + package_name: "com.android.wm.shell.flicker.pip", + instrumentation_target_package: "com.android.wm.shell.flicker.pip", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsPip2-src", + ":WMShellFlickerTestsPipCommon-src", + ], +} + +android_test { + name: "WMShellFlickerTestsPip3", + defaults: ["WMShellFlickerTestsDefault"], + additional_manifests: ["manifests/AndroidManifestPip.xml"], + package_name: "com.android.wm.shell.flicker.pip", + instrumentation_target_package: "com.android.wm.shell.flicker.pip", + srcs: [ + ":WMShellFlickerTestsBase-src", + ":WMShellFlickerTestsPip3-src", + ":WMShellFlickerTestsPipCommon-src", + ], + exclude_srcs: [ + ":WMShellFlickerTestsPip1-src", + ":WMShellFlickerTestsPip2-src", + ], +} + +android_test { name: "WMShellFlickerTestsPipApps", defaults: ["WMShellFlickerTestsDefault"], additional_manifests: ["manifests/AndroidManifestPip.xml"], diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt index 19c8435facaf..94e3959782ed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt @@ -22,6 +22,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.LegacyFlickerTest import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice +import com.android.wm.shell.flicker.pip.common.EnterPipTransition import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -55,7 +56,7 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : - EnterPipViaAppUiButtonTest(flicker) { + EnterPipTransition(flicker) { override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } } override val defaultEnterPip: FlickerBuilder.() -> Unit = { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt index c0c4498e3ebf..add78b2ee8b3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt @@ -6,6 +6,9 @@ import android.graphics.Rect import android.os.IBinder import android.testing.AndroidTestingRunner import android.view.Display +import android.view.Surface +import android.view.Surface.ROTATION_270 +import android.view.Surface.ROTATION_90 import android.view.SurfaceControl import android.window.WindowContainerToken import android.window.WindowContainerTransaction @@ -24,6 +27,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.eq import org.mockito.Mock +import org.mockito.Mockito import org.mockito.Mockito.any import org.mockito.Mockito.argThat import org.mockito.Mockito.never @@ -76,7 +80,15 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { whenever(mockDisplayController.getDisplayLayout(DISPLAY_ID)).thenReturn(mockDisplayLayout) whenever(mockDisplayLayout.densityDpi()).thenReturn(DENSITY_DPI) whenever(mockDisplayLayout.getStableBounds(any())).thenAnswer { i -> - (i.arguments.first() as Rect).set(STABLE_BOUNDS) + if (mockWindowDecoration.mTaskInfo.configuration.windowConfiguration + .displayRotation == ROTATION_90 || + mockWindowDecoration.mTaskInfo.configuration.windowConfiguration + .displayRotation == ROTATION_270 + ) { + (i.arguments.first() as Rect).set(STABLE_BOUNDS_LANDSCAPE) + } else { + (i.arguments.first() as Rect).set(STABLE_BOUNDS_PORTRAIT) + } } `when`(mockDisplayLayout.stableInsets()).thenReturn(STABLE_INSETS) `when`(mockTransactionFactory.get()).thenReturn(mockTransaction) @@ -89,6 +101,7 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { defaultMinSize = DEFAULT_MIN displayId = DISPLAY_ID configuration.windowConfiguration.setBounds(STARTING_BOUNDS) + configuration.windowConfiguration.displayRotation = ROTATION_90 } mockWindowDecoration.mDisplay = mockDisplay whenever(mockDisplay.displayId).thenAnswer { DISPLAY_ID } @@ -623,7 +636,7 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { ) val newX = STARTING_BOUNDS.left.toFloat() - val newY = STABLE_BOUNDS.top.toFloat() - 5 + val newY = STABLE_BOUNDS_LANDSCAPE.top.toFloat() - 5 taskPositioner.onDragPositioningMove( newX, newY @@ -641,9 +654,81 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { token == taskBinder && (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && change.configuration.windowConfiguration.bounds.top == - STABLE_BOUNDS.top + STABLE_BOUNDS_LANDSCAPE.top + } + }) + } + + @Test + fun testDragResize_drag_updatesStableBoundsOnRotate() { + // Test landscape stable bounds + performDrag(STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat() + 2000, + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + val rectAfterDrag = Rect(STARTING_BOUNDS) + rectAfterDrag.right += 2000 + // First drag; we should fetch stable bounds. + verify(mockDisplayLayout, Mockito.times(1)).getStableBounds(any()) + verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds == rectAfterDrag + } + }) + // Drag back to starting bounds. + performDrag( + STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + + // Display did not rotate; we should use previous stable bounds + verify(mockDisplayLayout, Mockito.times(1)).getStableBounds(any()) + + // Rotate the screen to portrait + mockWindowDecoration.mTaskInfo.apply { + configuration.windowConfiguration.displayRotation = Surface.ROTATION_0 + } + // Test portrait stable bounds + performDrag( + STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat() + 2000, + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + rectAfterDrag.right -= 2000 + rectAfterDrag.bottom += 2000 + + verify(mockShellTaskOrganizer).applyTransaction(argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds == rectAfterDrag } }) + // Display has rotated; we expect a new stable bounds. + verify(mockDisplayLayout, Mockito.times(2)).getStableBounds(any()) + } + + private fun performDrag( + startX: Float, + startY: Float, + endX: Float, + endY: Float, + ctrlType: Int + ) { + taskPositioner.onDragPositioningStart( + ctrlType, + startX, + startY + ) + taskPositioner.onDragPositioningMove( + endX, + endY + ) + + taskPositioner.onDragPositioningEnd( + endX, + endY + ) } companion object { @@ -664,11 +749,17 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { DISPLAY_BOUNDS.bottom - NAVBAR_HEIGHT, DISPLAY_BOUNDS.right, DISPLAY_BOUNDS.bottom) - private val STABLE_BOUNDS = Rect( + private val STABLE_BOUNDS_LANDSCAPE = Rect( DISPLAY_BOUNDS.left, DISPLAY_BOUNDS.top + CAPTION_HEIGHT, DISPLAY_BOUNDS.right, DISPLAY_BOUNDS.bottom - NAVBAR_HEIGHT ) + private val STABLE_BOUNDS_PORTRAIT = Rect( + DISPLAY_BOUNDS.top, + DISPLAY_BOUNDS.left + CAPTION_HEIGHT, + DISPLAY_BOUNDS.bottom, + DISPLAY_BOUNDS.right - NAVBAR_HEIGHT + ) } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt index 8913453aa578..a70ebf14324a 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt @@ -21,6 +21,9 @@ import android.graphics.Rect import android.os.IBinder import android.testing.AndroidTestingRunner import android.view.Display +import android.view.Surface.ROTATION_0 +import android.view.Surface.ROTATION_270 +import android.view.Surface.ROTATION_90 import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CHANGE import android.window.WindowContainerToken @@ -30,6 +33,7 @@ import com.android.wm.shell.ShellTestCase import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayLayout import com.android.wm.shell.transition.Transitions +import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_BOTTOM import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_RIGHT import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_TOP import com.android.wm.shell.windowdecor.DragPositioningCallback.CTRL_TYPE_UNDEFINED @@ -93,10 +97,17 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { whenever(mockDisplayController.getDisplayLayout(DISPLAY_ID)).thenReturn(mockDisplayLayout) whenever(mockDisplayLayout.densityDpi()).thenReturn(DENSITY_DPI) whenever(mockDisplayLayout.getStableBounds(any())).thenAnswer { i -> - (i.arguments.first() as Rect).set(STABLE_BOUNDS) + if (mockDesktopWindowDecoration.mTaskInfo.configuration.windowConfiguration + .displayRotation == ROTATION_90 || + mockDesktopWindowDecoration.mTaskInfo.configuration.windowConfiguration + .displayRotation == ROTATION_270 + ) { + (i.arguments.first() as Rect).set(STABLE_BOUNDS_LANDSCAPE) + } else { + (i.arguments.first() as Rect).set(STABLE_BOUNDS_PORTRAIT) + } } `when`(mockTransactionFactory.get()).thenReturn(mockTransaction) - mockDesktopWindowDecoration.mTaskInfo = ActivityManager.RunningTaskInfo().apply { taskId = TASK_ID token = taskToken @@ -105,6 +116,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { defaultMinSize = DEFAULT_MIN displayId = DISPLAY_ID configuration.windowConfiguration.setBounds(STARTING_BOUNDS) + configuration.windowConfiguration.displayRotation = ROTATION_90 } mockDesktopWindowDecoration.mDisplay = mockDisplay whenever(mockDisplay.displayId).thenAnswer { DISPLAY_ID } @@ -343,7 +355,7 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { ) val newX = STARTING_BOUNDS.left.toFloat() - val newY = STABLE_BOUNDS.top.toFloat() - 5 + val newY = STABLE_BOUNDS_LANDSCAPE.top.toFloat() - 5 taskPositioner.onDragPositioningMove( newX, newY @@ -361,11 +373,79 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { token == taskBinder && (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && change.configuration.windowConfiguration.bounds.top == - STABLE_BOUNDS.top + STABLE_BOUNDS_LANDSCAPE.top } }) } + @Test + fun testDragResize_drag_updatesStableBoundsOnRotate() { + // Test landscape stable bounds + performDrag(STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat() + 2000, + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + val rectAfterDrag = Rect(STARTING_BOUNDS) + rectAfterDrag.right += 2000 + // First drag; we should fetch stable bounds. + verify(mockDisplayLayout, times(1)).getStableBounds(any()) + verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds == rectAfterDrag}}, + eq(taskPositioner)) + // Drag back to starting bounds. + performDrag(STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + + // Display did not rotate; we should use previous stable bounds + verify(mockDisplayLayout, times(1)).getStableBounds(any()) + + // Rotate the screen to portrait + mockDesktopWindowDecoration.mTaskInfo.apply { + configuration.windowConfiguration.displayRotation = ROTATION_0 + } + // Test portrait stable bounds + performDrag(STARTING_BOUNDS.right.toFloat(), STARTING_BOUNDS.bottom.toFloat(), + STARTING_BOUNDS.right.toFloat() + 2000, STARTING_BOUNDS.bottom.toFloat() + 2000, + CTRL_TYPE_RIGHT or CTRL_TYPE_BOTTOM) + rectAfterDrag.right -= 2000 + rectAfterDrag.bottom += 2000 + + verify(mockTransitions).startTransition(eq(TRANSIT_CHANGE), argThat { wct -> + return@argThat wct.changes.any { (token, change) -> + token == taskBinder && + (change.windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0 && + change.configuration.windowConfiguration.bounds == rectAfterDrag}}, + eq(taskPositioner)) + // Display has rotated; we expect a new stable bounds. + verify(mockDisplayLayout, times(2)).getStableBounds(any()) + } + + private fun performDrag( + startX: Float, + startY: Float, + endX: Float, + endY: Float, + ctrlType: Int + ) { + taskPositioner.onDragPositioningStart( + ctrlType, + startX, + startY + ) + taskPositioner.onDragPositioningMove( + endX, + endY + ) + + taskPositioner.onDragPositioningEnd( + endX, + endY + ) + } + companion object { private const val TASK_ID = 5 private const val MIN_WIDTH = 10 @@ -378,11 +458,17 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { private const val DISALLOWED_AREA_FOR_END_BOUNDS_HEIGHT = 10 private val DISPLAY_BOUNDS = Rect(0, 0, 2400, 1600) private val STARTING_BOUNDS = Rect(100, 100, 200, 200) - private val STABLE_BOUNDS = Rect( + private val STABLE_BOUNDS_LANDSCAPE = Rect( DISPLAY_BOUNDS.left, DISPLAY_BOUNDS.top + CAPTION_HEIGHT, DISPLAY_BOUNDS.right, DISPLAY_BOUNDS.bottom - NAVBAR_HEIGHT ) + private val STABLE_BOUNDS_PORTRAIT = Rect( + DISPLAY_BOUNDS.top, + DISPLAY_BOUNDS.left + CAPTION_HEIGHT, + DISPLAY_BOUNDS.bottom, + DISPLAY_BOUNDS.right - NAVBAR_HEIGHT + ) } } diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/EntryHighlight.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/EntryHighlight.kt index 90c44b549df9..330755c0b419 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/EntryHighlight.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/EntryHighlight.kt @@ -30,11 +30,11 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import com.android.settingslib.spa.framework.common.LocalEntryDataProvider -import com.android.settingslib.spa.framework.theme.SettingsTheme @Composable -internal fun EntryHighlight(UiLayoutFn: @Composable () -> Unit) { +internal fun EntryHighlight(content: @Composable () -> Unit) { val entryData = LocalEntryDataProvider.current val entryIsHighlighted = rememberSaveable { entryData.isHighlighted } var localHighlighted by rememberSaveable { mutableStateOf(false) } @@ -45,15 +45,16 @@ internal fun EntryHighlight(UiLayoutFn: @Composable () -> Unit) { val backgroundColor by animateColorAsState( targetValue = when { localHighlighted -> MaterialTheme.colorScheme.surfaceVariant - else -> SettingsTheme.colorScheme.background + else -> Color.Transparent }, animationSpec = repeatable( iterations = 3, animation = tween(durationMillis = 500), repeatMode = RepeatMode.Restart - ) + ), + label = "BackgroundColorAnimation", ) Box(modifier = Modifier.background(color = backgroundColor)) { - UiLayoutFn() + content() } } diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING index 03f7c9968a1d..de73b77b21a3 100644 --- a/packages/SystemUI/TEST_MAPPING +++ b/packages/SystemUI/TEST_MAPPING @@ -32,22 +32,6 @@ ] }, { - "name": "SystemUIGoogleScreenshotTests", - "options": [ - { - "exclude-annotation": "org.junit.Ignore" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.Postsubmit" - } - ], - // The test doesn't run on AOSP Cuttlefish - "keywords": ["internal"] - }, - { // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+) "name": "SystemUIGoogleBiometricsScreenshotTests", "options": [ diff --git a/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt b/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt index c6e429a79e86..ddd1c67bd5fa 100644 --- a/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt +++ b/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt @@ -72,6 +72,10 @@ object ComposeFacade : BaseComposeFacade { throwComposeUnavailableError() } + override fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View { + throwComposeUnavailableError() + } + private fun throwComposeUnavailableError(): Nothing { error( "Compose is not available. Make sure to check isComposeAvailable() before calling any" + diff --git a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt index 1722685f4287..eeda6c63b68f 100644 --- a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt +++ b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt @@ -30,6 +30,7 @@ import com.android.compose.theme.PlatformTheme import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation import com.android.systemui.common.ui.compose.windowinsets.DisplayCutout import com.android.systemui.common.ui.compose.windowinsets.DisplayCutoutProvider +import com.android.systemui.communal.ui.compose.CommunalContainer import com.android.systemui.communal.ui.compose.CommunalHub import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.people.ui.compose.PeopleScreen @@ -104,6 +105,12 @@ object ComposeFacade : BaseComposeFacade { } } + override fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View { + return ComposeView(context).apply { + setContent { PlatformTheme { CommunalContainer(viewModel = viewModel) } } + } + } + // TODO(b/298525212): remove once Compose exposes window inset bounds. private fun displayCutoutFromWindowInsets( scope: CoroutineScope, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt new file mode 100644 index 000000000000..46d418a03c00 --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -0,0 +1,123 @@ +package com.android.systemui.communal.ui.compose + +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.android.compose.animation.scene.Edge +import com.android.compose.animation.scene.ElementKey +import com.android.compose.animation.scene.SceneKey +import com.android.compose.animation.scene.SceneScope +import com.android.compose.animation.scene.SceneTransitionLayout +import com.android.compose.animation.scene.Swipe +import com.android.compose.animation.scene.transitions +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel + +object Scenes { + val Blank = SceneKey(name = "blank") + val Communal = SceneKey(name = "communal") +} + +object Communal { + object Elements { + val Content = ElementKey("CommunalContent") + } +} + +val sceneTransitions = transitions { + from(Scenes.Blank, to = Scenes.Communal) { + spec = tween(durationMillis = 500) + + translate(Communal.Elements.Content, Edge.Right) + fade(Communal.Elements.Content) + } +} + +/** + * View containing a [SceneTransitionLayout] that shows the communal UI and handles transitions. + * + * This is a temporary container to allow the communal UI to use [SceneTransitionLayout] for gesture + * handling and transitions before the full Flexiglass layout is ready. + */ +@Composable +fun CommunalContainer(modifier: Modifier = Modifier, viewModel: CommunalViewModel) { + val (currentScene, setCurrentScene) = remember { mutableStateOf(Scenes.Blank) } + + // Failsafe to hide the whole SceneTransitionLayout in case of bugginess. + var showSceneTransitionLayout by remember { mutableStateOf(true) } + if (!showSceneTransitionLayout) { + return + } + + SceneTransitionLayout( + modifier = modifier.fillMaxSize(), + currentScene = currentScene, + onChangeScene = setCurrentScene, + transitions = sceneTransitions, + ) { + scene(Scenes.Blank, userActions = mapOf(Swipe.Left to Scenes.Communal)) { + BlankScene { showSceneTransitionLayout = false } + } + + scene( + Scenes.Communal, + userActions = mapOf(Swipe.Right to Scenes.Blank), + ) { + CommunalScene(viewModel, modifier = modifier) + } + } +} + +/** + * Blank scene that shows over keyguard/dream. This scene will eventually show nothing at all and is + * only used to allow for transitions to the communal scene. + */ +@Composable +private fun BlankScene( + modifier: Modifier = Modifier, + hideSceneTransitionLayout: () -> Unit, +) { + Box(modifier.fillMaxSize()) { + Column( + Modifier.fillMaxHeight() + .width(100.dp) + .align(Alignment.CenterEnd) + .background(Color(0x55e9f2eb)), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("Default scene") + + IconButton(onClick = hideSceneTransitionLayout) { + Icon(Icons.Filled.Close, contentDescription = "Close button") + } + } + } +} + +/** Scene containing the glanceable hub UI. */ +@Composable +private fun SceneScope.CommunalScene( + viewModel: CommunalViewModel, + modifier: Modifier = Modifier, +) { + Box(modifier.element(Communal.Elements.Content)) { CommunalHub(viewModel = viewModel) } +} diff --git a/packages/SystemUI/res/layout/super_notification_shade.xml b/packages/SystemUI/res/layout/super_notification_shade.xml index acee4258b64d..8957903b29d4 100644 --- a/packages/SystemUI/res/layout/super_notification_shade.xml +++ b/packages/SystemUI/res/layout/super_notification_shade.xml @@ -83,6 +83,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + <!-- Placeholder for the communal UI that will be replaced if the feature is enabled. --> + <ViewStub + android:id="@+id/communal_ui_stub" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <include layout="@layout/brightness_mirror_container" /> <com.android.systemui.scrim.ScrimView diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 9ac1e9f58dbc..572f6ff2745e 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -531,19 +531,25 @@ </string> <!-- A path similar to frameworks/base/core/res/res/values/config.xml - config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display - cutout. If present as well as config_enableDisplayCutoutProtection is set to true, then - SystemUI will draw this "protection path" instead of the display cutout path that is normally - used for anti-aliasing. + config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a outer + display cutout. If present as well as config_enableDisplayCutoutProtection is set to true, + then SystemUI will draw this "protection path" instead of the display cutout path that is + normally used for anti-aliasing. This path will only be drawn when the front-facing camera turns on, otherwise the main DisplayCutout path will be rendered --> <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"></string> - <!-- ID for the camera that needs extra protection --> + <!-- ID for the camera of outer display that needs extra protection --> <string translatable="false" name="config_protectedCameraId"></string> + <!-- Similar to config_frontBuiltInDisplayCutoutProtection but for inner display. --> + <string translatable="false" name="config_innerBuiltInDisplayCutoutProtection"></string> + + <!-- ID for the camera of inner display that needs extra protection --> + <string translatable="false" name="config_protectedInnerCameraId"></string> + <!-- Comma-separated list of packages to exclude from camera protection e.g. "com.android.systemui,com.android.xyz" --> <string translatable="false" name="config_cameraProtectionExcludedPackages"></string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java index 1e896142f718..400f6529eed6 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java @@ -702,13 +702,18 @@ public class RotationButtonController { @Override public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) { - // Only hide the icon if the top task changes its requestedOrientation - // Launcher can alter its requestedOrientation while it's not on top, don't hide on this - Optional.ofNullable(ActivityManagerWrapper.getInstance()) - .map(ActivityManagerWrapper::getRunningTask) - .ifPresent(a -> { - if (a.id == taskId) setRotateSuggestionButtonState(false /* visible */); - }); + mBgExecutor.execute(() -> { + // Only hide the icon if the top task changes its requestedOrientation Launcher can + // alter its requestedOrientation while it's not on top, don't hide on this + Optional.ofNullable(ActivityManagerWrapper.getInstance()) + .map(ActivityManagerWrapper::getRunningTask) + .ifPresent(a -> { + if (a.id == taskId) { + mMainThreadHandler.post(() -> + setRotateSuggestionButtonState(false /* visible */)); + } + }); + }); } } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java index eb2066936088..c505bd502985 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java @@ -61,6 +61,8 @@ public final class InteractionJankMonitorWrapper { InteractionJankMonitor.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS; public static final int CUJ_OPEN_SEARCH_RESULT = InteractionJankMonitor.CUJ_LAUNCHER_OPEN_SEARCH_RESULT; + public static final int CUJ_LAUNCHER_UNFOLD_ANIM = + InteractionJankMonitor.CUJ_LAUNCHER_UNFOLD_ANIM; @IntDef({ CUJ_APP_LAUNCH_FROM_RECENTS, @@ -77,6 +79,7 @@ public final class InteractionJankMonitorWrapper { CUJ_CLOSE_ALL_APPS_SWIPE, CUJ_CLOSE_ALL_APPS_TO_HOME, CUJ_OPEN_SEARCH_RESULT, + CUJ_LAUNCHER_UNFOLD_ANIM, }) @Retention(RetentionPolicy.SOURCE) public @interface CujType { diff --git a/packages/SystemUI/src/com/android/systemui/CameraAvailabilityListener.kt b/packages/SystemUI/src/com/android/systemui/CameraAvailabilityListener.kt index 2d2ebe99d651..d33d279023da 100644 --- a/packages/SystemUI/src/com/android/systemui/CameraAvailabilityListener.kt +++ b/packages/SystemUI/src/com/android/systemui/CameraAvailabilityListener.kt @@ -17,6 +17,7 @@ package com.android.systemui import android.content.Context +import android.content.res.Resources import android.graphics.Path import android.graphics.Rect import android.graphics.RectF @@ -33,37 +34,32 @@ import kotlin.math.roundToInt */ class CameraAvailabilityListener( private val cameraManager: CameraManager, - private val cutoutProtectionPath: Path, - private val targetCameraId: String, + private val cameraProtectionInfoList: List<CameraProtectionInfo>, excludedPackages: String, private val executor: Executor ) { - private var cutoutBounds = Rect() private val excludedPackageIds: Set<String> private val listeners = mutableListOf<CameraTransitionCallback>() private val availabilityCallback: CameraManager.AvailabilityCallback = object : CameraManager.AvailabilityCallback() { override fun onCameraClosed(cameraId: String) { - if (targetCameraId == cameraId) { - notifyCameraInactive() + cameraProtectionInfoList.forEach { + if (cameraId == it.cameraId) { + notifyCameraInactive() + } } } override fun onCameraOpened(cameraId: String, packageId: String) { - if (targetCameraId == cameraId && !isExcluded(packageId)) { - notifyCameraActive() + cameraProtectionInfoList.forEach { + if (cameraId == it.cameraId && !isExcluded(packageId)) { + notifyCameraActive(it) + } } } } init { - val computed = RectF() - cutoutProtectionPath.computeBounds(computed, false /* unused */) - cutoutBounds.set( - computed.left.roundToInt(), - computed.top.roundToInt(), - computed.right.roundToInt(), - computed.bottom.roundToInt()) excludedPackageIds = excludedPackages.split(",").toSet() } @@ -100,8 +96,10 @@ class CameraAvailabilityListener( cameraManager.unregisterAvailabilityCallback(availabilityCallback) } - private fun notifyCameraActive() { - listeners.forEach { it.onApplyCameraProtection(cutoutProtectionPath, cutoutBounds) } + private fun notifyCameraActive(info: CameraProtectionInfo) { + listeners.forEach { + it.onApplyCameraProtection(info.cutoutProtectionPath, info.cutoutBounds) + } } private fun notifyCameraInactive() { @@ -121,12 +119,11 @@ class CameraAvailabilityListener( val manager = context .getSystemService(Context.CAMERA_SERVICE) as CameraManager val res = context.resources - val pathString = res.getString(R.string.config_frontBuiltInDisplayCutoutProtection) - val cameraId = res.getString(R.string.config_protectedCameraId) + val cameraProtectionInfoList = loadCameraProtectionInfoList(res) val excluded = res.getString(R.string.config_cameraProtectionExcludedPackages) return CameraAvailabilityListener( - manager, pathFromString(pathString), cameraId, excluded, executor) + manager, cameraProtectionInfoList, excluded, executor) } private fun pathFromString(pathString: String): Path { @@ -140,5 +137,53 @@ class CameraAvailabilityListener( return p } + + private fun loadCameraProtectionInfoList(res: Resources): List<CameraProtectionInfo> { + val list = mutableListOf<CameraProtectionInfo>() + val front = loadCameraProtectionInfo( + res, + R.string.config_protectedCameraId, + R.string.config_frontBuiltInDisplayCutoutProtection + ) + if (front != null) { + list.add(front) + } + val inner = loadCameraProtectionInfo( + res, + R.string.config_protectedInnerCameraId, + R.string.config_innerBuiltInDisplayCutoutProtection + ) + if (inner != null) { + list.add(inner) + } + return list + } + + private fun loadCameraProtectionInfo( + res: Resources, + cameraIdRes: Int, + pathRes: Int + ): CameraProtectionInfo? { + val cameraId = res.getString(cameraIdRes) + if (cameraId == null || cameraId.isEmpty()) { + return null + } + val protectionPath = pathFromString(res.getString(pathRes)) + val computed = RectF() + protectionPath.computeBounds(computed) + val protectionBounds = Rect( + computed.left.roundToInt(), + computed.top.roundToInt(), + computed.right.roundToInt(), + computed.bottom.roundToInt() + ) + return CameraProtectionInfo(cameraId, protectionPath, protectionBounds) + } } + + data class CameraProtectionInfo ( + val cameraId: String, + val cutoutProtectionPath: Path, + val cutoutBounds: Rect + ) } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt index 054bd082edb7..8d1d90588fc3 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.systemui.biometrics import android.annotation.MainThread @@ -25,7 +41,7 @@ constructor( shadeExpansionCollectorJob = scope.launch { // wait for it to emit true once - shadeInteractorLazy.get().isAnyExpanding.first { it } + shadeInteractorLazy.get().isUserInteracting.first { it } onShadeInteraction.run() } shadeExpansionCollectorJob?.invokeOnCompletion { shadeExpansionCollectorJob = null } diff --git a/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt b/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt index 9221832b4ba1..4bdea75d9d71 100644 --- a/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt +++ b/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt @@ -79,4 +79,7 @@ interface BaseComposeFacade { context: Context, viewModel: CommunalViewModel, ): View + + /** Creates a container that hosts the communal UI and handles gesture transitions. */ + fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View } diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index ae0c8da73c40..c91c9ac119af 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -263,7 +263,7 @@ object Flags { // TODO(b/290652751): Tracking bug. @JvmField val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA = - releasedFlag("migrate_split_keyguard_bottom_area") + unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true) // TODO(b/297037052): Tracking bug. @JvmField @@ -278,7 +278,7 @@ object Flags { /** Migrate the lock icon view to the new keyguard root view. */ // TODO(b/286552209): Tracking bug. - @JvmField val MIGRATE_LOCK_ICON = releasedFlag("migrate_lock_icon") + @JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon", teamfood = true) // TODO(b/288276738): Tracking bug. @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard") @@ -776,7 +776,7 @@ object Flags { val ENABLE_NEW_PRIVACY_DIALOG = releasedFlag("enable_new_privacy_dialog") // TODO(b/289573946): Tracking Bug - @JvmField val PRECOMPUTED_TEXT = unreleasedFlag("precomputed_text", teamfood = true) + @JvmField val PRECOMPUTED_TEXT = releasedFlag("precomputed_text") // TODO(b/302087895): Tracking Bug @JvmField val CALL_LAYOUT_ASYNC_SET_DATA = unreleasedFlag("call_layout_async_set_data") diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt index 84cd3ef622ba..3eef6aa37122 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt @@ -25,6 +25,7 @@ import android.util.Log import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import java.util.UUID @@ -48,8 +49,8 @@ import kotlinx.coroutines.flow.filter * [TransitionInteractor]. These interactors will call [startTransition] and [updateTransition] on * this repository. * - * To print all transitions to logcat to help with debugging, run this command: - * adb shell settings put global systemui/buffer/KeyguardLog VERBOSE + * To print all transitions to logcat to help with debugging, run this command: adb shell settings + * put global systemui/buffer/KeyguardLog VERBOSE * * This will print all keyguard transitions to logcat with the KeyguardTransitionAuditLogger tag. */ @@ -73,11 +74,8 @@ interface KeyguardTransitionRepository { /** * Begin a transition from one state to another. Transitions are interruptible, and will issue a * [TransitionStep] with state = [TransitionState.CANCELED] before beginning the next one. - * - * When canceled, there are two options: to continue from the current position of the prior - * transition, or to reset the position. When [resetIfCanceled] == true, it will do the latter. */ - fun startTransition(info: TransitionInfo, resetIfCanceled: Boolean = false): UUID? + fun startTransition(info: TransitionInfo): UUID? /** * Allows manual control of a transition. When calling [startTransition], the consumer must pass @@ -138,10 +136,7 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio ) } - override fun startTransition( - info: TransitionInfo, - resetIfCanceled: Boolean, - ): UUID? { + override fun startTransition(info: TransitionInfo): UUID? { if (lastStep.from == info.from && lastStep.to == info.to) { Log.i(TAG, "Duplicate call to start the transition, rejecting: $info") return null @@ -149,10 +144,10 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio val startingValue = if (lastStep.transitionState != TransitionState.FINISHED) { Log.i(TAG, "Transition still active: $lastStep, canceling") - if (resetIfCanceled) { - 0f - } else { - lastStep.value + when (info.modeOnCanceled) { + TransitionModeOnCanceled.LAST_VALUE -> lastStep.value + TransitionModeOnCanceled.RESET -> 0f + TransitionModeOnCanceled.REVERSE -> 1f - lastStep.value } } else { 0f diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt index 6e0aa4c7682d..a331a668e135 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt @@ -24,6 +24,7 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor import com.android.systemui.keyguard.shared.model.BiometricUnlockModel.Companion.isWakeAndUnlock import com.android.systemui.keyguard.shared.model.DozeStateModel import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.util.kotlin.Utils.Companion.toTriple import com.android.systemui.util.kotlin.sample import javax.inject.Inject @@ -65,8 +66,21 @@ constructor( ) .collect { (_, lastStartedStep, occluded) -> if (lastStartedStep.to == KeyguardState.AOD) { - startTransitionTo( + val toState = if (occluded) KeyguardState.OCCLUDED else KeyguardState.LOCKSCREEN + val modeOnCanceled = + if ( + toState == KeyguardState.LOCKSCREEN && + lastStartedStep.from == KeyguardState.LOCKSCREEN + ) { + TransitionModeOnCanceled.REVERSE + } else { + TransitionModeOnCanceled.LAST_VALUE + } + + startTransitionTo( + toState = toState, + modeOnCanceled = modeOnCanceled, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt index c67153a5963d..eace0c70cb5b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt @@ -22,6 +22,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.util.kotlin.Utils.Companion.toTriple import com.android.systemui.util.kotlin.sample @@ -114,8 +115,9 @@ constructor( .collect { (isAsleep, lastStartedStep, isAodAvailable) -> if (lastStartedStep.to == KeyguardState.GONE && isAsleep) { startTransitionTo( - if (isAodAvailable) KeyguardState.AOD else KeyguardState.DOZING, - resetIfCancelled = true, + toState = + if (isAodAvailable) KeyguardState.AOD else KeyguardState.DOZING, + modeOnCanceled = TransitionModeOnCanceled.RESET, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt index c39a4c9c4172..d44a9d86a731 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt @@ -27,6 +27,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.KeyguardSurfaceBehindModel import com.android.systemui.keyguard.shared.model.StatusBarState.KEYGUARD import com.android.systemui.keyguard.shared.model.TransitionInfo +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.shade.data.repository.ShadeRepository @@ -340,8 +341,20 @@ constructor( ) .collect { (isAsleep, lastStartedStep, isAodAvailable) -> if (lastStartedStep.to == KeyguardState.LOCKSCREEN && isAsleep) { - startTransitionTo( + val toState = if (isAodAvailable) KeyguardState.AOD else KeyguardState.DOZING + val modeOnCanceled = + if ( + toState == KeyguardState.AOD && + lastStartedStep.from == KeyguardState.AOD + ) { + TransitionModeOnCanceled.REVERSE + } else { + TransitionModeOnCanceled.LAST_VALUE + } + startTransitionTo( + toState = toState, + modeOnCanceled = modeOnCanceled, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt index f1649fb2851e..24b666185ce2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt @@ -25,6 +25,7 @@ import com.android.systemui.flags.Flags import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.KeyguardSurfaceBehindModel +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.kotlin.Utils.Companion.toQuad @@ -236,7 +237,7 @@ constructor( getDefaultAnimatorForTransitionsToState(KeyguardState.GONE).apply { this.duration = duration.inWholeMilliseconds }, - resetIfCancelled = true + modeOnCanceled = TransitionModeOnCanceled.RESET, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt index 54c6d5f6d09f..76018080848f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/TransitionInteractor.kt @@ -21,6 +21,7 @@ import android.util.Log import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionInfo +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.util.kotlin.sample import java.util.UUID import kotlinx.coroutines.CoroutineScope @@ -49,7 +50,7 @@ sealed class TransitionInteractor( fun startTransitionTo( toState: KeyguardState, animator: ValueAnimator? = getDefaultAnimatorForTransitionsToState(toState), - resetIfCancelled: Boolean = false, + modeOnCanceled: TransitionModeOnCanceled = TransitionModeOnCanceled.LAST_VALUE ): UUID? { if ( fromState != transitionInteractor.startedKeyguardState.value && @@ -73,8 +74,8 @@ sealed class TransitionInteractor( fromState, toState, animator, - ), - resetIfCancelled + modeOnCanceled, + ) ) } @@ -91,8 +92,8 @@ sealed class TransitionInteractor( // so use the last finishedKeyguardState to determine the overriding FROM state if (finishedKeyguardState == fromState) { startTransitionTo( - KeyguardState.OCCLUDED, - resetIfCancelled = true, + toState = KeyguardState.OCCLUDED, + modeOnCanceled = TransitionModeOnCanceled.RESET, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionInfo.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionInfo.kt index bfccf3fe076c..7a37365a9cbe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionInfo.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionInfo.kt @@ -22,7 +22,13 @@ data class TransitionInfo( val ownerName: String, val from: KeyguardState, val to: KeyguardState, - val animator: ValueAnimator?, // 'null' animator signal manual control + /** [null] animator signals manual control, otherwise transition run by the animator */ + val animator: ValueAnimator?, + /** + * If the transition resets in the cancellation of another transition, use this mode to + * determine how to continue. + */ + val modeOnCanceled: TransitionModeOnCanceled = TransitionModeOnCanceled.LAST_VALUE, ) { override fun toString(): String = "TransitionInfo(ownerName=$ownerName, from=$from, to=$to, " + diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/QSTilesDefaultLog.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionModeOnCanceled.kt index 6575cdd69c93..56f90bdb4f71 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/QSTilesDefaultLog.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/TransitionModeOnCanceled.kt @@ -11,18 +11,16 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License */ -package com.android.systemui.log.dagger +package com.android.systemui.keyguard.shared.model -import javax.inject.Qualifier - -/** - * A default [com.android.systemui.log.LogBuffer] for QS tiles messages. It's used exclusively in - * [com.android.systemui.qs.tiles.base.logging.QSTileLogger]. If you need to increase it for you - * tile, add one to the map provided by the [QSTilesLogBuffers] - */ -@Qualifier -@MustBeDocumented -@Retention(AnnotationRetention.RUNTIME) -annotation class QSTilesDefaultLog +/** When canceled, provide different ways to start the next transition. */ +enum class TransitionModeOnCanceled { + /** Proceed from the last value. If canceled at .7, start from .7 and end at 1 */ + LAST_VALUE, + /** Start over from 0. If canceled at .7, start from 0 and end at 1 */ + RESET, + /** Reverse the transition. If canceled at .7, start from 1-.7 (0.3) and end at 1 */ + REVERSE +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt index 342a440d972b..9371d4e2d465 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt @@ -50,8 +50,11 @@ constructor( override fun addViews(constraintLayout: ConstraintLayout) { if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) { - LayoutInflater.from(constraintLayout.context) - .inflate(R.layout.ambient_indication, constraintLayout, true) + val view = + LayoutInflater.from(constraintLayout.context) + .inflate(R.layout.ambient_indication, constraintLayout, false) + + constraintLayout.addView(view) } } diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java index 67531ad9926a..fd6b3f1e0f45 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -190,17 +190,6 @@ public class LogModule { } } - /** - * Provides a logging buffer for all logs related to Quick Settings tiles. This LogBuffer is - * unique for each tile. - * go/qs-tile-refactor - */ - @Provides - @QSTilesDefaultLog - public static LogBuffer provideQuickSettingsTilesLogBuffer(LogBufferFactory factory) { - return factory.create("QSTileLog", 25 /* maxSize */, false /* systrace */); - } - @Provides @QSTilesLogBuffers public static Map<TileSpec, LogBuffer> provideQuickSettingsTilesLogBufferCache() { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt index a48e56a9f158..7cb5b3bc0924 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt @@ -731,6 +731,7 @@ constructor( removePlayer(existingSmartspaceMediaKey, dismissMediaData = false) removedPlayer?.run { debugLogger.logPotentialMemoryLeak(existingSmartspaceMediaKey) + onDestroy() } } @@ -1302,6 +1303,7 @@ internal object MediaPlayerData { val removedPlayer = removeMediaPlayer(key) if (removedPlayer != null && removedPlayer != player) { debugLogger?.logPotentialMemoryLeak(key) + removedPlayer.onDestroy() } val sortKey = MediaSortKey( @@ -1329,6 +1331,7 @@ internal object MediaPlayerData { val removedPlayer = removeMediaPlayer(key) if (!update && removedPlayer != null && removedPlayer != player) { debugLogger?.logPotentialMemoryLeak(key) + removedPlayer.onDestroy() } val sortKey = MediaSortKey( @@ -1357,7 +1360,10 @@ internal object MediaPlayerData { // MediaPlayer should not be visible // no need to set isDismissed flag. val removedPlayer = removeMediaPlayer(newKey) - removedPlayer?.run { debugLogger?.logPotentialMemoryLeak(newKey) } + removedPlayer?.run { + debugLogger?.logPotentialMemoryLeak(newKey) + onDestroy() + } mediaData.put(newKey, it) } } diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionMetricsLogger.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionMetricsLogger.kt index a53f0f11c380..ce8b79cd9e38 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionMetricsLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionMetricsLogger.kt @@ -24,6 +24,7 @@ import com.android.internal.util.FrameworkStatsLog.MEDIA_PROJECTION_STATE_CHANGE import com.android.internal.util.FrameworkStatsLog.MEDIA_PROJECTION_STATE_CHANGED__CREATION_SOURCE__CREATION_SOURCE_SYSTEM_UI_SCREEN_RECORDER as METRICS_CREATION_SOURCE_SYSTEM_UI_SCREEN_RECORDER import com.android.internal.util.FrameworkStatsLog.MEDIA_PROJECTION_STATE_CHANGED__CREATION_SOURCE__CREATION_SOURCE_UNKNOWN as METRICS_CREATION_SOURCE_UNKNOWN import com.android.internal.util.FrameworkStatsLog.MEDIA_PROJECTION_STATE_CHANGED__STATE__MEDIA_PROJECTION_STATE_INITIATED +import com.android.internal.util.FrameworkStatsLog.MEDIA_PROJECTION_STATE_CHANGED__STATE__MEDIA_PROJECTION_STATE_PERMISSION_REQUEST_DISPLAYED as METRICS_STATE_PERMISSION_REQUEST_DISPLAYED import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject @@ -47,6 +48,10 @@ constructor(private val service: IMediaProjectionManager) { ) } + fun notifyPermissionRequestDisplayed() { + notifyToServer(METRICS_STATE_PERMISSION_REQUEST_DISPLAYED, SessionCreationSource.UNKNOWN) + } + /** * Request to log that the permission request moved to the given state. * diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java index fa418fc8b98b..2d830d311562 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java @@ -249,6 +249,10 @@ public class MediaProjectionPermissionActivity extends Activity setUpDialog(mDialog); mDialog.show(); + + if (savedInstanceState == null) { + mMediaProjectionMetricsLogger.notifyPermissionRequestDisplayed(); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java index 959afd86ee8d..e27a59c6fb21 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java @@ -30,12 +30,12 @@ import androidx.annotation.Nullable; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.logging.MetricsLogger; -import com.android.systemui.res.R; import com.android.systemui.animation.DialogCuj; import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.qs.QSTile; @@ -45,6 +45,7 @@ import com.android.systemui.qs.QsEventLogger; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.res.R; import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -69,6 +70,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> private final DialogLaunchAnimator mDialogLaunchAnimator; private final FeatureFlags mFlags; private final PanelInteractor mPanelInteractor; + private final MediaProjectionMetricsLogger mMediaProjectionMetricsLogger; private long mMillisUntilFinished = 0; @@ -88,7 +90,8 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> KeyguardDismissUtil keyguardDismissUtil, KeyguardStateController keyguardStateController, DialogLaunchAnimator dialogLaunchAnimator, - PanelInteractor panelInteractor + PanelInteractor panelInteractor, + MediaProjectionMetricsLogger mediaProjectionMetricsLogger ) { super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); @@ -99,6 +102,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> mKeyguardStateController = keyguardStateController; mDialogLaunchAnimator = dialogLaunchAnimator; mPanelInteractor = panelInteractor; + mMediaProjectionMetricsLogger = mediaProjectionMetricsLogger; } @Override @@ -190,6 +194,9 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> } else { dialog.show(); } + + mMediaProjectionMetricsLogger.notifyPermissionRequestDisplayed(); + return false; }; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt index 70a683b81f75..f8de36563dd2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt @@ -19,8 +19,8 @@ package com.android.systemui.qs.tiles.base.logging import androidx.annotation.GuardedBy import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogBufferFactory import com.android.systemui.log.core.LogLevel -import com.android.systemui.log.dagger.QSTilesDefaultLog import com.android.systemui.log.dagger.QSTilesLogBuffers import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.pipeline.shared.TileSpec @@ -29,14 +29,13 @@ import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction import com.android.systemui.statusbar.StatusBarState import javax.inject.Inject -import javax.inject.Provider @SysUISingleton class QSTileLogger @Inject constructor( @QSTilesLogBuffers logBuffers: Map<TileSpec, LogBuffer>, - @QSTilesDefaultLog private val defaultLogBufferProvider: Provider<LogBuffer>, + private val factory: LogBufferFactory, private val mStatusBarStateController: StatusBarStateController, ) { @GuardedBy("logBufferCache") private val logBufferCache = logBuffers.toMutableMap() @@ -154,7 +153,13 @@ constructor( private fun TileSpec.getLogBuffer(): LogBuffer = synchronized(logBufferCache) { - logBufferCache.getOrPut(this) { defaultLogBufferProvider.get() } + logBufferCache.getOrPut(this) { + factory.create( + "QSTileLog_${this.getLogTag()}", + BUFFER_MAX_SIZE /* maxSize */, + false /* systrace */ + ) + } } private fun StateUpdateTrigger.toLogString(): String = @@ -185,5 +190,6 @@ constructor( private companion object { const val TAG_FORMAT_PREFIX = "QSLog" const val DATA_MAX_LENGTH = 50 + const val BUFFER_MAX_SIZE = 25 } } diff --git a/packages/SystemUI/src/com/android/systemui/settings/UserTracker.kt b/packages/SystemUI/src/com/android/systemui/settings/UserTracker.kt index cf1fbe3685e3..d6f1ed9c3334 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/UserTracker.kt +++ b/packages/SystemUI/src/com/android/systemui/settings/UserTracker.kt @@ -68,6 +68,10 @@ interface UserTracker : UserContentResolverProvider, UserContextProvider { */ @WeaklyReferencedCallback interface Callback { + /** + * Notifies that the current user will be changed. + */ + fun onBeforeUserSwitching(newUser: Int) {} /** * Same as {@link onUserChanging(Int, Context, Runnable)} but the callback will be diff --git a/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt b/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt index 99127ea928bf..9f416bbf2c59 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/settings/UserTrackerImpl.kt @@ -227,6 +227,13 @@ open class UserTrackerImpl internal constructor( protected open fun handleBeforeUserSwitching(newUserId: Int) { Assert.isNotMainThread() setUserIdInternal(newUserId) + + val list = synchronized(callbacks) { + callbacks.toList() + } + list.forEach { + it.callback.get()?.onBeforeUserSwitching(newUserId) + } } @WorkerThread diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java index 09514404d4db..d8692397edda 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java @@ -35,6 +35,7 @@ import com.android.keyguard.KeyguardMessageAreaController; import com.android.keyguard.LockIconViewController; import com.android.keyguard.dagger.KeyguardBouncerComponent; import com.android.systemui.Dumpable; +import com.android.systemui.FeatureFlags; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; @@ -42,10 +43,12 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; import com.android.systemui.bouncer.ui.binder.KeyguardBouncerViewBinder; import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel; import com.android.systemui.classifier.FalsingCollector; +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel; +import com.android.systemui.compose.ComposeFacade; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dock.DockManager; import com.android.systemui.dump.DumpManager; -import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.flags.Flags; import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; @@ -103,8 +106,10 @@ public class NotificationShadeWindowViewController implements Dumpable { private final PulsingGestureListener mPulsingGestureListener; private final LockscreenHostedDreamGestureListener mLockscreenHostedDreamGestureListener; private final NotificationInsetsController mNotificationInsetsController; + private final CommunalViewModel mCommunalViewModel; private final boolean mIsTrackpadCommonEnabled; private final FeatureFlags mFeatureFlags; + private final FeatureFlagsClassic mFeatureFlagsClassic; private final SysUIKeyEventHandler mSysUIKeyEventHandler; private final PrimaryBouncerInteractor mPrimaryBouncerInteractor; private final AlternateBouncerInteractor mAlternateBouncerInteractor; @@ -175,7 +180,9 @@ public class NotificationShadeWindowViewController implements Dumpable { KeyguardMessageAreaController.Factory messageAreaControllerFactory, KeyguardTransitionInteractor keyguardTransitionInteractor, PrimaryBouncerToGoneTransitionViewModel primaryBouncerToGoneTransitionViewModel, + CommunalViewModel communalViewModel, NotificationExpansionRepository notificationExpansionRepository, + FeatureFlagsClassic featureFlagsClassic, FeatureFlags featureFlags, SystemClock clock, BouncerMessageInteractor bouncerMessageInteractor, @@ -206,8 +213,10 @@ public class NotificationShadeWindowViewController implements Dumpable { mPulsingGestureListener = pulsingGestureListener; mLockscreenHostedDreamGestureListener = lockscreenHostedDreamGestureListener; mNotificationInsetsController = notificationInsetsController; - mIsTrackpadCommonEnabled = featureFlags.isEnabled(TRACKPAD_GESTURE_COMMON); + mCommunalViewModel = communalViewModel; + mIsTrackpadCommonEnabled = featureFlagsClassic.isEnabled(TRACKPAD_GESTURE_COMMON); mFeatureFlags = featureFlags; + mFeatureFlagsClassic = featureFlagsClassic; mSysUIKeyEventHandler = sysUIKeyEventHandler; mPrimaryBouncerInteractor = primaryBouncerInteractor; mAlternateBouncerInteractor = alternateBouncerInteractor; @@ -223,7 +232,7 @@ public class NotificationShadeWindowViewController implements Dumpable { messageAreaControllerFactory, bouncerMessageInteractor, bouncerLogger, - featureFlags, + featureFlagsClassic, selectedUserInteractor); collectFlow(mView, keyguardTransitionInteractor.getLockscreenToDreamingTransition(), @@ -234,7 +243,7 @@ public class NotificationShadeWindowViewController implements Dumpable { this::setExpandAnimationRunning); mClock = clock; - if (featureFlags.isEnabled(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION)) { + if (featureFlagsClassic.isEnabled(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION)) { unfoldTransitionProgressProvider.ifPresent( progressProvider -> progressProvider.addCallback( mDisableSubpixelTextTransitionListener)); @@ -263,7 +272,7 @@ public class NotificationShadeWindowViewController implements Dumpable { mStackScrollLayout = mView.findViewById(R.id.notification_stack_scroller); mPulsingWakeupGestureHandler = new GestureDetector(mView.getContext(), mPulsingGestureListener); - if (mFeatureFlags.isEnabled(LOCKSCREEN_WALLPAPER_DREAM_ENABLED)) { + if (mFeatureFlagsClassic.isEnabled(LOCKSCREEN_WALLPAPER_DREAM_ENABLED)) { mDreamingWakeupGestureHandler = new GestureDetector(mView.getContext(), mLockscreenHostedDreamGestureListener); } @@ -435,7 +444,7 @@ public class NotificationShadeWindowViewController implements Dumpable { } boolean bouncerShowing; - if (mFeatureFlags.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) { + if (mFeatureFlagsClassic.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) { bouncerShowing = mPrimaryBouncerInteractor.isBouncerShowing() || mAlternateBouncerInteractor.isVisibleState(); } else { @@ -447,7 +456,7 @@ public class NotificationShadeWindowViewController implements Dumpable { if (mDragDownHelper.isDragDownEnabled()) { // This handles drag down over lockscreen boolean result = mDragDownHelper.onInterceptTouchEvent(ev); - if (mFeatureFlags.isEnabled(Flags.MIGRATE_NSSL)) { + if (mFeatureFlagsClassic.isEnabled(Flags.MIGRATE_NSSL)) { if (result) { mLastInterceptWasDragDownHelper = true; if (ev.getAction() == MotionEvent.ACTION_DOWN) { @@ -479,7 +488,7 @@ public class NotificationShadeWindowViewController implements Dumpable { MotionEvent cancellation = MotionEvent.obtain(ev); cancellation.setAction(MotionEvent.ACTION_CANCEL); mStackScrollLayout.onInterceptTouchEvent(cancellation); - if (!mFeatureFlags.isEnabled(Flags.MIGRATE_NSSL)) { + if (!mFeatureFlagsClassic.isEnabled(Flags.MIGRATE_NSSL)) { mNotificationPanelViewController.handleExternalInterceptTouch(cancellation); } cancellation.recycle(); @@ -494,7 +503,7 @@ public class NotificationShadeWindowViewController implements Dumpable { if (mStatusBarKeyguardViewManager.onTouch(ev)) { return true; } - if (mFeatureFlags.isEnabled(Flags.MIGRATE_NSSL)) { + if (mFeatureFlagsClassic.isEnabled(Flags.MIGRATE_NSSL)) { if (mLastInterceptWasDragDownHelper && (mDragDownHelper.isDraggingDown())) { // we still want to finish our drag down gesture when locking the screen handled |= mDragDownHelper.onTouchEvent(ev) || handled; @@ -559,8 +568,27 @@ public class NotificationShadeWindowViewController implements Dumpable { mDepthController.onPanelExpansionChanged(currentState); } + /** + * Sets up the communal hub UI if the {@link com.android.systemui.Flags#FLAG_COMMUNAL_HUB} flag + * is enabled. + * + * The layout lives in {@link R.id.communal_ui_container}. + */ + public void setupCommunalHubLayout() { + if (!mFeatureFlags.communalHub() || !ComposeFacade.INSTANCE.isComposeAvailable()) { + return; + } + + // Replace the placeholder view with the communal UI. + View communalPlaceholder = mView.findViewById(R.id.communal_ui_stub); + int index = mView.indexOfChild(communalPlaceholder); + mView.removeView(communalPlaceholder); + mView.addView(ComposeFacade.INSTANCE.createCommunalContainer(mView.getContext(), + mCommunalViewModel), index); + } + private boolean didNotificationPanelInterceptEvent(MotionEvent ev) { - if (mFeatureFlags.isEnabled(Flags.MIGRATE_NSSL)) { + if (mFeatureFlagsClassic.isEnabled(Flags.MIGRATE_NSSL)) { // Since NotificationStackScrollLayout is now a sibling of notification_panel, we need // to also ask NotificationPanelViewController directly, in order to process swipe up // events originating from notifications diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt index a8a20cc8559b..2f684762a13a 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt @@ -35,7 +35,6 @@ import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.pipeline.mobile.data.repository.UserSetupRepository import com.android.systemui.statusbar.policy.data.repository.DeviceProvisioningRepository import com.android.systemui.user.domain.interactor.UserSwitcherInteractor -import com.android.systemui.util.kotlin.pairwise import javax.inject.Inject import javax.inject.Provider import kotlinx.coroutines.CoroutineScope @@ -140,13 +139,6 @@ constructor( /** Whether either the shade or QS is fully expanded. */ val isAnyFullyExpanded: Flow<Boolean> = anyExpansion.map { it >= 1f }.distinctUntilChanged() - /** Whether either the shade or QS is expanding from a fully collapsed state. */ - val isAnyExpanding: Flow<Boolean> = - anyExpansion - .pairwise(1f) - .map { (prev, curr) -> curr > 0f && curr < 1f && prev < 1f } - .distinctUntilChanged() - /** * Whether either the shade or QS is partially or fully expanded, i.e. not fully collapsed. At * this time, this is not simply a matter of checking if either value in shadeExpansion and diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java index f32f1c2dcd25..710e59d91c6b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java @@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_ import static android.os.UserHandle.USER_NULL; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; +import static android.os.Flags.allowPrivateProfile; import static com.android.systemui.DejankUtils.whitelistIpcs; @@ -79,6 +80,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.Executor; +import java.util.Objects; import javax.inject.Inject; @@ -177,57 +179,50 @@ public class NotificationLockscreenUserManagerImpl implements @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - switch (action) { - case Intent.ACTION_USER_REMOVED: - int removedUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); - if (removedUserId != -1) { - for (UserChangedListener listener : mListeners) { - listener.onUserRemoved(removedUserId); - } - } - updateCurrentProfilesCache(); - break; - case Intent.ACTION_USER_ADDED: - updateCurrentProfilesCache(); - if (mFeatureFlags.isEnabled(Flags.NOTIF_LS_BACKGROUND_THREAD)) { - final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL); - mBackgroundHandler.post(() -> { - initValuesForUser(userId); - }); - } - break; - case Intent.ACTION_MANAGED_PROFILE_AVAILABLE: - case Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE: - updateCurrentProfilesCache(); - break; - case Intent.ACTION_USER_UNLOCKED: - // Start the overview connection to the launcher service - // Connect if user hasn't connected yet - if (mOverviewProxyServiceLazy.get().getProxy() == null) { - mOverviewProxyServiceLazy.get().startConnectionToCurrentUser(); - } - break; - case NOTIFICATION_UNLOCKED_BY_WORK_CHALLENGE_ACTION: - final IntentSender intentSender = intent.getParcelableExtra( - Intent.EXTRA_INTENT); - final String notificationKey = intent.getStringExtra(Intent.EXTRA_INDEX); - if (intentSender != null) { - try { - ActivityOptions options = ActivityOptions.makeBasic(); - options.setPendingIntentBackgroundActivityStartMode( - ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); - mContext.startIntentSender(intentSender, null, 0, 0, 0, - options.toBundle()); - } catch (IntentSender.SendIntentException e) { - /* ignore */ - } + if (Objects.equals(action, Intent.ACTION_USER_REMOVED)) { + int removedUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); + if (removedUserId != -1) { + for (UserChangedListener listener : mListeners) { + listener.onUserRemoved(removedUserId); } - if (notificationKey != null) { - final NotificationVisibility nv = mVisibilityProviderLazy.get() - .obtain(notificationKey, true); - mClickNotifier.onNotificationClick(notificationKey, nv); + } + updateCurrentProfilesCache(); + } else if (Objects.equals(action, Intent.ACTION_USER_ADDED)){ + updateCurrentProfilesCache(); + if (mFeatureFlags.isEnabled(Flags.NOTIF_LS_BACKGROUND_THREAD)) { + final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL); + mBackgroundHandler.post(() -> { + initValuesForUser(userId); + }); + } + } else if (profileAvailabilityActions(action)) { + updateCurrentProfilesCache(); + } else if (Objects.equals(action, Intent.ACTION_USER_UNLOCKED)) { + // Start the overview connection to the launcher service + // Connect if user hasn't connected yet + if (mOverviewProxyServiceLazy.get().getProxy() == null) { + mOverviewProxyServiceLazy.get().startConnectionToCurrentUser(); + } + } else if (Objects.equals(action, NOTIFICATION_UNLOCKED_BY_WORK_CHALLENGE_ACTION)) { + final IntentSender intentSender = intent.getParcelableExtra( + Intent.EXTRA_INTENT); + final String notificationKey = intent.getStringExtra(Intent.EXTRA_INDEX); + if (intentSender != null) { + try { + ActivityOptions options = ActivityOptions.makeBasic(); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + mContext.startIntentSender(intentSender, null, 0, 0, 0, + options.toBundle()); + } catch (IntentSender.SendIntentException e) { + /* ignore */ } - break; + } + if (notificationKey != null) { + final NotificationVisibility nv = mVisibilityProviderLazy.get() + .obtain(notificationKey, true); + mClickNotifier.onNotificationClick(notificationKey, nv); + } } } }; @@ -403,6 +398,10 @@ public class NotificationLockscreenUserManagerImpl implements filter.addAction(Intent.ACTION_USER_UNLOCKED); filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE); filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + if (allowPrivateProfile()){ + filter.addAction(Intent.ACTION_PROFILE_AVAILABLE); + filter.addAction(Intent.ACTION_PROFILE_UNAVAILABLE); + } mBroadcastDispatcher.registerReceiver(mBaseBroadcastReceiver, filter, null /* executor */, UserHandle.ALL); @@ -814,6 +813,14 @@ public class NotificationLockscreenUserManagerImpl implements } } + private boolean profileAvailabilityActions(String action){ + return allowPrivateProfile()? + Objects.equals(action,Intent.ACTION_PROFILE_AVAILABLE)|| + Objects.equals(action,Intent.ACTION_PROFILE_UNAVAILABLE): + Objects.equals(action,Intent.ACTION_MANAGED_PROFILE_AVAILABLE)|| + Objects.equals(action,Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + } + @Override public void dump(PrintWriter pw, String[] args) { pw.println("NotificationLockscreenUserManager state:"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java index 17da015789ea..ffde8c03682f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java @@ -118,16 +118,27 @@ public class RemoteInputController { // If the view is being removed, this may be called even though we're not active boolean remoteInputActiveForEntry = isRemoteInputActive(entry); + boolean remoteInputActive = isRemoteInputActive(); mLogger.logRemoveRemoteInput( entry.getKey() /* entryKey */, entry.mRemoteEditImeVisible /* remoteEditImeVisible */, entry.mRemoteEditImeAnimatingAway /* remoteEditImeAnimatingAway */, remoteInputActiveForEntry /* isRemoteInputActiveForEntry */, - isRemoteInputActive()/* isRemoteInputActive */, + remoteInputActive/* isRemoteInputActive */, reason/* reason */, entry.getNotificationStyle()/* notificationStyle */); - if (!remoteInputActiveForEntry) return; + if (!remoteInputActiveForEntry) { + if (mLastAppliedRemoteInputActive != null + && mLastAppliedRemoteInputActive + && !remoteInputActive) { + mLogger.logRemoteInputApplySkipped( + entry.getKey() /* entryKey */, + reason/* reason */, + entry.getNotificationStyle()/* notificationStyle */); + } + return; + } pruneWeakThenRemoveAndContains(null /* contains */, entry /* remove */, token); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt index ff89c62ab496..23f87ba9dcc9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt @@ -83,6 +83,21 @@ constructor(@NotificationRemoteInputLog private val logBuffer: LogBuffer) { } ) + fun logRemoteInputApplySkipped(entryKey: String, reason: String, notificationStyle: String) = + logBuffer.log( + TAG, + DEBUG, + { + str1 = entryKey + str2 = reason + str3 = notificationStyle + }, + { + "removeRemoteInput[apply is skipped] reason: $str2" + + "for entry: $str1, style: $str3 " + } + ) + private companion object { private const val TAG = "RemoteInputControllerLog" } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 9fb6c1bb2fd0..8d9fd12356a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1525,6 +1525,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { // regressions, we'll continue standing up the root view in CentralSurfaces. mNotificationShadeWindowController.fetchWindowRootView(); getNotificationShadeWindowViewController().setupExpandedStatusBar(); + getNotificationShadeWindowViewController().setupCommunalHubLayout(); mShadeController.setNotificationShadeWindowViewController( getNotificationShadeWindowViewController()); mBackActionInteractor.setup(mQsController, mShadeSurface); diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java index 9dca013f8aa4..aea3030967d2 100644 --- a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java @@ -109,6 +109,7 @@ public class ImageWallpaper extends WallpaperService { private WallpaperManager mWallpaperManager; private final WallpaperLocalColorExtractor mWallpaperLocalColorExtractor; private SurfaceHolder mSurfaceHolder; + private boolean mDrawn = false; @VisibleForTesting static final int MIN_SURFACE_WIDTH = 128; @VisibleForTesting @@ -239,6 +240,7 @@ public class ImageWallpaper extends WallpaperService { private void drawFrameSynchronized() { synchronized (mLock) { + if (mDrawn) return; drawFrameInternal(); } } @@ -276,6 +278,7 @@ public class ImageWallpaper extends WallpaperService { Rect dest = mSurfaceHolder.getSurfaceFrame(); try { canvas.drawBitmap(bitmap, null, dest, null); + mDrawn = true; } finally { surface.unlockCanvasAndPost(canvas); } diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java index 897c4da0fae2..1e801aeb5a29 100644 --- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java +++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java @@ -33,6 +33,7 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.inputmethodservice.InputMethodService; import android.os.IBinder; +import android.util.Log; import android.view.Display; import android.view.KeyEvent; @@ -66,6 +67,7 @@ import com.android.wm.shell.splitscreen.SplitScreen; import com.android.wm.shell.sysui.ShellInterface; import java.io.PrintWriter; +import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.concurrent.Executor; @@ -371,6 +373,13 @@ public final class WMShell implements @Override public void dump(PrintWriter pw, String[] args) { + Log.d(TAG, "Dumping with args: " + String.join(", ", args)); + + // Strip out the SysUI "dependency" arg before sending to WMShell + if (args[0].equals("dependency")) { + args = Arrays.copyOfRange(args, 1, args.length); + } + // Handle commands if provided if (mShell.handleCommand(args, pw)) { return; diff --git a/packages/SystemUI/tests/src/com/android/systemui/CameraAvailabilityListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/CameraAvailabilityListenerTest.kt new file mode 100644 index 000000000000..b1421b21b377 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/CameraAvailabilityListenerTest.kt @@ -0,0 +1,162 @@ +package com.android.systemui + +import android.graphics.Path +import android.graphics.Rect +import android.graphics.RectF +import android.hardware.camera2.CameraManager +import android.testing.AndroidTestingRunner +import android.util.PathParser +import androidx.test.filters.SmallTest +import com.android.systemui.res.R +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.withArgCaptor +import java.util.concurrent.Executor +import kotlin.math.roundToInt +import kotlin.test.assertEquals +import kotlin.test.assertNotNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +@RunWith(AndroidTestingRunner::class) +@SmallTest +class CameraAvailabilityListenerTest : SysuiTestCase() { + companion object { + const val EXCLUDED_PKG = "test.excluded.package" + const val CAMERA_ID_FRONT = "0" + const val CAMERA_ID_INNER = "1" + const val PROTECTION_PATH_STRING_FRONT = "M 50,50 a 20,20 0 1 0 40,0 a 20,20 0 1 0 -40,0 Z" + const val PROTECTION_PATH_STRING_INNER = "M 40,40 a 10,10 0 1 0 20,0 a 10,10 0 1 0 -20,0 Z" + val PATH_RECT_FRONT = rectFromPath(pathFromString(PROTECTION_PATH_STRING_FRONT)) + val PATH_RECT_INNER = rectFromPath(pathFromString(PROTECTION_PATH_STRING_INNER)) + + private fun pathFromString(pathString: String): Path { + val spec = pathString.trim() + val p: Path + try { + p = PathParser.createPathFromPathData(spec) + } catch (e: Throwable) { + throw IllegalArgumentException("Invalid protection path", e) + } + + return p + } + + private fun rectFromPath(path: Path): Rect { + val computed = RectF() + path.computeBounds(computed) + return Rect( + computed.left.roundToInt(), + computed.top.roundToInt(), + computed.right.roundToInt(), + computed.bottom.roundToInt() + ) + } + } + + @Mock private lateinit var cameraManager: CameraManager + @Mock + private lateinit var cameraTransitionCb: CameraAvailabilityListener.CameraTransitionCallback + private lateinit var cameraAvailabilityListener: CameraAvailabilityListener + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + context + .getOrCreateTestableResources() + .addOverride(R.string.config_cameraProtectionExcludedPackages, EXCLUDED_PKG) + context + .getOrCreateTestableResources() + .addOverride(R.string.config_protectedCameraId, CAMERA_ID_FRONT) + context + .getOrCreateTestableResources() + .addOverride( + R.string.config_frontBuiltInDisplayCutoutProtection, + PROTECTION_PATH_STRING_FRONT + ) + context + .getOrCreateTestableResources() + .addOverride(R.string.config_protectedInnerCameraId, CAMERA_ID_INNER) + context + .getOrCreateTestableResources() + .addOverride( + R.string.config_innerBuiltInDisplayCutoutProtection, + PROTECTION_PATH_STRING_INNER + ) + + context.addMockSystemService(CameraManager::class.java, cameraManager) + + cameraAvailabilityListener = + CameraAvailabilityListener.Factory.build(context, context.mainExecutor) + } + + @Test + fun testFrontCamera() { + var path: Path? = null + var rect: Rect? = null + val callback = + object : CameraAvailabilityListener.CameraTransitionCallback { + override fun onApplyCameraProtection(protectionPath: Path, bounds: Rect) { + path = protectionPath + rect = bounds + } + + override fun onHideCameraProtection() {} + } + + cameraAvailabilityListener.addTransitionCallback(callback) + cameraAvailabilityListener.startListening() + + val callbackCaptor = withArgCaptor { + verify(cameraManager).registerAvailabilityCallback(any(Executor::class.java), capture()) + } + + callbackCaptor.onCameraOpened(CAMERA_ID_FRONT, "") + assertNotNull(path) + assertEquals(PATH_RECT_FRONT, rect) + } + + @Test + fun testInnerCamera() { + var path: Path? = null + var rect: Rect? = null + val callback = + object : CameraAvailabilityListener.CameraTransitionCallback { + override fun onApplyCameraProtection(protectionPath: Path, bounds: Rect) { + path = protectionPath + rect = bounds + } + + override fun onHideCameraProtection() {} + } + + cameraAvailabilityListener.addTransitionCallback(callback) + cameraAvailabilityListener.startListening() + + val callbackCaptor = withArgCaptor { + verify(cameraManager).registerAvailabilityCallback(any(Executor::class.java), capture()) + } + + callbackCaptor.onCameraOpened(CAMERA_ID_INNER, "") + assertNotNull(path) + assertEquals(PATH_RECT_INNER, rect) + } + + @Test + fun testExcludedPackage() { + cameraAvailabilityListener.addTransitionCallback(cameraTransitionCb) + cameraAvailabilityListener.startListening() + + val callbackCaptor = withArgCaptor { + verify(cameraManager).registerAvailabilityCallback(any(Executor::class.java), capture()) + } + callbackCaptor.onCameraOpened(CAMERA_ID_FRONT, EXCLUDED_PKG) + + verify(cameraTransitionCb, never()) + .onApplyCameraProtection(any(Path::class.java), any(Rect::class.java)) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java index 5346db1aa067..daa6070b5403 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java @@ -19,8 +19,7 @@ package com.android.systemui.accessibility.floatingmenu; import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU; import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -90,7 +89,7 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); MockitoAnnotations.initMocks(this); mContextWrapper = new ContextWrapper(mContext) { @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DismissAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DismissAnimationControllerTest.java index 3b2ea0f5ce86..56664356f964 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DismissAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DismissAnimationControllerTest.java @@ -16,8 +16,7 @@ package com.android.systemui.accessibility.floatingmenu; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -59,7 +58,7 @@ public class DismissAnimationControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class); final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager, mock(SecureSettings.class)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java index 76a3153e648a..ec6ec63d213d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java @@ -16,8 +16,7 @@ package com.android.systemui.accessibility.floatingmenu; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -78,7 +77,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class); final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext, stubWindowManager); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuEduTooltipViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuEduTooltipViewTest.java index 83bcd8d50407..e8192c43f6f8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuEduTooltipViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuEduTooltipViewTest.java @@ -16,8 +16,7 @@ package com.android.systemui.accessibility.floatingmenu; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -29,8 +28,8 @@ import android.widget.TextView; import androidx.test.filters.SmallTest; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.res.R; import org.junit.Before; import org.junit.Test; @@ -46,7 +45,7 @@ public class MenuEduTooltipViewTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager windowManager = mContext.getSystemService(WindowManager.class); mMenuViewAppearance = new MenuViewAppearance(mContext, windowManager); mMenuEduTooltipView = new MenuEduTooltipView(mContext, mMenuViewAppearance); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java index e01f1b76df79..62cb9a01ac84 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java @@ -19,8 +19,7 @@ package com.android.systemui.accessibility.floatingmenu; import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS; import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -40,8 +39,8 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate; import androidx.test.filters.SmallTest; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.res.R; import com.android.systemui.util.settings.SecureSettings; import org.junit.Before; @@ -75,7 +74,7 @@ public class MenuItemAccessibilityDelegateTest extends SysuiTestCase { @Before public void setUp() { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager stubWindowManager = mContext.getSystemService(WindowManager.class); final MenuViewAppearance stubMenuViewAppearance = new MenuViewAppearance(mContext, stubWindowManager); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java index a88ee108141b..32487534423d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuListViewTouchHandlerTest.java @@ -18,8 +18,7 @@ package com.android.systemui.accessibility.floatingmenu; import static android.view.View.OVER_SCROLL_NEVER; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -83,7 +82,7 @@ public class MenuListViewTouchHandlerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager windowManager = mContext.getSystemService(WindowManager.class); final MenuViewModel stubMenuViewModel = new MenuViewModel(mContext, mAccessibilityManager, mock(SecureSettings.class)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerControllerTest.java index 41e5c209e344..03a4ba78a208 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerControllerTest.java @@ -19,8 +19,7 @@ package com.android.systemui.accessibility.floatingmenu; import static android.view.WindowInsets.Type.displayCutout; import static android.view.WindowInsets.Type.systemBars; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; @@ -76,7 +75,7 @@ public class MenuViewLayerControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final WindowManager wm = mContext.getSystemService(WindowManager.class); doAnswer(invocation -> wm.getMaximumWindowMetrics()).when( mWindowManager).getMaximumWindowMetrics(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java index b0776c9a5b58..df7d1b7a4aad 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java @@ -22,9 +22,8 @@ import static android.view.WindowInsets.Type.displayCutout; import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.systemBars; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; import static com.android.systemui.accessibility.floatingmenu.MenuViewLayer.LayerIndex; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -113,7 +112,7 @@ public class MenuViewLayerTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); final Rect mDisplayBounds = new Rect(); mDisplayBounds.set(/* left= */ 0, /* top= */ 0, DISPLAY_WINDOW_WIDTH, DISPLAY_WINDOW_HEIGHT); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java index ac2bfaf8eddf..b9fd5d0f5e84 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java @@ -18,8 +18,7 @@ package com.android.systemui.accessibility.floatingmenu; import static android.app.UiModeManager.MODE_NIGHT_YES; -import static com.android.systemui.Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG; -import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; +import static com.android.systemui.accessibility.utils.FlagUtils.setFlagDefaults; import static com.google.common.truth.Truth.assertThat; @@ -70,7 +69,7 @@ public class MenuViewTest extends SysuiTestCase { @Before public void setUp() throws Exception { - setFlagDefault(mSetFlagsRule, FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + setFlagDefaults(mSetFlagsRule); mUiModeManager = mContext.getSystemService(UiModeManager.class); mNightMode = mUiModeManager.getNightMode(); mUiModeManager.setNightMode(MODE_NIGHT_YES); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/utils/FlagUtils.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/utils/FlagUtils.java new file mode 100644 index 000000000000..297554956ed8 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/utils/FlagUtils.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.utils; + +import static com.android.systemui.flags.SetFlagsRuleExtensionsKt.setFlagDefault; + +import android.platform.test.flag.junit.SetFlagsRule; + +import com.android.systemui.Flags; + +public class FlagUtils { + /** + * Populates a setFlagsRule with every SystemUI a11y feature flag. + * This function should be updated when new flags are added. + * + * @param setFlagsRule set flags rule from the test environment. + */ + public static void setFlagDefaults(SetFlagsRule setFlagsRule) { + setFlagDefault(setFlagsRule, Flags.FLAG_FLOATING_MENU_OVERLAPS_NAV_BARS_FLAG); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt index d68a3131da4c..8c26776a1ef8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt @@ -72,6 +72,7 @@ class AuthDialogPanelInteractionDetectorTest : SysuiTestCase() { runCurrent() // WHEN shade expands + shadeRepository.setLegacyShadeTracking(true) shadeRepository.setLegacyShadeExpansion(.5f) runCurrent() @@ -108,6 +109,7 @@ class AuthDialogPanelInteractionDetectorTest : SysuiTestCase() { // WHEN detector is disabled and shade opens detector.disable() + shadeRepository.setLegacyShadeTracking(true) shadeRepository.setLegacyShadeExpansion(.5f) runCurrent() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt index 5afc4059357c..ad80a06e3fcd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt @@ -29,6 +29,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.KeyguardState.AOD import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN import com.android.systemui.keyguard.shared.model.TransitionInfo +import com.android.systemui.keyguard.shared.model.TransitionModeOnCanceled import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.keyguard.util.KeyguardTransitionRunner @@ -86,7 +87,7 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { } @Test - fun startingSecondTransitionWillCancelTheFirstTransition() = + fun startingSecondTransitionWillCancelTheFirstTransitionAndUseLastValue() = TestScope().runTest { val steps = mutableListOf<TransitionStep>() val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) @@ -100,12 +101,19 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { val job2 = underTest.transition(LOCKSCREEN, AOD).onEach { steps.add(it) }.launchIn(this) runner.startTransition( this, - TransitionInfo(OWNER_NAME, LOCKSCREEN, AOD, getAnimator()), + TransitionInfo( + OWNER_NAME, + LOCKSCREEN, + AOD, + getAnimator(), + TransitionModeOnCanceled.LAST_VALUE + ), ) val firstTransitionSteps = listWithStep(step = BigDecimal(.1), stop = BigDecimal(.1)) assertSteps(steps.subList(0, 4), firstTransitionSteps, AOD, LOCKSCREEN) + // Second transition starts from .1 (LAST_VALUE) val secondTransitionSteps = listWithStep(step = BigDecimal(.1), start = BigDecimal(.1)) assertSteps(steps.subList(4, steps.size), secondTransitionSteps, LOCKSCREEN, AOD) @@ -114,6 +122,76 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { } @Test + fun startingSecondTransitionWillCancelTheFirstTransitionAndUseReset() = + TestScope().runTest { + val steps = mutableListOf<TransitionStep>() + val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) + runner.startTransition( + this, + TransitionInfo(OWNER_NAME, AOD, LOCKSCREEN, getAnimator()), + maxFrames = 3, + ) + + // Now start 2nd transition, which will interrupt the first + val job2 = underTest.transition(LOCKSCREEN, AOD).onEach { steps.add(it) }.launchIn(this) + runner.startTransition( + this, + TransitionInfo( + OWNER_NAME, + LOCKSCREEN, + AOD, + getAnimator(), + TransitionModeOnCanceled.RESET + ), + ) + + val firstTransitionSteps = listWithStep(step = BigDecimal(.1), stop = BigDecimal(.1)) + assertSteps(steps.subList(0, 4), firstTransitionSteps, AOD, LOCKSCREEN) + + // Second transition starts from 0 (RESET) + val secondTransitionSteps = listWithStep(start = BigDecimal(0), step = BigDecimal(.1)) + assertSteps(steps.subList(4, steps.size), secondTransitionSteps, LOCKSCREEN, AOD) + + job.cancel() + job2.cancel() + } + + @Test + fun startingSecondTransitionWillCancelTheFirstTransitionAndUseReverse() = + TestScope().runTest { + val steps = mutableListOf<TransitionStep>() + val job = underTest.transition(AOD, LOCKSCREEN).onEach { steps.add(it) }.launchIn(this) + runner.startTransition( + this, + TransitionInfo(OWNER_NAME, AOD, LOCKSCREEN, getAnimator()), + maxFrames = 3, + ) + + // Now start 2nd transition, which will interrupt the first + val job2 = underTest.transition(LOCKSCREEN, AOD).onEach { steps.add(it) }.launchIn(this) + runner.startTransition( + this, + TransitionInfo( + OWNER_NAME, + LOCKSCREEN, + AOD, + getAnimator(), + TransitionModeOnCanceled.REVERSE + ), + ) + + val firstTransitionSteps = listWithStep(step = BigDecimal(.1), stop = BigDecimal(.1)) + assertSteps(steps.subList(0, 4), firstTransitionSteps, AOD, LOCKSCREEN) + + // Second transition starts from .9 (REVERSE) + val secondTransitionSteps = listWithStep(start = BigDecimal(0.9), step = BigDecimal(.1)) + assertSteps(steps.subList(4, steps.size), secondTransitionSteps, LOCKSCREEN, AOD) + + job.cancel() + job2.cancel() + } + + @Test fun nullAnimatorEnablesManualControlWithUpdateTransition() = TestScope().runTest { val steps = mutableListOf<TransitionStep>() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index f3930a37c486..275ac804b321 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -57,7 +57,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 -import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock import org.mockito.Mockito.clearInvocations @@ -244,7 +243,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to PRIMARY_BOUNCER should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -271,7 +270,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -298,7 +297,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -328,7 +327,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DREAMING should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -359,7 +358,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DREAMING_LOCKSCREEN_HOSTED should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -386,7 +385,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -413,7 +412,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -446,7 +445,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to Lockscreen should occur assertThat(info.ownerName).isEqualTo("FromDreamingLockscreenHostedTransitionInteractor") @@ -474,7 +473,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to Gone should occur assertThat(info.ownerName).isEqualTo("FromDreamingLockscreenHostedTransitionInteractor") @@ -504,7 +503,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to PRIMARY_BOUNCER should occur assertThat(info.ownerName).isEqualTo("FromDreamingLockscreenHostedTransitionInteractor") @@ -537,7 +536,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromDreamingLockscreenHostedTransitionInteractor") @@ -569,7 +568,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromDreamingLockscreenHostedTransitionInteractor") @@ -593,7 +592,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromDozingTransitionInteractor") @@ -625,7 +624,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { advanceUntilIdle() // THEN the transition is ignored - verify(transitionRepository, never()).startTransition(any(), anyBoolean()) + verify(transitionRepository, never()).startTransition(any()) coroutineContext.cancelChildren() } @@ -642,7 +641,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromDozingTransitionInteractor") @@ -669,7 +668,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromGoneTransitionInteractor") @@ -696,7 +695,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AOD should occur assertThat(info.ownerName).isEqualTo("FromGoneTransitionInteractor") @@ -719,7 +718,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AOD should occur assertThat(info.ownerName).isEqualTo("FromGoneTransitionInteractor") @@ -749,7 +748,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DREAMING should occur assertThat(info.ownerName).isEqualTo("FromGoneTransitionInteractor") @@ -780,7 +779,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DREAMING_LOCKSCREEN_HOSTED should occur assertThat(info.ownerName).isEqualTo("FromGoneTransitionInteractor") @@ -806,7 +805,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to PRIMARY_BOUNCER should occur assertThat(info.ownerName).isEqualTo("FromAlternateBouncerTransitionInteractor") @@ -838,7 +837,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AOD should occur assertThat(info.ownerName).isEqualTo("FromAlternateBouncerTransitionInteractor") @@ -871,7 +870,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromAlternateBouncerTransitionInteractor") @@ -901,7 +900,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to LOCKSCREEN should occur assertThat(info.ownerName).isEqualTo("FromAlternateBouncerTransitionInteractor") @@ -929,7 +928,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AOD should occur assertThat(info.ownerName).isEqualTo("FromPrimaryBouncerTransitionInteractor") @@ -957,7 +956,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to DOZING should occur assertThat(info.ownerName).isEqualTo("FromPrimaryBouncerTransitionInteractor") @@ -981,7 +980,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to LOCKSCREEN should occur assertThat(info.ownerName).isEqualTo("FromPrimaryBouncerTransitionInteractor") @@ -1011,7 +1010,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition back to DREAMING_LOCKSCREEN_HOSTED should occur assertThat(info.ownerName).isEqualTo("FromPrimaryBouncerTransitionInteractor") @@ -1042,7 +1041,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to GONE should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -1071,7 +1070,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to LOCKSCREEN should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -1096,7 +1095,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AlternateBouncer should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -1121,7 +1120,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to AlternateBouncer should occur assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor") @@ -1147,7 +1146,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromPrimaryBouncerTransitionInteractor") @@ -1172,7 +1171,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromDozingTransitionInteractor") @@ -1199,7 +1198,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromDreamingTransitionInteractor") @@ -1223,7 +1222,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") @@ -1253,7 +1252,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } // THEN a transition to OCCLUDED should occur assertThat(info.ownerName).isEqualTo("FromAodTransitionInteractor") @@ -1287,7 +1286,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { // THEN a transition from LOCKSCREEN => OCCLUDED should occur val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") assertThat(info.from).isEqualTo(KeyguardState.LOCKSCREEN) @@ -1318,7 +1317,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { // THEN a transition from LOCKSCREEN => PRIMARY_BOUNCER should occur val info = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } assertThat(info.ownerName).isEqualTo("FromLockscreenTransitionInteractor") assertThat(info.from).isEqualTo(KeyguardState.LOCKSCREEN) @@ -1339,7 +1338,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { // THEN a transition from PRIMARY_BOUNCER => LOCKSCREEN should occur val info2 = withArgCaptor<TransitionInfo> { - verify(transitionRepository).startTransition(capture(), anyBoolean()) + verify(transitionRepository).startTransition(capture()) } assertThat(info2.from).isEqualTo(KeyguardState.PRIMARY_BOUNCER) assertThat(info2.to).isEqualTo(KeyguardState.LOCKSCREEN) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRunner.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRunner.kt index 54fc4938e1b0..1abb441439fe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRunner.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRunner.kt @@ -42,7 +42,7 @@ class KeyguardTransitionRunner( private var frameCount = 1L private var frames = MutableStateFlow(Pair<Long, FrameCallback?>(0L, null)) private var job: Job? = null - private var isTerminated = false + @Volatile private var isTerminated = false /** * For transitions being directed by an animator. Will control the number of frames being diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java index 5b3d45bb6625..ac03073be17b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java @@ -22,11 +22,13 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.Dialog; import android.os.Handler; import android.service.quicksettings.Tile; import android.testing.AndroidTestingRunner; @@ -35,11 +37,11 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; import com.android.internal.logging.MetricsLogger; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -48,6 +50,7 @@ import com.android.systemui.qs.QsEventLogger; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.res.R; import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -89,6 +92,10 @@ public class ScreenRecordTileTest extends SysuiTestCase { private PanelInteractor mPanelInteractor; @Mock private QsEventLogger mUiEventLogger; + @Mock + private MediaProjectionMetricsLogger mMediaProjectionMetricsLogger; + @Mock + private Dialog mPermissionDialogPrompt; private TestableLooper mTestableLooper; private ScreenRecordTile mTile; @@ -116,7 +123,8 @@ public class ScreenRecordTileTest extends SysuiTestCase { mKeyguardDismissUtil, mKeyguardStateController, mDialogLaunchAnimator, - mPanelInteractor + mPanelInteractor, + mMediaProjectionMetricsLogger ); mTile.initialize(); @@ -280,4 +288,27 @@ public class ScreenRecordTileTest extends SysuiTestCase { assertEquals(state.icon, QSTileImpl.ResourceIcon.get(R.drawable.qs_screen_record_icon_off)); } + @Test + public void showingDialogPrompt_logsMediaProjectionPermissionRequested() { + when(mController.isStarting()).thenReturn(false); + when(mController.isRecording()).thenReturn(false); + when(mController.createScreenRecordDialog(any(), any(), any(), any(), any())) + .thenReturn(mPermissionDialogPrompt); + + mTile.handleClick(null /* view */); + mTestableLooper.processAllMessages(); + + verify(mController).createScreenRecordDialog(any(), eq(mFeatureFlags), + eq(mDialogLaunchAnimator), eq(mActivityStarter), any()); + var onDismissAction = ArgumentCaptor.forClass(ActivityStarter.OnDismissAction.class); + verify(mKeyguardDismissUtil).executeWhenUnlocked( + onDismissAction.capture(), anyBoolean(), anyBoolean()); + assertNotNull(onDismissAction.getValue()); + + onDismissAction.getValue().onDismiss(); + + verify(mPermissionDialogPrompt).show(); + verify(mMediaProjectionMetricsLogger).notifyPermissionRequestDisplayed(); + } + } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt index f1fcee318141..9907278402b0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt @@ -23,11 +23,14 @@ import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dump.LogcatEchoTrackerAlways import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogBufferFactory import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.tiles.base.interactor.StateUpdateTrigger import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter @@ -42,6 +45,7 @@ import org.mockito.MockitoAnnotations class QSTileLoggerTest : SysuiTestCase() { @Mock private lateinit var statusBarController: StatusBarStateController + @Mock private lateinit var logBufferFactory: LogBufferFactory private val chattyLogBuffer = LogBuffer("TestChatty", 5, LogcatEchoTrackerAlways()) private val logBuffer = LogBuffer("Test", 1, LogcatEchoTrackerAlways()) @@ -51,10 +55,11 @@ class QSTileLoggerTest : SysuiTestCase() { @Before fun setup() { MockitoAnnotations.initMocks(this) + whenever(logBufferFactory.create(any(), any(), any())).thenReturn(logBuffer) underTest = QSTileLogger( mapOf(TileSpec.create("chatty_tile") to chattyLogBuffer), - { logBuffer }, + logBufferFactory, statusBarController ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 4f3216da7370..da49230417b8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -21,7 +21,9 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import android.view.KeyEvent import android.view.MotionEvent +import android.view.View import android.view.ViewGroup +import androidx.core.view.contains import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardMessageAreaController import com.android.keyguard.KeyguardSecurityContainerController @@ -29,6 +31,8 @@ import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.LockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent +import com.android.systemui.FakeFeatureFlagsImpl +import com.android.systemui.Flags.FLAG_COMMUNAL_HUB import com.android.systemui.SysuiTestCase import com.android.systemui.back.domain.interactor.BackActionInteractor import com.android.systemui.biometrics.data.repository.FakeFacePropertyRepository @@ -43,11 +47,19 @@ import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel import com.android.systemui.classifier.FalsingCollector import com.android.systemui.classifier.FalsingCollectorFake +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel +import com.android.systemui.compose.ComposeFacade.isComposeAvailable import com.android.systemui.dock.DockManager import com.android.systemui.dump.DumpManager import com.android.systemui.dump.logcatLogBuffer -import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.flags.Flags +import com.android.systemui.flags.FakeFeatureFlagsClassic +import com.android.systemui.flags.Flags.ALTERNATE_BOUNCER_VIEW +import com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED +import com.android.systemui.flags.Flags.MIGRATE_NSSL +import com.android.systemui.flags.Flags.REVAMPED_BOUNCER_MESSAGES +import com.android.systemui.flags.Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION +import com.android.systemui.flags.Flags.TRACKPAD_GESTURE_COMMON +import com.android.systemui.flags.Flags.TRACKPAD_GESTURE_FEATURES import com.android.systemui.flags.SystemPropertiesHelper import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler import com.android.systemui.keyguard.DismissCallbackRegistry @@ -83,6 +95,7 @@ import com.android.systemui.unfold.UnfoldTransitionProgressProvider import com.android.systemui.user.data.repository.FakeUserRepository import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -97,6 +110,7 @@ import org.mockito.Mock import org.mockito.Mockito.anyFloat import org.mockito.Mockito.mock import org.mockito.Mockito.never +import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations import java.util.Optional @@ -135,6 +149,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { @Mock private lateinit var mLockscreenHostedDreamGestureListener: LockscreenHostedDreamGestureListener @Mock private lateinit var notificationInsetsController: NotificationInsetsController + @Mock private lateinit var mCommunalViewModel: CommunalViewModel @Mock lateinit var keyguardBouncerComponentFactory: KeyguardBouncerComponent.Factory @Mock lateinit var keyguardBouncerComponent: KeyguardBouncerComponent @Mock lateinit var keyguardSecurityContainerController: KeyguardSecurityContainerController @@ -159,7 +174,8 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { private lateinit var testScope: TestScope - private lateinit var featureFlags: FakeFeatureFlags + private lateinit var featureFlagsClassic: FakeFeatureFlagsClassic + private lateinit var featureFlags: FakeFeatureFlagsImpl @Before fun setUp() { @@ -174,14 +190,16 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { whenever(keyguardTransitionInteractor.lockscreenToDreamingTransition) .thenReturn(emptyFlow<TransitionStep>()) - featureFlags = FakeFeatureFlags() - featureFlags.set(Flags.TRACKPAD_GESTURE_COMMON, true) - featureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false) - featureFlags.set(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION, true) - featureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true) - featureFlags.set(Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED, false) - featureFlags.set(Flags.MIGRATE_NSSL, false) - featureFlags.set(Flags.ALTERNATE_BOUNCER_VIEW, false) + featureFlagsClassic = FakeFeatureFlagsClassic() + featureFlagsClassic.set(TRACKPAD_GESTURE_COMMON, true) + featureFlagsClassic.set(TRACKPAD_GESTURE_FEATURES, false) + featureFlagsClassic.set(SPLIT_SHADE_SUBPIXEL_OPTIMIZATION, true) + featureFlagsClassic.set(REVAMPED_BOUNCER_MESSAGES, true) + featureFlagsClassic.set(LOCKSCREEN_WALLPAPER_DREAM_ENABLED, false) + featureFlagsClassic.set(MIGRATE_NSSL, false) + featureFlagsClassic.set(ALTERNATE_BOUNCER_VIEW, false) + + featureFlags = FakeFeatureFlagsImpl() testScope = TestScope() fakeClock = FakeSystemClock() @@ -216,14 +234,16 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { mock(KeyguardMessageAreaController.Factory::class.java), keyguardTransitionInteractor, primaryBouncerToGoneTransitionViewModel, + mCommunalViewModel, notificationExpansionRepository, + featureFlagsClassic, featureFlags, fakeClock, BouncerMessageInteractor( repository = BouncerMessageRepositoryImpl(), userRepository = FakeUserRepository(), countDownTimerUtil = mock(CountDownTimerUtil::class.java), - featureFlags = featureFlags, + featureFlags = featureFlagsClassic, updateMonitor = mock(KeyguardUpdateMonitor::class.java), biometricSettingsRepository = FakeBiometricSettingsRepository(), applicationScope = testScope.backgroundScope, @@ -443,7 +463,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { whenever(lockIconViewController.willHandleTouchWhileDozing(DOWN_EVENT)) .thenReturn(true) - featureFlags.set(Flags.MIGRATE_NSSL, true) + featureFlagsClassic.set(MIGRATE_NSSL, true) // THEN touch should NOT be intercepted by NotificationShade assertThat(interactionEventHandler.shouldInterceptTouchEvent(DOWN_EVENT)).isFalse() @@ -460,7 +480,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { whenever(lockIconViewController.willHandleTouchWhileDozing(DOWN_EVENT)) .thenReturn(false) - featureFlags.set(Flags.MIGRATE_NSSL, true) + featureFlagsClassic.set(MIGRATE_NSSL, true) // THEN touch should NOT be intercepted by NotificationShade assertThat(interactionEventHandler.shouldInterceptTouchEvent(DOWN_EVENT)).isTrue() @@ -474,6 +494,48 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { } @Test + fun setsUpCommunalHubLayout_whenFlagEnabled() { + if (!isComposeAvailable()) { + return + } + + featureFlags.setFlag(FLAG_COMMUNAL_HUB, true) + + val mockCommunalPlaceholder = mock(View::class.java) + val fakeViewIndex = 20 + whenever(view.findViewById<View>(R.id.communal_ui_stub)).thenReturn(mockCommunalPlaceholder) + whenever(view.indexOfChild(mockCommunalPlaceholder)).thenReturn(fakeViewIndex) + whenever(view.context).thenReturn(context) + + underTest.setupCommunalHubLayout() + + // Communal view added as a child of the container at the proper index, the stub is removed. + verify(view).removeView(mockCommunalPlaceholder) + verify(view).addView(any(), eq(fakeViewIndex)) + } + + @Test + fun doesNotSetupCommunalHubLayout_whenFlagDisabled() { + if (!isComposeAvailable()) { + return + } + + featureFlags.setFlag(FLAG_COMMUNAL_HUB, false) + + val mockCommunalPlaceholder = mock(View::class.java) + val fakeViewIndex = 20 + whenever(view.findViewById<View>(R.id.communal_ui_stub)).thenReturn(mockCommunalPlaceholder) + whenever(view.indexOfChild(mockCommunalPlaceholder)).thenReturn(fakeViewIndex) + whenever(view.context).thenReturn(context) + + underTest.setupCommunalHubLayout() + + // No adding or removing of views occurs. + verify(view, times(0)).removeView(mockCommunalPlaceholder) + verify(view, times(0)).addView(any(), eq(fakeViewIndex)) + } + + @Test fun forwardsDispatchKeyEvent() { val keyEvent = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_B) interactionEventHandler.dispatchKeyEvent(keyEvent) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index 4d3eab45d001..c94741fa5320 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -28,6 +28,7 @@ import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.LockIconViewController import com.android.keyguard.dagger.KeyguardBouncerComponent +import com.android.systemui.FakeFeatureFlagsImpl import com.android.systemui.SysuiTestCase import com.android.systemui.back.domain.interactor.BackActionInteractor import com.android.systemui.biometrics.data.repository.FakeFacePropertyRepository @@ -42,6 +43,7 @@ import com.android.systemui.bouncer.ui.BouncerView import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel import com.android.systemui.classifier.FalsingCollector import com.android.systemui.classifier.FalsingCollectorFake +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.dock.DockManager import com.android.systemui.dump.DumpManager import com.android.systemui.dump.logcatLogBuffer @@ -142,6 +144,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { private lateinit var unfoldTransitionProgressProvider: Optional<UnfoldTransitionProgressProvider> @Mock private lateinit var notificationInsetsController: NotificationInsetsController + @Mock private lateinit var mCommunalViewModel: CommunalViewModel @Mock private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor @Mock lateinit var primaryBouncerInteractor: PrimaryBouncerInteractor @Mock lateinit var alternateBouncerInteractor: AlternateBouncerInteractor @@ -218,8 +221,10 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { Mockito.mock(KeyguardMessageAreaController.Factory::class.java), keyguardTransitionInteractor, primaryBouncerToGoneTransitionViewModel, + mCommunalViewModel, NotificationExpansionRepository(), featureFlags, + FakeFeatureFlagsImpl(), FakeSystemClock(), BouncerMessageInteractor( repository = BouncerMessageRepositoryImpl(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/data/repository/ShadeInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/data/repository/ShadeInteractorTest.kt index 81382a44def6..3a260ae374c6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/data/repository/ShadeInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/data/repository/ShadeInteractorTest.kt @@ -445,105 +445,6 @@ class ShadeInteractorTest : SysuiTestCase() { } @Test - fun expanding_shadeDraggedDown_expandingTrue() = - testScope.runTest() { - val actual by collectLastValue(underTest.isAnyExpanding) - - // GIVEN shade and QS collapsed - shadeRepository.setLegacyShadeExpansion(0f) - shadeRepository.setQsExpansion(0f) - runCurrent() - - // WHEN shade partially expanded - shadeRepository.setLegacyShadeExpansion(.5f) - runCurrent() - - // THEN anyExpanding is true - assertThat(actual).isTrue() - } - - @Test - fun expanding_qsDraggedDown_expandingTrue() = - testScope.runTest() { - val actual by collectLastValue(underTest.isAnyExpanding) - - // GIVEN shade and QS collapsed - shadeRepository.setLegacyShadeExpansion(0f) - shadeRepository.setQsExpansion(0f) - runCurrent() - - // WHEN shade partially expanded - shadeRepository.setQsExpansion(.5f) - runCurrent() - - // THEN anyExpanding is true - assertThat(actual).isTrue() - } - - @Test - fun expanding_shadeDraggedUpAndDown() = - testScope.runTest() { - val actual by collectLastValue(underTest.isAnyExpanding) - - // WHEN shade starts collapsed then partially expanded - shadeRepository.setLegacyShadeExpansion(0f) - shadeRepository.setLegacyShadeExpansion(.5f) - shadeRepository.setQsExpansion(0f) - runCurrent() - - // THEN anyExpanding is true - assertThat(actual).isTrue() - - // WHEN shade dragged up a bit - shadeRepository.setLegacyShadeExpansion(.2f) - runCurrent() - - // THEN anyExpanding is still true - assertThat(actual).isTrue() - - // WHEN shade dragged down a bit - shadeRepository.setLegacyShadeExpansion(.7f) - runCurrent() - - // THEN anyExpanding is still true - assertThat(actual).isTrue() - - // WHEN shade fully expanded - shadeRepository.setLegacyShadeExpansion(1f) - runCurrent() - - // THEN anyExpanding is now false - assertThat(actual).isFalse() - - // WHEN shade dragged up a bit - shadeRepository.setLegacyShadeExpansion(.7f) - runCurrent() - - // THEN anyExpanding is still false - assertThat(actual).isFalse() - } - - @Test - fun expanding_shadeDraggedDownThenUp_expandingFalse() = - testScope.runTest() { - val actual by collectLastValue(underTest.isAnyExpanding) - - // GIVEN shade starts collapsed - shadeRepository.setLegacyShadeExpansion(0f) - shadeRepository.setQsExpansion(0f) - runCurrent() - - // WHEN shade expands but doesn't complete - shadeRepository.setLegacyShadeExpansion(.5f) - runCurrent() - shadeRepository.setLegacyShadeExpansion(0f) - runCurrent() - - // THEN anyExpanding is false - assertThat(actual).isFalse() - } - - @Test fun lockscreenShadeExpansion_idle_onScene() = testScope.runTest() { // GIVEN an expansion flow based on transitions to and from a scene diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java index a5f5fc7e36f2..43adc69be13f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java @@ -22,14 +22,18 @@ import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; +import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE; import static android.os.UserHandle.USER_ALL; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; +import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -99,6 +103,7 @@ import java.util.concurrent.Executor; @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper public class NotificationLockscreenUserManagerTest extends SysuiTestCase { + private static final int TEST_PROFILE_USERHANDLE = 12; @Mock private NotificationPresenter mPresenter; @Mock @@ -701,6 +706,60 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { assertFalse(mLockscreenUserManager.userAllowsPrivateNotificationsInPublic(newUserId)); } + @Test + public void testProfileAvailabilityIntent() { + mSetFlagsRule.enableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + mLockscreenUserManager.mCurrentProfiles.clear(); + assertEquals(0, mLockscreenUserManager.mCurrentProfiles.size()); + mLockscreenUserManager.mCurrentProfiles.append(0, mock(UserInfo.class)); + simulateProfileAvailabilityActions(Intent.ACTION_PROFILE_AVAILABLE); + assertEquals(2, mLockscreenUserManager.mCurrentProfiles.size()); + } + + @Test + public void testProfileUnAvailabilityIntent() { + mSetFlagsRule.enableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + mLockscreenUserManager.mCurrentProfiles.clear(); + assertEquals(0, mLockscreenUserManager.mCurrentProfiles.size()); + mLockscreenUserManager.mCurrentProfiles.append(0, mock(UserInfo.class)); + simulateProfileAvailabilityActions(Intent.ACTION_PROFILE_UNAVAILABLE); + assertEquals(2, mLockscreenUserManager.mCurrentProfiles.size()); + } + + @Test + public void testManagedProfileAvailabilityIntent() { + mSetFlagsRule.disableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + mLockscreenUserManager.mCurrentProfiles.clear(); + mLockscreenUserManager.mCurrentManagedProfiles.clear(); + assertEquals(0, mLockscreenUserManager.mCurrentProfiles.size()); + assertEquals(0, mLockscreenUserManager.mCurrentManagedProfiles.size()); + mLockscreenUserManager.mCurrentProfiles.append(0, mock(UserInfo.class)); + simulateProfileAvailabilityActions(Intent.ACTION_MANAGED_PROFILE_AVAILABLE); + assertEquals(2, mLockscreenUserManager.mCurrentProfiles.size()); + assertEquals(1, mLockscreenUserManager.mCurrentManagedProfiles.size()); + } + + @Test + public void testManagedProfileUnAvailabilityIntent() { + mSetFlagsRule.disableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + mLockscreenUserManager.mCurrentProfiles.clear(); + mLockscreenUserManager.mCurrentManagedProfiles.clear(); + assertEquals(0, mLockscreenUserManager.mCurrentProfiles.size()); + assertEquals(0, mLockscreenUserManager.mCurrentManagedProfiles.size()); + mLockscreenUserManager.mCurrentProfiles.append(0, mock(UserInfo.class)); + simulateProfileAvailabilityActions(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + assertEquals(2, mLockscreenUserManager.mCurrentProfiles.size()); + assertEquals(1, mLockscreenUserManager.mCurrentManagedProfiles.size()); + } + + private void simulateProfileAvailabilityActions(String intentAction) { + BroadcastReceiver broadcastReceiver = + mLockscreenUserManager.getBaseBroadcastReceiverForTest(); + final Intent intent = new Intent(intentAction); + intent.putExtra(Intent.EXTRA_USER_HANDLE, TEST_PROFILE_USERHANDLE); + broadcastReceiver.onReceive(mContext, intent); + } + private class TestNotificationLockscreenUserManager extends NotificationLockscreenUserManagerImpl { public TestNotificationLockscreenUserManager(Context context) { diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt index e160548fed78..71e2bc1339a6 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeKeyguardTransitionRepository.kt @@ -42,7 +42,7 @@ class FakeKeyguardTransitionRepository @Inject constructor() : KeyguardTransitio _transitions.emit(step) } - override fun startTransition(info: TransitionInfo, resetIfCanceled: Boolean): UUID? { + override fun startTransition(info: TransitionInfo): UUID? { return if (info.animator == null) UUID.randomUUID() else null } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeUserTracker.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeUserTracker.kt index 4307ff980be4..7494ccf32a2c 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeUserTracker.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/FakeUserTracker.kt @@ -69,10 +69,16 @@ class FakeUserTracker( _userId = _userInfo.id _userHandle = UserHandle.of(_userId) + onBeforeUserSwitching() onUserChanging() onUserChanged() } + fun onBeforeUserSwitching(userId: Int = _userId) { + val copy = callbacks.toList() + copy.forEach { it.onBeforeUserSwitching(userId) } + } + fun onUserChanging(userId: Int = _userId) { val copy = callbacks.toList() copy.forEach { it.onUserChanging(userId, userContext) {} } diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig index f09cb19d0c1d..1a735f89a2bc 100644 --- a/services/accessibility/accessibility.aconfig +++ b/services/accessibility/accessibility.aconfig @@ -43,6 +43,13 @@ flag { } flag { + name: "disable_continuous_shortcut_on_force_stop" + namespace: "accessibility" + description: "When a package is force stopped, remove the button shortcuts of any continuously-running shortcuts." + bug: "198018180" +} + +flag { name: "deprecate_package_list_observer" namespace: "accessibility" description: "Stops using the deprecated PackageListObserver." diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index d28d291537aa..e65a185adfd2 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -16,6 +16,7 @@ package com.android.server.accessibility; +import static android.accessibilityservice.AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON; import static android.accessibilityservice.AccessibilityTrace.FLAGS_ACCESSIBILITY_MANAGER; import static android.accessibilityservice.AccessibilityTrace.FLAGS_ACCESSIBILITY_MANAGER_CLIENT; import static android.accessibilityservice.AccessibilityTrace.FLAGS_ACCESSIBILITY_SERVICE_CLIENT; @@ -182,6 +183,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.Executors; import java.util.function.Consumer; @@ -650,6 +652,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } + /** + * Returns the lock object for any synchronized test blocks. + * Should not be used outside of testing. + * @return lock object. + */ + @VisibleForTesting + Object getLock() { + return mLock; + } + AccessibilityUserState getCurrentUserState() { synchronized (mLock) { return getCurrentUserStateLocked(); @@ -746,6 +758,62 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } + /** + * Handles a package or packages being force stopped. + * Will disable any relevant services, + * and remove any button targets of continuous services, + * denoted by {@link AccessibilityServiceInfo#FLAG_REQUEST_ACCESSIBILITY_BUTTON}. + * If the result is {@code true}, + * then {@link AccessibilityManagerService#onUserStateChangedLocked( + * AccessibilityUserState, boolean)} should be called afterwards. + * + * @param packages list of packages that have stopped. + * @param userState user state to be read & modified. + * @return {@code true} if a service was enabled or a button target was removed, + * {@code false} otherwise. + */ + @VisibleForTesting + boolean onPackagesForceStoppedLocked( + String[] packages, AccessibilityUserState userState) { + final List<String> continuousServicePackages = + userState.mInstalledServices.stream().filter(service -> + (service.flags & FLAG_REQUEST_ACCESSIBILITY_BUTTON) + == FLAG_REQUEST_ACCESSIBILITY_BUTTON + ).map(service -> service.getComponentName().flattenToString()).toList(); + + boolean enabledServicesChanged = false; + final Iterator<ComponentName> it = userState.mEnabledServices.iterator(); + while (it.hasNext()) { + final ComponentName comp = it.next(); + final String compPkg = comp.getPackageName(); + for (String pkg : packages) { + if (compPkg.equals(pkg)) { + it.remove(); + userState.getBindingServicesLocked().remove(comp); + userState.getCrashedServicesLocked().remove(comp); + enabledServicesChanged = true; + } + } + } + if (enabledServicesChanged) { + persistComponentNamesToSettingLocked( + Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, + userState.mEnabledServices, userState.mUserId); + } + + boolean buttonTargetsChanged = userState.mAccessibilityButtonTargets.removeIf( + target -> continuousServicePackages.stream().anyMatch( + pkg -> Objects.equals(target, pkg))); + if (buttonTargetsChanged) { + persistColonDelimitedSetToSettingLocked( + Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, + userState.mUserId, + userState.mAccessibilityButtonTargets, str -> str); + } + + return enabledServicesChanged || buttonTargetsChanged; + } + @VisibleForTesting PackageMonitor getPackageMonitor() { return mPackageMonitor; @@ -850,6 +918,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } + /** + * Handles instances in which a package or packages have forcibly stopped. + * + * @param intent intent containing package event information. + * @param uid linux process user id (different from Android user id). + * @param packages array of package names that have stopped. + * @param doit whether to try and handle the stop or just log the trace. + * + * @return {@code true} if package should be restarted, {@code false} otherwise. + */ @Override public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) { @@ -867,26 +945,36 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub return false; } final AccessibilityUserState userState = getUserStateLocked(userId); - final Iterator<ComponentName> it = userState.mEnabledServices.iterator(); - while (it.hasNext()) { - final ComponentName comp = it.next(); - final String compPkg = comp.getPackageName(); - for (String pkg : packages) { - if (compPkg.equals(pkg)) { - if (!doit) { - return true; + + if (Flags.disableContinuousShortcutOnForceStop()) { + if (doit && onPackagesForceStoppedLocked(packages, userState)) { + onUserStateChangedLocked(userState); + return false; + } else { + return true; + } + } else { + final Iterator<ComponentName> it = userState.mEnabledServices.iterator(); + while (it.hasNext()) { + final ComponentName comp = it.next(); + final String compPkg = comp.getPackageName(); + for (String pkg : packages) { + if (compPkg.equals(pkg)) { + if (!doit) { + return true; + } + it.remove(); + userState.getBindingServicesLocked().remove(comp); + userState.getCrashedServicesLocked().remove(comp); + persistComponentNamesToSettingLocked( + Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, + userState.mEnabledServices, userId); + onUserStateChangedLocked(userState); } - it.remove(); - userState.getBindingServicesLocked().remove(comp); - userState.getCrashedServicesLocked().remove(comp); - persistComponentNamesToSettingLocked( - Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, - userState.mEnabledServices, userId); - onUserStateChangedLocked(userState); } } + return false; } - return false; } } }; @@ -2452,7 +2540,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub * @param userId The user id. * @param outComponentNames The output component names. */ - private void readComponentNamesFromSettingLocked(String settingName, int userId, + @VisibleForTesting + void readComponentNamesFromSettingLocked(String settingName, int userId, Set<ComponentName> outComponentNames) { readColonDelimitedSettingToSet(settingName, userId, str -> ComponentName.unflattenFromString(str), outComponentNames); @@ -2481,7 +2570,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub componentName -> componentName.flattenToShortString()); } - private <T> void readColonDelimitedSettingToSet(String settingName, int userId, + /** + * Reads a colon delimited setting, + * passes the values through a function, + * then stores the values in a provided set. + * + * @param settingName Name of setting. + * @param userId user id corresponding to setting. + * @param toItem function mapping values to the output set. + * @param outSet output set to write to. + * @param <T> type of output set. + */ + @VisibleForTesting + <T> void readColonDelimitedSettingToSet(String settingName, int userId, Function<String, T> toItem, Set<T> outSet) { final String settingValue = Settings.Secure.getStringForUser(mContext.getContentResolver(), settingName, userId); @@ -3475,7 +3576,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub return true; } final boolean requestA11yButton = (serviceInfo.flags - & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; + & FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; if (requestA11yButton && !userState.mEnabledServices.contains(componentName)) { // An a11y service targeting sdk version > Q and request A11y button and is assigned // to a11y btn should be in the enabled list. @@ -3776,7 +3877,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub final int targetSdk = installedServiceInfo.getResolveInfo() .serviceInfo.applicationInfo.targetSdkVersion; final boolean requestA11yButton = (installedServiceInfo.flags - & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; + & FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; // Turns on / off the accessibility service if ((targetSdk <= Build.VERSION_CODES.Q && shortcutType == ACCESSIBILITY_SHORTCUT_KEY) || (targetSdk > Build.VERSION_CODES.Q && !requestA11yButton)) { diff --git a/services/core/Android.bp b/services/core/Android.bp index 1d02e4c88b74..898cdcc30e0f 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -96,11 +96,26 @@ genrule { out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"], } +/* + * This module is used to refer aconfig flag libraries that are + * added to the framework via static_libs. + * These libraries are referred here via libs prevent duplication of classes in both + * the framework and the system server. +*/ +java_defaults { + name: "shared-framework-aconfig-libs", + libs: [ + "display_flags_lib", + "camera_platform_flags_core_java_lib", + ], +} + java_library_static { name: "services.core.unboosted", defaults: [ "platform_service_defaults", "android.hardware.power-java_static", + "shared-framework-aconfig-libs", ], srcs: [ ":android.hardware.biometrics.face-V3-java-source", @@ -181,7 +196,6 @@ java_library_static { "android.hardware.power.stats-V2-java", "android.hidl.manager-V1.2-java", "cbor-java", - "display_flags_lib", "icu4j_calendar_astronomer", "android.security.aaid_aidl-java", "netd-client", @@ -193,7 +207,6 @@ java_library_static { "apache-commons-math", "backstage_power_flags_lib", "notification_flags_lib", - "camera_platform_flags_core_java_lib", "biometrics_flags_lib", "am_flags_lib", ], diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 2d231b3cf42e..aa788ebb6ba7 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -118,6 +118,7 @@ public class SettingsToPropertiesMapper { // The list is sorted. @VisibleForTesting static final String[] sDeviceConfigAconfigScopes = new String[] { + "accessibility", "android_core_networking", "angle", "arc_next", diff --git a/services/core/java/com/android/server/display/DisplayBrightnessState.java b/services/core/java/com/android/server/display/DisplayBrightnessState.java index 425a1af1bbaa..669580189d7c 100644 --- a/services/core/java/com/android/server/display/DisplayBrightnessState.java +++ b/services/core/java/com/android/server/display/DisplayBrightnessState.java @@ -27,6 +27,8 @@ import java.util.Objects; * the DisplayBrightnessModeStrategies when updating the brightness. */ public final class DisplayBrightnessState { + public static final float CUSTOM_ANIMATION_RATE_NOT_SET = -1f; + private final float mBrightness; private final float mSdrBrightness; @@ -37,6 +39,8 @@ public final class DisplayBrightnessState { private final boolean mIsSlowChange; + private final float mCustomAnimationRate; + private DisplayBrightnessState(Builder builder) { mBrightness = builder.getBrightness(); mSdrBrightness = builder.getSdrBrightness(); @@ -45,6 +49,7 @@ public final class DisplayBrightnessState { mShouldUseAutoBrightness = builder.getShouldUseAutoBrightness(); mIsSlowChange = builder.isSlowChange(); mMaxBrightness = builder.getMaxBrightness(); + mCustomAnimationRate = builder.getCustomAnimationRate(); } /** @@ -97,7 +102,12 @@ public final class DisplayBrightnessState { return mMaxBrightness; } - + /** + * @return custom animation rate + */ + public float getCustomAnimationRate() { + return mCustomAnimationRate; + } @Override public String toString() { @@ -112,6 +122,7 @@ public final class DisplayBrightnessState { stringBuilder.append(getShouldUseAutoBrightness()); stringBuilder.append("\n isSlowChange:").append(mIsSlowChange); stringBuilder.append("\n maxBrightness:").append(mMaxBrightness); + stringBuilder.append("\n customAnimationRate:").append(mCustomAnimationRate); return stringBuilder.toString(); } @@ -137,13 +148,14 @@ public final class DisplayBrightnessState { otherState.getDisplayBrightnessStrategyName()) && mShouldUseAutoBrightness == otherState.getShouldUseAutoBrightness() && mIsSlowChange == otherState.isSlowChange() - && mMaxBrightness == otherState.getMaxBrightness(); + && mMaxBrightness == otherState.getMaxBrightness() + && mCustomAnimationRate == otherState.getCustomAnimationRate(); } @Override public int hashCode() { return Objects.hash(mBrightness, mSdrBrightness, mBrightnessReason, - mShouldUseAutoBrightness, mIsSlowChange, mMaxBrightness); + mShouldUseAutoBrightness, mIsSlowChange, mMaxBrightness, mCustomAnimationRate); } /** @@ -164,6 +176,7 @@ public final class DisplayBrightnessState { private boolean mShouldUseAutoBrightness; private boolean mIsSlowChange; private float mMaxBrightness; + private float mCustomAnimationRate = CUSTOM_ANIMATION_RATE_NOT_SET; /** * Create a builder starting with the values from the specified {@link @@ -180,6 +193,7 @@ public final class DisplayBrightnessState { builder.setShouldUseAutoBrightness(state.getShouldUseAutoBrightness()); builder.setIsSlowChange(state.isSlowChange()); builder.setMaxBrightness(state.getMaxBrightness()); + builder.setCustomAnimationRate(state.getCustomAnimationRate()); return builder; } @@ -303,6 +317,22 @@ public final class DisplayBrightnessState { return mMaxBrightness; } + + /** + * See {@link DisplayBrightnessState#getCustomAnimationRate()}. + */ + public Builder setCustomAnimationRate(float animationRate) { + this.mCustomAnimationRate = animationRate; + return this; + } + + /** + * See {@link DisplayBrightnessState#getCustomAnimationRate()}. + */ + public float getCustomAnimationRate() { + return mCustomAnimationRate; + } + /** * This is used to construct an immutable DisplayBrightnessState object from its builder */ diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index cb2302a60248..a7889684aeea 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -586,7 +586,8 @@ public final class DisplayManagerService extends SystemService { mSystemReady = false; mConfigParameterProvider = new DeviceConfigParameterProvider(DeviceConfigInterface.REAL); mExtraDisplayLoggingPackageName = DisplayProperties.debug_vri_package().orElse(null); - mExtraDisplayEventLogging = !TextUtils.isEmpty(mExtraDisplayLoggingPackageName); + // TODO: b/306170135 - return TextUtils package name check instead + mExtraDisplayEventLogging = true; } public void setupSchedulerPolicies() { @@ -2933,8 +2934,15 @@ public final class DisplayManagerService extends SystemService { // Send a display event if the display is enabled private void sendDisplayEventIfEnabledLocked(@NonNull LogicalDisplay display, @DisplayEvent int event) { + final boolean displayIsEnabled = display.isEnabledLocked(); + if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { + Trace.instant(Trace.TRACE_TAG_POWER, + "sendDisplayEventLocked#event=" + event + ",displayEnabled=" + + displayIsEnabled); + } + // Only send updates outside of DisplayManagerService for enabled displays - if (display.isEnabledLocked()) { + if (displayIsEnabled) { sendDisplayEventLocked(display, event); } else if (mExtraDisplayEventLogging) { Slog.i(TAG, "Not Sending Display Event; display is not enabled: " + display); @@ -2991,7 +2999,11 @@ public final class DisplayManagerService extends SystemService { + displayId + ", event=" + event + (uids != null ? ", uids=" + uids : "")); } - + if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { + Trace.instant(Trace.TRACE_TAG_POWER, + "deliverDisplayEvent#event=" + event + ",displayId=" + + displayId + (uids != null ? ", uids=" + uids : "")); + } // Grab the lock and copy the callbacks. final int count; synchronized (mSyncRoot) { @@ -3031,7 +3043,8 @@ public final class DisplayManagerService extends SystemService { } private boolean extraLogging(String packageName) { - return mExtraDisplayEventLogging && mExtraDisplayLoggingPackageName.equals(packageName); + // TODO: b/306170135 - return mExtraDisplayLoggingPackageName & package name check instead + return true; } // Runs on Handler thread. @@ -3498,10 +3511,13 @@ public final class DisplayManagerService extends SystemService { @Override public void binderDied() { - if (DEBUG || mExtraDisplayEventLogging && mExtraDisplayLoggingPackageName.equals( - mPackageName)) { + if (DEBUG || extraLogging(mPackageName)) { Slog.d(TAG, "Display listener for pid " + mPid + " died."); } + if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { + Trace.instant(Trace.TRACE_TAG_POWER, + "displayManagerBinderDied#mPid=" + mPid); + } onCallbackDied(this); } @@ -3510,11 +3526,15 @@ public final class DisplayManagerService extends SystemService { */ public boolean notifyDisplayEventAsync(int displayId, @DisplayEvent int event) { if (!shouldSendEvent(event)) { - if (mExtraDisplayEventLogging && mExtraDisplayLoggingPackageName.equals( - mPackageName)) { + if (extraLogging(mPackageName)) { Slog.i(TAG, "Not sending displayEvent: " + event + " due to mask:" + mEventsMask); } + if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { + Trace.instant(Trace.TRACE_TAG_POWER, + "notifyDisplayEventAsync#notSendingEvent=" + event + ",mEventsMask=" + + mEventsMask); + } return true; } diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 7d9c0182a691..0f0002781f93 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -561,8 +561,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal brightnessSetting, () -> postBrightnessChangeRunnable(), new HandlerExecutor(mHandler)); - mBrightnessClamperController = new BrightnessClamperController(mHandler, - modeChangeCallback::run, new BrightnessClamperController.DisplayDeviceData( + mBrightnessClamperController = mInjector.getBrightnessClamperController( + mHandler, modeChangeCallback::run, + new BrightnessClamperController.DisplayDeviceData( mUniqueDisplayId, mThermalBrightnessThrottlingDataId, logicalDisplay.getPowerThrottlingDataIdLocked(), @@ -1353,6 +1354,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal float rawBrightnessState = displayBrightnessState.getBrightness(); mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason()); boolean slowChange = displayBrightnessState.isSlowChange(); + // custom transition duration + float customAnimationRate = displayBrightnessState.getCustomAnimationRate(); // Set up the ScreenOff controller used when coming out of SCREEN_OFF and the ALS sensor // doesn't yet have a valid lux value to use with auto-brightness. @@ -1485,6 +1488,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal brightnessState = clampedState.getBrightness(); slowChange = clampedState.isSlowChange(); + // faster rate wins, at this point customAnimationRate == -1, strategy does not control + // customAnimationRate. Should be revisited if strategy start setting this value + customAnimationRate = Math.max(customAnimationRate, clampedState.getCustomAnimationRate()); mBrightnessReasonTemp.addModifier(clampedState.getBrightnessReason().getModifier()); if (updateScreenBrightnessSetting) { @@ -1553,9 +1559,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // allowed range. float animateValue = clampScreenBrightness(brightnessState); - // custom transition duration - float customTransitionRate = -1f; - // If there are any HDR layers on the screen, we have a special brightness value that we // use instead. We still preserve the calculated brightness for Standard Dynamic Range // (SDR) layers, but the main brightness value will be the one for HDR. @@ -1570,10 +1573,21 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // We want to scale HDR brightness level with the SDR level, we also need to restore // SDR brightness immediately when entering dim or low power mode. animateValue = mBrightnessRangeController.getHdrBrightnessValue(); - customTransitionRate = mBrightnessRangeController.getHdrTransitionRate(); + customAnimationRate = Math.max(customAnimationRate, + mBrightnessRangeController.getHdrTransitionRate()); mBrightnessReasonTemp.addModifier(BrightnessReason.MODIFIER_HDR); } + // if doze or suspend state is requested, we want to finish brightnes animation fast + // to allow state animation to start + if (mPowerRequest.policy == DisplayManagerInternal.DisplayPowerRequest.POLICY_DOZE + && (mPowerRequest.dozeScreenState == Display.STATE_UNKNOWN // dozing + || mPowerRequest.dozeScreenState == Display.STATE_DOZE_SUSPEND + || mPowerRequest.dozeScreenState == Display.STATE_ON_SUSPEND)) { + customAnimationRate = DisplayBrightnessState.CUSTOM_ANIMATION_RATE_NOT_SET; + slowChange = false; + } + final float currentBrightness = mPowerState.getScreenBrightness(); final float currentSdrBrightness = mPowerState.getSdrScreenBrightness(); @@ -1601,9 +1615,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal if (skipAnimation) { animateScreenBrightness(animateValue, sdrAnimateValue, SCREEN_ANIMATION_RATE_MINIMUM); - } else if (customTransitionRate > 0) { + } else if (customAnimationRate > 0) { animateScreenBrightness(animateValue, sdrAnimateValue, - customTransitionRate, /* ignoreAnimationLimits = */true); + customAnimationRate, /* ignoreAnimationLimits = */true); } else { boolean isIncreasing = animateValue > currentBrightness; final float rampSpeed; @@ -3059,6 +3073,15 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal modeChangeCallback, displayDeviceConfig, handler, flags, displayToken, info); } + BrightnessClamperController getBrightnessClamperController(Handler handler, + BrightnessClamperController.ClamperChangeListener clamperChangeListener, + BrightnessClamperController.DisplayDeviceData data, Context context, + DisplayManagerFlags flags) { + + return new BrightnessClamperController(handler, clamperChangeListener, data, context, + flags); + } + DisplayWhiteBalanceController getDisplayWhiteBalanceController(Handler handler, SensorManager sensorManager, Resources resources) { return DisplayWhiteBalanceFactory.create(handler, diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamper.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamper.java index 68f72d3b085a..dfcda40d8e3c 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamper.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamper.java @@ -19,6 +19,8 @@ package com.android.server.display.brightness.clamper; import android.annotation.NonNull; import android.os.PowerManager; +import com.android.server.display.DisplayBrightnessState; + import java.io.PrintWriter; /** @@ -33,6 +35,10 @@ abstract class BrightnessClamper<T> { return mBrightnessCap; } + float getCustomAnimationRate() { + return DisplayBrightnessState.CUSTOM_ANIMATION_RATE_NOT_SET; + } + boolean isActive() { return mIsActive; } diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java index 787f786a97da..b57491949196 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java @@ -51,6 +51,7 @@ import java.util.concurrent.Executor; */ public class BrightnessClamperController { private static final String TAG = "BrightnessClamperController"; + private final DeviceConfigParameterProvider mDeviceConfigParameterProvider; private final Handler mHandler; private final ClamperChangeListener mClamperChangeListenerExternal; @@ -60,6 +61,8 @@ public class BrightnessClamperController { private final List<BrightnessModifier> mModifiers; private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener; private float mBrightnessCap = PowerManager.BRIGHTNESS_MAX; + + private float mCustomAnimationRate = DisplayBrightnessState.CUSTOM_ANIMATION_RATE_NOT_SET; @Nullable private Type mClamperType = null; private boolean mClamperApplied = false; @@ -113,6 +116,7 @@ public class BrightnessClamperController { builder.setIsSlowChange(slowChange); builder.setBrightness(cappedBrightness); builder.setMaxBrightness(mBrightnessCap); + builder.setCustomAnimationRate(mCustomAnimationRate); if (mClamperType != null) { builder.getBrightnessReason().addModifier(BrightnessReason.MODIFIER_THROTTLED); @@ -182,6 +186,7 @@ public class BrightnessClamperController { private void recalculateBrightnessCap() { float brightnessCap = PowerManager.BRIGHTNESS_MAX; Type clamperType = null; + float customAnimationRate = DisplayBrightnessState.CUSTOM_ANIMATION_RATE_NOT_SET; BrightnessClamper<?> minClamper = mClampers.stream() .filter(BrightnessClamper::isActive) @@ -191,11 +196,14 @@ public class BrightnessClamperController { if (minClamper != null) { brightnessCap = minClamper.getBrightnessCap(); clamperType = minClamper.getType(); + customAnimationRate = minClamper.getCustomAnimationRate(); } - if (mBrightnessCap != brightnessCap || mClamperType != clamperType) { + if (mBrightnessCap != brightnessCap || mClamperType != clamperType + || mCustomAnimationRate != customAnimationRate) { mBrightnessCap = brightnessCap; mClamperType = clamperType; + mCustomAnimationRate = customAnimationRate; mClamperChangeListenerExternal.onChanged(); } diff --git a/services/core/java/com/android/server/display/brightness/clamper/HdrClamper.java b/services/core/java/com/android/server/display/brightness/clamper/HdrClamper.java index 39f0b13f716a..200d88a78dd7 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/HdrClamper.java +++ b/services/core/java/com/android/server/display/brightness/clamper/HdrClamper.java @@ -24,7 +24,6 @@ import android.os.PowerManager; import android.view.SurfaceControlHdrLayerInfoListener; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.display.BrightnessUtils; import com.android.server.display.config.HdrBrightnessData; import java.io.PrintWriter; @@ -176,21 +175,14 @@ public class HdrClamper { } else if (mDesiredMaxBrightness != expectedMaxBrightness) { mDesiredMaxBrightness = expectedMaxBrightness; long debounceTime; - long transitionDuration; if (mDesiredMaxBrightness > mMaxBrightness) { debounceTime = mHdrBrightnessData.mBrightnessIncreaseDebounceMillis; - transitionDuration = mHdrBrightnessData.mBrightnessIncreaseDurationMillis; + mDesiredTransitionRate = mHdrBrightnessData.mScreenBrightnessRampIncrease; } else { debounceTime = mHdrBrightnessData.mBrightnessDecreaseDebounceMillis; - transitionDuration = mHdrBrightnessData.mBrightnessDecreaseDurationMillis; + mDesiredTransitionRate = mHdrBrightnessData.mScreenBrightnessRampDecrease; } - float maxHlg = BrightnessUtils.convertLinearToGamma(mMaxBrightness); - float desiredMaxHlg = BrightnessUtils.convertLinearToGamma(mDesiredMaxBrightness); - - mDesiredTransitionRate = Math.abs( - (maxHlg - desiredMaxHlg) * 1000f / transitionDuration); - mHandler.removeCallbacks(mDebouncer); mHandler.postDelayed(mDebouncer, debounceTime); } diff --git a/services/core/java/com/android/server/display/config/HdrBrightnessData.java b/services/core/java/com/android/server/display/config/HdrBrightnessData.java index 48d671d356f7..837fbf7ca17c 100644 --- a/services/core/java/com/android/server/display/config/HdrBrightnessData.java +++ b/services/core/java/com/android/server/display/config/HdrBrightnessData.java @@ -40,9 +40,9 @@ public class HdrBrightnessData { public final long mBrightnessIncreaseDebounceMillis; /** - * Brightness increase animation duration + * Brightness increase animation speed */ - public final long mBrightnessIncreaseDurationMillis; + public final float mScreenBrightnessRampIncrease; /** * Debounce time for brightness decrease @@ -50,19 +50,19 @@ public class HdrBrightnessData { public final long mBrightnessDecreaseDebounceMillis; /** - * Brightness decrease animation duration + * Brightness decrease animation speed */ - public final long mBrightnessDecreaseDurationMillis; + public final float mScreenBrightnessRampDecrease; @VisibleForTesting public HdrBrightnessData(Map<Float, Float> maxBrightnessLimits, - long brightnessIncreaseDebounceMillis, long brightnessIncreaseDurationMillis, - long brightnessDecreaseDebounceMillis, long brightnessDecreaseDurationMillis) { + long brightnessIncreaseDebounceMillis, float screenBrightnessRampIncrease, + long brightnessDecreaseDebounceMillis, float screenBrightnessRampDecrease) { mMaxBrightnessLimits = maxBrightnessLimits; mBrightnessIncreaseDebounceMillis = brightnessIncreaseDebounceMillis; - mBrightnessIncreaseDurationMillis = brightnessIncreaseDurationMillis; + mScreenBrightnessRampIncrease = screenBrightnessRampIncrease; mBrightnessDecreaseDebounceMillis = brightnessDecreaseDebounceMillis; - mBrightnessDecreaseDurationMillis = brightnessDecreaseDurationMillis; + mScreenBrightnessRampDecrease = screenBrightnessRampDecrease; } @Override @@ -70,9 +70,9 @@ public class HdrBrightnessData { return "HdrBrightnessData {" + "mMaxBrightnessLimits: " + mMaxBrightnessLimits + ", mBrightnessIncreaseDebounceMillis: " + mBrightnessIncreaseDebounceMillis - + ", mBrightnessIncreaseDurationMillis: " + mBrightnessIncreaseDurationMillis + + ", mScreenBrightnessRampIncrease: " + mScreenBrightnessRampIncrease + ", mBrightnessDecreaseDebounceMillis: " + mBrightnessDecreaseDebounceMillis - + ", mBrightnessDecreaseDurationMillis: " + mBrightnessDecreaseDurationMillis + + ", mScreenBrightnessRampDecrease: " + mScreenBrightnessRampDecrease + "} "; } @@ -94,8 +94,8 @@ public class HdrBrightnessData { return new HdrBrightnessData(brightnessLimits, hdrConfig.getBrightnessIncreaseDebounceMillis().longValue(), - hdrConfig.getBrightnessIncreaseDurationMillis().longValue(), + hdrConfig.getScreenBrightnessRampIncrease().floatValue(), hdrConfig.getBrightnessDecreaseDebounceMillis().longValue(), - hdrConfig.getBrightnessDecreaseDurationMillis().longValue()); + hdrConfig.getScreenBrightnessRampDecrease().floatValue()); } } diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index f168f435b5d7..f35b045471a6 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -240,6 +240,10 @@ public class LockSettingsService extends ILockSettings.Stub { private static final String LSKF_LAST_CHANGED_TIME_KEY = "sp-handle-ts"; private static final String USER_SERIAL_NUMBER_KEY = "serial-number"; + private static final String MIGRATED_FRP2 = "migrated_frp2"; + private static final String MIGRATED_KEYSTORE_NS = "migrated_keystore_namespace"; + private static final String MIGRATED_SP_CE_ONLY = "migrated_all_users_to_sp_and_bound_ce"; + // Duration that LockSettingsService will store the gatekeeper password for. This allows // multiple biometric enrollments without prompting the user to enter their password via // ConfirmLockPassword/ConfirmLockPattern multiple times. This needs to be at least the duration @@ -909,14 +913,14 @@ public class LockSettingsService extends ILockSettings.Stub { } private void migrateOldData() { - if (getString("migrated_keystore_namespace", null, 0) == null) { + if (getString(MIGRATED_KEYSTORE_NS, null, 0) == null) { boolean success = true; synchronized (mSpManager) { success &= mSpManager.migrateKeyNamespace(); } success &= migrateProfileLockKeys(); if (success) { - setString("migrated_keystore_namespace", "true", 0); + setString(MIGRATED_KEYSTORE_NS, "true", 0); Slog.i(TAG, "Migrated keys to LSS namespace"); } else { Slog.w(TAG, "Failed to migrate keys to LSS namespace"); @@ -936,9 +940,9 @@ public class LockSettingsService extends ILockSettings.Stub { // "migrated_frp" to "migrated_frp2" to cause migrateFrpCredential() to run again on devices // where it had run before. if (LockPatternUtils.frpCredentialEnabled(mContext) - && !getBoolean("migrated_frp2", false, 0)) { + && !getBoolean(MIGRATED_FRP2, false, 0)) { migrateFrpCredential(); - setBoolean("migrated_frp2", true, 0); + setBoolean(MIGRATED_FRP2, true, 0); } } @@ -1028,14 +1032,14 @@ public class LockSettingsService extends ILockSettings.Stub { // If this gets interrupted (e.g. by the device powering off), there shouldn't be a // problem since this will run again on the next boot, and setUserKeyProtection() is // okay with the key being already protected by the given secret. - if (getString("migrated_all_users_to_sp_and_bound_ce", null, 0) == null) { + if (getString(MIGRATED_SP_CE_ONLY, null, 0) == null) { for (UserInfo user : mUserManager.getAliveUsers()) { removeStateForReusedUserIdIfNecessary(user.id, user.serialNumber); synchronized (mSpManager) { migrateUserToSpWithBoundCeKeyLocked(user.id); } } - setString("migrated_all_users_to_sp_and_bound_ce", "true", 0); + setString(MIGRATED_SP_CE_ONLY, "true", 0); } mThirdPartyAppsStarted = true; @@ -1062,7 +1066,7 @@ public class LockSettingsService extends ILockSettings.Stub { Slogf.wtf(TAG, "Failed to unwrap synthetic password for unsecured user %d", userId); return; } - setUserKeyProtection(userId, result.syntheticPassword.deriveFileBasedEncryptionKey()); + setUserKeyProtection(userId, result.syntheticPassword); } } @@ -1347,8 +1351,8 @@ public class LockSettingsService extends ILockSettings.Stub { AndroidKeyStoreMaintenance.onUserPasswordChanged(userHandle, password); } - private void unlockKeystore(byte[] password, int userHandle) { - Authorization.onLockScreenEvent(false, userHandle, password, null); + private void unlockKeystore(int userId, SyntheticPassword sp) { + Authorization.onLockScreenEvent(false, userId, sp.deriveKeyStorePassword(), null); } @VisibleForTesting /** Note: this method is overridden in unit tests */ @@ -2001,7 +2005,8 @@ public class LockSettingsService extends ILockSettings.Stub { mStorage.writeChildProfileLock(profileUserId, ArrayUtils.concat(iv, ciphertext)); } - private void setUserKeyProtection(@UserIdInt int userId, byte[] secret) { + private void setUserKeyProtection(@UserIdInt int userId, SyntheticPassword sp) { + final byte[] secret = sp.deriveFileBasedEncryptionKey(); final long callingId = Binder.clearCallingIdentity(); try { mStorageManager.setUserKeyProtection(userId, secret); @@ -2045,7 +2050,9 @@ public class LockSettingsService extends ILockSettings.Stub { } } - private void unlockUserKeyIfUnsecured(@UserIdInt int userId) { + @Override + public void unlockUserKeyIfUnsecured(@UserIdInt int userId) { + checkPasswordReadPermission(); synchronized (mSpManager) { if (isUserKeyUnlocked(userId)) { Slogf.d(TAG, "CE storage for user %d is already unlocked", userId); @@ -2768,7 +2775,7 @@ public class LockSettingsService extends ILockSettings.Stub { final long protectorId = mSpManager.createLskfBasedProtector(getGateKeeperService(), LockscreenCredential.createNone(), sp, userId); setCurrentLskfBasedProtectorId(protectorId, userId); - setUserKeyProtection(userId, sp.deriveFileBasedEncryptionKey()); + setUserKeyProtection(userId, sp); onSyntheticPasswordCreated(userId, sp); Slogf.i(TAG, "Successfully initialized synthetic password for user %d", userId); return sp; @@ -2827,7 +2834,7 @@ public class LockSettingsService extends ILockSettings.Stub { } } - unlockKeystore(sp.deriveKeyStorePassword(), userId); + unlockKeystore(userId, sp); unlockUserKey(userId, sp); @@ -2894,7 +2901,7 @@ public class LockSettingsService extends ILockSettings.Stub { mSpManager.clearSidForUser(userId); gateKeeperClearSecureUserId(userId); unlockUserKey(userId, sp); - unlockKeystore(sp.deriveKeyStorePassword(), userId); + unlockKeystore(userId, sp); setKeystorePassword(null, userId); removeBiometricsForUser(userId); } @@ -3454,11 +3461,6 @@ public class LockSettingsService extends ILockSettings.Stub { } @Override - public void unlockUserKeyIfUnsecured(@UserIdInt int userId) { - LockSettingsService.this.unlockUserKeyIfUnsecured(userId); - } - - @Override public void createNewUser(@UserIdInt int userId, int userSerialNumber) { LockSettingsService.this.createNewUser(userId, userSerialNumber); } diff --git a/services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java b/services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java index df95c69e7271..4bac872dbaa9 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java @@ -174,7 +174,7 @@ class LockSettingsShellCommand extends ShellCommand { pw.println(" Sets the lock screen as PIN, using the given PIN to unlock."); pw.println(""); pw.println(" set-password [--old <CREDENTIAL>] [--user USER_ID] <PASSWORD>"); - pw.println(" Sets the lock screen as password, using the given PASSOWRD to unlock."); + pw.println(" Sets the lock screen as password, using the given PASSWORD to unlock."); pw.println(""); pw.println(" clear [--old <CREDENTIAL>] [--user USER_ID]"); pw.println(" Clears the lock credentials."); diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 0e8f90795ef9..2c595116afed 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -268,7 +268,14 @@ public class MediaSessionService extends SystemService implements Monitor { } if (record.isSystemPriority()) { if (DEBUG_KEY_EVENT) { - Log.d(TAG, "Global priority session is updated, active=" + record.isActive()); + Log.d( + TAG, + "Global priority session updated - user id=" + + record.getUserId() + + " package=" + + record.getPackageName() + + " active=" + + record.isActive()); } user.pushAddressedPlayerChangedLocked(); } else { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index b4d36db96c01..7ca56990f2d0 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -71,6 +71,7 @@ import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; +import static android.os.Flags.allowPrivateProfile; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; import static android.os.PowerWhitelistManager.REASON_NOTIFICATION_SERVICE; @@ -289,7 +290,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.compat.IPlatformCompat; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags; -import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags; import com.android.internal.logging.InstanceId; import com.android.internal.logging.InstanceIdSequence; import com.android.internal.logging.MetricsLogger; @@ -1179,7 +1179,7 @@ public class NotificationManagerService extends SystemService { @Override public void onSetDisabled(int status) { synchronized (mNotificationLock) { - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.updateDisableNotificationEffectsLocked(status); } else { mDisableNotificationEffects = @@ -1325,7 +1325,7 @@ public class NotificationManagerService extends SystemService { public void clearEffects() { synchronized (mNotificationLock) { if (DBG) Slog.d(TAG, "clearEffects"); - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.clearAttentionEffects(); } else { clearSoundLocked(); @@ -1554,8 +1554,7 @@ public class NotificationManagerService extends SystemService { int changedFlags = data.getFlags() ^ flags; if ((changedFlags & FLAG_SUPPRESS_NOTIFICATION) != 0) { // Suppress notification flag changed, clear any effects - if (mFlagResolver.isEnabled( - NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.clearEffectsLocked(key); } else { clearEffectsLocked(key); @@ -1904,7 +1903,7 @@ public class NotificationManagerService extends SystemService { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - if (!mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (!Flags.refactorAttentionHelper()) { if (action.equals(Intent.ACTION_SCREEN_ON)) { // Keep track of screen on/off state, but do not turn off the notification light // until user passes through the lock screen or views the notification. @@ -1931,7 +1930,8 @@ public class NotificationManagerService extends SystemService { cancelAllNotificationsInt(MY_UID, MY_PID, null, null, 0, 0, userHandle, REASON_USER_STOPPED); } - } else if (action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) { + } else if ( + isProfileUnavailable(action)) { int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); if (userHandle >= 0 && !mDpm.isKeepProfilesRunningEnabled()) { cancelAllNotificationsInt(MY_UID, MY_PID, null, null, 0, 0, userHandle, @@ -1982,6 +1982,12 @@ public class NotificationManagerService extends SystemService { } } } + + private boolean isProfileUnavailable(String action) { + return allowPrivateProfile() ? + action.equals(Intent.ACTION_PROFILE_UNAVAILABLE) : + action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + } }; private final class SettingsObserver extends ContentObserver { @@ -2011,7 +2017,7 @@ public class NotificationManagerService extends SystemService { ContentResolver resolver = getContext().getContentResolver(); resolver.registerContentObserver(NOTIFICATION_BADGING_URI, false, this, UserHandle.USER_ALL); - if (!mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (!Flags.refactorAttentionHelper()) { resolver.registerContentObserver(NOTIFICATION_LIGHT_PULSE_URI, false, this, UserHandle.USER_ALL); } @@ -2037,7 +2043,7 @@ public class NotificationManagerService extends SystemService { public void update(Uri uri) { ContentResolver resolver = getContext().getContentResolver(); - if (!mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (!Flags.refactorAttentionHelper()) { if (uri == null || NOTIFICATION_LIGHT_PULSE_URI.equals(uri)) { boolean pulseEnabled = Settings.System.getIntForUser(resolver, Settings.System.NOTIFICATION_LIGHT_PULSE, 0, UserHandle.USER_CURRENT) @@ -2530,7 +2536,7 @@ public class NotificationManagerService extends SystemService { mToastRateLimiter = toastRateLimiter; - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper = new NotificationAttentionHelper(getContext(), lightsManager, mAccessibilityManager, mPackageManagerClient, userManager, usageStats, mNotificationManagerPrivate, mZenModeHelper, flagResolver); @@ -2540,7 +2546,7 @@ public class NotificationManagerService extends SystemService { // If this is called within a test, make sure to unregister the intent receivers by // calling onDestroy() IntentFilter filter = new IntentFilter(); - if (!mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (!Flags.refactorAttentionHelper()) { filter.addAction(Intent.ACTION_SCREEN_ON); filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED); @@ -2552,6 +2558,9 @@ public class NotificationManagerService extends SystemService { filter.addAction(Intent.ACTION_USER_REMOVED); filter.addAction(Intent.ACTION_USER_UNLOCKED); filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + if (allowPrivateProfile()){ + filter.addAction(Intent.ACTION_PROFILE_UNAVAILABLE); + } getContext().registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, filter, null, null); IntentFilter pkgFilter = new IntentFilter(); @@ -2865,7 +2874,7 @@ public class NotificationManagerService extends SystemService { } registerNotificationPreferencesPullers(); new LockPatternUtils(getContext()).registerStrongAuthTracker(mStrongAuthTracker); - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.onSystemReady(); } } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) { @@ -6490,7 +6499,7 @@ public class NotificationManagerService extends SystemService { pw.println(" mMaxPackageEnqueueRate=" + mMaxPackageEnqueueRate); pw.println(" hideSilentStatusBar=" + mPreferencesHelper.shouldHideSilentStatusIcons()); - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.dump(pw, " ", filter); } } @@ -7756,7 +7765,7 @@ public class NotificationManagerService extends SystemService { boolean wasPosted = removeFromNotificationListsLocked(r); cancelNotificationLocked(r, false, REASON_SNOOZED, wasPosted, null, SystemClock.elapsedRealtime()); - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.updateLightsLocked(); } else { updateLightsLocked(); @@ -7889,7 +7898,7 @@ public class NotificationManagerService extends SystemService { cancelGroupChildrenLocked(r, mCallingUid, mCallingPid, listenerName, mSendDelete, childrenFlagChecker, mReason, mCancellationElapsedTimeMs); - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.updateLightsLocked(); } else { updateLightsLocked(); @@ -8186,7 +8195,7 @@ public class NotificationManagerService extends SystemService { int buzzBeepBlinkLoggingCode = 0; if (!r.isHidden()) { - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { buzzBeepBlinkLoggingCode = mAttentionHelper.buzzBeepBlinkLocked(r, new NotificationAttentionHelper.Signals( mUserProfiles.isCurrentProfile(r.getUserId()), @@ -9173,7 +9182,7 @@ public class NotificationManagerService extends SystemService { || interruptiveChanged; if (interceptBefore && !record.isIntercepted() && record.isNewEnoughForAlerting(System.currentTimeMillis())) { - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.buzzBeepBlinkLocked(record, new NotificationAttentionHelper.Signals( mUserProfiles.isCurrentProfile(record.getUserId()), mListenerHints)); @@ -9553,7 +9562,7 @@ public class NotificationManagerService extends SystemService { }); } - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.clearEffectsLocked(canceledKey); } else { // sound @@ -9917,7 +9926,7 @@ public class NotificationManagerService extends SystemService { cancellationElapsedTimeMs); } } - if (mFlagResolver.isEnabled(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mAttentionHelper.updateLightsLocked(); } else { updateLightsLocked(); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 839b6998bd8b..61b6b24ba97e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4566,6 +4566,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final Bundle extras = new Bundle(); extras.putInt(Intent.EXTRA_UID, pmi.getPackageUid(packageName, 0, userId)); extras.putInt(Intent.EXTRA_USER_HANDLE, userId); + extras.putLong(Intent.EXTRA_TIME, SystemClock.elapsedRealtime()); mHandler.post(() -> { mBroadcastHelper.sendPackageBroadcast(Intent.ACTION_PACKAGE_UNSTOPPED, packageName, extras, @@ -6969,6 +6970,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final Bundle extras = new Bundle(); extras.putInt(Intent.EXTRA_UID, uid); extras.putInt(Intent.EXTRA_USER_HANDLE, userId); + extras.putLong(Intent.EXTRA_TIME, SystemClock.elapsedRealtime()); mHandler.post(() -> { mBroadcastHelper.sendPackageBroadcast(Intent.ACTION_PACKAGE_RESTARTED, packageName, extras, diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java index 3ca933a66656..42f4cfb8b4df 100644 --- a/services/core/java/com/android/server/pm/PackageSetting.java +++ b/services/core/java/com/android/server/pm/PackageSetting.java @@ -238,34 +238,16 @@ public class PackageSetting extends SettingBase implements PackageStateInternal } @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) - public PackageSetting(String name, String realName, @NonNull File path, - String legacyNativeLibraryPath, String primaryCpuAbi, - String secondaryCpuAbi, String cpuAbiOverride, - long longVersionCode, int pkgFlags, int pkgPrivateFlags, - int sharedUserAppId, - String[] usesSdkLibraries, long[] usesSdkLibrariesVersionsMajor, - String[] usesStaticLibraries, long[] usesStaticLibrariesVersions, - Map<String, Set<String>> mimeGroups, - @NonNull UUID domainSetId) { + public PackageSetting(@NonNull String name, @Nullable String realName, @NonNull File path, + int pkgFlags, int pkgPrivateFlags, @NonNull UUID domainSetId) { super(pkgFlags, pkgPrivateFlags); this.mName = name; this.mRealName = realName; - this.usesSdkLibraries = usesSdkLibraries; - this.usesSdkLibrariesVersionsMajor = usesSdkLibrariesVersionsMajor; - this.usesStaticLibraries = usesStaticLibraries; - this.usesStaticLibrariesVersions = usesStaticLibrariesVersions; this.mPath = path; this.mPathString = path.toString(); - this.legacyNativeLibraryPath = legacyNativeLibraryPath; - this.mPrimaryCpuAbi = primaryCpuAbi; - this.mSecondaryCpuAbi = secondaryCpuAbi; - this.mCpuAbiOverride = cpuAbiOverride; - this.versionCode = longVersionCode; this.signatures = new PackageSignatures(); this.installSource = InstallSource.EMPTY; - this.mSharedUserAppId = sharedUserAppId; - mDomainSetId = domainSetId; - copyMimeGroups(mimeGroups); + this.mDomainSetId = domainSetId; mSnapshot = makeCache(); } @@ -536,9 +518,10 @@ public class PackageSetting extends SettingBase implements PackageStateInternal return this; } - public void setSharedUserAppId(int sharedUserAppId) { + public PackageSetting setSharedUserAppId(int sharedUserAppId) { mSharedUserAppId = sharedUserAppId; onChanged(); + return this; } public PackageSetting setIsPersistent(boolean isPersistent) { @@ -576,7 +559,7 @@ public class PackageSetting extends SettingBase implements PackageStateInternal + " " + mName + "/" + mAppId + "}"; } - protected void copyMimeGroups(@Nullable Map<String, Set<String>> newMimeGroups) { + private void copyMimeGroups(@Nullable Map<String, Set<String>> newMimeGroups) { if (newMimeGroups == null) { mimeGroups = null; return; @@ -1250,7 +1233,8 @@ public class PackageSetting extends SettingBase implements PackageStateInternal /** * @see #mPath */ - PackageSetting setPath(@NonNull File path) { + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + public PackageSetting setPath(@NonNull File path) { this.mPath = path; this.mPathString = path.toString(); onChanged(); @@ -1451,9 +1435,11 @@ public class PackageSetting extends SettingBase implements PackageStateInternal return this; } - public PackageSetting setMimeGroups(@NonNull Map<String, Set<String>> mimeGroups) { - this.mimeGroups = mimeGroups; - onChanged(); + public PackageSetting setMimeGroups(@Nullable Map<String, Set<String>> mimeGroups) { + if (mimeGroups != null) { + copyMimeGroups(mimeGroups); + onChanged(); + } return this; } diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index e726d91c30a0..a39178ec4baa 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -931,16 +931,24 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile sharedUserSetting.mDisabledPackages.remove(p); } p.getPkgState().setUpdatedSystemApp(false); - PackageSetting ret = addPackageLPw(name, p.getRealName(), p.getPath(), - p.getLegacyNativeLibraryPath(), p.getPrimaryCpuAbiLegacy(), - p.getSecondaryCpuAbiLegacy(), p.getCpuAbiOverride(), - p.getAppId(), p.getVersionCode(), p.getFlags(), p.getPrivateFlags(), - p.getUsesSdkLibraries(), p.getUsesSdkLibrariesVersionsMajor(), - p.getUsesStaticLibraries(), p.getUsesStaticLibrariesVersions(), p.getMimeGroups(), - mDomainVerificationManager.generateNewId()); + PackageSetting ret = addPackageLPw(name, p.getRealName(), p.getPath(), p.getAppId(), + p.getFlags(), p.getPrivateFlags(), mDomainVerificationManager.generateNewId()); if (ret != null) { + ret.setLegacyNativeLibraryPath(p.getLegacyNativeLibraryPath()); + ret.setPrimaryCpuAbi(p.getPrimaryCpuAbiLegacy()); + ret.setSecondaryCpuAbi(p.getSecondaryCpuAbiLegacy()); + ret.setCpuAbiOverride(p.getCpuAbiOverride()); + ret.setLongVersionCode(p.getVersionCode()); + ret.setUsesSdkLibraries(p.getUsesSdkLibraries()); + ret.setUsesSdkLibrariesVersionsMajor(p.getUsesSdkLibrariesVersionsMajor()); + ret.setUsesStaticLibraries(p.getUsesStaticLibraries()); + ret.setUsesStaticLibrariesVersions(p.getUsesStaticLibrariesVersions()); + ret.setMimeGroups(p.getMimeGroups()); ret.setAppMetadataFilePath(p.getAppMetadataFilePath()); ret.getPkgState().setUpdatedSystemApp(false); + ret.setIsPersistent(p.isPersistent()); + ret.setTargetSdkVersion(p.getTargetSdkVersion()); + ret.setRestrictUpdateHash(p.getRestrictUpdateHash()); } mDisabledSysPackages.remove(name); return ret; @@ -961,13 +969,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } } - PackageSetting addPackageLPw(String name, String realName, File codePath, - String legacyNativeLibraryPathString, String primaryCpuAbiString, - String secondaryCpuAbiString, String cpuAbiOverrideString, int uid, long vc, - int pkgFlags, int pkgPrivateFlags, String[] usesSdkLibraries, - long[] usesSdkLibrariesVersions, String[] usesStaticLibraries, - long[] usesStaticLibrariesVersions, Map<String, Set<String>> mimeGroups, - @NonNull UUID domainSetId) { + PackageSetting addPackageLPw(String name, String realName, File codePath, int uid, int pkgFlags, + int pkgPrivateFlags, @NonNull UUID domainSetId) { PackageSetting p = mPackages.get(name); if (p != null) { if (p.getAppId() == uid) { @@ -977,11 +980,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile "Adding duplicate package, keeping first: " + name); return null; } - p = new PackageSetting(name, realName, codePath, legacyNativeLibraryPathString, - primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString, vc, pkgFlags, - pkgPrivateFlags, 0 /*userId*/, usesSdkLibraries, usesSdkLibrariesVersions, - usesStaticLibraries, usesStaticLibrariesVersions, mimeGroups, domainSetId); - p.setAppId(uid); + p = new PackageSetting(name, realName, codePath, pkgFlags, pkgPrivateFlags, domainSetId) + .setAppId(uid); if (mAppIds.registerExistingAppId(uid, p, name)) { mPackages.put(name, p); return p; @@ -1092,16 +1092,21 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile int installUserId = installUser != null ? installUser.getIdentifier() : UserHandle.USER_SYSTEM; - pkgSetting = new PackageSetting(pkgName, realPkgName, codePath, - legacyNativeLibraryPath, primaryCpuAbi, secondaryCpuAbi, - null /*cpuAbiOverrideString*/, versionCode, pkgFlags, pkgPrivateFlags, - 0 /*sharedUserAppId*/, usesSdkLibraries, usesSdkLibrariesVersions, - usesStaticLibraries, usesStaticLibrariesVersions, - createMimeGroups(mimeGroupNames), domainSetId) + pkgSetting = new PackageSetting(pkgName, realPkgName, codePath, pkgFlags, + pkgPrivateFlags, domainSetId) + .setUsesSdkLibraries(usesSdkLibraries) + .setUsesSdkLibrariesVersionsMajor(usesSdkLibrariesVersions) + .setUsesStaticLibraries(usesStaticLibraries) + .setUsesStaticLibrariesVersions(usesStaticLibrariesVersions) + .setLegacyNativeLibraryPath(legacyNativeLibraryPath) + .setPrimaryCpuAbi(primaryCpuAbi) + .setSecondaryCpuAbi(secondaryCpuAbi) + .setLongVersionCode(versionCode) + .setMimeGroups(createMimeGroups(mimeGroupNames)) .setIsPersistent(isPersistent) .setTargetSdkVersion(targetSdkVersion) - .setRestrictUpdateHash(restrictUpdatedHash); - pkgSetting.setLastModifiedTime(codePath.lastModified()); + .setRestrictUpdateHash(restrictUpdatedHash) + .setLastModifiedTime(codePath.lastModified()); if (sharedUser != null) { pkgSetting.setSharedUserAppId(sharedUser.mAppId); } @@ -3066,6 +3071,12 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime()); serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime()); serializer.attributeLong(null, "version", pkg.getVersionCode()); + serializer.attributeBoolean(null, "isPersistent", pkg.isPersistent()); + serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion()); + if (pkg.getRestrictUpdateHash() != null) { + serializer.attributeBytesBase64(null, "restrictUpdateHash", + pkg.getRestrictUpdateHash()); + } if (pkg.getLegacyNativeLibraryPath() != null) { serializer.attribute(null, "nativeLibraryPath", pkg.getLegacyNativeLibraryPath()); } @@ -3129,6 +3140,12 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile serializer.attributeLongHex(null, "ft", pkg.getLastModifiedTime()); serializer.attributeLongHex(null, "ut", pkg.getLastUpdateTime()); serializer.attributeLong(null, "version", pkg.getVersionCode()); + serializer.attributeBoolean(null, "isPersistent", pkg.isPersistent()); + serializer.attributeInt(null, "targetSdkVersion", pkg.getTargetSdkVersion()); + if (pkg.getRestrictUpdateHash() != null) { + serializer.attributeBytesBase64(null, "restrictUpdateHash", + pkg.getRestrictUpdateHash()); + } if (!pkg.hasSharedUser()) { serializer.attributeInt(null, "userId", pkg.getAppId()); } else { @@ -3861,6 +3878,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } long versionCode = parser.getAttributeLong(null, "version", 0); + boolean isPersistent = parser.getAttributeBoolean(null, "isPersistent", false); + int targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0); + byte[] restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash", + null); int pkgFlags = 0; int pkgPrivateFlags = 0; @@ -3873,10 +3894,16 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile // debug invalid entries. The actual logic for migrating to a new ID is done in other // methods that use DomainVerificationManagerInternal#generateNewId UUID domainSetId = DomainVerificationManagerInternal.DISABLED_ID; - PackageSetting ps = new PackageSetting(name, realName, new File(codePathStr), - legacyNativeLibraryPathStr, primaryCpuAbiStr, secondaryCpuAbiStr, cpuAbiOverrideStr, - versionCode, pkgFlags, pkgPrivateFlags, 0 /*sharedUserAppId*/, null, null, null, - null, null, domainSetId); + PackageSetting ps = new PackageSetting(name, realName, new File(codePathStr), pkgFlags, + pkgPrivateFlags, domainSetId) + .setLegacyNativeLibraryPath(legacyNativeLibraryPathStr) + .setPrimaryCpuAbi(primaryCpuAbiStr) + .setSecondaryCpuAbi(secondaryCpuAbiStr) + .setCpuAbiOverride(cpuAbiOverrideStr) + .setLongVersionCode(versionCode) + .setIsPersistent(isPersistent) + .setTargetSdkVersion(targetSdkVersion) + .setRestrictUpdateHash(restrictUpdateHash); long timeStamp = parser.getAttributeLongHex(null, "ft", 0); if (timeStamp == 0) { timeStamp = parser.getAttributeLong(null, "ts", 0); @@ -3970,6 +3997,9 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile long loadingCompletedTime = 0; UUID domainSetId; String appMetadataFilePath = null; + boolean isPersistent = false; + int targetSdkVersion = 0; + byte[] restrictUpdateHash = null; try { name = parser.getAttributeValue(null, ATTR_NAME); realName = parser.getAttributeValue(null, "realName"); @@ -3993,6 +4023,9 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } versionCode = parser.getAttributeLong(null, "version", 0); + isPersistent = parser.getAttributeBoolean(null, "isPersistent", false); + targetSdkVersion = parser.getAttributeInt(null, "targetSdkVersion", 0); + restrictUpdateHash = parser.getAttributeBytesBase64(null, "restrictUpdateHash", null); installerPackageName = parser.getAttributeValue(null, "installer"); installerPackageUid = parser.getAttributeInt(null, "installerUid", INVALID_UID); updateOwnerPackageName = parser.getAttributeValue(null, "updateOwner"); @@ -4088,11 +4121,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile + parser.getPositionDescription()); } else if (appId > 0) { packageSetting = addPackageLPw(name.intern(), realName, new File(codePathStr), - legacyNativeLibraryPathStr, primaryCpuAbiString, secondaryCpuAbiString, - cpuAbiOverrideString, appId, versionCode, pkgFlags, pkgPrivateFlags, - null /* usesSdkLibraries */, null /* usesSdkLibraryVersions */, - null /* usesStaticLibraries */, null /* usesStaticLibraryVersions */, - null /* mimeGroups */, domainSetId); + appId, pkgFlags, pkgPrivateFlags, domainSetId); if (PackageManagerService.DEBUG_SETTINGS) Log.i(PackageManagerService.TAG, "Reading package " + name + ": appId=" + appId + " pkg=" + packageSetting); @@ -4101,22 +4130,26 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile + appId + " while parsing settings at " + parser.getPositionDescription()); } else { + packageSetting.setLegacyNativeLibraryPath(legacyNativeLibraryPathStr); + packageSetting.setPrimaryCpuAbi(primaryCpuAbiString); + packageSetting.setSecondaryCpuAbi(secondaryCpuAbiString); + packageSetting.setCpuAbiOverride(cpuAbiOverrideString); + packageSetting.setLongVersionCode(versionCode); packageSetting.setLastModifiedTime(timeStamp); packageSetting.setLastUpdateTime(lastUpdateTime); } } else if (sharedUserAppId != 0) { if (sharedUserAppId > 0) { packageSetting = new PackageSetting(name.intern(), realName, - new File(codePathStr), legacyNativeLibraryPathStr, - primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString, - versionCode, pkgFlags, pkgPrivateFlags, sharedUserAppId, - null /* usesSdkLibraries */, - null /* usesSdkLibrariesVersions */, - null /* usesStaticLibraries */, - null /* usesStaticLibraryVersions */, - null /* mimeGroups */, domainSetId); - packageSetting.setLastModifiedTime(timeStamp); - packageSetting.setLastUpdateTime(lastUpdateTime); + new File(codePathStr), pkgFlags, pkgPrivateFlags, domainSetId) + .setLegacyNativeLibraryPath(legacyNativeLibraryPathStr) + .setPrimaryCpuAbi(primaryCpuAbiString) + .setSecondaryCpuAbi(secondaryCpuAbiString) + .setCpuAbiOverride(cpuAbiOverrideString) + .setLongVersionCode(versionCode) + .setSharedUserAppId(sharedUserAppId) + .setLastModifiedTime(timeStamp) + .setLastUpdateTime(lastUpdateTime); mPendingPackages.add(packageSetting); if (PackageManagerService.DEBUG_SETTINGS) Log.i(PackageManagerService.TAG, "Reading package " + name @@ -4155,7 +4188,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile .setForceQueryableOverride(installedForceQueryable) .setLoadingProgress(loadingProgress) .setLoadingCompletedTime(loadingCompletedTime) - .setAppMetadataFilePath(appMetadataFilePath); + .setAppMetadataFilePath(appMetadataFilePath) + .setIsPersistent(isPersistent) + .setTargetSdkVersion(targetSdkVersion) + .setRestrictUpdateHash(restrictUpdateHash); // Handle legacy string here for single-user mode final String enabledStr = parser.getAttributeValue(null, ATTR_ENABLED); if (enabledStr != null) { @@ -4916,9 +4952,11 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } pw.print(prefix); pw.print(" versionCode="); pw.print(ps.getVersionCode()); if (pkg != null) { - pw.print(" minSdk="); pw.print(pkg.getMinSdkVersion()); - pw.print(" targetSdk="); pw.println(pkg.getTargetSdkVersion()); - + pw.print(" minSdk="); + pw.print(pkg.getMinSdkVersion()); + } + pw.print(" targetSdk="); pw.println(ps.getTargetSdkVersion()); + if (pkg != null) { SparseIntArray minExtensionVersions = pkg.getMinExtensionVersions(); pw.print(prefix); pw.print(" minExtensionVersions=["); diff --git a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java index 99878679431c..585e2e48fb85 100644 --- a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java +++ b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java @@ -16,6 +16,7 @@ package com.android.server.pm; +import static android.content.pm.Flags.sdkLibIndependence; import static android.content.pm.PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY; import static android.content.pm.PackageManager.INSTALL_FAILED_SHARED_LIBRARY_BAD_CERTIFICATE_DIGEST; @@ -951,10 +952,12 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable } } if (!pkg.getUsesSdkLibraries().isEmpty()) { + // Allow installation even if sdk-library dependency doesn't exist + boolean required = !sdkLibIndependence(); usesLibraryInfos = collectSharedLibraryInfos(pkg.getUsesSdkLibraries(), pkg.getUsesSdkLibrariesVersionsMajor(), pkg.getUsesSdkLibrariesCertDigests(), - pkg.getPackageName(), "sdk", true, pkg.getTargetSdkVersion(), usesLibraryInfos, - availablePackages, newLibraries); + pkg.getPackageName(), "sdk", required, pkg.getTargetSdkVersion(), + usesLibraryInfos, availablePackages, newLibraries); } return usesLibraryInfos; } diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index d6e35e8b1fd3..a33e3532153b 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -347,8 +347,15 @@ public final class PermissionPolicyService extends SystemService { UserHandle user = UserHandle.getUserHandleForUid(uid); PermissionControllerManager manager = mPermControllerManagers.get(user); if (manager == null) { - manager = new PermissionControllerManager( - getUserContext(getContext(), user), PermissionThread.getHandler()); + try { + manager = new PermissionControllerManager( + getUserContext(getContext(), user), PermissionThread.getHandler()); + } catch (IllegalArgumentException exception) { + // There's a possible race condition when a user is being removed + Log.e(LOG_TAG, "Could not create PermissionControllerManager for user" + + user, exception); + return; + } mPermControllerManagers.put(user, manager); } manager.updateUserSensitiveForApp(uid); diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java index 1d5cac54d12b..7f55836598b5 100644 --- a/services/core/java/com/android/server/vibrator/VibrationSettings.java +++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java @@ -833,18 +833,24 @@ final class VibrationSettings { private final SparseArray<Integer> mProcStatesCache = new SparseArray<>(); public boolean isUidForeground(int uid) { - return mProcStatesCache.get(uid, ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) - <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND; + synchronized (this) { + return mProcStatesCache.get(uid, ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) + <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND; + } } @Override public void onUidGone(int uid, boolean disabled) { - mProcStatesCache.delete(uid); + synchronized (this) { + mProcStatesCache.delete(uid); + } } @Override public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { - mProcStatesCache.put(uid, procState); + synchronized (this) { + mProcStatesCache.put(uid, procState); + } } } diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 4200fbf39ade..c7a3c4349f4c 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -51,6 +51,7 @@ import android.app.ILocalWallpaperColorConsumer; import android.app.IWallpaperManager; import android.app.IWallpaperManagerCallback; import android.app.PendingIntent; +import android.app.UidObserver; import android.app.UserSwitchObserver; import android.app.WallpaperColors; import android.app.WallpaperInfo; @@ -103,6 +104,7 @@ import android.service.wallpaper.WallpaperService; import android.system.ErrnoException; import android.system.Os; import android.util.EventLog; +import android.util.IntArray; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; @@ -120,6 +122,7 @@ import com.android.server.ServiceThread; import com.android.server.SystemService; import com.android.server.pm.UserManagerInternal; import com.android.server.utils.TimingsTraceAndSlog; +import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; import org.xmlpull.v1.XmlPullParserException; @@ -1645,6 +1648,40 @@ public class WallpaperManagerService extends IWallpaperManager.Stub mWallpaperDisplayHelper = new WallpaperDisplayHelper(dm, mWindowManagerInternal); mWallpaperCropper = new WallpaperCropper(mWallpaperDisplayHelper); mActivityManager = mContext.getSystemService(ActivityManager.class); + + if (mContext.getResources().getBoolean( + R.bool.config_pauseWallpaperRenderWhenStateChangeEnabled)) { + // Pause wallpaper rendering engine as soon as a performance impacted app is launched. + final String[] pauseRenderList = mContext.getResources().getStringArray( + R.array.pause_wallpaper_render_when_state_change); + final IntArray pauseRenderUids = new IntArray(); + for (String pauseRenderApp : pauseRenderList) { + try { + int uid = mContext.getPackageManager().getApplicationInfo( + pauseRenderApp, 0).uid; + pauseRenderUids.add(uid); + } catch (Exception e) { + Slog.e(TAG, e.toString()); + } + } + if (pauseRenderUids.size() > 0) { + try { + ActivityManager.getService().registerUidObserverForUids(new UidObserver() { + @Override + public void onUidStateChanged(int uid, int procState, long procStateSeq, + int capability) { + pauseOrResumeRenderingImmediately( + procState == ActivityManager.PROCESS_STATE_TOP); + } + }, ActivityManager.UID_OBSERVER_PROCSTATE, + ActivityManager.PROCESS_STATE_TOP, "android", + pauseRenderUids.toArray()); + } catch (RemoteException e) { + Slog.e(TAG, e.toString()); + } + } + } + mMonitor = new MyPackageMonitor(); mColorsChangedListeners = new SparseArray<>(); mWallpaperDataParser = new WallpaperDataParser(mContext, mWallpaperDisplayHelper, @@ -2625,6 +2662,35 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } } + private void pauseOrResumeRenderingImmediately(boolean pause) { + synchronized (mLock) { + final WallpaperData[] wallpapers = mIsLockscreenLiveWallpaperEnabled + ? getActiveWallpapers() : new WallpaperData[] { + mWallpaperMap.get(mCurrentUserId) }; + for (WallpaperData data : wallpapers) { + if (data.connection == null || data.connection.mInfo == null) { + continue; + } + if (pause || LocalServices.getService(ActivityTaskManagerInternal.class) + .isUidForeground(data.connection.mInfo.getServiceInfo() + .applicationInfo.uid)) { + if (data.connection.containsDisplay( + mWindowManagerInternal.getTopFocusedDisplayId())) { + data.connection.forEachDisplayConnector(displayConnector -> { + if (displayConnector.mEngine != null) { + try { + displayConnector.mEngine.setVisibility(!pause); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to set visibility", e); + } + } + }); + } + } + } + } + } + /** * Propagate a wake event to the wallpaper engine(s). */ diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index a01113b26a1e..9fa5ed2cfde9 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4030,6 +4030,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mAppStopped) { abortAndClearOptionsAnimation(); } + if (mDisplayContent != null) { + mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); + } } boolean isFinishing() { @@ -5388,12 +5391,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mLastDeferHidingClient = deferHidingClient; if (!visible) { - // If this activity is about to finish/stopped and now becomes invisible, remove it - // from the unknownApp list in case the activity does not want to draw anything, which - // keep the user waiting for the next transition to start. - if (finishing || isState(STOPPED)) { - displayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); - } // Because starting window was transferred, this activity may be a trampoline which has // been occluded by next activity. If it has added windows, set client visibility // immediately to avoid the client getting RELAYOUT_RES_FIRST_TIME from relayout and @@ -5837,6 +5834,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A break; case STOPPED: mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_STOPPED); + if (mDisplayContent != null) { + mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); + } break; case DESTROYED: if (app != null && (mVisible || mVisibleRequested)) { @@ -6517,7 +6517,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } // Reset the last saved PiP snap fraction on app stop. mDisplayContent.mPinnedTaskController.onActivityHidden(mActivityComponent); - mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); if (isClientVisible()) { // Though this is usually unlikely to happen, still make sure the client is invisible. setClientVisible(false); diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 444470952c5d..c79a8b6b13a1 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -378,8 +378,23 @@ class BLASTSyncEngine { if (!wc.isSyncFinished(this)) { allFinished = false; Slog.i(TAG, "Unfinished container: " + wc); + wc.forAllActivities(a -> { + if (a.isVisibleRequested()) { + if (a.isRelaunching()) { + Slog.i(TAG, " " + a + " is relaunching"); + } + a.forAllWindows(w -> { + Slog.i(TAG, " " + w + " " + w.mWinAnimator.drawStateToString()); + }, true /* traverseTopToBottom */); + } else if (a.mDisplayContent != null && !a.mDisplayContent + .mUnknownAppVisibilityController.allResolved()) { + Slog.i(TAG, " UnknownAppVisibility: " + a.mDisplayContent + .mUnknownAppVisibilityController.getDebugMessage()); + } + }); } } + for (int i = mDependencies.size() - 1; i >= 0; --i) { allFinished = false; Slog.i(TAG, "Unfinished dependency: " + mDependencies.get(i).mSyncId); diff --git a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java index 41c1e793dd90..c0713966d8de 100644 --- a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java +++ b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java @@ -70,6 +70,9 @@ class UnknownAppVisibilityController { } boolean isVisibilityUnknown(ActivityRecord r) { + if (mUnknownApps.isEmpty()) { + return false; + } return mUnknownApps.containsKey(r); } @@ -90,6 +93,9 @@ class UnknownAppVisibilityController { } void appRemovedOrHidden(@NonNull ActivityRecord activity) { + if (mUnknownApps.isEmpty()) { + return; + } if (DEBUG_UNKNOWN_APP_VISIBILITY) { Slog.d(TAG, "App removed or hidden activity=" + activity); } @@ -117,8 +123,11 @@ class UnknownAppVisibilityController { * Notifies that {@param activity} has finished resuming. */ void notifyAppResumedFinished(@NonNull ActivityRecord activity) { - if (mUnknownApps.containsKey(activity) - && mUnknownApps.get(activity) == UNKNOWN_STATE_WAITING_RESUME) { + if (mUnknownApps.isEmpty()) { + return; + } + final Integer state = mUnknownApps.get(activity); + if (state != null && state == UNKNOWN_STATE_WAITING_RESUME) { if (DEBUG_UNKNOWN_APP_VISIBILITY) { Slog.d(TAG, "App resume finished activity=" + activity); } @@ -130,13 +139,16 @@ class UnknownAppVisibilityController { * Notifies that {@param activity} has relaid out. */ void notifyRelayouted(@NonNull ActivityRecord activity) { - if (!mUnknownApps.containsKey(activity)) { + if (mUnknownApps.isEmpty()) { + return; + } + final Integer state = mUnknownApps.get(activity); + if (state == null) { return; } if (DEBUG_UNKNOWN_APP_VISIBILITY) { Slog.d(TAG, "App relayouted appWindow=" + activity); } - int state = mUnknownApps.get(activity); if (state == UNKNOWN_STATE_WAITING_RELAYOUT || activity.mStartingWindow != null) { mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE); mDisplayContent.notifyKeyguardFlagsChanged(); diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index debd891400b6..215934f4dc09 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -272,12 +272,12 @@ <xs:element name="brightnessDecreaseDebounceMillis" type="xs:nonNegativeInteger"> <xs:annotation name="final"/> </xs:element> - <!-- Animation time for brightness increase in millis --> - <xs:element name="brightnessIncreaseDurationMillis" type="xs:nonNegativeInteger"> + <!-- Animation speed for brightness increase. In framework brightness units per second. --> + <xs:element name="screenBrightnessRampIncrease" type="nonNegativeDecimal"> <xs:annotation name="final"/> </xs:element> - <!-- Animation time for brightness decrease in millis --> - <xs:element name="brightnessDecreaseDurationMillis" type="xs:nonNegativeInteger"> + <!-- Animation speed for brightness decrease. In framework brightness units per second. --> + <xs:element name="screenBrightnessRampDecrease" type="nonNegativeDecimal"> <xs:annotation name="final"/> </xs:element> </xs:complexType> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 2d27f0c79660..f7e004375071 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -179,15 +179,15 @@ package com.android.server.display.config { public class HdrBrightnessConfig { ctor public HdrBrightnessConfig(); method public final java.math.BigInteger getBrightnessDecreaseDebounceMillis(); - method public final java.math.BigInteger getBrightnessDecreaseDurationMillis(); method public final java.math.BigInteger getBrightnessIncreaseDebounceMillis(); - method public final java.math.BigInteger getBrightnessIncreaseDurationMillis(); method @NonNull public final com.android.server.display.config.NonNegativeFloatToFloatMap getBrightnessMap(); + method public final java.math.BigDecimal getScreenBrightnessRampDecrease(); + method public final java.math.BigDecimal getScreenBrightnessRampIncrease(); method public final void setBrightnessDecreaseDebounceMillis(java.math.BigInteger); - method public final void setBrightnessDecreaseDurationMillis(java.math.BigInteger); method public final void setBrightnessIncreaseDebounceMillis(java.math.BigInteger); - method public final void setBrightnessIncreaseDurationMillis(java.math.BigInteger); method public final void setBrightnessMap(@NonNull com.android.server.display.config.NonNegativeFloatToFloatMap); + method public final void setScreenBrightnessRampDecrease(java.math.BigDecimal); + method public final void setScreenBrightnessRampIncrease(java.math.BigDecimal); } public class HighBrightnessMode { diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java index 25e8475fcf42..922f69c1e816 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java @@ -40,6 +40,7 @@ import android.app.admin.PolicyUpdateReceiver; import android.app.admin.PolicyValue; import android.app.admin.TargetUser; import android.app.admin.UserRestrictionPolicyKey; +import android.app.admin.flags.FlagUtils; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -65,7 +66,6 @@ import android.util.Xml; import com.android.internal.util.XmlUtils; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; -import com.android.server.devicepolicy.flags.FlagUtils; import com.android.server.utils.Slogf; import libcore.io.IoUtils; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 5a620a3b87f5..8509155861f5 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -330,6 +330,7 @@ import android.app.admin.SystemUpdatePolicy; import android.app.admin.UnsafeStateException; import android.app.admin.UserRestrictionPolicyKey; import android.app.admin.WifiSsidPolicy; +import android.app.admin.flags.FlagUtils; import android.app.backup.IBackupManager; import android.app.compat.CompatChanges; import android.app.role.OnRoleHoldersChangedListener; @@ -490,7 +491,6 @@ import com.android.server.SystemServerInitThreadPool; import com.android.server.SystemService; import com.android.server.SystemServiceManager; import com.android.server.devicepolicy.ActiveAdmin.TrustAgentInfo; -import com.android.server.devicepolicy.flags.FlagUtils; import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.pdb.PersistentDataBlockManagerInternal; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/flags/Android.bp b/services/devicepolicy/java/com/android/server/devicepolicy/flags/Android.bp deleted file mode 100644 index 1a45782ccd39..000000000000 --- a/services/devicepolicy/java/com/android/server/devicepolicy/flags/Android.bp +++ /dev/null @@ -1,16 +0,0 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -aconfig_declarations { - name: "device_policy_aconfig_flags", - package: "com.android.server.devicepolicy.flags", - srcs: [ - "flags.aconfig", - ], -} - -java_aconfig_library { - name: "device_policy_aconfig_flags_lib", - aconfig_declarations: "device_policy_aconfig_flags", -} diff --git a/services/midi/Android.bp b/services/midi/Android.bp index 4b5f8a7bf0ac..a385fe38495b 100644 --- a/services/midi/Android.bp +++ b/services/midi/Android.bp @@ -18,8 +18,8 @@ java_library_static { name: "services.midi", defaults: ["platform_service_defaults"], srcs: [":services.midi-sources"], - libs: ["services.core"], - static_libs: [ + libs: [ + "services.core", "aconfig_midi_flags_java_lib", ], } diff --git a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt index f3ac7d55c5db..12cd0f6e1a7c 100644 --- a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt +++ b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt @@ -143,8 +143,8 @@ class PackageManagerComponentLabelIconOverrideTest { val result: Result, val componentName: ComponentName? = ComponentName(pkgName, COMPONENT_CLASS_NAME) ) { - constructor(pkgName: String, appType: AppType, exception: Class<out Exception>) - : this(pkgName, appType, Result.Exception(exception)) + constructor(pkgName: String, appType: AppType, exception: Class<out Exception>) : + this(pkgName, appType, Result.Exception(exception)) val expectedLabel = when (result) { Result.Changed, Result.ChangedWithoutNotify, Result.NotChanged -> TEST_LABEL @@ -299,11 +299,9 @@ class PackageManagerComponentLabelIconOverrideTest { .hideAsFinal() private fun makePkgSetting(pkgName: String, pkg: AndroidPackageInternal) = - PackageSetting( - pkgName, null, File("/test"), - null, null, null, null, 0, 0, 0, 0, null, null, null, null, null, - UUID.fromString("3f9d52b7-d7b4-406a-a1da-d9f19984c72c") - ).apply { + PackageSetting(pkgName, null, File("/test"), 0, 0, + UUID.fromString("3f9d52b7-d7b4-406a-a1da-d9f19984c72c")) + .apply { if (params.isSystem) { this.flags = this.flags or ApplicationInfo.FLAG_SYSTEM } @@ -373,7 +371,7 @@ class PackageManagerComponentLabelIconOverrideTest { whenever(this.isCallerRecents(anyInt())) { false } } val mockAppsFilter: AppsFilterImpl = mockThrowOnUnmocked { - whenever(this.shouldFilterApplication(any<PackageDataSnapshot>(), anyInt(), + whenever(this.shouldFilterApplication(any<PackageDataSnapshot>(), anyInt(), any<PackageSetting>(), any<PackageSetting>(), anyInt())) { false } whenever(this.snapshot()) { this@mockThrowOnUnmocked } whenever(registerObserver(any())).thenCallRealMethod() diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerSettingsTests.java index cbedcaf97358..aaad669d5b8d 100644 --- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerSettingsTests.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerSettingsTests.java @@ -967,20 +967,12 @@ public class PackageManagerSettingsTests { PACKAGE_NAME, REAL_PACKAGE_NAME, INITIAL_CODE_PATH /*codePath*/, - null /*legacyNativeLibraryPathString*/, - "x86_64" /*primaryCpuAbiString*/, - "x86" /*secondaryCpuAbiString*/, - null /*cpuAbiOverrideString*/, - INITIAL_VERSION_CODE, ApplicationInfo.FLAG_SYSTEM|ApplicationInfo.FLAG_HAS_CODE, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED|ApplicationInfo.PRIVATE_FLAG_HIDDEN, - 0, - null /*usesSdkLibraries*/, - null /*usesSdkLibrariesVersions*/, - null /*usesStaticLibraries*/, - null /*usesStaticLibrariesVersions*/, - null /*mimeGroups*/, - UUID.randomUUID()); + UUID.randomUUID()) + .setPrimaryCpuAbi("x86_64") + .setSecondaryCpuAbi("x86") + .setLongVersionCode(INITIAL_VERSION_CODE); origPkgSetting01.setPkg(mockAndroidPackage(origPkgSetting01)); final PackageSetting testPkgSetting01 = new PackageSetting(origPkgSetting01); verifySettingCopy(origPkgSetting01, testPkgSetting01); @@ -989,23 +981,15 @@ public class PackageManagerSettingsTests { @Test public void testPackageStateCopy02() { final PackageSetting origPkgSetting01 = new PackageSetting( - PACKAGE_NAME /*pkgName*/, - REAL_PACKAGE_NAME /*realPkgName*/, + PACKAGE_NAME, + REAL_PACKAGE_NAME, INITIAL_CODE_PATH /*codePath*/, - null /*legacyNativeLibraryPathString*/, - "x86_64" /*primaryCpuAbiString*/, - "x86" /*secondaryCpuAbiString*/, - null /*cpuAbiOverrideString*/, - INITIAL_VERSION_CODE, ApplicationInfo.FLAG_SYSTEM|ApplicationInfo.FLAG_HAS_CODE, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED|ApplicationInfo.PRIVATE_FLAG_HIDDEN, - 0, - null /*usesSdkLibraries*/, - null /*usesSdkLibrariesVersions*/, - null /*usesStaticLibraries*/, - null /*usesStaticLibrariesVersions*/, - null /*mimeGroups*/, - UUID.randomUUID()); + UUID.randomUUID()) + .setPrimaryCpuAbi("x86_64") + .setSecondaryCpuAbi("x86") + .setLongVersionCode(INITIAL_VERSION_CODE); origPkgSetting01.setUserState(0, 100, 100, 1, true, false, false, false, 0, null, false, false, "lastDisabledCaller", new ArraySet<>(new String[]{"enabledComponent1"}), new ArraySet<>(new String[]{"disabledComponent1"}), 0, 0, "harmfulAppWarning", @@ -1028,20 +1012,10 @@ public class PackageManagerSettingsTests { PACKAGE_NAME /*pkgName*/, REAL_PACKAGE_NAME /*realPkgName*/, UPDATED_CODE_PATH /*codePath*/, - null /*legacyNativeLibraryPathString*/, - null /*primaryCpuAbiString*/, - null /*secondaryCpuAbiString*/, - null /*cpuAbiOverrideString*/, - UPDATED_VERSION_CODE, 0 /*pkgFlags*/, 0 /*pkgPrivateFlags*/, - 0, - null /*usesSdkLibraries*/, - null /*usesSdkLibrariesVersions*/, - null /*usesStaticLibraries*/, - null /*usesStaticLibrariesVersions*/, - null /*mimeGroups*/, - UUID.randomUUID()); + UUID.randomUUID()) + .setLongVersionCode(UPDATED_VERSION_CODE); testPkgSetting01.copyPackageSetting(origPkgSetting01, true); verifySettingCopy(origPkgSetting01, testPkgSetting01); verifyUserStatesCopy(origPkgSetting01.readUserState(0), @@ -1717,20 +1691,13 @@ public class PackageManagerSettingsTests { PACKAGE_NAME, REAL_PACKAGE_NAME, INITIAL_CODE_PATH /*codePath*/, - null /*legacyNativeLibraryPathString*/, - "x86_64" /*primaryCpuAbiString*/, - "x86" /*secondaryCpuAbiString*/, - null /*cpuAbiOverrideString*/, - INITIAL_VERSION_CODE, pkgFlags, 0 /*privateFlags*/, - sharedUserId, - null /*usesSdkLibraries*/, - null /*usesSdkLibrariesVersions*/, - null /*usesStaticLibraries*/, - null /*usesStaticLibrariesVersions*/, - null /*mimeGroups*/, - UUID.randomUUID()); + UUID.randomUUID()) + .setPrimaryCpuAbi("x86_64") + .setSecondaryCpuAbi("x86") + .setLongVersionCode(INITIAL_VERSION_CODE) + .setSharedUserAppId(sharedUserId); } private PackageSetting createPackageSetting(String packageName) { @@ -1738,20 +1705,12 @@ public class PackageManagerSettingsTests { packageName, packageName, INITIAL_CODE_PATH /*codePath*/, - null /*legacyNativeLibraryPathString*/, - "x86_64" /*primaryCpuAbiString*/, - "x86" /*secondaryCpuAbiString*/, - null /*cpuAbiOverrideString*/, - INITIAL_VERSION_CODE, 0, 0 /*privateFlags*/, - 0, - null /*usesSdkLibraries*/, - null /*usesSdkLibrariesVersions*/, - null /*usesStaticLibraries*/, - null /*usesStaticLibrariesVersions*/, - null /*mimeGroups*/, - UUID.randomUUID()); + UUID.randomUUID()) + .setPrimaryCpuAbi("x86_64") + .setSecondaryCpuAbi("x86") + .setLongVersionCode(INITIAL_VERSION_CODE); } static @NonNull List<UserInfo> createFakeUsers() { diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java index c12aedb72350..a400f1243afb 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java @@ -90,7 +90,9 @@ public class DisplayBrightnessStateTest { .append("\n isSlowChange:") .append(displayBrightnessState.isSlowChange()) .append("\n maxBrightness:") - .append(displayBrightnessState.getMaxBrightness()); + .append(displayBrightnessState.getMaxBrightness()) + .append("\n customAnimationRate:") + .append(displayBrightnessState.getCustomAnimationRate()); return sb.toString(); } } diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java index c37d21ae1cc0..179a9d5f748e 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -570,9 +570,9 @@ public final class DisplayDeviceConfigTest { assertNotNull(data); assertEquals(2, data.mMaxBrightnessLimits.size()); assertEquals(13000, data.mBrightnessDecreaseDebounceMillis); - assertEquals(10000, data.mBrightnessDecreaseDurationMillis); + assertEquals(0.1f, data.mScreenBrightnessRampDecrease, SMALL_DELTA); assertEquals(1000, data.mBrightnessIncreaseDebounceMillis); - assertEquals(11000, data.mBrightnessIncreaseDurationMillis); + assertEquals(0.11f, data.mScreenBrightnessRampIncrease, SMALL_DELTA); assertEquals(0.3f, data.mMaxBrightnessLimits.get(500f), SMALL_DELTA); assertEquals(0.6f, data.mMaxBrightnessLimits.get(1200f), SMALL_DELTA); @@ -841,9 +841,9 @@ public final class DisplayDeviceConfigTest { + " </point>\n" + " </brightnessMap>\n" + " <brightnessIncreaseDebounceMillis>1000</brightnessIncreaseDebounceMillis>\n" - + " <brightnessIncreaseDurationMillis>11000</brightnessIncreaseDurationMillis>\n" + + " <screenBrightnessRampIncrease>0.11</screenBrightnessRampIncrease>\n" + " <brightnessDecreaseDebounceMillis>13000</brightnessDecreaseDebounceMillis>\n" - + " <brightnessDecreaseDurationMillis>10000</brightnessDecreaseDurationMillis>\n" + + " <screenBrightnessRampDecrease>0.1</screenBrightnessRampDecrease>\n" + "</hdrBrightnessConfig>"; } diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java index 8b54d6d22c2b..47521d13e49c 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java @@ -74,6 +74,7 @@ import com.android.server.LocalServices; import com.android.server.am.BatteryStatsService; import com.android.server.display.RampAnimator.DualRampAnimator; import com.android.server.display.brightness.BrightnessEvent; +import com.android.server.display.brightness.clamper.BrightnessClamperController; import com.android.server.display.brightness.clamper.HdrClamper; import com.android.server.display.color.ColorDisplayService; import com.android.server.display.feature.DisplayManagerFlags; @@ -1314,6 +1315,54 @@ public final class DisplayPowerController2Test { } @Test + public void testRampRateForClampersControllerApplied() { + float transitionRate = 1.5f; + mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID); + DisplayPowerRequest dpr = new DisplayPowerRequest(); + when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f); + when(mHolder.displayPowerState.getScreenBrightness()).thenReturn(.2f); + when(mHolder.displayPowerState.getSdrScreenBrightness()).thenReturn(.1f); + when(mHolder.clamperController.clamp(any(), anyFloat(), anyBoolean())).thenAnswer( + invocation -> DisplayBrightnessState.builder() + .setIsSlowChange(invocation.getArgument(2)) + .setBrightness(invocation.getArgument(1)) + .setMaxBrightness(PowerManager.BRIGHTNESS_MAX) + .setCustomAnimationRate(transitionRate).build()); + + mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); + advanceTime(1); // Run updatePowerState + + verify(mHolder.animator, atLeastOnce()).animateTo(anyFloat(), anyFloat(), + eq(transitionRate), anyBoolean()); + } + + @Test + public void testRampRateForClampersControllerNotApplied_ifDoze() { + float transitionRate = 1.5f; + mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID); + DisplayPowerRequest dpr = new DisplayPowerRequest(); + dpr.policy = DisplayPowerRequest.POLICY_DOZE; + dpr.dozeScreenState = Display.STATE_UNKNOWN; + when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f); + when(mHolder.displayPowerState.getScreenBrightness()).thenReturn(.2f); + when(mHolder.displayPowerState.getSdrScreenBrightness()).thenReturn(.1f); + when(mHolder.clamperController.clamp(any(), anyFloat(), anyBoolean())).thenAnswer( + invocation -> DisplayBrightnessState.builder() + .setIsSlowChange(invocation.getArgument(2)) + .setBrightness(invocation.getArgument(1)) + .setMaxBrightness(PowerManager.BRIGHTNESS_MAX) + .setCustomAnimationRate(transitionRate).build()); + + mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); + advanceTime(1); // Run updatePowerState + + verify(mHolder.animator, atLeastOnce()).animateTo(anyFloat(), anyFloat(), + eq(BRIGHTNESS_RAMP_RATE_FAST_DECREASE), anyBoolean()); + verify(mHolder.animator, never()).animateTo(anyFloat(), anyFloat(), + eq(transitionRate), anyBoolean()); + } + + @Test @RequiresFlagsDisabled(Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1) public void testRampMaxTimeInteractiveThenIdle() { // Send a display power request @@ -1637,13 +1686,20 @@ public final class DisplayPowerController2Test { mock(ScreenOffBrightnessSensorController.class); final HighBrightnessModeController hbmController = mock(HighBrightnessModeController.class); final HdrClamper hdrClamper = mock(HdrClamper.class); + BrightnessClamperController clamperController = mock(BrightnessClamperController.class); when(hbmController.getCurrentBrightnessMax()).thenReturn(PowerManager.BRIGHTNESS_MAX); + when(clamperController.clamp(any(), anyFloat(), anyBoolean())).thenAnswer( + invocation -> DisplayBrightnessState.builder() + .setIsSlowChange(invocation.getArgument(2)) + .setBrightness(invocation.getArgument(1)) + .setMaxBrightness(PowerManager.BRIGHTNESS_MAX) + .setCustomAnimationRate(-1).build()); TestInjector injector = spy(new TestInjector(displayPowerState, animator, automaticBrightnessController, wakelockController, brightnessMappingStrategy, hysteresisLevels, screenOffBrightnessSensorController, hbmController, hdrClamper, - flags)); + clamperController, flags)); final LogicalDisplay display = mock(LogicalDisplay.class); final DisplayDevice device = mock(DisplayDevice.class); @@ -1662,8 +1718,8 @@ public final class DisplayPowerController2Test { return new DisplayPowerControllerHolder(dpc, display, displayPowerState, brightnessSetting, animator, automaticBrightnessController, wakelockController, - screenOffBrightnessSensorController, hbmController, hdrClamper, hbmMetadata, - brightnessMappingStrategy, injector, config); + screenOffBrightnessSensorController, hbmController, hdrClamper, clamperController, + hbmMetadata, brightnessMappingStrategy, injector, config); } /** @@ -1682,6 +1738,7 @@ public final class DisplayPowerController2Test { public final HighBrightnessModeController hbmController; public final HdrClamper hdrClamper; + public final BrightnessClamperController clamperController; public final HighBrightnessModeMetadata hbmMetadata; public final BrightnessMappingStrategy brightnessMappingStrategy; public final DisplayPowerController2.Injector injector; @@ -1695,6 +1752,7 @@ public final class DisplayPowerController2Test { ScreenOffBrightnessSensorController screenOffBrightnessSensorController, HighBrightnessModeController hbmController, HdrClamper hdrClamper, + BrightnessClamperController clamperController, HighBrightnessModeMetadata hbmMetadata, BrightnessMappingStrategy brightnessMappingStrategy, DisplayPowerController2.Injector injector, @@ -1709,6 +1767,7 @@ public final class DisplayPowerController2Test { this.screenOffBrightnessSensorController = screenOffBrightnessSensorController; this.hbmController = hbmController; this.hdrClamper = hdrClamper; + this.clamperController = clamperController; this.hbmMetadata = hbmMetadata; this.brightnessMappingStrategy = brightnessMappingStrategy; this.injector = injector; @@ -1728,6 +1787,8 @@ public final class DisplayPowerController2Test { private final HdrClamper mHdrClamper; + private final BrightnessClamperController mClamperController; + private final DisplayManagerFlags mFlags; TestInjector(DisplayPowerState dps, DualRampAnimator<DisplayPowerState> animator, @@ -1738,6 +1799,7 @@ public final class DisplayPowerController2Test { ScreenOffBrightnessSensorController screenOffBrightnessSensorController, HighBrightnessModeController highBrightnessModeController, HdrClamper hdrClamper, + BrightnessClamperController clamperController, DisplayManagerFlags flags) { mDisplayPowerState = dps; mAnimator = animator; @@ -1748,6 +1810,7 @@ public final class DisplayPowerController2Test { mScreenOffBrightnessSensorController = screenOffBrightnessSensorController; mHighBrightnessModeController = highBrightnessModeController; mHdrClamper = hdrClamper; + mClamperController = clamperController; mFlags = flags; } @@ -1864,6 +1927,14 @@ public final class DisplayPowerController2Test { } @Override + BrightnessClamperController getBrightnessClamperController(Handler handler, + BrightnessClamperController.ClamperChangeListener clamperChangeListener, + BrightnessClamperController.DisplayDeviceData data, Context context, + DisplayManagerFlags flags) { + return mClamperController; + } + + @Override DisplayWhiteBalanceController getDisplayWhiteBalanceController(Handler handler, SensorManager sensorManager, Resources resources) { return mDisplayWhiteBalanceControllerMock; diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java index c0e0df98213f..ff2b1f466a5c 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java @@ -137,8 +137,10 @@ public class BrightnessClamperControllerTest { float initialBrightness = 0.8f; boolean initialSlowChange = true; float clampedBrightness = 0.6f; + float customAnimationRate = 0.01f; when(mMockClamper.getBrightnessCap()).thenReturn(clampedBrightness); when(mMockClamper.getType()).thenReturn(BrightnessClamper.Type.THERMAL); + when(mMockClamper.getCustomAnimationRate()).thenReturn(customAnimationRate); when(mMockClamper.isActive()).thenReturn(false); mTestInjector.mCapturedChangeListener.onChanged(); mTestHandler.flush(); @@ -150,6 +152,7 @@ public class BrightnessClamperControllerTest { assertEquals(PowerManager.BRIGHTNESS_MAX, state.getMaxBrightness(), FLOAT_TOLERANCE); assertEquals(0, state.getBrightnessReason().getModifier() & BrightnessReason.MODIFIER_THROTTLED); + assertEquals(-1, state.getCustomAnimationRate(), FLOAT_TOLERANCE); assertEquals(initialSlowChange, state.isSlowChange()); } @@ -158,8 +161,10 @@ public class BrightnessClamperControllerTest { float initialBrightness = 0.8f; boolean initialSlowChange = true; float clampedBrightness = 0.6f; + float customAnimationRate = 0.01f; when(mMockClamper.getBrightnessCap()).thenReturn(clampedBrightness); when(mMockClamper.getType()).thenReturn(BrightnessClamper.Type.THERMAL); + when(mMockClamper.getCustomAnimationRate()).thenReturn(customAnimationRate); when(mMockClamper.isActive()).thenReturn(true); mTestInjector.mCapturedChangeListener.onChanged(); mTestHandler.flush(); @@ -171,6 +176,7 @@ public class BrightnessClamperControllerTest { assertEquals(clampedBrightness, state.getMaxBrightness(), FLOAT_TOLERANCE); assertEquals(BrightnessReason.MODIFIER_THROTTLED, state.getBrightnessReason().getModifier() & BrightnessReason.MODIFIER_THROTTLED); + assertEquals(customAnimationRate, state.getCustomAnimationRate(), FLOAT_TOLERANCE); assertFalse(state.isSlowChange()); } @@ -179,8 +185,10 @@ public class BrightnessClamperControllerTest { float initialBrightness = 0.6f; boolean initialSlowChange = true; float clampedBrightness = 0.8f; + float customAnimationRate = 0.01f; when(mMockClamper.getBrightnessCap()).thenReturn(clampedBrightness); when(mMockClamper.getType()).thenReturn(BrightnessClamper.Type.THERMAL); + when(mMockClamper.getCustomAnimationRate()).thenReturn(customAnimationRate); when(mMockClamper.isActive()).thenReturn(true); mTestInjector.mCapturedChangeListener.onChanged(); mTestHandler.flush(); @@ -192,6 +200,7 @@ public class BrightnessClamperControllerTest { assertEquals(clampedBrightness, state.getMaxBrightness(), FLOAT_TOLERANCE); assertEquals(BrightnessReason.MODIFIER_THROTTLED, state.getBrightnessReason().getModifier() & BrightnessReason.MODIFIER_THROTTLED); + assertEquals(customAnimationRate, state.getCustomAnimationRate(), FLOAT_TOLERANCE); assertFalse(state.isSlowChange()); } @@ -200,8 +209,10 @@ public class BrightnessClamperControllerTest { float initialBrightness = 0.8f; boolean initialSlowChange = true; float clampedBrightness = 0.6f; + float customAnimationRate = 0.01f; when(mMockClamper.getBrightnessCap()).thenReturn(clampedBrightness); when(mMockClamper.getType()).thenReturn(BrightnessClamper.Type.THERMAL); + when(mMockClamper.getCustomAnimationRate()).thenReturn(customAnimationRate); when(mMockClamper.isActive()).thenReturn(true); mTestInjector.mCapturedChangeListener.onChanged(); mTestHandler.flush(); @@ -216,6 +227,7 @@ public class BrightnessClamperControllerTest { assertEquals(clampedBrightness, state.getMaxBrightness(), FLOAT_TOLERANCE); assertEquals(BrightnessReason.MODIFIER_THROTTLED, state.getBrightnessReason().getModifier() & BrightnessReason.MODIFIER_THROTTLED); + assertEquals(customAnimationRate, state.getCustomAnimationRate(), FLOAT_TOLERANCE); assertEquals(initialSlowChange, state.isSlowChange()); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/HdrClamperTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/HdrClamperTest.java index ee187baf524e..8d8274c61b20 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/HdrClamperTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/HdrClamperTest.java @@ -56,9 +56,9 @@ public class HdrClamperTest { private static final HdrBrightnessData TEST_HDR_DATA = new HdrBrightnessData( Map.of(500f, 0.6f), /* brightnessIncreaseDebounceMillis= */ 1000, - /* brightnessIncreaseDurationMillis= */ 2000, + /* screenBrightnessRampIncrease= */ 0.02f, /* brightnessDecreaseDebounceMillis= */ 3000, - /* brightnessDecreaseDurationMillis= */4000 + /* screenBrightnessRampDecrease= */0.04f ); private static final int WIDTH = 600; @@ -152,8 +152,7 @@ public class HdrClamperTest { mClock.fastForward(3000); mTestHandler.timeAdvance(); assertEquals(0.6f, mHdrClamper.getMaxBrightness(), FLOAT_TOLERANCE); - // 0.6 to HLG = 0.905727, rate = (1-0.905727) / 4 - assertEquals(0.023568f, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); + assertEquals(0.04, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); } @Test @@ -181,8 +180,7 @@ public class HdrClamperTest { mClock.fastForward(1000); mTestHandler.timeAdvance(); assertEquals(PowerManager.BRIGHTNESS_MAX, mHdrClamper.getMaxBrightness(), FLOAT_TOLERANCE); - // 0.6 to HLG = 0.905727, rate = (1-0.905727) / 2 - assertEquals(0.047137f, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); + assertEquals(0.02f, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); } @Test @@ -209,8 +207,7 @@ public class HdrClamperTest { mClock.fastForward(3000); mTestHandler.timeAdvance(); assertEquals(0.6f, mHdrClamper.getMaxBrightness(), FLOAT_TOLERANCE); - // 0.6 to HLG = 0.905727, rate = (1-0.905727) / 4 - assertEquals(0.023568f, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); + assertEquals(0.04f, mHdrClamper.getTransitionRate(), FLOAT_TOLERANCE); } // MsgInfo.sendTime is calculated first by adding SystemClock.uptimeMillis() diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt index 2f6859c14742..be33b1b6f34f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt @@ -165,8 +165,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { null } whenever(mocks.settings.addPackageLPw(nullable(), nullable(), nullable(), nullable(), - nullable(), nullable(), nullable(), nullable(), nullable(), nullable(), nullable(), - nullable(), nullable(), nullable(), nullable(), nullable(), nullable())) { + nullable(), nullable(), nullable())) { val name: String = getArgument(0) val pendingAdd = mPendingPackageAdds.firstOrNull { it.first == name } ?: return@whenever null diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index cf315a4e0b9a..b9e45bab7ab3 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -16,6 +16,7 @@ package com.android.server.accessibility; +import static android.accessibilityservice.AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN; import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_NONE; @@ -68,6 +69,7 @@ import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.provider.Settings; import android.testing.TestableContext; +import android.util.ArraySet; import android.view.Display; import android.view.DisplayAdjustments; import android.view.DisplayInfo; @@ -600,6 +602,74 @@ public class AccessibilityManagerServiceTest { } @Test + public void testPackagesForceStopped_disablesRelevantService() { + final AccessibilityServiceInfo info_a = new AccessibilityServiceInfo(); + info_a.setComponentName(COMPONENT_NAME); + final AccessibilityServiceInfo info_b = new AccessibilityServiceInfo(); + info_b.setComponentName(new ComponentName("package", "class")); + + AccessibilityUserState userState = mA11yms.getCurrentUserState(); + userState.mInstalledServices.clear(); + userState.mInstalledServices.add(info_a); + userState.mInstalledServices.add(info_b); + userState.mEnabledServices.clear(); + userState.mEnabledServices.add(info_a.getComponentName()); + userState.mEnabledServices.add(info_b.getComponentName()); + + synchronized (mA11yms.getLock()) { + mA11yms.onPackagesForceStoppedLocked( + new String[]{info_a.getComponentName().getPackageName()}, userState); + } + + //Assert user state change + userState = mA11yms.getCurrentUserState(); + assertThat(userState.mEnabledServices).containsExactly(info_b.getComponentName()); + //Assert setting change + final Set<ComponentName> componentsFromSetting = new ArraySet<>(); + mA11yms.readComponentNamesFromSettingLocked(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, + userState.mUserId, componentsFromSetting); + assertThat(componentsFromSetting).containsExactly(info_b.getComponentName()); + } + + @Test + @RequiresFlagsEnabled(Flags.FLAG_DISABLE_CONTINUOUS_SHORTCUT_ON_FORCE_STOP) + public void testPackagesForceStopped_fromContinuousService_removesButtonTarget() { + final AccessibilityServiceInfo info_a = new AccessibilityServiceInfo(); + info_a.setComponentName(COMPONENT_NAME); + info_a.flags = FLAG_REQUEST_ACCESSIBILITY_BUTTON; + final AccessibilityServiceInfo info_b = new AccessibilityServiceInfo(); + info_b.setComponentName(new ComponentName("package", "class")); + + AccessibilityUserState userState = mA11yms.getCurrentUserState(); + userState.mInstalledServices.clear(); + userState.mInstalledServices.add(info_a); + userState.mInstalledServices.add(info_b); + userState.mAccessibilityButtonTargets.clear(); + userState.mAccessibilityButtonTargets.add(info_a.getComponentName().flattenToString()); + userState.mAccessibilityButtonTargets.add(info_b.getComponentName().flattenToString()); + + // despite force stopping both packages, only the first service has the relevant flag, + // so only the first should be removed. + synchronized (mA11yms.getLock()) { + mA11yms.onPackagesForceStoppedLocked( + new String[]{ + info_a.getComponentName().getPackageName(), + info_b.getComponentName().getPackageName()}, + userState); + } + + //Assert user state change + userState = mA11yms.getCurrentUserState(); + assertThat(userState.mAccessibilityButtonTargets).containsExactly( + info_b.getComponentName().flattenToString()); + //Assert setting change + final Set<String> targetsFromSetting = new ArraySet<>(); + mA11yms.readColonDelimitedSettingToSet(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, + userState.mUserId, str -> str, targetsFromSetting); + assertThat(targetsFromSetting).containsExactly(info_b.getComponentName().flattenToString()); + } + + @Test @RequiresFlagsDisabled(Flags.FLAG_SCAN_PACKAGES_WITHOUT_LOCK) // Test old behavior to validate lock detection for the old (locked access) case. public void testPackageMonitorScanPackages_scansWhileHoldingLock() { diff --git a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java index 37a6d22f038b..eca19c8e8c4d 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java @@ -255,7 +255,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { public void testUnlockUserKeyIfUnsecuredPassesPrimaryUserAuthSecret() throws RemoteException { initSpAndSetCredential(PRIMARY_USER_ID, newPassword(null)); reset(mAuthSecretService); - mLocalService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); + mService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); verify(mAuthSecretService).setPrimaryUserCredential(any(byte[].class)); } @@ -267,7 +267,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { mService.setLockCredential(nonePassword(), password, PRIMARY_USER_ID); reset(mAuthSecretService); - mLocalService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); + mService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); verify(mAuthSecretService).setPrimaryUserCredential(any(byte[].class)); } @@ -285,39 +285,39 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { @Test public void testHeadlessSystemUserDoesNotPassAuthSecret() throws RemoteException { setupHeadlessTest(); - mLocalService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); + mService.unlockUserKeyIfUnsecured(PRIMARY_USER_ID); verify(mAuthSecretService, never()).setPrimaryUserCredential(any(byte[].class)); } @Test public void testHeadlessSecondaryUserPassesAuthSecret() throws RemoteException { setupHeadlessTest(); - mLocalService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); + mService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); verify(mAuthSecretService).setPrimaryUserCredential(any(byte[].class)); } @Test public void testHeadlessTertiaryUserPassesSameAuthSecret() throws RemoteException { setupHeadlessTest(); - mLocalService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); + mService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); var captor = ArgumentCaptor.forClass(byte[].class); verify(mAuthSecretService).setPrimaryUserCredential(captor.capture()); var value = captor.getValue(); reset(mAuthSecretService); - mLocalService.unlockUserKeyIfUnsecured(TERTIARY_USER_ID); + mService.unlockUserKeyIfUnsecured(TERTIARY_USER_ID); verify(mAuthSecretService).setPrimaryUserCredential(eq(value)); } @Test public void testHeadlessTertiaryUserPassesSameAuthSecretAfterReset() throws RemoteException { setupHeadlessTest(); - mLocalService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); + mService.unlockUserKeyIfUnsecured(SECONDARY_USER_ID); var captor = ArgumentCaptor.forClass(byte[].class); verify(mAuthSecretService).setPrimaryUserCredential(captor.capture()); var value = captor.getValue(); mService.clearAuthSecret(); reset(mAuthSecretService); - mLocalService.unlockUserKeyIfUnsecured(TERTIARY_USER_ID); + mService.unlockUserKeyIfUnsecured(TERTIARY_USER_ID); verify(mAuthSecretService).setPrimaryUserCredential(eq(value)); } diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java index 42be3d36620a..5d6f36c005b4 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java @@ -19,7 +19,6 @@ package com.android.server.pm; import android.content.pm.SigningDetails; import android.util.SparseArray; -import com.android.server.pm.parsing.pkg.ParsedPackage; import com.android.server.pm.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageUserStateImpl; @@ -159,17 +158,19 @@ public class PackageSettingBuilder { public PackageSetting build() { final PackageSetting packageSetting = new PackageSetting(mName, mRealName, - new File(mCodePath), mLegacyNativeLibraryPathString, mPrimaryCpuAbiString, - mSecondaryCpuAbiString, mCpuAbiOverrideString, mPVersionCode, mPkgFlags, - mPrivateFlags, mSharedUserId, null /* usesSdkLibraries */, - null /* usesSdkLibrariesVersions */, null /* usesStaticLibraries */, - null /* usesStaticLibrariesVersions */, mMimeGroups, mDomainSetId); - packageSetting.setSignatures(mSigningDetails != null - ? new PackageSignatures(mSigningDetails) - : new PackageSignatures()); - packageSetting.setPkg((ParsedPackage) mPkg); - packageSetting.setAppId(mAppId); - packageSetting.setVolumeUuid(this.mVolumeUuid); + new File(mCodePath), mPkgFlags, mPrivateFlags, mDomainSetId) + .setLegacyNativeLibraryPath(mLegacyNativeLibraryPathString) + .setPrimaryCpuAbi(mPrimaryCpuAbiString) + .setSecondaryCpuAbi(mSecondaryCpuAbiString) + .setCpuAbiOverride(mCpuAbiOverrideString) + .setLongVersionCode(mPVersionCode) + .setSharedUserAppId(mSharedUserId) + .setMimeGroups(mMimeGroups) + .setSignatures(mSigningDetails != null + ? new PackageSignatures(mSigningDetails) : new PackageSignatures()) + .setPkg(mPkg) + .setAppId(mAppId) + .setVolumeUuid(this.mVolumeUuid); if (mInstallSource != null) { packageSetting.setInstallSource(mInstallSource); } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java index 9bd938f2e0a7..cf8548cfe689 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java @@ -80,7 +80,9 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.IAccessibilityManager; import android.view.accessibility.IAccessibilityManagerClient; + import androidx.test.runner.AndroidJUnit4; + import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags; import com.android.internal.config.sysui.TestableFlagResolver; import com.android.internal.logging.InstanceIdSequence; @@ -93,6 +95,7 @@ import com.android.server.pm.PackageManagerService; import java.util.List; import java.util.Objects; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -190,7 +193,7 @@ public class NotificationAttentionHelperTest extends UiServiceTestCase { assertTrue(mAccessibilityManager.isEnabled()); // TODO (b/291907312): remove feature flag - mTestFlagResolver.setFlagOverride(NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR, true); + mSetFlagsRule.enableFlags(Flags.FLAG_REFACTOR_ATTENTION_HELPER); // Disable feature flags by default. Tests should enable as needed. mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS, Flags.FLAG_EXPIRE_BITMAPS); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 75d012a8e1f2..16c39b440ba5 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -71,6 +71,7 @@ import static android.os.UserHandle.USER_SYSTEM; import static android.os.UserManager.USER_TYPE_FULL_SECONDARY; import static android.os.UserManager.USER_TYPE_PROFILE_CLONE; import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED; +import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE; import static android.service.notification.Adjustment.KEY_IMPORTANCE; import static android.service.notification.Adjustment.KEY_USER_SENTIMENT; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING; @@ -84,7 +85,6 @@ import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; -import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags.ENABLE_ATTENTION_HELPER_REFACTOR; import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags.FSI_FORCE_DEMOTE; import static com.android.internal.config.sysui.SystemUiSystemPropertiesFlags.NotificationFlags.SHOW_STICKY_HUN_FOR_DENIED_FSI; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; @@ -207,6 +207,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.WorkSource; import android.permission.PermissionManager; +import android.platform.test.flag.junit.SetFlagsRule; import android.provider.DeviceConfig; import android.provider.MediaStore; import android.provider.Settings; @@ -318,6 +319,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { private static final int UID_HEADLESS = 1_000_000; private static final int TOAST_DURATION = 2_000; private static final int SECONDARY_DISPLAY_ID = 42; + private static final int TEST_PROFILE_USERHANDLE = 12; private final int mUid = Binder.getCallingUid(); private final @UserIdInt int mUserId = UserHandle.getUserId(mUid); @@ -325,6 +327,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Rule public TestRule compatChangeRule = new PlatformCompatChangeRule(); + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + private TestableNotificationManagerService mService; private INotificationManager mBinderService; private NotificationManagerInternal mInternalService; @@ -445,7 +450,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { TestableNotificationManagerService.StrongAuthTrackerFake mStrongAuthTracker; TestableFlagResolver mTestFlagResolver = new TestableFlagResolver(); - + @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); private InstanceIdSequence mNotificationInstanceIdSequence = new InstanceIdSequenceFake( 1 << 30); @Mock @@ -611,7 +616,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { }); // TODO (b/291907312): remove feature flag - mTestFlagResolver.setFlagOverride(ENABLE_ATTENTION_HELPER_REFACTOR, false); + mSetFlagsRule.disableFlags(Flags.FLAG_REFACTOR_ATTENTION_HELPER, + Flags.FLAG_POLITE_NOTIFICATIONS); initNMS(); } @@ -652,7 +658,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(mHistoryManager).onBootPhaseAppsCanStart(); // TODO b/291907312: remove feature flag - if (mTestFlagResolver.isEnabled(ENABLE_ATTENTION_HELPER_REFACTOR)) { + if (Flags.refactorAttentionHelper()) { mService.mAttentionHelper.setAudioManager(mAudioManager); } else { mService.setAudioManager(mAudioManager); @@ -826,6 +832,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mPackageIntentReceiver.onReceive(getContext(), intent); } + private void simulateProfileAvailabilityActions(String intentAction) { + final Intent intent = new Intent(intentAction); + intent.putExtra(Intent.EXTRA_USER_HANDLE, TEST_PROFILE_USERHANDLE); + mUserSwitchIntentReceiver.onReceive(mContext, intent); + } + private ArrayMap<Boolean, ArrayList<ComponentName>> generateResetComponentValues() { ArrayMap<Boolean, ArrayList<ComponentName>> changed = new ArrayMap<>(); changed.put(true, new ArrayList<>()); @@ -1683,7 +1695,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testEnqueueNotificationWithTag_WritesExpectedLogs_NAHRefactor() throws Exception { // TODO b/291907312: remove feature flag - mTestFlagResolver.setFlagOverride(ENABLE_ATTENTION_HELPER_REFACTOR, true); + mSetFlagsRule.enableFlags(Flags.FLAG_REFACTOR_ATTENTION_HELPER); // Cleanup NMS before re-initializing if (mService != null) { try { @@ -9146,7 +9158,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testOnBubbleMetadataChangedToSuppressNotification_soundStopped_NAHRefactor() throws Exception { // TODO b/291907312: remove feature flag - mTestFlagResolver.setFlagOverride(ENABLE_ATTENTION_HELPER_REFACTOR, true); + mSetFlagsRule.enableFlags(Flags.FLAG_REFACTOR_ATTENTION_HELPER); // Cleanup NMS before re-initializing if (mService != null) { try { @@ -12751,6 +12763,23 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(service, times(1)).setDNDMigrationDone(user.id); } + @Test + public void testProfileUnavailableIntent() throws RemoteException { + mSetFlagsRule.enableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + simulateProfileAvailabilityActions(Intent.ACTION_PROFILE_UNAVAILABLE); + verify(mWorkerHandler).post(any(Runnable.class)); + verify(mSnoozeHelper).clearData(anyInt()); + } + + + @Test + public void testManagedProfileUnavailableIntent() throws RemoteException { + mSetFlagsRule.disableFlags(FLAG_ALLOW_PRIVATE_PROFILE); + simulateProfileAvailabilityActions(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE); + verify(mWorkerHandler).post(any(Runnable.class)); + verify(mSnoozeHelper).clearData(anyInt()); + } + private NotificationRecord createAndPostNotification(Notification.Builder nb, String testName) throws RemoteException { StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, testName, mUid, 0, diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java index 121e29609df5..337dd22e8712 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java @@ -91,7 +91,6 @@ public class NotificationVisitUrisTest extends UiServiceTestCase { private static final Multimap<Class<?>, String> KNOWN_BAD = ImmutableMultimap.<Class<?>, String>builder() .put(Person.Builder.class, "setUri") // TODO: b/281044385 - .put(RemoteViews.class, "setRemoteAdapter") // TODO: b/281044385 .build(); // Types that we can't really produce. No methods receiving these parameters will be invoked. diff --git a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java index 75a8dd822914..085eddd2e73d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.platform.test.annotations.Presubmit; @@ -94,10 +95,14 @@ public class UnknownAppVisibilityControllerTest extends WindowTestsBase { public void testRemoveFinishingInvisibleActivityFromUnknown() { final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build(); mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity); - activity.finishing = true; - activity.setVisibleRequested(true); - activity.setVisibility(false); + assertFalse(mDisplayContent.mUnknownAppVisibilityController.allResolved()); + activity.makeFinishingLocked(); assertTrue(mDisplayContent.mUnknownAppVisibilityController.allResolved()); + + mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity); + assertTrue(mDisplayContent.mUnknownAppVisibilityController.isVisibilityUnknown(activity)); + activity.setState(ActivityRecord.State.STOPPED, "test"); + assertFalse(mDisplayContent.mUnknownAppVisibilityController.isVisibilityUnknown(activity)); } @Test diff --git a/tools/hoststubgen/hoststubgen/test-tiny-framework/run-test-manually.sh b/tools/hoststubgen/hoststubgen/test-tiny-framework/run-test-manually.sh index 6bf074b1bf9f..523106f51fc8 100755 --- a/tools/hoststubgen/hoststubgen/test-tiny-framework/run-test-manually.sh +++ b/tools/hoststubgen/hoststubgen/test-tiny-framework/run-test-manually.sh @@ -36,7 +36,7 @@ mkdir -p $out HOSTSTUBGEN=hoststubgen # Rebuild the tool and the dependencies. These are the only things we build with the build system. -run m $HOSTSTUBGEN hoststubgen-annotations hoststubgen-helper-runtime truth-prebuilt junit +run m $HOSTSTUBGEN hoststubgen-annotations hoststubgen-helper-runtime truth junit # Build tiny-framework @@ -55,7 +55,7 @@ framework_compile_classpaths=( test_compile_classpaths=( $SOONG_INT/external/junit/junit/android_common/combined/junit.jar - $ANDROID_HOST_OUT/framework/truth-prebuilt.jar + $SOONG_INT/external/truth/truth/android_common/combined/truth.jar ) test_runtime_classpaths=( diff --git a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java index 2a199d27a60e..58638e8e1af4 100644 --- a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java +++ b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java @@ -113,6 +113,7 @@ public class WifiNl80211Manager { private HashMap<String, IPnoScanEvent> mPnoScanEventHandlers = new HashMap<>(); private HashMap<String, IApInterfaceEventCallback> mApInterfaceListeners = new HashMap<>(); private Runnable mDeathEventHandler; + private Object mLock = new Object(); /** * Ensures that no more than one sendMgmtFrame operation runs concurrently. */ @@ -625,13 +626,15 @@ public class WifiNl80211Manager { @VisibleForTesting public void binderDied() { mEventHandler.post(() -> { - Log.e(TAG, "Wificond died!"); - clearState(); - // Invalidate the global wificond handle on death. Will be refreshed - // on the next setup call. - mWificond = null; - if (mDeathEventHandler != null) { - mDeathEventHandler.run(); + synchronized (mLock) { + Log.e(TAG, "Wificond died!"); + clearState(); + // Invalidate the global wificond handle on death. Will be refreshed + // on the next setup call. + mWificond = null; + if (mDeathEventHandler != null) { + mDeathEventHandler.run(); + } } }); } @@ -867,26 +870,28 @@ public class WifiNl80211Manager { * @return Returns true on success. */ public boolean tearDownInterfaces() { - Log.d(TAG, "tearing down interfaces in wificond"); - // Explicitly refresh the wificodn handler because |tearDownInterfaces()| - // could be used to cleanup before we setup any interfaces. - if (!retrieveWificondAndRegisterForDeath()) { - return false; - } + synchronized (mLock) { + Log.d(TAG, "tearing down interfaces in wificond"); + // Explicitly refresh the wificond handler because |tearDownInterfaces()| + // could be used to cleanup before we setup any interfaces. + if (!retrieveWificondAndRegisterForDeath()) { + return false; + } - try { - for (Map.Entry<String, IWifiScannerImpl> entry : mWificondScanners.entrySet()) { - entry.getValue().unsubscribeScanEvents(); - entry.getValue().unsubscribePnoScanEvents(); + try { + for (Map.Entry<String, IWifiScannerImpl> entry : mWificondScanners.entrySet()) { + entry.getValue().unsubscribeScanEvents(); + entry.getValue().unsubscribePnoScanEvents(); + } + mWificond.tearDownInterfaces(); + clearState(); + return true; + } catch (RemoteException e) { + Log.e(TAG, "Failed to tear down interfaces due to remote exception"); } - mWificond.tearDownInterfaces(); - clearState(); - return true; - } catch (RemoteException e) { - Log.e(TAG, "Failed to tear down interfaces due to remote exception"); - } - return false; + return false; + } } /** Helper function to look up the interface handle using name */ diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java index 01f15916f244..3d5a0f7a239f 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java @@ -16,6 +16,7 @@ package android.net.wifi.sharedconnectivity.app; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; @@ -169,6 +170,7 @@ public final class NetworkProviderInfo implements Parcelable { * @return Returns the Builder object. */ @NonNull + @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public Builder setBatteryCharging(boolean isBatteryCharging) { mIsBatteryCharging = isBatteryCharging; return this; @@ -283,6 +285,7 @@ public final class NetworkProviderInfo implements Parcelable { * * @return Returns true if the battery of the remote device is charging. */ + @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging() { return mIsBatteryCharging; } diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java index 71ac94ba2ee4..b0f68f7870ee 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -17,6 +17,7 @@ package android.net.wifi.sharedconnectivity.app; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; @@ -296,6 +297,7 @@ public class SharedConnectivityManager { */ @TestApi @NonNull + @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api") public BroadcastReceiver getBroadcastReceiver() { return mBroadcastReceiver; } |