diff options
566 files changed, 21081 insertions, 10199 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 6ecd38f054aa..3391698ee15a 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -335,6 +335,11 @@ java_aconfig_library { aconfig_declarations: "android.os.flags-aconfig", defaults: ["framework-minus-apex-aconfig-java-defaults"], mode: "exported", + min_sdk_version: "30", + apex_available: [ + "//apex_available:platform", + "com.android.mediaprovider", + ], } cc_aconfig_library { @@ -716,6 +721,7 @@ aconfig_declarations { name: "android.credentials.flags-aconfig", package: "android.credentials.flags", srcs: ["core/java/android/credentials/flags.aconfig"], + exportable: true, } java_aconfig_library { @@ -724,6 +730,13 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "android.credentials.flags-aconfig-java-export", + aconfig_declarations: "android.credentials.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], + mode: "exported", +} + // Content Protection aconfig_declarations { name: "android.view.contentprotection.flags-aconfig", diff --git a/Android.bp b/Android.bp index 057b1d62ea5a..59e903ef37d3 100644 --- a/Android.bp +++ b/Android.bp @@ -389,7 +389,6 @@ java_defaults { // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build // system propagates "required" properly. "gps_debug.conf", - "protolog.conf.json.gz", "core.protolog.pb", "framework-res", // any install dependencies should go into framework-minus-apex-install-dependencies diff --git a/TEST_MAPPING b/TEST_MAPPING index c904eb46d88e..49384cde5803 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -232,30 +232,5 @@ } ] } - ], - "auto-features-postsubmit": [ - // Test tag for automotive feature targets. These are only running in postsubmit. - // This tag is used in targeted test features testing to limit resource use. - // TODO(b/256932212): this tag to be removed once the above is no longer in use. - { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.pm.UserVisibilityMediatorSUSDTest" - }, - { - "include-filter": "com.android.server.pm.UserVisibilityMediatorMUMDTest" - }, - { - "include-filter": "com.android.server.pm.UserVisibilityMediatorMUPANDTest" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] - } ] } diff --git a/core/api/current.txt b/core/api/current.txt index 4d3ca1335416..8a61f4a14b50 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10764,6 +10764,7 @@ package android.content { field public static final String OVERLAY_SERVICE = "overlay"; field public static final String PEOPLE_SERVICE = "people"; field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint"; + field @FlaggedApi("android.security.frp_enforcement") public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; field public static final String POWER_SERVICE = "power"; field public static final String PRINT_SERVICE = "print"; field @FlaggedApi("android.os.telemetry_apis_framework_initialization") public static final String PROFILING_SERVICE = "profiling"; @@ -20235,10 +20236,10 @@ package android.hardware.camera2.params { method public android.hardware.camera2.CaptureRequest getSessionParameters(); method public int getSessionType(); method public android.hardware.camera2.CameraCaptureSession.StateCallback getStateCallback(); - method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback); method public void setColorSpace(@NonNull android.graphics.ColorSpace.Named); method public void setInputConfiguration(@NonNull android.hardware.camera2.params.InputConfiguration); method public void setSessionParameters(android.hardware.camera2.CaptureRequest); + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public void setStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.SessionConfiguration> CREATOR; field public static final int SESSION_HIGH_SPEED = 1; // 0x1 diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 8ceda62e0e02..0023e2a3d579 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3797,7 +3797,6 @@ package android.content { field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence"; field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller"; field public static final String PERMISSION_SERVICE = "permission"; - field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; field public static final String REBOOT_READINESS_SERVICE = "reboot_readiness"; field public static final String ROLLBACK_SERVICE = "rollback"; field public static final String SAFETY_CENTER_SERVICE = "safety_center"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 0a26490b772f..a2b847e0fb5f 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2460,6 +2460,7 @@ package android.os { } public class UserManager { + method @FlaggedApi("android.os.allow_private_profile") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public boolean canAddPrivateProfile(); method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createProfileForUser(@Nullable String, @NonNull String, int, int, @Nullable String[]); method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String); method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index a8352fad8a90..ff713d071a05 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1581,6 +1581,10 @@ public class AppOpsManager { * Allows an app to access location without the traditional location permissions and while the * user location setting is off, but only during pre-defined emergency sessions. * + * <p>This op is only used for tracking, not for permissions, so it is still the client's + * responsibility to check the {@link Manifest.permission.LOCATION_BYPASS} permission + * appropriately. + * * @hide */ public static final int OP_EMERGENCY_LOCATION = AppProtoEnums.APP_OP_EMERGENCY_LOCATION; @@ -2459,6 +2463,10 @@ public class AppOpsManager { * Allows an app to access location without the traditional location permissions and while the * user location setting is off, but only during pre-defined emergency sessions. * + * <p>This op is only used for tracking, not for permissions, so it is still the client's + * responsibility to check the {@link Manifest.permission.LOCATION_BYPASS} permission + * appropriately. + * * @hide */ @SystemApi @@ -3047,8 +3055,10 @@ public class AppOpsManager { new AppOpInfo.Builder(OP_UNARCHIVAL_CONFIRMATION, OPSTR_UNARCHIVAL_CONFIRMATION, "UNARCHIVAL_CONFIRMATION") .setDefaultMode(MODE_ALLOWED).build(), - // TODO(b/301150056): STOPSHIP determine how this appop should work with the permission new AppOpInfo.Builder(OP_EMERGENCY_LOCATION, OPSTR_EMERGENCY_LOCATION, "EMERGENCY_LOCATION") + .setDefaultMode(MODE_ALLOWED) + // even though this has a permission associated, this op is only used for tracking, + // and the client is responsible for checking the LOCATION_BYPASS permission. .setPermission(Manifest.permission.LOCATION_BYPASS).build(), }; diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 1cbec3126aac..66ec865092f7 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -450,6 +450,11 @@ public final class SystemServiceRegistry { new CachedServiceFetcher<VcnManager>() { @Override public VcnManager createService(ContextImpl ctx) throws ServiceNotFoundException { + if (!ctx.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) { + return null; + } + IBinder b = ServiceManager.getService(Context.VCN_MANAGEMENT_SERVICE); IVcnManagementService service = IVcnManagementService.Stub.asInterface(b); return new VcnManager(ctx, service); @@ -1736,6 +1741,13 @@ public final class SystemServiceRegistry { return fetcher; } + private static boolean hasSystemFeatureOpportunistic(@NonNull ContextImpl ctx, + @NonNull String featureName) { + PackageManager manager = ctx.getPackageManager(); + if (manager == null) return true; + return manager.hasSystemFeature(featureName); + } + /** * Gets a system service from a given context. * @hide @@ -1758,12 +1770,18 @@ public final class SystemServiceRegistry { case Context.VIRTUALIZATION_SERVICE: case Context.VIRTUAL_DEVICE_SERVICE: return null; + case Context.VCN_MANAGEMENT_SERVICE: + if (!hasSystemFeatureOpportunistic(ctx, + PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) { + return null; + } + break; case Context.SEARCH_SERVICE: // Wear device does not support SEARCH_SERVICE so we do not print WTF here - PackageManager manager = ctx.getPackageManager(); - if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_WATCH)) { + if (hasSystemFeatureOpportunistic(ctx, PackageManager.FEATURE_WATCH)) { return null; } + break; } Slog.wtf(TAG, "Manager wrapper not available: " + name); return null; diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 441d52148b7b..3ec6fe7728e5 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -1,3 +1,6 @@ +# proto-file: build/make/tools/aconfig/aconfig_protos/protos/aconfig.proto +# proto-message: flag_declarations + package: "android.app.admin.flags" flag { @@ -180,3 +183,10 @@ flag { description: "Allow COPE admin to control screen brightness and timeout." bug: "323894620" } + +flag { + name: "is_recursive_required_app_merging_enabled" + namespace: "enterprise" + description: "Guards a new flow for recursive required enterprise app list merging" + bug: "319084618" +} diff --git a/core/java/android/app/ondeviceintelligence/IOnDeviceIntelligenceManager.aidl b/core/java/android/app/ondeviceintelligence/IOnDeviceIntelligenceManager.aidl index 0dbe18156904..8bf288abb0f9 100644 --- a/core/java/android/app/ondeviceintelligence/IOnDeviceIntelligenceManager.aidl +++ b/core/java/android/app/ondeviceintelligence/IOnDeviceIntelligenceManager.aidl @@ -53,19 +53,22 @@ void getFeatureDetails(in Feature feature, in IFeatureDetailsCallback featureDetailsCallback) = 4; @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)") - void requestFeatureDownload(in Feature feature, in ICancellationSignal signal, in IDownloadCallback callback) = 5; + void requestFeatureDownload(in Feature feature, in AndroidFuture cancellationSignalFuture, in IDownloadCallback callback) = 5; @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)") - void requestTokenInfo(in Feature feature, in Bundle requestBundle, in ICancellationSignal signal, + void requestTokenInfo(in Feature feature, in Bundle requestBundle, in AndroidFuture cancellationSignalFuture, in ITokenInfoCallback tokenInfocallback) = 6; @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)") - void processRequest(in Feature feature, in Bundle requestBundle, int requestType, in ICancellationSignal cancellationSignal, - in IProcessingSignal signal, in IResponseCallback responseCallback) = 7; + void processRequest(in Feature feature, in Bundle requestBundle, int requestType, + in AndroidFuture cancellationSignalFuture, + in AndroidFuture processingSignalFuture, + in IResponseCallback responseCallback) = 7; @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)") void processRequestStreaming(in Feature feature, - in Bundle requestBundle, int requestType, in ICancellationSignal cancellationSignal, in IProcessingSignal signal, + in Bundle requestBundle, int requestType, in AndroidFuture cancellationSignalFuture, + in AndroidFuture processingSignalFuture, in IStreamingResponseCallback streamingCallback) = 8; String getRemoteServicePackageName() = 9; diff --git a/core/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java b/core/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java index a465e3cbb6ec..bc50d2e492ae 100644 --- a/core/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java +++ b/core/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java @@ -26,22 +26,23 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.content.ComponentName; import android.content.Context; import android.graphics.Bitmap; import android.os.Binder; import android.os.Bundle; import android.os.CancellationSignal; +import android.os.IBinder; import android.os.ICancellationSignal; import android.os.OutcomeReceiver; import android.os.PersistableBundle; import android.os.RemoteCallback; import android.os.RemoteException; import android.system.OsConstants; +import android.util.Log; import androidx.annotation.IntDef; -import com.android.internal.R; +import com.android.internal.infra.AndroidFuture; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -76,6 +77,8 @@ public final class OnDeviceIntelligenceManager { */ public static final String AUGMENT_REQUEST_CONTENT_BUNDLE_KEY = "AugmentRequestContentBundleKey"; + + private static final String TAG = "OnDeviceIntelligence"; private final Context mContext; private final IOnDeviceIntelligenceManager mService; @@ -121,9 +124,9 @@ public final class OnDeviceIntelligenceManager { @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public String getRemoteServicePackageName() { String result; - try{ - result = mService.getRemoteServicePackageName(); - } catch (RemoteException e){ + try { + result = mService.getRemoteServicePackageName(); + } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } return result; @@ -288,18 +291,15 @@ public final class OnDeviceIntelligenceManager { } }; - ICancellationSignal transport = null; - if (cancellationSignal != null) { - transport = CancellationSignal.createTransport(); - cancellationSignal.setRemote(transport); - } - - mService.requestFeatureDownload(feature, transport, downloadCallback); + mService.requestFeatureDownload(feature, + configureRemoteCancellationFuture(cancellationSignal, callbackExecutor), + downloadCallback); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } + /** * The methods computes the token related information for a given request payload using the * provided {@link Feature}. @@ -337,13 +337,9 @@ public final class OnDeviceIntelligenceManager { } }; - ICancellationSignal transport = null; - if (cancellationSignal != null) { - transport = CancellationSignal.createTransport(); - cancellationSignal.setRemote(transport); - } - - mService.requestTokenInfo(feature, request, transport, callback); + mService.requestTokenInfo(feature, request, + configureRemoteCancellationFuture(cancellationSignal, callbackExecutor), + callback); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -407,19 +403,9 @@ public final class OnDeviceIntelligenceManager { }; - IProcessingSignal transport = null; - if (processingSignal != null) { - transport = ProcessingSignal.createTransport(); - processingSignal.setRemote(transport); - } - - ICancellationSignal cancellationTransport = null; - if (cancellationSignal != null) { - cancellationTransport = CancellationSignal.createTransport(); - cancellationSignal.setRemote(cancellationTransport); - } - - mService.processRequest(feature, request, requestType, cancellationTransport, transport, + mService.processRequest(feature, request, requestType, + configureRemoteCancellationFuture(cancellationSignal, callbackExecutor), + configureRemoteProcessingSignalFuture(processingSignal, callbackExecutor), callback); } catch (RemoteException e) { @@ -449,7 +435,8 @@ public final class OnDeviceIntelligenceManager { * @param callbackExecutor executor to run the callback on. */ @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) - public void processRequestStreaming(@NonNull Feature feature, @NonNull @InferenceParams Bundle request, + public void processRequestStreaming(@NonNull Feature feature, + @NonNull @InferenceParams Bundle request, @RequestType int requestType, @Nullable CancellationSignal cancellationSignal, @Nullable ProcessingSignal processingSignal, @@ -500,20 +487,11 @@ public final class OnDeviceIntelligenceManager { } }; - IProcessingSignal transport = null; - if (processingSignal != null) { - transport = ProcessingSignal.createTransport(); - processingSignal.setRemote(transport); - } - - ICancellationSignal cancellationTransport = null; - if (cancellationSignal != null) { - cancellationTransport = CancellationSignal.createTransport(); - cancellationSignal.setRemote(cancellationTransport); - } - mService.processRequestStreaming( - feature, request, requestType, cancellationTransport, transport, callback); + feature, request, requestType, + configureRemoteCancellationFuture(cancellationSignal, callbackExecutor), + configureRemoteProcessingSignalFuture(processingSignal, callbackExecutor), + callback); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -574,4 +552,45 @@ public final class OnDeviceIntelligenceManager { @Target({ElementType.PARAMETER, ElementType.FIELD}) public @interface InferenceParams { } + + + @Nullable + private static AndroidFuture<IBinder> configureRemoteCancellationFuture( + @Nullable CancellationSignal cancellationSignal, + @NonNull Executor callbackExecutor) { + if (cancellationSignal == null) { + return null; + } + AndroidFuture<IBinder> cancellationFuture = new AndroidFuture<>(); + cancellationFuture.whenCompleteAsync( + (cancellationTransport, error) -> { + if (error != null || cancellationTransport == null) { + Log.e(TAG, "Unable to receive the remote cancellation signal.", error); + } else { + cancellationSignal.setRemote( + ICancellationSignal.Stub.asInterface(cancellationTransport)); + } + }, callbackExecutor); + return cancellationFuture; + } + + @Nullable + private static AndroidFuture<IBinder> configureRemoteProcessingSignalFuture( + ProcessingSignal processingSignal, Executor executor) { + if (processingSignal == null) { + return null; + } + AndroidFuture<IBinder> processingSignalFuture = new AndroidFuture<>(); + processingSignalFuture.whenCompleteAsync( + (transport, error) -> { + if (error != null || transport == null) { + Log.e(TAG, "Unable to receive the remote processing signal.", error); + } else { + processingSignal.setRemote(IProcessingSignal.Stub.asInterface(transport)); + } + }, executor); + return processingSignalFuture; + } + + } diff --git a/core/java/android/app/ondeviceintelligence/ProcessingSignal.java b/core/java/android/app/ondeviceintelligence/ProcessingSignal.java index c275cc786007..733f4fad96f4 100644 --- a/core/java/android/app/ondeviceintelligence/ProcessingSignal.java +++ b/core/java/android/app/ondeviceintelligence/ProcessingSignal.java @@ -123,10 +123,10 @@ public final class ProcessingSignal { * Sets the processing signal callback to be called when signals are received. * * This method is intended to be used by the recipient of a processing signal - * such as the remote implementation for {@link OnDeviceIntelligenceManager} to handle - * cancellation requests while performing a long-running operation. This method is not - * intended - * to be used by applications themselves. + * such as the remote implementation in + * {@link android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService} to handle + * processing signals while performing a long-running operation. This method is not + * intended to be used by the caller themselves. * * If {@link ProcessingSignal#sendSignal} has already been called, then the provided callback * is invoked immediately and all previously queued actions are passed to remote signal. @@ -200,7 +200,7 @@ public final class ProcessingSignal { } /** - * Given a locally created transport, returns its associated cancellation signal. + * Given a locally created transport, returns its associated processing signal. * * @param transport The locally created transport, or null if none. * @return The associated processing signal, or null if none. diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index 3304475df89f..ec59cf61097b 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -972,6 +972,7 @@ public final class VirtualDeviceManager { * * @param config camera configuration. * @return newly created camera. + * @throws UnsupportedOperationException if virtual camera isn't supported on this device. * @see VirtualDeviceParams#POLICY_TYPE_CAMERA */ @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index 24d6a5cfc42d..2904e7c989e8 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -44,3 +44,11 @@ flag { description: "Enable device awareness in camera service" bug: "305170199" } + +flag { + namespace: "virtual_devices" + name: "device_aware_drm" + description: "Makes MediaDrm APIs device-aware" + bug: "303535376" + is_fixed_read_only: true +}
\ No newline at end of file diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 89300e3a15f1..284e3184d436 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4208,7 +4208,7 @@ public abstract class Context { MEDIA_COMMUNICATION_SERVICE, BATTERY_SERVICE, JOB_SCHEDULER_SERVICE, - //@hide: PERSISTENT_DATA_BLOCK_SERVICE, + PERSISTENT_DATA_BLOCK_SERVICE, //@hide: OEM_LOCK_SERVICE, MEDIA_PROJECTION_SERVICE, MIDI_SERVICE, @@ -5930,9 +5930,8 @@ public abstract class Context { * * @see #getSystemService(String) * @see android.service.persistentdata.PersistentDataBlockManager - * @hide */ - @SystemApi + @FlaggedApi(android.security.Flags.FLAG_FRP_ENFORCEMENT) public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; /** diff --git a/core/java/android/credentials/flags.aconfig b/core/java/android/credentials/flags.aconfig index 47edba6a9e56..16ca31f27028 100644 --- a/core/java/android/credentials/flags.aconfig +++ b/core/java/android/credentials/flags.aconfig @@ -47,6 +47,7 @@ flag { name: "configurable_selector_ui_enabled" description: "Enables OEM configurable Credential Selector UI" bug: "319448437" + is_exported: true } flag { diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 13d5c7e74e4b..6f901d7ec7d2 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -2800,7 +2800,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * upright.</p> * <p>Camera devices may either encode this value into the JPEG EXIF header, or * rotate the image data to match this orientation. When the image data is rotated, - * the thumbnail data will also be rotated.</p> + * the thumbnail data will also be rotated. Additionally, in the case where the image data + * is rotated, {@link android.media.Image#getWidth } and {@link android.media.Image#getHeight } + * will not be updated to reflect the height and width of the rotated image.</p> * <p>Note that this orientation is relative to the orientation of the camera sensor, given * by {@link CameraCharacteristics#SENSOR_ORIENTATION android.sensor.orientation}.</p> * <p>To translate from the device orientation given by the Android sensor APIs for camera diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 7145501c718d..69b1c34a1da2 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -3091,7 +3091,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * upright.</p> * <p>Camera devices may either encode this value into the JPEG EXIF header, or * rotate the image data to match this orientation. When the image data is rotated, - * the thumbnail data will also be rotated.</p> + * the thumbnail data will also be rotated. Additionally, in the case where the image data + * is rotated, {@link android.media.Image#getWidth } and {@link android.media.Image#getHeight } + * will not be updated to reflect the height and width of the rotated image.</p> * <p>Note that this orientation is relative to the orientation of the camera sensor, given * by {@link CameraCharacteristics#SENSOR_ORIENTATION android.sensor.orientation}.</p> * <p>To translate from the device orientation given by the Android sensor APIs for camera diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index 5b32f33777fa..c00e6101b363 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java @@ -1757,7 +1757,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { mCallbacks, result.getSequenceId()); } if ((!mSingleCapture) && (mPreviewProcessorType == - IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY)) { + IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY) + && mInitialized) { CaptureStageImpl captureStage = null; try { captureStage = mPreviewRequestUpdateProcessor.process( @@ -1780,8 +1781,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { } else { mRequestUpdatedNeeded = false; } - } else if (mPreviewProcessorType == - IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) { + } else if ((mPreviewProcessorType == + IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) && mInitialized) { int idx = mPendingResultMap.indexOfKey(timestamp); if ((idx >= 0) && (mPendingResultMap.get(timestamp).first == null)) { @@ -1828,7 +1829,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { } else { // No special handling for PROCESSOR_TYPE_NONE } - if (notifyClient) { + if (notifyClient && mInitialized) { final long ident = Binder.clearCallingIdentity(); try { if (processStatus) { diff --git a/core/java/android/hardware/camera2/params/SessionConfiguration.java b/core/java/android/hardware/camera2/params/SessionConfiguration.java index b0f354fac009..3b2913c81d49 100644 --- a/core/java/android/hardware/camera2/params/SessionConfiguration.java +++ b/core/java/android/hardware/camera2/params/SessionConfiguration.java @@ -133,7 +133,7 @@ public final class SessionConfiguration implements Parcelable { * {@link CameraDeviceSetup.isSessionConfigurationSupported} and {@link * CameraDeviceSetup.getSessionCharacteristics} to query a camera device's feature * combination support and session specific characteristics. For the SessionConfiguration - * object to be used to create a capture session, {@link #setCallback} must be called to + * object to be used to create a capture session, {@link #setStateCallback} must be called to * specify the state callback function, and any incomplete OutputConfigurations must be * completed via {@link OutputConfiguration#addSurface} or * {@link OutputConfiguration#setSurfacesForMultiResolutionOutput} as appropriate.</p> @@ -419,7 +419,7 @@ public final class SessionConfiguration implements Parcelable { * @param cb A state callback interface implementation. */ @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) - public void setCallback( + public void setStateCallback( @NonNull @CallbackExecutor Executor executor, @NonNull CameraCaptureSession.StateCallback cb) { mStateCallback = cb; diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java index b067095668b2..978a8f9200ba 100644 --- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java +++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java @@ -1473,6 +1473,11 @@ public final class StreamConfigurationMap { * <li>ImageFormat.DEPTH_JPEG => HAL_DATASPACE_DYNAMIC_DEPTH * <li>ImageFormat.HEIC => HAL_DATASPACE_HEIF * <li>ImageFormat.JPEG_R => HAL_DATASPACE_JPEG_R + * <li>ImageFormat.YUV_420_888 => HAL_DATASPACE_JFIF + * <li>ImageFormat.RAW_SENSOR => HAL_DATASPACE_ARBITRARY + * <li>ImageFormat.RAW_OPAQUE => HAL_DATASPACE_ARBITRARY + * <li>ImageFormat.RAW10 => HAL_DATASPACE_ARBITRARY + * <li>ImageFormat.RAW12 => HAL_DATASPACE_ARBITRARY * <li>others => HAL_DATASPACE_UNKNOWN * </ul> * </p> @@ -1511,6 +1516,11 @@ public final class StreamConfigurationMap { return HAL_DATASPACE_JPEG_R; case ImageFormat.YUV_420_888: return HAL_DATASPACE_JFIF; + case ImageFormat.RAW_SENSOR: + case ImageFormat.RAW_PRIVATE: + case ImageFormat.RAW10: + case ImageFormat.RAW12: + return HAL_DATASPACE_ARBITRARY; default: return HAL_DATASPACE_UNKNOWN; } @@ -2005,6 +2015,12 @@ public final class StreamConfigurationMap { private static final int HAL_DATASPACE_RANGE_SHIFT = 27; private static final int HAL_DATASPACE_UNKNOWN = 0x0; + + /** + * @hide + */ + public static final int HAL_DATASPACE_ARBITRARY = 0x1; + /** @hide */ public static final int HAL_DATASPACE_V0_JFIF = (2 << HAL_DATASPACE_STANDARD_SHIFT) | diff --git a/core/java/android/hardware/devicestate/DeviceState.java b/core/java/android/hardware/devicestate/DeviceState.java index b214da227a2d..689e343bcbc6 100644 --- a/core/java/android/hardware/devicestate/DeviceState.java +++ b/core/java/android/hardware/devicestate/DeviceState.java @@ -173,7 +173,7 @@ public final class DeviceState { public static final int PROPERTY_FEATURE_DUAL_DISPLAY_INTERNAL_DEFAULT = 17; /** @hide */ - @IntDef(prefix = {"PROPERTY_"}, flag = true, value = { + @IntDef(prefix = {"PROPERTY_"}, flag = false, value = { PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED, PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN, PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN, @@ -197,7 +197,7 @@ public final class DeviceState { public @interface DeviceStateProperties {} /** @hide */ - @IntDef(prefix = {"PROPERTY_"}, flag = true, value = { + @IntDef(prefix = {"PROPERTY_"}, flag = false, value = { PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED, PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN, PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_OPEN @@ -207,7 +207,7 @@ public final class DeviceState { public @interface PhysicalDeviceStateProperties {} /** @hide */ - @IntDef(prefix = {"PROPERTY_"}, flag = true, value = { + @IntDef(prefix = {"PROPERTY_"}, flag = false, value = { PROPERTY_POLICY_CANCEL_OVERRIDE_REQUESTS, PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP, PROPERTY_POLICY_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL, diff --git a/core/java/android/hardware/radio/Announcement.java b/core/java/android/hardware/radio/Announcement.java index 3ba3ebceeb18..faa103cf1da3 100644 --- a/core/java/android/hardware/radio/Announcement.java +++ b/core/java/android/hardware/radio/Announcement.java @@ -71,7 +71,7 @@ public final class Announcement implements Parcelable { /** * An event called whenever a list of active announcements change. * - * The entire list is sent each time a new announcement appears or any ends broadcasting. + * <p>The entire list is sent each time a new announcement appears or any ends broadcasting. * * @param activeAnnouncements a full list of active announcements */ diff --git a/core/java/android/hardware/radio/ProgramList.java b/core/java/android/hardware/radio/ProgramList.java index c5167dbc7d4c..6146df8b4b1b 100644 --- a/core/java/android/hardware/radio/ProgramList.java +++ b/core/java/android/hardware/radio/ProgramList.java @@ -357,7 +357,7 @@ public final class ProgramList implements AutoCloseable { /** * Constructor of program list filter. * - * Arrays passed to this constructor become owned by this object, do not modify them later. + * <p>Arrays passed to this constructor will be owned by this object, do not modify them. * * @param identifierTypes see getIdentifierTypes() * @param identifiers see getIdentifiers() @@ -438,12 +438,11 @@ public final class ProgramList implements AutoCloseable { /** * Returns the list of identifier types that satisfy the filter. * - * If the program list entry contains at least one identifier of the type - * listed, it satisfies this condition. + * <p>If the program list entry contains at least one identifier of the type + * listed, it satisfies this condition. Empty list means no filtering on + * identifier type. * - * Empty list means no filtering on identifier type. - * - * @return the list of accepted identifier types, must not be modified + * @return the set of accepted identifier types, must not be modified */ public @NonNull Set<Integer> getIdentifierTypes() { return mIdentifierTypes; @@ -452,12 +451,10 @@ public final class ProgramList implements AutoCloseable { /** * Returns the list of identifiers that satisfy the filter. * - * If the program list entry contains at least one listed identifier, - * it satisfies this condition. - * - * Empty list means no filtering on identifier. + * <p>If the program list entry contains at least one listed identifier, + * it satisfies this condition. Empty list means no filtering on identifier. * - * @return the list of accepted identifiers, must not be modified + * @return the set of accepted identifiers, must not be modified */ public @NonNull Set<ProgramSelector.Identifier> getIdentifiers() { return mIdentifiers; @@ -476,7 +473,7 @@ public final class ProgramList implements AutoCloseable { /** * Checks, if updates on entry modifications should be disabled. * - * If true, 'modified' vector of ProgramListChunk must contain list + * <p>If true, 'modified' vector of ProgramListChunk must contain list * additions only. Once the program is added to the list, it's not * updated anymore. */ diff --git a/core/java/android/hardware/radio/ProgramSelector.java b/core/java/android/hardware/radio/ProgramSelector.java index 0740374ad8e2..42028f67f400 100644 --- a/core/java/android/hardware/radio/ProgramSelector.java +++ b/core/java/android/hardware/radio/ProgramSelector.java @@ -36,27 +36,31 @@ import java.util.stream.Stream; /** * A set of identifiers necessary to tune to a given station. * - * This can hold various identifiers, like - * - AM/FM frequency - * - HD Radio subchannel - * - DAB channel info + * <p>This can hold various identifiers, like + * <ui> + * <li>AM/FM frequency</li> + * <li>HD Radio subchannel</li> + * <li>DAB channel info</li> + * </ui> * - * The primary ID uniquely identifies a station and can be used for equality + * <p>The primary ID uniquely identifies a station and can be used for equality * check. The secondary IDs are supplementary and can speed up tuning process, * but the primary ID is sufficient (ie. after a full band scan). * - * Two selectors with different secondary IDs, but the same primary ID are + * <p>Two selectors with different secondary IDs, but the same primary ID are * considered equal. In particular, secondary IDs vector may get updated for * an entry on the program list (ie. when a better frequency for a given * station is found). * - * The primaryId of a given programType MUST be of a specific type: - * - AM, FM: RDS_PI if the station broadcasts RDS, AMFM_FREQUENCY otherwise; - * - AM_HD, FM_HD: HD_STATION_ID_EXT; - * - DAB: DAB_SIDECC; - * - DRMO: DRMO_SERVICE_ID; - * - SXM: SXM_SERVICE_ID; - * - VENDOR: VENDOR_PRIMARY. + * <p>The primaryId of a given programType MUST be of a specific type: + * <ui> + * <li>AM, FM: RDS_PI if the station broadcasts RDS, AMFM_FREQUENCY otherwise;</li> + * <li>AM_HD, FM_HD: HD_STATION_ID_EXT;</li> + * <li>DAB: DAB_SIDECC;</li> + * <li>DRMO: DRMO_SERVICE_ID;</li> + * <li>SXM: SXM_SERVICE_ID;</li> + * <li>VENDOR: VENDOR_PRIMARY.</li> + * </ui> * @hide */ @SystemApi @@ -258,10 +262,10 @@ public final class ProgramSelector implements Parcelable { /** * 64bit additional identifier for HD Radio. * - * <p>Due to Station ID abuse, some HD_STATION_ID_EXT identifiers may be not - * globally unique. To provide a best-effort solution, a short version of - * station name may be carried as additional identifier and may be used - * by the tuner hardware to double-check tuning. + * <p>Due to Station ID abuse, some {@link #IDENTIFIER_TYPE_HD_STATION_ID_EXT} + * identifiers may be not globally unique. To provide a best-effort solution, a + * short version of station name may be carried as additional identifier and + * may be used by the tuner hardware to double-check tuning. * * <p>The name is limited to the first 8 A-Z0-9 characters (lowercase * letters must be converted to uppercase). Encoded in little-endian @@ -384,7 +388,7 @@ public final class ProgramSelector implements Parcelable { * The value format is determined by a vendor. * * <p>It must not be used in any other programType than corresponding VENDOR - * type between VENDOR_START and VENDOR_END (eg. identifier type 1015 must + * type between VENDOR_START and VENDOR_END (e.g. identifier type 1015 must * not be used in any program type other than 1015). */ public static final int IDENTIFIER_TYPE_VENDOR_START = PROGRAM_TYPE_VENDOR_START; @@ -435,9 +439,10 @@ public final class ProgramSelector implements Parcelable { /** * Constructor for ProgramSelector. * - * It's not desired to modify selector objects, so all its fields are initialized at creation. + * <p>It's not desired to modify selector objects, so all its fields are initialized at + * creation. * - * Identifier lists must not contain any nulls, but can itself be null to be interpreted + * <p>Identifier lists must not contain any nulls, but can itself be null to be interpreted * as empty list at object creation. * * @param programType type of a radio technology. @@ -492,8 +497,8 @@ public final class ProgramSelector implements Parcelable { /** * Looks up an identifier of a given type (either primary or secondary). * - * If there are multiple identifiers if a given type, then first in order (where primary id is - * before any secondary) is selected. + * <p>If there are multiple identifiers if a given type, then first in order (where primary id + * is before any secondary) is selected. * * @param type type of identifier. * @return identifier value, if found. @@ -510,11 +515,11 @@ public final class ProgramSelector implements Parcelable { /** * Looks up all identifier of a given type (either primary or secondary). * - * Some identifiers may be provided multiple times, for example - * IDENTIFIER_TYPE_AMFM_FREQUENCY for FM Alternate Frequencies. + * <p>Some identifiers may be provided multiple times, for example + * {@link #IDENTIFIER_TYPE_AMFM_FREQUENCY} for FM Alternate Frequencies. * * @param type type of identifier. - * @return a list of identifiers, generated on each call. May be modified. + * @return an array of identifiers, generated on each call. May be modified. */ public @NonNull Identifier[] getAllIds(@IdentifierType int type) { List<Identifier> out = new ArrayList<>(); @@ -543,14 +548,14 @@ public final class ProgramSelector implements Parcelable { /** * Creates an equivalent ProgramSelector with a given secondary identifier preferred. * - * Used to point to a specific physical identifier for technologies that may broadcast the same - * program on different channels. For example, with a DAB program broadcasted over multiple + * <p>Used to point to a specific physical identifier for technologies that may broadcast the + * same program on different channels. For example, with a DAB program broadcasted over multiple * ensembles, the radio hardware may select the one with the strongest signal. The UI may select * preferred ensemble though, so the radio hardware may try to use it in the first place. * - * This is a best-effort hint for the tuner, not a guaranteed behavior. + * <p>This is a best-effort hint for the tuner, not a guaranteed behavior. * - * Setting the given secondary identifier as preferred means filtering out other secondary + * <p>Setting the given secondary identifier as preferred means filtering out other secondary * identifiers of its type and adding it to the list. * * @param preferred preferred secondary identifier @@ -577,7 +582,7 @@ public final class ProgramSelector implements Parcelable { * * @param band the band. * @param frequencyKhz the frequency in kHz. - * @return new ProgramSelector object representing given frequency. + * @return new {@link ProgramSelector} object representing given frequency. * @throws IllegalArgumentException if provided frequency is out of bounds. */ public static @NonNull ProgramSelector createAmFmSelector( @@ -588,13 +593,13 @@ public final class ProgramSelector implements Parcelable { /** * Checks, if a given AM/FM frequency is roughly valid and in correct unit. * - * It does not check the range precisely: it may provide false positives, but not false + * <p>It does not check the range precisely: it may provide false positives, but not false * negatives. In particular, it may be way off for certain regions. - * The main purpose is to avoid passing inproper units, ie. MHz instead of kHz. + * The main purpose is to avoid passing improper units, ie. MHz instead of kHz. * * @param isAm true, if AM, false if FM. * @param frequencyKhz the frequency in kHz. - * @return true, if the frequency is rougly valid. + * @return true, if the frequency is roughly valid. */ private static boolean isValidAmFmFrequency(boolean isAm, int frequencyKhz) { if (isAm) { @@ -607,7 +612,7 @@ public final class ProgramSelector implements Parcelable { /** * Builds new ProgramSelector for AM/FM frequency. * - * This method variant supports HD Radio subchannels, but it's undesirable to + * <p>This method variant supports HD Radio subchannels, but it's undesirable to * select them manually. Instead, the value should be retrieved from program list. * * @param band the band. @@ -741,9 +746,9 @@ public final class ProgramSelector implements Parcelable { }; /** - * A single program identifier component, eg. frequency or channel ID. + * A single program identifier component, e.g. frequency or channel ID. * - * The long value field holds the value in format described in comments for + * <p>The long value field holds the value in format described in comments for * IdentifierType constants. */ public static final class Identifier implements Parcelable { @@ -776,11 +781,11 @@ public final class ProgramSelector implements Parcelable { } /** - * Returns whether this Identifier's type is considered a category when filtering + * Returns whether this identifier's type is considered a category when filtering * ProgramLists for category entries. * * @see ProgramList.Filter#areCategoriesIncluded - * @return False if this identifier's type is not tuneable (e.g. DAB ensemble or + * @return False if this identifier's type is not tunable (e.g. DAB ensemble or * vendor-specified type). True otherwise. */ public boolean isCategoryType() { @@ -791,14 +796,14 @@ public final class ProgramSelector implements Parcelable { /** * Value of an identifier. * - * Its meaning depends on identifier type, ie. for IDENTIFIER_TYPE_AMFM_FREQUENCY type, - * the value is a frequency in kHz. + * <p>Its meaning depends on identifier type, ie. for + * {@link #IDENTIFIER_TYPE_AMFM_FREQUENCY} type, the value is a frequency in kHz. * - * The range of a value depends on its type; it does not always require the whole long + * <p>The range of a value depends on its type; it does not always require the whole long * range. Casting to necessary type (ie. int) without range checking is correct in front-end * code - any range violations are either errors in the framework or in the - * HAL implementation. For example, IDENTIFIER_TYPE_AMFM_FREQUENCY always fits in int, - * as Integer.MAX_VALUE would mean 2.1THz. + * HAL implementation. For example, {@link #IDENTIFIER_TYPE_AMFM_FREQUENCY} always fits in + * int, as {@link Integer#MAX_VALUE} would mean 2.1THz. * * @return value of an identifier. */ diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java index da6c68646820..61854e44287b 100644 --- a/core/java/android/hardware/radio/RadioManager.java +++ b/core/java/android/hardware/radio/RadioManager.java @@ -102,7 +102,7 @@ public class RadioManager { public @interface RadioStatusType{} - // keep in sync with radio_class_t in /system/core/incluse/system/radio.h + // keep in sync with radio_class_t in /system/core/include/system/radio.h /** Radio module class supporting FM (including HD radio) and AM */ public static final int CLASS_AM_FM = 0; /** Radio module class supporting satellite radio */ @@ -154,7 +154,7 @@ public class RadioManager { /** * Forces mono audio stream reception. * - * Analog broadcasts can recover poor reception conditions by jointing + * <p>Analog broadcasts can recover poor reception conditions by jointing * stereo channels into one. Mainly for, but not limited to AM/FM. */ public static final int CONFIG_FORCE_MONO = 1; @@ -176,7 +176,7 @@ public class RadioManager { /** * Forces the digital playback for the supporting radio technology. * - * User may disable digital-analog handover that happens with poor + * <p>User may disable digital-analog handover that happens with poor * reception conditions. With digital forced, the radio will remain silent * instead of switching to analog channel if it's available. This is purely * user choice, it does not reflect the actual state of handover. @@ -185,7 +185,7 @@ public class RadioManager { /** * RDS Alternative Frequencies. * - * If set and the currently tuned RDS station broadcasts on multiple + * <p>If set and the currently tuned RDS station broadcasts on multiple * channels, radio tuner automatically switches to the best available * alternative. */ @@ -193,7 +193,7 @@ public class RadioManager { /** * RDS region-specific program lock-down. * - * Allows user to lock to the current region as they move into the + * <p>Allows user to lock to the current region as they move into the * other region. */ public static final int CONFIG_RDS_REG = 5; @@ -247,11 +247,12 @@ public class RadioManager { @Retention(RetentionPolicy.SOURCE) public @interface ConfigFlag {} - /***************************************************************************** + /** * Lists properties, options and radio bands supported by a given broadcast radio module. - * Each module has a unique ID used to address it when calling RadioManager APIs. - * Module properties are returned by {@link #listModules(List <ModuleProperties>)} method. - ****************************************************************************/ + * + * <p>Each module has a unique ID used to address it when calling RadioManager APIs. + * Module properties are returned by {@link #listModules(List)} method. + */ public static class ModuleProperties implements Parcelable { private final int mId; @@ -315,8 +316,11 @@ public class RadioManager { return set.stream().mapToInt(Integer::intValue).toArray(); } - /** Unique module identifier provided by the native service. - * For use with {@link #openTuner(int, BandConfig, boolean, RadioTuner.Callback, Handler)}. + /** + * Unique module identifier provided by the native service. + * + * <p>or use with + * {@link #openTuner(int, BandConfig, boolean, RadioTuner.Callback, Handler)}. * @return the radio module unique identifier. */ public int getId() { @@ -324,22 +328,24 @@ public class RadioManager { } /** - * Module service (driver) name as registered with HIDL. + * Module service (driver) name as registered with HIDL or AIDL HAL. * @return the module service name. */ public @NonNull String getServiceName() { return mServiceName; } - /** Module class identifier: {@link #CLASS_AM_FM}, {@link #CLASS_SAT}, {@link #CLASS_DT} + /** + * Module class identifier: {@link #CLASS_AM_FM}, {@link #CLASS_SAT}, {@link #CLASS_DT} * @return the radio module class identifier. */ public int getClassId() { return mClassId; } - /** Human readable broadcast radio module implementor - * @return the name of the radio module implementator. + /** + * Human readable broadcast radio module implementor + * @return the name of the radio module implementer. */ public String getImplementor() { return mImplementor; @@ -352,31 +358,38 @@ public class RadioManager { return mProduct; } - /** Human readable broadcast radio module version number + /** + * Human readable broadcast radio module version number * @return the radio module version. */ public String getVersion() { return mVersion; } - /** Radio module serial number. - * Can be used for subscription services. + /** + * Radio module serial number. + * + * <p>This can be used for subscription services. * @return the radio module serial number. */ public String getSerial() { return mSerial; } - /** Number of tuners available. - * This is the number of tuners that can be open simultaneously. + /** + * Number of tuners available. + * + * <p>This is the number of tuners that can be open simultaneously. * @return the number of tuners supported. */ public int getNumTuners() { return mNumTuners; } - /** Number tuner audio sources available. Must be less or equal to getNumTuners(). - * When more than one tuner is supported, one is usually for playback and has one + /** + * Number tuner audio sources available. Must be less or equal to {@link #getNumTuners}. + * + * <p>When more than one tuner is supported, one is usually for playback and has one * associated audio source and the other is for pre scanning and building a * program list. * @return the number of audio sources available. @@ -387,20 +400,24 @@ public class RadioManager { } /** - * Checks, if BandConfig initialization (after {@link RadioManager#openTuner}) + * Checks, if {@link BandConfig} initialization (after {@link RadioManager#openTuner}) * is required to be done before other operations or not. * - * If it is, the client has to wait for {@link RadioTuner.Callback#onConfigurationChanged} - * callback before executing any other operations. Otherwise, such operation will fail - * returning {@link RadioManager#STATUS_INVALID_OPERATION} error code. + * <p>If it is, the client has to wait for + * {@link RadioTuner.Callback#onConfigurationChanged} callback before executing any other + * operations. Otherwise, such operation will fail returning + * {@link RadioManager#STATUS_INVALID_OPERATION} error code. */ public boolean isInitializationRequired() { return mIsInitializationRequired; } - /** {@code true} if audio capture is possible from radio tuner output. - * This indicates if routing to audio devices not connected to the same HAL as the FM radio - * is possible (e.g. to USB) or DAR (Digital Audio Recorder) feature can be implemented. + /** + * {@code true} if audio capture is possible from radio tuner output. + * + * <p>This indicates if routing to audio devices not connected to the same HAL as the FM + * radio is possible (e.g. to USB) or DAR (Digital Audio Recorder) feature can be + * implemented. * @return {@code true} if audio capture is possible, {@code false} otherwise. */ public boolean isCaptureSupported() { @@ -421,8 +438,8 @@ public class RadioManager { /** * Checks, if a given program type is supported by this tuner. * - * If a program type is supported by radio module, it means it can tune - * to ProgramSelector of a given type. + * <p>If a program type is supported by radio module, it means it can tune + * to {@link ProgramSelector} of a given type. * * @return {@code true} if a given program type is supported. */ @@ -433,8 +450,8 @@ public class RadioManager { /** * Checks, if a given program identifier is supported by this tuner. * - * If an identifier is supported by radio module, it means it can use it for - * tuning to ProgramSelector with either primary or secondary Identifier of + * <p>If an identifier is supported by radio module, it means it can use it for + * tuning to {@link ProgramSelector} with either primary or secondary Identifier of * a given type. * * @return {@code true} if a given program type is supported. @@ -446,9 +463,9 @@ public class RadioManager { /** * A frequency table for Digital Audio Broadcasting (DAB). * - * The key is a channel name, i.e. 5A, 7B. + * <p>The key is a channel name, i.e. 5A, 7B. * - * The value is a frequency, in kHz. + * <p>The value is a frequency, in kHz. * * @return a frequency table, or {@code null} if the module doesn't support DAB */ @@ -460,17 +477,18 @@ public class RadioManager { * A map of vendor-specific opaque strings, passed from HAL without changes. * Format of these strings can vary across vendors. * - * It may be used for extra features, that's not supported by a platform, + * <p>It may be used for extra features, that's not supported by a platform, * for example: preset-slots=6; ultra-hd-capable=false. * - * Keys must be prefixed with unique vendor Java-style namespace, - * eg. 'com.somecompany.parameter1'. + * <p>Keys must be prefixed with unique vendor Java-style namespace, + * e.g. 'com.somecompany.parameter1'. */ public @NonNull Map<String, String> getVendorInfo() { return mVendorInfo; } - /** List of descriptors for all bands supported by this module. + /** + * List of descriptors for all bands supported by this module. * @return an array of {@link BandDescriptor}. */ public BandDescriptor[] getBands() { @@ -590,7 +608,9 @@ public class RadioManager { } /** Radio band descriptor: an element in ModuleProperties bands array. - * It is either an instance of {@link FmBandDescriptor} or {@link AmBandDescriptor} */ + * + * <p>It is either an instance of {@link FmBandDescriptor} or {@link AmBandDescriptor} + */ public static class BandDescriptor implements Parcelable { private final int mRegion; @@ -610,16 +630,18 @@ public class RadioManager { mSpacing = spacing; } - /** Region this band applies to. E.g. {@link #REGION_ITU_1} + /** + * Region this band applies to. E.g. {@link #REGION_ITU_1} * @return the region this band is associated to. */ public int getRegion() { return mRegion; } - /** Band type, e.g {@link #BAND_FM}. Defines the subclass this descriptor can be cast to: + /** + * Band type, e.g. {@link #BAND_FM}. Defines the subclass this descriptor can be cast to: * <ul> - * <li>{@link #BAND_FM} or {@link #BAND_FM_HD} cast to {@link FmBandDescriptor}, </li> - * <li>{@link #BAND_AM} cast to {@link AmBandDescriptor}, </li> + * <li>{@link #BAND_FM} or {@link #BAND_FM_HD} cast to {@link FmBandDescriptor}</li> + * <li>{@link #BAND_AM} cast to {@link AmBandDescriptor}</li> * </ul> * @return the band type. */ @@ -645,23 +667,29 @@ public class RadioManager { return mType == BAND_FM || mType == BAND_FM_HD; } - /** Lower band limit expressed in units according to band type. - * Currently all defined band types express channels as frequency in kHz + /** + * Lower band limit expressed in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz. * @return the lower band limit. */ public int getLowerLimit() { return mLowerLimit; } - /** Upper band limit expressed in units according to band type. - * Currently all defined band types express channels as frequency in kHz + /** + * Upper band limit expressed in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz. * @return the upper band limit. */ public int getUpperLimit() { return mUpperLimit; } - /** Channel spacing in units according to band type. - * Currently all defined band types express channels as frequency in kHz - * @return the channel spacing. + /** + * Channel spacing in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz + * @return the channel spacing.</p> */ public int getSpacing() { return mSpacing; @@ -758,9 +786,11 @@ public class RadioManager { } } - /** FM band descriptor + /** + * FM band descriptor * @see #BAND_FM - * @see #BAND_FM_HD */ + * @see #BAND_FM_HD + */ public static class FmBandDescriptor extends BandDescriptor { private final boolean mStereo; private final boolean mRds; @@ -779,19 +809,22 @@ public class RadioManager { mEa = ea; } - /** Stereo is supported + /** + * Stereo is supported * @return {@code true} if stereo is supported, {@code false} otherwise. */ public boolean isStereoSupported() { return mStereo; } - /** RDS or RBDS(if region is ITU2) is supported + /** + * RDS or RBDS(if region is ITU2) is supported * @return {@code true} if RDS or RBDS is supported, {@code false} otherwise. */ public boolean isRdsSupported() { return mRds; } - /** Traffic announcement is supported + /** + * Traffic announcement is supported * @return {@code true} if TA is supported, {@code false} otherwise. */ public boolean isTaSupported() { @@ -804,8 +837,9 @@ public class RadioManager { return mAf; } - /** Emergency Announcement is supported - * @return {@code true} if Emergency annoucement is supported, {@code false} otherwise. + /** + * Emergency Announcement is supported + * @return {@code true} if Emergency announcement is supported, {@code false} otherwise. */ public boolean isEaSupported() { return mEa; @@ -890,8 +924,10 @@ public class RadioManager { } } - /** AM band descriptor. - * @see #BAND_AM */ + /** + * AM band descriptor. + * @see #BAND_AM + */ public static class AmBandDescriptor extends BandDescriptor { private final boolean mStereo; @@ -903,8 +939,9 @@ public class RadioManager { mStereo = stereo; } - /** Stereo is supported - * @return {@code true} if stereo is supported, {@code false} otherwise. + /** + * Stereo is supported + * @return {@code true} if stereo is supported, {@code false} otherwise. */ public boolean isStereoSupported() { return mStereo; @@ -991,39 +1028,47 @@ public class RadioManager { return mDescriptor; } - /** Region this band applies to. E.g. {@link #REGION_ITU_1} - * @return the region associated with this band. + /** + * Region this band applies to. E.g. {@link #REGION_ITU_1} + * @return the region associated with this band. */ public int getRegion() { return mDescriptor.getRegion(); } - /** Band type, e.g {@link #BAND_FM}. Defines the subclass this descriptor can be cast to: + /** + * Band type, e.g. {@link #BAND_FM}. Defines the subclass this descriptor can be cast to: * <ul> - * <li>{@link #BAND_FM} or {@link #BAND_FM_HD} cast to {@link FmBandDescriptor}, </li> - * <li>{@link #BAND_AM} cast to {@link AmBandDescriptor}, </li> + * <li>{@link #BAND_FM} or {@link #BAND_FM_HD} cast to {@link FmBandDescriptor}</li> + * <li>{@link #BAND_AM} cast to {@link AmBandDescriptor}</li> * </ul> * @return the band type. */ public int getType() { return mDescriptor.getType(); } - /** Lower band limit expressed in units according to band type. - * Currently all defined band types express channels as frequency in kHz - * @return the lower band limit. + /** + * Lower band limit expressed in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz. + * @return the lower band limit. */ public int getLowerLimit() { return mDescriptor.getLowerLimit(); } - /** Upper band limit expressed in units according to band type. - * Currently all defined band types express channels as frequency in kHz - * @return the upper band limit. + /** + * Upper band limit expressed in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz. + * @return the upper band limit. */ public int getUpperLimit() { return mDescriptor.getUpperLimit(); } - /** Channel spacing in units according to band type. - * Currently all defined band types express channels as frequency in kHz - * @return the channel spacing. + /** + * Channel spacing in units according to band type. + * + * <p>Currently all defined band types express channels as frequency in kHz. + * @return the channel spacing. */ public int getSpacing() { return mDescriptor.getSpacing(); @@ -1089,9 +1134,11 @@ public class RadioManager { } } - /** FM band configuration. + /** + * FM band configuration. * @see #BAND_FM - * @see #BAND_FM_HD */ + * @see #BAND_FM_HD + */ public static class FmBandConfig extends BandConfig { private final boolean mStereo; private final boolean mRds; @@ -1119,28 +1166,32 @@ public class RadioManager { mEa = ea; } - /** Get stereo enable state + /** + * Get stereo enable state * @return the enable state. */ public boolean getStereo() { return mStereo; } - /** Get RDS or RBDS(if region is ITU2) enable state + /** + * Get RDS or RBDS(if region is ITU2) enable state * @return the enable state. */ public boolean getRds() { return mRds; } - /** Get Traffic announcement enable state + /** + * Get Traffic announcement enable state * @return the enable state. */ public boolean getTa() { return mTa; } - /** Get Alternate Frequency Switching enable state + /** + * Get Alternate Frequency Switching enable state * @return the enable state. */ public boolean getAf() { @@ -1285,7 +1336,8 @@ public class RadioManager { return config; } - /** Set stereo enable state + /** + * Set stereo enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1294,7 +1346,8 @@ public class RadioManager { return this; } - /** Set RDS or RBDS(if region is ITU2) enable state + /** + * Set RDS or RBDS(if region is ITU2) enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1303,7 +1356,8 @@ public class RadioManager { return this; } - /** Set Traffic announcement enable state + /** + * Set Traffic announcement enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1312,7 +1366,8 @@ public class RadioManager { return this; } - /** Set Alternate Frequency Switching enable state + /** + * Set Alternate Frequency Switching enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1321,7 +1376,8 @@ public class RadioManager { return this; } - /** Set Emergency Announcement enable state + /** + * Set Emergency Announcement enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1332,8 +1388,10 @@ public class RadioManager { }; } - /** AM band configuration. - * @see #BAND_AM */ + /** + * AM band configuration. + * @see #BAND_AM + */ public static class AmBandConfig extends BandConfig { private final boolean mStereo; @@ -1349,7 +1407,8 @@ public class RadioManager { mStereo = stereo; } - /** Get stereo enable state + /** + * Get stereo enable state * @return the enable state. */ public boolean getStereo() { @@ -1453,7 +1512,8 @@ public class RadioManager { return config; } - /** Set stereo enable state + /** + * Set stereo enable state * @param state The new enable state. * @return the same Builder instance. */ @@ -1467,7 +1527,8 @@ public class RadioManager { /** Radio program information. */ public static class ProgramInfo implements Parcelable { - // sourced from hardware/interfaces/broadcastradio/2.0/types.hal + // sourced from + // hardware/interfaces/broadcastradio/aidl/android/hardware/broadcastradio/ProgramInfo.aidl private static final int FLAG_LIVE = 1 << 0; private static final int FLAG_MUTED = 1 << 1; private static final int FLAG_TRAFFIC_PROGRAM = 1 << 2; @@ -1521,10 +1582,10 @@ public class RadioManager { /** * Identifier currently used for program selection. * - * This identifier can be used to determine which technology is + * <p>This identifier can be used to determine which technology is * currently being used for reception. * - * Some program selectors contain tuning information for different radio + * <p>Some program selectors contain tuning information for different radio * technologies (i.e. FM RDS and DAB). For example, user may tune using * a ProgramSelector with RDS_PI primary identifier, but the tuner hardware * may choose to use DAB technology to make actual tuning. This identifier @@ -1537,7 +1598,7 @@ public class RadioManager { /** * Identifier currently used by hardware to physically tune to a channel. * - * Some radio technologies broadcast the same program on multiple channels, + * <p>Some radio technologies broadcast the same program on multiple channels, * i.e. with RDS AF the same program may be broadcasted on multiple * alternative frequencies; the same DAB program may be broadcast on * multiple ensembles. This identifier points to the channel to which the @@ -1550,11 +1611,11 @@ public class RadioManager { /** * Primary identifiers of related contents. * - * Some radio technologies provide pointers to other programs that carry + * <p>Some radio technologies provide pointers to other programs that carry * related content (i.e. DAB soft-links). This field is a list of pointers * to other programs on the program list. * - * Please note, that these identifiers does not have to exist on the program + * <p>Please note, that these identifiers does not have to exist on the program * list - i.e. DAB tuner may provide information on FM RDS alternatives * despite not supporting FM RDS. If the system has multiple tuners, another * one may have it on its list. @@ -1563,7 +1624,8 @@ public class RadioManager { return mRelatedContent; } - /** Main channel expressed in units according to band type. + /** + * Main channel expressed in units according to band type. * Currently all defined band types express channels as frequency in kHz * @return the program channel * @deprecated Use {@link ProgramInfo#getSelector} instead. @@ -1578,7 +1640,8 @@ public class RadioManager { } } - /** Sub channel ID. E.g 1 for HD radio HD1 + /** + * Sub channel ID. E.g. 1 for HD radio HD1 * @return the program sub channel * @deprecated Use {@link ProgramInfo#getSelector} instead. */ @@ -1600,14 +1663,16 @@ public class RadioManager { return (mInfoFlags & FLAG_TUNED) != 0; } - /** {@code true} if the received program is stereo + /** + * {@code true} if the received program is stereo * @return {@code true} if stereo, {@code false} otherwise. */ public boolean isStereo() { return (mInfoFlags & FLAG_STEREO) != 0; } - /** {@code true} if the received program is digital (e.g HD radio) + /** + * {@code true} if the received program is digital (e.g. HD radio) * @return {@code true} if digital, {@code false} otherwise. * @deprecated Use {@link ProgramInfo#getLogicallyTunedTo()} instead. */ @@ -1623,8 +1688,9 @@ public class RadioManager { /** * {@code true} if the program is currently playing live stream. - * This may result in a slightly altered reception parameters, - * usually targetted at reduced latency. + * + * <p>This may result in a slightly altered reception parameters, + * usually targeted at reduced latency. */ public boolean isLive() { return (mInfoFlags & FLAG_LIVE) != 0; @@ -1634,7 +1700,8 @@ public class RadioManager { * {@code true} if radio stream is not playing, i.e. due to bad reception * conditions or buffering. In this state volume knob MAY be disabled to * prevent user increasing volume too much. - * It does NOT mean the user has muted audio. + * + * <p>It does NOT mean the user has muted audio. */ public boolean isMuted() { return (mInfoFlags & FLAG_MUTED) != 0; @@ -1688,8 +1755,9 @@ public class RadioManager { } /** Metadata currently received from this station. - * null if no metadata have been received - * @return current meta data received from this program. + * + * @return current meta data received from this program, {@code null} if no metadata have + * been received */ public RadioMetadata getMetadata() { return mMetadata; @@ -1699,11 +1767,11 @@ public class RadioManager { * A map of vendor-specific opaque strings, passed from HAL without changes. * Format of these strings can vary across vendors. * - * It may be used for extra features, that's not supported by a platform, + * <p>It may be used for extra features, that's not supported by a platform, * for example: paid-service=true; bitrate=320kbps. * - * Keys must be prefixed with unique vendor Java-style namespace, - * eg. 'com.somecompany.parameter1'. + * <p>Keys must be prefixed with unique vendor Java-style namespace, + * e.g. 'com.somecompany.parameter1'. */ public @NonNull Map<String, String> getVendorInfo() { return mVendorInfo; @@ -1830,13 +1898,14 @@ public class RadioManager { /** * Open an interface to control a tuner on a given broadcast radio module. - * Optionally selects and applies the configuration passed as "config" argument. + * + * <p>Optionally selects and applies the configuration passed as "config" argument. * @param moduleId radio module identifier {@link ModuleProperties#getId()}. Mandatory. * @param config desired band and configuration to apply when enabling the hardware module. * optional, can be null. * @param withAudio {@code true} to request a tuner with an audio source. * This tuner is intended for live listening or recording or a radio program. - * If {@code false}, the tuner can only be used to retrieve program informations. + * If {@code false}, the tuner can only be used to retrieve program information. * @param callback {@link RadioTuner.Callback} interface. Mandatory. * @param handler the Handler on which the callbacks will be received. * Can be null if default handler is OK. diff --git a/core/java/android/hardware/radio/RadioMetadata.java b/core/java/android/hardware/radio/RadioMetadata.java index 67381ec8e829..31880fd405a8 100644 --- a/core/java/android/hardware/radio/RadioMetadata.java +++ b/core/java/android/hardware/radio/RadioMetadata.java @@ -291,7 +291,7 @@ public final class RadioMetadata implements Parcelable { /** * Provides a Clock that can be used to describe time as provided by the Radio. * - * The clock is defined by the seconds since epoch at the UTC + 0 timezone + * <p>The clock time is defined by the seconds since epoch at the UTC + 0 timezone * and timezone offset from UTC + 0 represented in number of minutes. * * @hide @@ -493,16 +493,16 @@ public final class RadioMetadata implements Parcelable { /** * Retrieves an identifier for a bitmap. * - * The format of an identifier is opaque to the application, + * <p>The format of an identifier is opaque to the application, * with a special case of value 0 being invalid. * An identifier for a given image-tuner pair is unique, so an application * may cache images and determine if there is a necessity to fetch them * again - if identifier changes, it means the image has changed. * - * Only bitmap keys may be used with this method: + * <p>Only bitmap keys may be used with this method: * <ul> - * <li>{@link #METADATA_KEY_ICON}</li> - * <li>{@link #METADATA_KEY_ART}</li> + * <li>{@link #METADATA_KEY_ICON}</li> + * <li>{@link #METADATA_KEY_ART}</li> * </ul> * * @param key The key the value is stored under. @@ -537,7 +537,7 @@ public final class RadioMetadata implements Parcelable { * * <p>Only string array keys may be used with this method: * <ul> - * <li>{@link #METADATA_KEY_UFIDS}</li> + * <li>{@link #METADATA_KEY_UFIDS}</li> * </ul> * * @param key The key the value is stored under @@ -667,17 +667,17 @@ public final class RadioMetadata implements Parcelable { * the METADATA_KEYs defined in this class are used they may only be one * of the following: * <ul> - * <li>{@link #METADATA_KEY_RDS_PS}</li> - * <li>{@link #METADATA_KEY_RDS_RT}</li> - * <li>{@link #METADATA_KEY_TITLE}</li> - * <li>{@link #METADATA_KEY_ARTIST}</li> - * <li>{@link #METADATA_KEY_ALBUM}</li> - * <li>{@link #METADATA_KEY_GENRE}</li> - * <li>{@link #METADATA_KEY_COMMENT_SHORT_DESCRIPTION}</li> - * <li>{@link #METADATA_KEY_COMMENT_ACTUAL_TEXT}</li> - * <li>{@link #METADATA_KEY_COMMERCIAL}</li> - * <li>{@link #METADATA_KEY_HD_STATION_NAME_SHORT}</li> - * <li>{@link #METADATA_KEY_HD_STATION_NAME_LONG}</li> + * <li>{@link #METADATA_KEY_RDS_PS}</li> + * <li>{@link #METADATA_KEY_RDS_RT}</li> + * <li>{@link #METADATA_KEY_TITLE}</li> + * <li>{@link #METADATA_KEY_ARTIST}</li> + * <li>{@link #METADATA_KEY_ALBUM}</li> + * <li>{@link #METADATA_KEY_GENRE}</li> + * <li>{@link #METADATA_KEY_COMMENT_SHORT_DESCRIPTION}</li> + * <li>{@link #METADATA_KEY_COMMENT_ACTUAL_TEXT}</li> + * <li>{@link #METADATA_KEY_COMMERCIAL}</li> + * <li>{@link #METADATA_KEY_HD_STATION_NAME_SHORT}</li> + * <li>{@link #METADATA_KEY_HD_STATION_NAME_LONG}</li> * </ul> * * @param key The key for referencing this value @@ -699,10 +699,10 @@ public final class RadioMetadata implements Parcelable { * the METADATA_KEYs defined in this class are used they may only be one * of the following: * <ul> - * <li>{@link #METADATA_KEY_RDS_PI}</li> - * <li>{@link #METADATA_KEY_RDS_PTY}</li> - * <li>{@link #METADATA_KEY_RBDS_PTY}</li> - * <li>{@link #METADATA_KEY_HD_SUBCHANNELS_AVAILABLE}</li> + * <li>{@link #METADATA_KEY_RDS_PI}</li> + * <li>{@link #METADATA_KEY_RDS_PTY}</li> + * <li>{@link #METADATA_KEY_RBDS_PTY}</li> + * <li>{@link #METADATA_KEY_HD_SUBCHANNELS_AVAILABLE}</li> * </ul> * or any bitmap represented by its identifier. * @@ -720,8 +720,8 @@ public final class RadioMetadata implements Parcelable { * if the METADATA_KEYs defined in this class are used they may only be * one of the following: * <ul> - * <li>{@link #METADATA_KEY_ICON}</li> - * <li>{@link #METADATA_KEY_ART}</li> + * <li>{@link #METADATA_KEY_ICON}</li> + * <li>{@link #METADATA_KEY_ART}</li> * </ul> * <p> * @@ -765,7 +765,7 @@ public final class RadioMetadata implements Parcelable { * the METADATA_KEYs defined in this class are used they may only be one * of the following: * <ul> - * <li>{@link #METADATA_KEY_UFIDS}</li> + * <li>{@link #METADATA_KEY_UFIDS}</li> * </ul> * * @param key The key for referencing this value diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 7020a38ed08a..db06a6ba0ef5 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -48,6 +48,7 @@ import libcore.io.IoUtils; import java.io.FileDescriptor; import java.io.IOException; import java.util.Map; +import java.util.NoSuchElementException; import java.util.concurrent.TimeoutException; /** @@ -588,6 +589,8 @@ public class Process { **/ public static final int THREAD_GROUP_RESTRICTED = 7; + /** @hide */ + public static final int SIGNAL_DEFAULT = 0; public static final int SIGNAL_QUIT = 3; public static final int SIGNAL_KILL = 9; public static final int SIGNAL_USR1 = 10; @@ -1437,6 +1440,49 @@ public class Process { sendSignal(pid, SIGNAL_KILL); } + /** + * Check the tgid and tid pair to see if the tid still exists and belong to the tgid. + * + * TOCTOU warning: the status of the tid can change at the time this method returns. This should + * be used in very rare cases such as checking if a (tid, tgid) pair that is known to exist + * recently no longer exists now. As the possibility of the same tid to be reused under the same + * tgid during a short window is rare. And even if it happens the caller logic should be robust + * to handle it without error. + * + * @throws IllegalArgumentException if tgid or tid is not positive. + * @throws SecurityException if the caller doesn't have the permission, this method is expected + * to be used by system process with {@link #SYSTEM_UID} because it + * internally uses tkill(2). + * @throws NoSuchElementException if the Linux process with pid as the tid has exited or it + * doesn't belong to the tgid. + * @hide + */ + public static final void checkTid(int tgid, int tid) + throws IllegalArgumentException, SecurityException, NoSuchElementException { + sendTgSignalThrows(tgid, tid, SIGNAL_DEFAULT); + } + + /** + * Check if the pid still exists. + * + * TOCTOU warning: the status of the pid can change at the time this method returns. This should + * be used in very rare cases such as checking if a pid that belongs to an isolated process of a + * uid known to exist recently no longer exists now. As the possibility of the same pid to be + * reused again under the same uid during a short window is rare. And even if it happens the + * caller logic should be robust to handle it without error. + * + * @throws IllegalArgumentException if pid is not positive. + * @throws SecurityException if the caller doesn't have the permission, this method is expected + * to be used by system process with {@link #SYSTEM_UID} because it + * internally uses kill(2). + * @throws NoSuchElementException if the Linux process with the pid has exited. + * @hide + */ + public static final void checkPid(int pid) + throws IllegalArgumentException, SecurityException, NoSuchElementException { + sendSignalThrows(pid, SIGNAL_DEFAULT); + } + /** @hide */ public static final native int setUid(int uid); @@ -1451,6 +1497,12 @@ public class Process { */ public static final native void sendSignal(int pid, int signal); + private static native void sendSignalThrows(int pid, int signal) + throws IllegalArgumentException, SecurityException, NoSuchElementException; + + private static native void sendTgSignalThrows(int pid, int tgid, int signal) + throws IllegalArgumentException, SecurityException, NoSuchElementException; + /** * @hide * Private impl for avoiding a log message... DO NOT USE without doing diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index bebb912bd069..edb3a641f107 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -125,15 +125,15 @@ public final class Trace { @UnsupportedAppUsage @CriticalNative @android.ravenwood.annotation.RavenwoodReplace - private static native long nativeGetEnabledTags(); + private static native boolean nativeIsTagEnabled(long tag); @android.ravenwood.annotation.RavenwoodReplace private static native void nativeSetAppTracingAllowed(boolean allowed); @android.ravenwood.annotation.RavenwoodReplace private static native void nativeSetTracingEnabled(boolean allowed); - private static long nativeGetEnabledTags$ravenwood() { + private static boolean nativeIsTagEnabled$ravenwood(long traceTag) { // Tracing currently completely disabled under Ravenwood - return 0; + return false; } private static void nativeSetAppTracingAllowed$ravenwood(boolean allowed) { @@ -181,8 +181,7 @@ public final class Trace { @UnsupportedAppUsage @SystemApi(client = MODULE_LIBRARIES) public static boolean isTagEnabled(long traceTag) { - long tags = nativeGetEnabledTags(); - return (tags & traceTag) != 0; + return nativeIsTagEnabled(traceTag); } /** diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 84619a0eee2e..f172c3e52415 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -3188,6 +3188,8 @@ public class UserManager { * @return whether the context user can add a private profile. * @hide */ + @TestApi + @FlaggedApi(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE) @RequiresPermission(anyOf = { Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}, diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e26dc73f7172..aad2b4ef9242 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11090,21 +11090,12 @@ public final class Settings { "assist_long_press_home_enabled"; /** - * Whether press and hold on nav handle can trigger search. + * Whether all entrypoints can trigger search. Replaces individual settings. * * @hide */ - public static final String SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED = - "search_press_hold_nav_handle_enabled"; - - /** - * Whether long-pressing on the home button can trigger search. - * - * @hide - */ - public static final String SEARCH_LONG_PRESS_HOME_ENABLED = - "search_long_press_home_enabled"; - + public static final String SEARCH_ALL_ENTRYPOINTS_ENABLED = + "search_all_entrypoints_enabled"; /** * Whether or not the accessibility data streaming is enbled for the diff --git a/core/java/android/service/ondeviceintelligence/IOnDeviceIntelligenceService.aidl b/core/java/android/service/ondeviceintelligence/IOnDeviceIntelligenceService.aidl index 6dbff7185f6f..908ab5f69775 100644 --- a/core/java/android/service/ondeviceintelligence/IOnDeviceIntelligenceService.aidl +++ b/core/java/android/service/ondeviceintelligence/IOnDeviceIntelligenceService.aidl @@ -41,7 +41,9 @@ oneway interface IOnDeviceIntelligenceService { void getFeatureDetails(int callerUid, in Feature feature, in IFeatureDetailsCallback featureDetailsCallback); void getReadOnlyFileDescriptor(in String fileName, in AndroidFuture<ParcelFileDescriptor> future); void getReadOnlyFeatureFileDescriptorMap(in Feature feature, in RemoteCallback remoteCallback); - void requestFeatureDownload(int callerUid, in Feature feature, in ICancellationSignal cancellationSignal, in IDownloadCallback downloadCallback); + void requestFeatureDownload(int callerUid, in Feature feature, + in AndroidFuture<ICancellationSignal> cancellationSignal, + in IDownloadCallback downloadCallback); void registerRemoteServices(in IRemoteProcessingService remoteProcessingService); void notifyInferenceServiceConnected(); void notifyInferenceServiceDisconnected(); diff --git a/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl b/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl index 799c7545968e..4213a0996e4c 100644 --- a/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl +++ b/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl @@ -24,6 +24,7 @@ import android.app.ondeviceintelligence.Feature; import android.os.ICancellationSignal; import android.os.PersistableBundle; import android.os.Bundle; +import com.android.internal.infra.AndroidFuture; import android.service.ondeviceintelligence.IRemoteStorageService; import android.service.ondeviceintelligence.IProcessingUpdateStatusCallback; @@ -34,13 +35,16 @@ import android.service.ondeviceintelligence.IProcessingUpdateStatusCallback; */ oneway interface IOnDeviceSandboxedInferenceService { void registerRemoteStorageService(in IRemoteStorageService storageService); - void requestTokenInfo(int callerUid, in Feature feature, in Bundle request, in ICancellationSignal cancellationSignal, + void requestTokenInfo(int callerUid, in Feature feature, in Bundle request, + in AndroidFuture<ICancellationSignal> cancellationSignal, in ITokenInfoCallback tokenInfoCallback); void processRequest(int callerUid, in Feature feature, in Bundle request, in int requestType, - in ICancellationSignal cancellationSignal, in IProcessingSignal processingSignal, + in AndroidFuture<ICancellationSignal> cancellationSignal, + in AndroidFuture<IProcessingSignal> processingSignal, in IResponseCallback callback); void processRequestStreaming(int callerUid, in Feature feature, in Bundle request, in int requestType, - in ICancellationSignal cancellationSignal, in IProcessingSignal processingSignal, + in AndroidFuture<ICancellationSignal> cancellationSignal, + in AndroidFuture<IProcessingSignal> processingSignal, in IStreamingResponseCallback callback); void updateProcessingState(in Bundle processingState, in IProcessingUpdateStatusCallback callback); diff --git a/core/java/android/service/ondeviceintelligence/OnDeviceIntelligenceService.java b/core/java/android/service/ondeviceintelligence/OnDeviceIntelligenceService.java index 93213182d284..86320b801f6c 100644 --- a/core/java/android/service/ondeviceintelligence/OnDeviceIntelligenceService.java +++ b/core/java/android/service/ondeviceintelligence/OnDeviceIntelligenceService.java @@ -148,14 +148,18 @@ public abstract class OnDeviceIntelligenceService extends Service { @Override public void requestFeatureDownload(int callerUid, Feature feature, - ICancellationSignal cancellationSignal, + AndroidFuture cancellationSignalFuture, IDownloadCallback downloadCallback) { Objects.requireNonNull(feature); Objects.requireNonNull(downloadCallback); - + ICancellationSignal transport = null; + if (cancellationSignalFuture != null) { + transport = CancellationSignal.createTransport(); + cancellationSignalFuture.complete(transport); + } OnDeviceIntelligenceService.this.onDownloadFeature(callerUid, feature, - CancellationSignal.fromTransport(cancellationSignal), + CancellationSignal.fromTransport(transport), wrapDownloadCallback(downloadCallback)); } diff --git a/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java b/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java index fc7a4c83f82c..96c45eef3731 100644 --- a/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java +++ b/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java @@ -122,46 +122,72 @@ public abstract class OnDeviceSandboxedInferenceService extends Service { @Override public void requestTokenInfo(int callerUid, Feature feature, Bundle request, - ICancellationSignal cancellationSignal, + AndroidFuture cancellationSignalFuture, ITokenInfoCallback tokenInfoCallback) { Objects.requireNonNull(feature); Objects.requireNonNull(tokenInfoCallback); + ICancellationSignal transport = null; + if (cancellationSignalFuture != null) { + transport = CancellationSignal.createTransport(); + cancellationSignalFuture.complete(transport); + } OnDeviceSandboxedInferenceService.this.onTokenInfoRequest(callerUid, feature, request, - CancellationSignal.fromTransport(cancellationSignal), + CancellationSignal.fromTransport(transport), wrapTokenInfoCallback(tokenInfoCallback)); } @Override public void processRequestStreaming(int callerUid, Feature feature, Bundle request, - int requestType, ICancellationSignal cancellationSignal, - IProcessingSignal processingSignal, + int requestType, + AndroidFuture cancellationSignalFuture, + AndroidFuture processingSignalFuture, IStreamingResponseCallback callback) { Objects.requireNonNull(feature); Objects.requireNonNull(callback); + ICancellationSignal transport = null; + if (cancellationSignalFuture != null) { + transport = CancellationSignal.createTransport(); + cancellationSignalFuture.complete(transport); + } + IProcessingSignal processingSignalTransport = null; + if (processingSignalFuture != null) { + processingSignalTransport = ProcessingSignal.createTransport(); + processingSignalFuture.complete(processingSignalTransport); + } OnDeviceSandboxedInferenceService.this.onProcessRequestStreaming(callerUid, feature, request, requestType, - CancellationSignal.fromTransport(cancellationSignal), - ProcessingSignal.fromTransport(processingSignal), + CancellationSignal.fromTransport(transport), + ProcessingSignal.fromTransport(processingSignalTransport), wrapStreamingResponseCallback(callback)); } @Override public void processRequest(int callerUid, Feature feature, Bundle request, - int requestType, ICancellationSignal cancellationSignal, - IProcessingSignal processingSignal, + int requestType, + AndroidFuture cancellationSignalFuture, + AndroidFuture processingSignalFuture, IResponseCallback callback) { Objects.requireNonNull(feature); Objects.requireNonNull(callback); - + ICancellationSignal transport = null; + if (cancellationSignalFuture != null) { + transport = CancellationSignal.createTransport(); + cancellationSignalFuture.complete(transport); + } + IProcessingSignal processingSignalTransport = null; + if (processingSignalFuture != null) { + processingSignalTransport = ProcessingSignal.createTransport(); + processingSignalFuture.complete(processingSignalTransport); + } OnDeviceSandboxedInferenceService.this.onProcessRequest(callerUid, feature, request, requestType, - CancellationSignal.fromTransport(cancellationSignal), - ProcessingSignal.fromTransport(processingSignal), + CancellationSignal.fromTransport(transport), + ProcessingSignal.fromTransport(processingSignalTransport), wrapResponseCallback(callback)); } @@ -206,7 +232,8 @@ public abstract class OnDeviceSandboxedInferenceService extends Service { * Invoked when caller provides a request for a particular feature to be processed in a * streaming manner. The expectation from the implementation is that when processing the * request, - * it periodically populates the {@link StreamingProcessingCallback#onPartialResult} to continuously + * it periodically populates the {@link StreamingProcessingCallback#onPartialResult} to + * continuously * provide partial Bundle results for the caller to utilize. Optionally the implementation can * provide the complete response in the {@link StreamingProcessingCallback#onResult} upon * processing completion. diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index bbda0684f1d8..cd486d0e7c2e 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -211,7 +211,7 @@ public abstract class WallpaperService extends Service { * @hide */ @ChangeId - @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) public static final long WEAROS_WALLPAPER_HANDLES_SCALING = 272527315L; static final class WallpaperCommand { diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index aff1d4a4ee12..30b1a2ef5849 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -121,8 +121,22 @@ flag { } flag { + name: "handwriting_end_of_line_tap" + namespace: "text" + description: "Initiate handwriting when stylus taps at the end of a line in a focused non-empty TextView with the cursor at the end of that line" + bug: "323376217" +} + +flag { name: "handwriting_cursor_position" namespace: "text" description: "When handwriting is initiated in an unfocused TextView, cursor is placed at the end of the closest paragraph." bug: "323376217" } + +flag { + name: "handwriting_unsupported_message" + namespace: "text" + description: "Feature flag for showing error message when user tries stylus handwriting on a text field which doesn't support it" + bug: "297962571" +} diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java index 29c83509dbf2..192b2ec93ce0 100644 --- a/core/java/android/view/HandwritingInitiator.java +++ b/core/java/android/view/HandwritingInitiator.java @@ -34,7 +34,9 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.Editor; import android.widget.TextView; +import android.widget.Toast; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import java.lang.ref.WeakReference; @@ -223,7 +225,24 @@ public class HandwritingInitiator { View candidateView = findBestCandidateView(mState.mStylusDownX, mState.mStylusDownY, /* isHover */ false); if (candidateView != null && candidateView.isEnabled()) { - if (candidateView == getConnectedOrFocusedView()) { + if (shouldShowHandwritingUnavailableMessageForView(candidateView)) { + int messagesResId = (candidateView instanceof TextView tv + && tv.isAnyPasswordInputType()) + ? R.string.error_handwriting_unsupported_password + : R.string.error_handwriting_unsupported; + Toast.makeText(candidateView.getContext(), messagesResId, + Toast.LENGTH_SHORT).show(); + if (!candidateView.hasFocus()) { + requestFocusWithoutReveal(candidateView); + } + mImm.showSoftInput(candidateView, 0); + mState.mHandled = true; + mState.mShouldInitHandwriting = false; + motionEvent.setAction((motionEvent.getAction() + & MotionEvent.ACTION_POINTER_INDEX_MASK) + | MotionEvent.ACTION_CANCEL); + candidateView.getRootView().dispatchTouchEvent(motionEvent); + } else if (candidateView == getConnectedOrFocusedView()) { if (!mInitiateWithoutConnection && !candidateView.hasFocus()) { requestFocusWithoutReveal(candidateView); } @@ -484,6 +503,15 @@ public class HandwritingInitiator { return view.isStylusHandwritingAvailable(); } + private static boolean shouldShowHandwritingUnavailableMessageForView(@NonNull View view) { + return (view instanceof TextView) && !shouldTriggerStylusHandwritingForView(view); + } + + private static boolean shouldTriggerHandwritingOrShowUnavailableMessageForView( + @NonNull View view) { + return (view instanceof TextView) || shouldTriggerStylusHandwritingForView(view); + } + /** * Returns the pointer icon for the motion event, or null if it doesn't specify the icon. * This gives HandwritingInitiator a chance to show the stylus handwriting icon over a @@ -491,7 +519,7 @@ public class HandwritingInitiator { */ public PointerIcon onResolvePointerIcon(Context context, MotionEvent event) { final View hoverView = findHoverView(event); - if (hoverView == null) { + if (hoverView == null || !shouldTriggerStylusHandwritingForView(hoverView)) { return null; } @@ -594,7 +622,7 @@ public class HandwritingInitiator { /** * Given the location of the stylus event, return the best candidate view to initialize - * handwriting mode. + * handwriting mode or show the handwriting unavailable error message. * * @param x the x coordinates of the stylus event, in the coordinates of the window. * @param y the y coordinates of the stylus event, in the coordinates of the window. @@ -610,7 +638,8 @@ public class HandwritingInitiator { Rect handwritingArea = mTempRect; if (getViewHandwritingArea(connectedOrFocusedView, handwritingArea) && isInHandwritingArea(handwritingArea, x, y, connectedOrFocusedView, isHover) - && shouldTriggerStylusHandwritingForView(connectedOrFocusedView)) { + && shouldTriggerHandwritingOrShowUnavailableMessageForView( + connectedOrFocusedView)) { if (!isHover && mState != null) { mState.mStylusDownWithinEditorBounds = contains(handwritingArea, x, y, 0f, 0f, 0f, 0f); @@ -628,7 +657,7 @@ public class HandwritingInitiator { final View view = viewInfo.getView(); final Rect handwritingArea = viewInfo.getHandwritingArea(); if (!isInHandwritingArea(handwritingArea, x, y, view, isHover) - || !shouldTriggerStylusHandwritingForView(view)) { + || !shouldTriggerHandwritingOrShowUnavailableMessageForView(view)) { continue; } @@ -856,7 +885,7 @@ public class HandwritingInitiator { /** The helper method to check if the given view is still active for handwriting. */ private static boolean isViewActive(@Nullable View view) { return view != null && view.isAttachedToWindow() && view.isAggregatedVisible() - && view.shouldInitiateHandwriting(); + && view.shouldTrackHandwritingArea(); } private CursorAnchorInfo getCursorAnchorInfoForConnectionless(View view) { diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index e126836020b4..3a90841c5327 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -47,6 +47,19 @@ import java.util.List; * {@hide} */ interface IWindowSession { + + /** + * Bundle key to store the latest sync seq id for the relayout configuration. + * @see #relayout + */ + const String KEY_RELAYOUT_BUNDLE_SEQID = "seqid"; + /** + * Bundle key to store the latest ActivityWindowInfo associated with the relayout configuration. + * Will only be set if the relayout window is an activity window. + * @see #relayout + */ + const String KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO = "activity_window_info"; + int addToDisplay(IWindow window, in WindowManager.LayoutParams attrs, in int viewVisibility, in int layerStackId, int requestedVisibleTypes, out InputChannel outInputChannel, out InsetsState insetsState, @@ -92,7 +105,7 @@ interface IWindowSession { * @param outSurfaceControl Object in which is placed the new display surface. * @param insetsState The current insets state in the system. * @param activeControls Objects which allow controlling {@link InsetsSource}s. - * @param bundle A temporary object to obtain the latest SyncSeqId. + * @param bundle A Bundle to contain the latest SyncSeqId and any extra relayout optional infos. * @return int Result flags, defined in {@link WindowManagerGlobal}. */ int relayout(IWindow window, in WindowManager.LayoutParams attrs, diff --git a/core/java/android/view/OWNERS b/core/java/android/view/OWNERS index a2f767d002f4..07d05a4ff1ea 100644 --- a/core/java/android/view/OWNERS +++ b/core/java/android/view/OWNERS @@ -75,12 +75,14 @@ per-file View.java = file:/graphics/java/android/graphics/OWNERS per-file View.java = file:/services/core/java/com/android/server/input/OWNERS per-file View.java = file:/services/core/java/com/android/server/wm/OWNERS per-file View.java = file:/core/java/android/view/inputmethod/OWNERS +per-file View.java = file:/core/java/android/text/OWNERS per-file ViewRootImpl.java = file:/services/accessibility/OWNERS per-file ViewRootImpl.java = file:/core/java/android/service/autofill/OWNERS per-file ViewRootImpl.java = file:/graphics/java/android/graphics/OWNERS per-file ViewRootImpl.java = file:/services/core/java/com/android/server/input/OWNERS per-file ViewRootImpl.java = file:/services/core/java/com/android/server/wm/OWNERS per-file ViewRootImpl.java = file:/core/java/android/view/inputmethod/OWNERS +per-file ViewRootImpl.java = file:/core/java/android/text/OWNERS per-file AccessibilityInteractionController.java = file:/services/accessibility/OWNERS per-file OnReceiveContentListener.java = file:/core/java/android/service/autofill/OWNERS per-file OnReceiveContentListener.java = file:/core/java/android/widget/OWNERS diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 0a75f4e6d731..41bfb24884a2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12695,7 +12695,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (getSystemGestureExclusionRects().isEmpty() && collectPreferKeepClearRects().isEmpty() && collectUnrestrictedPreferKeepClearRects().isEmpty() - && (info.mHandwritingArea == null || !shouldInitiateHandwriting())) { + && (info.mHandwritingArea == null || !shouldTrackHandwritingArea())) { if (info.mPositionUpdateListener != null) { mRenderNode.removePositionUpdateListener(info.mPositionUpdateListener); info.mPositionUpdateListener = null; @@ -13062,7 +13062,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, void updateHandwritingArea() { // If autoHandwritingArea is not enabled, do nothing. - if (!shouldInitiateHandwriting()) return; + if (!shouldTrackHandwritingArea()) return; final AttachInfo ai = mAttachInfo; if (ai != null) { ai.mViewRootImpl.getHandwritingInitiator().updateHandwritingAreasForView(this); @@ -13080,6 +13080,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** + * Returns whether the handwriting initiator should track the handwriting area for this view, + * either to initiate handwriting mode, or to prepare handwriting delegation, or to show the + * handwriting unsupported message. + * @hide + */ + public boolean shouldTrackHandwritingArea() { + return shouldInitiateHandwriting(); + } + + /** * Sets a callback which should be called when a stylus {@link MotionEvent} occurs within this * view's bounds. The callback will be called from the UI thread. * diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index cae66720e49e..304e43eaf1c1 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -8933,7 +8933,8 @@ public final class ViewRootImpl implements ViewParent, mTempInsets, mTempControls, mRelayoutBundle); mRelayoutRequested = true; - final int maybeSyncSeqId = mRelayoutBundle.getInt("seqid"); + final int maybeSyncSeqId = mRelayoutBundle.getInt( + IWindowSession.KEY_RELAYOUT_BUNDLE_SEQID); if (maybeSyncSeqId > 0) { mSyncSeqId = maybeSyncSeqId; } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 86fc6f48a145..56667398265e 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1476,15 +1476,26 @@ public interface WindowManager extends ViewManager { */ @TestApi static boolean hasWindowExtensionsEnabled() { - return HAS_WINDOW_EXTENSIONS_ON_DEVICE - && ActivityTaskManager.supportsMultiWindow(ActivityThread.currentApplication()) - // Since enableWmExtensionsForAllFlag, HAS_WINDOW_EXTENSIONS_ON_DEVICE is now true - // on all devices by default as a build file property. - // Until finishing flag ramp up, only return true when - // ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15 is false, which is set per device by - // OEMs. - && (Flags.enableWmExtensionsForAllFlag() - || !ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15); + if (!Flags.enableWmExtensionsForAllFlag() && ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15) { + // Since enableWmExtensionsForAllFlag, HAS_WINDOW_EXTENSIONS_ON_DEVICE is now true + // on all devices by default as a build file property. + // Until finishing flag ramp up, only return true when + // ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15 is false, which is set per device by + // OEMs. + return false; + } + + if (!HAS_WINDOW_EXTENSIONS_ON_DEVICE) { + return false; + } + + try { + return ActivityTaskManager.supportsMultiWindow(ActivityThread.currentApplication()); + } catch (Exception e) { + // In case the PackageManager is not set up correctly in test. + Log.e("WindowManager", "Unable to read if the device supports multi window", e); + return false; + } } /** diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 0373539c44ea..dc060ba6e60d 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -13118,6 +13118,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return superResult; } + // At this point, the event is not a long press, otherwise it would be handled above. + if (Flags.handwritingEndOfLineTap() && action == MotionEvent.ACTION_UP + && shouldStartHandwritingForEndOfLineTap(event)) { + InputMethodManager imm = getInputMethodManager(); + if (imm != null) { + imm.startStylusHandwriting(this); + return true; + } + } + final boolean touchIsFinished = (action == MotionEvent.ACTION_UP) && (mEditor == null || !mEditor.mIgnoreActionUpEvent) && isFocused(); @@ -13167,6 +13177,46 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** + * If handwriting is supported, the TextView is already focused and not empty, and the cursor is + * at the end of a line, a stylus tap after the end of the line will trigger handwriting. + */ + private boolean shouldStartHandwritingForEndOfLineTap(MotionEvent actionUpEvent) { + if (!onCheckIsTextEditor() + || !isEnabled() + || !isAutoHandwritingEnabled() + || TextUtils.isEmpty(mText) + || didTouchFocusSelect() + || mLayout == null + || !actionUpEvent.isStylusPointer()) { + return false; + } + int cursorOffset = getSelectionStart(); + if (cursorOffset < 0 || getSelectionEnd() != cursorOffset) { + return false; + } + int cursorLine = mLayout.getLineForOffset(cursorOffset); + int cursorLineEnd = mLayout.getLineEnd(cursorLine); + if (cursorLine != mLayout.getLineCount() - 1) { + cursorLineEnd--; + } + if (cursorLineEnd != cursorOffset) { + return false; + } + // Check that the stylus down point is within the same line as the cursor. + if (getLineAtCoordinate(actionUpEvent.getY()) != cursorLine) { + return false; + } + // Check that the stylus down point is after the end of the line. + float localX = convertToLocalHorizontalCoordinate(actionUpEvent.getX()); + if (mLayout.getParagraphDirection(cursorLine) == Layout.DIR_RIGHT_TO_LEFT + ? localX >= mLayout.getLineLeft(cursorLine) + : localX <= mLayout.getLineRight(cursorLine)) { + return false; + } + return isStylusHandwritingAvailable(); + } + + /** * Returns true when need to show UIs, e.g. floating toolbar, etc, for finger based interaction. * * @return true if UIs need to show for finger interaciton. false if UIs are not necessary. @@ -13565,6 +13615,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener /** @hide */ @Override + public boolean shouldTrackHandwritingArea() { + // The handwriting initiator tracks all editable TextViews regardless of whether handwriting + // is supported, so that it can show an error message for unsupported editable TextViews. + return super.shouldTrackHandwritingArea() + || (Flags.handwritingUnsupportedMessage() && onCheckIsTextEditor()); + } + + /** @hide */ + @Override public boolean isStylusHandwritingAvailable() { if (mTextOperationUser == null) { return super.isStylusHandwritingAvailable(); diff --git a/core/java/android/window/InputTransferToken.java b/core/java/android/window/InputTransferToken.java index 5fab48f93316..d2cefa8e0570 100644 --- a/core/java/android/window/InputTransferToken.java +++ b/core/java/android/window/InputTransferToken.java @@ -57,6 +57,7 @@ public final class InputTransferToken implements Parcelable { private static native void nativeWriteToParcel(long nativeObject, Parcel out); private static native long nativeReadFromParcel(Parcel in); private static native IBinder nativeGetBinderToken(long nativeObject); + private static native long nativeGetBinderTokenRef(long nativeObject); private static native long nativeGetNativeInputTransferTokenFinalizer(); private static native boolean nativeEquals(long nativeObject1, long nativeObject2); @@ -130,7 +131,7 @@ public final class InputTransferToken implements Parcelable { */ @Override public int hashCode() { - return Objects.hash(getToken()); + return Objects.hash(nativeGetBinderTokenRef(mNativeObject)); } /** diff --git a/core/java/android/window/TaskFragmentOperation.java b/core/java/android/window/TaskFragmentOperation.java index 7e77f150b63b..43df4f962256 100644 --- a/core/java/android/window/TaskFragmentOperation.java +++ b/core/java/android/window/TaskFragmentOperation.java @@ -112,10 +112,13 @@ public final class TaskFragmentOperation implements Parcelable { /** * Creates a decor surface in the parent Task of the TaskFragment. The created decor surface * will be provided in {@link TaskFragmentTransaction#TYPE_TASK_FRAGMENT_PARENT_INFO_CHANGED} - * event callback. The decor surface can be used to draw the divider between TaskFragments or - * other decorations. + * event callback. If a decor surface already exists in the parent Task, the current + * TaskFragment will become the new owner of the decor surface and the decor surface will be + * moved above the TaskFragment. + * + * The decor surface can be used to draw the divider between TaskFragments or other decorations. */ - public static final int OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE = 14; + public static final int OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE = 14; /** * Removes the decor surface in the parent Task of the TaskFragment. @@ -162,7 +165,7 @@ public final class TaskFragmentOperation implements Parcelable { OP_TYPE_SET_ISOLATED_NAVIGATION, OP_TYPE_REORDER_TO_BOTTOM_OF_TASK, OP_TYPE_REORDER_TO_TOP_OF_TASK, - OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE, + OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE, OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE, OP_TYPE_SET_DIM_ON_TASK, OP_TYPE_SET_MOVE_TO_BOTTOM_IF_CLEAR_WHEN_LAUNCH, diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index 7f5331b936e9..4a3aba13fd54 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -165,7 +165,8 @@ public class WindowTokenClient extends Binder { Log.d(TAG, "Configuration not dispatch to IME because configuration is up" + " to date. Current config=" + context.getResources().getConfiguration() + ", reported config=" + currentConfig - + ", updated config=" + newConfig); + + ", updated config=" + newConfig + + ", updated display ID=" + newDisplayId); } // Update display first. In case callers want to obtain display information( // ex: DisplayMetrics) in #onConfigurationChanged callback. @@ -190,13 +191,18 @@ public class WindowTokenClient extends Binder { if (mShouldDumpConfigForIme) { if (!shouldReportConfigChange) { Log.d(TAG, "Only apply configuration update to Resources because " - + "shouldReportConfigChange is false.\n" + Debug.getCallers(5)); + + "shouldReportConfigChange is false. " + + "context=" + context + + ", config=" + context.getResources().getConfiguration() + + ", display ID=" + context.getDisplayId() + "\n" + + Debug.getCallers(5)); } else if (diff == 0) { Log.d(TAG, "Configuration not dispatch to IME because configuration has no " + " public difference with updated config. " + " Current config=" + context.getResources().getConfiguration() + ", reported config=" + currentConfig - + ", updated config=" + newConfig); + + ", updated config=" + newConfig + + ", display ID=" + context.getDisplayId()); } } } diff --git a/core/java/android/window/flags/accessibility.aconfig b/core/java/android/window/flags/accessibility.aconfig index 814c62017391..90b54bd76a60 100644 --- a/core/java/android/window/flags/accessibility.aconfig +++ b/core/java/android/window/flags/accessibility.aconfig @@ -12,4 +12,7 @@ flag { namespace: "accessibility" description: "Always draw fullscreen orange border in fullscreen magnification" bug: "291891390" + metadata { + purpose: PURPOSE_BUGFIX + } }
\ No newline at end of file diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 14fb17c09031..65bf24179bea 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -38,6 +38,17 @@ flag { } flag { + name: "skip_sleeping_when_switching_display" + namespace: "windowing_frontend" + description: "Reduce unnecessary visibility or lifecycle changes when changing fold state" + bug: "303241079" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "introduce_smoother_dimmer" namespace: "windowing_frontend" description: "Refactor dim to fix flickers" diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 78f06b6bddb3..84715aa80edb 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -217,6 +217,12 @@ public class ResolverActivity extends Activity implements public static final String EXTRA_IS_AUDIO_CAPTURE_DEVICE = "is_audio_capture_device"; /** + * Boolean extra to indicate if Resolver Sheet needs to be started in single user mode. + */ + protected static final String EXTRA_RESTRICT_TO_SINGLE_USER = + "com.android.internal.app.ResolverActivity.EXTRA_RESTRICT_TO_SINGLE_USER"; + + /** * Integer extra to indicate which profile should be automatically selected. * <p>Can only be used if there is a work profile. * <p>Possible values can be either {@link #PROFILE_PERSONAL} or {@link #PROFILE_WORK}. @@ -750,8 +756,10 @@ public class ResolverActivity extends Activity implements } protected UserHandle getPersonalProfileUserHandle() { - if (privateSpaceEnabled() && isLaunchedAsPrivateProfile()){ - return mPrivateProfileUserHandle; + // When launched in single user mode, only personal tab is populated, so we use + // tabOwnerUserHandleForLaunch as personal tab's user handle. + if (privateSpaceEnabled() && isLaunchedInSingleUserMode()) { + return getTabOwnerUserHandleForLaunch(); } return mPersonalProfileUserHandle; } @@ -822,11 +830,11 @@ public class ResolverActivity extends Activity implements // If we are in work or private profile's process, return WorkProfile/PrivateProfile user // as owner, otherwise we always return PersonalProfile user as owner if (UserHandle.of(UserHandle.myUserId()).equals(getWorkProfileUserHandle())) { - return getWorkProfileUserHandle(); + return mWorkProfileUserHandle; } else if (privateSpaceEnabled() && isLaunchedAsPrivateProfile()) { - return getPrivateProfileUserHandle(); + return mPrivateProfileUserHandle; } - return getPersonalProfileUserHandle(); + return mPersonalProfileUserHandle; } private boolean hasWorkProfile() { @@ -847,8 +855,18 @@ public class ResolverActivity extends Activity implements && (UserHandle.myUserId() == getPrivateProfileUserHandle().getIdentifier()); } + protected final boolean isLaunchedInSingleUserMode() { + // When launched from Private Profile, return true + if (isLaunchedAsPrivateProfile()) { + return true; + } + return getIntent() + .getBooleanExtra(EXTRA_RESTRICT_TO_SINGLE_USER, /* defaultValue = */ false); + } + protected boolean shouldShowTabs() { - if (privateSpaceEnabled() && isLaunchedAsPrivateProfile()) { + // No Tabs are shown when launched in single user mode. + if (privateSpaceEnabled() && isLaunchedInSingleUserMode()) { return false; } return hasWorkProfile() && ENABLE_TABBED_VIEW; diff --git a/core/java/com/android/internal/compat/compat_logging_flags.aconfig b/core/java/com/android/internal/compat/compat_logging_flags.aconfig index fab3856daca7..a5c31edde473 100644 --- a/core/java/com/android/internal/compat/compat_logging_flags.aconfig +++ b/core/java/com/android/internal/compat/compat_logging_flags.aconfig @@ -2,7 +2,7 @@ package: "com.android.internal.compat.flags" flag { name: "skip_old_and_disabled_compat_logging" - namespace: "platform_compat" + namespace: "app_compat" description: "Feature flag for skipping debug logging for changes that do not target the latest sdk or are disabled" bug: "323949942" is_fixed_read_only: true diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 0f1f7e9900c1..a65a1bb18303 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -137,7 +137,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private static final int SCRIM_LIGHT = 0xe6ffffff; // 90% white - private static final int SCRIM_ALPHA = 0xcc0000; // 80% alpha + private static final int SCRIM_ALPHA = 0xcc000000; // 80% alpha public static final ColorViewAttributes STATUS_BAR_COLOR_VIEW_ATTRIBUTES = new ColorViewAttributes(FLAG_TRANSLUCENT_STATUS, diff --git a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java index 3e065bf9f450..01b45697f5d4 100644 --- a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java +++ b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java @@ -171,7 +171,9 @@ public class EmphasizedNotificationButton extends Button { return; } - prepareIcon(icon); + if (icon != null) { + prepareIcon(icon); + } mIconToGlue = icon; mGluePending = true; diff --git a/core/java/com/android/internal/widget/ImageFloatingTextView.java b/core/java/com/android/internal/widget/ImageFloatingTextView.java index 5da64350619c..352e6d8e7b59 100644 --- a/core/java/com/android/internal/widget/ImageFloatingTextView.java +++ b/core/java/com/android/internal/widget/ImageFloatingTextView.java @@ -31,6 +31,8 @@ import android.view.RemotableViewMethod; import android.widget.RemoteViews; import android.widget.TextView; +import com.android.internal.R; + /** * A TextView that can float around an image on the end. * @@ -49,6 +51,7 @@ public class ImageFloatingTextView extends TextView { private int mMaxLinesForHeight = -1; private int mLayoutMaxLines = -1; private int mImageEndMargin; + private final int mMaxLineUpperLimit; private int mStaticLayoutCreationCountInOnMeasure = 0; @@ -71,6 +74,8 @@ public class ImageFloatingTextView extends TextView { super(context, attrs, defStyleAttr, defStyleRes); setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL_FAST); setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY); + mMaxLineUpperLimit = + getResources().getInteger(R.integer.config_notificationLongTextMaxLineCount); } @Override @@ -102,6 +107,11 @@ public class ImageFloatingTextView extends TextView { } else { maxLines = getMaxLines() >= 0 ? getMaxLines() : Integer.MAX_VALUE; } + + if (mMaxLineUpperLimit > 0) { + maxLines = Math.min(maxLines, mMaxLineUpperLimit); + } + builder.setMaxLines(maxLines); mLayoutMaxLines = maxLines; if (shouldEllipsize) { diff --git a/core/jni/OWNERS b/core/jni/OWNERS index 3aca751edb0d..2a4f062478bd 100644 --- a/core/jni/OWNERS +++ b/core/jni/OWNERS @@ -27,6 +27,7 @@ per-file android_view_VelocityTracker.* = file:/services/core/java/com/android/s # WindowManager per-file android_graphics_BLASTBufferQueue.cpp = file:/services/core/java/com/android/server/wm/OWNERS per-file android_view_Surface* = file:/services/core/java/com/android/server/wm/OWNERS +per-file android_view_WindowManagerGlobal.cpp = file:/services/core/java/com/android/server/wm/OWNERS per-file android_window_* = file:/services/core/java/com/android/server/wm/OWNERS # Resources diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 52237989f059..d48cdc4645c6 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -161,6 +161,7 @@ static struct { jfieldID mMixType; jfieldID mCallbackFlags; jfieldID mToken; + jfieldID mVirtualDeviceId; } gAudioMixFields; static jclass gAudioFormatClass; @@ -2312,7 +2313,7 @@ static jint convertAudioMixFromNative(JNIEnv *env, jobject *jAudioMix, const Aud jstring deviceAddress = env->NewStringUTF(nAudioMix.mDeviceAddress.c_str()); *jAudioMix = env->NewObject(gAudioMixClass, gAudioMixCstor, jAudioMixingRule, jAudioFormat, nAudioMix.mRouteFlags, nAudioMix.mCbFlags, nAudioMix.mDeviceType, - deviceAddress, jBinderToken); + deviceAddress, jBinderToken, nAudioMix.mVirtualDeviceId); return AUDIO_JAVA_SUCCESS; } @@ -2347,6 +2348,7 @@ static jint convertAudioMixToNative(JNIEnv *env, AudioMix *nAudioMix, const jobj aiBinder(AIBinder_fromJavaBinder(env, jToken), &AIBinder_decStrong); nAudioMix->mToken = AIBinder_toPlatformBinder(aiBinder.get()); + nAudioMix->mVirtualDeviceId = env->GetIntField(jAudioMix, gAudioMixFields.mVirtualDeviceId); jint status = convertAudioMixingRuleToNative(env, jRule, &(nAudioMix->mCriteria)); env->DeleteLocalRef(jRule); @@ -3676,7 +3678,7 @@ int register_android_media_AudioSystem(JNIEnv *env) gAudioMixCstor = GetMethodIDOrDie(env, audioMixClass, "<init>", "(Landroid/media/audiopolicy/AudioMixingRule;Landroid/" - "media/AudioFormat;IIILjava/lang/String;Landroid/os/IBinder;)V"); + "media/AudioFormat;IIILjava/lang/String;Landroid/os/IBinder;I)V"); } gAudioMixFields.mRule = GetFieldIDOrDie(env, audioMixClass, "mRule", "Landroid/media/audiopolicy/AudioMixingRule;"); @@ -3689,6 +3691,7 @@ int register_android_media_AudioSystem(JNIEnv *env) gAudioMixFields.mMixType = GetFieldIDOrDie(env, audioMixClass, "mMixType", "I"); gAudioMixFields.mCallbackFlags = GetFieldIDOrDie(env, audioMixClass, "mCallbackFlags", "I"); gAudioMixFields.mToken = GetFieldIDOrDie(env, audioMixClass, "mToken", "Landroid/os/IBinder;"); + gAudioMixFields.mVirtualDeviceId = GetFieldIDOrDie(env, audioMixClass, "mVirtualDeviceId", "I"); jclass audioFormatClass = FindClassOrDie(env, "android/media/AudioFormat"); gAudioFormatClass = MakeGlobalRefOrDie(env, audioFormatClass); diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index b579daf505e7..4387a4c63673 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -124,8 +124,8 @@ static void android_os_Trace_nativeInstantForTrack(JNIEnv* env, jclass, }); } -static jlong android_os_Trace_nativeGetEnabledTags(JNIEnv* env) { - return tracing_perfetto::getEnabledCategories(); +static jboolean android_os_Trace_nativeIsTagEnabled(jlong tag) { + return tracing_perfetto::isTagEnabled(tag); } static void android_os_Trace_nativeRegisterWithPerfetto(JNIEnv* env) { @@ -157,7 +157,7 @@ static const JNINativeMethod gTraceMethods[] = { {"nativeRegisterWithPerfetto", "()V", (void*)android_os_Trace_nativeRegisterWithPerfetto}, // ----------- @CriticalNative ---------------- - {"nativeGetEnabledTags", "()J", (void*)android_os_Trace_nativeGetEnabledTags}, + {"nativeIsTagEnabled", "(J)Z", (void*)android_os_Trace_nativeIsTagEnabled}, }; int register_android_os_Trace(JNIEnv* env) { diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index d2e58bb62c46..982189e30beb 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -1137,6 +1137,41 @@ void android_os_Process_sendSignalQuiet(JNIEnv* env, jobject clazz, jint pid, ji } } +void android_os_Process_sendSignalThrows(JNIEnv* env, jobject clazz, jint pid, jint sig) { + if (pid <= 0) { + jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", "Invalid argument: pid(%d)", + pid); + return; + } + int ret = kill(pid, sig); + if (ret < 0) { + if (errno == ESRCH) { + jniThrowExceptionFmt(env, "java/util/NoSuchElementException", + "Process with pid %d not found", pid); + } else { + signalExceptionForError(env, errno, pid); + } + } +} + +void android_os_Process_sendTgSignalThrows(JNIEnv* env, jobject clazz, jint tgid, jint tid, + jint sig) { + if (tgid <= 0 || tid <= 0) { + jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", + "Invalid argument: tgid(%d), tid(%d)", tid, tgid); + return; + } + int ret = tgkill(tgid, tid, sig); + if (ret < 0) { + if (errno == ESRCH) { + jniThrowExceptionFmt(env, "java/util/NoSuchElementException", + "Process with tid %d and tgid %d not found", tid, tgid); + } else { + signalExceptionForError(env, errno, tid); + } + } +} + static jlong android_os_Process_getElapsedCpuTime(JNIEnv* env, jobject clazz) { struct timespec ts; @@ -1357,6 +1392,8 @@ static const JNINativeMethod methods[] = { {"setGid", "(I)I", (void*)android_os_Process_setGid}, {"sendSignal", "(II)V", (void*)android_os_Process_sendSignal}, {"sendSignalQuiet", "(II)V", (void*)android_os_Process_sendSignalQuiet}, + {"sendSignalThrows", "(II)V", (void*)android_os_Process_sendSignalThrows}, + {"sendTgSignalThrows", "(III)V", (void*)android_os_Process_sendTgSignalThrows}, {"setProcessFrozen", "(IIZ)V", (void*)android_os_Process_setProcessFrozen}, {"getFreeMemory", "()J", (void*)android_os_Process_getFreeMemory}, {"getTotalMemory", "()J", (void*)android_os_Process_getTotalMemory}, diff --git a/core/jni/android_view_WindowManagerGlobal.cpp b/core/jni/android_view_WindowManagerGlobal.cpp index b03ac88a36ca..abc621d8dc90 100644 --- a/core/jni/android_view_WindowManagerGlobal.cpp +++ b/core/jni/android_view_WindowManagerGlobal.cpp @@ -48,7 +48,7 @@ std::shared_ptr<InputChannel> createInputChannel( surfaceControlObj(env, android_view_SurfaceControl_getJavaSurfaceControl(env, surfaceControl)); - jobject clientTokenObj = javaObjectForIBinder(env, clientToken); + ScopedLocalRef<jobject> clientTokenObj(env, javaObjectForIBinder(env, clientToken)); ScopedLocalRef<jobject> clientInputTransferTokenObj( env, android_window_InputTransferToken_getJavaInputTransferToken(env, @@ -57,7 +57,7 @@ std::shared_ptr<InputChannel> createInputChannel( inputChannelObj(env, env->CallStaticObjectMethod(gWindowManagerGlobal.clazz, gWindowManagerGlobal.createInputChannel, - clientTokenObj, + clientTokenObj.get(), hostInputTransferTokenObj.get(), surfaceControlObj.get(), clientInputTransferTokenObj.get())); @@ -68,9 +68,9 @@ std::shared_ptr<InputChannel> createInputChannel( void removeInputChannel(const sp<IBinder>& clientToken) { JNIEnv* env = AndroidRuntime::getJNIEnv(); - jobject clientTokenObj(javaObjectForIBinder(env, clientToken)); + ScopedLocalRef<jobject> clientTokenObj(env, javaObjectForIBinder(env, clientToken)); env->CallStaticObjectMethod(gWindowManagerGlobal.clazz, gWindowManagerGlobal.removeInputChannel, - clientTokenObj); + clientTokenObj.get()); } int register_android_view_WindowManagerGlobal(JNIEnv* env) { diff --git a/core/jni/android_window_InputTransferToken.cpp b/core/jni/android_window_InputTransferToken.cpp index 8fb668d6bbd9..5bcea9b7c401 100644 --- a/core/jni/android_window_InputTransferToken.cpp +++ b/core/jni/android_window_InputTransferToken.cpp @@ -70,6 +70,11 @@ static jobject nativeGetBinderToken(JNIEnv* env, jclass clazz, jlong nativeObj) return javaObjectForIBinder(env, inputTransferToken->mToken); } +static jlong nativeGetBinderTokenRef(JNIEnv*, jclass, jlong nativeObj) { + sp<InputTransferToken> inputTransferToken = reinterpret_cast<InputTransferToken*>(nativeObj); + return reinterpret_cast<jlong>(inputTransferToken->mToken.get()); +} + InputTransferToken* android_window_InputTransferToken_getNativeInputTransferToken( JNIEnv* env, jobject inputTransferTokenObj) { if (inputTransferTokenObj != nullptr && @@ -114,6 +119,7 @@ static const JNINativeMethod sInputTransferTokenMethods[] = { {"nativeWriteToParcel", "(JLandroid/os/Parcel;)V", (void*)nativeWriteToParcel}, {"nativeReadFromParcel", "(Landroid/os/Parcel;)J", (void*)nativeReadFromParcel}, {"nativeGetBinderToken", "(J)Landroid/os/IBinder;", (void*)nativeGetBinderToken}, + {"nativeGetBinderTokenRef", "(J)J", (void*)nativeGetBinderTokenRef}, {"nativeGetNativeInputTransferTokenFinalizer", "()J", (void*)nativeGetNativeInputTransferTokenFinalizer}, {"nativeEquals", "(JJ)Z", (void*) nativeEquals}, // clang-format on diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 763d9ce1a053..6b0c2d28b776 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -143,9 +143,11 @@ message SecureSettingsProto { optional SettingProto gesture_setup_complete = 9 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto touch_gesture_enabled = 10 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto long_press_home_enabled = 11 [ (android.privacy).dest = DEST_AUTOMATIC ]; - optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC ]; - optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC ]; + // Deprecated - use search_all_entrypoints_enabled instead + optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC, deprecated = true ]; + optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC, deprecated = true ]; optional SettingProto visual_query_accessibility_detection_enabled = 14 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto search_all_entrypoints_enabled = 15 [ (android.privacy).dest = DEST_AUTOMATIC ]; } optional Assist assist = 7; diff --git a/core/res/res/drawable/activity_embedding_divider_handle.xml b/core/res/res/drawable/activity_embedding_divider_handle.xml new file mode 100644 index 000000000000..d9f363cb33a7 --- /dev/null +++ b/core/res/res/drawable/activity_embedding_divider_handle.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2024 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. + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/activity_embedding_divider_handle_pressed" /> + <item android:drawable="@drawable/activity_embedding_divider_handle_default" /> +</selector>
\ No newline at end of file diff --git a/core/res/res/drawable/activity_embedding_divider_handle_default.xml b/core/res/res/drawable/activity_embedding_divider_handle_default.xml new file mode 100644 index 000000000000..565f67169ab5 --- /dev/null +++ b/core/res/res/drawable/activity_embedding_divider_handle_default.xml @@ -0,0 +1,23 @@ +<!-- + Copyright 2024 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. + --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="@dimen/activity_embedding_divider_handle_radius" /> + <size + android:width="@dimen/activity_embedding_divider_handle_width" + android:height="@dimen/activity_embedding_divider_handle_height" /> + <solid android:color="@color/activity_embedding_divider_color" /> +</shape>
\ No newline at end of file diff --git a/core/res/res/drawable/activity_embedding_divider_handle_pressed.xml b/core/res/res/drawable/activity_embedding_divider_handle_pressed.xml new file mode 100644 index 000000000000..e5cca2397806 --- /dev/null +++ b/core/res/res/drawable/activity_embedding_divider_handle_pressed.xml @@ -0,0 +1,23 @@ +<!-- + Copyright 2024 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. + --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="@dimen/activity_embedding_divider_handle_radius_pressed" /> + <size + android:width="@dimen/activity_embedding_divider_handle_width_pressed" + android:height="@dimen/activity_embedding_divider_handle_height_pressed" /> + <solid android:color="@color/activity_embedding_divider_color_pressed" /> +</shape>
\ No newline at end of file diff --git a/core/res/res/layout/transient_notification_with_icon.xml b/core/res/res/layout/transient_notification_with_icon.xml index 0dfb3adc8364..04518b2a75a2 100644 --- a/core/res/res/layout/transient_notification_with_icon.xml +++ b/core/res/res/layout/transient_notification_with_icon.xml @@ -22,7 +22,7 @@ android:orientation="horizontal" android:gravity="center_vertical" android:maxWidth="@dimen/toast_width" - android:background="?android:attr/colorBackground" + android:background="@android:drawable/toast_frame" android:elevation="@dimen/toast_elevation" android:layout_marginEnd="16dp" android:layout_marginStart="16dp" @@ -31,8 +31,11 @@ <ImageView android:id="@android:id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:layout_marginEnd="10dp" /> <TextView android:id="@android:id/message" diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 417c6df1e30d..e6719195565e 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -593,6 +593,10 @@ <color name="accessibility_magnification_thumbnail_container_background_color">#99000000</color> <color name="accessibility_magnification_thumbnail_container_stroke_color">#FFFFFF</color> + <!-- Activity Embedding divider --> + <color name="activity_embedding_divider_color">#8e918f</color> + <color name="activity_embedding_divider_color_pressed">#e3e3e3</color> + <!-- Lily Language Picker language item view colors --> <color name="language_picker_item_text_color">#202124</color> <color name="language_picker_item_text_color_secondary">#5F6368</color> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index e3f1cb619eb5..89ac81ebce56 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1483,6 +1483,11 @@ <!-- Number of notifications to keep in the notification service historical archive --> <integer name="config_notificationServiceArchiveSize">100</integer> + <!-- Upper limit imposed for long text content for BigTextStyle, MessagingStyle and + ConversationStyle notifications for performance reasons, and that line count is also + capped by vertical space available. It is only enabled when the value is positive int.--> + <integer name="config_notificationLongTextMaxLineCount">10</integer> + <!-- Allow the menu hard key to be disabled in LockScreen on some devices --> <bool name="config_disableMenuKeyInLockScreen">false</bool> @@ -6414,10 +6419,8 @@ <!-- Default value for Settings.ASSIST_TOUCH_GESTURE_ENABLED --> <bool name="config_assistTouchGestureEnabledDefault">true</bool> - <!-- Default value for Settings.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED --> - <bool name="config_searchPressHoldNavHandleEnabledDefault">true</bool> - <!-- Default value for Settings.ASSIST_LONG_PRESS_HOME_ENABLED for search overlay --> - <bool name="config_searchLongPressHomeEnabledDefault">true</bool> + <!-- Default value for Settings.SEARCH_ALL_ENTRYPOINTS_ENABLED --> + <bool name="config_searchAllEntrypointsEnabledDefault">true</bool> <!-- The maximum byte size of the information contained in the bundle of HotwordDetectedResult. --> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 291a5936330a..4aa741de80a5 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -1028,6 +1028,16 @@ <dimen name="popup_enter_animation_from_y_delta">20dp</dimen> <dimen name="popup_exit_animation_to_y_delta">-10dp</dimen> + <!-- Dimensions for the activity embedding divider. --> + <dimen name="activity_embedding_divider_handle_width">4dp</dimen> + <dimen name="activity_embedding_divider_handle_height">48dp</dimen> + <dimen name="activity_embedding_divider_handle_radius">2dp</dimen> + <dimen name="activity_embedding_divider_handle_width_pressed">12dp</dimen> + <dimen name="activity_embedding_divider_handle_height_pressed">53dp</dimen> + <dimen name="activity_embedding_divider_handle_radius_pressed">6dp</dimen> + <dimen name="activity_embedding_divider_touch_target_width">24dp</dimen> + <dimen name="activity_embedding_divider_touch_target_height">64dp</dimen> + <!-- Default handwriting bounds offsets for editors. --> <dimen name="handwriting_bounds_offset_left">10dp</dimen> <dimen name="handwriting_bounds_offset_top">40dp</dimen> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f915f038dc0d..a3dba48bbb7d 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -231,8 +231,10 @@ <string name="NetworkPreferenceSwitchSummary">Try changing preferred network. Tap to change.</string> <!-- Displayed to tell the user that emergency calls might not be available. --> <string name="EmergencyCallWarningTitle">Emergency calling unavailable</string> - <!-- Displayed to tell the user that emergency calls might not be available. --> - <string name="EmergencyCallWarningSummary">Can\u2019t make emergency calls over Wi\u2011Fi</string> + <!-- Displayed to tell the user that emergency calls might not be available; this is shown to + the user when only WiFi calling is available and the carrier does not support emergency + calls over WiFi calling. --> + <string name="EmergencyCallWarningSummary">Emergency calls require a mobile network</string> <!-- Telephony notification channel name for a channel containing network alert notifications. --> <string name="notification_channel_network_alert">Alerts</string> @@ -3247,6 +3249,12 @@ <!-- Title for EditText context menu [CHAR LIMIT=20] --> <string name="editTextMenuTitle">Text actions</string> + <!-- Error shown when a user uses a stylus to try handwriting on a text field which doesn't support stylus handwriting. [CHAR LIMIT=TOAST] --> + <string name="error_handwriting_unsupported">Handwriting is not supported in this field</string> + + <!-- Error shown when a user uses a stylus to try handwriting on a password text field which doesn't support stylus handwriting. [CHAR LIMIT=TOAST] --> + <string name="error_handwriting_unsupported_password">Handwriting is not supported in password fields</string> + <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="input_method_nav_back_button_desc">Back</string> <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f4b42f6b3fb2..2e029b23f6af 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2078,6 +2078,7 @@ <java-symbol type="integer" name="config_notificationsBatteryMediumARGB" /> <java-symbol type="integer" name="config_notificationsBatteryNearlyFullLevel" /> <java-symbol type="integer" name="config_notificationServiceArchiveSize" /> + <java-symbol type="integer" name="config_notificationLongTextMaxLineCount" /> <java-symbol type="dimen" name="config_rotaryEncoderAxisScrollTickInterval" /> <java-symbol type="integer" name="config_recentVibrationsDumpSizeLimit" /> <java-symbol type="integer" name="config_previousVibrationsDumpSizeLimit" /> @@ -3121,6 +3122,8 @@ <!-- TextView --> <java-symbol type="bool" name="config_textShareSupported" /> <java-symbol type="string" name="failed_to_copy_to_clipboard" /> + <java-symbol type="string" name="error_handwriting_unsupported" /> + <java-symbol type="string" name="error_handwriting_unsupported_password" /> <java-symbol type="id" name="notification_material_reply_container" /> <java-symbol type="id" name="notification_material_reply_text_1" /> @@ -5016,8 +5019,7 @@ <java-symbol type="bool" name="config_assistLongPressHomeEnabledDefault" /> <java-symbol type="bool" name="config_assistTouchGestureEnabledDefault" /> - <java-symbol type="bool" name="config_searchPressHoldNavHandleEnabledDefault" /> - <java-symbol type="bool" name="config_searchLongPressHomeEnabledDefault" /> + <java-symbol type="bool" name="config_searchAllEntrypointsEnabledDefault" /> <java-symbol type="integer" name="config_hotwordDetectedResultMaxBundleSize" /> @@ -5335,6 +5337,11 @@ <java-symbol type="raw" name="default_ringtone_vibration_effect" /> + <!-- For activity embedding divider --> + <java-symbol type="drawable" name="activity_embedding_divider_handle" /> + <java-symbol type="dimen" name="activity_embedding_divider_touch_target_width" /> + <java-symbol type="dimen" name="activity_embedding_divider_touch_target_height" /> + <!-- Whether we order unlocking and waking --> <java-symbol type="bool" name="config_orderUnlockAndWake" /> diff --git a/core/tests/bugreports/OWNERS b/core/tests/bugreports/OWNERS new file mode 100644 index 000000000000..dbd767c78853 --- /dev/null +++ b/core/tests/bugreports/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 153446 +file:/platform/frameworks/native:/cmds/dumpstate/OWNERS diff --git a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java index a5c962412024..6c00fd80c5e1 100644 --- a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java +++ b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java @@ -55,6 +55,7 @@ import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; +import androidx.test.annotation.UiThreadTest; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; @@ -72,6 +73,7 @@ import org.mockito.ArgumentCaptor; */ @Presubmit @SmallTest +@UiThreadTest @RunWith(AndroidJUnit4.class) public class HandwritingInitiatorTest { private static final long TIMEOUT = ViewConfiguration.getLongPressTimeout(); diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index cb8754ae9962..488f017872b1 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -27,6 +27,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; import static com.android.internal.app.MatcherUtils.first; +import static com.android.internal.app.ResolverActivity.EXTRA_RESTRICT_TO_SINGLE_USER; import static com.android.internal.app.ResolverDataProvider.createPackageManagerMockedInfo; import static com.android.internal.app.ResolverWrapperActivity.sOverrides; @@ -1254,6 +1255,51 @@ public class ResolverActivityTest { } } + @Test + public void testTriggerFromMainProfile_inSingleUserMode_withWorkProfilePresent() { + mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE, + android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE); + markWorkProfileUserAvailable(); + setTabOwnerUserHandleForLaunch(PERSONAL_USER_HANDLE); + Intent sendIntent = createSendImageIntent(); + sendIntent.putExtra(EXTRA_RESTRICT_TO_SINGLE_USER, true); + List<ResolvedComponentInfo> personalResolvedComponentInfos = + createResolvedComponentsForTestWithOtherProfile(3, PERSONAL_USER_HANDLE); + List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, + sOverrides.workProfileUserHandle); + setupResolverControllers(personalResolvedComponentInfos, workResolvedComponentInfos); + final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + waitForIdle(); + assertThat(activity.getPersonalListAdapter().getCount(), is(2)); + onView(withId(R.id.tabs)).check(matches(not(isDisplayed()))); + assertEquals(activity.getMultiProfilePagerAdapterCount(), 1); + for (ResolvedComponentInfo resolvedInfo : personalResolvedComponentInfos) { + assertEquals(resolvedInfo.getResolveInfoAt(0).userHandle, PERSONAL_USER_HANDLE); + } + } + + @Test + public void testTriggerFromWorkProfile_inSingleUserMode() { + mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE, + android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE); + markWorkProfileUserAvailable(); + setTabOwnerUserHandleForLaunch(sOverrides.workProfileUserHandle); + Intent sendIntent = createSendImageIntent(); + sendIntent.putExtra(EXTRA_RESTRICT_TO_SINGLE_USER, true); + List<ResolvedComponentInfo> personalResolvedComponentInfos = + createResolvedComponentsForTest(3, sOverrides.workProfileUserHandle); + setupResolverControllers(personalResolvedComponentInfos); + final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + waitForIdle(); + assertThat(activity.getPersonalListAdapter().getCount(), is(3)); + onView(withId(R.id.tabs)).check(matches(not(isDisplayed()))); + assertEquals(activity.getMultiProfilePagerAdapterCount(), 1); + for (ResolvedComponentInfo resolvedInfo : personalResolvedComponentInfos) { + assertEquals(resolvedInfo.getResolveInfoAt(0).userHandle, + sOverrides.workProfileUserHandle); + } + } + private Intent createSendImageIntent() { Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); @@ -1339,6 +1385,10 @@ public class ResolverActivityTest { ResolverWrapperActivity.sOverrides.privateProfileUserHandle = UserHandle.of(12); } + private void setTabOwnerUserHandleForLaunch(UserHandle tabOwnerUserHandleForLaunch) { + sOverrides.tabOwnerUserHandleForLaunch = tabOwnerUserHandleForLaunch; + } + private void setupResolverControllers( List<ResolvedComponentInfo> personalResolvedComponentInfos, List<ResolvedComponentInfo> workResolvedComponentInfos) { diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java index 862cbd5b5e01..4604b01d1bd2 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java @@ -116,6 +116,10 @@ public class ResolverWrapperActivity extends ResolverActivity { when(sOverrides.resolverListController.getUserHandle()).thenReturn(UserHandle.SYSTEM); return sOverrides.resolverListController; } + if (isLaunchedInSingleUserMode()) { + when(sOverrides.resolverListController.getUserHandle()).thenReturn(userHandle); + return sOverrides.resolverListController; + } when(sOverrides.workResolverListController.getUserHandle()).thenReturn(userHandle); return sOverrides.workResolverListController; } diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 9c1c700641f1..ea3235bfff6c 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -588,6 +588,8 @@ applications that come with the platform <permission name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW" /> <!-- Permission required for CTS test - PackageManagerShellCommandInstallTest --> <permission name="android.permission.EMERGENCY_INSTALL_PACKAGES" /> + <!-- Permission required for Cts test - CtsSettingsTestCases --> + <permission name="android.permission.PREPARE_FACTORY_RESET" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/data/keyboards/Vendor_054c_Product_05c4.idc b/data/keyboards/Vendor_054c_Product_05c4.idc index 2cb3f7b90fed..2da622745baf 100644 --- a/data/keyboards/Vendor_054c_Product_05c4.idc +++ b/data/keyboards/Vendor_054c_Product_05c4.idc @@ -13,9 +13,11 @@ # limitations under the License. # -# Sony DS4 motion sensor configuration file. +# Sony Playstation(R) DualShock 4 Controller # +## Motion sensor ## + # reporting mode 0 - continuous sensor.accelerometer.reportingMode = 0 # The delay between sensor events corresponding to the lowest frequency in microsecond @@ -33,3 +35,28 @@ sensor.gyroscope.maxDelay = 100000 sensor.gyroscope.minDelay = 5000 # The power in mA used by this sensor while in use sensor.gyroscope.power = 0.8 + +## Touchpad ## + +# After the DualShock 4 has been connected over Bluetooth for a minute or so, +# its reports start bunching up in time, meaning that we receive 2–4 reports +# within a millisecond followed by a >10ms wait until the next batch. +# +# This uneven timing causes the apparent speed of a finger (calculated using +# time deltas between received reports) to vary dramatically even if it's +# actually moving smoothly across the touchpad, triggering the touchpad stack's +# drumroll detection logic. For moving fingers, the drumroll detection logic +# splits the finger's single movement into many small movements of consecutive +# touches, which are then inhibited by the click wiggle filter. For tapping +# fingers, it prevents tapping to click because it thinks the finger's moving +# too fast. +# +# Since this touchpad doesn't seem to have to drumroll issues, we can safely +# disable drumroll detection. +gestureProp.Drumroll_Suppression_Enable = 0 + +# Because of the way this touchpad is positioned, touches around the edges are +# no more likely to be palms than ones in the middle, so remove the edge zones +# from the palm classifier to increase the usable area of the pad. +gestureProp.Palm_Edge_Zone_Width = 0 +gestureProp.Tap_Exclusion_Border_Width = 0 diff --git a/data/keyboards/Vendor_054c_Product_09cc.idc b/data/keyboards/Vendor_054c_Product_09cc.idc index 2cb3f7b90fed..2a1a4fc62b24 100644 --- a/data/keyboards/Vendor_054c_Product_09cc.idc +++ b/data/keyboards/Vendor_054c_Product_09cc.idc @@ -13,9 +13,11 @@ # limitations under the License. # -# Sony DS4 motion sensor configuration file. +# Sony Playstation(R) DualShock 4 Controller # +## Motion sensor ## + # reporting mode 0 - continuous sensor.accelerometer.reportingMode = 0 # The delay between sensor events corresponding to the lowest frequency in microsecond @@ -33,3 +35,28 @@ sensor.gyroscope.maxDelay = 100000 sensor.gyroscope.minDelay = 5000 # The power in mA used by this sensor while in use sensor.gyroscope.power = 0.8 + +## Touchpad ## + +# After the DualShock 4 has been connected over Bluetooth for a minute or so, +# its reports start bunching up in time, meaning that we receive 2–4 reports +# within a millisecond followed by a >10ms wait until the next batch. +# +# This uneven timing causes the apparent speed of a finger (calculated using +# time deltas between received reports) to vary dramatically even if it's +# actually moving smoothly across the touchpad, triggering the touchpad stack's +# drumroll detection logic. For moving fingers, the drumroll detection logic +# splits the finger's single movement into many small movements of consecutive +# touches, which are then inhibited by the click wiggle filter. For tapping +# fingers, it prevents tapping to click because it thinks the finger's moving +# too fast. +# +# Since this touchpad doesn't seem to have drumroll issues, we can safely +# disable drumroll detection. +gestureProp.Drumroll_Suppression_Enable = 0 + +# Because of the way this touchpad is positioned, touches around the edges are +# no more likely to be palms than ones in the middle, so remove the edge zones +# from the palm classifier to increase the usable area of the pad. +gestureProp.Palm_Edge_Zone_Width = 0 +gestureProp.Tap_Exclusion_Border_Width = 0 diff --git a/keystore/java/android/security/AndroidKeyStoreMaintenance.java b/keystore/java/android/security/AndroidKeyStoreMaintenance.java index 2430e8d8e662..efbbfc23736f 100644 --- a/keystore/java/android/security/AndroidKeyStoreMaintenance.java +++ b/keystore/java/android/security/AndroidKeyStoreMaintenance.java @@ -175,20 +175,6 @@ public class AndroidKeyStoreMaintenance { } /** - * Informs Keystore 2.0 that an off body event was detected. - */ - public static void onDeviceOffBody() { - StrictMode.noteDiskWrite(); - try { - getService().onDeviceOffBody(); - } catch (Exception e) { - // TODO This fails open. This is not a regression with respect to keystore1 but it - // should get fixed. - Log.e(TAG, "Error while reporting device off body event.", e); - } - } - - /** * Migrates a key given by the source descriptor to the location designated by the destination * descriptor. * diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index bd9abec22325..f105072a32bf 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -56,11 +56,4 @@ public class KeyStore { return Authorization.addAuthToken(authToken); } - - /** - * Notify keystore that the device went off-body. - */ - public void onDeviceOffBody() { - AndroidKeyStoreMaintenance.onDeviceOffBody(); - } } diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index 7aecfd8d4a0d..d359a9050a0f 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java @@ -880,9 +880,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu } /** - * Returns {@code true} if the screen must be unlocked for this key to be used for decryption or - * signing. Encryption and signature verification will still be available when the screen is - * locked. + * Returns {@code true} if the key is authorized to be used only while the device is unlocked. * * @see Builder#setUnlockedDeviceRequired(boolean) */ @@ -1672,16 +1670,16 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu * {@link #setUserAuthenticationValidityDurationSeconds} and * {@link #setUserAuthenticationRequired}). Once the device has been removed from the * user's body, the key will be considered unauthorized and the user will need to - * re-authenticate to use it. For keys without an authentication validity period this - * parameter has no effect. - * - * <p>Similarly, on devices that do not have an on-body sensor, this parameter will have no - * effect; the device will always be considered to be "on-body" and the key will therefore - * remain authorized until the validity period ends. - * - * @param remainsValid if {@code true}, and if the device supports on-body detection, key - * will be invalidated when the device is removed from the user's body or when the - * authentication validity expires, whichever occurs first. + * re-authenticate to use it. If the device does not have an on-body sensor or the key does + * not have an authentication validity period, this parameter has no effect. + * <p> + * Since Android 12 (API level 31), this parameter has no effect even on devices that have + * an on-body sensor. A future version of Android may restore enforcement of this parameter. + * Meanwhile, it is recommended to not use it. + * + * @param remainsValid if {@code true}, and if the device supports enforcement of this + * parameter, the key will be invalidated when the device is removed from the user's body or + * when the authentication validity expires, whichever occurs first. */ @NonNull public Builder setUserAuthenticationValidWhileOnBody(boolean remainsValid) { @@ -1723,11 +1721,49 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu } /** - * Sets whether the keystore requires the screen to be unlocked before allowing decryption - * using this key. If this is set to {@code true}, any attempt to decrypt or sign using this - * key while the screen is locked will fail. A locked device requires a PIN, password, - * biometric, or other trusted factor to access. While the screen is locked, any associated - * public key can still be used (e.g for signature verification). + * Sets whether this key is authorized to be used only while the device is unlocked. + * <p> + * The device is considered to be locked for a user when the user's apps are currently + * inaccessible and some form of lock screen authentication is required to regain access to + * them. For the full definition, see {@link KeyguardManager#isDeviceLocked()}. + * <p> + * Public key operations aren't restricted by {@code setUnlockedDeviceRequired(true)} and + * may be performed even while the device is locked. In Android 11 (API level 30) and lower, + * encryption and verification operations with symmetric keys weren't restricted either. + * <p> + * Keys that use {@code setUnlockedDeviceRequired(true)} can be imported and generated even + * while the device is locked, as long as the device has been unlocked at least once since + * the last reboot. However, such keys cannot be used (except for the unrestricted + * operations mentioned above) until the device is unlocked. Apps that need to encrypt data + * while the device is locked such that it can only be decrypted while the device is + * unlocked can generate a key and encrypt the data in software, import the key into + * Keystore using {@code setUnlockedDeviceRequired(true)}, and zeroize the original key. + * <p> + * {@code setUnlockedDeviceRequired(true)} is related to but distinct from + * {@link #setUserAuthenticationRequired(boolean) setUserAuthenticationRequired(true)}. + * {@code setUnlockedDeviceRequired(true)} requires that the device be unlocked, whereas + * {@code setUserAuthenticationRequired(true)} requires that a specific type of strong + * authentication has happened within a specific time period. They may be used together or + * separately; there are cases in which one requirement can be satisfied but not the other. + * <p> + * <b>Warning:</b> Be careful using {@code setUnlockedDeviceRequired(true)} on Android 14 + * (API level 34) and lower, since the following bugs existed in Android 12 through 14: + * <ul> + * <li>When the user didn't have a secure lock screen, unlocked-device-required keys + * couldn't be generated, imported, or used.</li> + * <li>When the user's secure lock screen was removed, all of that user's + * unlocked-device-required keys were automatically deleted.</li> + * <li>Unlocking the device with a non-strong biometric, such as face on many devices, + * didn't re-authorize the use of unlocked-device-required keys.</li> + * <li>Unlocking the device with a biometric didn't re-authorize the use of + * unlocked-device-required keys in profiles that share their parent user's lock.</li> + * </ul> + * These issues are fixed in Android 15, so apps can avoid them by using + * {@code setUnlockedDeviceRequired(true)} only on Android 15 and higher. + * Apps that use both {@code setUnlockedDeviceRequired(true)} and + * {@link #setUserAuthenticationRequired(boolean) setUserAuthenticationRequired(true)} + * are unaffected by the first two issues, since the first two issues describe expected + * behavior for {@code setUserAuthenticationRequired(true)}. */ @NonNull public Builder setUnlockedDeviceRequired(boolean unlockedDeviceRequired) { diff --git a/keystore/java/android/security/keystore/KeyInfo.java b/keystore/java/android/security/keystore/KeyInfo.java index 5cffe46936a2..2163ca2f8217 100644 --- a/keystore/java/android/security/keystore/KeyInfo.java +++ b/keystore/java/android/security/keystore/KeyInfo.java @@ -279,7 +279,7 @@ public class KeyInfo implements KeySpec { } /** - * Returns {@code true} if the key is authorized to be used only when the device is unlocked. + * Returns {@code true} if the key is authorized to be used only while the device is unlocked. * * <p>This authorization applies only to secret key and private key operations. Public key * operations are not restricted. diff --git a/keystore/java/android/security/keystore/KeyProtection.java b/keystore/java/android/security/keystore/KeyProtection.java index 31b4a5eac619..8e5ac45d394d 100644 --- a/keystore/java/android/security/keystore/KeyProtection.java +++ b/keystore/java/android/security/keystore/KeyProtection.java @@ -577,9 +577,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { } /** - * Returns {@code true} if the screen must be unlocked for this key to be used for decryption or - * signing. Encryption and signature verification will still be available when the screen is - * locked. + * Returns {@code true} if the key is authorized to be used only while the device is unlocked. * * @see Builder#setUnlockedDeviceRequired(boolean) */ @@ -1039,16 +1037,16 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { * {@link #setUserAuthenticationValidityDurationSeconds} and * {@link #setUserAuthenticationRequired}). Once the device has been removed from the * user's body, the key will be considered unauthorized and the user will need to - * re-authenticate to use it. For keys without an authentication validity period this - * parameter has no effect. + * re-authenticate to use it. If the device does not have an on-body sensor or the key does + * not have an authentication validity period, this parameter has no effect. + * <p> + * Since Android 12 (API level 31), this parameter has no effect even on devices that have + * an on-body sensor. A future version of Android may restore enforcement of this parameter. + * Meanwhile, it is recommended to not use it. * - * <p>Similarly, on devices that do not have an on-body sensor, this parameter will have no - * effect; the device will always be considered to be "on-body" and the key will therefore - * remain authorized until the validity period ends. - * - * @param remainsValid if {@code true}, and if the device supports on-body detection, key - * will be invalidated when the device is removed from the user's body or when the - * authentication validity expires, whichever occurs first. + * @param remainsValid if {@code true}, and if the device supports enforcement of this + * parameter, the key will be invalidated when the device is removed from the user's body or + * when the authentication validity expires, whichever occurs first. */ @NonNull public Builder setUserAuthenticationValidWhileOnBody(boolean remainsValid) { @@ -1117,11 +1115,49 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { } /** - * Sets whether the keystore requires the screen to be unlocked before allowing decryption - * using this key. If this is set to {@code true}, any attempt to decrypt or sign using this - * key while the screen is locked will fail. A locked device requires a PIN, password, - * biometric, or other trusted factor to access. While the screen is locked, the key can - * still be used for encryption or signature verification. + * Sets whether this key is authorized to be used only while the device is unlocked. + * <p> + * The device is considered to be locked for a user when the user's apps are currently + * inaccessible and some form of lock screen authentication is required to regain access to + * them. For the full definition, see {@link KeyguardManager#isDeviceLocked()}. + * <p> + * Public key operations aren't restricted by {@code setUnlockedDeviceRequired(true)} and + * may be performed even while the device is locked. In Android 11 (API level 30) and lower, + * encryption and verification operations with symmetric keys weren't restricted either. + * <p> + * Keys that use {@code setUnlockedDeviceRequired(true)} can be imported and generated even + * while the device is locked, as long as the device has been unlocked at least once since + * the last reboot. However, such keys cannot be used (except for the unrestricted + * operations mentioned above) until the device is unlocked. Apps that need to encrypt data + * while the device is locked such that it can only be decrypted while the device is + * unlocked can generate a key and encrypt the data in software, import the key into + * Keystore using {@code setUnlockedDeviceRequired(true)}, and zeroize the original key. + * <p> + * {@code setUnlockedDeviceRequired(true)} is related to but distinct from + * {@link #setUserAuthenticationRequired(boolean) setUserAuthenticationRequired(true)}. + * {@code setUnlockedDeviceRequired(true)} requires that the device be unlocked, whereas + * {@code setUserAuthenticationRequired(true)} requires that a specific type of strong + * authentication has happened within a specific time period. They may be used together or + * separately; there are cases in which one requirement can be satisfied but not the other. + * <p> + * <b>Warning:</b> Be careful using {@code setUnlockedDeviceRequired(true)} on Android 14 + * (API level 34) and lower, since the following bugs existed in Android 12 through 14: + * <ul> + * <li>When the user didn't have a secure lock screen, unlocked-device-required keys + * couldn't be generated, imported, or used.</li> + * <li>When the user's secure lock screen was removed, all of that user's + * unlocked-device-required keys were automatically deleted.</li> + * <li>Unlocking the device with a non-strong biometric, such as face on many devices, + * didn't re-authorize the use of unlocked-device-required keys.</li> + * <li>Unlocking the device with a biometric didn't re-authorize the use of + * unlocked-device-required keys in profiles that share their parent user's lock.</li> + * </ul> + * These issues are fixed in Android 15, so apps can avoid them by using + * {@code setUnlockedDeviceRequired(true)} only on Android 15 and higher. + * Apps that use both {@code setUnlockedDeviceRequired(true)} and + * {@link #setUserAuthenticationRequired(boolean) setUserAuthenticationRequired(true)} + * are unaffected by the first two issues, since the first two issues describe expected + * behavior for {@code setUserAuthenticationRequired(true)}. */ @NonNull public Builder setUnlockedDeviceRequired(boolean unlockedDeviceRequired) { diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java index 97562783882c..16c77d0c3c81 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java @@ -53,7 +53,7 @@ class WindowExtensionsImpl implements WindowExtensions { * The min version of the WM Extensions that must be supported in the current platform version. */ @VisibleForTesting - static final int EXTENSIONS_VERSION_CURRENT_PLATFORM = 5; + static final int EXTENSIONS_VERSION_CURRENT_PLATFORM = 6; private final Object mLock = new Object(); private volatile DeviceStateManagerFoldingFeatureProducer mFoldingFeatureProducer; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java index 100185b84b77..cae232e54f3c 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java @@ -17,6 +17,12 @@ package androidx.window.extensions.embedding; import static android.util.TypedValue.COMPLEX_UNIT_DIP; +import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; +import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; +import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; +import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE; +import static android.window.TaskFragmentOperation.OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE; import static androidx.window.extensions.embedding.DividerAttributes.RATIO_UNSET; import static androidx.window.extensions.embedding.DividerAttributes.WIDTH_UNSET; @@ -28,34 +34,253 @@ import static androidx.window.extensions.embedding.SplitPresenter.CONTAINER_POSI import android.annotation.Nullable; import android.app.ActivityThread; import android.content.Context; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; +import android.graphics.Color; +import android.graphics.PixelFormat; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.RotateDrawable; +import android.hardware.display.DisplayManager; +import android.os.IBinder; import android.util.TypedValue; +import android.view.Gravity; +import android.view.SurfaceControl; +import android.view.SurfaceControlViewHost; +import android.view.WindowManager; +import android.view.WindowlessWindowManager; +import android.widget.FrameLayout; +import android.widget.ImageButton; +import android.window.InputTransferToken; +import android.window.TaskFragmentOperation; +import android.window.TaskFragmentParentInfo; +import android.window.WindowContainerTransaction; +import androidx.annotation.IdRes; import androidx.annotation.NonNull; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.window.flags.Flags; +import java.util.Objects; + /** * Manages the rendering and interaction of the divider. */ class DividerPresenter { + private static final String WINDOW_NAME = "AE Divider"; + // TODO(b/327067596) Update based on UX guidance. - @VisibleForTesting static final float DEFAULT_MIN_RATIO = 0.35f; - @VisibleForTesting static final float DEFAULT_MAX_RATIO = 0.65f; - @VisibleForTesting static final int DEFAULT_DIVIDER_WIDTH_DP = 24; + private static final Color DEFAULT_DIVIDER_COLOR = Color.valueOf(Color.BLACK); + @VisibleForTesting + static final float DEFAULT_MIN_RATIO = 0.35f; + @VisibleForTesting + static final float DEFAULT_MAX_RATIO = 0.65f; + @VisibleForTesting + static final int DEFAULT_DIVIDER_WIDTH_DP = 24; + + /** + * The {@link Properties} of the divider. This field is {@code null} when no divider should be + * drawn, e.g. when the split doesn't have {@link DividerAttributes} or when the decor surface + * is not available. + */ + @Nullable + @VisibleForTesting + Properties mProperties; + + /** + * The {@link Renderer} of the divider. This field is {@code null} when no divider should be + * drawn, i.e. when {@link #mProperties} is {@code null}. The {@link Renderer} is recreated or + * updated when {@link #mProperties} is changed. + */ + @Nullable + @VisibleForTesting + Renderer mRenderer; + + /** + * The owner TaskFragment token of the decor surface. The decor surface is placed right above + * the owner TaskFragment surface and is removed if the owner TaskFragment is destroyed. + */ + @Nullable + @VisibleForTesting + IBinder mDecorSurfaceOwner; + + /** Updates the divider when external conditions are changed. */ + void updateDivider( + @NonNull WindowContainerTransaction wct, + @NonNull TaskFragmentParentInfo parentInfo, + @Nullable SplitContainer topSplitContainer) { + if (!Flags.activityEmbeddingInteractiveDividerFlag()) { + return; + } + + // Clean up the decor surface if top SplitContainer is null. + if (topSplitContainer == null) { + removeDecorSurfaceAndDivider(wct); + return; + } + + // Clean up the decor surface if DividerAttributes is null. + final DividerAttributes dividerAttributes = + topSplitContainer.getCurrentSplitAttributes().getDividerAttributes(); + if (dividerAttributes == null) { + removeDecorSurfaceAndDivider(wct); + return; + } + + if (topSplitContainer.getCurrentSplitAttributes().getSplitType() + instanceof SplitAttributes.SplitType.ExpandContainersSplitType) { + // No divider is needed for ExpandContainersSplitType. + removeDivider(); + return; + } + + // Skip updating when the TFs have not been updated to match the SplitAttributes. + if (topSplitContainer.getPrimaryContainer().getLastRequestedBounds().isEmpty() + || topSplitContainer.getSecondaryContainer().getLastRequestedBounds().isEmpty()) { + return; + } + + final SurfaceControl decorSurface = parentInfo.getDecorSurface(); + if (decorSurface == null) { + // Clean up when the decor surface is currently unavailable. + removeDivider(); + // Request to create the decor surface + createOrMoveDecorSurface(wct, topSplitContainer.getPrimaryContainer()); + return; + } + + // make the top primary container the owner of the decor surface. + if (!Objects.equals(mDecorSurfaceOwner, + topSplitContainer.getPrimaryContainer().getTaskFragmentToken())) { + createOrMoveDecorSurface(wct, topSplitContainer.getPrimaryContainer()); + } + + updateProperties( + new Properties( + parentInfo.getConfiguration(), + dividerAttributes, + decorSurface, + getInitialDividerPosition(topSplitContainer), + isVerticalSplit(topSplitContainer), + parentInfo.getDisplayId())); + } + + private void updateProperties(@NonNull Properties properties) { + if (Properties.equalsForDivider(mProperties, properties)) { + return; + } + final Properties previousProperties = mProperties; + mProperties = properties; + + if (mRenderer == null) { + // Create a new renderer when a renderer doesn't exist yet. + mRenderer = new Renderer(); + } else if (!Properties.areSameSurfaces( + previousProperties.mDecorSurface, mProperties.mDecorSurface) + || previousProperties.mDisplayId != mProperties.mDisplayId) { + // Release and recreate the renderer if the decor surface or the display has changed. + mRenderer.release(); + mRenderer = new Renderer(); + } else { + // Otherwise, update the renderer for the new properties. + mRenderer.update(); + } + } + + /** + * Creates a decor surface for the TaskFragment if no decor surface exists, or changes the owner + * of the existing decor surface to be the specified TaskFragment. + * + * See {@link TaskFragmentOperation#OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE}. + */ + private void createOrMoveDecorSurface( + @NonNull WindowContainerTransaction wct, @NonNull TaskFragmentContainer container) { + final TaskFragmentOperation operation = new TaskFragmentOperation.Builder( + OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE) + .build(); + wct.addTaskFragmentOperation(container.getTaskFragmentToken(), operation); + mDecorSurfaceOwner = container.getTaskFragmentToken(); + } + + private void removeDecorSurfaceAndDivider(@NonNull WindowContainerTransaction wct) { + if (mDecorSurfaceOwner != null) { + final TaskFragmentOperation operation = new TaskFragmentOperation.Builder( + OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE) + .build(); + wct.addTaskFragmentOperation(mDecorSurfaceOwner, operation); + mDecorSurfaceOwner = null; + } + removeDivider(); + } + + private void removeDivider() { + if (mRenderer != null) { + mRenderer.release(); + } + mProperties = null; + mRenderer = null; + } + + @VisibleForTesting + static int getInitialDividerPosition(@NonNull SplitContainer splitContainer) { + final Rect primaryBounds = + splitContainer.getPrimaryContainer().getLastRequestedBounds(); + final Rect secondaryBounds = + splitContainer.getSecondaryContainer().getLastRequestedBounds(); + if (isVerticalSplit(splitContainer)) { + return Math.min(primaryBounds.right, secondaryBounds.right); + } else { + return Math.min(primaryBounds.bottom, secondaryBounds.bottom); + } + } + + private static boolean isVerticalSplit(@NonNull SplitContainer splitContainer) { + final int layoutDirection = splitContainer.getCurrentSplitAttributes().getLayoutDirection(); + switch(layoutDirection) { + case SplitAttributes.LayoutDirection.LEFT_TO_RIGHT: + case SplitAttributes.LayoutDirection.RIGHT_TO_LEFT: + case SplitAttributes.LayoutDirection.LOCALE: + return true; + case SplitAttributes.LayoutDirection.TOP_TO_BOTTOM: + case SplitAttributes.LayoutDirection.BOTTOM_TO_TOP: + return false; + default: + throw new IllegalArgumentException("Invalid layout direction:" + layoutDirection); + } + } - static int getDividerWidthPx(@NonNull DividerAttributes dividerAttributes) { + private static void safeReleaseSurfaceControl(@Nullable SurfaceControl sc) { + if (sc != null) { + sc.release(); + } + } + + private static int getDividerWidthPx(@NonNull DividerAttributes dividerAttributes) { int dividerWidthDp = dividerAttributes.getWidthDp(); + return convertDpToPixel(dividerWidthDp); + } + private static int convertDpToPixel(int dp) { // TODO(b/329193115) support divider on secondary display final Context applicationContext = ActivityThread.currentActivityThread().getApplication(); return (int) TypedValue.applyDimension( COMPLEX_UNIT_DIP, - dividerWidthDp, + dp, applicationContext.getResources().getDisplayMetrics()); } + private static int getDimensionDp(@IdRes int resId) { + final Context context = ActivityThread.currentActivityThread().getApplication(); + final int px = context.getResources().getDimensionPixelSize(resId); + return (int) TypedValue.convertPixelsToDimension( + COMPLEX_UNIT_DIP, + px, + context.getResources().getDisplayMetrics()); + } + /** * Returns the container bound offset that is a result of the presence of a divider. * @@ -140,6 +365,12 @@ class DividerPresenter { widthDp = DEFAULT_DIVIDER_WIDTH_DP; } + if (dividerAttributes.getDividerType() == DividerAttributes.DIVIDER_TYPE_DRAGGABLE) { + // Draggable divider width must be larger than the drag handle size. + widthDp = Math.max(widthDp, + getDimensionDp(R.dimen.activity_embedding_divider_touch_target_width)); + } + float minRatio = dividerAttributes.getPrimaryMinRatio(); if (minRatio == RATIO_UNSET) { minRatio = DEFAULT_MIN_RATIO; @@ -156,4 +387,231 @@ class DividerPresenter { .setPrimaryMaxRatio(maxRatio) .build(); } + + /** + * Properties for the {@link DividerPresenter}. The rendering of the divider solely depends on + * these properties. When any value is updated, the divider is re-rendered. The Properties + * instance is created only when all the pre-conditions of drawing a divider are met. + */ + @VisibleForTesting + static class Properties { + private static final int CONFIGURATION_MASK_FOR_DIVIDER = + ActivityInfo.CONFIG_DENSITY | ActivityInfo.CONFIG_WINDOW_CONFIGURATION; + @NonNull + private final Configuration mConfiguration; + @NonNull + private final DividerAttributes mDividerAttributes; + @NonNull + private final SurfaceControl mDecorSurface; + + /** The initial position of the divider calculated based on container bounds. */ + private final int mInitialDividerPosition; + + /** Whether the split is vertical, such as left-to-right or right-to-left split. */ + private final boolean mIsVerticalSplit; + + private final int mDisplayId; + + @VisibleForTesting + Properties( + @NonNull Configuration configuration, + @NonNull DividerAttributes dividerAttributes, + @NonNull SurfaceControl decorSurface, + int initialDividerPosition, + boolean isVerticalSplit, + int displayId) { + mConfiguration = configuration; + mDividerAttributes = dividerAttributes; + mDecorSurface = decorSurface; + mInitialDividerPosition = initialDividerPosition; + mIsVerticalSplit = isVerticalSplit; + mDisplayId = displayId; + } + + /** + * Compares whether two Properties objects are equal for rendering the divider. The + * Configuration is checked for rendering related fields, and other fields are checked for + * regular equality. + */ + private static boolean equalsForDivider(@Nullable Properties a, @Nullable Properties b) { + if (a == b) { + return true; + } + if (a == null || b == null) { + return false; + } + return areSameSurfaces(a.mDecorSurface, b.mDecorSurface) + && Objects.equals(a.mDividerAttributes, b.mDividerAttributes) + && areConfigurationsEqualForDivider(a.mConfiguration, b.mConfiguration) + && a.mInitialDividerPosition == b.mInitialDividerPosition + && a.mIsVerticalSplit == b.mIsVerticalSplit + && a.mDisplayId == b.mDisplayId; + } + + private static boolean areSameSurfaces( + @Nullable SurfaceControl sc1, @Nullable SurfaceControl sc2) { + if (sc1 == sc2) { + // If both are null or both refer to the same object. + return true; + } + if (sc1 == null || sc2 == null) { + return false; + } + return sc1.isSameSurface(sc2); + } + + private static boolean areConfigurationsEqualForDivider( + @NonNull Configuration a, @NonNull Configuration b) { + final int diff = a.diff(b); + return (diff & CONFIGURATION_MASK_FOR_DIVIDER) == 0; + } + } + + /** + * Handles the rendering of the divider. When the decor surface is updated, the renderer is + * recreated. When other fields in the Properties are changed, the renderer is updated. + */ + @VisibleForTesting + class Renderer { + @NonNull + private final SurfaceControl mDividerSurface; + @NonNull + private final WindowlessWindowManager mWindowlessWindowManager; + @NonNull + private final SurfaceControlViewHost mViewHost; + @NonNull + private final FrameLayout mDividerLayout; + private final int mDividerWidthPx; + + private Renderer() { + mDividerWidthPx = getDividerWidthPx(mProperties.mDividerAttributes); + + mDividerSurface = createChildSurface("DividerSurface", true /* visible */); + mWindowlessWindowManager = new WindowlessWindowManager( + mProperties.mConfiguration, + mDividerSurface, + new InputTransferToken()); + + final Context context = ActivityThread.currentActivityThread().getApplication(); + final DisplayManager displayManager = context.getSystemService(DisplayManager.class); + mViewHost = new SurfaceControlViewHost( + context, displayManager.getDisplay(mProperties.mDisplayId), + mWindowlessWindowManager, "DividerContainer"); + mDividerLayout = new FrameLayout(context); + + update(); + } + + /** Updates the divider when properties are changed */ + @VisibleForTesting + void update() { + mWindowlessWindowManager.setConfiguration(mProperties.mConfiguration); + updateSurface(); + updateLayout(); + updateDivider(); + } + + @VisibleForTesting + void release() { + mViewHost.release(); + // TODO handle synchronization between surface transactions and WCT. + new SurfaceControl.Transaction().remove(mDividerSurface).apply(); + safeReleaseSurfaceControl(mDividerSurface); + } + + private void updateSurface() { + final Rect taskBounds = mProperties.mConfiguration.windowConfiguration.getBounds(); + // TODO handle synchronization between surface transactions and WCT. + final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + if (mProperties.mIsVerticalSplit) { + t.setPosition(mDividerSurface, mProperties.mInitialDividerPosition, 0.0f); + t.setWindowCrop(mDividerSurface, mDividerWidthPx, taskBounds.height()); + } else { + t.setPosition(mDividerSurface, 0.0f, mProperties.mInitialDividerPosition); + t.setWindowCrop(mDividerSurface, taskBounds.width(), mDividerWidthPx); + } + t.apply(); + } + + private void updateLayout() { + final Rect taskBounds = mProperties.mConfiguration.windowConfiguration.getBounds(); + final WindowManager.LayoutParams lp = mProperties.mIsVerticalSplit + ? new WindowManager.LayoutParams( + mDividerWidthPx, + taskBounds.height(), + TYPE_APPLICATION_PANEL, + FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL | FLAG_SLIPPERY, + PixelFormat.TRANSLUCENT) + : new WindowManager.LayoutParams( + taskBounds.width(), + mDividerWidthPx, + TYPE_APPLICATION_PANEL, + FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL | FLAG_SLIPPERY, + PixelFormat.TRANSLUCENT); + lp.setTitle(WINDOW_NAME); + mViewHost.setView(mDividerLayout, lp); + } + + private void updateDivider() { + mDividerLayout.removeAllViews(); + mDividerLayout.setBackgroundColor(DEFAULT_DIVIDER_COLOR.toArgb()); + if (mProperties.mDividerAttributes.getDividerType() + == DividerAttributes.DIVIDER_TYPE_DRAGGABLE) { + drawDragHandle(); + } + mViewHost.getView().invalidate(); + } + + private void drawDragHandle() { + final Context context = mDividerLayout.getContext(); + final ImageButton button = new ImageButton(context); + final FrameLayout.LayoutParams params = mProperties.mIsVerticalSplit + ? new FrameLayout.LayoutParams( + context.getResources().getDimensionPixelSize( + R.dimen.activity_embedding_divider_touch_target_width), + context.getResources().getDimensionPixelSize( + R.dimen.activity_embedding_divider_touch_target_height)) + : new FrameLayout.LayoutParams( + context.getResources().getDimensionPixelSize( + R.dimen.activity_embedding_divider_touch_target_height), + context.getResources().getDimensionPixelSize( + R.dimen.activity_embedding_divider_touch_target_width)); + params.gravity = Gravity.CENTER; + button.setLayoutParams(params); + button.setBackgroundColor(R.color.transparent); + + final Drawable handle = context.getResources().getDrawable( + R.drawable.activity_embedding_divider_handle, context.getTheme()); + if (mProperties.mIsVerticalSplit) { + button.setImageDrawable(handle); + } else { + // Rotate the handle drawable + RotateDrawable rotatedHandle = new RotateDrawable(); + rotatedHandle.setFromDegrees(90f); + rotatedHandle.setToDegrees(90f); + rotatedHandle.setPivotXRelative(true); + rotatedHandle.setPivotYRelative(true); + rotatedHandle.setPivotX(0.5f); + rotatedHandle.setPivotY(0.5f); + rotatedHandle.setLevel(1); + rotatedHandle.setDrawable(handle); + + button.setImageDrawable(rotatedHandle); + } + mDividerLayout.addView(button); + } + + @NonNull + private SurfaceControl createChildSurface(@NonNull String name, boolean visible) { + final Rect bounds = mProperties.mConfiguration.windowConfiguration.getBounds(); + return new SurfaceControl.Builder() + .setParent(mProperties.mDecorSurface) + .setName(name) + .setHidden(!visible) + .setCallsite("DividerManager.createChildSurface") + .setBufferSize(bounds.width(), bounds.height()) + .setColorLayer() + .build(); + } + } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java index 80afb16d5832..3f4dddf0cc81 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java @@ -168,11 +168,14 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { * @param fragmentToken token of an existing TaskFragment. */ void expandTaskFragment(@NonNull WindowContainerTransaction wct, - @NonNull IBinder fragmentToken) { + @NonNull TaskFragmentContainer container) { + final IBinder fragmentToken = container.getTaskFragmentToken(); resizeTaskFragment(wct, fragmentToken, new Rect()); clearAdjacentTaskFragments(wct, fragmentToken); updateWindowingMode(wct, fragmentToken, WINDOWING_MODE_UNDEFINED); updateAnimationParams(wct, fragmentToken, TaskFragmentAnimationParams.DEFAULT); + + container.getTaskContainer().updateDivider(wct); } /** diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index 0cc4b1f367d8..1bc8264d8e7e 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -844,6 +844,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen // Checks if container should be updated before apply new parentInfo. final boolean shouldUpdateContainer = taskContainer.shouldUpdateContainer(parentInfo); taskContainer.updateTaskFragmentParentInfo(parentInfo); + taskContainer.updateDivider(wct); // If the last direct activity of the host task is dismissed and the overlay container is // the only taskFragment, the overlay container should also be dismissed. @@ -1224,7 +1225,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen final TaskFragmentContainer container = getContainerWithActivity(activity); if (shouldContainerBeExpanded(container)) { // Make sure that the existing container is expanded. - mPresenter.expandTaskFragment(wct, container.getTaskFragmentToken()); + mPresenter.expandTaskFragment(wct, container); } else { // Put activity into a new expanded container. final TaskFragmentContainer newContainer = newContainer(activity, getTaskId(activity)); @@ -1928,7 +1929,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } if (shouldContainerBeExpanded(container)) { if (container.getInfo() != null) { - mPresenter.expandTaskFragment(wct, container.getTaskFragmentToken()); + mPresenter.expandTaskFragment(wct, container); } // If the info is not available yet the task fragment will be expanded when it's ready return; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java index f680694c3af9..20bc82002339 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java @@ -368,6 +368,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { updateTaskFragmentWindowingModeIfRegistered(wct, secondaryContainer, windowingMode); updateAnimationParams(wct, primaryContainer.getTaskFragmentToken(), splitAttributes); updateAnimationParams(wct, secondaryContainer.getTaskFragmentToken(), splitAttributes); + taskContainer.updateDivider(wct); } private void setAdjacentTaskFragments(@NonNull WindowContainerTransaction wct, @@ -686,8 +687,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { splitContainer.getPrimaryContainer().getTaskFragmentToken(); final IBinder secondaryToken = splitContainer.getSecondaryContainer().getTaskFragmentToken(); - expandTaskFragment(wct, primaryToken); - expandTaskFragment(wct, secondaryToken); + expandTaskFragment(wct, splitContainer.getPrimaryContainer()); + expandTaskFragment(wct, splitContainer.getSecondaryContainer()); // Set the companion TaskFragment when the two containers stacked. setCompanionTaskFragment(wct, primaryToken, secondaryToken, splitContainer.getSplitRule(), true /* isStacked */); diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java index 73109e266905..e75a317cc3b3 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java @@ -77,6 +77,9 @@ class TaskContainer { private boolean mHasDirectActivity; + @Nullable + private TaskFragmentParentInfo mTaskFragmentParentInfo; + /** * TaskFragments that the organizer has requested to be closed. They should be removed when * the organizer receives @@ -85,14 +88,17 @@ class TaskContainer { */ final Set<IBinder> mFinishedContainer = new ArraySet<>(); + // TODO(b/293654166): move DividerPresenter to SplitController. + @NonNull + final DividerPresenter mDividerPresenter; + /** * The {@link TaskContainer} constructor * - * @param taskId The ID of the Task, which must match {@link Activity#getTaskId()} with - * {@code activityInTask}. + * @param taskId The ID of the Task, which must match {@link Activity#getTaskId()} with + * {@code activityInTask}. * @param activityInTask The {@link Activity} in the Task with {@code taskId}. It is used to * initialize the {@link TaskContainer} properties. - * */ TaskContainer(int taskId, @NonNull Activity activityInTask) { if (taskId == INVALID_TASK_ID) { @@ -107,6 +113,7 @@ class TaskContainer { // the host task is visible and has an activity in the task. mIsVisible = true; mHasDirectActivity = true; + mDividerPresenter = new DividerPresenter(); } int getTaskId() { @@ -136,10 +143,12 @@ class TaskContainer { } void updateTaskFragmentParentInfo(@NonNull TaskFragmentParentInfo info) { + // TODO(b/293654166): cache the TaskFragmentParentInfo and remove these fields. mConfiguration.setTo(info.getConfiguration()); mDisplayId = info.getDisplayId(); mIsVisible = info.isVisible(); mHasDirectActivity = info.hasDirectActivity(); + mTaskFragmentParentInfo = info; } /** @@ -161,8 +170,8 @@ class TaskContainer { * Returns the windowing mode for the TaskFragments below this Task, which should be split with * other TaskFragments. * - * @param taskFragmentBounds Requested bounds for the TaskFragment. It will be empty when - * the pair of TaskFragments are stacked due to the limited space. + * @param taskFragmentBounds Requested bounds for the TaskFragment. It will be empty when + * the pair of TaskFragments are stacked due to the limited space. */ @WindowingMode int getWindowingModeForTaskFragment(@Nullable Rect taskFragmentBounds) { @@ -228,7 +237,7 @@ class TaskContainer { @Nullable TaskFragmentContainer getTopNonFinishingTaskFragmentContainer(boolean includePin, - boolean includeOverlay) { + boolean includeOverlay) { for (int i = mContainers.size() - 1; i >= 0; i--) { final TaskFragmentContainer container = mContainers.get(i); if (!includePin && isTaskFragmentContainerPinned(container)) { @@ -283,7 +292,7 @@ class TaskContainer { return mContainers.indexOf(child); } - /** Whether the Task is in an intermediate state waiting for the server update.*/ + /** Whether the Task is in an intermediate state waiting for the server update. */ boolean isInIntermediateState() { for (TaskFragmentContainer container : mContainers) { if (container.isInIntermediateState()) { @@ -389,6 +398,26 @@ class TaskContainer { return mContainers; } + void updateDivider(@NonNull WindowContainerTransaction wct) { + if (mTaskFragmentParentInfo != null) { + // Update divider only if TaskFragmentParentInfo is available. + mDividerPresenter.updateDivider( + wct, mTaskFragmentParentInfo, getTopNonFinishingSplitContainer()); + } + } + + @Nullable + private SplitContainer getTopNonFinishingSplitContainer() { + for (int i = mSplitContainers.size() - 1; i >= 0; i--) { + final SplitContainer splitContainer = mSplitContainers.get(i); + if (!splitContainer.getPrimaryContainer().isFinished() + && !splitContainer.getSecondaryContainer().isFinished()) { + return splitContainer; + } + } + return null; + } + private void onTaskFragmentContainerUpdated() { // TODO(b/300211704): Find a better mechanism to handle the z-order in case we introduce // another special container that should also be on top in the future. diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java index a6bf99d4add5..e20a3e02c65d 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java @@ -748,6 +748,10 @@ class TaskFragmentContainer { } } + @NonNull Rect getLastRequestedBounds() { + return mLastRequestedBounds; + } + /** * Checks if last requested windowing mode is equal to the provided value. * @see WindowContainerTransaction#setWindowingMode diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/DividerPresenterTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/DividerPresenterTest.java index 2a277f4c9619..4d1d807038eb 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/DividerPresenterTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/DividerPresenterTest.java @@ -16,22 +16,49 @@ package androidx.window.extensions.embedding; +import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE; +import static android.window.TaskFragmentOperation.OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE; + import static androidx.window.extensions.embedding.DividerPresenter.getBoundsOffsetForDivider; +import static androidx.window.extensions.embedding.DividerPresenter.getInitialDividerPosition; import static androidx.window.extensions.embedding.SplitPresenter.CONTAINER_POSITION_BOTTOM; import static androidx.window.extensions.embedding.SplitPresenter.CONTAINER_POSITION_LEFT; import static androidx.window.extensions.embedding.SplitPresenter.CONTAINER_POSITION_RIGHT; import static androidx.window.extensions.embedding.SplitPresenter.CONTAINER_POSITION_TOP; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.content.res.Configuration; +import android.graphics.Rect; +import android.os.Binder; +import android.os.IBinder; import android.platform.test.annotations.Presubmit; +import android.platform.test.flag.junit.SetFlagsRule; +import android.view.Display; +import android.view.SurfaceControl; +import android.window.TaskFragmentOperation; +import android.window.TaskFragmentParentInfo; +import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import com.android.window.flags.Flags; + +import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; /** * Test class for {@link DividerPresenter}. @@ -43,6 +70,167 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) public class DividerPresenterTest { + @Rule + public final SetFlagsRule mSetFlagRule = new SetFlagsRule(); + + @Mock + private DividerPresenter.Renderer mRenderer; + + @Mock + private WindowContainerTransaction mTransaction; + + @Mock + private TaskFragmentParentInfo mParentInfo; + + @Mock + private SplitContainer mSplitContainer; + + @Mock + private SurfaceControl mSurfaceControl; + + private DividerPresenter mDividerPresenter; + + private final IBinder mPrimaryContainerToken = new Binder(); + + private final IBinder mSecondaryContainerToken = new Binder(); + + private final IBinder mAnotherContainerToken = new Binder(); + + private DividerPresenter.Properties mProperties; + + private static final DividerAttributes DEFAULT_DIVIDER_ATTRIBUTES = + new DividerAttributes.Builder(DividerAttributes.DIVIDER_TYPE_DRAGGABLE).build(); + + private static final DividerAttributes ANOTHER_DIVIDER_ATTRIBUTES = + new DividerAttributes.Builder(DividerAttributes.DIVIDER_TYPE_DRAGGABLE) + .setWidthDp(10).build(); + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mSetFlagRule.enableFlags(Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG); + + when(mParentInfo.getDisplayId()).thenReturn(Display.DEFAULT_DISPLAY); + when(mParentInfo.getConfiguration()).thenReturn(new Configuration()); + when(mParentInfo.getDecorSurface()).thenReturn(mSurfaceControl); + + when(mSplitContainer.getCurrentSplitAttributes()).thenReturn( + new SplitAttributes.Builder() + .setDividerAttributes(DEFAULT_DIVIDER_ATTRIBUTES) + .build()); + final TaskFragmentContainer mockPrimaryContainer = + createMockTaskFragmentContainer( + mPrimaryContainerToken, new Rect(0, 0, 950, 1000)); + final TaskFragmentContainer mockSecondaryContainer = + createMockTaskFragmentContainer( + mSecondaryContainerToken, new Rect(1000, 0, 2000, 1000)); + when(mSplitContainer.getPrimaryContainer()).thenReturn(mockPrimaryContainer); + when(mSplitContainer.getSecondaryContainer()).thenReturn(mockSecondaryContainer); + + mProperties = new DividerPresenter.Properties( + new Configuration(), + DEFAULT_DIVIDER_ATTRIBUTES, + mSurfaceControl, + getInitialDividerPosition(mSplitContainer), + true /* isVerticalSplit */, + Display.DEFAULT_DISPLAY); + + mDividerPresenter = new DividerPresenter(); + mDividerPresenter.mProperties = mProperties; + mDividerPresenter.mRenderer = mRenderer; + mDividerPresenter.mDecorSurfaceOwner = mPrimaryContainerToken; + } + + @Test + public void testUpdateDivider() { + when(mSplitContainer.getCurrentSplitAttributes()).thenReturn( + new SplitAttributes.Builder() + .setDividerAttributes(ANOTHER_DIVIDER_ATTRIBUTES) + .build()); + mDividerPresenter.updateDivider( + mTransaction, + mParentInfo, + mSplitContainer); + + assertNotEquals(mProperties, mDividerPresenter.mProperties); + verify(mRenderer).update(); + verify(mTransaction, never()).addTaskFragmentOperation(any(), any()); + } + + @Test + public void testUpdateDivider_updateDecorSurfaceOwnerIfPrimaryContainerChanged() { + final TaskFragmentContainer mockPrimaryContainer = + createMockTaskFragmentContainer( + mAnotherContainerToken, new Rect(0, 0, 750, 1000)); + final TaskFragmentContainer mockSecondaryContainer = + createMockTaskFragmentContainer( + mSecondaryContainerToken, new Rect(800, 0, 2000, 1000)); + when(mSplitContainer.getPrimaryContainer()).thenReturn(mockPrimaryContainer); + when(mSplitContainer.getSecondaryContainer()).thenReturn(mockSecondaryContainer); + mDividerPresenter.updateDivider( + mTransaction, + mParentInfo, + mSplitContainer); + + assertNotEquals(mProperties, mDividerPresenter.mProperties); + verify(mRenderer).update(); + final TaskFragmentOperation operation = new TaskFragmentOperation.Builder( + OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE) + .build(); + assertEquals(mAnotherContainerToken, mDividerPresenter.mDecorSurfaceOwner); + verify(mTransaction).addTaskFragmentOperation(mAnotherContainerToken, operation); + } + + @Test + public void testUpdateDivider_noChangeIfPropertiesIdentical() { + mDividerPresenter.updateDivider( + mTransaction, + mParentInfo, + mSplitContainer); + + assertEquals(mProperties, mDividerPresenter.mProperties); + verify(mRenderer, never()).update(); + verify(mTransaction, never()).addTaskFragmentOperation(any(), any()); + } + + @Test + public void testUpdateDivider_dividerRemovedWhenSplitContainerIsNull() { + mDividerPresenter.updateDivider( + mTransaction, + mParentInfo, + null /* splitContainer */); + final TaskFragmentOperation taskFragmentOperation = new TaskFragmentOperation.Builder( + OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE) + .build(); + + verify(mTransaction).addTaskFragmentOperation( + mPrimaryContainerToken, taskFragmentOperation); + verify(mRenderer).release(); + assertNull(mDividerPresenter.mRenderer); + assertNull(mDividerPresenter.mProperties); + assertNull(mDividerPresenter.mDecorSurfaceOwner); + } + + @Test + public void testUpdateDivider_dividerRemovedWhenDividerAttributesIsNull() { + when(mSplitContainer.getCurrentSplitAttributes()).thenReturn( + new SplitAttributes.Builder().setDividerAttributes(null).build()); + mDividerPresenter.updateDivider( + mTransaction, + mParentInfo, + mSplitContainer); + final TaskFragmentOperation taskFragmentOperation = new TaskFragmentOperation.Builder( + OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE) + .build(); + + verify(mTransaction).addTaskFragmentOperation( + mPrimaryContainerToken, taskFragmentOperation); + verify(mRenderer).release(); + assertNull(mDividerPresenter.mRenderer); + assertNull(mDividerPresenter.mProperties); + assertNull(mDividerPresenter.mDecorSurfaceOwner); + } + @Test public void testSanitizeDividerAttributes_setDefaultValues() { DividerAttributes attributes = @@ -61,7 +249,7 @@ public class DividerPresenterTest { public void testSanitizeDividerAttributes_notChangingValidValues() { DividerAttributes attributes = new DividerAttributes.Builder(DividerAttributes.DIVIDER_TYPE_DRAGGABLE) - .setWidthDp(10) + .setWidthDp(24) .setPrimaryMinRatio(0.3f) .setPrimaryMaxRatio(0.7f) .build(); @@ -123,6 +311,14 @@ public class DividerPresenterTest { dividerWidthPx, splitType, expectedTopLeftOffset, expectedBottomRightOffset); } + private TaskFragmentContainer createMockTaskFragmentContainer( + @NonNull IBinder token, @NonNull Rect bounds) { + final TaskFragmentContainer container = mock(TaskFragmentContainer.class); + when(container.getTaskFragmentToken()).thenReturn(token); + when(container.getLastRequestedBounds()).thenReturn(bounds); + return container; + } + private void assertDividerOffsetEquals( int dividerWidthPx, @NonNull SplitAttributes.SplitType splitType, diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java index dd087e8eb7c9..6f37e9cb794d 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java @@ -107,7 +107,7 @@ public class JetpackTaskFragmentOrganizerTest { mOrganizer.mFragmentInfos.put(container.getTaskFragmentToken(), info); container.setInfo(mTransaction, info); - mOrganizer.expandTaskFragment(mTransaction, container.getTaskFragmentToken()); + mOrganizer.expandTaskFragment(mTransaction, container); verify(mTransaction).setWindowingMode(container.getInfo().getToken(), WINDOWING_MODE_UNDEFINED); diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java index cdb37acfc0c2..c246a19f27e2 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java @@ -642,7 +642,7 @@ public class SplitControllerTest { false /* isOnReparent */); assertTrue(result); - verify(mSplitPresenter).expandTaskFragment(mTransaction, container.getTaskFragmentToken()); + verify(mSplitPresenter).expandTaskFragment(mTransaction, container); } @Test diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java index 941b4e1c3e41..62d8aa30a576 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java @@ -665,8 +665,8 @@ public class SplitPresenterTest { assertEquals(RESULT_EXPANDED, mPresenter.expandSplitContainerIfNeeded(mTransaction, splitContainer, mActivity, secondaryActivity, null /* secondaryIntent */)); - verify(mPresenter).expandTaskFragment(mTransaction, primaryTf.getTaskFragmentToken()); - verify(mPresenter).expandTaskFragment(mTransaction, secondaryTf.getTaskFragmentToken()); + verify(mPresenter).expandTaskFragment(mTransaction, primaryTf); + verify(mPresenter).expandTaskFragment(mTransaction, secondaryTf); splitContainer.updateCurrentSplitAttributes(SPLIT_ATTRIBUTES); clearInvocations(mPresenter); @@ -675,8 +675,8 @@ public class SplitPresenterTest { splitContainer, mActivity, null /* secondaryActivity */, new Intent(ApplicationProvider.getApplicationContext(), MinimumDimensionActivity.class))); - verify(mPresenter).expandTaskFragment(mTransaction, primaryTf.getTaskFragmentToken()); - verify(mPresenter).expandTaskFragment(mTransaction, secondaryTf.getTaskFragmentToken()); + verify(mPresenter).expandTaskFragment(mTransaction, primaryTf); + verify(mPresenter).expandTaskFragment(mTransaction, secondaryTf); } @Test diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt index e422198c40c5..e73d8802f0b2 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt @@ -26,6 +26,7 @@ import android.view.WindowManager import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.internal.protolog.common.ProtoLog import com.android.wm.shell.R import com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT import com.android.wm.shell.common.bubbles.BubbleBarLocation @@ -54,6 +55,7 @@ class BubblePositionerTest { @Before fun setUp() { + ProtoLog.REQUIRE_PROTOLOGTOOL = false val windowManager = context.getSystemService(WindowManager::class.java) positioner = BubblePositioner(context, windowManager) } @@ -167,8 +169,9 @@ class BubblePositionerTest { @Test fun testGetRestingPosition_afterBoundsChange() { - positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, - windowBounds = Rect(0, 0, 2000, 1600))) + positioner.update( + defaultDeviceConfig.copy(isLargeScreen = true, windowBounds = Rect(0, 0, 2000, 1600)) + ) // Set the resting position to the right side var allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) @@ -176,8 +179,9 @@ class BubblePositionerTest { positioner.restingPosition = restingPosition // Now make the device smaller - positioner.update(defaultDeviceConfig.copy(isLargeScreen = false, - windowBounds = Rect(0, 0, 1000, 1600))) + positioner.update( + defaultDeviceConfig.copy(isLargeScreen = false, windowBounds = Rect(0, 0, 1000, 1600)) + ) // Check the resting position is on the correct side allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) @@ -236,7 +240,8 @@ class BubblePositionerTest { 0 /* taskId */, null /* locus */, true /* isDismissable */, - directExecutor()) {} + directExecutor() + ) {} // Ensure the height is the same as the desired value assertThat(positioner.getExpandedViewHeight(bubble)) @@ -263,7 +268,8 @@ class BubblePositionerTest { 0 /* taskId */, null /* locus */, true /* isDismissable */, - directExecutor()) {} + directExecutor() + ) {} // Ensure the height is the same as the desired value val minHeight = @@ -471,20 +477,20 @@ class BubblePositionerTest { fun testGetTaskViewContentWidth_onLeft() { positioner.update(defaultDeviceConfig.copy(insets = Insets.of(100, 0, 200, 0))) val taskViewWidth = positioner.getTaskViewContentWidth(true /* onLeft */) - val paddings = positioner.getExpandedViewContainerPadding(true /* onLeft */, - false /* isOverflow */) - assertThat(taskViewWidth).isEqualTo( - positioner.screenRect.width() - paddings[0] - paddings[2]) + val paddings = + positioner.getExpandedViewContainerPadding(true /* onLeft */, false /* isOverflow */) + assertThat(taskViewWidth) + .isEqualTo(positioner.screenRect.width() - paddings[0] - paddings[2]) } @Test fun testGetTaskViewContentWidth_onRight() { positioner.update(defaultDeviceConfig.copy(insets = Insets.of(100, 0, 200, 0))) val taskViewWidth = positioner.getTaskViewContentWidth(false /* onLeft */) - val paddings = positioner.getExpandedViewContainerPadding(false /* onLeft */, - false /* isOverflow */) - assertThat(taskViewWidth).isEqualTo( - positioner.screenRect.width() - paddings[0] - paddings[2]) + val paddings = + positioner.getExpandedViewContainerPadding(false /* onLeft */, false /* isOverflow */) + assertThat(taskViewWidth) + .isEqualTo(positioner.screenRect.width() - paddings[0] - paddings[2]) } @Test @@ -513,6 +519,66 @@ class BubblePositionerTest { assertThat(positioner.isBubbleBarOnLeft).isFalse() } + @Test + fun testGetBubbleBarExpandedViewBounds_onLeft() { + testGetBubbleBarExpandedViewBounds(onLeft = true, isOverflow = false) + } + + @Test + fun testGetBubbleBarExpandedViewBounds_onRight() { + testGetBubbleBarExpandedViewBounds(onLeft = false, isOverflow = false) + } + + @Test + fun testGetBubbleBarExpandedViewBounds_isOverflow_onLeft() { + testGetBubbleBarExpandedViewBounds(onLeft = true, isOverflow = true) + } + + @Test + fun testGetBubbleBarExpandedViewBounds_isOverflow_onRight() { + testGetBubbleBarExpandedViewBounds(onLeft = false, isOverflow = true) + } + + private fun testGetBubbleBarExpandedViewBounds(onLeft: Boolean, isOverflow: Boolean) { + positioner.setShowingInBubbleBar(true) + val deviceConfig = + defaultDeviceConfig.copy( + isLargeScreen = true, + isLandscape = true, + insets = Insets.of(10, 20, 5, 15), + windowBounds = Rect(0, 0, 2000, 2600) + ) + positioner.update(deviceConfig) + + positioner.bubbleBarBounds = getBubbleBarBounds(onLeft, deviceConfig) + + val expandedViewPadding = + context.resources.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding) + + val left: Int + val right: Int + if (onLeft) { + // Pin to the left, calculate right + left = deviceConfig.insets.left + expandedViewPadding + right = left + positioner.getExpandedViewWidthForBubbleBar(isOverflow) + } else { + // Pin to the right, calculate left + right = + deviceConfig.windowBounds.right - deviceConfig.insets.right - expandedViewPadding + left = right - positioner.getExpandedViewWidthForBubbleBar(isOverflow) + } + // Above the bubble bar + val bottom = positioner.bubbleBarBounds.top - expandedViewPadding + // Calculate right and top based on size + val top = bottom - positioner.getExpandedViewHeightForBubbleBar(isOverflow) + val expectedBounds = Rect(left, top, right, bottom) + + val bounds = Rect() + positioner.getBubbleBarExpandedViewBounds(onLeft, isOverflow, bounds) + + assertThat(bounds).isEqualTo(expectedBounds) + } + private val defaultYPosition: Float /** * Calculates the Y position bubbles should be placed based on the config. Based on the @@ -544,4 +610,21 @@ class BubblePositionerTest { positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) return allowableStackRegion.top + allowableStackRegion.height() * offsetPercent } + + private fun getBubbleBarBounds(onLeft: Boolean, deviceConfig: DeviceConfig): Rect { + val width = 200 + val height = 100 + val bottom = deviceConfig.windowBounds.bottom - deviceConfig.insets.bottom + val top = bottom - height + val left: Int + val right: Int + if (onLeft) { + left = deviceConfig.insets.left + right = left + width + } else { + right = deviceConfig.windowBounds.right - deviceConfig.insets.right + left = right - width + } + return Rect(left, top, right, bottom) + } } diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 00fb298ea1cc..43ce1668c4df 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -535,5 +535,7 @@ <!-- The vertical margin that needs to be preserved between the scaled window bounds and the original window bounds (once the surface is scaled enough to do so) --> <dimen name="cross_task_back_vertical_margin">8dp</dimen> + <!-- The offset from the left edge of the entering page for the cross-activity animation --> + <dimen name="cross_activity_back_entering_start_offset">96dp</dimen> </resources> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java deleted file mode 100644 index d6f7c367f772..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java +++ /dev/null @@ -1,455 +0,0 @@ -/* - * Copyright (C) 2022 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.wm.shell.back; - -import static android.view.RemoteAnimationTarget.MODE_CLOSING; -import static android.view.RemoteAnimationTarget.MODE_OPENING; -import static android.window.BackEvent.EDGE_RIGHT; - -import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY; -import static com.android.wm.shell.back.BackAnimationConstants.UPDATE_SYSUI_FLAGS_THRESHOLD; -import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ValueAnimator; -import android.annotation.NonNull; -import android.content.Context; -import android.graphics.Matrix; -import android.graphics.PointF; -import android.graphics.Rect; -import android.graphics.RectF; -import android.os.RemoteException; -import android.util.FloatProperty; -import android.util.TypedValue; -import android.view.IRemoteAnimationFinishedCallback; -import android.view.IRemoteAnimationRunner; -import android.view.RemoteAnimationTarget; -import android.view.SurfaceControl; -import android.view.animation.Interpolator; -import android.window.BackEvent; -import android.window.BackMotionEvent; -import android.window.BackProgressAnimator; -import android.window.IOnBackInvokedCallback; - -import com.android.internal.dynamicanimation.animation.SpringAnimation; -import com.android.internal.dynamicanimation.animation.SpringForce; -import com.android.internal.policy.ScreenDecorationsUtils; -import com.android.internal.protolog.common.ProtoLog; -import com.android.wm.shell.animation.Interpolators; -import com.android.wm.shell.common.annotations.ShellMainThread; - -import javax.inject.Inject; - -/** Class that defines cross-activity animation. */ -@ShellMainThread -public class CrossActivityBackAnimation extends ShellBackAnimation { - /** - * Minimum scale of the entering/closing window. - */ - private static final float MIN_WINDOW_SCALE = 0.9f; - - /** Duration of post animation after gesture committed. */ - private static final int POST_ANIMATION_DURATION = 350; - private static final Interpolator INTERPOLATOR = Interpolators.STANDARD_DECELERATE; - private static final FloatProperty<CrossActivityBackAnimation> ENTER_PROGRESS_PROP = - new FloatProperty<>("enter-alpha") { - @Override - public void setValue(CrossActivityBackAnimation anim, float value) { - anim.setEnteringProgress(value); - } - - @Override - public Float get(CrossActivityBackAnimation object) { - return object.getEnteringProgress(); - } - }; - private static final FloatProperty<CrossActivityBackAnimation> LEAVE_PROGRESS_PROP = - new FloatProperty<>("leave-alpha") { - @Override - public void setValue(CrossActivityBackAnimation anim, float value) { - anim.setLeavingProgress(value); - } - - @Override - public Float get(CrossActivityBackAnimation object) { - return object.getLeavingProgress(); - } - }; - private static final float MIN_WINDOW_ALPHA = 0.01f; - private static final float WINDOW_X_SHIFT_DP = 48; - private static final int SCALE_FACTOR = 100; - // TODO(b/264710590): Use the progress commit threshold from ViewConfiguration once it exists. - private static final float TARGET_COMMIT_PROGRESS = 0.5f; - private static final float ENTER_ALPHA_THRESHOLD = 0.22f; - - private final Rect mStartTaskRect = new Rect(); - private final float mCornerRadius; - - // The closing window properties. - private final RectF mClosingRect = new RectF(); - - // The entering window properties. - private final Rect mEnteringStartRect = new Rect(); - private final RectF mEnteringRect = new RectF(); - private final SpringAnimation mEnteringProgressSpring; - private final SpringAnimation mLeavingProgressSpring; - // Max window x-shift in pixels. - private final float mWindowXShift; - private final BackAnimationRunner mBackAnimationRunner; - - private float mEnteringProgress = 0f; - private float mLeavingProgress = 0f; - - private final PointF mInitialTouchPos = new PointF(); - - private final Matrix mTransformMatrix = new Matrix(); - - private final float[] mTmpFloat9 = new float[9]; - - private RemoteAnimationTarget mEnteringTarget; - private RemoteAnimationTarget mClosingTarget; - private SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction(); - - private boolean mBackInProgress = false; - private boolean mIsRightEdge; - private boolean mTriggerBack = false; - - private PointF mTouchPos = new PointF(); - private IRemoteAnimationFinishedCallback mFinishCallback; - - private final BackProgressAnimator mProgressAnimator = new BackProgressAnimator(); - - private final BackAnimationBackground mBackground; - - @Inject - public CrossActivityBackAnimation(Context context, BackAnimationBackground background) { - mCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context); - mBackAnimationRunner = new BackAnimationRunner( - new Callback(), new Runner(), context, CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY); - mBackground = background; - mEnteringProgressSpring = new SpringAnimation(this, ENTER_PROGRESS_PROP); - mEnteringProgressSpring.setSpring(new SpringForce() - .setStiffness(SpringForce.STIFFNESS_MEDIUM) - .setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY)); - mLeavingProgressSpring = new SpringAnimation(this, LEAVE_PROGRESS_PROP); - mLeavingProgressSpring.setSpring(new SpringForce() - .setStiffness(SpringForce.STIFFNESS_MEDIUM) - .setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY)); - mWindowXShift = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, WINDOW_X_SHIFT_DP, - context.getResources().getDisplayMetrics()); - } - - /** - * Returns 1 if x >= edge1, 0 if x <= edge0, and a smoothed value between the two. - * From https://en.wikipedia.org/wiki/Smoothstep - */ - private static float smoothstep(float edge0, float edge1, float x) { - if (x < edge0) return 0; - if (x >= edge1) return 1; - - x = (x - edge0) / (edge1 - edge0); - return x * x * (3 - 2 * x); - } - - /** - * Linearly map x from range (a1, a2) to range (b1, b2). - */ - private static float mapLinear(float x, float a1, float a2, float b1, float b2) { - return b1 + (x - a1) * (b2 - b1) / (a2 - a1); - } - - /** - * Linearly map a normalized value from (0, 1) to (min, max). - */ - private static float mapRange(float value, float min, float max) { - return min + (value * (max - min)); - } - - private void startBackAnimation() { - if (mEnteringTarget == null || mClosingTarget == null) { - ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Entering target or closing target is null."); - return; - } - mTransaction.setAnimationTransaction(); - - // Offset start rectangle to align task bounds. - mStartTaskRect.set(mClosingTarget.windowConfiguration.getBounds()); - mStartTaskRect.offsetTo(0, 0); - - // Draw background with task background color. - mBackground.ensureBackground(mClosingTarget.windowConfiguration.getBounds(), - mEnteringTarget.taskInfo.taskDescription.getBackgroundColor(), mTransaction); - setEnteringProgress(0); - setLeavingProgress(0); - } - - private void applyTransform(SurfaceControl leash, RectF targetRect, float targetAlpha) { - if (leash == null || !leash.isValid()) { - return; - } - - final float scale = targetRect.width() / mStartTaskRect.width(); - mTransformMatrix.reset(); - mTransformMatrix.setScale(scale, scale); - mTransformMatrix.postTranslate(targetRect.left, targetRect.top); - mTransaction.setAlpha(leash, targetAlpha) - .setMatrix(leash, mTransformMatrix, mTmpFloat9) - .setWindowCrop(leash, mStartTaskRect) - .setCornerRadius(leash, mCornerRadius); - } - - private void finishAnimation() { - if (mEnteringTarget != null) { - if (mEnteringTarget.leash != null && mEnteringTarget.leash.isValid()) { - mTransaction.setCornerRadius(mEnteringTarget.leash, 0); - mEnteringTarget.leash.release(); - } - mEnteringTarget = null; - } - if (mClosingTarget != null) { - if (mClosingTarget.leash != null) { - mClosingTarget.leash.release(); - } - mClosingTarget = null; - } - if (mBackground != null) { - mBackground.removeBackground(mTransaction); - } - - mTransaction.apply(); - mBackInProgress = false; - mTransformMatrix.reset(); - mInitialTouchPos.set(0, 0); - - if (mFinishCallback != null) { - try { - mFinishCallback.onAnimationFinished(); - } catch (RemoteException e) { - e.printStackTrace(); - } - mFinishCallback = null; - } - mEnteringProgressSpring.animateToFinalPosition(0); - mEnteringProgressSpring.skipToEnd(); - mLeavingProgressSpring.animateToFinalPosition(0); - mLeavingProgressSpring.skipToEnd(); - } - - private void onGestureProgress(@NonNull BackEvent backEvent) { - if (!mBackInProgress) { - mIsRightEdge = backEvent.getSwipeEdge() == EDGE_RIGHT; - mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); - mBackInProgress = true; - } - mTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); - - float progress = backEvent.getProgress(); - float springProgress = (mTriggerBack - ? mapLinear(progress, 0f, 1, TARGET_COMMIT_PROGRESS, 1) - : mapLinear(progress, 0, 1f, 0, TARGET_COMMIT_PROGRESS)) * SCALE_FACTOR; - mLeavingProgressSpring.animateToFinalPosition(springProgress); - mEnteringProgressSpring.animateToFinalPosition(springProgress); - mBackground.onBackProgressed(progress); - } - - private void onGestureCommitted() { - if (mEnteringTarget == null || mClosingTarget == null || mClosingTarget.leash == null - || mEnteringTarget.leash == null || !mEnteringTarget.leash.isValid() - || !mClosingTarget.leash.isValid()) { - finishAnimation(); - return; - } - // End the fade animations - mLeavingProgressSpring.cancel(); - mEnteringProgressSpring.cancel(); - - // We enter phase 2 of the animation, the starting coordinates for phase 2 are the current - // coordinate of the gesture driven phase. - mEnteringRect.round(mEnteringStartRect); - mTransaction.hide(mClosingTarget.leash); - - ValueAnimator valueAnimator = - ValueAnimator.ofFloat(1f, 0f).setDuration(POST_ANIMATION_DURATION); - valueAnimator.setInterpolator(INTERPOLATOR); - valueAnimator.addUpdateListener(animation -> { - float progress = animation.getAnimatedFraction(); - updatePostCommitEnteringAnimation(progress); - if (progress > 1 - UPDATE_SYSUI_FLAGS_THRESHOLD) { - mBackground.resetStatusBarCustomization(); - } - mTransaction.apply(); - }); - - valueAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mBackground.resetStatusBarCustomization(); - finishAnimation(); - } - }); - valueAnimator.start(); - } - - private void updatePostCommitEnteringAnimation(float progress) { - float left = mapRange(progress, mEnteringStartRect.left, mStartTaskRect.left); - float top = mapRange(progress, mEnteringStartRect.top, mStartTaskRect.top); - float width = mapRange(progress, mEnteringStartRect.width(), mStartTaskRect.width()); - float height = mapRange(progress, mEnteringStartRect.height(), mStartTaskRect.height()); - float alpha = mapRange(progress, getPreCommitEnteringAlpha(), 1.0f); - mEnteringRect.set(left, top, left + width, top + height); - applyTransform(mEnteringTarget.leash, mEnteringRect, alpha); - } - - private float getPreCommitEnteringAlpha() { - return Math.max(smoothstep(ENTER_ALPHA_THRESHOLD, 0.7f, mEnteringProgress), - MIN_WINDOW_ALPHA); - } - - private float getEnteringProgress() { - return mEnteringProgress * SCALE_FACTOR; - } - - private void setEnteringProgress(float value) { - mEnteringProgress = value / SCALE_FACTOR; - if (mEnteringTarget != null && mEnteringTarget.leash != null) { - transformWithProgress( - mEnteringProgress, - getPreCommitEnteringAlpha(), - mEnteringTarget.leash, - mEnteringRect, - -mWindowXShift, - 0 - ); - } - } - - private float getPreCommitLeavingAlpha() { - return Math.max(1 - smoothstep(0, ENTER_ALPHA_THRESHOLD, mLeavingProgress), - MIN_WINDOW_ALPHA); - } - - private float getLeavingProgress() { - return mLeavingProgress * SCALE_FACTOR; - } - - private void setLeavingProgress(float value) { - mLeavingProgress = value / SCALE_FACTOR; - if (mClosingTarget != null && mClosingTarget.leash != null) { - transformWithProgress( - mLeavingProgress, - getPreCommitLeavingAlpha(), - mClosingTarget.leash, - mClosingRect, - 0, - mIsRightEdge ? 0 : mWindowXShift - ); - } - } - - private void transformWithProgress(float progress, float alpha, SurfaceControl surface, - RectF targetRect, float deltaXMin, float deltaXMax) { - - final int width = mStartTaskRect.width(); - final int height = mStartTaskRect.height(); - - final float interpolatedProgress = INTERPOLATOR.getInterpolation(progress); - final float closingScale = MIN_WINDOW_SCALE - + (1 - interpolatedProgress) * (1 - MIN_WINDOW_SCALE); - final float closingWidth = closingScale * width; - final float closingHeight = (float) height / width * closingWidth; - - // Move the window along the X axis. - float closingLeft = mStartTaskRect.left + (width - closingWidth) / 2; - closingLeft += mapRange(interpolatedProgress, deltaXMin, deltaXMax); - - // Move the window along the Y axis. - final float closingTop = (height - closingHeight) * 0.5f; - targetRect.set( - closingLeft, closingTop, closingLeft + closingWidth, closingTop + closingHeight); - - applyTransform(surface, targetRect, Math.max(alpha, MIN_WINDOW_ALPHA)); - mTransaction.apply(); - } - - @Override - public BackAnimationRunner getRunner() { - return mBackAnimationRunner; - } - - private final class Callback extends IOnBackInvokedCallback.Default { - @Override - public void onBackStarted(BackMotionEvent backEvent) { - mTriggerBack = backEvent.getTriggerBack(); - mProgressAnimator.onBackStarted(backEvent, - CrossActivityBackAnimation.this::onGestureProgress); - } - - @Override - public void onBackProgressed(@NonNull BackMotionEvent backEvent) { - mTriggerBack = backEvent.getTriggerBack(); - mProgressAnimator.onBackProgressed(backEvent); - } - - @Override - public void onBackCancelled() { - mProgressAnimator.onBackCancelled(() -> { - // mProgressAnimator can reach finish stage earlier than mLeavingProgressSpring, - // and if we release all animation leash first, the leavingProgressSpring won't - // able to update the animation anymore, which cause flicker. - // Here should force update the closing animation target to the final stage before - // release it. - setLeavingProgress(0); - finishAnimation(); - }); - } - - @Override - public void onBackInvoked() { - mProgressAnimator.reset(); - onGestureCommitted(); - } - } - - private final class Runner extends IRemoteAnimationRunner.Default { - @Override - public void onAnimationStart( - int transit, - RemoteAnimationTarget[] apps, - RemoteAnimationTarget[] wallpapers, - RemoteAnimationTarget[] nonApps, - IRemoteAnimationFinishedCallback finishedCallback) { - ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Start back to activity animation."); - for (RemoteAnimationTarget a : apps) { - if (a.mode == MODE_CLOSING) { - mClosingTarget = a; - } - if (a.mode == MODE_OPENING) { - mEnteringTarget = a; - } - } - - startBackAnimation(); - mFinishCallback = finishedCallback; - } - - @Override - public void onAnimationCancelled() { - finishAnimation(); - } - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt new file mode 100644 index 000000000000..edf29dd484fc --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt @@ -0,0 +1,367 @@ +/* + * Copyright (C) 2022 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.wm.shell.back + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.content.Context +import android.content.res.Configuration +import android.graphics.Matrix +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.os.RemoteException +import android.view.Display +import android.view.IRemoteAnimationFinishedCallback +import android.view.IRemoteAnimationRunner +import android.view.RemoteAnimationTarget +import android.view.SurfaceControl +import android.view.animation.DecelerateInterpolator +import android.view.animation.Interpolator +import android.window.BackEvent +import android.window.BackMotionEvent +import android.window.BackProgressAnimator +import android.window.IOnBackInvokedCallback +import com.android.internal.jank.Cuj +import com.android.internal.policy.ScreenDecorationsUtils +import com.android.internal.protolog.common.ProtoLog +import com.android.wm.shell.R +import com.android.wm.shell.RootTaskDisplayAreaOrganizer +import com.android.wm.shell.animation.Interpolators +import com.android.wm.shell.common.annotations.ShellMainThread +import com.android.wm.shell.protolog.ShellProtoLogGroup +import javax.inject.Inject +import kotlin.math.abs +import kotlin.math.max +import kotlin.math.min + +/** Class that defines cross-activity animation. */ +@ShellMainThread +class CrossActivityBackAnimation @Inject constructor( + private val context: Context, + private val background: BackAnimationBackground, + private val rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer +) : ShellBackAnimation() { + + private val startClosingRect = RectF() + private val targetClosingRect = RectF() + private val currentClosingRect = RectF() + + private val startEnteringRect = RectF() + private val targetEnteringRect = RectF() + private val currentEnteringRect = RectF() + + private val taskBoundsRect = Rect() + + private val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context) + + private val backAnimationRunner = BackAnimationRunner( + Callback(), Runner(), context, Cuj.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY + ) + private val initialTouchPos = PointF() + private val transformMatrix = Matrix() + private val tmpFloat9 = FloatArray(9) + private var enteringTarget: RemoteAnimationTarget? = null + private var closingTarget: RemoteAnimationTarget? = null + private val transaction = SurfaceControl.Transaction() + private var triggerBack = false + private var finishCallback: IRemoteAnimationFinishedCallback? = null + private val progressAnimator = BackProgressAnimator() + private val displayBoundsMargin = + context.resources.getDimension(R.dimen.cross_task_back_vertical_margin) + private val enteringStartOffset = + context.resources.getDimension(R.dimen.cross_activity_back_entering_start_offset) + + private val gestureInterpolator = Interpolators.STANDARD_DECELERATE + private val postCommitInterpolator = Interpolators.FAST_OUT_SLOW_IN + private val verticalMoveInterpolator: Interpolator = DecelerateInterpolator() + + private var scrimLayer: SurfaceControl? = null + private var maxScrimAlpha: Float = 0f + + override fun getRunner() = backAnimationRunner + + private fun startBackAnimation(backMotionEvent: BackMotionEvent) { + if (enteringTarget == null || closingTarget == null) { + ProtoLog.d( + ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW, + "Entering target or closing target is null." + ) + return + } + triggerBack = backMotionEvent.triggerBack + initialTouchPos.set(backMotionEvent.touchX, backMotionEvent.touchY) + + transaction.setAnimationTransaction() + + // Offset start rectangle to align task bounds. + taskBoundsRect.set(closingTarget!!.windowConfiguration.bounds) + taskBoundsRect.offsetTo(0, 0) + + startClosingRect.set(taskBoundsRect) + + // scale closing target into the middle for rhs and to the right for lhs + targetClosingRect.set(startClosingRect) + targetClosingRect.scaleCentered(MAX_SCALE) + if (backMotionEvent.swipeEdge != BackEvent.EDGE_RIGHT) { + targetClosingRect.offset( + startClosingRect.right - targetClosingRect.right - displayBoundsMargin, 0f + ) + } + + // the entering target starts 96dp to the left of the screen edge... + startEnteringRect.set(startClosingRect) + startEnteringRect.offset(-enteringStartOffset, 0f) + + // ...and gets scaled in sync with the closing target + targetEnteringRect.set(startEnteringRect) + targetEnteringRect.scaleCentered(MAX_SCALE) + + // Draw background with task background color. + background.ensureBackground( + closingTarget!!.windowConfiguration.bounds, + enteringTarget!!.taskInfo.taskDescription!!.backgroundColor, transaction + ) + ensureScrimLayer() + transaction.apply() + } + + private fun onGestureProgress(backEvent: BackEvent) { + val progress = gestureInterpolator.getInterpolation(backEvent.progress) + background.onBackProgressed(progress) + currentClosingRect.setInterpolatedRectF(startClosingRect, targetClosingRect, progress) + val yOffset = getYOffset(currentClosingRect, backEvent.touchY) + currentClosingRect.offset(0f, yOffset) + applyTransform(closingTarget?.leash, currentClosingRect, 1f) + currentEnteringRect.setInterpolatedRectF(startEnteringRect, targetEnteringRect, progress) + currentEnteringRect.offset(0f, yOffset) + applyTransform(enteringTarget?.leash, currentEnteringRect, 1f) + transaction.apply() + } + + private fun getYOffset(centeredRect: RectF, touchY: Float): Float { + val screenHeight = taskBoundsRect.height() + // Base the window movement in the Y axis on the touch movement in the Y axis. + val rawYDelta = touchY - initialTouchPos.y + val yDirection = (if (rawYDelta < 0) -1 else 1) + // limit yDelta interpretation to 1/2 of screen height in either direction + val deltaYRatio = min(screenHeight / 2f, abs(rawYDelta)) / (screenHeight / 2f) + val interpolatedYRatio: Float = verticalMoveInterpolator.getInterpolation(deltaYRatio) + // limit y-shift so surface never passes 8dp screen margin + val deltaY = yDirection * interpolatedYRatio * max( + 0f, (screenHeight - centeredRect.height()) / 2f - displayBoundsMargin + ) + return deltaY + } + + private fun onGestureCommitted() { + if (closingTarget?.leash == null || enteringTarget?.leash == null || + !enteringTarget!!.leash.isValid || !closingTarget!!.leash.isValid + ) { + finishAnimation() + return + } + + // We enter phase 2 of the animation, the starting coordinates for phase 2 are the current + // coordinate of the gesture driven phase. Let's update the start and target rects and kick + // off the animator + startClosingRect.set(currentClosingRect) + startEnteringRect.set(currentEnteringRect) + targetEnteringRect.set(taskBoundsRect) + targetClosingRect.set(taskBoundsRect) + targetClosingRect.offset(currentClosingRect.left + enteringStartOffset, 0f) + + val valueAnimator = ValueAnimator.ofFloat(1f, 0f).setDuration(POST_ANIMATION_DURATION) + valueAnimator.addUpdateListener { animation: ValueAnimator -> + val progress = animation.animatedFraction + onPostCommitProgress(progress) + if (progress > 1 - BackAnimationConstants.UPDATE_SYSUI_FLAGS_THRESHOLD) { + background.resetStatusBarCustomization() + } + } + valueAnimator.addListener(object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + background.resetStatusBarCustomization() + finishAnimation() + } + }) + valueAnimator.start() + } + + private fun onPostCommitProgress(linearProgress: Float) { + val closingAlpha = max(1f - linearProgress * 2, 0f) + val progress = postCommitInterpolator.getInterpolation(linearProgress) + scrimLayer?.let { transaction.setAlpha(it, maxScrimAlpha * (1f - linearProgress)) } + currentClosingRect.setInterpolatedRectF(startClosingRect, targetClosingRect, progress) + applyTransform(closingTarget?.leash, currentClosingRect, closingAlpha) + currentEnteringRect.setInterpolatedRectF(startEnteringRect, targetEnteringRect, progress) + applyTransform(enteringTarget?.leash, currentEnteringRect, 1f) + transaction.apply() + } + + private fun finishAnimation() { + enteringTarget?.let { + if (it.leash != null && it.leash.isValid) { + transaction.setCornerRadius(it.leash, 0f) + it.leash.release() + } + enteringTarget = null + } + + closingTarget?.leash?.release() + closingTarget = null + + background.removeBackground(transaction) + transaction.apply() + transformMatrix.reset() + initialTouchPos.set(0f, 0f) + try { + finishCallback?.onAnimationFinished() + } catch (e: RemoteException) { + e.printStackTrace() + } + finishCallback = null + removeScrimLayer() + } + + private fun applyTransform(leash: SurfaceControl?, rect: RectF, alpha: Float) { + if (leash == null || !leash.isValid) return + val scale = rect.width() / taskBoundsRect.width() + transformMatrix.reset() + transformMatrix.setScale(scale, scale) + transformMatrix.postTranslate(rect.left, rect.top) + transaction.setAlpha(leash, alpha) + .setMatrix(leash, transformMatrix, tmpFloat9) + .setCrop(leash, taskBoundsRect) + .setCornerRadius(leash, cornerRadius) + } + + private fun ensureScrimLayer() { + if (scrimLayer != null) return + val isDarkTheme: Boolean = isDarkMode(context) + val scrimBuilder = SurfaceControl.Builder() + .setName("Cross-Activity back animation scrim") + .setCallsite("CrossActivityBackAnimation") + .setColorLayer() + .setOpaque(false) + .setHidden(false) + + rootTaskDisplayAreaOrganizer.attachToDisplayArea(Display.DEFAULT_DISPLAY, scrimBuilder) + scrimLayer = scrimBuilder.build() + val colorComponents = floatArrayOf(0f, 0f, 0f) + maxScrimAlpha = if (isDarkTheme) MAX_SCRIM_ALPHA_DARK else MAX_SCRIM_ALPHA_LIGHT + transaction + .setColor(scrimLayer, colorComponents) + .setAlpha(scrimLayer!!, maxScrimAlpha) + .setRelativeLayer(scrimLayer!!, closingTarget!!.leash, -1) + .show(scrimLayer) + } + + private fun removeScrimLayer() { + scrimLayer?.let { + if (it.isValid) { + transaction.remove(it).apply() + } + } + scrimLayer = null + } + + + private inner class Callback : IOnBackInvokedCallback.Default() { + override fun onBackStarted(backMotionEvent: BackMotionEvent) { + startBackAnimation(backMotionEvent) + progressAnimator.onBackStarted(backMotionEvent) { backEvent: BackEvent -> + onGestureProgress(backEvent) + } + } + + override fun onBackProgressed(backEvent: BackMotionEvent) { + triggerBack = backEvent.triggerBack + progressAnimator.onBackProgressed(backEvent) + } + + override fun onBackCancelled() { + progressAnimator.onBackCancelled { + finishAnimation() + } + } + + override fun onBackInvoked() { + progressAnimator.reset() + onGestureCommitted() + } + } + + private inner class Runner : IRemoteAnimationRunner.Default() { + override fun onAnimationStart( + transit: Int, + apps: Array<RemoteAnimationTarget>, + wallpapers: Array<RemoteAnimationTarget>?, + nonApps: Array<RemoteAnimationTarget>?, + finishedCallback: IRemoteAnimationFinishedCallback + ) { + ProtoLog.d( + ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW, "Start back to activity animation." + ) + for (a in apps) { + when (a.mode) { + RemoteAnimationTarget.MODE_CLOSING -> closingTarget = a + RemoteAnimationTarget.MODE_OPENING -> enteringTarget = a + } + } + finishCallback = finishedCallback + } + + override fun onAnimationCancelled() { + finishAnimation() + } + } + + companion object { + /** Max scale of the entering/closing window.*/ + private const val MAX_SCALE = 0.9f + + /** Duration of post animation after gesture committed. */ + private const val POST_ANIMATION_DURATION = 300L + + private const val MAX_SCRIM_ALPHA_DARK = 0.8f + private const val MAX_SCRIM_ALPHA_LIGHT = 0.2f + } +} + +private fun isDarkMode(context: Context): Boolean { + return context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == + Configuration.UI_MODE_NIGHT_YES +} + +private fun RectF.setInterpolatedRectF(start: RectF, target: RectF, progress: Float) { + require(!(progress < 0 || progress > 1)) { "Progress value must be between 0 and 1" } + left = start.left + (target.left - start.left) * progress + top = start.top + (target.top - start.top) * progress + right = start.right + (target.right - start.right) * progress + bottom = start.bottom + (target.bottom - start.bottom) * progress +} + +private fun RectF.scaleCentered( + scale: Float, + pivotX: Float = left + width() / 2, + pivotY: Float = top + height() / 2 +) { + offset(-pivotX, -pivotY) // move pivot to origin + scale(scale) + offset(pivotX, pivotY) // Move back to the original position +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java index f4a401c64a31..4d5e516f76e5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java @@ -870,7 +870,7 @@ public class BubblePositioner { if (onLeft) { left = getInsets().left + padding; } else { - left = getAvailableRect().width() - width - padding; + left = getAvailableRect().right - width - padding; } int top = getExpandedViewBottomForBubbleBar() - height; out.offsetTo(left, top); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index 1c54754e9953..370720746808 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -332,6 +332,8 @@ public class RecentTasksController implements TaskStackListenerCallback, ArrayList<ActivityManager.RecentTaskInfo> freeformTasks = new ArrayList<>(); + int mostRecentFreeformTaskIndex = Integer.MAX_VALUE; + // Pull out the pairs as we iterate back in the list ArrayList<GroupedRecentTaskInfo> recentTasks = new ArrayList<>(); for (int i = 0; i < rawList.size(); i++) { @@ -344,6 +346,9 @@ public class RecentTasksController implements TaskStackListenerCallback, if (DesktopModeStatus.isEnabled() && mDesktopModeTaskRepository.isPresent() && mDesktopModeTaskRepository.get().isActiveTask(taskInfo.taskId)) { // Freeform tasks will be added as a separate entry + if (mostRecentFreeformTaskIndex == Integer.MAX_VALUE) { + mostRecentFreeformTaskIndex = recentTasks.size(); + } freeformTasks.add(taskInfo); continue; } @@ -362,7 +367,7 @@ public class RecentTasksController implements TaskStackListenerCallback, // Add a special entry for freeform tasks if (!freeformTasks.isEmpty()) { - recentTasks.add(0, GroupedRecentTaskInfo.forFreeformTasks( + recentTasks.add(mostRecentFreeformTaskIndex, GroupedRecentTaskInfo.forFreeformTasks( freeformTasks.toArray(new ActivityManager.RecentTaskInfo[0]))); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index 9130edfa9f26..74e85f8dd468 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -334,6 +334,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { boolean isDisplayRotationAnimationStarted = false; final boolean isDreamTransition = isDreamTransition(info); final boolean isOnlyTranslucent = isOnlyTranslucent(info); + final boolean isActivityLevel = isActivityLevelOnly(info); for (int i = info.getChanges().size() - 1; i >= 0; --i) { final TransitionInfo.Change change = info.getChanges().get(i); @@ -502,8 +503,35 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { : new Rect(change.getEndAbsBounds()); clipRect.offsetTo(0, 0); + final TransitionInfo.Root animRoot = TransitionUtil.getRootFor(change, info); + final Point animRelOffset = new Point( + change.getEndAbsBounds().left - animRoot.getOffset().x, + change.getEndAbsBounds().top - animRoot.getOffset().y); + if (change.getActivityComponent() != null && !isActivityLevel) { + // At this point, this is an independent activity change in a non-activity + // transition. This means that an activity transition got erroneously combined + // with another ongoing transition. This then means that the animation root may + // not tightly fit the activities, so we have to put them in a separate crop. + final int layer = Transitions.calculateAnimLayer(change, i, + info.getChanges().size(), info.getType()); + final SurfaceControl leash = new SurfaceControl.Builder() + .setName("Transition ActivityWrap: " + + change.getActivityComponent().toShortString()) + .setParent(animRoot.getLeash()) + .setContainerLayer().build(); + startTransaction.setCrop(leash, clipRect); + startTransaction.setPosition(leash, animRelOffset.x, animRelOffset.y); + startTransaction.setLayer(leash, layer); + startTransaction.show(leash); + startTransaction.reparent(change.getLeash(), leash); + startTransaction.setPosition(change.getLeash(), 0, 0); + animRelOffset.set(0, 0); + finishTransaction.reparent(leash, null); + leash.release(); + } + buildSurfaceAnimation(animations, a, change.getLeash(), onAnimFinish, - mTransactionPool, mMainExecutor, change.getEndRelOffset(), cornerRadius, + mTransactionPool, mMainExecutor, animRelOffset, cornerRadius, clipRect); if (info.getAnimationOptions() != null) { @@ -612,6 +640,18 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { return (translucentOpen + translucentClose) > 0; } + /** + * Does `info` only contain activity-level changes? This kinda assumes that if so, they are + * all in one task. + */ + private static boolean isActivityLevelOnly(@NonNull TransitionInfo info) { + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + final TransitionInfo.Change change = info.getChanges().get(i); + if (change.getActivityComponent() == null) return false; + } + return true; + } + @Override public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index ccd0b2df8cf1..6a53d33243db 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -31,7 +31,6 @@ import static android.view.WindowManager.fixScale; import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED; import static android.window.TransitionInfo.FLAG_IS_BEHIND_STARTING_WINDOW; import static android.window.TransitionInfo.FLAG_IS_OCCLUDED; -import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; import static android.window.TransitionInfo.FLAG_MOVED_TO_TOP; import static android.window.TransitionInfo.FLAG_NO_ANIMATION; import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT; @@ -530,6 +529,44 @@ public class Transitions implements RemoteCallable<Transitions>, } } + static int calculateAnimLayer(@NonNull TransitionInfo.Change change, int i, + int numChanges, @WindowManager.TransitionType int transitType) { + // Put animating stuff above this line and put static stuff below it. + final int zSplitLine = numChanges + 1; + final boolean isOpening = isOpeningType(transitType); + final boolean isClosing = isClosingType(transitType); + final int mode = change.getMode(); + // Put all the OPEN/SHOW on top + if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { + if (isOpening + // This is for when an activity launches while a different transition is + // collecting. + || change.hasFlags(FLAG_MOVED_TO_TOP)) { + // put on top + return zSplitLine + numChanges - i; + } else { + // put on bottom + return zSplitLine - i; + } + } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { + if (isOpening) { + // put on bottom and leave visible + return zSplitLine - i; + } else { + // put on top + return zSplitLine + numChanges - i; + } + } else { // CHANGE or other + if (isClosing || TransitionUtil.isOrderOnly(change)) { + // Put below CLOSE mode (in the "static" section). + return zSplitLine - i; + } else { + // Put above CLOSE mode. + return zSplitLine + numChanges - i; + } + } + } + /** * Reparents all participants into a shared parent and orders them based on: the global transit * type, their transit mode, and their destination z-order. @@ -537,19 +574,14 @@ public class Transitions implements RemoteCallable<Transitions>, private static void setupAnimHierarchy(@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction t, @NonNull SurfaceControl.Transaction finishT) { final int type = info.getType(); - final boolean isOpening = isOpeningType(type); - final boolean isClosing = isClosingType(type); for (int i = 0; i < info.getRootCount(); ++i) { t.show(info.getRoot(i).getLeash()); } final int numChanges = info.getChanges().size(); - // Put animating stuff above this line and put static stuff below it. - final int zSplitLine = numChanges + 1; // changes should be ordered top-to-bottom in z for (int i = numChanges - 1; i >= 0; --i) { final TransitionInfo.Change change = info.getChanges().get(i); final SurfaceControl leash = change.getLeash(); - final int mode = change.getMode(); // Don't reparent anything that isn't independent within its parents if (!TransitionInfo.isIndependent(change, info)) { @@ -558,50 +590,14 @@ public class Transitions implements RemoteCallable<Transitions>, boolean hasParent = change.getParent() != null; - final int rootIdx = TransitionUtil.rootIndexFor(change, info); + final TransitionInfo.Root root = TransitionUtil.getRootFor(change, info); if (!hasParent) { - t.reparent(leash, info.getRoot(rootIdx).getLeash()); + t.reparent(leash, root.getLeash()); t.setPosition(leash, - change.getStartAbsBounds().left - info.getRoot(rootIdx).getOffset().x, - change.getStartAbsBounds().top - info.getRoot(rootIdx).getOffset().y); - } - final int layer; - // Put all the OPEN/SHOW on top - if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) { - // Wallpaper is always at the bottom, opening wallpaper on top of closing one. - if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { - layer = -zSplitLine + numChanges - i; - } else { - layer = -zSplitLine - i; - } - } else if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { - if (isOpening - // This is for when an activity launches while a different transition is - // collecting. - || change.hasFlags(FLAG_MOVED_TO_TOP)) { - // put on top - layer = zSplitLine + numChanges - i; - } else { - // put on bottom - layer = zSplitLine - i; - } - } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { - if (isOpening) { - // put on bottom and leave visible - layer = zSplitLine - i; - } else { - // put on top - layer = zSplitLine + numChanges - i; - } - } else { // CHANGE or other - if (isClosing || TransitionUtil.isOrderOnly(change)) { - // Put below CLOSE mode (in the "static" section). - layer = zSplitLine - i; - } else { - // Put above CLOSE mode. - layer = zSplitLine + numChanges - i; - } + change.getStartAbsBounds().left - root.getOffset().x, + change.getStartAbsBounds().top - root.getOffset().y); } + final int layer = calculateAnimLayer(change, i, numChanges, type); t.setLayer(leash, layer); } } 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 6f8b3d5aaaad..76096b0c59f3 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 static android.view.WindowManager.TRANSIT_CHANGE; +import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.os.IBinder; @@ -178,10 +179,11 @@ class FluidResizeTaskPositioner implements DragPositioningCallback, for (TransitionInfo.Change change: info.getChanges()) { final SurfaceControl sc = change.getLeash(); final Rect endBounds = change.getEndAbsBounds(); + final Point endPosition = change.getEndRelOffset(); startTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) - .setPosition(sc, endBounds.left, endBounds.top); + .setPosition(sc, endPosition.x, endPosition.y); finishTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) - .setPosition(sc, endBounds.left, endBounds.top); + .setPosition(sc, endPosition.x, endPosition.y); } startTransaction.apply(); 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 c12a93edcaf3..5fce5d228d71 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 @@ -18,6 +18,7 @@ package com.android.wm.shell.windowdecor; import static android.view.WindowManager.TRANSIT_CHANGE; +import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.os.IBinder; @@ -179,10 +180,11 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, for (TransitionInfo.Change change: info.getChanges()) { final SurfaceControl sc = change.getLeash(); final Rect endBounds = change.getEndAbsBounds(); + final Point endPosition = change.getEndRelOffset(); startTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) - .setPosition(sc, endBounds.left, endBounds.top); + .setPosition(sc, endPosition.x, endPosition.y); finishTransaction.setWindowCrop(sc, endBounds.width(), endBounds.height()) - .setPosition(sc, endBounds.left, endBounds.top); + .setPosition(sc, endPosition.x, endPosition.y); } startTransaction.apply(); diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt index 1ccc7d8084a6..5f25d70acf7c 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt @@ -24,6 +24,7 @@ import android.tools.flicker.legacy.LegacyFlickerTest import android.tools.flicker.legacy.LegacyFlickerTestFactory import android.tools.helpers.WindowUtils import android.tools.traces.parsers.toFlickerComponent +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.helpers.SimpleAppHelper import com.android.server.wm.flicker.testapp.ActivityOptions @@ -181,6 +182,12 @@ class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : } } + /** {@inheritDoc} */ + @FlakyTest(bugId = 312446524) + @Test + override fun visibleLayersShownMoreThanOneConsecutiveEntry() = + super.visibleLayersShownMoreThanOneConsecutiveEntry() + companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index 9ded6ea1d187..703eb199f260 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -61,6 +61,7 @@ import androidx.annotation.Nullable; import androidx.test.filters.SmallTest; import com.android.internal.util.test.FakeSettingsProvider; +import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestShellExecutor; import com.android.wm.shell.sysui.ShellCommandHandler; @@ -113,6 +114,8 @@ public class BackAnimationControllerTest extends ShellTestCase { private InputManager mInputManager; @Mock private ShellCommandHandler mShellCommandHandler; + @Mock + private RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer; private BackAnimationController mController; private TestableContentResolver mContentResolver; @@ -133,7 +136,8 @@ public class BackAnimationControllerTest extends ShellTestCase { mShellInit = spy(new ShellInit(mShellExecutor)); mShellBackAnimationRegistry = new ShellBackAnimationRegistry( - new CrossActivityBackAnimation(mContext, mAnimationBackground), + new CrossActivityBackAnimation( + mContext, mAnimationBackground, mRootTaskDisplayAreaOrganizer), new CrossTaskBackAnimation(mContext, mAnimationBackground), /* dialogCloseAnimation= */ null, new CustomizeActivityAnimation(mContext, mAnimationBackground), @@ -528,8 +532,8 @@ public class BackAnimationControllerTest extends ShellTestCase { @Test public void testBackToActivity() throws RemoteException { - final CrossActivityBackAnimation animation = new CrossActivityBackAnimation(mContext, - mAnimationBackground); + final CrossActivityBackAnimation animation = new CrossActivityBackAnimation( + mContext, mAnimationBackground, mRootTaskDisplayAreaOrganizer); verifySystemBackBehavior(BackNavigationInfo.TYPE_CROSS_ACTIVITY, animation.getRunner()); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java index 41a4e8d503c9..d38e97f378c9 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java @@ -302,6 +302,54 @@ public class RecentTasksControllerTest extends ShellTestCase { } @Test + public void testGetRecentTasks_hasActiveDesktopTasks_proto2Enabled_freeformTaskOrder() { + StaticMockitoSession mockitoSession = mockitoSession().mockStatic( + DesktopModeStatus.class).startMocking(); + when(DesktopModeStatus.isEnabled()).thenReturn(true); + + ActivityManager.RecentTaskInfo t1 = makeTaskInfo(1); + ActivityManager.RecentTaskInfo t2 = makeTaskInfo(2); + ActivityManager.RecentTaskInfo t3 = makeTaskInfo(3); + ActivityManager.RecentTaskInfo t4 = makeTaskInfo(4); + ActivityManager.RecentTaskInfo t5 = makeTaskInfo(5); + setRawList(t1, t2, t3, t4, t5); + + SplitBounds pair1Bounds = + new SplitBounds(new Rect(), new Rect(), 1, 2, SNAP_TO_50_50); + mRecentTasksController.addSplitPair(t1.taskId, t2.taskId, pair1Bounds); + + when(mDesktopModeTaskRepository.isActiveTask(3)).thenReturn(true); + when(mDesktopModeTaskRepository.isActiveTask(5)).thenReturn(true); + + ArrayList<GroupedRecentTaskInfo> recentTasks = mRecentTasksController.getRecentTasks( + MAX_VALUE, RECENT_IGNORE_UNAVAILABLE, 0); + + // 2 split screen tasks grouped, 2 freeform tasks grouped, 3 total recents entries + assertEquals(3, recentTasks.size()); + GroupedRecentTaskInfo splitGroup = recentTasks.get(0); + GroupedRecentTaskInfo freeformGroup = recentTasks.get(1); + GroupedRecentTaskInfo singleGroup = recentTasks.get(2); + + // Check that groups have expected types + assertEquals(GroupedRecentTaskInfo.TYPE_SPLIT, splitGroup.getType()); + assertEquals(GroupedRecentTaskInfo.TYPE_FREEFORM, freeformGroup.getType()); + assertEquals(GroupedRecentTaskInfo.TYPE_SINGLE, singleGroup.getType()); + + // Check freeform group entries + assertEquals(t3, freeformGroup.getTaskInfoList().get(0)); + assertEquals(t5, freeformGroup.getTaskInfoList().get(1)); + + // Check split group entries + assertEquals(t1, splitGroup.getTaskInfoList().get(0)); + assertEquals(t2, splitGroup.getTaskInfoList().get(1)); + + // Check single entry + assertEquals(t4, singleGroup.getTaskInfo1()); + + mockitoSession.finishMocking(); + } + + @Test public void testGetRecentTasks_hasActiveDesktopTasks_proto2Disabled_doNotGroupFreeformTasks() { StaticMockitoSession mockitoSession = mockitoSession().mockStatic( DesktopModeStatus.class).startMocking(); 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 ce7b63322b4a..9174556d091b 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 @@ -2,6 +2,7 @@ package com.android.wm.shell.windowdecor import android.app.ActivityManager import android.app.WindowConfiguration +import android.graphics.Point import android.graphics.Rect import android.os.IBinder import android.testing.AndroidTestingRunner @@ -11,6 +12,7 @@ import android.view.Surface.ROTATION_270 import android.view.Surface.ROTATION_90 import android.view.SurfaceControl import android.view.WindowManager +import android.window.TransitionInfo import android.window.WindowContainerToken import android.window.WindowContainerTransaction import android.window.WindowContainerTransaction.Change.CHANGE_DRAG_RESIZING @@ -41,6 +43,8 @@ import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations import org.mockito.kotlin.doReturn import java.util.function.Supplier +import org.mockito.Mockito.eq +import org.mockito.Mockito.mock import org.mockito.Mockito.`when` as whenever /** @@ -575,6 +579,32 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { }) } + @Test + fun testStartAnimation_useEndRelOffset() { + val mockTransitionInfo = mock(TransitionInfo::class.java) + val changeMock = mock(TransitionInfo.Change::class.java) + val startTransaction = mock(SurfaceControl.Transaction::class.java) + val finishTransaction = mock(SurfaceControl.Transaction::class.java) + val point = Point(10, 20) + val bounds = Rect(1, 2, 3, 4) + `when`(changeMock.endRelOffset).thenReturn(point) + `when`(changeMock.endAbsBounds).thenReturn(bounds) + `when`(mockTransitionInfo.changes).thenReturn(listOf(changeMock)) + `when`(startTransaction.setWindowCrop(any(), + eq(bounds.width()), + eq(bounds.height()))).thenReturn(startTransaction) + `when`(finishTransaction.setWindowCrop(any(), + eq(bounds.width()), + eq(bounds.height()))).thenReturn(finishTransaction) + + taskPositioner.startAnimation(mockTransitionBinder, mockTransitionInfo, startTransaction, + finishTransaction, { _ -> }) + + verify(startTransaction).setPosition(any(), eq(point.x.toFloat()), eq(point.y.toFloat())) + verify(finishTransaction).setPosition(any(), eq(point.x.toFloat()), eq(point.y.toFloat())) + verify(changeMock).endRelOffset + } + private fun WindowContainerTransaction.Change.ofBounds(bounds: Rect): Boolean { return ((windowSetMask and WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0) && bounds == configuration.windowConfiguration.bounds 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 7f6e538f0bbf..a9f44929fc64 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 @@ -17,6 +17,7 @@ package com.android.wm.shell.windowdecor import android.app.ActivityManager import android.app.WindowConfiguration +import android.graphics.Point import android.graphics.Rect import android.os.IBinder import android.testing.AndroidTestingRunner @@ -25,6 +26,7 @@ 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.SurfaceControl.Transaction import android.view.WindowManager.TRANSIT_CHANGE import android.window.TransitionInfo import android.window.WindowContainerToken @@ -39,6 +41,7 @@ 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 +import java.util.function.Supplier import junit.framework.Assert import org.junit.Before import org.junit.Test @@ -47,13 +50,13 @@ import org.mockito.Mock import org.mockito.Mockito.any import org.mockito.Mockito.argThat import org.mockito.Mockito.eq +import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.`when` -import org.mockito.MockitoAnnotations -import java.util.function.Supplier import org.mockito.Mockito.`when` as whenever +import org.mockito.MockitoAnnotations /** * Tests for [VeiledResizeTaskPositioner]. @@ -439,6 +442,40 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() { Assert.assertFalse(taskPositioner.isResizingOrAnimating) } + @Test + fun testStartAnimation_useEndRelOffset() { + val changeMock = mock(TransitionInfo.Change::class.java) + val startTransaction = mock(Transaction::class.java) + val finishTransaction = mock(Transaction::class.java) + val point = Point(10, 20) + val bounds = Rect(1, 2, 3, 4) + `when`(changeMock.endRelOffset).thenReturn(point) + `when`(changeMock.endAbsBounds).thenReturn(bounds) + `when`(mockTransitionInfo.changes).thenReturn(listOf(changeMock)) + `when`(startTransaction.setWindowCrop( + any(), + eq(bounds.width()), + eq(bounds.height()) + )).thenReturn(startTransaction) + `when`(finishTransaction.setWindowCrop( + any(), + eq(bounds.width()), + eq(bounds.height()) + )).thenReturn(finishTransaction) + + taskPositioner.startAnimation( + mockTransitionBinder, + mockTransitionInfo, + startTransaction, + finishTransaction, + mockFinishCallback + ) + + verify(startTransaction).setPosition(any(), eq(point.x.toFloat()), eq(point.y.toFloat())) + verify(finishTransaction).setPosition(any(), eq(point.x.toFloat()), eq(point.y.toFloat())) + verify(changeMock).endRelOffset + } + private fun performDrag( startX: Float, startY: Float, diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 6f7024ae76b4..1fe3c2ecec29 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -5453,7 +5453,8 @@ public class AudioManager { String regId = service.registerAudioPolicy(policy.getConfig(), policy.cb(), policy.hasFocusListener(), policy.isFocusPolicy(), policy.isTestFocusPolicy(), policy.isVolumeController(), - projection == null ? null : projection.getProjection()); + projection == null ? null : projection.getProjection(), + policy.getAttributionSource()); if (regId == null) { return ERROR; } else { diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 447d3bbddceb..80e57193d0dc 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -789,7 +789,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, private @NonNull AudioRecord buildAudioPlaybackCaptureRecord() { AudioMix audioMix = mAudioPlaybackCaptureConfiguration.createAudioMix(mFormat); MediaProjection projection = mAudioPlaybackCaptureConfiguration.getMediaProjection(); - AudioPolicy audioPolicy = new AudioPolicy.Builder(/*context=*/ null) + AudioPolicy audioPolicy = new AudioPolicy.Builder(/*context=*/ mContext) .setMediaProjection(projection) .addMix(audioMix).build(); @@ -853,7 +853,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, .setFormat(mFormat) .setRouteFlags(AudioMix.ROUTE_FLAG_LOOP_BACK) .build(); - AudioPolicy audioPolicy = new AudioPolicy.Builder(null).addMix(audioMix).build(); + AudioPolicy audioPolicy = new AudioPolicy.Builder(mContext).addMix(audioMix).build(); if (AudioManager.registerAudioPolicyStatic(audioPolicy) != 0) { throw new UnsupportedOperationException("Error: could not register audio policy"); } diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 194da217a121..73deb17d0055 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -1353,7 +1353,8 @@ public class AudioTrack extends PlayerBase .setRouteFlags(AudioMix.ROUTE_FLAG_LOOP_BACK) .build(); AudioPolicy audioPolicy = - new AudioPolicy.Builder(/*context=*/ null).addMix(audioMix).build(); + new AudioPolicy.Builder(/*context=*/ mContext).addMix(audioMix).build(); + if (AudioManager.registerAudioPolicyStatic(audioPolicy) != 0) { throw new UnsupportedOperationException("Error: could not register audio policy"); } diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 98bd3caf3f7d..e612645fb4d7 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -18,6 +18,7 @@ package android.media; import android.bluetooth.BluetoothDevice; import android.content.ComponentName; +import android.content.AttributionSource; import android.media.AudioAttributes; import android.media.AudioDeviceAttributes; import android.media.AudioFormat; @@ -361,7 +362,8 @@ interface IAudioService { String registerAudioPolicy(in AudioPolicyConfig policyConfig, in IAudioPolicyCallback pcb, boolean hasFocusListener, boolean isFocusPolicy, boolean isTestFocusPolicy, - boolean isVolumeController, in IMediaProjection projection); + boolean isVolumeController, in IMediaProjection projection, + in AttributionSource attributionSource); oneway void unregisterAudioPolicyAsync(in IAudioPolicyCallback pcb); diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java index ab7c27f70e05..2d7db5e6ed94 100644 --- a/media/java/android/media/MediaCas.java +++ b/media/java/android/media/MediaCas.java @@ -35,6 +35,7 @@ import android.media.tv.tunerresourcemanager.TunerResourceManager; import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; +import android.os.IBinder; import android.os.IHwBinder; import android.os.Looper; import android.os.Message; @@ -43,7 +44,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceSpecificException; import android.util.Log; -import android.util.Singleton; import com.android.internal.util.FrameworkStatsLog; @@ -264,71 +264,107 @@ public final class MediaCas implements AutoCloseable { public static final int PLUGIN_STATUS_SESSION_NUMBER_CHANGED = android.hardware.cas.StatusEvent.PLUGIN_SESSION_NUMBER_CHANGED; - private static final Singleton<IMediaCasService> sService = - new Singleton<IMediaCasService>() { + private static IMediaCasService sService = null; + private static Object sAidlLock = new Object(); + + /** DeathListener for AIDL service */ + private static IBinder.DeathRecipient sDeathListener = + new IBinder.DeathRecipient() { @Override - protected IMediaCasService create() { - try { - Log.d(TAG, "Trying to get AIDL service"); - IMediaCasService serviceAidl = - IMediaCasService.Stub.asInterface( - ServiceManager.waitForDeclaredService( - IMediaCasService.DESCRIPTOR + "/default")); - if (serviceAidl != null) { - return serviceAidl; - } - } catch (Exception eAidl) { - Log.d(TAG, "Failed to get cas AIDL service"); + public void binderDied() { + synchronized (sAidlLock) { + Log.d(TAG, "The service is dead"); + sService.asBinder().unlinkToDeath(sDeathListener, 0); + sService = null; } - return null; } }; - private static final Singleton<android.hardware.cas.V1_0.IMediaCasService> sServiceHidl = - new Singleton<android.hardware.cas.V1_0.IMediaCasService>() { - @Override - protected android.hardware.cas.V1_0.IMediaCasService create() { - try { - Log.d(TAG, "Trying to get cas@1.2 service"); - android.hardware.cas.V1_2.IMediaCasService serviceV12 = - android.hardware.cas.V1_2.IMediaCasService.getService( - true /*wait*/); - if (serviceV12 != null) { - return serviceV12; - } - } catch (Exception eV1_2) { - Log.d(TAG, "Failed to get cas@1.2 service"); + static IMediaCasService getService() { + synchronized (sAidlLock) { + if (sService == null || !sService.asBinder().isBinderAlive()) { + try { + Log.d(TAG, "Trying to get AIDL service"); + sService = + IMediaCasService.Stub.asInterface( + ServiceManager.waitForDeclaredService( + IMediaCasService.DESCRIPTOR + "/default")); + if (sService != null) { + sService.asBinder().linkToDeath(sDeathListener, 0); } + } catch (Exception eAidl) { + Log.d(TAG, "Failed to get cas AIDL service"); + } + } + return sService; + } + } - try { - Log.d(TAG, "Trying to get cas@1.1 service"); - android.hardware.cas.V1_1.IMediaCasService serviceV11 = - android.hardware.cas.V1_1.IMediaCasService.getService( - true /*wait*/); - if (serviceV11 != null) { - return serviceV11; + private static android.hardware.cas.V1_0.IMediaCasService sServiceHidl = null; + private static Object sHidlLock = new Object(); + + /** Used to indicate the right end-point to handle the serviceDied method */ + private static final long MEDIA_CAS_HIDL_COOKIE = 394; + + /** DeathListener for HIDL service */ + private static IHwBinder.DeathRecipient sDeathListenerHidl = + new IHwBinder.DeathRecipient() { + @Override + public void serviceDied(long cookie) { + if (cookie == MEDIA_CAS_HIDL_COOKIE) { + synchronized (sHidlLock) { + sServiceHidl = null; } - } catch (Exception eV1_1) { - Log.d(TAG, "Failed to get cas@1.1 service"); } + } + }; - try { - Log.d(TAG, "Trying to get cas@1.0 service"); - return android.hardware.cas.V1_0.IMediaCasService.getService(true /*wait*/); - } catch (Exception eV1_0) { - Log.d(TAG, "Failed to get cas@1.0 service"); + static android.hardware.cas.V1_0.IMediaCasService getServiceHidl() { + synchronized (sHidlLock) { + if (sServiceHidl != null) { + return sServiceHidl; + } else { + try { + Log.d(TAG, "Trying to get cas@1.2 service"); + android.hardware.cas.V1_2.IMediaCasService serviceV12 = + android.hardware.cas.V1_2.IMediaCasService.getService(true /*wait*/); + if (serviceV12 != null) { + sServiceHidl = serviceV12; + sServiceHidl.linkToDeath(sDeathListenerHidl, MEDIA_CAS_HIDL_COOKIE); + return sServiceHidl; } - - return null; + } catch (Exception eV1_2) { + Log.d(TAG, "Failed to get cas@1.2 service"); } - }; - static IMediaCasService getService() { - return sService.get(); - } + try { + Log.d(TAG, "Trying to get cas@1.1 service"); + android.hardware.cas.V1_1.IMediaCasService serviceV11 = + android.hardware.cas.V1_1.IMediaCasService.getService(true /*wait*/); + if (serviceV11 != null) { + sServiceHidl = serviceV11; + sServiceHidl.linkToDeath(sDeathListenerHidl, MEDIA_CAS_HIDL_COOKIE); + return sServiceHidl; + } + } catch (Exception eV1_1) { + Log.d(TAG, "Failed to get cas@1.1 service"); + } - static android.hardware.cas.V1_0.IMediaCasService getServiceHidl() { - return sServiceHidl.get(); + try { + Log.d(TAG, "Trying to get cas@1.0 service"); + sServiceHidl = + android.hardware.cas.V1_0.IMediaCasService.getService(true /*wait*/); + if (sServiceHidl != null) { + sServiceHidl.linkToDeath(sDeathListenerHidl, MEDIA_CAS_HIDL_COOKIE); + } + return sServiceHidl; + } catch (Exception eV1_0) { + Log.d(TAG, "Failed to get cas@1.0 service"); + } + } + } + // Couldn't find an HIDL service, returning null. + return null; } private void validateInternalStates() { @@ -756,7 +792,7 @@ public final class MediaCas implements AutoCloseable { * @return Whether the specified CA system is supported on this device. */ public static boolean isSystemIdSupported(int CA_system_id) { - IMediaCasService service = sService.get(); + IMediaCasService service = getService(); if (service != null) { try { return service.isSystemIdSupported(CA_system_id); @@ -765,7 +801,7 @@ public final class MediaCas implements AutoCloseable { } } - android.hardware.cas.V1_0.IMediaCasService serviceHidl = sServiceHidl.get(); + android.hardware.cas.V1_0.IMediaCasService serviceHidl = getServiceHidl(); if (serviceHidl != null) { try { return serviceHidl.isSystemIdSupported(CA_system_id); @@ -781,7 +817,7 @@ public final class MediaCas implements AutoCloseable { * @return an array of descriptors for the available CA plugins. */ public static PluginDescriptor[] enumeratePlugins() { - IMediaCasService service = sService.get(); + IMediaCasService service = getService(); if (service != null) { try { AidlCasPluginDescriptor[] descriptors = service.enumeratePlugins(); @@ -794,10 +830,11 @@ public final class MediaCas implements AutoCloseable { } return results; } catch (RemoteException e) { + Log.e(TAG, "Some exception while enumerating plugins"); } } - android.hardware.cas.V1_0.IMediaCasService serviceHidl = sServiceHidl.get(); + android.hardware.cas.V1_0.IMediaCasService serviceHidl = getServiceHidl(); if (serviceHidl != null) { try { ArrayList<HidlCasPluginDescriptor> descriptors = serviceHidl.enumeratePlugins(); diff --git a/media/java/android/media/audiopolicy/AudioMix.java b/media/java/android/media/audiopolicy/AudioMix.java index a53a8ce79354..e4eaaa317b3d 100644 --- a/media/java/android/media/audiopolicy/AudioMix.java +++ b/media/java/android/media/audiopolicy/AudioMix.java @@ -24,6 +24,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.content.Context; import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioSystem; @@ -67,12 +68,19 @@ public class AudioMix implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mDeviceSystemType; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_* + // The (virtual) device ID that this AudioMix was registered for. This value is overwritten + // when registering this AudioMix with an AudioPolicy or attaching this AudioMix to an + // AudioPolicy to match the AudioPolicy attribution. Does not imply that it only modifies + // audio routing for this device ID. + private int mVirtualDeviceId; + /** * All parameters are guaranteed valid through the Builder. */ private AudioMix(@NonNull AudioMixingRule rule, @NonNull AudioFormat format, int routeFlags, int callbackFlags, - int deviceType, @Nullable String deviceAddress, IBinder token) { + int deviceType, @Nullable String deviceAddress, IBinder token, + int virtualDeviceId) { mRule = Objects.requireNonNull(rule); mFormat = Objects.requireNonNull(format); mRouteFlags = routeFlags; @@ -81,6 +89,7 @@ public class AudioMix implements Parcelable { mDeviceSystemType = deviceType; mDeviceAddress = (deviceAddress == null) ? new String("") : deviceAddress; mToken = token; + mVirtualDeviceId = virtualDeviceId; } // CALLBACK_FLAG_* values: keep in sync with AudioMix::kCbFlag* values defined @@ -269,6 +278,11 @@ public class AudioMix implements Parcelable { } /** @hide */ + public boolean matchesVirtualDeviceId(int deviceId) { + return mVirtualDeviceId == deviceId; + } + + /** @hide */ @Override public boolean equals(Object o) { if (this == o) return true; @@ -311,6 +325,7 @@ public class AudioMix implements Parcelable { mFormat.writeToParcel(dest, flags); mRule.writeToParcel(dest, flags); dest.writeStrongBinder(mToken); + dest.writeInt(mVirtualDeviceId); } public static final @NonNull Parcelable.Creator<AudioMix> CREATOR = new Parcelable.Creator<>() { @@ -331,6 +346,7 @@ public class AudioMix implements Parcelable { mixBuilder.setFormat(AudioFormat.CREATOR.createFromParcel(p)); mixBuilder.setMixingRule(AudioMixingRule.CREATOR.createFromParcel(p)); mixBuilder.setToken(p.readStrongBinder()); + mixBuilder.setVirtualDeviceId(p.readInt()); return mixBuilder.build(); } @@ -339,6 +355,15 @@ public class AudioMix implements Parcelable { } }; + /** + * Updates the deviceId of the AudioMix to match with the AudioPolicy the mix is registered + * through. + * @hide + */ + public void setVirtualDeviceId(int virtualDeviceId) { + mVirtualDeviceId = virtualDeviceId; + } + /** @hide */ @IntDef(flag = true, value = { ROUTE_FLAG_RENDER, ROUTE_FLAG_LOOP_BACK } ) @@ -354,6 +379,7 @@ public class AudioMix implements Parcelable { private int mRouteFlags = 0; private int mCallbackFlags = 0; private IBinder mToken = null; + private int mVirtualDeviceId = Context.DEVICE_ID_DEFAULT; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_* private int mDeviceSystemType = AudioSystem.DEVICE_NONE; private String mDeviceAddress = null; @@ -404,6 +430,15 @@ public class AudioMix implements Parcelable { /** * @hide + * Only used by AudioMix internally. + */ + Builder setVirtualDeviceId(int virtualDeviceId) { + mVirtualDeviceId = virtualDeviceId; + return this; + } + + /** + * @hide * Only used by AudioPolicyConfig, not a public API. * @param callbackFlags which callbacks are called from native * @return the same Builder instance. @@ -570,7 +605,7 @@ public class AudioMix implements Parcelable { } return new AudioMix(mRule, mFormat, mRouteFlags, mCallbackFlags, mDeviceSystemType, - mDeviceAddress, mToken); + mDeviceAddress, mToken, mVirtualDeviceId); } private int getLoopbackDeviceSystemTypeForAudioMixingRule(AudioMixingRule rule) { diff --git a/media/java/android/media/audiopolicy/AudioPolicy.java b/media/java/android/media/audiopolicy/AudioPolicy.java index 508c0a2b9a21..293a8f89fbca 100644 --- a/media/java/android/media/audiopolicy/AudioPolicy.java +++ b/media/java/android/media/audiopolicy/AudioPolicy.java @@ -27,6 +27,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UserIdInt; import android.app.ActivityManager; +import android.content.AttributionSource; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioAttributes; @@ -146,6 +147,16 @@ public class AudioPolicy { return mProjection; } + /** @hide */ + public AttributionSource getAttributionSource() { + return getAttributionSource(mContext); + } + + private static AttributionSource getAttributionSource(Context context) { + return context == null + ? AttributionSource.myAttributionSource() : context.getAttributionSource(); + } + /** * The parameters are guaranteed non-null through the Builder */ @@ -208,6 +219,9 @@ public class AudioPolicy { if (mix == null) { throw new IllegalArgumentException("Illegal null AudioMix argument"); } + if (android.permission.flags.Flags.deviceAwarePermissionApisEnabled()) { + mix.setVirtualDeviceId(getAttributionSource(mContext).getDeviceId()); + } mMixes.add(mix); return this; } @@ -358,6 +372,9 @@ public class AudioPolicy { if (mix == null) { throw new IllegalArgumentException("Illegal null AudioMix in attachMixes"); } else { + if (android.permission.flags.Flags.deviceAwarePermissionApisEnabled()) { + mix.setVirtualDeviceId(getAttributionSource(mContext).getDeviceId()); + } zeMixes.add(mix); } } @@ -400,6 +417,9 @@ public class AudioPolicy { if (mix == null) { throw new IllegalArgumentException("Illegal null AudioMix in detachMixes"); } else { + if (android.permission.flags.Flags.deviceAwarePermissionApisEnabled()) { + mix.setVirtualDeviceId(getAttributionSource(mContext).getDeviceId()); + } zeMixes.add(mix); } } diff --git a/native/android/surface_control_input_receiver.cpp b/native/android/surface_control_input_receiver.cpp index 0b930d88bf6b..a84ec7309a62 100644 --- a/native/android/surface_control_input_receiver.cpp +++ b/native/android/surface_control_input_receiver.cpp @@ -45,6 +45,8 @@ public: mClientToken(clientToken), mInputTransferToken(inputTransferToken) {} + // The InputConsumer does not keep the InputReceiver alive so the receiver is cleared once the + // owner releases it. ~InputReceiver() { remove(); } diff --git a/nfc/api/current.txt b/nfc/api/current.txt index da292a818396..80b2be2567a7 100644 --- a/nfc/api/current.txt +++ b/nfc/api/current.txt @@ -268,10 +268,9 @@ package android.nfc.cardemulation { } @FlaggedApi("android.nfc.nfc_read_polling_loop") public final class PollingFrame implements android.os.Parcelable { - ctor public PollingFrame(int, @Nullable byte[], int, int, boolean); method public int describeContents(); method @NonNull public byte[] getData(); - method public int getTimestamp(); + method public long getTimestamp(); method public boolean getTriggeredAutoTransact(); method public int getType(); method public int getVendorSpecificGain(); diff --git a/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java index be3c24806c5b..a353df743520 100644 --- a/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -723,6 +723,7 @@ public final class ApduServiceInfo implements Parcelable { * delivered to {@link HostApduService#processPollingFrames(List)}. Adding a key with this * multiple times will cause the value to be overwritten each time. * @param pollingLoopFilter the polling loop filter to add, must be a valid hexadecimal string + * @param autoTransact whether Observe Mode should be disabled when this filter matches or not */ @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP) public void addPollingLoopFilter(@NonNull String pollingLoopFilter, @@ -747,6 +748,7 @@ public final class ApduServiceInfo implements Parcelable { * multiple times will cause the value to be overwritten each time. * @param pollingLoopPatternFilter the polling loop pattern filter to add, must be a valid * regex to match a hexadecimal string + * @param autoTransact whether Observe Mode should be disabled when this filter matches or not */ @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP) public void addPollingLoopPatternFilter(@NonNull String pollingLoopPatternFilter, diff --git a/nfc/java/android/nfc/cardemulation/PollingFrame.java b/nfc/java/android/nfc/cardemulation/PollingFrame.java index af63a6e4350b..654e8cc574ba 100644 --- a/nfc/java/android/nfc/cardemulation/PollingFrame.java +++ b/nfc/java/android/nfc/cardemulation/PollingFrame.java @@ -16,6 +16,7 @@ package android.nfc.cardemulation; +import android.annotation.DurationMillisLong; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; @@ -148,7 +149,8 @@ public final class PollingFrame implements Parcelable{ private final int mType; private final byte[] mData; private final int mGain; - private final int mTimestamp; + @DurationMillisLong + private final long mTimestamp; private final boolean mTriggeredAutoTransact; public static final @NonNull Parcelable.Creator<PollingFrame> CREATOR = @@ -180,16 +182,18 @@ public final class PollingFrame implements Parcelable{ * @param type the type of the frame * @param data a byte array of the data contained in the frame * @param gain the vendor-specific gain of the field - * @param timestamp the timestamp in millisecones + * @param timestampMillis the timestamp in millisecones * @param triggeredAutoTransact whether or not this frame triggered the device to start a * transaction automatically + * + * @hide */ public PollingFrame(@PollingFrameType int type, @Nullable byte[] data, - int gain, int timestamp, boolean triggeredAutoTransact) { + int gain, @DurationMillisLong long timestampMillis, boolean triggeredAutoTransact) { mType = type; mData = data == null ? new byte[0] : data; mGain = gain; - mTimestamp = timestamp; + mTimestamp = timestampMillis; mTriggeredAutoTransact = triggeredAutoTransact; } @@ -230,7 +234,7 @@ public final class PollingFrame implements Parcelable{ * frames relative to each other. * @return the timestamp in milliseconds */ - public int getTimestamp() { + public @DurationMillisLong long getTimestamp() { return mTimestamp; } @@ -264,7 +268,7 @@ public final class PollingFrame implements Parcelable{ frame.putInt(KEY_POLLING_LOOP_GAIN, (byte) getVendorSpecificGain()); } frame.putByteArray(KEY_POLLING_LOOP_DATA, getData()); - frame.putInt(KEY_POLLING_LOOP_TIMESTAMP, getTimestamp()); + frame.putLong(KEY_POLLING_LOOP_TIMESTAMP, getTimestamp()); frame.putBoolean(KEY_POLLING_LOOP_TRIGGERED_AUTOTRANSACT, getTriggeredAutoTransact()); return frame; } @@ -273,7 +277,7 @@ public final class PollingFrame implements Parcelable{ public String toString() { return "PollingFrame { Type: " + (char) getType() + ", gain: " + getVendorSpecificGain() - + ", timestamp: " + Integer.toUnsignedString(getTimestamp()) + + ", timestamp: " + Long.toUnsignedString(getTimestamp()) + ", data: [" + HexFormat.ofDelimiter(" ").formatHex(getData()) + "] }"; } } diff --git a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml index 7f09dd5d07cc..914987ac4650 100644 --- a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml +++ b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml @@ -33,10 +33,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:paddingLeft="@dimen/autofill_view_left_padding" + android:paddingStart="@dimen/autofill_view_left_padding" android:src="@drawable/more_horiz_24px" android:tint="?androidprv:attr/materialColorOnSurface" - android:layout_alignParentStart="true" android:contentDescription="@string/more_options_content_description" android:background="@null"/> @@ -44,8 +43,8 @@ android:id="@+id/text_container" android:layout_width="@dimen/autofill_dropdown_textview_max_width" android:layout_height="wrap_content" - android:paddingLeft="@dimen/autofill_view_left_padding" - android:paddingRight="@dimen/autofill_view_right_padding" + android:paddingStart="@dimen/autofill_view_left_padding" + android:paddingEnd="@dimen/autofill_view_right_padding" android:paddingTop="@dimen/more_options_item_vertical_padding" android:paddingBottom="@dimen/more_options_item_vertical_padding" android:orientation="vertical"> @@ -54,9 +53,7 @@ android:id="@android:id/text1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" android:textColor="?androidprv:attr/materialColorOnSurface" - android:layout_toEndOf="@android:id/icon1" style="@style/autofill.TextTitle"/> </LinearLayout> diff --git a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml index 08948d793488..e998fe8fc8d9 100644 --- a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml +++ b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml @@ -42,8 +42,8 @@ android:id="@+id/text_container" android:layout_width="@dimen/autofill_dropdown_textview_max_width" android:layout_height="wrap_content" - android:paddingLeft="@dimen/autofill_view_left_padding" - android:paddingRight="@dimen/autofill_view_right_padding" + android:paddingStart="@dimen/autofill_view_left_padding" + android:paddingEnd="@dimen/autofill_view_right_padding" android:paddingTop="@dimen/autofill_view_top_padding" android:paddingBottom="@dimen/autofill_view_bottom_padding" android:orientation="vertical"> @@ -52,8 +52,6 @@ android:id="@android:id/text1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_toEndOf="@android:id/icon1" android:textColor="?androidprv:attr/materialColorOnSurface" style="@style/autofill.TextTitle"/> @@ -61,8 +59,6 @@ android:id="@android:id/text2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@android:id/text1" - android:layout_toEndOf="@android:id/icon1" android:textColor="?androidprv:attr/materialColorOnSurfaceVariant" style="@style/autofill.TextSubtitle"/> diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java index 215ead367148..167d50614783 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java @@ -108,18 +108,19 @@ public class InstallSuccess extends Activity { mDialog = builder.create(); mDialog.show(); mDialog.requireViewById(R.id.install_success).setVisibility(View.VISIBLE); - // Enable or disable "launch" button - boolean enabled = false; + // Show or hide "launch" button + boolean visible = false; if (mLaunchIntent != null) { List<ResolveInfo> list = getPackageManager().queryIntentActivities(mLaunchIntent, 0); if (list != null && list.size() > 0) { - enabled = true; + visible = true; } } + visible = visible && isLauncherActivityEnabled(mLaunchIntent); Button launchButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); - if (enabled) { + if (visible) { launchButton.setOnClickListener(view -> { try { startActivity(mLaunchIntent.addFlags( @@ -130,7 +131,15 @@ public class InstallSuccess extends Activity { finish(); }); } else { - launchButton.setEnabled(false); + launchButton.setVisibility(View.GONE); } } + + private boolean isLauncherActivityEnabled(Intent intent) { + if (intent == null || intent.getComponent() == null) { + return false; + } + return getPackageManager().getComponentEnabledSetting(intent.getComponent()) + != PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + } } diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt index aeabbd53d177..e48c0f42e62e 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt +++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt @@ -30,6 +30,7 @@ import android.content.pm.PackageInstaller import android.content.pm.PackageInstaller.SessionInfo import android.content.pm.PackageInstaller.SessionParams import android.content.pm.PackageManager +import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED import android.net.Uri import android.os.ParcelFileDescriptor import android.os.Process @@ -95,6 +96,7 @@ class InstallRepository(private val context: Context) { var stagedSessionId = SessionInfo.INVALID_ID private set private var callingUid = Process.INVALID_UID + private var originatingUid = Process.INVALID_UID private var callingPackage: String? = null private var sessionStager: SessionStager? = null private lateinit var intent: Intent @@ -147,7 +149,7 @@ class InstallRepository(private val context: Context) { } val sourceInfo: ApplicationInfo? = getSourceInfo(callingPackage) // Uid of the source package, with a preference to uid from ApplicationInfo - val originatingUid = sourceInfo?.uid ?: callingUid + originatingUid = sourceInfo?.uid ?: callingUid appOpRequestInfo = AppOpRequestInfo( getPackageNameForUid(context, originatingUid, callingPackage), originatingUid, callingAttributionTag @@ -281,7 +283,7 @@ class InstallRepository(private val context: Context) { context.contentResolver.openAssetFileDescriptor(uri, "r").use { afd -> val pfd: ParcelFileDescriptor? = afd?.parcelFileDescriptor val params: SessionParams = - createSessionParams(intent, pfd, uri.toString()) + createSessionParams(originatingUid, intent, pfd, uri.toString()) stagedSessionId = packageInstaller.createSession(params) } } catch (e: Exception) { @@ -337,6 +339,7 @@ class InstallRepository(private val context: Context) { } private fun createSessionParams( + originatingUid: Int, intent: Intent, pfd: ParcelFileDescriptor?, debugPathName: String, @@ -353,9 +356,7 @@ class InstallRepository(private val context: Context) { params.setOriginatingUri( intent.getParcelableExtra(Intent.EXTRA_ORIGINATING_URI, Uri::class.java) ) - params.setOriginatingUid( - intent.getIntExtra(Intent.EXTRA_ORIGINATING_UID, Process.INVALID_UID) - ) + params.setOriginatingUid(originatingUid) params.setInstallerPackageName(intent.getStringExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME)) params.setInstallReason(PackageManager.INSTALL_REASON_USER) // Disable full screen intent usage by for sideloads. @@ -830,7 +831,8 @@ class InstallRepository(private val context: Context) { val resultIntent = if (shouldReturnResult) { Intent().putExtra(Intent.EXTRA_INSTALL_RESULT, PackageManager.INSTALL_SUCCEEDED) } else { - packageManager.getLaunchIntentForPackage(newPackageInfo!!.packageName) + val intent = packageManager.getLaunchIntentForPackage(newPackageInfo!!.packageName) + if (isLauncherActivityEnabled(intent)) intent else null } _installResult.setValue(InstallSuccess(appSnippet, shouldReturnResult, resultIntent)) } else { @@ -838,6 +840,14 @@ class InstallRepository(private val context: Context) { } } + private fun isLauncherActivityEnabled(intent: Intent?): Boolean { + if (intent == null || intent.component == null) { + return false + } + return (intent.component?.let { packageManager.getComponentEnabledSetting(it) } + != COMPONENT_ENABLED_STATE_DISABLED) + } + /** * Cleanup the staged session. Also signal the packageinstaller that an install session is to * be aborted diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallSuccessFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallSuccessFragment.java index b2a65faa0a91..e491f9c87313 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallSuccessFragment.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallSuccessFragment.java @@ -23,13 +23,13 @@ import android.content.DialogInterface; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import com.android.packageinstaller.R; -import com.android.packageinstaller.v2.model.InstallStage; import com.android.packageinstaller.v2.model.InstallSuccess; import com.android.packageinstaller.v2.ui.InstallActionListener; import java.util.List; @@ -40,6 +40,7 @@ import java.util.List; */ public class InstallSuccessFragment extends DialogFragment { + private static final String LOG_TAG = InstallSuccessFragment.class.getSimpleName(); private final InstallSuccess mDialogData; private AlertDialog mDialog; private InstallActionListener mInstallActionListener; @@ -60,12 +61,15 @@ public class InstallSuccessFragment extends DialogFragment { @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { View dialogView = getLayoutInflater().inflate(R.layout.install_content_view, null); - mDialog = new AlertDialog.Builder(requireContext()).setTitle(mDialogData.getAppLabel()) - .setIcon(mDialogData.getAppIcon()).setView(dialogView).setNegativeButton(R.string.done, + mDialog = new AlertDialog.Builder(requireContext()) + .setTitle(mDialogData.getAppLabel()) + .setIcon(mDialogData.getAppIcon()) + .setView(dialogView) + .setNegativeButton(R.string.done, (dialog, which) -> mInstallActionListener.onNegativeResponse( - InstallStage.STAGE_SUCCESS)) - .setPositiveButton(R.string.launch, (dialog, which) -> { - }).create(); + mDialogData.getStageCode())) + .setPositiveButton(R.string.launch, (dialog, which) -> {}) + .create(); dialogView.requireViewById(R.id.install_success).setVisibility(View.VISIBLE); @@ -76,25 +80,28 @@ public class InstallSuccessFragment extends DialogFragment { public void onStart() { super.onStart(); Button launchButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); - boolean enabled = false; + boolean visible = false; if (mDialogData.getResultIntent() != null) { List<ResolveInfo> list = mPm.queryIntentActivities(mDialogData.getResultIntent(), 0); if (list.size() > 0) { - enabled = true; + visible = true; } } - if (enabled) { + if (visible) { launchButton.setOnClickListener(view -> { + Log.i(LOG_TAG, "Finished installing and launching " + + mDialogData.getAppLabel()); mInstallActionListener.openInstalledApp(mDialogData.getResultIntent()); }); } else { - launchButton.setEnabled(false); + launchButton.setVisibility(View.GONE); } } @Override public void onCancel(@NonNull DialogInterface dialog) { super.onCancel(dialog); + Log.i(LOG_TAG, "Finished installing " + mDialogData.getAppLabel()); mInstallActionListener.onNegativeResponse(mDialogData.getStageCode()); } } diff --git a/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt b/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt new file mode 100644 index 000000000000..b52586c2d8d9 --- /dev/null +++ b/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/KeyedObserverTest.kt @@ -0,0 +1,215 @@ +/* + * Copyright (C) 2024 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.settingslib.datastore + +import com.google.common.truth.Truth.assertThat +import com.google.common.util.concurrent.MoreExecutors.directExecutor +import java.util.concurrent.Executor +import java.util.concurrent.atomic.AtomicInteger +import org.junit.Assert +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.any +import org.mockito.kotlin.never +import org.mockito.kotlin.reset +import org.mockito.kotlin.verify +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class KeyedObserverTest { + @get:Rule + val mockitoRule: MockitoRule = MockitoJUnit.rule() + + @Mock + private lateinit var observer1: KeyedObserver<Any?> + + @Mock + private lateinit var observer2: KeyedObserver<Any?> + + @Mock + private lateinit var keyedObserver1: KeyedObserver<Any> + + @Mock + private lateinit var keyedObserver2: KeyedObserver<Any> + + @Mock + private lateinit var key1: Any + + @Mock + private lateinit var key2: Any + + @Mock + private lateinit var executor: Executor + + private val keyedObservable = KeyedDataObservable<Any>() + + @Test + fun addObserver_sameExecutor() { + keyedObservable.addObserver(observer1, executor) + keyedObservable.addObserver(observer1, executor) + } + + @Test + fun addObserver_keyedObserver_sameExecutor() { + keyedObservable.addObserver(key1, keyedObserver1, executor) + keyedObservable.addObserver(key1, keyedObserver1, executor) + } + + @Test + fun addObserver_differentExecutor() { + keyedObservable.addObserver(observer1, executor) + Assert.assertThrows(IllegalStateException::class.java) { + keyedObservable.addObserver(observer1, directExecutor()) + } + } + + @Test + fun addObserver_keyedObserver_differentExecutor() { + keyedObservable.addObserver(key1, keyedObserver1, executor) + Assert.assertThrows(IllegalStateException::class.java) { + keyedObservable.addObserver(key1, keyedObserver1, directExecutor()) + } + } + + @Test + fun addObserver_weaklyReferenced() { + val counter = AtomicInteger() + var observer: KeyedObserver<Any?>? = KeyedObserver { _, _ -> counter.incrementAndGet() } + keyedObservable.addObserver(observer!!, directExecutor()) + + keyedObservable.notifyChange(ChangeReason.UPDATE) + assertThat(counter.get()).isEqualTo(1) + + // trigger GC, the observer callback should not be invoked + null.also { observer = it } + System.gc() + System.runFinalization() + + keyedObservable.notifyChange(ChangeReason.UPDATE) + assertThat(counter.get()).isEqualTo(1) + } + + @Test + fun addObserver_keyedObserver_weaklyReferenced() { + val counter = AtomicInteger() + var keyObserver: KeyedObserver<Any>? = KeyedObserver { _, _ -> counter.incrementAndGet() } + keyedObservable.addObserver(key1, keyObserver!!, directExecutor()) + + keyedObservable.notifyChange(key1, ChangeReason.UPDATE) + assertThat(counter.get()).isEqualTo(1) + + // trigger GC, the observer callback should not be invoked + null.also { keyObserver = it } + System.gc() + System.runFinalization() + + keyedObservable.notifyChange(key1, ChangeReason.UPDATE) + assertThat(counter.get()).isEqualTo(1) + } + + @Test + fun addObserver_notifyObservers_removeObserver() { + keyedObservable.addObserver(observer1, directExecutor()) + keyedObservable.addObserver(observer2, executor) + + keyedObservable.notifyChange(ChangeReason.UPDATE) + verify(observer1).onKeyChanged(null, ChangeReason.UPDATE) + verify(observer2, never()).onKeyChanged(any(), any()) + verify(executor).execute(any()) + + reset(observer1, executor) + keyedObservable.removeObserver(observer2) + + keyedObservable.notifyChange(ChangeReason.DELETE) + verify(observer1).onKeyChanged(null, ChangeReason.DELETE) + verify(executor, never()).execute(any()) + } + + @Test + fun addObserver_keyedObserver_notifyObservers_removeObserver() { + keyedObservable.addObserver(key1, keyedObserver1, directExecutor()) + keyedObservable.addObserver(key2, keyedObserver2, executor) + + keyedObservable.notifyChange(key1, ChangeReason.UPDATE) + verify(keyedObserver1).onKeyChanged(key1, ChangeReason.UPDATE) + verify(keyedObserver2, never()).onKeyChanged(any(), any()) + verify(executor, never()).execute(any()) + + reset(keyedObserver1, executor) + keyedObservable.removeObserver(key2, keyedObserver2) + + keyedObservable.notifyChange(key1, ChangeReason.DELETE) + verify(keyedObserver1).onKeyChanged(key1, ChangeReason.DELETE) + verify(executor, never()).execute(any()) + } + + @Test + fun notifyChange_addMoreTypeObservers_checkOnKeyChanged() { + keyedObservable.addObserver(observer1, directExecutor()) + keyedObservable.addObserver(key1, keyedObserver1, directExecutor()) + keyedObservable.addObserver(key2, keyedObserver2, directExecutor()) + + keyedObservable.notifyChange(ChangeReason.UPDATE) + verify(observer1).onKeyChanged(null, ChangeReason.UPDATE) + verify(keyedObserver1).onKeyChanged(key1, ChangeReason.UPDATE) + verify(keyedObserver2).onKeyChanged(key2, ChangeReason.UPDATE) + + reset(observer1, keyedObserver1, keyedObserver2) + keyedObservable.notifyChange(key1, ChangeReason.UPDATE) + + verify(observer1).onKeyChanged(key1, ChangeReason.UPDATE) + verify(keyedObserver1).onKeyChanged(key1, ChangeReason.UPDATE) + verify(keyedObserver2, never()).onKeyChanged(key1, ChangeReason.UPDATE) + + reset(observer1, keyedObserver1, keyedObserver2) + keyedObservable.notifyChange(key2, ChangeReason.UPDATE) + + verify(observer1).onKeyChanged(key2, ChangeReason.UPDATE) + verify(keyedObserver1, never()).onKeyChanged(key2, ChangeReason.UPDATE) + verify(keyedObserver2).onKeyChanged(key2, ChangeReason.UPDATE) + } + + @Test + fun notifyChange_addObserverWithinCallback() { + // ConcurrentModificationException is raised if it is not implemented correctly + val observer: KeyedObserver<Any?> = KeyedObserver { _, _ -> + keyedObservable.addObserver(observer1, executor) + } + + keyedObservable.addObserver(observer, directExecutor()) + + keyedObservable.notifyChange(ChangeReason.UPDATE) + keyedObservable.removeObserver(observer) + } + + @Test + fun notifyChange_KeyedObserver_addObserverWithinCallback() { + // ConcurrentModificationException is raised if it is not implemented correctly + val keyObserver: KeyedObserver<Any?> = KeyedObserver { _, _ -> + keyedObservable.addObserver(key1, keyedObserver1, executor) + } + + keyedObservable.addObserver(key1, keyObserver, directExecutor()) + + keyedObservable.notifyChange(key1, ChangeReason.UPDATE) + keyedObservable.removeObserver(key1, keyObserver) + } +}
\ No newline at end of file diff --git a/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt b/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt index bb791dc9a23c..f0658290beb0 100644 --- a/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt +++ b/packages/SettingsLib/DataStore/tests/src/com/android/settingslib/datastore/ObserverTest.kt @@ -69,8 +69,7 @@ class ObserverTest { assertThat(counter.get()).isEqualTo(1) // trigger GC, the observer callback should not be invoked - @Suppress("unused") - observer = null + null.also { observer = it } System.gc() System.runFinalization() @@ -100,10 +99,12 @@ class ObserverTest { @Test fun notifyChange_addObserverWithinCallback() { // ConcurrentModificationException is raised if it is not implemented correctly + val observer = Observer { observable.addObserver(observer1, executor) } observable.addObserver( - { observable.addObserver(observer1, executor) }, + observer, MoreExecutors.directExecutor() ) observable.notifyChange(ChangeReason.UPDATE) + observable.removeObserver(observer) } } diff --git a/packages/SettingsLib/ProfileSelector/Android.bp b/packages/SettingsLib/ProfileSelector/Android.bp index 6dc07b29a510..4aa67c17ad98 100644 --- a/packages/SettingsLib/ProfileSelector/Android.bp +++ b/packages/SettingsLib/ProfileSelector/Android.bp @@ -20,6 +20,7 @@ android_library { static_libs: [ "com.google.android.material_material", "SettingsLibSettingsTheme", + "android.os.flags-aconfig-java-export", ], sdk_version: "system_current", diff --git a/packages/SettingsLib/ProfileSelector/AndroidManifest.xml b/packages/SettingsLib/ProfileSelector/AndroidManifest.xml index 80f6b7683269..303e20c2497e 100644 --- a/packages/SettingsLib/ProfileSelector/AndroidManifest.xml +++ b/packages/SettingsLib/ProfileSelector/AndroidManifest.xml @@ -18,5 +18,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib.widget.profileselector"> - <uses-sdk android:minSdkVersion="23" /> + <uses-sdk android:minSdkVersion="29" /> </manifest> diff --git a/packages/SettingsLib/ProfileSelector/res/values/strings.xml b/packages/SettingsLib/ProfileSelector/res/values/strings.xml index 68d4047a497c..76ccb651969b 100644 --- a/packages/SettingsLib/ProfileSelector/res/values/strings.xml +++ b/packages/SettingsLib/ProfileSelector/res/values/strings.xml @@ -21,4 +21,6 @@ <string name="settingslib_category_personal">Personal</string> <!-- Header for items under the work user [CHAR LIMIT=30] --> <string name="settingslib_category_work">Work</string> + <!-- Header for items under the private profile user [CHAR LIMIT=30] --> + <string name="settingslib_category_private">Private</string> </resources>
\ No newline at end of file diff --git a/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileSelectFragment.java b/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileSelectFragment.java index be5753beea4e..c52386bef07b 100644 --- a/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileSelectFragment.java +++ b/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileSelectFragment.java @@ -16,31 +16,77 @@ package com.android.settingslib.widget; +import android.annotation.TargetApi; import android.app.Activity; +import android.content.Context; +import android.content.pm.UserProperties; +import android.os.Build; import android.os.Bundle; +import android.os.UserHandle; +import android.os.UserManager; +import android.util.ArrayMap; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.core.os.BuildCompat; import androidx.fragment.app.Fragment; import androidx.viewpager2.widget.ViewPager2; +import com.android.settingslib.widget.profileselector.R; + import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.android.settingslib.widget.profileselector.R; + +import java.util.ArrayList; +import java.util.List; /** * Base fragment class for profile settings. */ public abstract class ProfileSelectFragment extends Fragment { + private static final String TAG = "ProfileSelectFragment"; + // UserHandle#USER_NULL is a @TestApi so is not accessible. + private static final int USER_NULL = -10000; + private static final int DEFAULT_POSITION = 0; + + /** + * The type of profile tab of {@link ProfileSelectFragment} to show + * <ul> + * <li>0: Personal tab. + * <li>1: Work profile tab. + * </ul> + * + * <p> Please note that this is supported for legacy reasons. Please use + * {@link #EXTRA_SHOW_FRAGMENT_USER_ID} instead. + */ + public static final String EXTRA_SHOW_FRAGMENT_TAB = ":settings:show_fragment_tab"; + + /** + * An {@link ArrayList} of users to show. The supported users are: System user, the managed + * profile user, and the private profile user. A client should pass all the user ids that need + * to be shown in this list. Note that if this list is not provided then, for legacy reasons + * see {@link #EXTRA_SHOW_FRAGMENT_TAB}, an attempt will be made to show two tabs: one for the + * System user and one for the managed profile user. + * + * <p>Please note that this MUST be used in conjunction with + * {@link #EXTRA_SHOW_FRAGMENT_USER_ID} + */ + public static final String EXTRA_LIST_OF_USER_IDS = ":settings:list_user_ids"; /** - * Personal or Work profile tab of {@link ProfileSelectFragment} - * <p>0: Personal tab. - * <p>1: Work profile tab. + * The user id of the user to be show in {@link ProfileSelectFragment}. Only the below user + * types are supported: + * <ul> + * <li> System user. + * <li> Managed profile user. + * <li> Private profile user. + * </ul> + * + * <p>Please note that this MUST be used in conjunction with {@link #EXTRA_LIST_OF_USER_IDS}. */ - public static final String EXTRA_SHOW_FRAGMENT_TAB = - ":settings:show_fragment_tab"; + public static final String EXTRA_SHOW_FRAGMENT_USER_ID = ":settings:show_fragment_user_id"; /** * Used in fragment argument with Extra key EXTRA_SHOW_FRAGMENT_TAB @@ -48,13 +94,23 @@ public abstract class ProfileSelectFragment extends Fragment { public static final int PERSONAL_TAB = 0; /** - * Used in fragment argument with Extra key EXTRA_SHOW_FRAGMENT_TAB + * Used in fragment argument with Extra key EXTRA_SHOW_FRAGMENT_TAB for the managed profile */ public static final int WORK_TAB = 1; + /** + * Please note that private profile is available from API LEVEL + * {@link Build.VERSION_CODES.VANILLA_ICE_CREAM} only, therefore PRIVATE_TAB MUST be + * passed in {@link #EXTRA_SHOW_FRAGMENT_TAB} and {@link #EXTRA_LIST_OF_PROFILE_TABS} for + * {@link Build.VERSION_CODES.VANILLA_ICE_CREAM} or higher API Levels only. + */ + private static final int PRIVATE_TAB = 2; + private ViewGroup mContentView; private ViewPager2 mViewPager; + private final ArrayMap<UserHandle, Integer> mProfileTabsByUsers = new ArrayMap<>(); + private boolean mUsingUserIds = false; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -67,7 +123,7 @@ public abstract class ProfileSelectFragment extends Fragment { if (titleResId > 0) { activity.setTitle(titleResId); } - final int selectedTab = getTabId(activity, getArguments()); + initProfileTabsToShow(); final View tabContainer = mContentView.findViewById(R.id.tab_container); mViewPager = tabContainer.findViewById(R.id.view_pager); @@ -78,16 +134,14 @@ public abstract class ProfileSelectFragment extends Fragment { ).attach(); tabContainer.setVisibility(View.VISIBLE); - final TabLayout.Tab tab = tabs.getTabAt(selectedTab); + final TabLayout.Tab tab = tabs.getTabAt(getSelectedTabPosition(activity, getArguments())); tab.select(); return mContentView; } /** - * create Personal or Work profile fragment - * <p>0: Personal profile. - * <p>1: Work profile. + * Create Personal or Work or Private profile fragment. See {@link #EXTRA_SHOW_FRAGMENT_USER_ID} */ public abstract Fragment createFragment(int position); @@ -99,21 +153,90 @@ public abstract class ProfileSelectFragment extends Fragment { return 0; } - int getTabId(Activity activity, Bundle bundle) { + int getSelectedTabPosition(Activity activity, Bundle bundle) { if (bundle != null) { + final int extraUserId = bundle.getInt(EXTRA_SHOW_FRAGMENT_USER_ID, USER_NULL); + if (extraUserId != USER_NULL) { + return mProfileTabsByUsers.indexOfKey(UserHandle.of(extraUserId)); + } final int extraTab = bundle.getInt(EXTRA_SHOW_FRAGMENT_TAB, -1); if (extraTab != -1) { return extraTab; } } - return PERSONAL_TAB; + return DEFAULT_POSITION; + } + + int getTabCount() { + return mUsingUserIds ? mProfileTabsByUsers.size() : 2; + } + + void initProfileTabsToShow() { + Bundle bundle = getArguments(); + if (bundle != null) { + ArrayList<Integer> userIdsToShow = + bundle.getIntegerArrayList(EXTRA_LIST_OF_USER_IDS); + if (userIdsToShow != null && !userIdsToShow.isEmpty()) { + mUsingUserIds = true; + UserManager userManager = getContext().getSystemService(UserManager.class); + List<UserHandle> userHandles = userManager.getUserProfiles(); + for (UserHandle userHandle : userHandles) { + if (!userIdsToShow.contains(userHandle.getIdentifier())) { + continue; + } + if (userHandle.isSystem()) { + mProfileTabsByUsers.put(userHandle, PERSONAL_TAB); + } else if (userManager.isManagedProfile(userHandle.getIdentifier())) { + mProfileTabsByUsers.put(userHandle, WORK_TAB); + } else if (shouldShowPrivateProfileIfItsOne(userHandle)) { + mProfileTabsByUsers.put(userHandle, PRIVATE_TAB); + } + } + } + } + } + + private int getProfileTabForPosition(int position) { + return mUsingUserIds ? mProfileTabsByUsers.valueAt(position) : position; + } + + int getUserIdForPosition(int position) { + return mUsingUserIds ? mProfileTabsByUsers.keyAt(position).getIdentifier() : position; } private CharSequence getPageTitle(int position) { - if (position == WORK_TAB) { + int tab = getProfileTabForPosition(position); + if (tab == WORK_TAB) { return getContext().getString(R.string.settingslib_category_work); + } else if (tab == PRIVATE_TAB) { + return getContext().getString(R.string.settingslib_category_private); } return getString(R.string.settingslib_category_personal); } + + @TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) + private boolean shouldShowUserInQuietMode(UserHandle userHandle, UserManager userManager) { + UserProperties userProperties = userManager.getUserProperties(userHandle); + return !userManager.isQuietModeEnabled(userHandle) + || userProperties.getShowInQuietMode() != UserProperties.SHOW_IN_QUIET_MODE_HIDDEN; + } + + // It's sufficient to have this method marked with the appropriate API level because we expect + // to be here only for this API level - when then private profile was introduced. + @TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) + private boolean shouldShowPrivateProfileIfItsOne(UserHandle userHandle) { + if (!BuildCompat.isAtLeastV() || !android.os.Flags.allowPrivateProfile()) { + return false; + } + try { + Context userContext = getContext().createContextAsUser(userHandle, /* flags= */ 0); + UserManager userManager = userContext.getSystemService(UserManager.class); + return userManager.isPrivateProfile() + && shouldShowUserInQuietMode(userHandle, userManager); + } catch (IllegalStateException exception) { + Log.i(TAG, "Ignoring this user as the calling package not available in this user."); + } + return false; + } } diff --git a/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileViewPagerAdapter.java b/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileViewPagerAdapter.java index f5ab64742992..37f4f275cfe7 100644 --- a/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileViewPagerAdapter.java +++ b/packages/SettingsLib/ProfileSelector/src/com/android/settingslib/widget/ProfileViewPagerAdapter.java @@ -18,7 +18,6 @@ package com.android.settingslib.widget; import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.android.settingslib.widget.profileselector.R; /** * ViewPager Adapter to handle between TabLayout and ViewPager2 @@ -34,11 +33,11 @@ public class ProfileViewPagerAdapter extends FragmentStateAdapter { @Override public Fragment createFragment(int position) { - return mParentFragments.createFragment(position); + return mParentFragments.createFragment(mParentFragments.getUserIdForPosition(position)); } @Override public int getItemCount() { - return 2; + return mParentFragments.getTabCount(); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index b8624fd9605b..4777b0de0732 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -1315,8 +1315,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> boolean isActiveAshaHearingAid = mIsActiveDeviceHearingAid; boolean isActiveLeAudioHearingAid = mIsActiveDeviceLeAudio && isConnectedHapClientDevice(); - if ((isActiveAshaHearingAid || isActiveLeAudioHearingAid) - && stringRes == R.string.bluetooth_active_no_battery_level) { + if (isActiveAshaHearingAid || isActiveLeAudioHearingAid) { final Set<CachedBluetoothDevice> memberDevices = getMemberDevice(); final CachedBluetoothDevice subDevice = getSubDevice(); if (memberDevices.stream().anyMatch(m -> m.isConnected())) { diff --git a/packages/SettingsLib/src/com/android/settingslib/media/session/MediaSessionManagerExt.kt b/packages/SettingsLib/src/com/android/settingslib/media/session/MediaSessionManagerExt.kt index cda6b8bb36be..68f471dd4e4f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/session/MediaSessionManagerExt.kt +++ b/packages/SettingsLib/src/com/android/settingslib/media/session/MediaSessionManagerExt.kt @@ -17,6 +17,7 @@ package com.android.settingslib.media.session import android.media.session.MediaController +import android.media.session.MediaSession import android.media.session.MediaSessionManager import android.os.UserHandle import androidx.concurrent.futures.DirectExecutor @@ -28,7 +29,7 @@ import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.launch /** [Flow] for [MediaSessionManager.OnActiveSessionsChangedListener]. */ -val MediaSessionManager.activeMediaChanges: Flow<Collection<MediaController>?> +val MediaSessionManager.activeMediaChanges: Flow<List<MediaController>?> get() = callbackFlow { val listener = @@ -42,3 +43,24 @@ val MediaSessionManager.activeMediaChanges: Flow<Collection<MediaController>?> awaitClose { removeOnActiveSessionsChangedListener(listener) } } .buffer(capacity = Channel.CONFLATED) + +/** [Flow] for [MediaSessionManager.RemoteSessionCallback]. */ +val MediaSessionManager.remoteSessionChanges: Flow<MediaSession.Token?> + get() = + callbackFlow { + val callback = + object : MediaSessionManager.RemoteSessionCallback { + override fun onVolumeChanged(sessionToken: MediaSession.Token, flags: Int) { + launch { send(sessionToken) } + } + + override fun onDefaultRemoteSessionChanged( + sessionToken: MediaSession.Token? + ) { + launch { send(sessionToken) } + } + } + registerRemoteSessionCallback(DirectExecutor.INSTANCE, callback) + awaitClose { unregisterRemoteSessionCallback(callback) } + } + .buffer(capacity = Channel.CONFLATED) diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt index 6730aadbdeb3..e7fec692bd63 100644 --- a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt +++ b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt @@ -19,7 +19,6 @@ package com.android.settingslib.volume.data.repository import android.media.AudioDeviceInfo import android.media.AudioManager import android.media.AudioManager.OnCommunicationDeviceChangedListener -import androidx.concurrent.futures.DirectExecutor import com.android.internal.util.ConcurrentUtils import com.android.settingslib.volume.shared.AudioManagerEventsReceiver import com.android.settingslib.volume.shared.model.AudioManagerEvent @@ -109,8 +108,8 @@ class AudioRepositoryImpl( callbackFlow { val listener = OnCommunicationDeviceChangedListener { trySend(Unit) } audioManager.addOnCommunicationDeviceChangedListener( - DirectExecutor.INSTANCE, - listener + ConcurrentUtils.DIRECT_EXECUTOR, + listener, ) awaitClose { audioManager.removeOnCommunicationDeviceChangedListener(listener) } @@ -146,7 +145,7 @@ class AudioRepositoryImpl( maxVolume = audioManager.getStreamMaxVolume(audioStream.value), volume = audioManager.getStreamVolume(audioStream.value), isAffectedByRingerMode = audioManager.isStreamAffectedByRingerMode(audioStream.value), - isMuted = audioManager.isStreamMute(audioStream.value), + isMuted = audioManager.isStreamMute(audioStream.value) ) } diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/LocalMediaRepository.kt b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/LocalMediaRepository.kt index 298dd71e555e..724dd51b8fe4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/LocalMediaRepository.kt +++ b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/LocalMediaRepository.kt @@ -15,14 +15,10 @@ */ package com.android.settingslib.volume.data.repository -import android.media.MediaRouter2Manager -import android.media.RoutingSessionInfo import com.android.settingslib.media.LocalMediaManager import com.android.settingslib.media.MediaDevice -import com.android.settingslib.volume.data.model.RoutingSession import com.android.settingslib.volume.shared.AudioManagerEventsReceiver import com.android.settingslib.volume.shared.model.AudioManagerEvent -import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow @@ -30,35 +26,23 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.filterIsInstance -import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.stateIn -import kotlinx.coroutines.withContext /** Repository providing data about connected media devices. */ interface LocalMediaRepository { - /** Available devices list */ - val mediaDevices: StateFlow<Collection<MediaDevice>> - /** Currently connected media device */ val currentConnectedDevice: StateFlow<MediaDevice?> - - val remoteRoutingSessions: StateFlow<Collection<RoutingSession>> - - suspend fun adjustSessionVolume(sessionId: String?, volume: Int) } class LocalMediaRepositoryImpl( audioManagerEventsReceiver: AudioManagerEventsReceiver, private val localMediaManager: LocalMediaManager, - private val mediaRouter2Manager: MediaRouter2Manager, coroutineScope: CoroutineScope, - private val backgroundContext: CoroutineContext, ) : LocalMediaRepository { private val devicesChanges = @@ -94,18 +78,6 @@ class LocalMediaRepositoryImpl( } .shareIn(coroutineScope, SharingStarted.WhileSubscribed(), replay = 0) - override val mediaDevices: StateFlow<Collection<MediaDevice>> = - mediaDevicesUpdates - .mapNotNull { - if (it is DevicesUpdate.DeviceListUpdate) { - it.newDevices ?: emptyList() - } else { - null - } - } - .flowOn(backgroundContext) - .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), emptyList()) - override val currentConnectedDevice: StateFlow<MediaDevice?> = merge(devicesChanges, mediaDevicesUpdates) .map { localMediaManager.currentConnectedDevice } @@ -116,30 +88,6 @@ class LocalMediaRepositoryImpl( localMediaManager.currentConnectedDevice ) - override val remoteRoutingSessions: StateFlow<Collection<RoutingSession>> = - merge(devicesChanges, mediaDevicesUpdates) - .onStart { emit(Unit) } - .map { localMediaManager.remoteRoutingSessions.map(::toRoutingSession) } - .flowOn(backgroundContext) - .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), emptyList()) - - override suspend fun adjustSessionVolume(sessionId: String?, volume: Int) { - withContext(backgroundContext) { - if (sessionId == null) { - localMediaManager.adjustSessionVolume(volume) - } else { - localMediaManager.adjustSessionVolume(sessionId, volume) - } - } - } - - private fun toRoutingSession(info: RoutingSessionInfo): RoutingSession = - RoutingSession( - info, - isMediaOutputDisabled = mediaRouter2Manager.getTransferableRoutes(info).isEmpty(), - isVolumeSeekBarEnabled = localMediaManager.shouldEnableVolumeSeekBar(info) - ) - private sealed interface DevicesUpdate { data class DeviceListUpdate(val newDevices: List<MediaDevice>?) : DevicesUpdate diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/MediaControllerRepository.kt b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/MediaControllerRepository.kt index 7c231d1fad4e..e4ac9fe686a3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/MediaControllerRepository.kt +++ b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/MediaControllerRepository.kt @@ -27,18 +27,26 @@ import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.filterIsInstance -import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn /** Provides controllers for currently active device media sessions. */ interface MediaControllerRepository { - /** Current [MediaController]. Null is emitted when there is no active [MediaController]. */ - val activeLocalMediaController: StateFlow<MediaController?> + /** + * Get a list of controllers for all ongoing sessions. The controllers will be provided in + * priority order with the most important controller at index 0. + * + * This requires the [android.Manifest.permission.MEDIA_CONTENT_CONTROL] permission be held by + * the calling app. + */ + val activeSessions: StateFlow<List<MediaController>> } class MediaControllerRepositoryImpl( @@ -49,51 +57,17 @@ class MediaControllerRepositoryImpl( backgroundContext: CoroutineContext, ) : MediaControllerRepository { - private val devicesChanges = - audioManagerEventsReceiver.events.filterIsInstance( - AudioManagerEvent.StreamDevicesChanged::class - ) - - override val activeLocalMediaController: StateFlow<MediaController?> = - combine( - mediaSessionManager.activeMediaChanges.onStart { - emit(mediaSessionManager.getActiveSessions(null)) - }, - localBluetoothManager?.headsetAudioModeChanges?.onStart { emit(Unit) } - ?: flowOf(null), - devicesChanges.onStart { emit(AudioManagerEvent.StreamDevicesChanged) }, - ) { controllers, _, _ -> - controllers?.let(::findLocalMediaController) - } + override val activeSessions: StateFlow<List<MediaController>> = + merge( + mediaSessionManager.activeMediaChanges.filterNotNull(), + localBluetoothManager?.headsetAudioModeChanges?.map { + mediaSessionManager.getActiveSessions(null) + } ?: emptyFlow(), + audioManagerEventsReceiver.events + .filterIsInstance(AudioManagerEvent.StreamDevicesChanged::class) + .map { mediaSessionManager.getActiveSessions(null) }, + ) + .onStart { emit(mediaSessionManager.getActiveSessions(null)) } .flowOn(backgroundContext) - .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), null) - - private fun findLocalMediaController( - controllers: Collection<MediaController>, - ): MediaController? { - var localController: MediaController? = null - val remoteMediaSessionLists: MutableList<String> = ArrayList() - for (controller in controllers) { - val playbackInfo: MediaController.PlaybackInfo = controller.playbackInfo ?: continue - when (playbackInfo.playbackType) { - MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE -> { - if (localController?.packageName.equals(controller.packageName)) { - localController = null - } - if (!remoteMediaSessionLists.contains(controller.packageName)) { - remoteMediaSessionLists.add(controller.packageName) - } - } - MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL -> { - if ( - localController == null && - !remoteMediaSessionLists.contains(controller.packageName) - ) { - localController = controller - } - } - } - } - return localController - } + .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), emptyList()) } diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/AudioVolumeInteractor.kt b/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/AudioVolumeInteractor.kt index c9ac97dcab7f..778653b9bd44 100644 --- a/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/AudioVolumeInteractor.kt +++ b/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/AudioVolumeInteractor.kt @@ -66,6 +66,10 @@ class AudioVolumeInteractor( } } + fun isMutable(audioStream: AudioStream): Boolean = + // Alarm stream doesn't support muting + audioStream.value != AudioManager.STREAM_ALARM + private suspend fun processVolume( audioStreamModel: AudioStreamModel, ringerMode: RingerMode, diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/LocalMediaInteractor.kt b/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/LocalMediaInteractor.kt deleted file mode 100644 index f6213351ae0d..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/volume/domain/interactor/LocalMediaInteractor.kt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2024 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.settingslib.volume.domain.interactor - -import com.android.settingslib.media.MediaDevice -import com.android.settingslib.volume.data.repository.LocalMediaRepository -import com.android.settingslib.volume.domain.model.RoutingSession -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.stateIn - -class LocalMediaInteractor( - private val repository: LocalMediaRepository, - coroutineScope: CoroutineScope, -) { - - /** Available devices list */ - val mediaDevices: StateFlow<Collection<MediaDevice>> - get() = repository.mediaDevices - - /** Currently connected media device */ - val currentConnectedDevice: StateFlow<MediaDevice?> - get() = repository.currentConnectedDevice - - val remoteRoutingSessions: StateFlow<List<RoutingSession>> = - repository.remoteRoutingSessions - .map { sessions -> - sessions.map { - RoutingSession( - routingSessionInfo = it.routingSessionInfo, - isMediaOutputDisabled = it.isMediaOutputDisabled, - isVolumeSeekBarEnabled = - it.isVolumeSeekBarEnabled && it.routingSessionInfo.volumeMax > 0 - ) - } - } - .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), emptyList()) - - suspend fun adjustSessionVolume(sessionId: String?, volume: Int) = - repository.adjustSessionVolume(sessionId, volume) -} diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/LocalMediaRepositoryImplTest.kt b/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/LocalMediaRepositoryImplTest.kt index 2d12dae36ff1..caf41f21afb7 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/LocalMediaRepositoryImplTest.kt +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/LocalMediaRepositoryImplTest.kt @@ -15,17 +15,12 @@ */ package com.android.settingslib.volume.data.repository -import android.media.MediaRoute2Info -import android.media.MediaRouter2Manager -import android.media.RoutingSessionInfo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.settingslib.media.LocalMediaManager import com.android.settingslib.media.MediaDevice -import com.android.settingslib.volume.data.model.RoutingSession import com.android.settingslib.volume.shared.FakeAudioManagerEventsReceiver import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.test.TestScope @@ -37,15 +32,10 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Captor import org.mockito.Mock -import org.mockito.Mockito.any -import org.mockito.Mockito.anyInt -import org.mockito.Mockito.anyString -import org.mockito.Mockito.mock import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations -@OptIn(ExperimentalCoroutinesApi::class) @RunWith(AndroidJUnit4::class) @SmallTest class LocalMediaRepositoryImplTest { @@ -53,7 +43,6 @@ class LocalMediaRepositoryImplTest { @Mock private lateinit var localMediaManager: LocalMediaManager @Mock private lateinit var mediaDevice1: MediaDevice @Mock private lateinit var mediaDevice2: MediaDevice - @Mock private lateinit var mediaRouter2Manager: MediaRouter2Manager @Captor private lateinit var deviceCallbackCaptor: ArgumentCaptor<LocalMediaManager.DeviceCallback> @@ -71,29 +60,11 @@ class LocalMediaRepositoryImplTest { LocalMediaRepositoryImpl( eventsReceiver, localMediaManager, - mediaRouter2Manager, testScope.backgroundScope, - testScope.testScheduler, ) } @Test - fun mediaDevices_areUpdated() { - testScope.runTest { - var mediaDevices: Collection<MediaDevice>? = null - underTest.mediaDevices.onEach { mediaDevices = it }.launchIn(backgroundScope) - runCurrent() - verify(localMediaManager).registerCallback(deviceCallbackCaptor.capture()) - deviceCallbackCaptor.value.onDeviceListUpdate(listOf(mediaDevice1, mediaDevice2)) - runCurrent() - - assertThat(mediaDevices).hasSize(2) - assertThat(mediaDevices).contains(mediaDevice1) - assertThat(mediaDevices).contains(mediaDevice2) - } - } - - @Test fun deviceListUpdated_currentConnectedDeviceUpdated() { testScope.runTest { var currentConnectedDevice: MediaDevice? = null @@ -110,78 +81,4 @@ class LocalMediaRepositoryImplTest { assertThat(currentConnectedDevice).isEqualTo(mediaDevice1) } } - - @Test - fun kek() { - testScope.runTest { - `when`(localMediaManager.remoteRoutingSessions) - .thenReturn( - listOf( - testRoutingSessionInfo1, - testRoutingSessionInfo2, - testRoutingSessionInfo3, - ) - ) - `when`(localMediaManager.shouldEnableVolumeSeekBar(any())).then { - (it.arguments[0] as RoutingSessionInfo) == testRoutingSessionInfo1 - } - `when`(mediaRouter2Manager.getTransferableRoutes(any<RoutingSessionInfo>())).then { - if ((it.arguments[0] as RoutingSessionInfo) == testRoutingSessionInfo2) { - return@then listOf(mock(MediaRoute2Info::class.java)) - } - emptyList<MediaRoute2Info>() - } - var remoteRoutingSessions: Collection<RoutingSession>? = null - underTest.remoteRoutingSessions - .onEach { remoteRoutingSessions = it } - .launchIn(backgroundScope) - - runCurrent() - - assertThat(remoteRoutingSessions) - .containsExactlyElementsIn( - listOf( - RoutingSession( - routingSessionInfo = testRoutingSessionInfo1, - isVolumeSeekBarEnabled = true, - isMediaOutputDisabled = true, - ), - RoutingSession( - routingSessionInfo = testRoutingSessionInfo2, - isVolumeSeekBarEnabled = false, - isMediaOutputDisabled = false, - ), - RoutingSession( - routingSessionInfo = testRoutingSessionInfo3, - isVolumeSeekBarEnabled = false, - isMediaOutputDisabled = true, - ) - ) - ) - } - } - - @Test - fun adjustSessionVolume_adjusts() { - testScope.runTest { - var volume = 0 - `when`(localMediaManager.adjustSessionVolume(anyString(), anyInt())).then { - volume = it.arguments[1] as Int - Unit - } - - underTest.adjustSessionVolume("test_session", 10) - - assertThat(volume).isEqualTo(10) - } - } - - private companion object { - val testRoutingSessionInfo1 = - RoutingSessionInfo.Builder("id_1", "test.pkg.1").addSelectedRoute("route_1").build() - val testRoutingSessionInfo2 = - RoutingSessionInfo.Builder("id_2", "test.pkg.2").addSelectedRoute("route_2").build() - val testRoutingSessionInfo3 = - RoutingSessionInfo.Builder("id_3", "test.pkg.3").addSelectedRoute("route_3").build() - } } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/MediaControllerRepositoryImplTest.kt b/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/MediaControllerRepositoryImplTest.kt index f3d17141334e..964c3f7d13d4 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/MediaControllerRepositoryImplTest.kt +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/volume/data/repository/MediaControllerRepositoryImplTest.kt @@ -22,13 +22,10 @@ import android.media.session.MediaSessionManager import android.media.session.PlaybackState import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.settingslib.bluetooth.BluetoothCallback import com.android.settingslib.bluetooth.BluetoothEventManager import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.settingslib.volume.shared.FakeAudioManagerEventsReceiver -import com.android.settingslib.volume.shared.model.AudioManagerEvent import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.test.TestScope @@ -37,21 +34,15 @@ import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentCaptor -import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.any -import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations -@OptIn(ExperimentalCoroutinesApi::class) @RunWith(AndroidJUnit4::class) @SmallTest class MediaControllerRepositoryImplTest { - @Captor private lateinit var callbackCaptor: ArgumentCaptor<BluetoothCallback> - @Mock private lateinit var mediaSessionManager: MediaSessionManager @Mock private lateinit var localBluetoothManager: LocalBluetoothManager @Mock private lateinit var eventManager: BluetoothEventManager @@ -103,7 +94,7 @@ class MediaControllerRepositoryImplTest { } @Test - fun playingMediaDevicesAvailable_sessionIsActive() { + fun mediaDevicesAvailable_returnsAllActiveOnes() { testScope.runTest { `when`(mediaSessionManager.getActiveSessions(any())) .thenReturn( @@ -112,53 +103,25 @@ class MediaControllerRepositoryImplTest { statelessMediaController, errorMediaController, remoteMediaController, - localMediaController + localMediaController, ) ) - var mediaController: MediaController? = null - underTest.activeLocalMediaController - .onEach { mediaController = it } - .launchIn(backgroundScope) - runCurrent() - eventsReceiver.triggerEvent(AudioManagerEvent.StreamDevicesChanged) - triggerOnAudioModeChanged() + var mediaControllers: Collection<MediaController>? = null + underTest.activeSessions.onEach { mediaControllers = it }.launchIn(backgroundScope) runCurrent() - assertThat(mediaController).isSameInstanceAs(localMediaController) - } - } - - @Test - fun noPlayingMediaDevicesAvailable_sessionIsInactive() { - testScope.runTest { - `when`(mediaSessionManager.getActiveSessions(any())) - .thenReturn( - listOf( - stoppedMediaController, - statelessMediaController, - errorMediaController, - ) + assertThat(mediaControllers) + .containsExactly( + stoppedMediaController, + statelessMediaController, + errorMediaController, + remoteMediaController, + localMediaController, ) - var mediaController: MediaController? = null - underTest.activeLocalMediaController - .onEach { mediaController = it } - .launchIn(backgroundScope) - runCurrent() - - eventsReceiver.triggerEvent(AudioManagerEvent.StreamDevicesChanged) - triggerOnAudioModeChanged() - runCurrent() - - assertThat(mediaController).isNull() } } - private fun triggerOnAudioModeChanged() { - verify(eventManager).registerCallback(callbackCaptor.capture()) - callbackCaptor.value.onAudioModeChanged() - } - private companion object { val statePlaying: PlaybackState = PlaybackState.Builder().setState(PlaybackState.STATE_PLAYING, 0, 0f).build() diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp index 7ec3d243529f..bf4f60d84e4d 100644 --- a/packages/SettingsProvider/Android.bp +++ b/packages/SettingsProvider/Android.bp @@ -60,6 +60,7 @@ android_test { // because this test is not an instrumentation test. (because the target runs in the system process.) "SettingsProviderLib", "androidx.test.rules", + "frameworks-base-testutils", "device_config_service_flags_java", "flag-junit", "junit", diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index eaec617cfa70..5629a7bf7b21 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -256,8 +256,7 @@ public class SecureSettings { Settings.Secure.HEARING_AID_MEDIA_ROUTING, Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING, Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, - Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, - Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED, + Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, Settings.Secure.HUB_MODE_TUTORIAL_STATE, Settings.Secure.STYLUS_BUTTONS_ENABLED, Settings.Secure.STYLUS_HANDWRITING_ENABLED, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 046d6e25ff31..b8d95eb5329d 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -208,8 +208,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.ASSIST_TOUCH_GESTURE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.SEARCH_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"})); VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 3e0d05cd9ecf..1eb04ac1c181 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -98,6 +98,7 @@ public class SettingsHelper { sBroadcastOnRestore.add(Settings.Secure.DARK_THEME_CUSTOM_END_TIME); sBroadcastOnRestore.add(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED); sBroadcastOnRestore.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS); + sBroadcastOnRestore.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS); sBroadcastOnRestoreSystemUI = new ArraySet<String>(2); sBroadcastOnRestoreSystemUI.add(Settings.Secure.QS_TILES); sBroadcastOnRestoreSystemUI.add(Settings.Secure.QS_AUTO_ADDED_TILES); @@ -229,6 +230,10 @@ public class SettingsHelper { } else if (Settings.System.ACCELEROMETER_ROTATION.equals(name) && shouldSkipAutoRotateRestore()) { return; + } else if (Settings.Secure.ACCESSIBILITY_QS_TARGETS.equals(name)) { + // Don't write it to setting. Let the broadcast receiver in + // AccessibilityManagerService handle restore/merging logic. + return; } // Default case: write the restored value to settings diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 02d212cb4996..dba3bac4a4b8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1950,11 +1950,8 @@ class SettingsProtoDumpUtil { Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, SecureSettingsProto.Assist.LONG_PRESS_HOME_ENABLED); dumpSetting(s, p, - Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, - SecureSettingsProto.Assist.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED); - dumpSetting(s, p, - Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED, - SecureSettingsProto.Assist.SEARCH_LONG_PRESS_HOME_ENABLED); + Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, + SecureSettingsProto.Assist.SEARCH_ALL_ENTRYPOINTS_ENABLED); dumpSetting(s, p, Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED, SecureSettingsProto.Assist.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED); diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java index 197788e11973..2f8cf4b3d034 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java @@ -16,23 +16,31 @@ package com.android.providers.settings; +import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; +import android.content.Intent; import android.net.Uri; import android.os.Build; import android.provider.Settings; +import android.provider.SettingsStringUtil; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import com.android.internal.util.test.BroadcastInterceptingContext; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import java.util.concurrent.ExecutionException; + /** * Tests for {@link SettingsHelper#restoreValue(Context, ContentResolver, ContentValues, Uri, * String, String, int)}. Specifically verifies that we restore critical accessibility settings only @@ -165,4 +173,33 @@ public class SettingsHelperRestoreTest { assertEquals(restoreSettingValue, Settings.Secure.getInt(mContentResolver, settingName)); } + + @Test + public void restoreAccessibilityQsTargets_broadcastSent() + throws ExecutionException, InterruptedException { + BroadcastInterceptingContext interceptingContext = new BroadcastInterceptingContext( + mContext); + final String settingName = Settings.Secure.ACCESSIBILITY_QS_TARGETS; + final String restoreSettingValue = "com.android.server.accessibility/ColorInversion" + + SettingsStringUtil.DELIMITER + + "com.android.server.accessibility/ColorCorrectionTile"; + BroadcastInterceptingContext.FutureIntent futureIntent = + interceptingContext.nextBroadcastIntent(Intent.ACTION_SETTING_RESTORED); + + mSettingsHelper.restoreValue( + interceptingContext, + mContentResolver, + new ContentValues(2), + Settings.Secure.getUriFor(settingName), + settingName, + restoreSettingValue, + Build.VERSION.SDK_INT); + + Intent intentReceived = futureIntent.get(); + assertThat(intentReceived.getStringExtra(Intent.EXTRA_SETTING_NEW_VALUE)) + .isEqualTo(restoreSettingValue); + assertThat(intentReceived.getIntExtra( + Intent.EXTRA_SETTING_RESTORED_FROM_SDK_INT, /* defaultValue= */ 0)) + .isEqualTo(Build.VERSION.SDK_INT); + } } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 02d19dc84f2e..58040716db3e 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -932,6 +932,9 @@ <uses-permission android:name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW" /> + <!-- Permission required for Cts test - CtsSettingsTestCases --> + <uses-permission android:name="android.permission.PREPARE_FACTORY_RESET" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index d9c371a79b2d..e346e72516cf 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -277,6 +277,9 @@ <!-- to change spatial audio --> <uses-permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS" /> + <!-- to adjust volume in volume panel --> + <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + <!-- to access ResolverRankerServices --> <uses-permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE" /> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java b/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java index 6546b87c8802..f70ad9ed58b0 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java @@ -23,10 +23,10 @@ import static android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_QU import static android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_RECENTS; import static android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_TAKE_SCREENSHOT; -import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_OPEN_BLOCKED; import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_GLOBAL_ACTION; import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_GLOBAL_ACTION_EXTRA; import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_HIDE_MENU; +import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_OPEN_BLOCKED; import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.INTENT_TOGGLE_MENU; import static com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService.PACKAGE_NAME; @@ -77,6 +77,8 @@ public class AccessibilityMenuServiceTest { private static final int TIMEOUT_SERVICE_STATUS_CHANGE_S = 5; private static final int TIMEOUT_UI_CHANGE_S = 5; private static final int NO_GLOBAL_ACTION = -1; + private static final Intent INTENT_OPEN_MENU = new Intent(INTENT_TOGGLE_MENU) + .setPackage(PACKAGE_NAME); private static Instrumentation sInstrumentation; private static UiAutomation sUiAutomation; @@ -152,9 +154,6 @@ public class AccessibilityMenuServiceTest { @Before public void setup() throws Throwable { sOpenBlocked.set(false); - wakeUpScreen(); - sUiAutomation.executeShellCommand("input keyevent KEYCODE_MENU"); - openMenu(); } @After @@ -188,24 +187,17 @@ public class AccessibilityMenuServiceTest { } private static void openMenu() throws Throwable { - openMenu(false); - } - - private static void openMenu(boolean abandonOnBlock) throws Throwable { - Intent intent = new Intent(INTENT_TOGGLE_MENU); - intent.setPackage(PACKAGE_NAME); - sInstrumentation.getContext().sendBroadcast(intent); + unlockSignal(); + sInstrumentation.getContext().sendBroadcast(INTENT_OPEN_MENU); TestUtils.waitUntil("Timed out before menu could appear.", TIMEOUT_UI_CHANGE_S, () -> { - if (sOpenBlocked.get() && abandonOnBlock) { - throw new IllegalStateException(); - } if (isMenuVisible()) { return true; } else { - sInstrumentation.getContext().sendBroadcast(intent); + unlockSignal(); + sInstrumentation.getContext().sendBroadcast(INTENT_OPEN_MENU); return false; } }); @@ -249,6 +241,7 @@ public class AccessibilityMenuServiceTest { @Test public void testAdjustBrightness() throws Throwable { + openMenu(); Context context = sInstrumentation.getTargetContext(); DisplayManager displayManager = context.getSystemService( DisplayManager.class); @@ -264,22 +257,28 @@ public class AccessibilityMenuServiceTest { context.getDisplayId()).getBrightnessInfo(); try { - displayManager.setBrightness(context.getDisplayId(), brightnessInfo.brightnessMinimum); TestUtils.waitUntil("Could not change to minimum brightness", TIMEOUT_UI_CHANGE_S, - () -> displayManager.getBrightness(context.getDisplayId()) - == brightnessInfo.brightnessMinimum); + () -> { + displayManager.setBrightness( + context.getDisplayId(), brightnessInfo.brightnessMinimum); + return displayManager.getBrightness(context.getDisplayId()) + == brightnessInfo.brightnessMinimum; + }); brightnessUpButton.performAction(CLICK_ID); TestUtils.waitUntil("Did not detect an increase in brightness.", TIMEOUT_UI_CHANGE_S, () -> displayManager.getBrightness(context.getDisplayId()) > brightnessInfo.brightnessMinimum); - displayManager.setBrightness(context.getDisplayId(), brightnessInfo.brightnessMaximum); TestUtils.waitUntil("Could not change to maximum brightness", TIMEOUT_UI_CHANGE_S, - () -> displayManager.getBrightness(context.getDisplayId()) - == brightnessInfo.brightnessMaximum); + () -> { + displayManager.setBrightness( + context.getDisplayId(), brightnessInfo.brightnessMaximum); + return displayManager.getBrightness(context.getDisplayId()) + == brightnessInfo.brightnessMaximum; + }); brightnessDownButton.performAction(CLICK_ID); TestUtils.waitUntil("Did not detect a decrease in brightness.", TIMEOUT_UI_CHANGE_S, @@ -292,6 +291,7 @@ public class AccessibilityMenuServiceTest { @Test public void testAdjustVolume() throws Throwable { + openMenu(); Context context = sInstrumentation.getTargetContext(); AudioManager audioManager = context.getSystemService(AudioManager.class); int resetVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC); @@ -332,6 +332,7 @@ public class AccessibilityMenuServiceTest { @Test public void testAssistantButton_opensVoiceAssistant() throws Throwable { + openMenu(); AccessibilityNodeInfo assistantButton = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_ASSISTANT_VALUE.ordinal())); Intent expectedIntent = new Intent(Intent.ACTION_VOICE_COMMAND); @@ -349,6 +350,7 @@ public class AccessibilityMenuServiceTest { @Test public void testAccessibilitySettingsButton_opensAccessibilitySettings() throws Throwable { + openMenu(); AccessibilityNodeInfo settingsButton = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_A11YSETTING_VALUE.ordinal())); Intent expectedIntent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS); @@ -364,6 +366,7 @@ public class AccessibilityMenuServiceTest { @Test public void testPowerButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_POWER_VALUE.ordinal())); @@ -376,6 +379,7 @@ public class AccessibilityMenuServiceTest { @Test public void testRecentButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_RECENT_VALUE.ordinal())); @@ -388,6 +392,7 @@ public class AccessibilityMenuServiceTest { @Test public void testLockButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_LOCKSCREEN_VALUE.ordinal())); @@ -400,6 +405,7 @@ public class AccessibilityMenuServiceTest { @Test public void testQuickSettingsButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_QUICKSETTING_VALUE.ordinal())); @@ -412,6 +418,7 @@ public class AccessibilityMenuServiceTest { @Test public void testNotificationsButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_NOTIFICATION_VALUE.ordinal())); @@ -424,6 +431,7 @@ public class AccessibilityMenuServiceTest { @Test public void testScreenshotButton_performsGlobalAction() throws Throwable { + openMenu(); AccessibilityNodeInfo button = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_SCREENSHOT_VALUE.ordinal())); @@ -436,6 +444,7 @@ public class AccessibilityMenuServiceTest { @Test public void testOnScreenLock_closesMenu() throws Throwable { + openMenu(); closeScreen(); wakeUpScreen(); @@ -447,13 +456,18 @@ public class AccessibilityMenuServiceTest { closeScreen(); wakeUpScreen(); - boolean blocked = false; - try { - openMenu(true); - } catch (IllegalStateException e) { - // Expected - blocked = true; - } - assertThat(blocked).isTrue(); + TestUtils.waitUntil("Did not receive signal that menu cannot open", + TIMEOUT_UI_CHANGE_S, + () -> { + sInstrumentation.getContext().sendBroadcast(INTENT_OPEN_MENU); + return sOpenBlocked.get(); + }); + } + + private static void unlockSignal() { + // MENU unlocks screen, + // BACK closes any menu that may appear if the screen wasn't locked. + sUiAutomation.executeShellCommand("input keyevent KEYCODE_MENU"); + sUiAutomation.executeShellCommand("input keyevent KEYCODE_BACK"); } } diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 8da50216f13c..a155dc4d7639 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -104,6 +104,13 @@ flag { } flag { + name: "notifications_heads_up_refactor" + namespace: "systemui" + description: "Use HeadsUpInteractor to feed HUN updates to the NSSL." + bug: "325936094" +} + +flag { name: "pss_app_selector_abrupt_exit_fix" namespace: "systemui" description: "Fixes the app selector abruptly disappearing without an animation, when the" @@ -424,6 +431,13 @@ flag { } flag { + name: "screenshot_shelf_ui" + namespace: "systemui" + description: "Use new shelf UI flow for screenshots" + bug: "329659738" +} + +flag { name: "run_fingerprint_detect_on_dismissible_keyguard" namespace: "systemui" description: "Run fingerprint detect instead of authenticate if the keyguard is dismissible." diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt index abe1e3de8eea..1c763e8c6108 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt @@ -181,6 +181,11 @@ private constructor( turbulenceNoiseShader.setColor(newColor) } + /** Updates the noise color that's screen blended on top. */ + fun updateScreenColor(newColor: Int) { + turbulenceNoiseShader.setScreenColor(newColor) + } + /** * Retrieves the noise offset x, y, z values. This is useful for replaying the animation * smoothly from the last animation, by passing in the last values to the next animation. @@ -322,7 +327,10 @@ private constructor( private fun draw() { paintCallback?.onDraw(paint!!) renderEffectCallback?.onDraw( - RenderEffect.createRuntimeShaderEffect(turbulenceNoiseShader, "in_src") + RenderEffect.createRuntimeShaderEffect( + turbulenceNoiseShader, + TurbulenceNoiseShader.BACKGROUND_UNIFORM + ) ) } diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt index 59354c843447..ba8f1ace0214 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt @@ -52,7 +52,7 @@ data class TurbulenceNoiseAnimationConfig( /** Color of the effect. */ val color: Int = DEFAULT_COLOR, /** Background color of the effect. */ - val backgroundColor: Int = DEFAULT_BACKGROUND_COLOR, + val screenColor: Int = DEFAULT_SCREEN_COLOR, val width: Float = 0f, val height: Float = 0f, val maxDuration: Float = DEFAULT_MAX_DURATION_IN_MILLIS, @@ -72,7 +72,7 @@ data class TurbulenceNoiseAnimationConfig( */ val lumaMatteOverallBrightness: Float = DEFAULT_LUMA_MATTE_OVERALL_BRIGHTNESS, /** Whether to flip the luma mask. */ - val shouldInverseNoiseLuminosity: Boolean = false + val shouldInverseNoiseLuminosity: Boolean = false, ) { companion object { const val DEFAULT_MAX_DURATION_IN_MILLIS = 30_000f // Max 30 sec @@ -83,7 +83,7 @@ data class TurbulenceNoiseAnimationConfig( const val DEFAULT_COLOR = Color.WHITE const val DEFAULT_LUMA_MATTE_BLEND_FACTOR = 1f const val DEFAULT_LUMA_MATTE_OVERALL_BRIGHTNESS = 0f - const val DEFAULT_BACKGROUND_COLOR = Color.BLACK + const val DEFAULT_SCREEN_COLOR = Color.BLACK private val random = Random() } } diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt index 8dd90a8ffe9f..025c8b9dce04 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt @@ -16,6 +16,7 @@ package com.android.systemui.surfaceeffects.turbulencenoise import android.graphics.RuntimeShader +import com.android.systemui.surfaceeffects.shaders.SolidColorShader import com.android.systemui.surfaceeffects.shaderutil.ShaderUtilLibrary import java.lang.Float.max @@ -28,9 +29,11 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : RuntimeShader(getShader(baseType)) { // language=AGSL companion object { + /** Uniform name for the background buffer (e.g. image, solid color, etc.). */ + const val BACKGROUND_UNIFORM = "in_src" private const val UNIFORMS = """ - uniform shader in_src; // Needed to support RenderEffect. + uniform shader ${BACKGROUND_UNIFORM}; uniform float in_gridNum; uniform vec3 in_noiseMove; uniform vec2 in_size; @@ -41,7 +44,7 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : uniform half in_lumaMatteBlendFactor; uniform half in_lumaMatteOverallBrightness; layout(color) uniform vec4 in_color; - layout(color) uniform vec4 in_backgroundColor; + layout(color) uniform vec4 in_screenColor; """ private const val SIMPLEX_SHADER = @@ -50,22 +53,20 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : vec2 uv = p / in_size.xy; uv.x *= in_aspectRatio; + // Compute turbulence effect with the uv distorted with simplex noise. vec3 noiseP = vec3(uv + in_noiseMove.xy, in_noiseMove.z) * in_gridNum; - // Bring it to [0, 1] range. - float luma = (simplex3d(noiseP) * in_inverseLuma) * 0.5 + 0.5; - luma = saturate(luma * in_lumaMatteBlendFactor + in_lumaMatteOverallBrightness) - * in_opacity; - vec3 mask = maskLuminosity(in_color.rgb, luma); - vec3 color = in_backgroundColor.rgb + mask * 0.6; + vec3 color = getColorTurbulenceMask(simplex3d(noiseP) * in_inverseLuma); + + // Blend the result with the background color. + color = in_src.eval(p).rgb + color * 0.6; // Add dither with triangle distribution to avoid color banding. Dither in the // shader here as we are in gamma space. float dither = triangleNoise(p * in_pixelDensity) / 255.; + color += dither.rrr; - // The result color should be pre-multiplied, i.e. [R*A, G*A, B*A, A], thus need to - // multiply rgb with a to get the correct result. - color = (color + dither.rrr) * in_opacity; - return vec4(color, in_opacity); + // Return the pre-multiplied alpha result, i.e. [R*A, G*A, B*A, A]. + return vec4(color * in_opacity, in_opacity); } """ @@ -76,32 +77,105 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : uv.x *= in_aspectRatio; vec3 noiseP = vec3(uv + in_noiseMove.xy, in_noiseMove.z) * in_gridNum; - // Bring it to [0, 1] range. - float luma = (simplex3d_fractal(noiseP) * in_inverseLuma) * 0.5 + 0.5; - luma = saturate(luma * in_lumaMatteBlendFactor + in_lumaMatteOverallBrightness) - * in_opacity; - vec3 mask = maskLuminosity(in_color.rgb, luma); - vec3 color = in_backgroundColor.rgb + mask * 0.6; + vec3 color = getColorTurbulenceMask(simplex3d_fractal(noiseP) * in_inverseLuma); + + // Blend the result with the background color. + color = in_src.eval(p).rgb + color * 0.6; // Skip dithering. return vec4(color * in_opacity, in_opacity); } """ + + /** + * This effect has two layers: color turbulence effect with sparkles on top. + * 1. Gets the luma matte using Simplex noise. + * 2. Generate a colored turbulence layer with the luma matte. + * 3. Generate a colored sparkle layer with the same luma matter. + * 4. Apply a screen color to the background image. + * 5. Composite the previous result with the color turbulence. + * 6. Composite the latest result with the sparkles. + */ + private const val SIMPLEX_SPARKLE_SHADER = + """ + vec4 main(vec2 p) { + vec2 uv = p / in_size.xy; + uv.x *= in_aspectRatio; + + vec3 noiseP = vec3(uv + in_noiseMove.xy, in_noiseMove.z) * in_gridNum; + // Luma is used for both color and sparkle masks. + float luma = simplex3d(noiseP) * in_inverseLuma; + + // Get color layer (color mask with in_color applied) + vec3 colorLayer = getColorTurbulenceMask(simplex3d(noiseP) * in_inverseLuma); + float dither = triangleNoise(p * in_pixelDensity) / 255.; + colorLayer += dither.rrr; + + // Get sparkle layer (sparkle mask with particles & in_color applied) + vec3 sparkleLayer = getSparkleTurbulenceMask(luma, p); + + // Composite with the background. + half4 bgColor = in_src.eval(p); + half sparkleOpacity = smoothstep(0, 0.75, in_opacity); + + half3 effect = screen(bgColor.rgb, in_screenColor.rgb); + effect = screen(effect, colorLayer * 0.22); + effect += sparkleLayer * sparkleOpacity; + + return mix(bgColor, vec4(effect, 1.), in_opacity); + } + """ + + private const val COMMON_FUNCTIONS = + /** + * Below two functions generate turbulence layers (color or sparkles applied) with the + * given luma matte. They both return a mask with in_color applied. + */ + """ + vec3 getColorTurbulenceMask(float luma) { + // Bring it to [0, 1] range. + luma = luma * 0.5 + 0.5; + + half colorLuma = + saturate(luma * in_lumaMatteBlendFactor + in_lumaMatteOverallBrightness) + * in_opacity; + vec3 colorLayer = maskLuminosity(in_color.rgb, colorLuma); + + return colorLayer; + } + + vec3 getSparkleTurbulenceMask(float luma, vec2 p) { + half lumaIntensity = 1.75; + half lumaBrightness = -1.3; + half sparkleLuma = max(luma * lumaIntensity + lumaBrightness, 0.); + + float sparkle = sparkles(p - mod(p, in_pixelDensity * 0.8), in_noiseMove.z); + vec3 sparkleLayer = maskLuminosity(in_color.rgb * sparkle, sparkleLuma); + + return sparkleLayer; + } + """ private const val SIMPLEX_NOISE_SHADER = - ShaderUtilLibrary.SHADER_LIB + UNIFORMS + SIMPLEX_SHADER + ShaderUtilLibrary.SHADER_LIB + UNIFORMS + COMMON_FUNCTIONS + SIMPLEX_SHADER private const val FRACTAL_NOISE_SHADER = - ShaderUtilLibrary.SHADER_LIB + UNIFORMS + FRACTAL_SHADER - // TODO (b/282007590): Add NOISE_WITH_SPARKLE + ShaderUtilLibrary.SHADER_LIB + UNIFORMS + COMMON_FUNCTIONS + FRACTAL_SHADER + private const val SPARKLE_NOISE_SHADER = + ShaderUtilLibrary.SHADER_LIB + UNIFORMS + COMMON_FUNCTIONS + SIMPLEX_SPARKLE_SHADER enum class Type { + /** Effect with a simple color noise turbulence. */ SIMPLEX_NOISE, + /** Effect with a simple color noise turbulence, with fractal. */ SIMPLEX_NOISE_FRACTAL, + /** Effect with color & sparkle turbulence with screen color layer. */ + SIMPLEX_NOISE_SPARKLE } fun getShader(type: Type): String { return when (type) { Type.SIMPLEX_NOISE -> SIMPLEX_NOISE_SHADER Type.SIMPLEX_NOISE_FRACTAL -> FRACTAL_NOISE_SHADER + Type.SIMPLEX_NOISE_SPARKLE -> SPARKLE_NOISE_SHADER } } } @@ -111,7 +185,7 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : setGridCount(config.gridCount) setPixelDensity(config.pixelDensity) setColor(config.color) - setBackgroundColor(config.backgroundColor) + setScreenColor(config.screenColor) setSize(config.width, config.height) setLumaMatteFactors(config.lumaMatteBlendFactor, config.lumaMatteOverallBrightness) setInverseNoiseLuminosity(config.shouldInverseNoiseLuminosity) @@ -137,9 +211,20 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : setColorUniform("in_color", color) } - /** Sets the background color of the effect. Alpha is ignored. */ + /** + * Sets the color that is used for blending on top of the background color/image. Only relevant + * to [Type.SIMPLEX_NOISE_SPARKLE]. + */ + fun setScreenColor(color: Int) { + setColorUniform("in_screenColor", color) + } + + /** + * Sets the background color of the effect. Alpha is ignored. If you are using [RenderEffect], + * no need to call this function since the background image of the View will be used. + */ fun setBackgroundColor(color: Int) { - setColorUniform("in_backgroundColor", color) + setInputShader(BACKGROUND_UNIFORM, SolidColorShader(color)) } /** @@ -163,7 +248,7 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : * * @param lumaMatteBlendFactor increases or decreases the amount of variance in noise. Setting * this a lower number removes variations. I.e. the turbulence noise will look more blended. - * Expected input range is [0, 1]. more dimmed. + * Expected input range is [0, 1]. * @param lumaMatteOverallBrightness adds the overall brightness of the turbulence noise. * Expected input range is [0, 1]. * diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt index 621ddf796f58..1da6c1ee6638 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt @@ -53,6 +53,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -71,6 +72,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.times import com.android.compose.PlatformButton import com.android.compose.animation.scene.ElementKey @@ -84,7 +86,9 @@ import com.android.systemui.bouncer.shared.model.BouncerActionButtonModel import com.android.systemui.bouncer.ui.BouncerDialogFactory import com.android.systemui.bouncer.ui.helper.BouncerSceneLayout import com.android.systemui.bouncer.ui.viewmodel.AuthMethodBouncerViewModel +import com.android.systemui.bouncer.ui.viewmodel.BouncerMessageViewModel import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel +import com.android.systemui.bouncer.ui.viewmodel.MessageViewModel import com.android.systemui.bouncer.ui.viewmodel.PasswordBouncerViewModel import com.android.systemui.bouncer.ui.viewmodel.PatternBouncerViewModel import com.android.systemui.bouncer.ui.viewmodel.PinBouncerViewModel @@ -166,7 +170,7 @@ private fun StandardLayout( modifier = Modifier.fillMaxWidth(), ) { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, modifier = Modifier, ) @@ -228,7 +232,7 @@ private fun SplitLayout( when (authMethod) { is PinBouncerViewModel -> { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, modifier = Modifier.align(Alignment.TopCenter), ) @@ -241,7 +245,7 @@ private fun SplitLayout( } is PatternBouncerViewModel -> { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, modifier = Modifier.align(Alignment.TopCenter), ) @@ -280,7 +284,7 @@ private fun SplitLayout( modifier = Modifier.fillMaxWidth().align(Alignment.Center), ) { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, ) OutputArea(viewModel = viewModel, modifier = Modifier.padding(top = 24.dp)) @@ -376,7 +380,7 @@ private fun BesideUserSwitcherLayout( modifier = Modifier.fillMaxWidth() ) { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, ) OutputArea(viewModel = viewModel, modifier = Modifier.padding(top = 24.dp)) @@ -441,7 +445,7 @@ private fun BelowUserSwitcherLayout( modifier = Modifier.fillMaxWidth(), ) { StatusMessage( - viewModel = viewModel, + viewModel = viewModel.message, ) OutputArea(viewModel = viewModel, modifier = Modifier.padding(top = 24.dp)) @@ -548,26 +552,44 @@ private fun SceneScope.FoldableScene( @Composable private fun StatusMessage( - viewModel: BouncerViewModel, + viewModel: BouncerMessageViewModel, modifier: Modifier = Modifier, ) { - val message: BouncerViewModel.MessageViewModel by viewModel.message.collectAsState() + val message: MessageViewModel? by viewModel.message.collectAsState() + + DisposableEffect(Unit) { + viewModel.onShown() + onDispose {} + } Crossfade( targetState = message, label = "Bouncer message", - animationSpec = if (message.isUpdateAnimated) tween() else snap(), + animationSpec = if (message?.isUpdateAnimated == true) tween() else snap(), modifier = modifier.fillMaxWidth(), - ) { - Box( - contentAlignment = Alignment.Center, + ) { msg -> + Column( + horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth(), ) { - Text( - text = it.text, - color = MaterialTheme.colorScheme.onSurface, - style = MaterialTheme.typography.bodyLarge, - ) + msg?.let { + Text( + text = it.text, + color = MaterialTheme.colorScheme.onSurface, + fontSize = 18.sp, + lineHeight = 24.sp, + overflow = TextOverflow.Ellipsis, + ) + Spacer(modifier = Modifier.size(10.dp)) + Text( + text = it.secondaryText ?: "", + color = MaterialTheme.colorScheme.onSurface, + fontSize = 14.sp, + lineHeight = 20.sp, + overflow = TextOverflow.Ellipsis, + maxLines = 2 + ) + } } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PasswordBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PasswordBouncer.kt index 2a13d4931b69..c34f2fd26d0c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PasswordBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PasswordBouncer.kt @@ -74,10 +74,7 @@ internal fun PasswordBouncer( val isImeSwitcherButtonVisible by viewModel.isImeSwitcherButtonVisible.collectAsState() val selectedUserId by viewModel.selectedUserId.collectAsState() - DisposableEffect(Unit) { - viewModel.onShown() - onDispose { viewModel.onHidden() } - } + DisposableEffect(Unit) { onDispose { viewModel.onHidden() } } LaunchedEffect(animateFailure) { if (animateFailure) { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt index 0a5f5d281f83..a78c2c0d16c6 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PatternBouncer.kt @@ -72,10 +72,7 @@ internal fun PatternBouncer( centerDotsVertically: Boolean, modifier: Modifier = Modifier, ) { - DisposableEffect(Unit) { - viewModel.onShown() - onDispose { viewModel.onHidden() } - } + DisposableEffect(Unit) { onDispose { viewModel.onHidden() } } val colCount = viewModel.columnCount val rowCount = viewModel.rowCount diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt index f505b9067140..5651a4646b2d 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt @@ -72,10 +72,7 @@ fun PinPad( verticalSpacing: Dp, modifier: Modifier = Modifier, ) { - DisposableEffect(Unit) { - viewModel.onShown() - onDispose { viewModel.onHidden() } - } + DisposableEffect(Unit) { onDispose { viewModel.onHidden() } } val isInputEnabled: Boolean by viewModel.isInputEnabled.collectAsState() val backspaceButtonAppearance by viewModel.backspaceButtonAppearance.collectAsState() diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/DefaultClockSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/DefaultClockSection.kt index 82e19e7c154c..1d86b15dbf4f 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/DefaultClockSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/DefaultClockSection.kt @@ -58,7 +58,6 @@ constructor( if (currentClock?.smallClock?.view == null) { return } - viewModel.clock = currentClock val context = LocalContext.current MovableElement(key = smallClockElementKey, modifier = modifier) { @@ -89,7 +88,6 @@ constructor( @Composable fun SceneScope.LargeClock(modifier: Modifier = Modifier) { val currentClock by viewModel.currentClock.collectAsState() - viewModel.clock = currentClock if (currentClock?.largeClock?.view == null) { return } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt index 5c9b271b342c..525ad161c94f 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt @@ -16,45 +16,33 @@ package com.android.systemui.keyguard.ui.composable.section -import android.content.Context import android.view.ViewGroup import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.android.compose.animation.scene.SceneScope import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.notifications.ui.composable.NotificationStack import com.android.systemui.scene.shared.flag.SceneContainerFlags -import com.android.systemui.statusbar.notification.stack.AmbientState import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController -import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer -import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder -import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel import javax.inject.Inject -import kotlinx.coroutines.CoroutineDispatcher @SysUISingleton class NotificationSection @Inject constructor( - @Application private val context: Context, private val viewModel: NotificationsPlaceholderViewModel, - controller: NotificationStackScrollLayoutController, sceneContainerFlags: SceneContainerFlags, sharedNotificationContainer: SharedNotificationContainer, sharedNotificationContainerViewModel: SharedNotificationContainerViewModel, stackScrollLayout: NotificationStackScrollLayout, - notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel, - ambientState: AmbientState, - notificationStackSizeCalculator: NotificationStackSizeCalculator, - @Main private val mainImmediateDispatcher: CoroutineDispatcher, + sharedNotificationContainerBinder: SharedNotificationContainerBinder, + notificationStackViewBinder: NotificationStackViewBinder, ) { init { @@ -73,24 +61,13 @@ constructor( sharedNotificationContainer.addNotificationStackScrollLayout(stackScrollLayout) } - SharedNotificationContainerBinder.bind( + sharedNotificationContainerBinder.bind( sharedNotificationContainer, sharedNotificationContainerViewModel, - sceneContainerFlags, - controller, - notificationStackSizeCalculator, - mainImmediateDispatcher = mainImmediateDispatcher, ) if (sceneContainerFlags.isEnabled()) { - NotificationStackAppearanceViewBinder.bind( - context, - sharedNotificationContainer, - notificationStackAppearanceViewModel, - ambientState, - controller, - mainImmediateDispatcher = mainImmediateDispatcher, - ) + notificationStackViewBinder.bindWhileAttached() } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index d78097815b5e..9ba5e3b846ed 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -57,6 +57,7 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.layout.positionInWindow import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize @@ -70,9 +71,10 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadi import com.android.systemui.notifications.ui.composable.Notifications.Form import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_CORNER_RADIUS import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_SCRIM_ALPHA +import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.ui.composable.ShadeHeader -import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder.SCRIM_CORNER_RADIUS +import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import kotlin.math.roundToInt @@ -139,6 +141,7 @@ fun SceneScope.NotificationScrollingStack( ) { val density = LocalDensity.current val screenCornerRadius = LocalScreenCornerRadius.current + val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius) val scrollState = rememberScrollState() val syntheticScroll = viewModel.syntheticScroll.collectAsState(0f) val expansionFraction by viewModel.expandFraction.collectAsState(0f) @@ -156,6 +159,8 @@ fun SceneScope.NotificationScrollingStack( val contentHeight = viewModel.intrinsicContentHeight.collectAsState() + val stackRounding = viewModel.stackRounding.collectAsState(StackRounding()) + // the offset for the notifications scrim. Its upper bound is 0, and its lower bound is // calculated in minScrimOffset. The scrim is the same height as the screen minus the // height of the Shade Header, and at rest (scrimOffset = 0) its top bound is at maxScrimStartY. @@ -222,16 +227,12 @@ fun SceneScope.NotificationScrollingStack( .graphicsLayer { shape = calculateCornerRadius( + scrimCornerRadius, screenCornerRadius, { expansionFraction }, layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade) ) - .let { - RoundedCornerShape( - topStart = it, - topEnd = it, - ) - } + .let { stackRounding.value.toRoundedCornerShape(it) } clip = true } ) { @@ -359,6 +360,7 @@ private fun SceneScope.NotificationPlaceholder( } private fun calculateCornerRadius( + scrimCornerRadius: Dp, screenCornerRadius: Dp, expansionFraction: () -> Float, transitioning: Boolean, @@ -366,12 +368,12 @@ private fun calculateCornerRadius( return if (transitioning) { lerp( start = screenCornerRadius.value, - stop = SCRIM_CORNER_RADIUS, - fraction = (expansionFraction() / EXPANSION_FOR_MAX_CORNER_RADIUS).coerceAtMost(1f), + stop = scrimCornerRadius.value, + fraction = (expansionFraction() / EXPANSION_FOR_MAX_CORNER_RADIUS).coerceIn(0f, 1f), ) .dp } else { - SCRIM_CORNER_RADIUS.dp + scrimCornerRadius } } @@ -394,5 +396,16 @@ private fun Modifier.debugBackground( this } +fun StackRounding.toRoundedCornerShape(radius: Dp): RoundedCornerShape { + val topRadius = if (roundTop) radius else 0.dp + val bottomRadius = if (roundBottom) radius else 0.dp + return RoundedCornerShape( + topStart = topRadius, + topEnd = topRadius, + bottomStart = bottomRadius, + bottomEnd = bottomRadius, + ) +} + private const val TAG = "FlexiNotifs" private val DEBUG_COLOR = Color(1f, 0f, 0f, 0.2f) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt index bc48dd1d431f..244861c277c6 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue @@ -36,7 +37,8 @@ import com.android.compose.modifiers.thenIf import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Companion.Collapsing import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Expanding -import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Unsquishing +import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.UnsquishingQQS +import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.UnsquishingQS import com.android.systemui.scene.shared.model.Scenes object QuickSettings { @@ -49,6 +51,8 @@ object QuickSettings { object Elements { val Content = ElementKey("QuickSettingsContent", scenePicker = MovableElementScenePicker(SCENES)) + val QuickQuickSettings = ElementKey("QuickQuickSettings") + val SplitShadeQuickSettings = ElementKey("SplitShadeQuickSettings") val FooterActions = ElementKey("QuickSettingsFooterActions") } @@ -78,12 +82,16 @@ private fun SceneScope.stateForQuickSettingsContent( is TransitionState.Transition -> with(transitionState) { when { - isSplitShade -> QSSceneAdapter.State.QS - fromScene == Scenes.Shade && toScene == Scenes.QuickSettings -> + isSplitShade -> UnsquishingQS(squishiness) + fromScene == Scenes.Shade && toScene == Scenes.QuickSettings -> { Expanding(progress) - fromScene == Scenes.QuickSettings && toScene == Scenes.Shade -> + } + fromScene == Scenes.QuickSettings && toScene == Scenes.Shade -> { Collapsing(progress) - fromScene == Scenes.Shade || toScene == Scenes.Shade -> Unsquishing(squishiness) + } + fromScene == Scenes.Shade || toScene == Scenes.Shade -> { + UnsquishingQQS(squishiness) + } fromScene == Scenes.QuickSettings || toScene == Scenes.QuickSettings -> { QSSceneAdapter.State.QS } @@ -119,6 +127,18 @@ fun SceneScope.QuickSettings( squishiness: Float = QuickSettings.SharedValues.SquishinessValues.Default, ) { val contentState = stateForQuickSettingsContent(isSplitShade, squishiness) + val transitionState = layoutState.transitionState + val isClosing = + transitionState is TransitionState.Transition && + transitionState.progress >= 0.9f && // almost done closing + !(layoutState.isTransitioning(to = Scenes.Shade) || + layoutState.isTransitioning(to = Scenes.QuickSettings)) + + if (isClosing) { + DisposableEffect(Unit) { + onDispose { qsSceneAdapter.setState(QSSceneAdapter.State.CLOSED) } + } + } MovableElement( key = QuickSettings.Elements.Content, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt index 5c6e1c89ad65..9b59708fe81d 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt @@ -13,11 +13,18 @@ fun TransitionBuilder.goneToShadeTransition( ) { spec = tween(durationMillis = DefaultDuration.times(durationScale).inWholeMilliseconds.toInt()) - fractionRange(start = .58f) { fade(ShadeHeader.Elements.Clock) } - fractionRange(start = .58f) { fade(ShadeHeader.Elements.CollapsedContentStart) } - fractionRange(start = .58f) { fade(ShadeHeader.Elements.CollapsedContentEnd) } - fractionRange(start = .58f) { fade(ShadeHeader.Elements.PrivacyChip) } - translate(QuickSettings.Elements.Content, y = -ShadeHeader.Dimensions.CollapsedHeight * .66f) + fractionRange(start = .58f) { + fade(ShadeHeader.Elements.Clock) + fade(ShadeHeader.Elements.CollapsedContentStart) + fade(ShadeHeader.Elements.CollapsedContentEnd) + fade(ShadeHeader.Elements.PrivacyChip) + fade(QuickSettings.Elements.SplitShadeQuickSettings) + fade(QuickSettings.Elements.FooterActions) + } + translate( + QuickSettings.Elements.QuickQuickSettings, + y = -ShadeHeader.Dimensions.CollapsedHeight * .66f + ) translate(Notifications.Elements.NotificationScrim, Edge.Top, false) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt index 15e7b511915e..85798acd0dcd 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt @@ -55,6 +55,7 @@ import androidx.compose.ui.unit.dp import com.android.compose.animation.scene.ElementKey import com.android.compose.animation.scene.LowestZIndexScenePicker import com.android.compose.animation.scene.SceneScope +import com.android.compose.animation.scene.TransitionState import com.android.compose.animation.scene.UserAction import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.animateSceneFloatAsState @@ -222,15 +223,17 @@ private fun SceneScope.SingleShade( horizontal = Shade.Dimensions.HorizontalPadding ) ) - QuickSettings( - viewModel.qsSceneAdapter, - { - (viewModel.qsSceneAdapter.qqsHeight * tileSquishiness) - .roundToInt() - }, - isSplitShade = false, - squishiness = tileSquishiness, - ) + Box(Modifier.element(QuickSettings.Elements.QuickQuickSettings)) { + QuickSettings( + viewModel.qsSceneAdapter, + { + (viewModel.qsSceneAdapter.qqsHeight * tileSquishiness) + .roundToInt() + }, + isSplitShade = false, + squishiness = tileSquishiness, + ) + } MediaIfVisible( viewModel = viewModel, @@ -280,6 +283,8 @@ private fun SceneScope.SplitShade( val lifecycleOwner = LocalLifecycleOwner.current val footerActionsViewModel = remember(lifecycleOwner, viewModel) { viewModel.getFooterActionsViewModel(lifecycleOwner) } + val tileSquishiness by + animateSceneFloatAsState(value = 1f, key = QuickSettings.SharedValues.TilesSquishiness) val navBarBottomHeight = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() val density = LocalDensity.current @@ -290,6 +295,7 @@ private fun SceneScope.SplitShade( } val quickSettingsScrollState = rememberScrollState() + val isScrollable = layoutState.transitionState is TransitionState.Idle LaunchedEffect(isCustomizing, quickSettingsScrollState) { if (isCustomizing) { quickSettingsScrollState.scrollTo(0) @@ -318,31 +324,41 @@ private fun SceneScope.SplitShade( Column( verticalArrangement = Arrangement.Top, modifier = - Modifier.weight(1f).fillMaxHeight().thenIf(!isCustomizing) { - Modifier.verticalNestedScrollToScene() - .verticalScroll(quickSettingsScrollState) - .clipScrollableContainer(Orientation.Horizontal) - .padding(bottom = navBarBottomHeight) - } + Modifier.weight(1f).fillMaxSize().thenIf(!isCustomizing) { + Modifier.padding(bottom = navBarBottomHeight) + }, ) { - QuickSettings( - qsSceneAdapter = viewModel.qsSceneAdapter, - heightProvider = { viewModel.qsSceneAdapter.qsHeight }, - isSplitShade = true, - modifier = Modifier.fillMaxWidth(), - ) - - MediaIfVisible( - viewModel = viewModel, - mediaCarouselController = mediaCarouselController, - mediaHost = mediaHost, - modifier = Modifier.fillMaxWidth(), - ) - - Spacer( - modifier = Modifier.weight(1f), - ) + Column( + modifier = + Modifier.fillMaxSize().weight(1f).thenIf(!isCustomizing) { + Modifier.verticalNestedScrollToScene() + .verticalScroll( + quickSettingsScrollState, + enabled = isScrollable + ) + .clipScrollableContainer(Orientation.Horizontal) + } + ) { + Box( + modifier = + Modifier.element(QuickSettings.Elements.SplitShadeQuickSettings) + ) { + QuickSettings( + qsSceneAdapter = viewModel.qsSceneAdapter, + heightProvider = { viewModel.qsSceneAdapter.qsHeight }, + isSplitShade = true, + modifier = Modifier.fillMaxWidth(), + squishiness = tileSquishiness, + ) + } + MediaIfVisible( + viewModel = viewModel, + mediaCarouselController = mediaCarouselController, + mediaHost = mediaHost, + modifier = Modifier.fillMaxWidth(), + ) + } FooterActionsWithAnimatedVisibility( viewModel = footerActionsViewModel, isCustomizing = isCustomizing, @@ -354,7 +370,8 @@ private fun SceneScope.SplitShade( NotificationScrollingStack( viewModel = viewModel.notifications, maxScrimTop = { 0f }, - modifier = Modifier.weight(1f).fillMaxHeight(), + modifier = + Modifier.weight(1f).fillMaxHeight().padding(bottom = navBarBottomHeight), ) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt index 24351706cb46..248dfeee2281 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt @@ -18,6 +18,7 @@ package com.android.systemui.volume.panel.component.volume.ui.composable import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.basicMarquee +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.size import androidx.compose.material3.IconButton @@ -27,6 +28,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.ProgressBarRangeInfo @@ -38,6 +40,7 @@ import androidx.compose.ui.semantics.setProgress import androidx.compose.ui.unit.dp import com.android.compose.PlatformSlider import com.android.compose.PlatformSliderColors +import com.android.systemui.common.shared.model.Icon import com.android.systemui.common.ui.compose.Icon import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.SliderState @@ -86,18 +89,11 @@ fun VolumeSlider( Text(text = state.valueText, color = LocalContentColor.current) } else { state.icon?.let { - IconButton( - onClick = onIconTapped, - colors = - IconButtonColors( - contentColor = LocalContentColor.current, - containerColor = Color.Transparent, - disabledContentColor = LocalContentColor.current, - disabledContainerColor = Color.Transparent, - ) - ) { - Icon(modifier = Modifier.size(24.dp), icon = it) - } + SliderIcon( + icon = it, + onIconTapped = onIconTapped, + isTappable = state.isMutable, + ) } } }, @@ -127,3 +123,32 @@ fun VolumeSlider( } ) } + +@Composable +private fun SliderIcon( + icon: Icon, + onIconTapped: () -> Unit, + isTappable: Boolean, + modifier: Modifier = Modifier +) { + if (isTappable) { + IconButton( + modifier = modifier, + onClick = onIconTapped, + colors = + IconButtonColors( + contentColor = LocalContentColor.current, + containerColor = Color.Transparent, + disabledContentColor = LocalContentColor.current, + disabledContainerColor = Color.Transparent, + ), + content = { Icon(modifier = Modifier.size(24.dp), icon = icon) }, + ) + } else { + Box( + modifier = modifier, + contentAlignment = Alignment.Center, + content = { Icon(modifier = Modifier.size(24.dp), icon = icon) }, + ) + } +} diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Scene.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Scene.kt index af51cee2a255..dc3b612d3594 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Scene.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Scene.kt @@ -73,7 +73,7 @@ internal class Scene( internal class SceneScopeImpl( private val layoutImpl: SceneTransitionLayoutImpl, private val scene: Scene, -) : SceneScope { +) : SceneScope, ElementStateScope by layoutImpl.elementStateScope { override val layoutState: SceneTransitionLayoutState = layoutImpl.state override fun Modifier.element(key: ElementKey): Modifier { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt index b7e2dd13f321..ebc90990275d 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt @@ -131,9 +131,30 @@ interface SceneTransitionLayoutScope { */ @DslMarker annotation class ElementDsl +/** A scope that can be used to query the target state of an element or scene. */ +interface ElementStateScope { + /** + * Return the *target* size of [this] element in the given [scene], i.e. the size of the element + * when idle, or `null` if the element is not composed and measured in that scene (yet). + */ + fun ElementKey.targetSize(scene: SceneKey): IntSize? + + /** + * Return the *target* offset of [this] element in the given [scene], i.e. the size of the + * element when idle, or `null` if the element is not composed and placed in that scene (yet). + */ + fun ElementKey.targetOffset(scene: SceneKey): Offset? + + /** + * Return the *target* size of [this] scene, i.e. the size of the scene when idle, or `null` if + * the scene was never composed. + */ + fun SceneKey.targetSize(): IntSize? +} + @Stable @ElementDsl -interface BaseSceneScope { +interface BaseSceneScope : ElementStateScope { /** The state of the [SceneTransitionLayout] in which this scene is contained. */ val layoutState: SceneTransitionLayoutState @@ -415,25 +436,7 @@ interface UserActionDistance { ): Float } -interface UserActionDistanceScope : Density { - /** - * Return the *target* size of [this] element in the given [scene], i.e. the size of the element - * when idle, or `null` if the element is not composed and measured in that scene (yet). - */ - fun ElementKey.targetSize(scene: SceneKey): IntSize? - - /** - * Return the *target* offset of [this] element in the given [scene], i.e. the size of the - * element when idle, or `null` if the element is not composed and placed in that scene (yet). - */ - fun ElementKey.targetOffset(scene: SceneKey): Offset? - - /** - * Return the *target* size of [this] scene, i.e. the size of the scene when idle, or `null` if - * the scene was never composed. - */ - fun SceneKey.targetSize(): IntSize? -} +interface UserActionDistanceScope : Density, ElementStateScope /** The user action has a fixed [absoluteDistance]. */ class FixedDistance(private val distance: Dp) : UserActionDistance { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt index 25b0895fafb3..b1cfdcf07977 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt @@ -98,6 +98,7 @@ internal class SceneTransitionLayoutImpl( private val horizontalDraggableHandler: DraggableHandlerImpl private val verticalDraggableHandler: DraggableHandlerImpl + internal val elementStateScope = ElementStateScopeImpl(this) private var _userActionDistanceScope: UserActionDistanceScope? = null internal val userActionDistanceScope: UserActionDistanceScope get() = diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt index 228d19f09cff..b7abb33c1242 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt @@ -19,15 +19,9 @@ package com.android.compose.animation.scene import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.IntSize -internal class UserActionDistanceScopeImpl( +internal class ElementStateScopeImpl( private val layoutImpl: SceneTransitionLayoutImpl, -) : UserActionDistanceScope { - override val density: Float - get() = layoutImpl.density.density - - override val fontScale: Float - get() = layoutImpl.density.fontScale - +) : ElementStateScope { override fun ElementKey.targetSize(scene: SceneKey): IntSize? { return layoutImpl.elements[this]?.sceneStates?.get(scene)?.targetSize.takeIf { it != Element.SizeUnspecified @@ -44,3 +38,13 @@ internal class UserActionDistanceScopeImpl( return layoutImpl.scenes[this]?.targetSize.takeIf { it != IntSize.Zero } } } + +internal class UserActionDistanceScopeImpl( + private val layoutImpl: SceneTransitionLayoutImpl, +) : UserActionDistanceScope, ElementStateScope by layoutImpl.elementStateScope { + override val density: Float + get() = layoutImpl.density.density + + override val fontScale: Float + get() = layoutImpl.density.fontScale +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt index 707777b9f728..b0d03b15d310 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorTest.kt @@ -71,34 +71,6 @@ class BouncerInteractorTest : SysuiTestCase() { } @Test - fun pinAuthMethod() = - testScope.runTest { - val message by collectLastValue(underTest.message) - - kosmos.fakeAuthenticationRepository.setAuthenticationMethod( - AuthenticationMethodModel.Pin - ) - runCurrent() - underTest.clearMessage() - assertThat(message).isNull() - - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PIN) - - // Wrong input. - assertThat(underTest.authenticate(listOf(9, 8, 7))) - .isEqualTo(AuthenticationResult.FAILED) - assertThat(message).isEqualTo(MESSAGE_WRONG_PIN) - - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PIN) - - // Correct input. - assertThat(underTest.authenticate(FakeAuthenticationRepository.DEFAULT_PIN)) - .isEqualTo(AuthenticationResult.SUCCEEDED) - } - - @Test fun pinAuthMethod_sim_skipsAuthentication() = testScope.runTest { kosmos.fakeAuthenticationRepository.setAuthenticationMethod( @@ -146,8 +118,6 @@ class BouncerInteractorTest : SysuiTestCase() { @Test fun pinAuthMethod_tryAutoConfirm_withoutAutoConfirmPin() = testScope.runTest { - val message by collectLastValue(underTest.message) - kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pin ) @@ -156,7 +126,6 @@ class BouncerInteractorTest : SysuiTestCase() { // Incomplete input. assertThat(underTest.authenticate(listOf(1, 2), tryAutoConfirm = true)) .isEqualTo(AuthenticationResult.SKIPPED) - assertThat(message).isNull() // Correct input. assertThat( @@ -166,28 +135,19 @@ class BouncerInteractorTest : SysuiTestCase() { ) ) .isEqualTo(AuthenticationResult.SKIPPED) - assertThat(message).isNull() } @Test fun passwordAuthMethod() = testScope.runTest { - val message by collectLastValue(underTest.message) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Password ) runCurrent() - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PASSWORD) - // Wrong input. assertThat(underTest.authenticate("alohamora".toList())) .isEqualTo(AuthenticationResult.FAILED) - assertThat(message).isEqualTo(MESSAGE_WRONG_PASSWORD) - - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PASSWORD) // Too short input. assertThat( @@ -201,7 +161,6 @@ class BouncerInteractorTest : SysuiTestCase() { ) ) .isEqualTo(AuthenticationResult.SKIPPED) - assertThat(message).isEqualTo(MESSAGE_WRONG_PASSWORD) // Correct input. assertThat(underTest.authenticate("password".toList())) @@ -211,13 +170,10 @@ class BouncerInteractorTest : SysuiTestCase() { @Test fun patternAuthMethod() = testScope.runTest { - val message by collectLastValue(underTest.message) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pattern ) runCurrent() - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PATTERN) // Wrong input. val wrongPattern = @@ -231,10 +187,6 @@ class BouncerInteractorTest : SysuiTestCase() { assertThat(wrongPattern.size) .isAtLeast(kosmos.fakeAuthenticationRepository.minPatternLength) assertThat(underTest.authenticate(wrongPattern)).isEqualTo(AuthenticationResult.FAILED) - assertThat(message).isEqualTo(MESSAGE_WRONG_PATTERN) - - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PATTERN) // Too short input. val tooShortPattern = @@ -244,10 +196,6 @@ class BouncerInteractorTest : SysuiTestCase() { ) assertThat(underTest.authenticate(tooShortPattern)) .isEqualTo(AuthenticationResult.SKIPPED) - assertThat(message).isEqualTo(MESSAGE_WRONG_PATTERN) - - underTest.resetMessage() - assertThat(message).isEqualTo(MESSAGE_ENTER_YOUR_PATTERN) // Correct input. assertThat(underTest.authenticate(FakeAuthenticationRepository.PATTERN)) @@ -258,7 +206,6 @@ class BouncerInteractorTest : SysuiTestCase() { fun lockoutStarted() = testScope.runTest { val lockoutStartedEvents by collectValues(underTest.onLockoutStarted) - val message by collectLastValue(underTest.message) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pin @@ -272,17 +219,14 @@ class BouncerInteractorTest : SysuiTestCase() { .isEqualTo(AuthenticationResult.FAILED) if (times < FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT - 1) { assertThat(lockoutStartedEvents).isEmpty() - assertThat(message).isNotEmpty() } } assertThat(authenticationInteractor.lockoutEndTimestamp).isNotNull() assertThat(lockoutStartedEvents.size).isEqualTo(1) - assertThat(message).isNull() // Advance the time to finish the lockout: advanceTimeBy(FakeAuthenticationRepository.LOCKOUT_DURATION_SECONDS.seconds) assertThat(authenticationInteractor.lockoutEndTimestamp).isNull() - assertThat(message).isNull() assertThat(lockoutStartedEvents.size).isEqualTo(1) // Trigger lockout again: diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt index 701b7039a1ed..c878e0b4757d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractorTest.kt @@ -17,7 +17,6 @@ package com.android.systemui.bouncer.domain.interactor import android.content.pm.UserInfo -import android.os.Handler import android.testing.TestableLooper import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest @@ -28,27 +27,25 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.data.repository.FaceSensorInfo -import com.android.systemui.biometrics.data.repository.FakeFacePropertyRepository +import com.android.systemui.biometrics.data.repository.fakeFacePropertyRepository +import com.android.systemui.biometrics.data.repository.fakeFingerprintPropertyRepository import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.bouncer.data.repository.BouncerMessageRepositoryImpl -import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository +import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository import com.android.systemui.bouncer.shared.model.BouncerMessageModel -import com.android.systemui.bouncer.ui.BouncerView -import com.android.systemui.classifier.FalsingCollector import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFingerprintAuthInteractor import com.android.systemui.flags.SystemPropertiesHelper -import com.android.systemui.keyguard.DismissCallbackRegistry -import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFaceAuthRepository -import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.FakeTrustRepository +import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeTrustRepository import com.android.systemui.keyguard.shared.model.AuthenticationFlags +import com.android.systemui.kosmos.testScope import com.android.systemui.res.R.string.kg_too_many_failed_attempts_countdown import com.android.systemui.res.R.string.kg_trust_agent_disabled -import com.android.systemui.statusbar.policy.KeyguardStateController -import com.android.systemui.user.data.repository.FakeUserRepository -import com.android.systemui.user.domain.interactor.SelectedUserInteractor +import com.android.systemui.testKosmos +import com.android.systemui.user.data.repository.fakeUserRepository import com.android.systemui.util.mockito.KotlinArgumentCaptor import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat @@ -61,7 +58,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.eq import org.mockito.Mock -import org.mockito.Mockito.mock import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -70,34 +66,22 @@ import org.mockito.MockitoAnnotations @TestableLooper.RunWithLooper(setAsMainLooper = true) @RunWith(AndroidJUnit4::class) class BouncerMessageInteractorTest : SysuiTestCase() { - + private val kosmos = testKosmos() private val countDownTimerCallback = KotlinArgumentCaptor(CountDownTimerCallback::class.java) private val repository = BouncerMessageRepositoryImpl() - private val userRepository = FakeUserRepository() - private val fakeTrustRepository = FakeTrustRepository() - private val fakeFacePropertyRepository = FakeFacePropertyRepository() - private val bouncerRepository = FakeKeyguardBouncerRepository() - private val fakeDeviceEntryFingerprintAuthRepository = - FakeDeviceEntryFingerprintAuthRepository() - private val fakeDeviceEntryFaceAuthRepository = FakeDeviceEntryFaceAuthRepository() - private val biometricSettingsRepository: FakeBiometricSettingsRepository = - FakeBiometricSettingsRepository() + private val biometricSettingsRepository = kosmos.fakeBiometricSettingsRepository + private val testScope = kosmos.testScope @Mock private lateinit var updateMonitor: KeyguardUpdateMonitor @Mock private lateinit var securityModel: KeyguardSecurityModel @Mock private lateinit var countDownTimerUtil: CountDownTimerUtil @Mock private lateinit var systemPropertiesHelper: SystemPropertiesHelper - @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor - @Mock private lateinit var mSelectedUserInteractor: SelectedUserInteractor - private lateinit var primaryBouncerInteractor: PrimaryBouncerInteractor - private lateinit var testScope: TestScope private lateinit var underTest: BouncerMessageInteractor @Before fun setUp() { MockitoAnnotations.initMocks(this) - userRepository.setUserInfos(listOf(PRIMARY_USER)) - testScope = TestScope() + kosmos.fakeUserRepository.setUserInfos(listOf(PRIMARY_USER)) allowTestableLooperAsMainThread() whenever(securityModel.getSecurityMode(PRIMARY_USER_ID)).thenReturn(PIN) biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) @@ -105,44 +89,28 @@ class BouncerMessageInteractorTest : SysuiTestCase() { } suspend fun TestScope.init() { - userRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) mSetFlagsRule.enableFlags(Flags.FLAG_REVAMPED_BOUNCER_MESSAGES) - primaryBouncerInteractor = - PrimaryBouncerInteractor( - bouncerRepository, - mock(BouncerView::class.java), - mock(Handler::class.java), - mock(KeyguardStateController::class.java), - mock(KeyguardSecurityModel::class.java), - mock(PrimaryBouncerCallbackInteractor::class.java), - mock(FalsingCollector::class.java), - mock(DismissCallbackRegistry::class.java), - context, - keyguardUpdateMonitor, - fakeTrustRepository, - testScope.backgroundScope, - mSelectedUserInteractor, - mock(DeviceEntryFaceAuthInteractor::class.java), - ) underTest = BouncerMessageInteractor( repository = repository, - userRepository = userRepository, + userRepository = kosmos.fakeUserRepository, countDownTimerUtil = countDownTimerUtil, updateMonitor = updateMonitor, biometricSettingsRepository = biometricSettingsRepository, - applicationScope = this.backgroundScope, - trustRepository = fakeTrustRepository, + applicationScope = testScope.backgroundScope, + trustRepository = kosmos.fakeTrustRepository, systemPropertiesHelper = systemPropertiesHelper, - primaryBouncerInteractor = primaryBouncerInteractor, - facePropertyRepository = fakeFacePropertyRepository, - deviceEntryFingerprintAuthRepository = fakeDeviceEntryFingerprintAuthRepository, - faceAuthRepository = fakeDeviceEntryFaceAuthRepository, + primaryBouncerInteractor = kosmos.primaryBouncerInteractor, + facePropertyRepository = kosmos.fakeFacePropertyRepository, + deviceEntryFingerprintAuthInteractor = kosmos.deviceEntryFingerprintAuthInteractor, + faceAuthRepository = kosmos.fakeDeviceEntryFaceAuthRepository, securityModel = securityModel ) biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) - fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) - bouncerRepository.setPrimaryShow(true) + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) + kosmos.fakeFingerprintPropertyRepository.supportsSideFps() + kosmos.fakeKeyguardBouncerRepository.setPrimaryShow(true) runCurrent() } @@ -268,7 +236,7 @@ class BouncerMessageInteractorTest : SysuiTestCase() { init() val lockoutMessage by collectLastValue(underTest.bouncerMessage) - fakeDeviceEntryFaceAuthRepository.setLockedOut(true) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(true) runCurrent() assertThat(primaryResMessage(lockoutMessage)) @@ -276,7 +244,7 @@ class BouncerMessageInteractorTest : SysuiTestCase() { assertThat(secondaryResMessage(lockoutMessage)) .isEqualTo("Can’t unlock with face. Too many attempts.") - fakeDeviceEntryFaceAuthRepository.setLockedOut(false) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(false) runCurrent() assertThat(primaryResMessage(lockoutMessage)) @@ -289,15 +257,17 @@ class BouncerMessageInteractorTest : SysuiTestCase() { testScope.runTest { init() val lockoutMessage by collectLastValue(underTest.bouncerMessage) - fakeFacePropertyRepository.setSensorInfo(FaceSensorInfo(1, SensorStrength.STRONG)) - fakeDeviceEntryFaceAuthRepository.setLockedOut(true) + kosmos.fakeFacePropertyRepository.setSensorInfo( + FaceSensorInfo(1, SensorStrength.STRONG) + ) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(true) runCurrent() assertThat(primaryResMessage(lockoutMessage)).isEqualTo("Enter PIN") assertThat(secondaryResMessage(lockoutMessage)) .isEqualTo("PIN is required after too many attempts") - fakeDeviceEntryFaceAuthRepository.setLockedOut(false) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(false) runCurrent() assertThat(primaryResMessage(lockoutMessage)) @@ -311,14 +281,14 @@ class BouncerMessageInteractorTest : SysuiTestCase() { init() val lockedOutMessage by collectLastValue(underTest.bouncerMessage) - fakeDeviceEntryFingerprintAuthRepository.setLockedOut(true) + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(true) runCurrent() assertThat(primaryResMessage(lockedOutMessage)).isEqualTo("Enter PIN") assertThat(secondaryResMessage(lockedOutMessage)) .isEqualTo("PIN is required after too many attempts") - fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) runCurrent() assertThat(primaryResMessage(lockedOutMessage)) @@ -327,6 +297,19 @@ class BouncerMessageInteractorTest : SysuiTestCase() { } @Test + fun onUdfpsFingerprint_DoesNotShowFingerprintMessage() = + testScope.runTest { + init() + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) + kosmos.fakeFingerprintPropertyRepository.supportsUdfps() + val lockedOutMessage by collectLastValue(underTest.bouncerMessage) + + runCurrent() + + assertThat(primaryResMessage(lockedOutMessage)).isEqualTo("Enter PIN") + } + + @Test fun onRestartForMainlineUpdate_shouldProvideRelevantMessage() = testScope.runTest { init() @@ -344,9 +327,10 @@ class BouncerMessageInteractorTest : SysuiTestCase() { fun onAuthFlagsChanged_withTrustNotManagedAndNoBiometrics_isANoop() = testScope.runTest { init() - fakeTrustRepository.setTrustUsuallyManaged(false) + kosmos.fakeTrustRepository.setTrustUsuallyManaged(false) biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + runCurrent() val defaultMessage = Pair("Enter PIN", null) @@ -377,12 +361,13 @@ class BouncerMessageInteractorTest : SysuiTestCase() { testScope.runTest { init() - userRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + runCurrent() - fakeTrustRepository.setCurrentUserTrustManaged(true) - fakeTrustRepository.setTrustUsuallyManaged(true) + kosmos.fakeTrustRepository.setCurrentUserTrustManaged(true) + kosmos.fakeTrustRepository.setTrustUsuallyManaged(true) val defaultMessage = Pair("Enter PIN", null) @@ -415,8 +400,8 @@ class BouncerMessageInteractorTest : SysuiTestCase() { fun authFlagsChanges_withFaceEnrolled_providesDifferentMessages() = testScope.runTest { init() - userRepository.setSelectedUserInfo(PRIMARY_USER) - fakeTrustRepository.setTrustUsuallyManaged(false) + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeTrustRepository.setTrustUsuallyManaged(false) biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) @@ -453,12 +438,13 @@ class BouncerMessageInteractorTest : SysuiTestCase() { fun authFlagsChanges_withFingerprintEnrolled_providesDifferentMessages() = testScope.runTest { init() - userRepository.setSelectedUserInfo(PRIMARY_USER) - fakeTrustRepository.setCurrentUserTrustManaged(false) + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeTrustRepository.setCurrentUserTrustManaged(false) biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + runCurrent() verifyMessagesForAuthFlag( LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED to @@ -466,6 +452,7 @@ class BouncerMessageInteractorTest : SysuiTestCase() { ) biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(false) + runCurrent() verifyMessagesForAuthFlag( LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST to diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt index d30e33332926..c9fa671ad34f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModelTest.kt @@ -48,6 +48,7 @@ class AuthMethodBouncerViewModelTest : SysuiTestCase() { isInputEnabled = MutableStateFlow(true), simBouncerInteractor = kosmos.simBouncerInteractor, authenticationMethod = AuthenticationMethodModel.Pin, + onIntentionalUserInput = {}, ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelTest.kt new file mode 100644 index 000000000000..16ec9aa897fb --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelTest.kt @@ -0,0 +1,455 @@ +/* + * Copyright (C) 2024 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.bouncer.ui.viewmodel + +import android.content.pm.UserInfo +import android.hardware.biometrics.BiometricFaceConstants +import android.hardware.fingerprint.FingerprintManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.internal.widget.LockPatternUtils +import com.android.systemui.SysuiTestCase +import com.android.systemui.authentication.data.repository.FakeAuthenticationRepository +import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository +import com.android.systemui.authentication.domain.interactor.authenticationInteractor +import com.android.systemui.authentication.shared.model.AuthenticationMethodModel +import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Pattern +import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Pin +import com.android.systemui.biometrics.data.repository.FaceSensorInfo +import com.android.systemui.biometrics.data.repository.fakeFacePropertyRepository +import com.android.systemui.biometrics.data.repository.fakeFingerprintPropertyRepository +import com.android.systemui.biometrics.shared.model.SensorStrength +import com.android.systemui.bouncer.domain.interactor.bouncerInteractor +import com.android.systemui.bouncer.shared.flag.fakeComposeBouncerFlags +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor +import com.android.systemui.deviceentry.shared.model.ErrorFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.FailedFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.HelpFaceAuthenticationStatus +import com.android.systemui.flags.fakeSystemPropertiesHelper +import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeTrustRepository +import com.android.systemui.keyguard.shared.model.AuthenticationFlags +import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus +import com.android.systemui.kosmos.testScope +import com.android.systemui.res.R +import com.android.systemui.testKosmos +import com.android.systemui.user.data.repository.fakeUserRepository +import com.google.common.truth.Truth.assertThat +import kotlin.time.Duration.Companion.seconds +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceTimeBy +import kotlinx.coroutines.test.currentTime +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +class BouncerMessageViewModelTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val authenticationInteractor by lazy { kosmos.authenticationInteractor } + private val bouncerInteractor by lazy { kosmos.bouncerInteractor } + private lateinit var underTest: BouncerMessageViewModel + + @Before + fun setUp() { + kosmos.fakeUserRepository.setUserInfos(listOf(PRIMARY_USER)) + kosmos.fakeComposeBouncerFlags.composeBouncerEnabled = true + underTest = kosmos.bouncerMessageViewModel + overrideResource(R.string.kg_trust_agent_disabled, "Trust agent is unavailable") + kosmos.fakeSystemPropertiesHelper.set( + DeviceEntryInteractor.SYS_BOOT_REASON_PROP, + "not mainline reboot" + ) + } + + @Test + fun message_defaultMessage_basedOnAuthMethod() = + testScope.runTest { + val message by collectLastValue(underTest.message) + + kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) + kosmos.fakeFingerprintPropertyRepository.supportsSideFps() + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + runCurrent() + + assertThat(message!!.text).isEqualTo("Unlock with PIN or fingerprint") + + kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pattern) + runCurrent() + assertThat(message!!.text).isEqualTo("Unlock with pattern or fingerprint") + + kosmos.fakeAuthenticationRepository.setAuthenticationMethod( + AuthenticationMethodModel.Password + ) + runCurrent() + assertThat(message!!.text).isEqualTo("Unlock with password or fingerprint") + } + + @Test + fun message() = + testScope.runTest { + val message by collectLastValue(underTest.message) + kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) + assertThat(message?.isUpdateAnimated).isTrue() + + repeat(FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT) { + bouncerInteractor.authenticate(WRONG_PIN) + } + assertThat(message?.isUpdateAnimated).isFalse() + + val lockoutEndMs = authenticationInteractor.lockoutEndTimestamp ?: 0 + advanceTimeBy(lockoutEndMs - testScope.currentTime) + assertThat(message?.isUpdateAnimated).isTrue() + } + + @Test + fun lockoutMessage() = + testScope.runTest { + val message by collectLastValue(underTest.message) + kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) + assertThat(kosmos.fakeAuthenticationRepository.lockoutEndTimestamp).isNull() + runCurrent() + + repeat(FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT) { times -> + bouncerInteractor.authenticate(WRONG_PIN) + runCurrent() + if (times < FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT - 1) { + assertThat(message?.text).isEqualTo("Wrong PIN. Try again.") + assertThat(message?.isUpdateAnimated).isTrue() + } + } + val lockoutSeconds = FakeAuthenticationRepository.LOCKOUT_DURATION_SECONDS + assertTryAgainMessage(message?.text, lockoutSeconds) + assertThat(message?.isUpdateAnimated).isFalse() + + repeat(FakeAuthenticationRepository.LOCKOUT_DURATION_SECONDS) { time -> + advanceTimeBy(1.seconds) + val remainingSeconds = lockoutSeconds - time - 1 + if (remainingSeconds > 0) { + assertTryAgainMessage(message?.text, remainingSeconds) + } + } + assertThat(message?.text).isEqualTo("Enter PIN") + assertThat(message?.isUpdateAnimated).isTrue() + } + + @Test + fun defaultMessage_mapsToDeviceEntryRestrictionReason_whenTrustAgentIsEnabled() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + kosmos.fakeTrustRepository.setTrustUsuallyManaged(true) + kosmos.fakeTrustRepository.setCurrentUserTrustManaged(false) + runCurrent() + + val defaultMessage = Pair("Enter PIN", null) + + verifyMessagesForAuthFlags( + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED to defaultMessage, + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT to + Pair("Enter PIN", "PIN is required after device restarts"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT to + Pair("Enter PIN", "Added security required. PIN not used for a while."), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW to + Pair("Enter PIN", "For added security, device was locked by work policy"), + LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST to + Pair("Enter PIN", "Trust agent is unavailable"), + LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED to + Pair("Enter PIN", "Trust agent is unavailable"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to + Pair("Enter PIN", "PIN is required after lockdown"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE to + Pair("Enter PIN", "PIN required for additional security"), + LockPatternUtils.StrongAuthTracker + .STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT to + Pair( + "Enter PIN", + "Added security required. Device wasn’t unlocked for a while." + ), + ) + } + + @Test + fun defaultMessage_mapsToDeviceEntryRestrictionReason_whenFingerprintIsAvailable() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeFingerprintPropertyRepository.supportsSideFps() + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + kosmos.fakeTrustRepository.setCurrentUserTrustManaged(false) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) + runCurrent() + + verifyMessagesForAuthFlags( + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED to + Pair("Unlock with PIN or fingerprint", null), + LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST to + Pair("Unlock with PIN or fingerprint", null), + LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED to + Pair("Unlock with PIN or fingerprint", null), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT to + Pair("Enter PIN", "PIN is required after device restarts"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT to + Pair("Enter PIN", "Added security required. PIN not used for a while."), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW to + Pair("Enter PIN", "For added security, device was locked by work policy"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to + Pair("Enter PIN", "PIN is required after lockdown"), + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE to + Pair("Enter PIN", "PIN required for additional security"), + LockPatternUtils.StrongAuthTracker + .STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT to + Pair( + "Unlock with PIN or fingerprint", + "Added security required. Device wasn’t unlocked for a while." + ), + ) + } + + @Test + fun onFingerprintLockout_messageUpdated() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeFingerprintPropertyRepository.supportsSideFps() + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + val lockedOutMessage by collectLastValue(underTest.message) + + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(true) + runCurrent() + + assertThat(lockedOutMessage?.text).isEqualTo("Enter PIN") + assertThat(lockedOutMessage?.secondaryText) + .isEqualTo("PIN is required after too many attempts") + + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) + runCurrent() + + assertThat(lockedOutMessage?.text).isEqualTo("Unlock with PIN or fingerprint") + assertThat(lockedOutMessage?.secondaryText.isNullOrBlank()).isTrue() + } + + @Test + fun onUdfpsFingerprint_DoesNotShowFingerprintMessage() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeFingerprintPropertyRepository.supportsUdfps() + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + kosmos.fakeDeviceEntryFingerprintAuthRepository.setLockedOut(false) + val message by collectLastValue(underTest.message) + + runCurrent() + + assertThat(message?.text).isEqualTo("Enter PIN") + } + + @Test + fun onRestartForMainlineUpdate_shouldProvideRelevantMessage() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeSystemPropertiesHelper.set("sys.boot.reason.last", "reboot,mainline_update") + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + runCurrent() + + verifyMessagesForAuthFlags( + LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT to + Pair("Enter PIN", "Device updated. Enter PIN to continue.") + ) + } + + @Test + fun onFaceLockout_whenItIsClass3_shouldProvideRelevantMessage() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + val lockoutMessage by collectLastValue(underTest.message) + kosmos.fakeFacePropertyRepository.setSensorInfo( + FaceSensorInfo(1, SensorStrength.STRONG) + ) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(true) + runCurrent() + + assertThat(lockoutMessage?.text).isEqualTo("Enter PIN") + assertThat(lockoutMessage?.secondaryText) + .isEqualTo("PIN is required after too many attempts") + + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(false) + runCurrent() + + assertThat(lockoutMessage?.text).isEqualTo("Enter PIN") + assertThat(lockoutMessage?.secondaryText.isNullOrBlank()).isTrue() + } + + @Test + fun onFaceLockout_whenItIsNotStrong_shouldProvideRelevantMessage() = + testScope.runTest { + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + val lockoutMessage by collectLastValue(underTest.message) + kosmos.fakeFacePropertyRepository.setSensorInfo(FaceSensorInfo(1, SensorStrength.WEAK)) + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(true) + runCurrent() + + assertThat(lockoutMessage?.text).isEqualTo("Enter PIN") + assertThat(lockoutMessage?.secondaryText) + .isEqualTo("Can’t unlock with face. Too many attempts.") + + kosmos.fakeDeviceEntryFaceAuthRepository.setLockedOut(false) + runCurrent() + + assertThat(lockoutMessage?.text).isEqualTo("Enter PIN") + assertThat(lockoutMessage?.secondaryText.isNullOrBlank()).isTrue() + } + + @Test + fun setFingerprintMessage_propagateValue() = + testScope.runTest { + val bouncerMessage by collectLastValue(underTest.message) + + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + kosmos.fakeFingerprintPropertyRepository.supportsSideFps() + runCurrent() + + kosmos.deviceEntryFingerprintAuthRepository.setAuthenticationStatus( + HelpFingerprintAuthenticationStatus(1, "some helpful message") + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Unlock with PIN or fingerprint") + assertThat(bouncerMessage?.secondaryText).isEqualTo("some helpful message") + + kosmos.deviceEntryFingerprintAuthRepository.setAuthenticationStatus( + FailFingerprintAuthenticationStatus + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Fingerprint not recognized") + assertThat(bouncerMessage?.secondaryText).isEqualTo("Try again or enter PIN") + + kosmos.deviceEntryFingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, + "locked out" + ) + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Enter PIN") + assertThat(bouncerMessage?.secondaryText) + .isEqualTo("PIN is required after too many attempts") + } + + @Test + fun setFaceMessage_propagateValue() = + testScope.runTest { + val bouncerMessage by collectLastValue(underTest.message) + + kosmos.fakeUserRepository.setSelectedUserInfo(PRIMARY_USER) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + kosmos.fakeBiometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + runCurrent() + + kosmos.fakeDeviceEntryFaceAuthRepository.setAuthenticationStatus( + HelpFaceAuthenticationStatus(1, "some helpful message") + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Enter PIN") + assertThat(bouncerMessage?.secondaryText).isEqualTo("some helpful message") + + kosmos.fakeDeviceEntryFaceAuthRepository.setAuthenticationStatus( + ErrorFaceAuthenticationStatus( + BiometricFaceConstants.FACE_ERROR_TIMEOUT, + "Try again" + ) + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Enter PIN") + assertThat(bouncerMessage?.secondaryText).isEqualTo("Try again") + + kosmos.fakeDeviceEntryFaceAuthRepository.setAuthenticationStatus( + FailedFaceAuthenticationStatus() + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Face not recognized") + assertThat(bouncerMessage?.secondaryText).isEqualTo("Try again or enter PIN") + + kosmos.fakeDeviceEntryFaceAuthRepository.setAuthenticationStatus( + ErrorFaceAuthenticationStatus( + BiometricFaceConstants.FACE_ERROR_LOCKOUT, + "locked out" + ) + ) + runCurrent() + assertThat(bouncerMessage?.text).isEqualTo("Enter PIN") + assertThat(bouncerMessage?.secondaryText) + .isEqualTo("Can’t unlock with face. Too many attempts.") + } + + private fun TestScope.verifyMessagesForAuthFlags( + vararg authFlagToMessagePair: Pair<Int, Pair<String, String?>> + ) { + val actualMessage by collectLastValue(underTest.message) + + authFlagToMessagePair.forEach { (flag, expectedMessagePair) -> + kosmos.fakeBiometricSettingsRepository.setAuthenticationFlags( + AuthenticationFlags(userId = PRIMARY_USER_ID, flag = flag) + ) + runCurrent() + + assertThat(actualMessage?.text).isEqualTo(expectedMessagePair.first) + + if (expectedMessagePair.second == null) { + assertThat(actualMessage?.secondaryText.isNullOrBlank()).isTrue() + } else { + assertThat(actualMessage?.secondaryText).isEqualTo(expectedMessagePair.second) + } + } + } + + private fun assertTryAgainMessage( + message: String?, + time: Int, + ) { + assertThat(message).contains("Try again in $time second") + } + + companion object { + private val WRONG_PIN = FakeAuthenticationRepository.DEFAULT_PIN.map { it + 1 } + private const val PRIMARY_USER_ID = 0 + private val PRIMARY_USER = + UserInfo( + /* id= */ PRIMARY_USER_ID, + /* name= */ "primary user", + /* flags= */ UserInfo.FLAG_PRIMARY + ) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt index 73db1757c06a..3afca96e07a0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelTest.kt @@ -37,7 +37,6 @@ import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage -import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flatMapLatest @@ -142,54 +141,6 @@ class BouncerViewModelTest : SysuiTestCase() { } @Test - fun message() = - testScope.runTest { - val message by collectLastValue(underTest.message) - kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) - assertThat(message?.isUpdateAnimated).isTrue() - - repeat(FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT) { - bouncerInteractor.authenticate(WRONG_PIN) - } - assertThat(message?.isUpdateAnimated).isFalse() - - val lockoutEndMs = authenticationInteractor.lockoutEndTimestamp ?: 0 - advanceTimeBy(lockoutEndMs - testScope.currentTime) - assertThat(message?.isUpdateAnimated).isTrue() - } - - @Test - fun lockoutMessage() = - testScope.runTest { - val authMethodViewModel by collectLastValue(underTest.authMethodViewModel) - val message by collectLastValue(underTest.message) - kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) - assertThat(kosmos.fakeAuthenticationRepository.lockoutEndTimestamp).isNull() - assertThat(authMethodViewModel?.lockoutMessageId).isNotNull() - - repeat(FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT) { times -> - bouncerInteractor.authenticate(WRONG_PIN) - if (times < FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT - 1) { - assertThat(message?.text).isEqualTo(bouncerInteractor.message.value) - assertThat(message?.isUpdateAnimated).isTrue() - } - } - val lockoutSeconds = FakeAuthenticationRepository.LOCKOUT_DURATION_SECONDS - assertTryAgainMessage(message?.text, lockoutSeconds) - assertThat(message?.isUpdateAnimated).isFalse() - - repeat(FakeAuthenticationRepository.LOCKOUT_DURATION_SECONDS) { time -> - advanceTimeBy(1.seconds) - val remainingSeconds = lockoutSeconds - time - 1 - if (remainingSeconds > 0) { - assertTryAgainMessage(message?.text, remainingSeconds) - } - } - assertThat(message?.text).isEmpty() - assertThat(message?.isUpdateAnimated).isTrue() - } - - @Test fun isInputEnabled() = testScope.runTest { val isInputEnabled by @@ -212,25 +163,6 @@ class BouncerViewModelTest : SysuiTestCase() { } @Test - fun dialogViewModel() = - testScope.runTest { - val authMethodViewModel by collectLastValue(underTest.authMethodViewModel) - val dialogViewModel by collectLastValue(underTest.dialogViewModel) - kosmos.fakeAuthenticationRepository.setAuthenticationMethod(Pin) - assertThat(authMethodViewModel?.lockoutMessageId).isNotNull() - - repeat(FakeAuthenticationRepository.MAX_FAILED_AUTH_TRIES_BEFORE_LOCKOUT) { - assertThat(dialogViewModel).isNull() - bouncerInteractor.authenticate(WRONG_PIN) - } - assertThat(dialogViewModel).isNotNull() - assertThat(dialogViewModel?.text).isNotEmpty() - - dialogViewModel?.onDismiss?.invoke() - assertThat(dialogViewModel).isNull() - } - - @Test fun isSideBySideSupported() = testScope.runTest { val isSideBySideSupported by collectLastValue(underTest.isSideBySideSupported) @@ -265,13 +197,6 @@ class BouncerViewModelTest : SysuiTestCase() { return listOf(None, Pin, Password, Pattern, Sim) } - private fun assertTryAgainMessage( - message: String?, - time: Int, - ) { - assertThat(message).isEqualTo("Try again in $time seconds.") - } - companion object { private val WRONG_PIN = FakeAuthenticationRepository.DEFAULT_PIN.map { it + 1 } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt index df50eb64f8b6..71c578545647 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt @@ -66,7 +66,6 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { private val bouncerInteractor by lazy { kosmos.bouncerInteractor } private val selectedUserInteractor by lazy { kosmos.selectedUserInteractor } private val inputMethodInteractor by lazy { kosmos.inputMethodInteractor } - private val bouncerViewModel by lazy { kosmos.bouncerViewModel } private val isInputEnabled = MutableStateFlow(true) private val underTest = @@ -76,6 +75,7 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { interactor = bouncerInteractor, inputMethodInteractor = inputMethodInteractor, selectedUserInteractor = selectedUserInteractor, + onIntentionalUserInput = {}, ) @Before @@ -88,11 +88,9 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { fun onShown() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() - assertThat(message?.text).isEqualTo(ENTER_YOUR_PASSWORD) assertThat(password).isEmpty() assertThat(currentScene).isEqualTo(Scenes.Bouncer) assertThat(underTest.authenticationMethod).isEqualTo(AuthenticationMethodModel.Password) @@ -101,16 +99,13 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { @Test fun onHidden_resetsPasswordInputAndMessage() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() underTest.onPasswordInputChanged("password") - assertThat(message?.text).isNotEqualTo(ENTER_YOUR_PASSWORD) assertThat(password).isNotEmpty() underTest.onHidden() - assertThat(message?.text).isEqualTo(ENTER_YOUR_PASSWORD) assertThat(password).isEmpty() } @@ -118,13 +113,11 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { fun onPasswordInputChanged() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() underTest.onPasswordInputChanged("password") - assertThat(message?.text).isEmpty() assertThat(password).isEqualTo("password") assertThat(currentScene).isEqualTo(Scenes.Bouncer) } @@ -144,7 +137,6 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { @Test fun onAuthenticateKeyPressed_whenWrong() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() @@ -152,13 +144,11 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { underTest.onAuthenticateKeyPressed() assertThat(password).isEmpty() - assertThat(message?.text).isEqualTo(WRONG_PASSWORD) } @Test fun onAuthenticateKeyPressed_whenEmpty() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Password @@ -171,14 +161,12 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { underTest.onAuthenticateKeyPressed() assertThat(password).isEmpty() - assertThat(message?.text).isEqualTo(ENTER_YOUR_PASSWORD) } @Test fun onAuthenticateKeyPressed_correctAfterWrong() = testScope.runTest { val authResult by collectLastValue(authenticationInteractor.onAuthenticationResult) - val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() @@ -186,12 +174,10 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { underTest.onPasswordInputChanged("wrong") underTest.onAuthenticateKeyPressed() assertThat(password).isEqualTo("") - assertThat(message?.text).isEqualTo(WRONG_PASSWORD) assertThat(authResult).isFalse() // Enter the correct password: underTest.onPasswordInputChanged("password") - assertThat(message?.text).isEmpty() underTest.onAuthenticateKeyPressed() @@ -331,10 +317,8 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { private fun TestScope.switchToScene(toScene: SceneKey) { val currentScene by collectLastValue(sceneInteractor.currentScene) - val bouncerShown = currentScene != Scenes.Bouncer && toScene == Scenes.Bouncer val bouncerHidden = currentScene == Scenes.Bouncer && toScene != Scenes.Bouncer sceneInteractor.changeScene(toScene, "reason") - if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt index 91a056ddd685..51b73ee92df5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt @@ -63,6 +63,7 @@ class PatternBouncerViewModelTest : SysuiTestCase() { viewModelScope = testScope.backgroundScope, interactor = bouncerInteractor, isInputEnabled = MutableStateFlow(true).asStateFlow(), + onIntentionalUserInput = {}, ) } @@ -79,12 +80,10 @@ class PatternBouncerViewModelTest : SysuiTestCase() { fun onShown() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) lockDeviceAndOpenPatternBouncer() - assertThat(message?.text).isEqualTo(ENTER_YOUR_PATTERN) assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() assertThat(currentScene).isEqualTo(Scenes.Bouncer) @@ -95,14 +94,12 @@ class PatternBouncerViewModelTest : SysuiTestCase() { fun onDragStart() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) lockDeviceAndOpenPatternBouncer() underTest.onDragStart() - assertThat(message?.text).isEmpty() assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() assertThat(currentScene).isEqualTo(Scenes.Bouncer) @@ -148,7 +145,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { fun onDragEnd_whenWrong() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) lockDeviceAndOpenPatternBouncer() @@ -159,7 +155,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() - assertThat(message?.text).isEqualTo(WRONG_PATTERN) assertThat(currentScene).isEqualTo(Scenes.Bouncer) } @@ -302,7 +297,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { @Test fun onDragEnd_whenPatternTooShort() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val dialogViewModel by collectLastValue(bouncerViewModel.dialogViewModel) lockDeviceAndOpenPatternBouncer() @@ -325,7 +319,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { underTest.onDragEnd() - assertWithMessage("Attempt #$attempt").that(message?.text).isEqualTo(WRONG_PATTERN) assertWithMessage("Attempt #$attempt").that(dialogViewModel).isNull() } } @@ -334,7 +327,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { fun onDragEnd_correctAfterWrong() = testScope.runTest { val authResult by collectLastValue(authenticationInteractor.onAuthenticationResult) - val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) lockDeviceAndOpenPatternBouncer() @@ -344,7 +336,6 @@ class PatternBouncerViewModelTest : SysuiTestCase() { underTest.onDragEnd() assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() - assertThat(message?.text).isEqualTo(WRONG_PATTERN) assertThat(authResult).isFalse() // Enter the correct pattern: @@ -370,10 +361,8 @@ class PatternBouncerViewModelTest : SysuiTestCase() { private fun TestScope.switchToScene(toScene: SceneKey) { val currentScene by collectLastValue(sceneInteractor.currentScene) - val bouncerShown = currentScene != Scenes.Bouncer && toScene == Scenes.Bouncer val bouncerHidden = currentScene == Scenes.Bouncer && toScene != Scenes.Bouncer sceneInteractor.changeScene(toScene, "reason") - if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt index 7b75a3715415..564795429fa6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt @@ -56,7 +56,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { private val sceneInteractor by lazy { kosmos.sceneInteractor } private val authenticationInteractor by lazy { kosmos.authenticationInteractor } private val bouncerInteractor by lazy { kosmos.bouncerInteractor } - private val bouncerViewModel by lazy { kosmos.bouncerViewModel } private lateinit var underTest: PinBouncerViewModel @Before @@ -69,6 +68,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { isInputEnabled = MutableStateFlow(true).asStateFlow(), simBouncerInteractor = kosmos.simBouncerInteractor, authenticationMethod = AuthenticationMethodModel.Pin, + onIntentionalUserInput = {}, ) overrideResource(R.string.keyguard_enter_your_pin, ENTER_YOUR_PIN) @@ -78,11 +78,9 @@ class PinBouncerViewModelTest : SysuiTestCase() { @Test fun onShown() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() - assertThat(message?.text).ignoringCase().isEqualTo(ENTER_YOUR_PIN) assertThat(pin).isEmpty() assertThat(underTest.authenticationMethod).isEqualTo(AuthenticationMethodModel.Pin) } @@ -98,6 +96,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { isInputEnabled = MutableStateFlow(true).asStateFlow(), simBouncerInteractor = kosmos.simBouncerInteractor, authenticationMethod = AuthenticationMethodModel.Sim, + onIntentionalUserInput = {}, ) assertThat(underTest.isSimAreaVisible).isTrue() @@ -126,6 +125,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { isInputEnabled = MutableStateFlow(true).asStateFlow(), simBouncerInteractor = kosmos.simBouncerInteractor, authenticationMethod = AuthenticationMethodModel.Sim, + onIntentionalUserInput = {}, ) kosmos.fakeAuthenticationRepository.setAutoConfirmFeatureEnabled(true) val hintedPinLength by collectLastValue(underTest.hintedPinLength) @@ -136,20 +136,17 @@ class PinBouncerViewModelTest : SysuiTestCase() { @Test fun onPinButtonClicked() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() underTest.onPinButtonClicked(1) - assertThat(message?.text).isEmpty() assertThat(pin).containsExactly(1) } @Test fun onBackspaceButtonClicked() = testScope.runTest { - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -158,7 +155,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onBackspaceButtonClicked() - assertThat(message?.text).isEmpty() assertThat(pin).isEmpty() } @@ -183,7 +179,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { fun onBackspaceButtonLongPressed() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -195,7 +190,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onBackspaceButtonLongPressed() - assertThat(message?.text).isEmpty() assertThat(pin).isEmpty() assertThat(currentScene).isEqualTo(Scenes.Bouncer) } @@ -217,7 +211,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { fun onAuthenticateButtonClicked_whenWrong() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -230,7 +223,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onAuthenticateButtonClicked() assertThat(pin).isEmpty() - assertThat(message?.text).ignoringCase().isEqualTo(WRONG_PIN) assertThat(currentScene).isEqualTo(Scenes.Bouncer) } @@ -238,7 +230,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { fun onAuthenticateButtonClicked_correctAfterWrong() = testScope.runTest { val authResult by collectLastValue(authenticationInteractor.onAuthenticationResult) - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -248,13 +239,11 @@ class PinBouncerViewModelTest : SysuiTestCase() { underTest.onPinButtonClicked(4) underTest.onPinButtonClicked(5) // PIN is now wrong! underTest.onAuthenticateButtonClicked() - assertThat(message?.text).ignoringCase().isEqualTo(WRONG_PIN) assertThat(pin).isEmpty() assertThat(authResult).isFalse() // Enter the correct PIN: FakeAuthenticationRepository.DEFAULT_PIN.forEach(underTest::onPinButtonClicked) - assertThat(message?.text).isEmpty() underTest.onAuthenticateButtonClicked() @@ -277,7 +266,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { fun onAutoConfirm_whenWrong() = testScope.runTest { val currentScene by collectLastValue(sceneInteractor.currentScene) - val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) kosmos.fakeAuthenticationRepository.setAutoConfirmFeatureEnabled(true) lockDeviceAndOpenPinBouncer() @@ -290,7 +278,6 @@ class PinBouncerViewModelTest : SysuiTestCase() { ) // PIN is now wrong! assertThat(pin).isEmpty() - assertThat(message?.text).ignoringCase().isEqualTo(WRONG_PIN) assertThat(currentScene).isEqualTo(Scenes.Bouncer) } @@ -390,10 +377,8 @@ class PinBouncerViewModelTest : SysuiTestCase() { private fun TestScope.switchToScene(toScene: SceneKey) { val currentScene by collectLastValue(sceneInteractor.currentScene) - val bouncerShown = currentScene != Scenes.Bouncer && toScene == Scenes.Bouncer val bouncerHidden = currentScene == Scenes.Bouncer && toScene != Scenes.Bouncer sceneInteractor.changeScene(toScene, "reason") - if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt index 8e2e94716660..a7e98ea34154 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt @@ -18,10 +18,16 @@ package com.android.systemui.communal.view.viewmodel import android.app.smartspace.SmartspaceTarget import android.appwidget.AppWidgetProviderInfo +import android.content.ActivityNotFoundException +import android.content.Intent +import android.content.pm.ActivityInfo +import android.content.pm.PackageManager +import android.content.pm.ResolveInfo import android.content.pm.UserInfo import android.os.UserHandle import android.provider.Settings import android.widget.RemoteViews +import androidx.activity.result.ActivityResultLauncher import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger @@ -39,6 +45,7 @@ import com.android.systemui.communal.shared.log.CommunalUiEvent import com.android.systemui.communal.shared.model.CommunalWidgetContentModel import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.testDispatcher import com.android.systemui.kosmos.testScope import com.android.systemui.log.logcatLogBuffer import com.android.systemui.media.controls.ui.view.MediaHost @@ -46,15 +53,19 @@ import com.android.systemui.settings.fakeUserTracker import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock import org.mockito.Mockito +import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -64,6 +75,8 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { @Mock private lateinit var mediaHost: MediaHost @Mock private lateinit var uiEventLogger: UiEventLogger @Mock private lateinit var providerInfo: AppWidgetProviderInfo + @Mock private lateinit var packageManager: PackageManager + @Mock private lateinit var activityResultLauncher: ActivityResultLauncher<Intent> private val kosmos = testKosmos() private val testScope = kosmos.testScope @@ -73,6 +86,8 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { private lateinit var smartspaceRepository: FakeSmartspaceRepository private lateinit var mediaRepository: FakeCommunalMediaRepository + private val testableResources = context.orCreateTestableResources + private lateinit var underTest: CommunalEditModeViewModel @Before @@ -96,6 +111,7 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { mediaHost, uiEventLogger, logcatLogBuffer("CommunalEditModeViewModelTest"), + kosmos.testDispatcher, ) } @@ -217,7 +233,69 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { verify(uiEventLogger).log(CommunalUiEvent.COMMUNAL_HUB_REORDER_WIDGET_CANCEL) } + @Test + fun onOpenWidgetPicker_launchesWidgetPickerActivity() { + testScope.runTest { + whenever(packageManager.resolveActivity(any(), anyInt())).then { + ResolveInfo().apply { + activityInfo = ActivityInfo().apply { packageName = WIDGET_PICKER_PACKAGE_NAME } + } + } + + val success = + underTest.onOpenWidgetPicker( + testableResources.resources, + packageManager, + activityResultLauncher + ) + + verify(activityResultLauncher).launch(any()) + assertTrue(success) + } + } + + @Test + fun onOpenWidgetPicker_launcherActivityNotResolved_doesNotLaunchWidgetPickerActivity() { + testScope.runTest { + whenever(packageManager.resolveActivity(any(), anyInt())).thenReturn(null) + + val success = + underTest.onOpenWidgetPicker( + testableResources.resources, + packageManager, + activityResultLauncher + ) + + verify(activityResultLauncher, never()).launch(any()) + assertFalse(success) + } + } + + @Test + fun onOpenWidgetPicker_activityLaunchThrowsException_failure() { + testScope.runTest { + whenever(packageManager.resolveActivity(any(), anyInt())).then { + ResolveInfo().apply { + activityInfo = ActivityInfo().apply { packageName = WIDGET_PICKER_PACKAGE_NAME } + } + } + + whenever(activityResultLauncher.launch(any())) + .thenThrow(ActivityNotFoundException::class.java) + + val success = + underTest.onOpenWidgetPicker( + testableResources.resources, + packageManager, + activityResultLauncher, + ) + + assertFalse(success) + } + } + private companion object { val MAIN_USER_INFO = UserInfo(0, "primary", UserInfo.FLAG_MAIN) + const val WIDGET_PICKER_PACKAGE_NAME = "widget_picker_package_name" } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractorTest.kt index decbdaf0feee..51f99570b51e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractorTest.kt @@ -26,12 +26,10 @@ import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthR import com.android.systemui.kosmos.testScope import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat -import kotlin.test.Test -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest +import org.junit.Test import org.junit.runner.RunWith -@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidJUnit4::class) class DeviceEntryFingerprintAuthInteractorTest : SysuiTestCase() { @@ -59,17 +57,20 @@ class DeviceEntryFingerprintAuthInteractorTest : SysuiTestCase() { } @Test - fun isSensorUnderDisplay_trueForUdfpsSensorTypes() = + fun isFingerprintCurrentlyAllowedInBouncer_trueForNonUdfpsSensorTypes() = testScope.runTest { - val isSensorUnderDisplay by collectLastValue(underTest.isSensorUnderDisplay) + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + val isFingerprintCurrentlyAllowedInBouncer by + collectLastValue(underTest.isFingerprintCurrentlyAllowedOnBouncer) fingerprintPropertyRepository.supportsUdfps() - assertThat(isSensorUnderDisplay).isTrue() + assertThat(isFingerprintCurrentlyAllowedInBouncer).isFalse() fingerprintPropertyRepository.supportsRearFps() - assertThat(isSensorUnderDisplay).isFalse() + assertThat(isFingerprintCurrentlyAllowedInBouncer).isTrue() fingerprintPropertyRepository.supportsSideFps() - assertThat(isSensorUnderDisplay).isFalse() + assertThat(isFingerprintCurrentlyAllowedInBouncer).isTrue() } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModelTest.kt index d4438516a023..0cc0c2fb530b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModelTest.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.flags.Flags import com.android.systemui.flags.fakeFeatureFlagsClassic @@ -32,6 +33,7 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith @@ -49,9 +51,7 @@ class AlternateBouncerToGoneTransitionViewModelTest : SysuiTestCase() { } private val testScope = kosmos.testScope private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository - private val underTest by lazy { - kosmos.alternateBouncerToGoneTransitionViewModel - } + private val underTest by lazy { kosmos.alternateBouncerToGoneTransitionViewModel } @Test fun deviceEntryParentViewDisappear() = @@ -73,6 +73,61 @@ class AlternateBouncerToGoneTransitionViewModelTest : SysuiTestCase() { values.forEach { assertThat(it).isEqualTo(0f) } } + @Test + fun lockscreenAlpha() = + testScope.runTest { + val startAlpha = 0.6f + val viewState = ViewStateAccessor(alpha = { startAlpha }) + val alpha by collectLastValue(underTest.lockscreenAlpha(viewState)) + runCurrent() + + keyguardTransitionRepository.sendTransitionSteps( + listOf( + step(0f, TransitionState.STARTED), + step(0.25f), + step(0.5f), + step(0.75f), + step(1f), + ), + testScope, + ) + + // Alpha starts at the starting value from ViewStateAccessor. + keyguardTransitionRepository.sendTransitionStep( + step(0f, state = TransitionState.STARTED) + ) + runCurrent() + assertThat(alpha).isEqualTo(startAlpha) + + // Alpha finishes in 200ms out of 500ms, check the alpha at the halfway point. + val progress = 0.2f + keyguardTransitionRepository.sendTransitionStep(step(progress)) + runCurrent() + assertThat(alpha).isEqualTo(0.3f) + + // Alpha ends at 0. + keyguardTransitionRepository.sendTransitionStep(step(1f)) + runCurrent() + assertThat(alpha).isEqualTo(0f) + } + + @Test + fun lockscreenAlpha_zeroInitialAlpha() = + testScope.runTest { + // ViewState starts at 0 alpha. + val viewState = ViewStateAccessor(alpha = { 0f }) + val alpha by collectValues(underTest.lockscreenAlpha(viewState)) + + keyguardTransitionRepository.sendTransitionSteps( + from = KeyguardState.ALTERNATE_BOUNCER, + to = GONE, + testScope + ) + + // Alpha starts and ends at 0. + alpha.forEach { assertThat(it).isEqualTo(0f) } + } + private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep { return TransitionStep( from = KeyguardState.ALTERNATE_BOUNCER, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelTest.kt index 0796af065790..409c55144c6a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelTest.kt @@ -91,27 +91,6 @@ class PrimaryBouncerToLockscreenTransitionViewModelTest : SysuiTestCase() { assertThat(bgViewAlpha).isEqualTo(1f) } - @Test - fun deviceEntryBackgroundViewAlpha_rearFpEnrolled_noUpdates() = - testScope.runTest { - fingerprintPropertyRepository.supportsRearFps() - val bgViewAlpha by collectLastValue(underTest.deviceEntryBackgroundViewAlpha) - keyguardTransitionRepository.sendTransitionStep(step(0f, TransitionState.STARTED)) - assertThat(bgViewAlpha).isNull() - - keyguardTransitionRepository.sendTransitionStep(step(0.5f)) - assertThat(bgViewAlpha).isNull() - - keyguardTransitionRepository.sendTransitionStep(step(.75f)) - assertThat(bgViewAlpha).isNull() - - keyguardTransitionRepository.sendTransitionStep(step(1f)) - assertThat(bgViewAlpha).isNull() - - keyguardTransitionRepository.sendTransitionStep(step(1f, TransitionState.FINISHED)) - assertThat(bgViewAlpha).isNull() - } - private fun step( value: Float, state: TransitionState = TransitionState.RUNNING diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/MediaTestHelper.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/MediaTestHelper.kt new file mode 100644 index 000000000000..8e44932fb38e --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/MediaTestHelper.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2024 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.media.controls + +import android.R +import android.app.smartspace.SmartspaceAction +import android.content.Context +import android.graphics.drawable.Icon +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever + +class MediaTestHelper { + companion object { + /** Returns a list of three mocked recommendations */ + fun getValidRecommendationList(context: Context): List<SmartspaceAction> { + val mediaRecommendationItem = + mock<SmartspaceAction> { + whenever(icon) + .thenReturn( + Icon.createWithResource( + context, + R.drawable.ic_media_play, + ) + ) + } + return listOf(mediaRecommendationItem, mediaRecommendationItem, mediaRecommendationItem) + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryTest.kt new file mode 100644 index 000000000000..6c41bc3c1000 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryTest.kt @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.flags.Flags +import com.android.systemui.flags.fakeFeatureFlagsClassic +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.MediaTestHelper +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class MediaDataRepositoryTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + + private val underTest: MediaDataRepository = kosmos.mediaDataRepository + + @Test + fun setRecommendation() = + testScope.runTest { + val smartspaceData by collectLastValue(underTest.smartspaceMediaData) + val recommendation = SmartspaceMediaData(isActive = true) + + underTest.setRecommendation(recommendation) + + assertThat(smartspaceData).isEqualTo(recommendation) + } + + @Test + fun addAndRemoveMediaData() = + testScope.runTest { + val entries by collectLastValue(underTest.mediaEntries) + + val firstKey = "key1" + val firstData = MediaData().copy(isPlaying = true) + + val secondKey = "key2" + val secondData = MediaData().copy(resumption = true) + + underTest.addMediaEntry(firstKey, firstData) + underTest.addMediaEntry(secondKey, secondData) + underTest.addMediaEntry(firstKey, firstData.copy(isPlaying = false)) + + assertThat(entries!!.size).isEqualTo(2) + assertThat(entries!![firstKey]).isNotEqualTo(firstData) + + underTest.removeMediaEntry(firstKey) + + assertThat(entries!!.size).isEqualTo(1) + assertThat(entries!![secondKey]).isEqualTo(secondData) + } + + @Test + fun setRecommendationInactive() = + testScope.runTest { + kosmos.fakeFeatureFlagsClassic.set(Flags.MEDIA_RETAIN_RECOMMENDATIONS, true) + val smartspaceData by collectLastValue(underTest.smartspaceMediaData) + val recommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + + underTest.setRecommendation(recommendation) + + assertThat(smartspaceData).isEqualTo(recommendation) + + underTest.setRecommendationInactive(KEY_MEDIA_SMARTSPACE) + + assertThat(smartspaceData).isNotEqualTo(recommendation) + assertThat(smartspaceData!!.isActive).isFalse() + } + + @Test + fun dismissRecommendation() = + testScope.runTest { + val smartspaceData by collectLastValue(underTest.smartspaceMediaData) + val recommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + + underTest.setRecommendation(recommendation) + + assertThat(smartspaceData).isEqualTo(recommendation) + + underTest.dismissSmartspaceRecommendation(KEY_MEDIA_SMARTSPACE) + + assertThat(smartspaceData!!.isActive).isFalse() + } + + companion object { + private const val KEY_MEDIA_SMARTSPACE = "MEDIA_SMARTSPACE_ID" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryTest.kt new file mode 100644 index 000000000000..d39e77da2f55 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryTest.kt @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.MediaTestHelper +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class MediaFilterRepositoryTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + + private val underTest: MediaFilterRepository = kosmos.mediaFilterRepository + + @Test + fun addSelectedUserMediaEntry_activeThenInactivate() = + testScope.runTest { + val selectedUserEntries by collectLastValue(underTest.selectedUserEntries) + + val userMedia = MediaData().copy(active = true) + + underTest.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(selectedUserEntries?.get(KEY)).isEqualTo(userMedia) + + underTest.addSelectedUserMediaEntry(KEY, userMedia.copy(active = false)) + + assertThat(selectedUserEntries?.get(KEY)).isNotEqualTo(userMedia) + assertThat(selectedUserEntries?.get(KEY)?.active).isFalse() + } + + @Test + fun addSelectedUserMediaEntry_thenRemove_returnsBoolean() = + testScope.runTest { + val selectedUserEntries by collectLastValue(underTest.selectedUserEntries) + + val userMedia = MediaData() + + underTest.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(selectedUserEntries?.get(KEY)).isEqualTo(userMedia) + + assertThat(underTest.removeSelectedUserMediaEntry(KEY, userMedia)).isTrue() + } + + @Test + fun addSelectedUserMediaEntry_thenRemove_returnsValue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(underTest.selectedUserEntries) + + val userMedia = MediaData() + + underTest.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(selectedUserEntries?.get(KEY)).isEqualTo(userMedia) + + assertThat(underTest.removeSelectedUserMediaEntry(KEY)).isEqualTo(userMedia) + } + + @Test + fun addAllUserMediaEntry_activeThenInactivate() = + testScope.runTest { + val allUserEntries by collectLastValue(underTest.allUserEntries) + + val userMedia = MediaData().copy(active = true) + + underTest.addMediaEntry(KEY, userMedia) + + assertThat(allUserEntries?.get(KEY)).isEqualTo(userMedia) + + underTest.addMediaEntry(KEY, userMedia.copy(active = false)) + + assertThat(allUserEntries?.get(KEY)).isNotEqualTo(userMedia) + assertThat(allUserEntries?.get(KEY)?.active).isFalse() + } + + @Test + fun addAllUserMediaEntry_thenRemove_returnsValue() = + testScope.runTest { + val allUserEntries by collectLastValue(underTest.allUserEntries) + + val userMedia = MediaData() + + underTest.addMediaEntry(KEY, userMedia) + + assertThat(allUserEntries?.get(KEY)).isEqualTo(userMedia) + + assertThat(underTest.removeMediaEntry(KEY)).isEqualTo(userMedia) + } + + @Test + fun addActiveRecommendation_thenInactive() = + testScope.runTest { + val smartspaceMediaData by collectLastValue(underTest.smartspaceMediaData) + + val mediaRecommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + + underTest.setRecommendation(mediaRecommendation) + + assertThat(smartspaceMediaData).isEqualTo(mediaRecommendation) + + underTest.setRecommendation(mediaRecommendation.copy(isActive = false)) + + assertThat(smartspaceMediaData).isNotEqualTo(mediaRecommendation) + assertThat(smartspaceMediaData?.isActive).isFalse() + } + + companion object { + private const val KEY = "KEY" + private const val KEY_MEDIA_SMARTSPACE = "MEDIA_SMARTSPACE_ID" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt new file mode 100644 index 000000000000..6e67000b1ab3 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.interactor + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.flags.Flags +import com.android.systemui.flags.fakeFeatureFlagsClassic +import com.android.systemui.kosmos.testScope +import com.android.systemui.media.controls.MediaTestHelper +import com.android.systemui.media.controls.data.repository.MediaFilterRepository +import com.android.systemui.media.controls.data.repository.mediaFilterRepository +import com.android.systemui.media.controls.domain.pipeline.interactor.MediaCarouselInteractor +import com.android.systemui.media.controls.domain.pipeline.interactor.mediaCarouselInteractor +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class MediaCarouselInteractorTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + + private val mediaFilterRepository: MediaFilterRepository = kosmos.mediaFilterRepository + private val underTest: MediaCarouselInteractor = kosmos.mediaCarouselInteractor + + @Test + fun addUserMediaEntry_activeThenInactivate() = + testScope.runTest { + val hasActiveMediaOrRecommendation by + collectLastValue(underTest.hasActiveMediaOrRecommendation) + val hasActiveMedia by collectLastValue(underTest.hasActiveMedia) + val hasAnyMedia by collectLastValue(underTest.hasAnyMedia) + + val userMedia = MediaData().copy(active = true) + + mediaFilterRepository.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(hasActiveMediaOrRecommendation).isTrue() + assertThat(hasActiveMedia).isTrue() + assertThat(hasAnyMedia).isTrue() + + mediaFilterRepository.addSelectedUserMediaEntry(KEY, userMedia.copy(active = false)) + + assertThat(hasActiveMediaOrRecommendation).isFalse() + assertThat(hasActiveMedia).isFalse() + assertThat(hasAnyMedia).isTrue() + } + + @Test + fun addInactiveUserMediaEntry_thenRemove() = + testScope.runTest { + val hasActiveMediaOrRecommendation by + collectLastValue(underTest.hasActiveMediaOrRecommendation) + val hasActiveMedia by collectLastValue(underTest.hasActiveMedia) + val hasAnyMedia by collectLastValue(underTest.hasAnyMedia) + + val userMedia = MediaData().copy(active = false) + + mediaFilterRepository.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(hasActiveMediaOrRecommendation).isFalse() + assertThat(hasActiveMedia).isFalse() + assertThat(hasAnyMedia).isTrue() + + assertThat(mediaFilterRepository.removeSelectedUserMediaEntry(KEY, userMedia)).isTrue() + + assertThat(hasActiveMediaOrRecommendation).isFalse() + assertThat(hasActiveMedia).isFalse() + assertThat(hasAnyMedia).isFalse() + } + + @Test + fun addActiveRecommendation_inactiveMedia() = + testScope.runTest { + val hasActiveMediaOrRecommendation by + collectLastValue(underTest.hasActiveMediaOrRecommendation) + val hasAnyMediaOrRecommendation by + collectLastValue(underTest.hasAnyMediaOrRecommendation) + kosmos.fakeFeatureFlagsClassic.set(Flags.MEDIA_RETAIN_RECOMMENDATIONS, false) + + val userMediaRecommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + val userMedia = MediaData().copy(active = false) + + mediaFilterRepository.setRecommendation(userMediaRecommendation) + + assertThat(hasActiveMediaOrRecommendation).isTrue() + assertThat(hasAnyMediaOrRecommendation).isTrue() + + mediaFilterRepository.addSelectedUserMediaEntry(KEY, userMedia) + + assertThat(hasActiveMediaOrRecommendation).isTrue() + assertThat(hasAnyMediaOrRecommendation).isTrue() + } + + @Test + fun addActiveRecommendation_thenInactive() = + testScope.runTest { + val hasActiveMediaOrRecommendation by + collectLastValue(underTest.hasActiveMediaOrRecommendation) + val hasAnyMediaOrRecommendation by + collectLastValue(underTest.hasAnyMediaOrRecommendation) + kosmos.fakeFeatureFlagsClassic.set(Flags.MEDIA_RETAIN_RECOMMENDATIONS, false) + + val mediaRecommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + + mediaFilterRepository.setRecommendation(mediaRecommendation) + + assertThat(hasActiveMediaOrRecommendation).isTrue() + assertThat(hasAnyMediaOrRecommendation).isTrue() + + mediaFilterRepository.setRecommendation(mediaRecommendation.copy(isActive = false)) + + assertThat(hasActiveMediaOrRecommendation).isFalse() + assertThat(hasAnyMediaOrRecommendation).isFalse() + } + + @Test + fun addActiveRecommendation_thenInvalid() = + testScope.runTest { + val hasActiveMediaOrRecommendation by + collectLastValue(underTest.hasActiveMediaOrRecommendation) + val hasAnyMediaOrRecommendation by + collectLastValue(underTest.hasAnyMediaOrRecommendation) + kosmos.fakeFeatureFlagsClassic.set(Flags.MEDIA_RETAIN_RECOMMENDATIONS, false) + + val mediaRecommendation = + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + recommendations = MediaTestHelper.getValidRecommendationList(context), + ) + + mediaFilterRepository.setRecommendation(mediaRecommendation) + + assertThat(hasActiveMediaOrRecommendation).isTrue() + assertThat(hasAnyMediaOrRecommendation).isTrue() + + mediaFilterRepository.setRecommendation( + mediaRecommendation.copy(recommendations = listOf()) + ) + + assertThat(hasActiveMediaOrRecommendation).isFalse() + assertThat(hasAnyMediaOrRecommendation).isFalse() + } + + @Test + fun hasAnyMedia_noMediaSet_returnsFalse() = + testScope.runTest { assertThat(underTest.hasAnyMedia.value).isFalse() } + + @Test + fun hasAnyMediaOrRecommendation_noMediaSet_returnsFalse() = + testScope.runTest { assertThat(underTest.hasAnyMediaOrRecommendation.value).isFalse() } + + @Test + fun hasActiveMedia_noMediaSet_returnsFalse() = + testScope.runTest { assertThat(underTest.hasActiveMedia.value).isFalse() } + + @Test + fun hasActiveMediaOrRecommendation_nothingSet_returnsFalse() = + testScope.runTest { assertThat(underTest.hasActiveMediaOrRecommendation.value).isFalse() } + + companion object { + private const val KEY = "KEY" + private const val KEY_MEDIA_SMARTSPACE = "MEDIA_SMARTSPACE_ID" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapperTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapperTest.kt index c2ce39249f9e..f1cd0c843256 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapperTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapperTest.kt @@ -185,7 +185,7 @@ class AlarmTileMapperTest : SysuiTestCase() { setOf(QSTileState.UserAction.CLICK), label, null, - QSTileState.SideViewIcon.None, + QSTileState.SideViewIcon.Chevron, QSTileState.EnabledState.ENABLED, Switch::class.qualifiedName ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt index 3c0ab240cbba..27c4ec125b59 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt @@ -27,9 +27,17 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.dump.DumpManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testCase +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope import com.android.systemui.qs.QSImpl import com.android.systemui.qs.dagger.QSComponent import com.android.systemui.qs.dagger.QSSceneComponent +import com.android.systemui.shade.data.repository.fakeShadeRepository +import com.android.systemui.shade.domain.interactor.shadeInteractor +import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture @@ -41,8 +49,6 @@ import com.google.common.truth.Truth.assertThat import java.util.Locale import javax.inject.Provider import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.StandardTestDispatcher -import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Test @@ -57,8 +63,9 @@ import org.mockito.Mockito.verify @OptIn(ExperimentalCoroutinesApi::class) class QSSceneAdapterImplTest : SysuiTestCase() { - private val testDispatcher = StandardTestDispatcher() - private val testScope = TestScope(testDispatcher) + private val kosmos = Kosmos().apply { testCase = this@QSSceneAdapterImplTest } + private val testDispatcher = kosmos.testDispatcher + private val testScope = kosmos.testScope private val qsImplProvider = object : Provider<QSImpl> { @@ -107,10 +114,15 @@ class QSSceneAdapterImplTest : SysuiTestCase() { } } + private val shadeInteractor = kosmos.shadeInteractor + private val dumpManager = mock<DumpManager>() + private val underTest = QSSceneAdapterImpl( qsSceneComponentFactory, qsImplProvider, + shadeInteractor, + dumpManager, testDispatcher, testScope.backgroundScope, configurationInteractor, @@ -158,12 +170,6 @@ class QSSceneAdapterImplTest : SysuiTestCase() { ) verify(this).setListening(false) verify(this).setExpanded(false) - verify(this) - .setTransitionToFullShadeProgress( - /* isTransitioningToFullShade= */ false, - /* qsTransitionFraction= */ 1f, - /* qsSquishinessFraction = */ 1f, - ) } } @@ -187,13 +193,7 @@ class QSSceneAdapterImplTest : SysuiTestCase() { /* squishinessFraction= */ 1f, ) verify(this).setListening(true) - verify(this).setExpanded(true) - verify(this) - .setTransitionToFullShadeProgress( - /* isTransitioningToFullShade= */ false, - /* qsTransitionFraction= */ 1f, - /* qsSquishinessFraction = */ 1f, - ) + verify(this).setExpanded(false) } } @@ -218,12 +218,6 @@ class QSSceneAdapterImplTest : SysuiTestCase() { ) verify(this).setListening(true) verify(this).setExpanded(true) - verify(this) - .setTransitionToFullShadeProgress( - /* isTransitioningToFullShade= */ false, - /* qsTransitionFraction= */ 1f, - /* qsSquishinessFraction = */ 1f, - ) } } @@ -249,12 +243,6 @@ class QSSceneAdapterImplTest : SysuiTestCase() { ) verify(this).setListening(true) verify(this).setExpanded(true) - verify(this) - .setTransitionToFullShadeProgress( - /* isTransitioningToFullShade= */ false, - /* qsTransitionFraction= */ 1f, - /* qsSquishinessFraction = */ 1f, - ) } } @@ -268,7 +256,7 @@ class QSSceneAdapterImplTest : SysuiTestCase() { runCurrent() clearInvocations(qsImpl!!) - underTest.setState(QSSceneAdapter.State.Unsquishing(squishiness)) + underTest.setState(QSSceneAdapter.State.UnsquishingQQS(squishiness)) with(qsImpl!!) { verify(this).setQsVisible(true) verify(this) @@ -279,13 +267,7 @@ class QSSceneAdapterImplTest : SysuiTestCase() { /* squishinessFraction= */ squishiness, ) verify(this).setListening(true) - verify(this).setExpanded(true) - verify(this) - .setTransitionToFullShadeProgress( - /* isTransitioningToFullShade= */ false, - /* qsTransitionFraction= */ 1f, - /* qsSquishinessFraction = */ squishiness, - ) + verify(this).setExpanded(false) } } @@ -497,4 +479,21 @@ class QSSceneAdapterImplTest : SysuiTestCase() { verify(qsImpl!!).applyBottomNavBarToCustomizerPadding(navBarHeight) } + + @Test + fun dispatchSplitShade() = + testScope.runTest { + val shadeRepository = kosmos.fakeShadeRepository + shadeRepository.setShadeMode(ShadeMode.Single) + val qsImpl by collectLastValue(underTest.qsImpl) + + underTest.inflate(context) + runCurrent() + + verify(qsImpl!!).setInSplitShade(false) + + shadeRepository.setShadeMode(ShadeMode.Split) + runCurrent() + verify(qsImpl!!).setInSplitShade(true) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterTest.kt index e281383e6250..ebd65fdcd538 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterTest.kt @@ -49,9 +49,16 @@ class QSSceneAdapterTest : SysuiTestCase() { } @Test - fun unsquishing_expansionSameAsQQS() { + fun unsquishingQQS_expansionSameAsQQS() { val squishiness = 0.6f - assertThat(QSSceneAdapter.State.Unsquishing(squishiness).expansion) + assertThat(QSSceneAdapter.State.UnsquishingQQS(squishiness).expansion) .isEqualTo(QSSceneAdapter.State.QQS.expansion) } + + @Test + fun unsquishingQS_expansionSameAsQS() { + val squishiness = 0.6f + assertThat(QSSceneAdapter.State.UnsquishingQS(squishiness).expansion) + .isEqualTo(QSSceneAdapter.State.QS.expansion) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt index 1c5496142fec..d1c4ec3ddacf 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt @@ -95,7 +95,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { scope = testScope.backgroundScope, ) - private val qsFlexiglassAdapter = FakeQSSceneAdapter({ mock() }) + private val qsSceneAdapter = FakeQSSceneAdapter({ mock() }) private lateinit var shadeHeaderViewModel: ShadeHeaderViewModel @@ -122,7 +122,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { applicationScope = testScope.backgroundScope, deviceEntryInteractor = deviceEntryInteractor, shadeHeaderViewModel = shadeHeaderViewModel, - qsSceneAdapter = qsFlexiglassAdapter, + qsSceneAdapter = qsSceneAdapter, notifications = kosmos.notificationsPlaceholderViewModel, mediaDataManager = mediaDataManager, shadeInteractor = kosmos.shadeInteractor, @@ -279,6 +279,20 @@ class ShadeSceneViewModelTest : SysuiTestCase() { } @Test + fun upTransitionSceneKey_customizing_noTransition() = + testScope.runTest { + val destinationScenes by collectLastValue(underTest.destinationScenes) + + qsSceneAdapter.setCustomizing(true) + assertThat( + destinationScenes!! + .keys + .filterIsInstance<Swipe>() + .filter { it.direction == SwipeDirection.Up } + ).isEmpty() + } + + @Test fun shadeMode() = testScope.runTest { val shadeMode by collectLastValue(underTest.shadeMode) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt index 2689fc111142..94539a39869e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt @@ -22,7 +22,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.ObservableTransitionState import com.android.systemui.SysuiTestCase -import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.coroutines.collectLastValue import com.android.systemui.flags.Flags import com.android.systemui.flags.fakeFeatureFlagsClassic @@ -31,6 +30,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.fakeSceneDataSource +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.testKosmos @@ -64,7 +64,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { @Test fun updateBounds() = testScope.runTest { - val bounds by collectLastValue(appearanceViewModel.stackBounds) + val clipping by collectLastValue(appearanceViewModel.stackClipping) val top = 200f val left = 0f @@ -76,15 +76,8 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { right = right, bottom = bottom ) - assertThat(bounds) - .isEqualTo( - NotificationContainerBounds( - left = left, - top = top, - right = right, - bottom = bottom - ) - ) + assertThat(clipping?.bounds) + .isEqualTo(StackBounds(left = left, top = top, right = right, bottom = bottom)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt index ffe6e6df6b48..e3fa89c5760d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt @@ -19,10 +19,13 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope +import com.android.systemui.shade.data.repository.shadeRepository +import com.android.systemui.shade.shared.model.ShadeMode +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds +import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding +import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest import org.junit.Test @@ -30,10 +33,9 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) -@android.platform.test.annotations.EnabledOnRavenwood class NotificationStackAppearanceInteractorTest : SysuiTestCase() { - private val kosmos = Kosmos() + private val kosmos = testKosmos() private val testScope = kosmos.testScope private val underTest = kosmos.notificationStackAppearanceInteractor @@ -43,29 +45,39 @@ class NotificationStackAppearanceInteractorTest : SysuiTestCase() { val stackBounds by collectLastValue(underTest.stackBounds) val bounds1 = - NotificationContainerBounds( + StackBounds( top = 100f, bottom = 200f, - isAnimated = true, ) underTest.setStackBounds(bounds1) assertThat(stackBounds).isEqualTo(bounds1) val bounds2 = - NotificationContainerBounds( + StackBounds( top = 200f, bottom = 300f, - isAnimated = false, ) underTest.setStackBounds(bounds2) assertThat(stackBounds).isEqualTo(bounds2) } + @Test + fun stackRounding() = + testScope.runTest { + val stackRounding by collectLastValue(underTest.stackRounding) + + kosmos.shadeRepository.setShadeMode(ShadeMode.Single) + assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = false)) + + kosmos.shadeRepository.setShadeMode(ShadeMode.Split) + assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = true)) + } + @Test(expected = IllegalStateException::class) fun setStackBounds_withImproperBounds_throwsException() = testScope.runTest { underTest.setStackBounds( - NotificationContainerBounds( + StackBounds( top = 100f, bottom = 99f, ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt index 693de55211f8..2ccc8b44eff8 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModelTest.kt @@ -22,6 +22,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.keyguard.domain.interactor.keyguardInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.notificationStackAppearanceInteractor +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import org.junit.Test @@ -36,9 +37,9 @@ class NotificationsPlaceholderViewModelTest : SysuiTestCase() { fun onBoundsChanged_setsNotificationContainerBounds() { underTest.onBoundsChanged(left = 5f, top = 5f, right = 5f, bottom = 5f) assertThat(kosmos.keyguardInteractor.notificationContainerBounds.value) - .isEqualTo(NotificationContainerBounds(left = 5f, top = 5f, right = 5f, bottom = 5f)) + .isEqualTo(NotificationContainerBounds(top = 5f, bottom = 5f)) assertThat(kosmos.notificationStackAppearanceInteractor.stackBounds.value) - .isEqualTo(NotificationContainerBounds(left = 5f, top = 5f, right = 5f, bottom = 5f)) + .isEqualTo(StackBounds(left = 5f, top = 5f, right = 5f, bottom = 5f)) } @Test fun onContentTopChanged_setsContentTop() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt index be63301e5749..30564bb6eb84 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt @@ -60,7 +60,7 @@ class AvalancheControllerTest : SysuiTestCase() { private val mGlobalSettings = FakeGlobalSettings() private val mSystemClock = FakeSystemClock() private val mExecutor = FakeExecutor(mSystemClock) - private var testableHeadsUpManager: BaseHeadsUpManager? = null + private lateinit var testableHeadsUpManager: BaseHeadsUpManager @Before fun setUp() { @@ -88,20 +88,15 @@ class AvalancheControllerTest : SysuiTestCase() { } private fun createHeadsUpEntry(id: Int): BaseHeadsUpManager.HeadsUpEntry { - val entry = testableHeadsUpManager!!.createHeadsUpEntry() - - entry.setEntry( + return testableHeadsUpManager.createHeadsUpEntry( NotificationEntryBuilder() .setSbn(HeadsUpManagerTestUtil.createSbn(id, Notification.Builder(mContext, ""))) .build() ) - return entry } private fun createFsiHeadsUpEntry(id: Int): BaseHeadsUpManager.HeadsUpEntry { - val entry = testableHeadsUpManager!!.createHeadsUpEntry() - entry.setEntry(createFullScreenIntentEntry(id, mContext)) - return entry + return testableHeadsUpManager.createHeadsUpEntry(createFullScreenIntentEntry(id, mContext)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java index ed0d272cd848..3dc449514699 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java @@ -38,7 +38,6 @@ import static org.mockito.Mockito.when; import android.app.Notification; import android.app.PendingIntent; import android.app.Person; -import android.content.Intent; import android.testing.TestableLooper; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -498,16 +497,16 @@ public class BaseHeadsUpManagerTest extends SysuiTestCase { public void testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() { final BaseHeadsUpManager hum = createHeadsUpManager(); - final BaseHeadsUpManager.HeadsUpEntry ongoingCall = hum.new HeadsUpEntry(); - ongoingCall.setEntry(new NotificationEntryBuilder() - .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, - new Notification.Builder(mContext, "") - .setCategory(Notification.CATEGORY_CALL) - .setOngoing(true))) - .build()); + final BaseHeadsUpManager.HeadsUpEntry ongoingCall = hum.new HeadsUpEntry( + new NotificationEntryBuilder() + .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, + new Notification.Builder(mContext, "") + .setCategory(Notification.CATEGORY_CALL) + .setOngoing(true))) + .build()); - final BaseHeadsUpManager.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry(); - activeRemoteInput.setEntry(HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); + final BaseHeadsUpManager.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry( + HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); activeRemoteInput.mRemoteInputActive = true; assertThat(ongoingCall.compareTo(activeRemoteInput)).isLessThan(0); @@ -518,18 +517,18 @@ public class BaseHeadsUpManagerTest extends SysuiTestCase { public void testAlertEntryCompareTo_incomingCallLessThanActiveRemoteInput() { final BaseHeadsUpManager hum = createHeadsUpManager(); - final BaseHeadsUpManager.HeadsUpEntry incomingCall = hum.new HeadsUpEntry(); final Person person = new Person.Builder().setName("person").build(); final PendingIntent intent = mock(PendingIntent.class); - incomingCall.setEntry(new NotificationEntryBuilder() - .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, - new Notification.Builder(mContext, "") - .setStyle(Notification.CallStyle - .forIncomingCall(person, intent, intent)))) - .build()); - - final BaseHeadsUpManager.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry(); - activeRemoteInput.setEntry(HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); + final BaseHeadsUpManager.HeadsUpEntry incomingCall = hum.new HeadsUpEntry( + new NotificationEntryBuilder() + .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, + new Notification.Builder(mContext, "") + .setStyle(Notification.CallStyle + .forIncomingCall(person, intent, intent)))) + .build()); + + final BaseHeadsUpManager.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry( + HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); activeRemoteInput.mRemoteInputActive = true; assertThat(incomingCall.compareTo(activeRemoteInput)).isLessThan(0); @@ -541,8 +540,7 @@ public class BaseHeadsUpManagerTest extends SysuiTestCase { final BaseHeadsUpManager hum = createHeadsUpManager(); // Needs full screen intent in order to be pinned - final BaseHeadsUpManager.HeadsUpEntry entryToPin = hum.new HeadsUpEntry(); - entryToPin.setEntry( + final BaseHeadsUpManager.HeadsUpEntry entryToPin = hum.new HeadsUpEntry( HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id = */ 0, mContext)); // Note: the standard way to show a notification would be calling showNotification rather diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/TestableHeadsUpManager.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/TestableHeadsUpManager.java index d8f77f054b49..3c9dc6345d31 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/TestableHeadsUpManager.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/TestableHeadsUpManager.java @@ -54,9 +54,10 @@ class TestableHeadsUpManager extends BaseHeadsUpManager { mStickyForSomeTimeAutoDismissTime = BaseHeadsUpManagerTest.TEST_STICKY_AUTO_DISMISS_TIME; } + @NonNull @Override - protected HeadsUpEntry createHeadsUpEntry() { - mLastCreatedEntry = spy(super.createHeadsUpEntry()); + protected HeadsUpEntry createHeadsUpEntry(NotificationEntry entry) { + mLastCreatedEntry = spy(super.createHeadsUpEntry(entry)); return mLastCreatedEntry; } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/util/kotlin/DisposableHandlesTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/util/kotlin/DisposableHandlesTest.kt new file mode 100644 index 000000000000..a5ad3c325e51 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/util/kotlin/DisposableHandlesTest.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2024 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.util.kotlin + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.DisposableHandle +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class DisposableHandlesTest : SysuiTestCase() { + @Test + fun disposeWorksOnce() { + var handleDisposeCount = 0 + val underTest = DisposableHandles() + + // Add a handle + underTest += DisposableHandle { handleDisposeCount++ } + + // dispose() calls dispose() on children + underTest.dispose() + assertThat(handleDisposeCount).isEqualTo(1) + + // Once disposed, children are not disposed again + underTest.dispose() + assertThat(handleDisposeCount).isEqualTo(1) + } + + @Test + fun replaceCallsDispose() { + var handleDisposeCount1 = 0 + var handleDisposeCount2 = 0 + val underTest = DisposableHandles() + val handle1 = DisposableHandle { handleDisposeCount1++ } + val handle2 = DisposableHandle { handleDisposeCount2++ } + + // First add handle1 + underTest += handle1 + + // replace() calls dispose() on existing children + underTest.replaceAll(handle2) + assertThat(handleDisposeCount1).isEqualTo(1) + assertThat(handleDisposeCount2).isEqualTo(0) + + // Once disposed, replaced children are not disposed again + underTest.dispose() + assertThat(handleDisposeCount1).isEqualTo(1) + assertThat(handleDisposeCount2).isEqualTo(1) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/domain/interactor/AudioVolumeInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/domain/interactor/AudioVolumeInteractorTest.kt index 3d936545bbb3..5358a6dbb476 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/domain/interactor/AudioVolumeInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/domain/interactor/AudioVolumeInteractorTest.kt @@ -200,6 +200,15 @@ class AudioVolumeInteractorTest : SysuiTestCase() { } } + @Test + fun alarmStream_isNotMutable() { + with(kosmos) { + val isMutable = underTest.isMutable(AudioStream(AudioManager.STREAM_ALARM)) + + assertThat(isMutable).isFalse() + } + } + private companion object { val audioStream = AudioStream(AudioManager.STREAM_SYSTEM) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractorTest.kt new file mode 100644 index 000000000000..b5c580978737 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractorTest.kt @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2024 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.volume.panel.component.mediaoutput.domain.interactor + +import android.os.Handler +import android.testing.TestableLooper +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.testCase +import com.android.systemui.kosmos.testScope +import com.android.systemui.testKosmos +import com.android.systemui.volume.localMediaController +import com.android.systemui.volume.mediaControllerRepository +import com.android.systemui.volume.mediaOutputInteractor +import com.android.systemui.volume.remoteMediaController +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +class MediaDeviceSessionInteractorTest : SysuiTestCase() { + + private val kosmos = testKosmos() + + private lateinit var underTest: MediaDeviceSessionInteractor + + @Before + fun setup() { + with(kosmos) { + mediaControllerRepository.setActiveSessions( + listOf(localMediaController, remoteMediaController) + ) + + underTest = + MediaDeviceSessionInteractor( + testScope.testScheduler, + Handler(TestableLooper.get(kosmos.testCase).looper), + mediaControllerRepository, + ) + } + } + + @Test + fun playbackInfo_returnsPlaybackInfo() { + with(kosmos) { + testScope.runTest { + val session by collectLastValue(mediaOutputInteractor.defaultActiveMediaSession) + runCurrent() + val info by collectLastValue(underTest.playbackInfo(session!!)) + runCurrent() + + assertThat(info).isEqualTo(localMediaController.playbackInfo) + } + } + } + + @Test + fun playbackState_returnsPlaybackState() { + with(kosmos) { + testScope.runTest { + val session by collectLastValue(mediaOutputInteractor.defaultActiveMediaSession) + runCurrent() + val state by collectLastValue(underTest.playbackState(session!!)) + runCurrent() + + assertThat(state).isEqualTo(localMediaController.playbackState) + } + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModelTest.kt index dcf635e622f4..6f7f20b47199 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModelTest.kt @@ -29,9 +29,10 @@ import com.android.systemui.res.R import com.android.systemui.testKosmos import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +import com.android.systemui.volume.localMediaController import com.android.systemui.volume.localMediaRepository -import com.android.systemui.volume.mediaController import com.android.systemui.volume.mediaControllerRepository +import com.android.systemui.volume.mediaDeviceSessionInteractor import com.android.systemui.volume.mediaOutputActionsInteractor import com.android.systemui.volume.mediaOutputInteractor import com.android.systemui.volume.panel.volumePanelViewModel @@ -63,6 +64,7 @@ class MediaOutputViewModelTest : SysuiTestCase() { testScope.backgroundScope, volumePanelViewModel, mediaOutputActionsInteractor, + mediaDeviceSessionInteractor, mediaOutputInteractor, ) @@ -74,11 +76,11 @@ class MediaOutputViewModelTest : SysuiTestCase() { ) } - whenever(mediaController.packageName).thenReturn("test.pkg") - whenever(mediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) - whenever(mediaController.playbackState).then { playbackStateBuilder.build() } + whenever(localMediaController.packageName).thenReturn("test.pkg") + whenever(localMediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) + whenever(localMediaController.playbackState).then { playbackStateBuilder.build() } - mediaControllerRepository.setActiveLocalMediaController(mediaController) + mediaControllerRepository.setActiveSessions(listOf(localMediaController)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/SpatialAudioAvailabilityCriteriaTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/SpatialAudioAvailabilityCriteriaTest.kt index 1ed7f5d04622..2f69942aa459 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/SpatialAudioAvailabilityCriteriaTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/SpatialAudioAvailabilityCriteriaTest.kt @@ -32,8 +32,8 @@ import com.android.systemui.media.spatializerRepository import com.android.systemui.testKosmos import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +import com.android.systemui.volume.localMediaController import com.android.systemui.volume.localMediaRepository -import com.android.systemui.volume.mediaController import com.android.systemui.volume.mediaControllerRepository import com.android.systemui.volume.panel.component.spatial.spatialAudioComponentInteractor import com.google.common.truth.Truth.assertThat @@ -66,11 +66,11 @@ class SpatialAudioAvailabilityCriteriaTest : SysuiTestCase() { } ) - whenever(mediaController.packageName).thenReturn("test.pkg") - whenever(mediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) - whenever(mediaController.playbackState).thenReturn(PlaybackState.Builder().build()) + whenever(localMediaController.packageName).thenReturn("test.pkg") + whenever(localMediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) + whenever(localMediaController.playbackState).thenReturn(PlaybackState.Builder().build()) - mediaControllerRepository.setActiveLocalMediaController(mediaController) + mediaControllerRepository.setActiveSessions(listOf(localMediaController)) underTest = SpatialAudioAvailabilityCriteria(spatialAudioComponentInteractor) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractorTest.kt index 281b03d69536..e36ae60ebe7d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractorTest.kt @@ -34,8 +34,8 @@ import com.android.systemui.media.spatializerRepository import com.android.systemui.testKosmos import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever +import com.android.systemui.volume.localMediaController import com.android.systemui.volume.localMediaRepository -import com.android.systemui.volume.mediaController import com.android.systemui.volume.mediaControllerRepository import com.android.systemui.volume.mediaOutputInteractor import com.android.systemui.volume.panel.component.spatial.domain.model.SpatialAudioAvailabilityModel @@ -70,11 +70,11 @@ class SpatialAudioComponentInteractorTest : SysuiTestCase() { } ) - whenever(mediaController.packageName).thenReturn("test.pkg") - whenever(mediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) - whenever(mediaController.playbackState).thenReturn(PlaybackState.Builder().build()) + whenever(localMediaController.packageName).thenReturn("test.pkg") + whenever(localMediaController.sessionToken).thenReturn(MediaSession.Token(0, mock {})) + whenever(localMediaController.playbackState).thenReturn(PlaybackState.Builder().build()) - mediaControllerRepository.setActiveLocalMediaController(mediaController) + mediaControllerRepository.setActiveSessions(listOf(localMediaController)) underTest = SpatialAudioComponentInteractor( diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java index a8999ff31f8a..6c8949e51094 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java @@ -16,6 +16,7 @@ package com.android.systemui.plugins.qs; import android.content.Context; import android.view.View; +import android.view.ViewConfiguration; import android.widget.LinearLayout; import com.android.systemui.plugins.annotations.DependsOn; @@ -74,4 +75,9 @@ public abstract class QSTileView extends LinearLayout { /** Sets the index of this tile in its layout */ public abstract void setPosition(int position); + + /** Get the duration of a visuo-haptic long-press effect */ + public int getLongPressEffectDuration() { + return ViewConfiguration.getLongPressTimeout() - ViewConfiguration.getTapTimeout(); + } } diff --git a/packages/SystemUI/res/layout/screenshot_shelf.xml b/packages/SystemUI/res/layout/screenshot_shelf.xml new file mode 100644 index 000000000000..ef1a21f2fdf6 --- /dev/null +++ b/packages/SystemUI/res/layout/screenshot_shelf.xml @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2024 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. + --> +<com.android.systemui.screenshot.ui.ScreenshotShelfView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ImageView + android:id="@+id/actions_container_background" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp" + android:elevation="4dp" + android:background="@drawable/action_chip_container_background" + android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal" + android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/actions_container" + app:layout_constraintEnd_toEndOf="@+id/actions_container" + app:layout_constraintBottom_toTopOf="@id/guideline"/> + <HorizontalScrollView + android:id="@+id/actions_container" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal" + android:paddingEnd="@dimen/overlay_action_container_padding_end" + android:paddingVertical="@dimen/overlay_action_container_padding_vertical" + android:elevation="4dp" + android:scrollbars="none" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintWidth_percent="1.0" + app:layout_constraintWidth_max="wrap" + app:layout_constraintStart_toEndOf="@+id/screenshot_preview_border" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/actions_container_background"> + <LinearLayout + android:id="@+id/screenshot_actions" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <include layout="@layout/overlay_action_chip" + android:id="@+id/screenshot_share_chip"/> + <include layout="@layout/overlay_action_chip" + android:id="@+id/screenshot_edit_chip"/> + <include layout="@layout/overlay_action_chip" + android:id="@+id/screenshot_scroll_chip" + android:visibility="gone" /> + </LinearLayout> + </HorizontalScrollView> + <View + android:id="@+id/screenshot_preview_border" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginStart="16dp" + android:layout_marginTop="@dimen/overlay_border_width_neg" + android:layout_marginEnd="@dimen/overlay_border_width_neg" + android:layout_marginBottom="14dp" + android:elevation="8dp" + android:background="@drawable/overlay_border" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/screenshot_preview" + app:layout_constraintEnd_toEndOf="@id/screenshot_preview" + app:layout_constraintBottom_toBottomOf="parent"/> + <ImageView + android:id="@+id/screenshot_preview" + android:layout_width="@dimen/overlay_x_scale" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/overlay_border_width" + android:layout_marginBottom="@dimen/overlay_border_width" + android:layout_gravity="center" + android:elevation="8dp" + android:contentDescription="@string/screenshot_edit_description" + android:scaleType="fitEnd" + android:background="@drawable/overlay_preview_background" + android:adjustViewBounds="true" + android:clickable="true" + app:layout_constraintStart_toStartOf="@id/screenshot_preview_border" + app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"/> + <ImageView + android:id="@+id/screenshot_badge" + android:layout_width="56dp" + android:layout_height="56dp" + android:visibility="gone" + android:elevation="9dp" + app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border" + app:layout_constraintEnd_toEndOf="@id/screenshot_preview_border"/> + <FrameLayout + android:id="@+id/screenshot_dismiss_button" + android:layout_width="@dimen/overlay_dismiss_button_tappable_size" + android:layout_height="@dimen/overlay_dismiss_button_tappable_size" + android:elevation="11dp" + android:visibility="gone" + app:layout_constraintStart_toEndOf="@id/screenshot_preview" + app:layout_constraintEnd_toEndOf="@id/screenshot_preview" + app:layout_constraintTop_toTopOf="@id/screenshot_preview" + app:layout_constraintBottom_toTopOf="@id/screenshot_preview" + android:contentDescription="@string/screenshot_dismiss_description"> + <ImageView + android:id="@+id/screenshot_dismiss_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="@dimen/overlay_dismiss_button_margin" + android:background="@drawable/circular_background" + android:backgroundTint="?androidprv:attr/materialColorPrimary" + android:tint="?androidprv:attr/materialColorOnPrimary" + android:padding="4dp" + android:src="@drawable/ic_close"/> + </FrameLayout> + <ImageView + android:id="@+id/screenshot_scrollable_preview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="matrix" + android:visibility="gone" + app:layout_constraintStart_toStartOf="@id/screenshot_preview" + app:layout_constraintTop_toTopOf="@id/screenshot_preview" + android:elevation="7dp"/> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintGuide_end="0dp" /> + + <FrameLayout + android:id="@+id/screenshot_message_container" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/overlay_action_container_margin_horizontal" + android:layout_marginTop="4dp" + android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom" + android:paddingHorizontal="@dimen/overlay_action_container_padding_end" + android:paddingVertical="@dimen/overlay_action_container_padding_vertical" + android:elevation="4dp" + android:background="@drawable/action_chip_container_background" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/guideline" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintWidth_max="450dp" + app:layout_constraintHorizontal_bias="0"> + <include layout="@layout/screenshot_work_profile_first_run" /> + <include layout="@layout/screenshot_detection_notice" /> + </FrameLayout> +</com.android.systemui.screenshot.ui.ScreenshotShelfView> diff --git a/packages/SystemUI/res/layout/window_magnification_settings_view.xml b/packages/SystemUI/res/layout/window_magnification_settings_view.xml index efdb0a360031..704cf0b61b1b 100644 --- a/packages/SystemUI/res/layout/window_magnification_settings_view.xml +++ b/packages/SystemUI/res/layout/window_magnification_settings_view.xml @@ -29,9 +29,13 @@ android:layout_height="wrap_content" android:orientation="horizontal"> <TextView + android:id="@+id/magnifier_size_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + android:singleLine="true" + android:scrollHorizontally="true" + android:ellipsize="marquee" android:text="@string/accessibility_magnifier_size" android:textAppearance="@style/TextAppearance.MagnificationSetting.Title" android:focusable="true" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 774bbe504b03..3029888c7e54 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -235,6 +235,8 @@ <string name="screenshot_edit_label">Edit</string> <!-- Content description indicating that tapping the element will allow editing the screenshot [CHAR LIMIT=NONE] --> <string name="screenshot_edit_description">Edit screenshot</string> + <!-- Label for UI element which allows sharing the screenshot [CHAR LIMIT=30] --> + <string name="screenshot_share_label">Share</string> <!-- Content description indicating that tapping the element will allow sharing the screenshot [CHAR LIMIT=NONE] --> <string name="screenshot_share_description">Share screenshot</string> <!-- Label for UI element which allows the user to capture additional off-screen content in a screenshot. [CHAR LIMIT=30] --> @@ -1437,8 +1439,11 @@ <!-- Indication on the keyguard that appears when a trust agents unlocks the device. [CHAR LIMIT=40] --> <string name="keyguard_indication_trust_unlocked">Kept unlocked by TrustAgent</string> - <!-- Message asking the user to authenticate with primary authentication methods (PIN/pattern/password) or biometrics after the device is locked by adaptive auth. [CHAR LIMIT=60] --> - <string name="kg_prompt_after_adaptive_auth_lock">Theft protection\nDevice locked, too many unlock attempts</string> + <!-- Message asking the user to authenticate with primary authentication methods (PIN/pattern/password) or biometrics after the device is locked by adaptive auth. [CHAR LIMIT=70] --> + <string name="kg_prompt_after_adaptive_auth_lock">Device was locked, too many authentication attempts</string> + + <!-- Indication on the keyguard that appears after the device is locked by adaptive auth. [CHAR LIMIT=60] --> + <string name="keyguard_indication_after_adaptive_auth_lock">Device locked\nFailed authentication</string> <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] --> <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string> @@ -1991,8 +1996,6 @@ <string name="group_system_cycle_back">Cycle backward through recent apps</string> <!-- User visible title for the keyboard shortcut that accesses list of all apps and search. [CHAR LIMIT=70] --> <string name="group_system_access_all_apps_search">Open apps list</string> - <!-- User visible title for the keyboard shortcut that hides and (re)showes taskbar. [CHAR LIMIT=70] --> - <string name="group_system_hide_reshow_taskbar">Show taskbar</string> <!-- User visible title for the keyboard shortcut that accesses [system] settings. [CHAR LIMIT=70] --> <string name="group_system_access_system_settings">Open settings</string> <!-- User visible title for the keyboard shortcut that accesses Assistant app. [CHAR LIMIT=70] --> @@ -2010,6 +2013,10 @@ <string name="system_multitasking_lhs">Enter split screen with current app to LHS</string> <!-- User visible title for the keyboard shortcut that switches from split screen to full screen [CHAR LIMIT=70] --> <string name="system_multitasking_full_screen">Switch from split screen to full screen</string> + <!-- User visible title for the keyboard shortcut that switches to app on right or below while using split screen [CHAR LIMIT=70] --> + <string name="system_multitasking_splitscreen_focus_rhs">Switch to app on right or below while using split screen</string> + <!-- User visible title for the keyboard shortcut that switches to app on left or above while using split screen [CHAR LIMIT=70] --> + <string name="system_multitasking_splitscreen_focus_lhs">Switch to app on left or above while using split screen</string> <!-- User visible title for the keyboard shortcut that replaces an app from one to another during split screen [CHAR LIMIT=70] --> <string name="system_multitasking_replace">During split screen: replace an app from one to another</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 59516be65a5e..0483a0734a83 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -962,7 +962,7 @@ <item name="android:windowBackground">@android:color/transparent</item> <item name="android:backgroundDimEnabled">true</item> <item name="android:windowCloseOnTouchOutside">true</item> - <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> + <item name="android:windowAnimationStyle">@null</item> </style> <style name="Widget.SliceView.VolumePanel"> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index e621ffe4cbc4..86f64f809e42 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -631,7 +631,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS @Nullable public ClockController getClock() { if (migrateClocksToBlueprint()) { - return mKeyguardClockInteractor.getClock(); + return mKeyguardClockInteractor.getCurrentClock().getValue(); } else { return mClockEventController.getClock(); } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java index a98990af00c7..ca24ccb3e6ec 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java @@ -98,6 +98,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest private ImageButton mMediumButton; private ImageButton mLargeButton; private Button mDoneButton; + private TextView mSizeTitle; private Button mEditButton; private ImageButton mFullScreenButton; private int mLastSelectedButtonIndex = MagnificationSize.NONE; @@ -521,6 +522,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mMediumButton = mSettingView.findViewById(R.id.magnifier_medium_button); mLargeButton = mSettingView.findViewById(R.id.magnifier_large_button); mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button); + mSizeTitle = mSettingView.findViewById(R.id.magnifier_size_title); mEditButton = mSettingView.findViewById(R.id.magnifier_edit_button); mFullScreenButton = mSettingView.findViewById(R.id.magnifier_full_button); mAllowDiagonalScrollingTitle = @@ -548,6 +550,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mDoneButton.setOnClickListener(mButtonClickListener); mFullScreenButton.setOnClickListener(mButtonClickListener); mEditButton.setOnClickListener(mButtonClickListener); + mSizeTitle.setSelected(true); mAllowDiagonalScrollingTitle.setSelected(true); mSettingView.setOnApplyWindowInsetsListener((v, insets) -> { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt index ac99fc69b2b5..85f63e9f1974 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt @@ -126,6 +126,7 @@ constructor( field?.let { oldView -> val lottie = oldView.requireViewById(R.id.sidefps_animation) as LottieAnimationView lottie.pauseAnimation() + lottie.removeAllLottieOnCompositionLoadedListener() windowManager.removeView(oldView) orientationListener.disable() } @@ -288,7 +289,7 @@ constructor( } private fun onOrientationChanged(@BiometricRequestConstants.RequestReason reason: Int) { - if (overlayView != null) { + if (overlayView?.isAttachedToWindow == true) { createOverlayForDisplay(reason) } } @@ -322,7 +323,7 @@ constructor( ) lottie.addLottieOnCompositionLoadedListener { // Check that view is not stale, and that overlayView has not been hidden/removed - if (overlayView != null && overlayView == view) { + if (overlayView?.isAttachedToWindow == true && overlayView == view) { updateOverlayParams(display, it.bounds) } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/BiometricStatusInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/BiometricStatusInteractor.kt index ed1557cccd01..c4967ec0df21 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/BiometricStatusInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/BiometricStatusInteractor.kt @@ -23,6 +23,7 @@ import com.android.systemui.biometrics.shared.model.AuthenticationReason.Setting import com.android.systemui.keyguard.shared.model.FingerprintAuthenticationStatus import javax.inject.Inject import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map /** Encapsulates business logic for interacting with biometric authentication state. */ @@ -52,7 +53,7 @@ constructor( } else { AuthenticationReason.NotRunning } - } + }.distinctUntilChanged() override val fingerprintAcquiredStatus: Flow<FingerprintAuthenticationStatus> = biometricStatusRepository.fingerprintAcquiredStatus diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt index d849b3a44519..94e085479675 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt @@ -20,7 +20,6 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlagsClassic import com.android.systemui.flags.Flags import javax.inject.Inject -import kotlinx.coroutines.flow.MutableStateFlow /** Provides access to bouncer-related application state. */ @SysUISingleton @@ -29,9 +28,6 @@ class BouncerRepository constructor( private val flags: FeatureFlagsClassic, ) { - /** The user-facing message to show in the bouncer. */ - val message = MutableStateFlow<String?>(null) - /** Whether the user switcher should be displayed within the bouncer UI on large screens. */ val isUserSwitcherVisible: Boolean get() = flags.isEnabled(Flags.FULL_SCREEN_USER_SWITCHER) diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt index d8be1afc4dd6..aeb564d53195 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt @@ -16,13 +16,8 @@ package com.android.systemui.bouncer.domain.interactor -import android.content.Context import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor import com.android.systemui.authentication.domain.interactor.AuthenticationResult -import com.android.systemui.authentication.shared.model.AuthenticationMethodModel -import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Password -import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Pattern -import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Pin import com.android.systemui.authentication.shared.model.AuthenticationMethodModel.Sim import com.android.systemui.bouncer.data.repository.BouncerRepository import com.android.systemui.classifier.FalsingClassifier @@ -31,7 +26,6 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.res.R import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async @@ -41,7 +35,6 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map -import kotlinx.coroutines.launch /** Encapsulates business logic and application state accessing use-cases. */ @SysUISingleton @@ -49,16 +42,14 @@ class BouncerInteractor @Inject constructor( @Application private val applicationScope: CoroutineScope, - @Application private val applicationContext: Context, private val repository: BouncerRepository, private val authenticationInteractor: AuthenticationInteractor, private val deviceEntryFaceAuthInteractor: DeviceEntryFaceAuthInteractor, private val falsingInteractor: FalsingInteractor, private val powerInteractor: PowerInteractor, - private val simBouncerInteractor: SimBouncerInteractor, ) { - /** The user-facing message to show in the bouncer when lockout is not active. */ - val message: StateFlow<String?> = repository.message + private val _onIncorrectBouncerInput = MutableSharedFlow<Unit>() + val onIncorrectBouncerInput: SharedFlow<Unit> = _onIncorrectBouncerInput /** Whether the auto confirm feature is enabled for the currently-selected user. */ val isAutoConfirmEnabled: StateFlow<Boolean> = authenticationInteractor.isAutoConfirmEnabled @@ -119,25 +110,6 @@ constructor( ) } - fun setMessage(message: String?) { - repository.message.value = message - } - - /** - * Resets the user-facing message back to the default according to the current authentication - * method. - */ - fun resetMessage() { - applicationScope.launch { - setMessage(promptMessage(authenticationInteractor.getAuthenticationMethod())) - } - } - - /** Removes the user-facing message. */ - fun clearMessage() { - setMessage(null) - } - /** * Attempts to authenticate based on the given user input. * @@ -176,50 +148,17 @@ constructor( .async { authenticationInteractor.authenticate(input, tryAutoConfirm) } .await() - if (authenticationInteractor.lockoutEndTimestamp != null) { - clearMessage() - } else if ( + if ( authResult == AuthenticationResult.FAILED || (authResult == AuthenticationResult.SKIPPED && !tryAutoConfirm) ) { - showWrongInputMessage() + _onIncorrectBouncerInput.emit(Unit) } return authResult } - /** - * Shows the a message notifying the user that their credentials input is wrong. - * - * Callers should use this instead of [authenticate] when they know ahead of time that an auth - * attempt will fail but aren't interested in the other side effects like triggering lockout. - * For example, if the user entered a pattern that's too short, the system can show the error - * message without having the attempt trigger lockout. - */ - private suspend fun showWrongInputMessage() { - setMessage(wrongInputMessage(authenticationInteractor.getAuthenticationMethod())) - } - /** Notifies that the input method editor (software keyboard) has been hidden by the user. */ suspend fun onImeHiddenByUser() { _onImeHiddenByUser.emit(Unit) } - - private fun promptMessage(authMethod: AuthenticationMethodModel): String { - return when (authMethod) { - is Sim -> simBouncerInteractor.getDefaultMessage() - is Pin -> applicationContext.getString(R.string.keyguard_enter_your_pin) - is Password -> applicationContext.getString(R.string.keyguard_enter_your_password) - is Pattern -> applicationContext.getString(R.string.keyguard_enter_your_pattern) - else -> "" - } - } - - private fun wrongInputMessage(authMethod: AuthenticationMethodModel): String { - return when (authMethod) { - is Pin -> applicationContext.getString(R.string.kg_wrong_pin) - is Password -> applicationContext.getString(R.string.kg_wrong_password) - is Pattern -> applicationContext.getString(R.string.kg_wrong_pattern) - else -> "" - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt index 7f6fc914e92b..d20c60724822 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt @@ -33,15 +33,17 @@ import com.android.systemui.bouncer.shared.model.Message import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.deviceentry.data.repository.DeviceEntryFaceAuthRepository +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFingerprintAuthInteractor import com.android.systemui.flags.SystemPropertiesHelper import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository import com.android.systemui.keyguard.data.repository.TrustRepository import com.android.systemui.user.data.repository.UserRepository -import com.android.systemui.util.kotlin.Quint +import com.android.systemui.util.kotlin.Sextuple +import com.android.systemui.util.kotlin.combine import javax.inject.Inject import kotlin.math.roundToInt import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.combine @@ -56,6 +58,7 @@ private const val REBOOT_MAINLINE_UPDATE = "reboot,mainline_update" private const val TAG = "BouncerMessageInteractor" /** Handles business logic for the primary bouncer message area. */ +@OptIn(ExperimentalCoroutinesApi::class) @SysUISingleton class BouncerMessageInteractor @Inject @@ -63,23 +66,24 @@ constructor( private val repository: BouncerMessageRepository, private val userRepository: UserRepository, private val countDownTimerUtil: CountDownTimerUtil, - private val updateMonitor: KeyguardUpdateMonitor, + updateMonitor: KeyguardUpdateMonitor, trustRepository: TrustRepository, biometricSettingsRepository: BiometricSettingsRepository, private val systemPropertiesHelper: SystemPropertiesHelper, primaryBouncerInteractor: PrimaryBouncerInteractor, @Application private val applicationScope: CoroutineScope, private val facePropertyRepository: FacePropertyRepository, - deviceEntryFingerprintAuthRepository: DeviceEntryFingerprintAuthRepository, + private val deviceEntryFingerprintAuthInteractor: DeviceEntryFingerprintAuthInteractor, faceAuthRepository: DeviceEntryFaceAuthRepository, private val securityModel: KeyguardSecurityModel, ) { - private val isFingerprintAuthCurrentlyAllowed = - deviceEntryFingerprintAuthRepository.isLockedOut - .isFalse() - .and(biometricSettingsRepository.isFingerprintAuthCurrentlyAllowed) - .stateIn(applicationScope, SharingStarted.Eagerly, false) + private val isFingerprintAuthCurrentlyAllowedOnBouncer = + deviceEntryFingerprintAuthInteractor.isFingerprintCurrentlyAllowedOnBouncer.stateIn( + applicationScope, + SharingStarted.Eagerly, + false + ) private val currentSecurityMode get() = securityModel.getSecurityMode(currentUserId) @@ -99,13 +103,13 @@ constructor( BiometricSourceType.FACE -> BouncerMessageStrings.incorrectFaceInput( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() else -> BouncerMessageStrings.defaultMessage( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } @@ -144,11 +148,12 @@ constructor( biometricSettingsRepository.authenticationFlags, trustRepository.isCurrentUserTrustManaged, isAnyBiometricsEnabledAndEnrolled, - deviceEntryFingerprintAuthRepository.isLockedOut, + deviceEntryFingerprintAuthInteractor.isLockedOut, faceAuthRepository.isLockedOut, - ::Quint + isFingerprintAuthCurrentlyAllowedOnBouncer, + ::Sextuple ) - .map { (flags, _, biometricsEnrolledAndEnabled, fpLockedOut, faceLockedOut) -> + .map { (flags, _, biometricsEnrolledAndEnabled, fpLockedOut, faceLockedOut, _) -> val isTrustUsuallyManaged = trustRepository.isCurrentUserTrustUsuallyManaged.value val trustOrBiometricsAvailable = (isTrustUsuallyManaged || biometricsEnrolledAndEnabled) @@ -193,14 +198,14 @@ constructor( } else { BouncerMessageStrings.faceLockedOut( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } } else if (flags.isSomeAuthRequiredAfterAdaptiveAuthRequest) { BouncerMessageStrings.authRequiredAfterAdaptiveAuthRequest( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } else if ( @@ -209,19 +214,19 @@ constructor( ) { BouncerMessageStrings.nonStrongAuthTimeout( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } else if (isTrustUsuallyManaged && flags.someAuthRequiredAfterUserRequest) { BouncerMessageStrings.trustAgentDisabled( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } else if (isTrustUsuallyManaged && flags.someAuthRequiredAfterTrustAgentExpired) { BouncerMessageStrings.trustAgentDisabled( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() } else if (trustOrBiometricsAvailable && flags.isInUserLockdown) { @@ -265,7 +270,7 @@ constructor( repository.setMessage( BouncerMessageStrings.incorrectSecurityInput( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() ) @@ -274,14 +279,22 @@ constructor( fun setFingerprintAcquisitionMessage(value: String?) { if (!Flags.revampedBouncerMessages()) return repository.setMessage( - defaultMessage(currentSecurityMode, value, isFingerprintAuthCurrentlyAllowed.value) + defaultMessage( + currentSecurityMode, + value, + isFingerprintAuthCurrentlyAllowedOnBouncer.value + ) ) } fun setFaceAcquisitionMessage(value: String?) { if (!Flags.revampedBouncerMessages()) return repository.setMessage( - defaultMessage(currentSecurityMode, value, isFingerprintAuthCurrentlyAllowed.value) + defaultMessage( + currentSecurityMode, + value, + isFingerprintAuthCurrentlyAllowedOnBouncer.value + ) ) } @@ -289,7 +302,11 @@ constructor( if (!Flags.revampedBouncerMessages()) return repository.setMessage( - defaultMessage(currentSecurityMode, value, isFingerprintAuthCurrentlyAllowed.value) + defaultMessage( + currentSecurityMode, + value, + isFingerprintAuthCurrentlyAllowedOnBouncer.value + ) ) } @@ -297,7 +314,7 @@ constructor( get() = BouncerMessageStrings.defaultMessage( currentSecurityMode.toAuthModel(), - isFingerprintAuthCurrentlyAllowed.value + isFingerprintAuthCurrentlyAllowedOnBouncer.value ) .toMessage() @@ -355,11 +372,6 @@ open class CountDownTimerUtil @Inject constructor() { private fun Flow<Boolean>.or(anotherFlow: Flow<Boolean>) = this.combine(anotherFlow) { a, b -> a || b } -private fun Flow<Boolean>.and(anotherFlow: Flow<Boolean>) = - this.combine(anotherFlow) { a, b -> a && b } - -private fun Flow<Boolean>.isFalse() = this.map { !it } - private fun defaultMessage( securityMode: SecurityMode, secondaryMessage: String?, diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt index f3903ded7cf4..aebc50f92e8d 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerViewModule.kt @@ -18,6 +18,7 @@ package com.android.systemui.bouncer.ui import android.app.AlertDialog import android.content.Context +import com.android.systemui.bouncer.ui.viewmodel.BouncerMessageViewModelModule import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModelModule import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -30,6 +31,7 @@ import dagger.Provides includes = [ BouncerViewModelModule::class, + BouncerMessageViewModelModule::class, ], ) interface BouncerViewModule { diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt index 0d7f6dcce1c7..4fbf735a62a2 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt @@ -57,17 +57,11 @@ sealed class AuthMethodBouncerViewModel( */ @get:StringRes abstract val lockoutMessageId: Int - /** Notifies that the UI has been shown to the user. */ - fun onShown() { - interactor.resetMessage() - } - /** * Notifies that the UI has been hidden from the user (after any transitions have completed). */ open fun onHidden() { clearInput() - interactor.resetMessage() } /** Notifies that the user has placed down a pointer. */ diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModel.kt new file mode 100644 index 000000000000..6cb9b16e2f9b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModel.kt @@ -0,0 +1,436 @@ +/* + * Copyright (C) 2024 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.bouncer.ui.viewmodel + +import android.content.Context +import android.util.PluralsMessageFormatter +import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor +import com.android.systemui.authentication.shared.model.AuthenticationMethodModel +import com.android.systemui.bouncer.domain.interactor.BouncerInteractor +import com.android.systemui.bouncer.domain.interactor.SimBouncerInteractor +import com.android.systemui.bouncer.shared.flag.ComposeBouncerFlags +import com.android.systemui.bouncer.shared.model.BouncerMessagePair +import com.android.systemui.bouncer.shared.model.BouncerMessageStrings +import com.android.systemui.bouncer.shared.model.primaryMessage +import com.android.systemui.bouncer.shared.model.secondaryMessage +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.deviceentry.domain.interactor.BiometricMessageInteractor +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFingerprintAuthInteractor +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor +import com.android.systemui.deviceentry.shared.model.DeviceEntryRestrictionReason +import com.android.systemui.deviceentry.shared.model.FaceFailureMessage +import com.android.systemui.deviceentry.shared.model.FaceLockoutMessage +import com.android.systemui.deviceentry.shared.model.FaceTimeoutMessage +import com.android.systemui.deviceentry.shared.model.FingerprintFailureMessage +import com.android.systemui.deviceentry.shared.model.FingerprintLockoutMessage +import com.android.systemui.res.R.string.kg_too_many_failed_attempts_countdown +import com.android.systemui.user.ui.viewmodel.UserSwitcherViewModel +import com.android.systemui.user.ui.viewmodel.UserViewModel +import com.android.systemui.util.kotlin.Utils.Companion.sample +import com.android.systemui.util.time.SystemClock +import dagger.Module +import dagger.Provides +import kotlin.math.ceil +import kotlin.math.max +import kotlin.time.Duration.Companion.seconds +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch + +/** Holds UI state for the 2-line status message shown on the bouncer. */ +@OptIn(ExperimentalCoroutinesApi::class) +class BouncerMessageViewModel( + @Application private val applicationContext: Context, + @Application private val applicationScope: CoroutineScope, + private val bouncerInteractor: BouncerInteractor, + private val simBouncerInteractor: SimBouncerInteractor, + private val authenticationInteractor: AuthenticationInteractor, + selectedUser: Flow<UserViewModel>, + private val clock: SystemClock, + private val biometricMessageInteractor: BiometricMessageInteractor, + private val faceAuthInteractor: DeviceEntryFaceAuthInteractor, + private val deviceEntryInteractor: DeviceEntryInteractor, + private val fingerprintInteractor: DeviceEntryFingerprintAuthInteractor, + flags: ComposeBouncerFlags, +) { + /** + * A message shown when the user has attempted the wrong credential too many times and now must + * wait a while before attempting to authenticate again. + * + * This is updated every second (countdown) during the lockout. When lockout is not active, this + * is `null` and no lockout message should be shown. + */ + private val lockoutMessage: MutableStateFlow<MessageViewModel?> = MutableStateFlow(null) + + /** Whether there is a lockout message that is available to be shown in the status message. */ + val isLockoutMessagePresent: Flow<Boolean> = lockoutMessage.map { it != null } + + /** The user-facing message to show in the bouncer. */ + val message: MutableStateFlow<MessageViewModel?> = MutableStateFlow(null) + + /** Initializes the bouncer message to default whenever it is shown. */ + fun onShown() { + showDefaultMessage() + } + + /** Reset the message shown on the bouncer to the default message. */ + fun showDefaultMessage() { + resetToDefault.tryEmit(Unit) + } + + private val resetToDefault = MutableSharedFlow<Unit>(replay = 1) + + private var lockoutCountdownJob: Job? = null + + private fun defaultBouncerMessageInitializer() { + applicationScope.launch { + resetToDefault.emit(Unit) + authenticationInteractor.authenticationMethod + .flatMapLatest { authMethod -> + if (authMethod == AuthenticationMethodModel.Sim) { + resetToDefault.map { + MessageViewModel(simBouncerInteractor.getDefaultMessage()) + } + } else if (authMethod.isSecure) { + combine( + deviceEntryInteractor.deviceEntryRestrictionReason, + lockoutMessage, + fingerprintInteractor.isFingerprintCurrentlyAllowedOnBouncer, + resetToDefault, + ) { deviceEntryRestrictedReason, lockoutMsg, isFpAllowedInBouncer, _ -> + lockoutMsg + ?: deviceEntryRestrictedReason.toMessage( + authMethod, + isFpAllowedInBouncer + ) + } + } else { + emptyFlow() + } + } + .collectLatest { messageViewModel -> message.value = messageViewModel } + } + } + + private fun listenForSimBouncerEvents() { + // Listen for any events from the SIM bouncer and update the message shown on the bouncer. + applicationScope.launch { + authenticationInteractor.authenticationMethod + .flatMapLatest { authMethod -> + if (authMethod == AuthenticationMethodModel.Sim) { + simBouncerInteractor.bouncerMessageChanged.map { simMsg -> + simMsg?.let { MessageViewModel(it) } + } + } else { + emptyFlow() + } + } + .collectLatest { + if (it != null) { + message.value = it + } else { + resetToDefault.emit(Unit) + } + } + } + } + + private fun listenForFaceMessages() { + // Listen for any events from face authentication and update the message shown on the + // bouncer. + applicationScope.launch { + biometricMessageInteractor.faceMessage + .sample( + authenticationInteractor.authenticationMethod, + fingerprintInteractor.isFingerprintCurrentlyAllowedOnBouncer, + ) + .collectLatest { (faceMessage, authMethod, fingerprintAllowedOnBouncer) -> + val isFaceAuthStrong = faceAuthInteractor.isFaceAuthStrong() + val defaultPrimaryMessage = + BouncerMessageStrings.defaultMessage( + authMethod, + fingerprintAllowedOnBouncer + ) + .primaryMessage + .toResString() + message.value = + when (faceMessage) { + is FaceTimeoutMessage -> + MessageViewModel( + text = defaultPrimaryMessage, + secondaryText = faceMessage.message, + isUpdateAnimated = true + ) + is FaceLockoutMessage -> + if (isFaceAuthStrong) + BouncerMessageStrings.class3AuthLockedOut(authMethod) + .toMessage() + else + BouncerMessageStrings.faceLockedOut( + authMethod, + fingerprintAllowedOnBouncer + ) + .toMessage() + is FaceFailureMessage -> + BouncerMessageStrings.incorrectFaceInput( + authMethod, + fingerprintAllowedOnBouncer + ) + .toMessage() + else -> + MessageViewModel( + text = defaultPrimaryMessage, + secondaryText = faceMessage.message, + isUpdateAnimated = false + ) + } + delay(MESSAGE_DURATION) + resetToDefault.emit(Unit) + } + } + } + + private fun listenForFingerprintMessages() { + applicationScope.launch { + // Listen for any events from fingerprint authentication and update the message shown + // on the bouncer. + biometricMessageInteractor.fingerprintMessage + .sample( + authenticationInteractor.authenticationMethod, + fingerprintInteractor.isFingerprintCurrentlyAllowedOnBouncer + ) + .collectLatest { (fingerprintMessage, authMethod, isFingerprintAllowed) -> + val defaultPrimaryMessage = + BouncerMessageStrings.defaultMessage(authMethod, isFingerprintAllowed) + .primaryMessage + .toResString() + message.value = + when (fingerprintMessage) { + is FingerprintLockoutMessage -> + BouncerMessageStrings.class3AuthLockedOut(authMethod).toMessage() + is FingerprintFailureMessage -> + BouncerMessageStrings.incorrectFingerprintInput(authMethod) + .toMessage() + else -> + MessageViewModel( + text = defaultPrimaryMessage, + secondaryText = fingerprintMessage.message, + isUpdateAnimated = false + ) + } + delay(MESSAGE_DURATION) + resetToDefault.emit(Unit) + } + } + } + + private fun listenForBouncerEvents() { + // Keeps the lockout message up-to-date. + applicationScope.launch { + bouncerInteractor.onLockoutStarted.collect { startLockoutCountdown() } + } + + // Listens to relevant bouncer events + applicationScope.launch { + bouncerInteractor.onIncorrectBouncerInput + .sample( + authenticationInteractor.authenticationMethod, + fingerprintInteractor.isFingerprintCurrentlyAllowedOnBouncer + ) + .collectLatest { (_, authMethod, isFingerprintAllowed) -> + message.emit( + BouncerMessageStrings.incorrectSecurityInput( + authMethod, + isFingerprintAllowed + ) + .toMessage() + ) + delay(MESSAGE_DURATION) + resetToDefault.emit(Unit) + } + } + } + + private fun DeviceEntryRestrictionReason?.toMessage( + authMethod: AuthenticationMethodModel, + isFingerprintAllowedOnBouncer: Boolean, + ): MessageViewModel { + return when (this) { + DeviceEntryRestrictionReason.UserLockdown -> + BouncerMessageStrings.authRequiredAfterUserLockdown(authMethod) + DeviceEntryRestrictionReason.DeviceNotUnlockedSinceReboot -> + BouncerMessageStrings.authRequiredAfterReboot(authMethod) + DeviceEntryRestrictionReason.PolicyLockdown -> + BouncerMessageStrings.authRequiredAfterAdminLockdown(authMethod) + DeviceEntryRestrictionReason.UnattendedUpdate -> + BouncerMessageStrings.authRequiredForUnattendedUpdate(authMethod) + DeviceEntryRestrictionReason.DeviceNotUnlockedSinceMainlineUpdate -> + BouncerMessageStrings.authRequiredForMainlineUpdate(authMethod) + DeviceEntryRestrictionReason.SecurityTimeout -> + BouncerMessageStrings.authRequiredAfterPrimaryAuthTimeout(authMethod) + DeviceEntryRestrictionReason.StrongBiometricsLockedOut -> + BouncerMessageStrings.class3AuthLockedOut(authMethod) + DeviceEntryRestrictionReason.NonStrongFaceLockedOut -> + BouncerMessageStrings.faceLockedOut(authMethod, isFingerprintAllowedOnBouncer) + DeviceEntryRestrictionReason.NonStrongBiometricsSecurityTimeout -> + BouncerMessageStrings.nonStrongAuthTimeout( + authMethod, + isFingerprintAllowedOnBouncer + ) + DeviceEntryRestrictionReason.TrustAgentDisabled -> + BouncerMessageStrings.trustAgentDisabled(authMethod, isFingerprintAllowedOnBouncer) + DeviceEntryRestrictionReason.AdaptiveAuthRequest -> + BouncerMessageStrings.authRequiredAfterAdaptiveAuthRequest( + authMethod, + isFingerprintAllowedOnBouncer + ) + else -> BouncerMessageStrings.defaultMessage(authMethod, isFingerprintAllowedOnBouncer) + }.toMessage() + } + + private fun BouncerMessagePair.toMessage(): MessageViewModel { + val primaryMsg = this.primaryMessage.toResString() + val secondaryMsg = + if (this.secondaryMessage == 0) "" else this.secondaryMessage.toResString() + return MessageViewModel(primaryMsg, secondaryText = secondaryMsg, isUpdateAnimated = true) + } + + /** Shows the countdown message and refreshes it every second. */ + private fun startLockoutCountdown() { + lockoutCountdownJob?.cancel() + lockoutCountdownJob = + applicationScope.launch { + authenticationInteractor.authenticationMethod.collectLatest { authMethod -> + do { + val remainingSeconds = remainingLockoutSeconds() + val authLockedOutMsg = + BouncerMessageStrings.primaryAuthLockedOut(authMethod) + lockoutMessage.value = + if (remainingSeconds > 0) { + MessageViewModel( + text = + kg_too_many_failed_attempts_countdown.toPluralString( + mutableMapOf<String, Any>( + Pair("count", remainingSeconds) + ) + ), + secondaryText = authLockedOutMsg.secondaryMessage.toResString(), + isUpdateAnimated = false + ) + } else { + null + } + delay(1.seconds) + } while (remainingSeconds > 0) + lockoutCountdownJob = null + } + } + } + + private fun remainingLockoutSeconds(): Int { + val endTimestampMs = authenticationInteractor.lockoutEndTimestamp ?: 0 + val remainingMs = max(0, endTimestampMs - clock.elapsedRealtime()) + return ceil(remainingMs / 1000f).toInt() + } + + private fun Int.toPluralString(formatterArgs: Map<String, Any>): String = + PluralsMessageFormatter.format(applicationContext.resources, formatterArgs, this) + + private fun Int.toResString(): String = applicationContext.getString(this) + + init { + if (flags.isComposeBouncerOrSceneContainerEnabled()) { + applicationScope.launch { + // Update the lockout countdown whenever the selected user is switched. + selectedUser.collect { startLockoutCountdown() } + } + + defaultBouncerMessageInitializer() + + listenForSimBouncerEvents() + listenForBouncerEvents() + listenForFaceMessages() + listenForFingerprintMessages() + } + } + + companion object { + private const val MESSAGE_DURATION = 2000L + } +} + +/** Data class that represents the status message show on the bouncer. */ +data class MessageViewModel( + val text: String, + val secondaryText: String? = null, + /** + * Whether updates to the message should be cross-animated from one message to another. + * + * If `false`, no animation should be applied, the message text should just be replaced + * instantly. + */ + val isUpdateAnimated: Boolean = true, +) + +@OptIn(ExperimentalCoroutinesApi::class) +@Module +object BouncerMessageViewModelModule { + + @Provides + @SysUISingleton + fun viewModel( + @Application applicationContext: Context, + @Application applicationScope: CoroutineScope, + bouncerInteractor: BouncerInteractor, + simBouncerInteractor: SimBouncerInteractor, + authenticationInteractor: AuthenticationInteractor, + clock: SystemClock, + biometricMessageInteractor: BiometricMessageInteractor, + faceAuthInteractor: DeviceEntryFaceAuthInteractor, + deviceEntryInteractor: DeviceEntryInteractor, + fingerprintInteractor: DeviceEntryFingerprintAuthInteractor, + flags: ComposeBouncerFlags, + userSwitcherViewModel: UserSwitcherViewModel, + ): BouncerMessageViewModel { + return BouncerMessageViewModel( + applicationContext = applicationContext, + applicationScope = applicationScope, + bouncerInteractor = bouncerInteractor, + simBouncerInteractor = simBouncerInteractor, + authenticationInteractor = authenticationInteractor, + clock = clock, + biometricMessageInteractor = biometricMessageInteractor, + faceAuthInteractor = faceAuthInteractor, + deviceEntryInteractor = deviceEntryInteractor, + fingerprintInteractor = fingerprintInteractor, + flags = flags, + selectedUser = userSwitcherViewModel.selectedUser, + ) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt index 62875783ef5f..5c07cc57c620 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt @@ -21,7 +21,6 @@ import android.app.admin.DevicePolicyResources import android.content.Context import android.graphics.Bitmap import androidx.core.graphics.drawable.toBitmap -import com.android.internal.R import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor import com.android.systemui.authentication.shared.model.AuthenticationMethodModel import com.android.systemui.authentication.shared.model.AuthenticationWipeModel @@ -40,18 +39,12 @@ import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.user.ui.viewmodel.UserActionViewModel import com.android.systemui.user.ui.viewmodel.UserSwitcherViewModel import com.android.systemui.user.ui.viewmodel.UserViewModel -import com.android.systemui.util.time.SystemClock import dagger.Module import dagger.Provides -import kotlin.math.ceil -import kotlin.math.max -import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -72,13 +65,13 @@ class BouncerViewModel( private val simBouncerInteractor: SimBouncerInteractor, private val authenticationInteractor: AuthenticationInteractor, private val selectedUserInteractor: SelectedUserInteractor, + private val devicePolicyManager: DevicePolicyManager, + bouncerMessageViewModel: BouncerMessageViewModel, flags: ComposeBouncerFlags, selectedUser: Flow<UserViewModel>, users: Flow<List<UserViewModel>>, userSwitcherMenu: Flow<List<UserActionViewModel>>, actionButton: Flow<BouncerActionButtonModel?>, - private val clock: SystemClock, - private val devicePolicyManager: DevicePolicyManager, ) { val selectedUserImage: StateFlow<Bitmap?> = selectedUser @@ -89,6 +82,8 @@ class BouncerViewModel( initialValue = null, ) + val message: BouncerMessageViewModel = bouncerMessageViewModel + val userSwitcherDropdown: StateFlow<List<UserSwitcherDropdownItemViewModel>> = combine( users, @@ -163,24 +158,6 @@ class BouncerViewModel( ) /** - * A message shown when the user has attempted the wrong credential too many times and now must - * wait a while before attempting to authenticate again. - * - * This is updated every second (countdown) during the lockout duration. When lockout is not - * active, this is `null` and no lockout message should be shown. - */ - private val lockoutMessage = MutableStateFlow<String?>(null) - - /** The user-facing message to show in the bouncer. */ - val message: StateFlow<MessageViewModel> = - combine(bouncerInteractor.message, lockoutMessage) { _, _ -> createMessageViewModel() } - .stateIn( - scope = applicationScope, - started = SharingStarted.WhileSubscribed(), - initialValue = createMessageViewModel(), - ) - - /** * The bouncer action button (Return to Call / Emergency Call). If `null`, the button should not * be shown. */ @@ -222,31 +199,16 @@ class BouncerViewModel( ) private val isInputEnabled: StateFlow<Boolean> = - lockoutMessage - .map { it == null } + bouncerMessageViewModel.isLockoutMessagePresent + .map { lockoutMessagePresent -> !lockoutMessagePresent } .stateIn( scope = applicationScope, started = SharingStarted.WhileSubscribed(), initialValue = authenticationInteractor.lockoutEndTimestamp == null, ) - private var lockoutCountdownJob: Job? = null - init { if (flags.isComposeBouncerOrSceneContainerEnabled()) { - // Keeps the lockout dialog up-to-date. - applicationScope.launch { - bouncerInteractor.onLockoutStarted.collect { - showLockoutDialog() - startLockoutCountdown() - } - } - - applicationScope.launch { - // Update the lockout countdown whenever the selected user is switched. - selectedUser.collect { startLockoutCountdown() } - } - // Keeps the upcoming wipe dialog up-to-date. applicationScope.launch { authenticationInteractor.upcomingWipe.collect { wipeModel -> @@ -256,48 +218,6 @@ class BouncerViewModel( } } - private fun showLockoutDialog() { - applicationScope.launch { - val failedAttempts = authenticationInteractor.failedAuthenticationAttempts.value - lockoutDialogMessage.value = - authMethodViewModel.value?.lockoutMessageId?.let { messageId -> - applicationContext.getString( - messageId, - failedAttempts, - remainingLockoutSeconds() - ) - } - } - } - - /** Shows the countdown message and refreshes it every second. */ - private fun startLockoutCountdown() { - lockoutCountdownJob?.cancel() - lockoutCountdownJob = - applicationScope.launch { - do { - val remainingSeconds = remainingLockoutSeconds() - lockoutMessage.value = - if (remainingSeconds > 0) { - applicationContext.getString( - R.string.lockscreen_too_many_failed_attempts_countdown, - remainingSeconds, - ) - } else { - null - } - delay(1.seconds) - } while (remainingSeconds > 0) - lockoutCountdownJob = null - } - } - - private fun remainingLockoutSeconds(): Int { - val endTimestampMs = authenticationInteractor.lockoutEndTimestamp ?: 0 - val remainingMs = max(0, endTimestampMs - clock.elapsedRealtime()) - return ceil(remainingMs / 1000f).toInt() - } - private fun isSideBySideSupported(authMethod: AuthMethodBouncerViewModel?): Boolean { return isUserSwitcherVisible || authMethod !is PasswordBouncerViewModel } @@ -306,15 +226,6 @@ class BouncerViewModel( return authMethod !is PasswordBouncerViewModel } - private fun createMessageViewModel(): MessageViewModel { - val isLockedOut = lockoutMessage.value != null - return MessageViewModel( - // A lockout message takes precedence over the non-lockout message. - text = lockoutMessage.value ?: bouncerInteractor.message.value ?: "", - isUpdateAnimated = !isLockedOut, - ) - } - private fun getChildViewModel( authenticationMethod: AuthenticationMethodModel, ): AuthMethodBouncerViewModel? { @@ -336,7 +247,8 @@ class BouncerViewModel( interactor = bouncerInteractor, isInputEnabled = isInputEnabled, simBouncerInteractor = simBouncerInteractor, - authenticationMethod = authenticationMethod + authenticationMethod = authenticationMethod, + onIntentionalUserInput = ::onIntentionalUserInput ) is AuthenticationMethodModel.Sim -> PinBouncerViewModel( @@ -346,6 +258,7 @@ class BouncerViewModel( isInputEnabled = isInputEnabled, simBouncerInteractor = simBouncerInteractor, authenticationMethod = authenticationMethod, + onIntentionalUserInput = ::onIntentionalUserInput ) is AuthenticationMethodModel.Password -> PasswordBouncerViewModel( @@ -354,6 +267,7 @@ class BouncerViewModel( interactor = bouncerInteractor, inputMethodInteractor = inputMethodInteractor, selectedUserInteractor = selectedUserInteractor, + onIntentionalUserInput = ::onIntentionalUserInput ) is AuthenticationMethodModel.Pattern -> PatternBouncerViewModel( @@ -361,11 +275,17 @@ class BouncerViewModel( viewModelScope = newViewModelScope, interactor = bouncerInteractor, isInputEnabled = isInputEnabled, + onIntentionalUserInput = ::onIntentionalUserInput ) else -> null } } + private fun onIntentionalUserInput() { + message.showDefaultMessage() + bouncerInteractor.onIntentionalUserInput() + } + private fun createChildCoroutineScope(parentScope: CoroutineScope): CoroutineScope { return CoroutineScope( SupervisorJob(parent = parentScope.coroutineContext.job) + mainDispatcher @@ -437,18 +357,6 @@ class BouncerViewModel( } } - data class MessageViewModel( - val text: String, - - /** - * Whether updates to the message should be cross-animated from one message to another. - * - * If `false`, no animation should be applied, the message text should just be replaced - * instantly. - */ - val isUpdateAnimated: Boolean, - ) - data class DialogViewModel( val text: String, @@ -480,8 +388,8 @@ object BouncerViewModelModule { selectedUserInteractor: SelectedUserInteractor, flags: ComposeBouncerFlags, userSwitcherViewModel: UserSwitcherViewModel, - clock: SystemClock, devicePolicyManager: DevicePolicyManager, + bouncerMessageViewModel: BouncerMessageViewModel, ): BouncerViewModel { return BouncerViewModel( applicationContext = applicationContext, @@ -497,8 +405,8 @@ object BouncerViewModelModule { users = userSwitcherViewModel.users, userSwitcherMenu = userSwitcherViewModel.menu, actionButton = actionButtonInteractor.actionButton, - clock = clock, devicePolicyManager = devicePolicyManager, + bouncerMessageViewModel = bouncerMessageViewModel, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModel.kt index b42eda108d54..052fb6b3c4d7 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModel.kt @@ -40,6 +40,7 @@ class PasswordBouncerViewModel( viewModelScope: CoroutineScope, isInputEnabled: StateFlow<Boolean>, interactor: BouncerInteractor, + private val onIntentionalUserInput: () -> Unit, private val inputMethodInteractor: InputMethodInteractor, private val selectedUserInteractor: SelectedUserInteractor, ) : @@ -96,12 +97,8 @@ class PasswordBouncerViewModel( /** Notifies that the user has changed the password input. */ fun onPasswordInputChanged(newPassword: String) { - if (this.password.value.isEmpty() && newPassword.isNotEmpty()) { - interactor.clearMessage() - } - if (newPassword.isNotEmpty()) { - interactor.onIntentionalUserInput() + onIntentionalUserInput() } _password.value = newPassword diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt index 69f8032ef4f2..a4016005a756 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt @@ -40,6 +40,7 @@ class PatternBouncerViewModel( viewModelScope: CoroutineScope, interactor: BouncerInteractor, isInputEnabled: StateFlow<Boolean>, + private val onIntentionalUserInput: () -> Unit, ) : AuthMethodBouncerViewModel( viewModelScope = viewModelScope, @@ -84,7 +85,7 @@ class PatternBouncerViewModel( /** Notifies that the user has started a drag gesture across the dot grid. */ fun onDragStart() { - interactor.clearMessage() + onIntentionalUserInput() } /** diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt index e910a9271ee2..62da5c0e5675 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt @@ -41,6 +41,7 @@ class PinBouncerViewModel( viewModelScope: CoroutineScope, interactor: BouncerInteractor, isInputEnabled: StateFlow<Boolean>, + private val onIntentionalUserInput: () -> Unit, private val simBouncerInteractor: SimBouncerInteractor, authenticationMethod: AuthenticationMethodModel, ) : @@ -131,11 +132,8 @@ class PinBouncerViewModel( /** Notifies that the user clicked on a PIN button with the given digit value. */ fun onPinButtonClicked(input: Int) { val pinInput = mutablePinInput.value - if (pinInput.isEmpty()) { - interactor.clearMessage() - } - interactor.onIntentionalUserInput() + onIntentionalUserInput() mutablePinInput.value = pinInput.append(input) tryAuthenticate(useAutoConfirm = true) @@ -149,7 +147,6 @@ class PinBouncerViewModel( /** Notifies that the user long-pressed the backspace button. */ fun onBackspaceButtonLongPressed() { clearInput() - interactor.clearMessage() } /** Notifies that the user clicked the "enter" button. */ @@ -173,7 +170,6 @@ class PinBouncerViewModel( /** Resets the sim screen and shows a default message. */ private fun onResetSimFlow() { simBouncerInteractor.resetSimPukUserInput() - interactor.resetMessage() clearInput() } diff --git a/packages/SystemUI/src/com/android/systemui/common/shared/model/NotificationContainerBounds.kt b/packages/SystemUI/src/com/android/systemui/common/shared/model/NotificationContainerBounds.kt index 3063ebd60b0c..fdd98bec0a2d 100644 --- a/packages/SystemUI/src/com/android/systemui/common/shared/model/NotificationContainerBounds.kt +++ b/packages/SystemUI/src/com/android/systemui/common/shared/model/NotificationContainerBounds.kt @@ -18,12 +18,8 @@ package com.android.systemui.common.shared.model /** Models the bounds of the notification container. */ data class NotificationContainerBounds( - /** The position of the left of the container in its window coordinate system, in pixels. */ - val left: Float = 0f, /** The position of the top of the container in its window coordinate system, in pixels. */ val top: Float = 0f, - /** The position of the right of the container in its window coordinate system, in pixels. */ - val right: Float = 0f, /** The position of the bottom of the container in its window coordinate system, in pixels. */ val bottom: Float = 0f, /** Whether any modifications to top/bottom should be smoothly animated. */ diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationState.kt b/packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationState.kt index 964eb6f3a613..578389b57a99 100644 --- a/packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationState.kt +++ b/packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationState.kt @@ -54,6 +54,18 @@ constructor( } /** + * Returns a [Flow] that emits a dimension pixel size that is kept in sync with the device + * configuration. + * + * @see android.content.res.Resources.getDimensionPixelSize + */ + fun getDimensionPixelOffset(@DimenRes id: Int): Flow<Int> { + return configurationController.onDensityOrFontScaleChanged.emitOnStart().map { + context.resources.getDimensionPixelOffset(id) + } + } + + /** * Returns a [Flow] that emits a color that is kept in sync with the device theme. * * @see Utils.getColorAttrDefaultColor diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt index bfe751af7154..afa7c37c648e 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt @@ -16,24 +16,36 @@ package com.android.systemui.communal.ui.viewmodel +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProviderInfo +import android.content.Intent +import android.content.pm.PackageManager +import android.content.res.Resources +import android.util.Log +import androidx.activity.result.ActivityResultLauncher import com.android.internal.logging.UiEventLogger import com.android.systemui.communal.domain.interactor.CommunalInteractor import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor import com.android.systemui.communal.domain.model.CommunalContentModel import com.android.systemui.communal.shared.log.CommunalUiEvent import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.log.LogBuffer import com.android.systemui.log.core.Logger import com.android.systemui.log.dagger.CommunalLog import com.android.systemui.media.controls.ui.view.MediaHost import com.android.systemui.media.dagger.MediaModule +import com.android.systemui.res.R import javax.inject.Inject import javax.inject.Named +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.withContext /** The view model for communal hub in edit mode. */ @SysUISingleton @@ -45,6 +57,7 @@ constructor( @Named(MediaModule.COMMUNAL_HUB) mediaHost: MediaHost, private val uiEventLogger: UiEventLogger, @CommunalLog logBuffer: LogBuffer, + @Background private val backgroundDispatcher: CoroutineDispatcher, ) : BaseCommunalViewModel(communalInteractor, mediaHost) { private val logger = Logger(logBuffer, "CommunalEditModeViewModel") @@ -86,10 +99,77 @@ constructor( uiEventLogger.log(CommunalUiEvent.COMMUNAL_HUB_REORDER_WIDGET_CANCEL) } - /** Returns the widget categories to show on communal hub. */ - val getCommunalWidgetCategories: Int - get() = communalSettingsInteractor.communalWidgetCategories.value + /** Launch the widget picker activity using the given {@link ActivityResultLauncher}. */ + suspend fun onOpenWidgetPicker( + resources: Resources, + packageManager: PackageManager, + activityLauncher: ActivityResultLauncher<Intent> + ): Boolean = + withContext(backgroundDispatcher) { + val widgets = communalInteractor.widgetContent.first() + val excludeList = widgets.mapTo(ArrayList()) { it.providerInfo } + getWidgetPickerActivityIntent(resources, packageManager, excludeList)?.let { + try { + activityLauncher.launch(it) + return@withContext true + } catch (e: Exception) { + Log.e(TAG, "Failed to launch widget picker activity", e) + } + } + false + } + + private fun getWidgetPickerActivityIntent( + resources: Resources, + packageManager: PackageManager, + excludeList: ArrayList<AppWidgetProviderInfo> + ): Intent? { + val packageName = + getLauncherPackageName(packageManager) + ?: run { + Log.e(TAG, "Couldn't resolve launcher package name") + return@getWidgetPickerActivityIntent null + } + + return Intent(Intent.ACTION_PICK).apply { + setPackage(packageName) + putExtra( + EXTRA_DESIRED_WIDGET_WIDTH, + resources.getDimensionPixelSize(R.dimen.communal_widget_picker_desired_width) + ) + putExtra( + EXTRA_DESIRED_WIDGET_HEIGHT, + resources.getDimensionPixelSize(R.dimen.communal_widget_picker_desired_height) + ) + putExtra( + AppWidgetManager.EXTRA_CATEGORY_FILTER, + communalSettingsInteractor.communalWidgetCategories.value + ) + putExtra(EXTRA_UI_SURFACE_KEY, EXTRA_UI_SURFACE_VALUE) + putParcelableArrayListExtra(EXTRA_ADDED_APP_WIDGETS_KEY, excludeList) + } + } + + private fun getLauncherPackageName(packageManager: PackageManager): String? { + return packageManager + .resolveActivity( + Intent(Intent.ACTION_MAIN).also { it.addCategory(Intent.CATEGORY_HOME) }, + PackageManager.MATCH_DEFAULT_ONLY + ) + ?.activityInfo + ?.packageName + } /** Sets whether edit mode is currently open */ fun setEditModeOpen(isOpen: Boolean) = communalInteractor.setEditModeOpen(isOpen) + + companion object { + private const val TAG = "CommunalEditModeViewModel" + + private const val EXTRA_DESIRED_WIDGET_WIDTH = "desired_widget_width" + private const val EXTRA_DESIRED_WIDGET_HEIGHT = "desired_widget_height" + private const val EXTRA_UI_SURFACE_KEY = "ui_surface" + private const val EXTRA_UI_SURFACE_VALUE = "widgets_hub" + const val EXTRA_ADDED_APP_WIDGETS_KEY = "added_app_widgets" + } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt index b6ad26b24dc7..ba18f0125a0a 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt @@ -16,9 +16,7 @@ package com.android.systemui.communal.widgets -import android.appwidget.AppWidgetManager import android.content.Intent -import android.content.pm.PackageManager import android.os.Bundle import android.os.RemoteException import android.util.Log @@ -32,6 +30,8 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.ui.Modifier +import androidx.lifecycle.lifecycleScope +import com.android.app.tracing.coroutines.launch import com.android.compose.theme.LocalAndroidColorScheme import com.android.compose.theme.PlatformTheme import com.android.internal.logging.UiEventLogger @@ -43,8 +43,8 @@ import com.android.systemui.communal.util.WidgetPickerIntentUtils.getWidgetExtra import com.android.systemui.log.LogBuffer import com.android.systemui.log.core.Logger import com.android.systemui.log.dagger.CommunalLog -import com.android.systemui.res.R import javax.inject.Inject +import kotlinx.coroutines.launch /** An Activity for editing the widgets that appear in hub mode. */ class EditWidgetsActivity @@ -57,11 +57,8 @@ constructor( @CommunalLog logBuffer: LogBuffer, ) : ComponentActivity() { companion object { - private const val EXTRA_IS_PENDING_WIDGET_DRAG = "is_pending_widget_drag" - private const val EXTRA_DESIRED_WIDGET_WIDTH = "desired_widget_width" - private const val EXTRA_DESIRED_WIDGET_HEIGHT = "desired_widget_height" - private const val TAG = "EditWidgetsActivity" + private const val EXTRA_IS_PENDING_WIDGET_DRAG = "is_pending_widget_drag" const val EXTRA_PRESELECTED_KEY = "preselected_key" } @@ -136,39 +133,13 @@ constructor( } private fun onOpenWidgetPicker() { - val intent = Intent(Intent.ACTION_MAIN).also { it.addCategory(Intent.CATEGORY_HOME) } - packageManager - .resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) - ?.activityInfo - ?.packageName - ?.let { packageName -> - try { - addWidgetActivityLauncher.launch( - Intent(Intent.ACTION_PICK).apply { - setPackage(packageName) - putExtra( - EXTRA_DESIRED_WIDGET_WIDTH, - resources.getDimensionPixelSize( - R.dimen.communal_widget_picker_desired_width - ) - ) - putExtra( - EXTRA_DESIRED_WIDGET_HEIGHT, - resources.getDimensionPixelSize( - R.dimen.communal_widget_picker_desired_height - ) - ) - putExtra( - AppWidgetManager.EXTRA_CATEGORY_FILTER, - communalViewModel.getCommunalWidgetCategories - ) - } - ) - } catch (e: Exception) { - Log.e(TAG, "Failed to launch widget picker activity", e) - } - } - ?: run { Log.e(TAG, "Couldn't resolve launcher package name") } + lifecycleScope.launch { + communalViewModel.onOpenWidgetPicker( + resources, + packageManager, + addWidgetActivityLauncher + ) + } } private fun onEditDone() { diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt index 805999397282..c4e0ef7d082d 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt @@ -29,6 +29,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filterIsInstance +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map @OptIn(ExperimentalCoroutinesApi::class) @@ -72,4 +74,14 @@ constructor( */ val isSensorUnderDisplay = fingerprintPropertyRepository.sensorType.map(FingerprintSensorType::isUdfps) + + /** Whether fingerprint authentication is currently allowed while on the bouncer. */ + val isFingerprintCurrentlyAllowedOnBouncer = + isSensorUnderDisplay.flatMapLatest { sensorBelowDisplay -> + if (sensorBelowDisplay) { + flowOf(false) + } else { + isFingerprintAuthCurrentlyAllowed + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffect.kt b/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffect.kt index ec72a1422973..f1620d96b159 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffect.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/qs/QSLongPressEffect.kt @@ -214,6 +214,24 @@ class QSLongPressEffect( _actionType.value = null } + /** + * Reset the effect with a new effect duration. + * + * The effect will go back to an [IDLE] state where it can begin its logic with a new duration. + * + * @param[duration] New duration for the long-press effect + */ + fun resetWithDuration(duration: Int) { + // The effect can't reset if it is running + if (effectAnimator.isRunning) return + + effectAnimator.duration = duration.toLong() + _effectProgress.value = 0f + _actionType.value = null + waitJob?.cancel() + state = State.IDLE + } + enum class State { IDLE, /* The effect is idle waiting for touch input */ TIMEOUT_WAIT, /* The effect is waiting for a [PRESSED_TIMEOUT] period */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt index 7ad5aac63837..7a56554be1d2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt @@ -113,7 +113,10 @@ constructor( override val currentClock: StateFlow<ClockController?> = currentClockId - .map { clockRegistry.createCurrentClock() } + .map { + clockEventController.clock = clockRegistry.createCurrentClock() + clockEventController.clock + } .stateIn( scope = applicationScope, started = SharingStarted.WhileSubscribed(), 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 9040e031d54e..d09ee54f2029 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 @@ -252,5 +252,6 @@ constructor( val TO_LOCKSCREEN_DURATION = 500.milliseconds val TO_GONE_DURATION = DEFAULT_DURATION val TO_OCCLUDED_DURATION = DEFAULT_DURATION + val TO_PRIMARY_BOUNCER_DURATION = DEFAULT_DURATION } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt index 9a6088de110e..1f24fc23bbdd 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt @@ -231,5 +231,7 @@ constructor( private val DEFAULT_DURATION = 500.milliseconds val TO_GLANCEABLE_HUB_DURATION = 1.seconds val TO_LOCKSCREEN_DURATION = 1167.milliseconds + val TO_AOD_DURATION = 300.milliseconds + val TO_GONE_DURATION = DEFAULT_DURATION } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt index b8ba09801ee8..5de1a61d61b5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt @@ -17,10 +17,10 @@ package com.android.systemui.keyguard.ui import android.view.animation.Interpolator import com.android.app.animation.Interpolators.LINEAR -import com.android.app.tracing.coroutines.launch import com.android.keyguard.logging.KeyguardTransitionAnimationLogger import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.Edge import com.android.systemui.keyguard.shared.model.KeyguardState @@ -35,6 +35,7 @@ import kotlin.math.max import kotlin.math.min import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow @@ -42,6 +43,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.launch /** * Assists in creating sub-flows for a KeyguardTransition. Call [setup] once for a transition, and @@ -52,13 +54,14 @@ class KeyguardTransitionAnimationFlow @Inject constructor( @Application private val scope: CoroutineScope, + @Main private val mainDispatcher: CoroutineDispatcher, private val transitionInteractor: KeyguardTransitionInteractor, private val logger: KeyguardTransitionAnimationLogger, ) { private val transitionMap = mutableMapOf<Edge, MutableSharedFlow<TransitionStep>>() init { - scope.launch("KeyguardTransitionAnimationFlow") { + scope.launch(mainDispatcher) { transitionInteractor.transitions.collect { // FROM->TO transitionMap[Edge(it.from, it.to)]?.emit(it) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt index 4812e03ec3f6..89148b09b3ed 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt @@ -213,9 +213,10 @@ constructor( cs: ConstraintSet, viewModel: KeyguardClockViewModel ) { - if (!DEBUG || viewModel.clock == null) return + val currentClock = viewModel.currentClock.value + if (!DEBUG || currentClock == null) return val smallClockViewId = R.id.lockscreen_clock_view - val largeClockViewId = viewModel.clock!!.largeClock.layout.views[0].id + val largeClockViewId = currentClock.largeClock.layout.views[0].id Log.i( TAG, "applyCsToSmallClock: vis=${cs.getVisibility(smallClockViewId)} " + diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt index 3630b4038357..397cbe5b3e5d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt @@ -22,11 +22,16 @@ import android.graphics.drawable.Animatable2 import android.util.Size import android.view.View import android.view.ViewGroup +import android.view.ViewGroup.MarginLayoutParams +import android.view.WindowInsets import android.widget.ImageView import androidx.core.animation.CycleInterpolator import androidx.core.animation.ObjectAnimator import androidx.core.view.isInvisible import androidx.core.view.isVisible +import androidx.core.view.marginLeft +import androidx.core.view.marginRight +import androidx.core.view.marginTop import androidx.core.view.updateLayoutParams import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle @@ -114,6 +119,38 @@ object KeyguardBottomAreaViewBinder { val settingsMenu: LaunchableLinearLayout = view.requireViewById(R.id.keyguard_settings_button) + startButton.setOnApplyWindowInsetsListener { inView, windowInsets -> + val bottomInset = windowInsets.displayCutout?.safeInsetBottom ?: 0 + val marginBottom = + inView.resources.getDimension(R.dimen.keyguard_affordance_vertical_offset).toInt() + inView.layoutParams = + (inView.layoutParams as MarginLayoutParams).apply { + setMargins( + inView.marginLeft, + inView.marginTop, + inView.marginRight, + marginBottom + bottomInset + ) + } + WindowInsets.CONSUMED + } + + endButton.setOnApplyWindowInsetsListener { inView, windowInsets -> + val bottomInset = windowInsets.displayCutout?.safeInsetBottom ?: 0 + val marginBottom = + inView.resources.getDimension(R.dimen.keyguard_affordance_vertical_offset).toInt() + inView.layoutParams = + (inView.layoutParams as MarginLayoutParams).apply { + setMargins( + inView.marginLeft, + inView.marginTop, + inView.marginRight, + marginBottom + bottomInset + ) + } + WindowInsets.CONSUMED + } + view.clipChildren = false view.clipToPadding = false view.setOnTouchListener { _, event -> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt index 01596ed2e3ef..fa1fe5ec1fe8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.binder import android.transition.TransitionManager import android.transition.TransitionSet import android.view.View.INVISIBLE +import android.view.ViewGroup import androidx.annotation.VisibleForTesting import androidx.constraintlayout.helper.widget.Layer import androidx.constraintlayout.widget.ConstraintLayout @@ -40,7 +41,8 @@ import kotlinx.coroutines.launch object KeyguardClockViewBinder { private val TAG = KeyguardClockViewBinder::class.simpleName!! - + // When changing to new clock, we need to remove old clock views from burnInLayer + private var lastClock: ClockController? = null @JvmStatic fun bind( clockSection: ClockSection, @@ -55,12 +57,11 @@ object KeyguardClockViewBinder { } } keyguardRootView.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { launch { if (!migrateClocksToBlueprint()) return@launch viewModel.currentClock.collect { currentClock -> - cleanupClockViews(viewModel.clock, keyguardRootView, viewModel.burnInLayer) - viewModel.clock = currentClock + cleanupClockViews(currentClock, keyguardRootView, viewModel.burnInLayer) addClockViews(currentClock, keyguardRootView) updateBurnInLayer(keyguardRootView, viewModel) applyConstraints(clockSection, keyguardRootView, true) @@ -76,7 +77,7 @@ object KeyguardClockViewBinder { launch { if (!migrateClocksToBlueprint()) return@launch viewModel.clockShouldBeCentered.collect { clockShouldBeCentered -> - viewModel.clock?.let { + viewModel.currentClock.value?.let { // Weather clock also has hasCustomPositionUpdatedAnimation as true // TODO(b/323020908): remove ID check if ( @@ -93,7 +94,7 @@ object KeyguardClockViewBinder { launch { if (!migrateClocksToBlueprint()) return@launch viewModel.isAodIconsVisible.collect { isAodIconsVisible -> - viewModel.clock?.let { + viewModel.currentClock.value?.let { // Weather clock also has hasCustomPositionUpdatedAnimation as true if ( viewModel.useLargeClock && it.config.id == "DIGITAL_CLOCK_WEATHER" @@ -132,11 +133,14 @@ object KeyguardClockViewBinder { } private fun cleanupClockViews( - clockController: ClockController?, + currentClock: ClockController?, rootView: ConstraintLayout, burnInLayer: Layer? ) { - clockController?.let { clock -> + if (lastClock == currentClock) { + return + } + lastClock?.let { clock -> clock.smallClock.layout.views.forEach { burnInLayer?.removeView(it) rootView.removeView(it) @@ -150,6 +154,7 @@ object KeyguardClockViewBinder { } clock.largeClock.layout.views.forEach { rootView.removeView(it) } } + lastClock = currentClock } @VisibleForTesting @@ -157,11 +162,19 @@ object KeyguardClockViewBinder { clockController: ClockController?, rootView: ConstraintLayout, ) { + // We'll collect the same clock when exiting wallpaper picker without changing clock + // so we need to remove clock views from parent before addView again clockController?.let { clock -> clock.smallClock.layout.views.forEach { + if (it.parent != null) { + (it.parent as ViewGroup).removeView(it) + } rootView.addView(it).apply { it.visibility = INVISIBLE } } clock.largeClock.layout.views.forEach { + if (it.parent != null) { + (it.parent as ViewGroup).removeView(it) + } rootView.addView(it).apply { it.visibility = INVISIBLE } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt index fc95ec927a4c..d0246a8cd872 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt @@ -44,6 +44,7 @@ import com.android.systemui.common.shared.model.Text import com.android.systemui.common.shared.model.TintedIcon import com.android.systemui.common.ui.ConfigurationState import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor +import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters @@ -142,12 +143,14 @@ object KeyguardRootViewBinder { } } - if (keyguardBottomAreaRefactor()) { + if (keyguardBottomAreaRefactor() || DeviceEntryUdfpsRefactor.isEnabled) { launch { viewModel.alpha(viewState).collect { alpha -> view.alpha = alpha - childViews[statusViewId]?.alpha = alpha - childViews[burnInLayerId]?.alpha = alpha + if (keyguardBottomAreaRefactor()) { + childViews[statusViewId]?.alpha = alpha + childViews[burnInLayerId]?.alpha = alpha + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt index b77f0c5a1e60..4d0a25fb7cd3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt @@ -41,7 +41,7 @@ object KeyguardSmartspaceViewBinder { blueprintInteractor: KeyguardBlueprintInteractor, ) { keyguardRootView.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { launch { if (!migrateClocksToBlueprint()) return@launch clockViewModel.hasCustomWeatherDataDisplay.collect { hasCustomWeatherDataDisplay diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt index 7c76e6afc074..f60da0e842e8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt @@ -90,6 +90,7 @@ import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController import com.android.systemui.statusbar.phone.KeyguardBottomAreaView import com.android.systemui.statusbar.phone.ScreenOffAnimationController import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator +import com.android.systemui.util.kotlin.DisposableHandles import com.android.systemui.util.settings.SecureSettings import dagger.assisted.Assisted import dagger.assisted.AssistedInject @@ -173,7 +174,7 @@ constructor( private lateinit var smallClockHostView: FrameLayout private var smartSpaceView: View? = null - private val disposables = mutableSetOf<DisposableHandle>() + private val disposables = DisposableHandles() private var isDestroyed = false private val shortcutsBindings = mutableSetOf<KeyguardQuickAffordanceViewBinder.Binding>() @@ -183,7 +184,7 @@ constructor( init { coroutineScope = CoroutineScope(applicationScope.coroutineContext + Job()) - disposables.add(DisposableHandle { coroutineScope.cancel() }) + disposables += DisposableHandle { coroutineScope.cancel() } if (keyguardBottomAreaRefactor()) { quickAffordancesCombinedViewModel.enablePreviewMode( @@ -214,7 +215,7 @@ constructor( if (hostToken == null) null else InputTransferToken(hostToken), "KeyguardPreviewRenderer" ) - disposables.add(DisposableHandle { host.release() }) + disposables += DisposableHandle { host.release() } } } @@ -284,7 +285,7 @@ constructor( fun destroy() { isDestroyed = true lockscreenSmartspaceController.disconnect() - disposables.forEach { it.dispose() } + disposables.dispose() if (keyguardBottomAreaRefactor()) { shortcutsBindings.forEach { it.destroy() } } @@ -372,7 +373,7 @@ constructor( private fun setupKeyguardRootView(previewContext: Context, rootView: FrameLayout) { val keyguardRootView = KeyguardRootView(previewContext, null) if (!keyguardBottomAreaRefactor()) { - disposables.add( + disposables += KeyguardRootViewBinder.bind( keyguardRootView, keyguardRootViewModel, @@ -387,7 +388,6 @@ constructor( null, // device entry haptics not required for preview mode null, // falsing manager not required for preview mode ) - ) } rootView.addView( keyguardRootView, @@ -555,14 +555,12 @@ constructor( } } clockRegistry.registerClockChangeListener(clockChangeListener) - disposables.add( - DisposableHandle { - clockRegistry.unregisterClockChangeListener(clockChangeListener) - } - ) + disposables += DisposableHandle { + clockRegistry.unregisterClockChangeListener(clockChangeListener) + } clockController.registerListeners(parentView) - disposables.add(DisposableHandle { clockController.unregisterListeners() }) + disposables += DisposableHandle { clockController.unregisterListeners() } } val receiver = @@ -581,7 +579,7 @@ constructor( addAction(Intent.ACTION_TIME_CHANGED) }, ) - disposables.add(DisposableHandle { broadcastDispatcher.unregisterReceiver(receiver) }) + disposables += DisposableHandle { broadcastDispatcher.unregisterReceiver(receiver) } if (!migrateClocksToBlueprint()) { val layoutChangeListener = @@ -602,9 +600,9 @@ constructor( } } parentView.addOnLayoutChangeListener(layoutChangeListener) - disposables.add( - DisposableHandle { parentView.removeOnLayoutChangeListener(layoutChangeListener) } - ) + disposables += DisposableHandle { + parentView.removeOnLayoutChangeListener(layoutChangeListener) + } } onClockChanged() diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt index f20c4acba448..3b21141273e0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt @@ -22,10 +22,12 @@ import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBounc import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel +import com.android.systemui.keyguard.ui.viewmodel.AodToPrimaryBouncerTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DozingToGoneTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DozingToOccludedTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel +import com.android.systemui.keyguard.ui.viewmodel.DreamingToAodTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.GoneToAodTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.GoneToDozingTransitionViewModel @@ -89,6 +91,12 @@ abstract class DeviceEntryIconTransitionModule { @Binds @IntoSet + abstract fun aodToPrimaryBouncer( + impl: AodToPrimaryBouncerTransitionViewModel + ): DeviceEntryIconTransition + + @Binds + @IntoSet abstract fun dozingToGone(impl: DozingToGoneTransitionViewModel): DeviceEntryIconTransition @Binds @@ -111,6 +119,10 @@ abstract class DeviceEntryIconTransitionModule { @Binds @IntoSet + abstract fun dreamingToAod(impl: DreamingToAodTransitionViewModel): DeviceEntryIconTransition + + @Binds + @IntoSet abstract fun dreamingToLockscreen( impl: DreamingToLockscreenTransitionViewModel ): DeviceEntryIconTransition diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/BaseBlueprintTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/BaseBlueprintTransition.kt index 9c9df806c38c..a215efa724f9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/BaseBlueprintTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/BaseBlueprintTransition.kt @@ -41,7 +41,7 @@ class BaseBlueprintTransition(val clockViewModel: KeyguardClockViewModel) : Tran private fun excludeClockAndSmartspaceViews(transition: Transition) { transition.excludeTarget(SmartspaceView::class.java, true) - clockViewModel.clock?.let { clock -> + clockViewModel.currentClock.value?.let { clock -> clock.largeClock.layout.views.forEach { view -> transition.excludeTarget(view, true) } clock.smallClock.layout.views.forEach { view -> transition.excludeTarget(view, true) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt index 3adeb2aeb283..c69d868866d0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt @@ -57,7 +57,9 @@ class IntraBlueprintTransition( when (config.type) { Type.NoTransition -> {} Type.DefaultClockStepping -> - addTransition(clockViewModel.clock?.let { DefaultClockSteppingTransition(it) }) + addTransition( + clockViewModel.currentClock.value?.let { DefaultClockSteppingTransition(it) } + ) else -> addTransition(ClockSizeTransition(config, clockViewModel, smartspaceViewModel)) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt index a183b720c087..7847c1ce3968 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt @@ -86,7 +86,7 @@ constructor( if (!Flags.migrateClocksToBlueprint()) { return } - clockInteractor.clock?.let { clock -> + keyguardClockViewModel.currentClock.value?.let { clock -> constraintSet.applyDeltaFrom(buildConstraints(clock, constraintSet)) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt index 6a3b920f9692..c1b0cc6b6db9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt @@ -26,20 +26,16 @@ import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP import com.android.systemui.Flags.centralizedStatusBarHeightFix import com.android.systemui.Flags.migrateClocksToBlueprint -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.shade.LargeScreenHeaderHelper import com.android.systemui.shade.NotificationPanelView -import com.android.systemui.statusbar.notification.stack.AmbientState -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController -import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer -import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel import dagger.Lazy import javax.inject.Inject -import kotlinx.coroutines.CoroutineDispatcher /** Single column format for notifications (default for phones) */ class DefaultNotificationStackScrollLayoutSection @@ -50,12 +46,9 @@ constructor( notificationPanelView: NotificationPanelView, sharedNotificationContainer: SharedNotificationContainer, sharedNotificationContainerViewModel: SharedNotificationContainerViewModel, - notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel, - ambientState: AmbientState, - controller: NotificationStackScrollLayoutController, - notificationStackSizeCalculator: NotificationStackSizeCalculator, + sharedNotificationContainerBinder: SharedNotificationContainerBinder, + notificationStackViewBinder: NotificationStackViewBinder, private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, - @Main mainDispatcher: CoroutineDispatcher, ) : NotificationStackScrollLayoutSection( context, @@ -63,11 +56,8 @@ constructor( notificationPanelView, sharedNotificationContainer, sharedNotificationContainerViewModel, - notificationStackAppearanceViewModel, - ambientState, - controller, - notificationStackSizeCalculator, - mainDispatcher, + sharedNotificationContainerBinder, + notificationStackViewBinder, ) { override fun applyConstraints(constraintSet: ConstraintSet) { if (!migrateClocksToBlueprint()) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/NotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/NotificationStackScrollLayoutSection.kt index 5dea7cbb801d..83235020b416 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/NotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/NotificationStackScrollLayoutSection.kt @@ -31,16 +31,11 @@ import com.android.systemui.keyguard.shared.model.KeyguardSection import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.shade.NotificationPanelView -import com.android.systemui.statusbar.notification.stack.AmbientState -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController -import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer -import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder -import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.DisposableHandle +import com.android.systemui.util.kotlin.DisposableHandles abstract class NotificationStackScrollLayoutSection constructor( @@ -49,14 +44,11 @@ constructor( private val notificationPanelView: NotificationPanelView, private val sharedNotificationContainer: SharedNotificationContainer, private val sharedNotificationContainerViewModel: SharedNotificationContainerViewModel, - private val notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel, - private val ambientState: AmbientState, - private val controller: NotificationStackScrollLayoutController, - private val notificationStackSizeCalculator: NotificationStackSizeCalculator, - private val mainDispatcher: CoroutineDispatcher, + private val sharedNotificationContainerBinder: SharedNotificationContainerBinder, + private val notificationStackViewBinder: NotificationStackViewBinder, ) : KeyguardSection() { private val placeHolderId = R.id.nssl_placeholder - private val disposableHandles: MutableList<DisposableHandle> = mutableListOf() + private val disposableHandles = DisposableHandles() /** * Align the notification placeholder bottom to the top of either the lock icon or the ambient @@ -102,39 +94,20 @@ constructor( return } - disposeHandles() - disposableHandles.add( - SharedNotificationContainerBinder.bind( + disposableHandles.dispose() + disposableHandles += + sharedNotificationContainerBinder.bind( sharedNotificationContainer, sharedNotificationContainerViewModel, - sceneContainerFlags, - controller, - notificationStackSizeCalculator, - mainImmediateDispatcher = mainDispatcher, ) - ) if (sceneContainerFlags.isEnabled()) { - disposableHandles.add( - NotificationStackAppearanceViewBinder.bind( - context, - sharedNotificationContainer, - notificationStackAppearanceViewModel, - ambientState, - controller, - mainImmediateDispatcher = mainDispatcher, - ) - ) + disposableHandles += notificationStackViewBinder.bindWhileAttached() } } override fun removeViews(constraintLayout: ConstraintLayout) { - disposeHandles() + disposableHandles.dispose() constraintLayout.removeView(placeHolderId) } - - private fun disposeHandles() { - disposableHandles.forEach { it.dispose() } - disposableHandles.clear() - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt index 2545302ccaa1..4a705a7f849d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt @@ -24,19 +24,14 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP import com.android.systemui.Flags.migrateClocksToBlueprint -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.shade.NotificationPanelView -import com.android.systemui.statusbar.notification.stack.AmbientState -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController -import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer -import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder +import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel import javax.inject.Inject -import kotlinx.coroutines.CoroutineDispatcher /** Large-screen format for notifications, shown as two columns on the device */ class SplitShadeNotificationStackScrollLayoutSection @@ -47,12 +42,8 @@ constructor( notificationPanelView: NotificationPanelView, sharedNotificationContainer: SharedNotificationContainer, sharedNotificationContainerViewModel: SharedNotificationContainerViewModel, - notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel, - ambientState: AmbientState, - controller: NotificationStackScrollLayoutController, - notificationStackSizeCalculator: NotificationStackSizeCalculator, - private val smartspaceViewModel: KeyguardSmartspaceViewModel, - @Main mainDispatcher: CoroutineDispatcher, + sharedNotificationContainerBinder: SharedNotificationContainerBinder, + notificationStackViewBinder: NotificationStackViewBinder, ) : NotificationStackScrollLayoutSection( context, @@ -60,11 +51,8 @@ constructor( notificationPanelView, sharedNotificationContainer, sharedNotificationContainerViewModel, - notificationStackAppearanceViewModel, - ambientState, - controller, - notificationStackSizeCalculator, - mainDispatcher, + sharedNotificationContainerBinder, + notificationStackViewBinder, ) { override fun applyConstraints(constraintSet: ConstraintSet) { if (!migrateClocksToBlueprint()) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt index 6184c82cbff7..4d3a78d32b3a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt @@ -216,7 +216,9 @@ class ClockSizeTransition( captureSmartspace = !viewModel.useLargeClock && smartspaceViewModel.isSmartspaceEnabled if (viewModel.useLargeClock) { - viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } + viewModel.currentClock.value?.let { + it.largeClock.layout.views.forEach { addTarget(it) } + } } else { addTarget(R.id.lockscreen_clock_view) } @@ -276,7 +278,9 @@ class ClockSizeTransition( if (viewModel.useLargeClock) { addTarget(R.id.lockscreen_clock_view) } else { - viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } + viewModel.currentClock.value?.let { + it.largeClock.layout.views.forEach { addTarget(it) } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModel.kt index d26356ebc92b..ac2713d88f39 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModel.kt @@ -16,6 +16,7 @@ package com.android.systemui.keyguard.ui.viewmodel +import android.util.MathUtils import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromAlternateBouncerTransitionInteractor.Companion.TO_GONE_DURATION import com.android.systemui.keyguard.shared.model.KeyguardState @@ -47,13 +48,16 @@ constructor( to = KeyguardState.GONE, ) - val lockscreenAlpha: Flow<Float> = - transitionAnimation.sharedFlow( + fun lockscreenAlpha(viewState: ViewStateAccessor): Flow<Float> { + var startAlpha = 1f + return transitionAnimation.sharedFlow( duration = 200.milliseconds, - onStep = { 1 - it }, + onStart = { startAlpha = viewState.alpha() }, + onStep = { MathUtils.lerp(startAlpha, 0f, it) }, onFinish = { 0f }, - onCancel = { 1f }, + onCancel = { startAlpha }, ) + } /** Scrim alpha values */ val scrimAlpha: Flow<ScrimAlpha> = diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt index f961e083e64f..9c1f0770708c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodBurnInViewModel.kt @@ -169,7 +169,7 @@ constructor( provider: Provider<ClockController>?, ): Provider<ClockController>? { return if (Flags.migrateClocksToBlueprint()) { - Provider { keyguardClockViewModel.clock } + Provider { keyguardClockViewModel.currentClock.value } } else { provider } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToPrimaryBouncerTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToPrimaryBouncerTransitionViewModel.kt new file mode 100644 index 000000000000..9a23007eea4a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToPrimaryBouncerTransitionViewModel.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 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.keyguard.ui.viewmodel + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor +import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow + +/** + * Breaks down AOD->PRIMARY BOUNCER transition into discrete steps for corresponding views to + * consume. + */ +@ExperimentalCoroutinesApi +@SysUISingleton +class AodToPrimaryBouncerTransitionViewModel +@Inject +constructor( + animationFlow: KeyguardTransitionAnimationFlow, +) : DeviceEntryIconTransition { + private val transitionAnimation = + animationFlow.setup( + duration = FromAodTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION, + from = KeyguardState.AOD, + to = KeyguardState.PRIMARY_BOUNCER, + ) + + override val deviceEntryParentViewAlpha: Flow<Float> = + transitionAnimation.immediatelyTransitionTo(0f) +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt index 4c0a9491b74a..1b91c4949018 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryBackgroundViewModel.kt @@ -55,6 +55,8 @@ constructor( lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel, dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel, alternateBouncerToDozingTransitionViewModel: AlternateBouncerToDozingTransitionViewModel, + dreamingToAodTransitionViewModel: DreamingToAodTransitionViewModel, + primaryBouncerToLockscreenTransitionViewModel: PrimaryBouncerToLockscreenTransitionViewModel, ) { val color: Flow<Int> = deviceEntryIconViewModel.useBackgroundProtection.flatMapLatest { useBackground -> @@ -96,6 +98,9 @@ constructor( lockscreenToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha, dozingToLockscreenTransitionViewModel.deviceEntryBackgroundViewAlpha, alternateBouncerToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha, + dreamingToAodTransitionViewModel.deviceEntryBackgroundViewAlpha, + primaryBouncerToLockscreenTransitionViewModel + .deviceEntryBackgroundViewAlpha, ) .merge() .onStart { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt index 1a018977664a..bc4fd1c88298 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel import android.animation.FloatEvaluator import android.animation.IntEvaluator import com.android.keyguard.KeyguardViewController +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor import com.android.systemui.deviceentry.domain.interactor.DeviceEntrySourceInteractor import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor @@ -33,9 +34,11 @@ import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.util.kotlin.sample import dagger.Lazy import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged @@ -45,6 +48,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.flow.shareIn /** Models the UI state for the containing device entry icon & long-press handling view. */ @ExperimentalCoroutinesApi @@ -62,6 +66,7 @@ constructor( private val keyguardViewController: Lazy<KeyguardViewController>, private val deviceEntryInteractor: DeviceEntryInteractor, private val deviceEntrySourceInteractor: DeviceEntrySourceInteractor, + @Application private val scope: CoroutineScope, ) { val isUdfpsSupported: StateFlow<Boolean> = deviceEntryUdfpsInteractor.isUdfpsSupported private val intEvaluator = IntEvaluator() @@ -73,7 +78,10 @@ constructor( private val qsProgress: Flow<Float> = shadeInteractor.qsExpansion.onStart { emit(0f) } private val shadeExpansion: Flow<Float> = shadeInteractor.shadeExpansion.onStart { emit(0f) } private val transitionAlpha: Flow<Float> = - transitions.map { it.deviceEntryParentViewAlpha }.merge() + transitions + .map { it.deviceEntryParentViewAlpha } + .merge() + .shareIn(scope, SharingStarted.WhileSubscribed()) private val alphaMultiplierFromShadeExpansion: Flow<Float> = combine( showingAlternateBouncer, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToAodTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToAodTransitionViewModel.kt new file mode 100644 index 000000000000..0fa74752ea0d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToAodTransitionViewModel.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2024 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.keyguard.ui.viewmodel + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor +import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor +import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.flatMapLatest + +/** Breaks down DREAMING->AOD transition into discrete steps for corresponding views to consume. */ +@ExperimentalCoroutinesApi +@SysUISingleton +class DreamingToAodTransitionViewModel +@Inject +constructor( + deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, + animationFlow: KeyguardTransitionAnimationFlow, +) : DeviceEntryIconTransition { + private val transitionAnimation = + animationFlow.setup( + duration = FromDreamingTransitionInteractor.TO_AOD_DURATION, + from = KeyguardState.DREAMING, + to = KeyguardState.AOD, + ) + + val deviceEntryBackgroundViewAlpha: Flow<Float> = + transitionAnimation.immediatelyTransitionTo(0f) + override val deviceEntryParentViewAlpha: Flow<Float> = + deviceEntryUdfpsInteractor.isUdfpsEnrolledAndEnabled.flatMapLatest { udfpsEnrolledAndEnabled + -> + if (udfpsEnrolledAndEnabled) { + transitionAnimation.sharedFlow( + duration = FromDreamingTransitionInteractor.TO_AOD_DURATION, + onStep = { it }, + onFinish = { 1f }, + ) + } else { + emptyFlow() + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModel.kt new file mode 100644 index 000000000000..ec7b931161f6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModel.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2024 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.keyguard.ui.viewmodel + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor +import com.android.systemui.keyguard.shared.model.KeyguardState +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +@SysUISingleton +class DreamingToGoneTransitionViewModel +@Inject +constructor( + animationFlow: KeyguardTransitionAnimationFlow, +) { + + private val transitionAnimation = + animationFlow.setup( + duration = FromDreamingTransitionInteractor.TO_GONE_DURATION, + from = KeyguardState.DREAMING, + to = KeyguardState.GONE, + ) + + /** Lockscreen views alpha */ + val lockscreenAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(0f) + +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt index b6622e5c07b1..1c1c33ab7e7e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt @@ -26,7 +26,6 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.shared.ComposeLockscreen import com.android.systemui.keyguard.shared.model.SettingsClockSize -import com.android.systemui.plugins.clocks.ClockController import com.android.systemui.res.R import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.shared.model.ShadeMode @@ -54,8 +53,6 @@ constructor( val useLargeClock: Boolean get() = clockSize.value == LARGE - var clock: ClockController? by keyguardClockInteractor::clock - val clockSize = combine(keyguardClockInteractor.selectedClockSize, keyguardClockInteractor.clockSize) { selectedSize, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt index 55a402597d5b..b662109ba4ad 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt @@ -85,10 +85,12 @@ constructor( private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel, private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel, private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel, + private val dreamingToGoneTransitionViewModel: DreamingToGoneTransitionViewModel, private val glanceableHubToLockscreenTransitionViewModel: GlanceableHubToLockscreenTransitionViewModel, private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel, private val goneToDozingTransitionViewModel: GoneToDozingTransitionViewModel, + private val goneToDreamingTransitionViewModel: GoneToDreamingTransitionViewModel, private val lockscreenToAodTransitionViewModel: LockscreenToAodTransitionViewModel, private val lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel, private val lockscreenToDreamingTransitionViewModel: LockscreenToDreamingTransitionViewModel, @@ -136,14 +138,20 @@ constructor( } .distinctUntilChanged() + private val lockscreenToGoneTransitionRunning: Flow<Boolean> = + keyguardTransitionInteractor + .isInTransitionWhere { from, to -> from == LOCKSCREEN && to == GONE } + .onStart { emit(false) } + private val alphaOnShadeExpansion: Flow<Float> = combineTransform( + lockscreenToGoneTransitionRunning, isOnLockscreen, shadeInteractor.qsExpansion, shadeInteractor.shadeExpansion, - ) { isOnLockscreen, qsExpansion, shadeExpansion -> + ) { lockscreenToGoneTransitionRunning, isOnLockscreen, qsExpansion, shadeExpansion -> // Fade out quickly as the shade expands - if (isOnLockscreen) { + if (isOnLockscreen && !lockscreenToGoneTransitionRunning) { val alpha = 1f - MathUtils.constrainedMap( @@ -197,17 +205,19 @@ constructor( merge( alphaOnShadeExpansion, keyguardInteractor.dismissAlpha.filterNotNull(), - alternateBouncerToGoneTransitionViewModel.lockscreenAlpha, + alternateBouncerToGoneTransitionViewModel.lockscreenAlpha(viewState), aodToGoneTransitionViewModel.lockscreenAlpha(viewState), aodToLockscreenTransitionViewModel.lockscreenAlpha(viewState), aodToOccludedTransitionViewModel.lockscreenAlpha(viewState), dozingToGoneTransitionViewModel.lockscreenAlpha(viewState), dozingToLockscreenTransitionViewModel.lockscreenAlpha, dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState), + dreamingToGoneTransitionViewModel.lockscreenAlpha, dreamingToLockscreenTransitionViewModel.lockscreenAlpha, glanceableHubToLockscreenTransitionViewModel.keyguardAlpha, goneToAodTransitionViewModel.enterFromTopAnimationAlpha, goneToDozingTransitionViewModel.lockscreenAlpha, + goneToDreamingTransitionViewModel.lockscreenAlpha, lockscreenToAodTransitionViewModel.lockscreenAlpha(viewState), lockscreenToDozingTransitionViewModel.lockscreenAlpha, lockscreenToDreamingTransitionViewModel.lockscreenAlpha, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModel.kt index 34c9ac92a3f3..25750415e88f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.keyguard.ui.viewmodel import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor import com.android.systemui.keyguard.domain.interactor.FromPrimaryBouncerTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow @@ -27,8 +26,6 @@ import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.emptyFlow -import kotlinx.coroutines.flow.flatMapLatest /** * Breaks down PRIMARY BOUNCER->LOCKSCREEN transition into discrete steps for corresponding views to @@ -39,7 +36,6 @@ import kotlinx.coroutines.flow.flatMapLatest class PrimaryBouncerToLockscreenTransitionViewModel @Inject constructor( - deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor, animationFlow: KeyguardTransitionAnimationFlow, ) : DeviceEntryIconTransition { private val transitionAnimation = @@ -49,15 +45,6 @@ constructor( to = KeyguardState.LOCKSCREEN, ) - val deviceEntryBackgroundViewAlpha: Flow<Float> = - deviceEntryUdfpsInteractor.isUdfpsSupported.flatMapLatest { isUdfps -> - if (isUdfps) { - transitionAnimation.immediatelyTransitionTo(1f) - } else { - emptyFlow() - } - } - val shortcutsAlpha: Flow<Float> = transitionAnimation.sharedFlow( duration = 250.milliseconds, @@ -67,6 +54,8 @@ constructor( val lockscreenAlpha: Flow<Float> = shortcutsAlpha + val deviceEntryBackgroundViewAlpha: Flow<Float> = + transitionAnimation.immediatelyTransitionTo(1f) override val deviceEntryParentViewAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(1f) } diff --git a/packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt b/packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt index 5f7991e62cd7..1c11178b5b35 100644 --- a/packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt +++ b/packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt @@ -24,12 +24,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry import androidx.lifecycle.lifecycleScope +import com.android.app.tracing.coroutines.createCoroutineTracingContext +import com.android.app.tracing.coroutines.launch import com.android.systemui.util.Assert import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.DisposableHandle -import kotlinx.coroutines.launch /** * Runs the given [block] every time the [View] becomes attached (or immediately after calling this @@ -66,7 +67,8 @@ fun View.repeatWhenAttached( // dispatcher to use. We don't want it to run on the Dispatchers.Default thread pool as // default behavior. Instead, we want it to run on the view's UI thread since the user will // presumably want to call view methods that require being called from said UI thread. - val lifecycleCoroutineContext = Dispatchers.Main + coroutineContext + val lifecycleCoroutineContext = + Dispatchers.Main + createCoroutineTracingContext() + coroutineContext var lifecycleOwner: ViewLifecycleOwner? = null val onAttachListener = object : View.OnAttachStateChangeListener { @@ -97,14 +99,12 @@ fun View.repeatWhenAttached( ) } - return object : DisposableHandle { - override fun dispose() { - Assert.isMainThread() + return DisposableHandle { + Assert.isMainThread() - lifecycleOwner?.onDestroy() - lifecycleOwner = null - view.removeOnAttachStateChangeListener(onAttachListener) - } + lifecycleOwner?.onDestroy() + lifecycleOwner = null + view.removeOnAttachStateChangeListener(onAttachListener) } } @@ -115,7 +115,12 @@ private fun createLifecycleOwnerAndRun( ): ViewLifecycleOwner { return ViewLifecycleOwner(view).apply { onCreate() - lifecycleScope.launch(coroutineContext) { block(view) } + lifecycleScope.launch( + "ViewLifecycleOwner(${view::class.java.simpleName})", + coroutineContext + ) { + block(view) + } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaDataRepository.kt b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaDataRepository.kt new file mode 100644 index 000000000000..b6fd287a675e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaDataRepository.kt @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import android.util.Log +import com.android.systemui.Dumpable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dump.DumpManager +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.util.MediaFlags +import java.io.PrintWriter +import javax.inject.Inject +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +private const val TAG = "MediaDataRepository" +private const val DEBUG = true + +/** A repository that holds the state of all media controls in carousel. */ +@SysUISingleton +class MediaDataRepository +@Inject +constructor( + private val mediaFlags: MediaFlags, + dumpManager: DumpManager, +) : Dumpable { + + private val _mediaEntries: MutableStateFlow<Map<String, MediaData>> = + MutableStateFlow(LinkedHashMap()) + val mediaEntries: StateFlow<Map<String, MediaData>> = _mediaEntries.asStateFlow() + + private val _smartspaceMediaData: MutableStateFlow<SmartspaceMediaData> = + MutableStateFlow(SmartspaceMediaData()) + val smartspaceMediaData: StateFlow<SmartspaceMediaData> = _smartspaceMediaData.asStateFlow() + + init { + dumpManager.registerNormalDumpable(TAG, this) + } + + /** Updates the recommendation data with a new smartspace media data. */ + fun setRecommendation(recommendation: SmartspaceMediaData) { + _smartspaceMediaData.value = recommendation + } + + /** + * Marks the recommendation data as inactive. + * + * @return true if the recommendation was actually marked as inactive, false otherwise. + */ + fun setRecommendationInactive(key: String): Boolean { + if (!mediaFlags.isPersistentSsCardEnabled()) { + Log.e(TAG, "Only persistent recommendation can be inactive!") + return false + } + if (DEBUG) Log.d(TAG, "Setting smartspace recommendation inactive") + + if (smartspaceMediaData.value.targetId != key || !smartspaceMediaData.value.isValid()) { + // If this doesn't match, or we've already invalidated the data, no action needed + return false + } + + setRecommendation(smartspaceMediaData.value.copy(isActive = false)) + return true + } + + /** + * Marks the recommendation data as dismissed. + * + * @return true if the recommendation was dismissed or already inactive, false otherwise. + */ + fun dismissSmartspaceRecommendation(key: String): Boolean { + val data = smartspaceMediaData.value + if (data.targetId != key || !data.isValid()) { + // If this doesn't match, or we've already invalidated the data, no action needed + return false + } + + if (DEBUG) Log.d(TAG, "Dismissing Smartspace media target") + if (data.isActive) { + setRecommendation( + SmartspaceMediaData( + targetId = smartspaceMediaData.value.targetId, + instanceId = smartspaceMediaData.value.instanceId + ) + ) + } + return true + } + + fun removeMediaEntry(key: String): MediaData? { + val entries = LinkedHashMap<String, MediaData>(_mediaEntries.value) + val mediaData = entries.remove(key) + _mediaEntries.value = entries + return mediaData + } + + fun addMediaEntry(key: String, data: MediaData): MediaData? { + val entries = LinkedHashMap<String, MediaData>(_mediaEntries.value) + val mediaData = entries.put(key, data) + _mediaEntries.value = entries + return mediaData + } + + override fun dump(pw: PrintWriter, args: Array<out String>) { + pw.apply { println("mediaEntries: ${mediaEntries.value}") } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt new file mode 100644 index 000000000000..b94a4af65649 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import javax.inject.Inject +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +/** A repository that holds the state of filtered media data on the device. */ +@SysUISingleton +class MediaFilterRepository @Inject constructor() { + + /** Key of media control that recommendations card reactivated. */ + private val _reactivatedKey: MutableStateFlow<String?> = MutableStateFlow(null) + val reactivatedKey: StateFlow<String?> = _reactivatedKey.asStateFlow() + + private val _smartspaceMediaData: MutableStateFlow<SmartspaceMediaData> = + MutableStateFlow(SmartspaceMediaData()) + val smartspaceMediaData: StateFlow<SmartspaceMediaData> = _smartspaceMediaData.asStateFlow() + + private val _selectedUserEntries: MutableStateFlow<Map<String, MediaData>> = + MutableStateFlow(LinkedHashMap()) + val selectedUserEntries: StateFlow<Map<String, MediaData>> = _selectedUserEntries.asStateFlow() + + private val _allUserEntries: MutableStateFlow<Map<String, MediaData>> = + MutableStateFlow(LinkedHashMap()) + val allUserEntries: StateFlow<Map<String, MediaData>> = _allUserEntries.asStateFlow() + + fun addMediaEntry(key: String, data: MediaData) { + val entries = LinkedHashMap<String, MediaData>(_allUserEntries.value) + entries[key] = data + _allUserEntries.value = entries + } + + /** + * Removes the media entry corresponding to the given [key]. + * + * @return media data if an entry is actually removed, `null` otherwise. + */ + fun removeMediaEntry(key: String): MediaData? { + val entries = LinkedHashMap<String, MediaData>(_allUserEntries.value) + val mediaData = entries.remove(key) + _allUserEntries.value = entries + return mediaData + } + + fun addSelectedUserMediaEntry(key: String, data: MediaData) { + val entries = LinkedHashMap<String, MediaData>(_selectedUserEntries.value) + entries[key] = data + _selectedUserEntries.value = entries + } + + /** + * Removes selected user media entry given the corresponding key. + * + * @return media data if an entry is actually removed, `null` otherwise. + */ + fun removeSelectedUserMediaEntry(key: String): MediaData? { + val entries = LinkedHashMap<String, MediaData>(_selectedUserEntries.value) + val mediaData = entries.remove(key) + _selectedUserEntries.value = entries + return mediaData + } + + /** + * Removes selected user media entry given a key and media data. + * + * @return true if media data is removed, false otherwise. + */ + fun removeSelectedUserMediaEntry(key: String, data: MediaData): Boolean { + val entries = LinkedHashMap<String, MediaData>(_selectedUserEntries.value) + val succeed = entries.remove(key, data) + if (!succeed) { + return false + } + _selectedUserEntries.value = entries + return true + } + + fun clearSelectedUserMedia() { + _selectedUserEntries.value = LinkedHashMap() + } + + /** Updates recommendation data with a new smartspace media data. */ + fun setRecommendation(smartspaceMediaData: SmartspaceMediaData) { + _smartspaceMediaData.value = smartspaceMediaData + } + + /** Updates media control key that recommendations card reactivated. */ + fun setReactivatedKey(key: String?) { + _reactivatedKey.value = key + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/MediaDomainModule.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/MediaDomainModule.kt new file mode 100644 index 000000000000..e0c54190283a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/MediaDomainModule.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2024 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.media.controls.domain + +import com.android.systemui.CoreStartable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.media.controls.domain.pipeline.LegacyMediaDataManagerImpl +import com.android.systemui.media.controls.domain.pipeline.MediaDataManager +import com.android.systemui.media.controls.domain.pipeline.MediaDataProcessor +import com.android.systemui.media.controls.domain.pipeline.interactor.MediaCarouselInteractor +import com.android.systemui.media.controls.util.MediaFlags +import dagger.Binds +import dagger.Module +import dagger.Provides +import dagger.multibindings.ClassKey +import dagger.multibindings.IntoMap +import javax.inject.Provider + +/** Dagger module for injecting media controls domain interfaces. */ +@Module +interface MediaDomainModule { + + @Binds + @IntoMap + @ClassKey(MediaCarouselInteractor::class) + fun bindMediaCarouselInteractor(interactor: MediaCarouselInteractor): CoreStartable + + @Binds + @IntoMap + @ClassKey(MediaDataProcessor::class) + fun bindMediaDataProcessor(interactor: MediaDataProcessor): CoreStartable + companion object { + + @Provides + @SysUISingleton + fun providesMediaDataManager( + legacyProvider: Provider<LegacyMediaDataManagerImpl>, + newProvider: Provider<MediaCarouselInteractor>, + mediaFlags: MediaFlags, + ): MediaDataManager { + return if (mediaFlags.isMediaControlsRefactorEnabled()) { + newProvider.get() + } else { + legacyProvider.get() + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilter.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImpl.kt index bc539efdfe69..c02478b02ec2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilter.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImpl.kt @@ -61,7 +61,7 @@ internal val SMARTSPACE_MAX_AGE = * This is added at the end of the pipeline since we may still need to handle callbacks from * background users (e.g. timeouts). */ -class MediaDataFilter +class LegacyMediaDataFilterImpl @Inject constructor( private val context: Context, @@ -74,9 +74,9 @@ constructor( private val mediaFlags: MediaFlags, ) : MediaDataManager.Listener { private val _listeners: MutableSet<MediaDataManager.Listener> = mutableSetOf() - internal val listeners: Set<MediaDataManager.Listener> + val listeners: Set<MediaDataManager.Listener> get() = _listeners.toSet() - internal lateinit var mediaDataManager: MediaDataManager + lateinit var mediaDataManager: MediaDataManager private val allEntries: LinkedHashMap<String, MediaData> = LinkedHashMap() // The filtered userEntries, which will be a subset of all userEntries in MediaDataManager @@ -279,7 +279,7 @@ constructor( val mediaKeys = userEntries.keys.toSet() mediaKeys.forEach { // Force updates to listeners, needed for re-activated card - mediaDataManager.setTimedOut(it, timedOut = true, forceUpdate = true) + mediaDataManager.setInactive(it, timedOut = true, forceUpdate = true) } if (smartspaceMediaData.isActive) { val dismissIntent = smartspaceMediaData.dismissIntent diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt new file mode 100644 index 000000000000..3a83115642bc --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt @@ -0,0 +1,1693 @@ +/* + * Copyright (C) 2020 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.media.controls.domain.pipeline + +import android.annotation.SuppressLint +import android.app.ActivityOptions +import android.app.BroadcastOptions +import android.app.Notification +import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME +import android.app.PendingIntent +import android.app.StatusBarManager +import android.app.UriGrantsManager +import android.app.smartspace.SmartspaceAction +import android.app.smartspace.SmartspaceConfig +import android.app.smartspace.SmartspaceManager +import android.app.smartspace.SmartspaceSession +import android.app.smartspace.SmartspaceTarget +import android.content.BroadcastReceiver +import android.content.ContentProvider +import android.content.ContentResolver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.graphics.ImageDecoder +import android.graphics.drawable.Animatable +import android.graphics.drawable.Icon +import android.media.MediaDescription +import android.media.MediaMetadata +import android.media.session.MediaController +import android.media.session.MediaSession +import android.media.session.PlaybackState +import android.net.Uri +import android.os.Parcelable +import android.os.Process +import android.os.UserHandle +import android.provider.Settings +import android.service.notification.StatusBarNotification +import android.support.v4.media.MediaMetadataCompat +import android.text.TextUtils +import android.util.Log +import android.util.Pair as APair +import androidx.media.utils.MediaConstants +import com.android.app.tracing.traceSection +import com.android.internal.annotations.Keep +import com.android.internal.logging.InstanceId +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.Dumpable +import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dump.DumpManager +import com.android.systemui.media.controls.domain.pipeline.MediaDataManager.Companion.isMediaNotification +import com.android.systemui.media.controls.domain.resume.MediaResumeListener +import com.android.systemui.media.controls.domain.resume.ResumeMediaBrowser +import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_SOURCE +import com.android.systemui.media.controls.shared.model.EXTRA_VALUE_TRIGGER_PERIODIC +import com.android.systemui.media.controls.shared.model.MediaAction +import com.android.systemui.media.controls.shared.model.MediaButton +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.MediaDeviceData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider +import com.android.systemui.media.controls.ui.view.MediaViewHolder +import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaDataUtils +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.media.controls.util.MediaUiEventLogger +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.res.R +import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState +import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState +import com.android.systemui.statusbar.notification.row.HybridGroupManager +import com.android.systemui.tuner.TunerService +import com.android.systemui.util.Assert +import com.android.systemui.util.Utils +import com.android.systemui.util.concurrency.DelayableExecutor +import com.android.systemui.util.concurrency.ThreadFactory +import com.android.systemui.util.time.SystemClock +import java.io.IOException +import java.io.PrintWriter +import java.util.concurrent.Executor +import javax.inject.Inject + +// URI fields to try loading album art from +private val ART_URIS = + arrayOf( + MediaMetadata.METADATA_KEY_ALBUM_ART_URI, + MediaMetadata.METADATA_KEY_ART_URI, + MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI + ) + +private const val TAG = "MediaDataManager" +private const val DEBUG = true +private const val EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY = "dismiss_intent" + +private val LOADING = + MediaData( + userId = -1, + initialized = false, + app = null, + appIcon = null, + artist = null, + song = null, + artwork = null, + actions = emptyList(), + actionsToShowInCompact = emptyList(), + packageName = "INVALID", + token = null, + clickIntent = null, + device = null, + active = true, + resumeAction = null, + instanceId = InstanceId.fakeInstanceId(-1), + appUid = Process.INVALID_UID + ) + +internal val EMPTY_SMARTSPACE_MEDIA_DATA = + SmartspaceMediaData( + targetId = "INVALID", + isActive = false, + packageName = "INVALID", + cardAction = null, + recommendations = emptyList(), + dismissIntent = null, + headphoneConnectionTimeMillis = 0, + instanceId = InstanceId.fakeInstanceId(-1), + expiryTimeMs = 0, + ) + +const val MEDIA_TITLE_ERROR_MESSAGE = "Invalid media data: title is null or blank." + +/** + * Allow recommendations from smartspace to show in media controls. Requires + * [Utils.useQsMediaPlayer] to be enabled. On by default, but can be disabled by setting to 0 + */ +private fun allowMediaRecommendations(context: Context): Boolean { + val flag = + Settings.Secure.getInt( + context.contentResolver, + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, + 1 + ) + return Utils.useQsMediaPlayer(context) && flag > 0 +} + +/** A class that facilitates management and loading of Media Data, ready for binding. */ +@SysUISingleton +class LegacyMediaDataManagerImpl( + private val context: Context, + @Background private val backgroundExecutor: Executor, + @Main private val uiExecutor: Executor, + @Main private val foregroundExecutor: DelayableExecutor, + private val mediaControllerFactory: MediaControllerFactory, + private val broadcastDispatcher: BroadcastDispatcher, + dumpManager: DumpManager, + mediaTimeoutListener: MediaTimeoutListener, + mediaResumeListener: MediaResumeListener, + mediaSessionBasedFilter: MediaSessionBasedFilter, + private val mediaDeviceManager: MediaDeviceManager, + mediaDataCombineLatest: MediaDataCombineLatest, + private val mediaDataFilter: LegacyMediaDataFilterImpl, + private val activityStarter: ActivityStarter, + private val smartspaceMediaDataProvider: SmartspaceMediaDataProvider, + private var useMediaResumption: Boolean, + private val useQsMediaPlayer: Boolean, + private val systemClock: SystemClock, + private val tunerService: TunerService, + private val mediaFlags: MediaFlags, + private val logger: MediaUiEventLogger, + private val smartspaceManager: SmartspaceManager?, + private val keyguardUpdateMonitor: KeyguardUpdateMonitor, +) : Dumpable, BcSmartspaceDataPlugin.SmartspaceTargetListener, MediaDataManager { + + companion object { + // UI surface label for subscribing Smartspace updates. + @JvmField val SMARTSPACE_UI_SURFACE_LABEL = "media_data_manager" + + // Smartspace package name's extra key. + @JvmField val EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name" + + // Maximum number of actions allowed in compact view + @JvmField val MAX_COMPACT_ACTIONS = 3 + + // Maximum number of actions allowed in expanded view + @JvmField val MAX_NOTIFICATION_ACTIONS = MediaViewHolder.genericButtonIds.size + } + + private val themeText = + com.android.settingslib.Utils.getColorAttr( + context, + com.android.internal.R.attr.textColorPrimary + ) + .defaultColor + + // Internal listeners are part of the internal pipeline. External listeners (those registered + // with [MediaDeviceManager.addListener]) receive events after they have propagated through + // the internal pipeline. + // Another way to think of the distinction between internal and external listeners is the + // following. Internal listeners are listeners that MediaDataManager depends on, and external + // listeners are listeners that depend on MediaDataManager. + // TODO(b/159539991#comment5): Move internal listeners to separate package. + private val internalListeners: MutableSet<MediaDataManager.Listener> = mutableSetOf() + private val mediaEntries: LinkedHashMap<String, MediaData> = LinkedHashMap() + // There should ONLY be at most one Smartspace media recommendation. + var smartspaceMediaData: SmartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA + @Keep private var smartspaceSession: SmartspaceSession? = null + private var allowMediaRecommendations = allowMediaRecommendations(context) + + private val artworkWidth = + context.resources.getDimensionPixelSize( + com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize + ) + private val artworkHeight = + context.resources.getDimensionPixelSize(R.dimen.qs_media_session_height_expanded) + + @SuppressLint("WrongConstant") // sysui allowed to call STATUS_BAR_SERVICE + private val statusBarManager = + context.getSystemService(Context.STATUS_BAR_SERVICE) as StatusBarManager + + /** Check whether this notification is an RCN */ + private fun isRemoteCastNotification(sbn: StatusBarNotification): Boolean { + return sbn.notification.extras.containsKey(Notification.EXTRA_MEDIA_REMOTE_DEVICE) + } + + @Inject + constructor( + context: Context, + threadFactory: ThreadFactory, + @Main uiExecutor: Executor, + @Main foregroundExecutor: DelayableExecutor, + mediaControllerFactory: MediaControllerFactory, + dumpManager: DumpManager, + broadcastDispatcher: BroadcastDispatcher, + mediaTimeoutListener: MediaTimeoutListener, + mediaResumeListener: MediaResumeListener, + mediaSessionBasedFilter: MediaSessionBasedFilter, + mediaDeviceManager: MediaDeviceManager, + mediaDataCombineLatest: MediaDataCombineLatest, + mediaDataFilter: LegacyMediaDataFilterImpl, + activityStarter: ActivityStarter, + smartspaceMediaDataProvider: SmartspaceMediaDataProvider, + clock: SystemClock, + tunerService: TunerService, + mediaFlags: MediaFlags, + logger: MediaUiEventLogger, + smartspaceManager: SmartspaceManager?, + keyguardUpdateMonitor: KeyguardUpdateMonitor, + ) : this( + context, + // Loading bitmap for UMO background can take longer time, so it cannot run on the default + // background thread. Use a custom thread for media. + threadFactory.buildExecutorOnNewThread(TAG), + uiExecutor, + foregroundExecutor, + mediaControllerFactory, + broadcastDispatcher, + dumpManager, + mediaTimeoutListener, + mediaResumeListener, + mediaSessionBasedFilter, + mediaDeviceManager, + mediaDataCombineLatest, + mediaDataFilter, + activityStarter, + smartspaceMediaDataProvider, + Utils.useMediaResumption(context), + Utils.useQsMediaPlayer(context), + clock, + tunerService, + mediaFlags, + logger, + smartspaceManager, + keyguardUpdateMonitor, + ) + + private val appChangeReceiver = + object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + when (intent.action) { + Intent.ACTION_PACKAGES_SUSPENDED -> { + val packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST) + packages?.forEach { removeAllForPackage(it) } + } + Intent.ACTION_PACKAGE_REMOVED, + Intent.ACTION_PACKAGE_RESTARTED -> { + intent.data?.encodedSchemeSpecificPart?.let { removeAllForPackage(it) } + } + } + } + } + + init { + dumpManager.registerDumpable(TAG, this) + + // Initialize the internal processing pipeline. The listeners at the front of the pipeline + // are set as internal listeners so that they receive events. From there, events are + // propagated through the pipeline. The end of the pipeline is currently mediaDataFilter, + // so it is responsible for dispatching events to external listeners. To achieve this, + // external listeners that are registered with [MediaDataManager.addListener] are actually + // registered as listeners to mediaDataFilter. + addInternalListener(mediaTimeoutListener) + addInternalListener(mediaResumeListener) + addInternalListener(mediaSessionBasedFilter) + mediaSessionBasedFilter.addListener(mediaDeviceManager) + mediaSessionBasedFilter.addListener(mediaDataCombineLatest) + mediaDeviceManager.addListener(mediaDataCombineLatest) + mediaDataCombineLatest.addListener(mediaDataFilter) + + // Set up links back into the pipeline for listeners that need to send events upstream. + mediaTimeoutListener.timeoutCallback = { key: String, timedOut: Boolean -> + setInactive(key, timedOut) + } + mediaTimeoutListener.stateCallback = { key: String, state: PlaybackState -> + updateState(key, state) + } + mediaTimeoutListener.sessionCallback = { key: String -> onSessionDestroyed(key) } + mediaResumeListener.setManager(this) + mediaDataFilter.mediaDataManager = this + + val suspendFilter = IntentFilter(Intent.ACTION_PACKAGES_SUSPENDED) + broadcastDispatcher.registerReceiver(appChangeReceiver, suspendFilter, null, UserHandle.ALL) + + val uninstallFilter = + IntentFilter().apply { + addAction(Intent.ACTION_PACKAGE_REMOVED) + addAction(Intent.ACTION_PACKAGE_RESTARTED) + addDataScheme("package") + } + // BroadcastDispatcher does not allow filters with data schemes + context.registerReceiver(appChangeReceiver, uninstallFilter) + + // Register for Smartspace data updates. + smartspaceMediaDataProvider.registerListener(this) + smartspaceSession = + smartspaceManager?.createSmartspaceSession( + SmartspaceConfig.Builder(context, SMARTSPACE_UI_SURFACE_LABEL).build() + ) + smartspaceSession?.let { + it.addOnTargetsAvailableListener( + // Use a main uiExecutor thread listening to Smartspace updates instead of using + // the existing background executor. + // SmartspaceSession has scheduled routine updates which can be unpredictable on + // test simulators, using the backgroundExecutor makes it's hard to test the threads + // numbers. + uiExecutor, + SmartspaceSession.OnTargetsAvailableListener { targets -> + smartspaceMediaDataProvider.onTargetsAvailable(targets) + } + ) + } + smartspaceSession?.let { it.requestSmartspaceUpdate() } + tunerService.addTunable( + object : TunerService.Tunable { + override fun onTuningChanged(key: String?, newValue: String?) { + allowMediaRecommendations = allowMediaRecommendations(context) + if (!allowMediaRecommendations) { + dismissSmartspaceRecommendation( + key = smartspaceMediaData.targetId, + delay = 0L + ) + } + } + }, + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION + ) + } + + override fun destroy() { + smartspaceMediaDataProvider.unregisterListener(this) + smartspaceSession?.close() + smartspaceSession = null + context.unregisterReceiver(appChangeReceiver) + } + + override fun onNotificationAdded(key: String, sbn: StatusBarNotification) { + if (useQsMediaPlayer && isMediaNotification(sbn)) { + var isNewlyActiveEntry = false + Assert.isMainThread() + val oldKey = findExistingEntry(key, sbn.packageName) + if (oldKey == null) { + val instanceId = logger.getNewInstanceId() + val temp = + LOADING.copy( + packageName = sbn.packageName, + instanceId = instanceId, + createdTimestampMillis = systemClock.currentTimeMillis(), + ) + mediaEntries.put(key, temp) + isNewlyActiveEntry = true + } else if (oldKey != key) { + // Resume -> active conversion; move to new key + val oldData = mediaEntries.remove(oldKey)!! + isNewlyActiveEntry = true + mediaEntries.put(key, oldData) + } + loadMediaData(key, sbn, oldKey, isNewlyActiveEntry) + } else { + onNotificationRemoved(key) + } + } + + private fun removeAllForPackage(packageName: String) { + Assert.isMainThread() + val toRemove = mediaEntries.filter { it.value.packageName == packageName } + toRemove.forEach { removeEntry(it.key) } + } + + override fun setResumeAction(key: String, action: Runnable?) { + mediaEntries.get(key)?.let { + it.resumeAction = action + it.hasCheckedForResume = true + } + } + + override fun addResumptionControls( + userId: Int, + desc: MediaDescription, + action: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) { + // Resume controls don't have a notification key, so store by package name instead + if (!mediaEntries.containsKey(packageName)) { + val instanceId = logger.getNewInstanceId() + val appUid = + try { + context.packageManager.getApplicationInfo(packageName, 0)?.uid!! + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Could not get app UID for $packageName", e) + Process.INVALID_UID + } + + val resumeData = + LOADING.copy( + packageName = packageName, + resumeAction = action, + hasCheckedForResume = true, + instanceId = instanceId, + appUid = appUid, + createdTimestampMillis = systemClock.currentTimeMillis(), + ) + mediaEntries.put(packageName, resumeData) + logSingleVsMultipleMediaAdded(appUid, packageName, instanceId) + logger.logResumeMediaAdded(appUid, packageName, instanceId) + } + backgroundExecutor.execute { + loadMediaDataInBgForResumption( + userId, + desc, + action, + token, + appName, + appIntent, + packageName + ) + } + } + + /** + * Check if there is an existing entry that matches the key or package name. Returns the key + * that matches, or null if not found. + */ + private fun findExistingEntry(key: String, packageName: String): String? { + if (mediaEntries.containsKey(key)) { + return key + } + // Check if we already had a resume player + if (mediaEntries.containsKey(packageName)) { + return packageName + } + return null + } + + private fun loadMediaData( + key: String, + sbn: StatusBarNotification, + oldKey: String?, + isNewlyActiveEntry: Boolean = false, + ) { + backgroundExecutor.execute { loadMediaDataInBg(key, sbn, oldKey, isNewlyActiveEntry) } + } + + /** Add a listener for changes in this class */ + override fun addListener(listener: MediaDataManager.Listener) { + // mediaDataFilter is the current end of the internal pipeline. Register external + // listeners as listeners to it. + mediaDataFilter.addListener(listener) + } + + /** Remove a listener for changes in this class */ + override fun removeListener(listener: MediaDataManager.Listener) { + // Since mediaDataFilter is the current end of the internal pipelie, external listeners + // have been registered to it. So, they need to be removed from it too. + mediaDataFilter.removeListener(listener) + } + + /** Add a listener for internal events. */ + private fun addInternalListener(listener: MediaDataManager.Listener) = + internalListeners.add(listener) + + /** + * Notify internal listeners of media loaded event. + * + * External listeners registered with [addListener] will be notified after the event propagates + * through the internal listener pipeline. + */ + private fun notifyMediaDataLoaded(key: String, oldKey: String?, info: MediaData) { + internalListeners.forEach { it.onMediaDataLoaded(key, oldKey, info) } + } + + /** + * Notify internal listeners of Smartspace media loaded event. + * + * External listeners registered with [addListener] will be notified after the event propagates + * through the internal listener pipeline. + */ + private fun notifySmartspaceMediaDataLoaded(key: String, info: SmartspaceMediaData) { + internalListeners.forEach { it.onSmartspaceMediaDataLoaded(key, info) } + } + + /** + * Notify internal listeners of media removed event. + * + * External listeners registered with [addListener] will be notified after the event propagates + * through the internal listener pipeline. + */ + private fun notifyMediaDataRemoved(key: String) { + internalListeners.forEach { it.onMediaDataRemoved(key) } + } + + /** + * Notify internal listeners of Smartspace media removed event. + * + * External listeners registered with [addListener] will be notified after the event propagates + * through the internal listener pipeline. + * + * @param immediately indicates should apply the UI changes immediately, otherwise wait until + * the next refresh-round before UI becomes visible. Should only be true if the update is + * initiated by user's interaction. + */ + private fun notifySmartspaceMediaDataRemoved(key: String, immediately: Boolean) { + internalListeners.forEach { it.onSmartspaceMediaDataRemoved(key, immediately) } + } + + /** + * Called whenever the player has been paused or stopped for a while, or swiped from QQS. This + * will make the player not active anymore, hiding it from QQS and Keyguard. + * + * @see MediaData.active + */ + override fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean) { + mediaEntries[key]?.let { + if (timedOut && !forceUpdate) { + // Only log this event when media expires on its own + logger.logMediaTimeout(it.appUid, it.packageName, it.instanceId) + } + if (it.active == !timedOut && !forceUpdate) { + if (it.resumption) { + if (DEBUG) Log.d(TAG, "timing out resume player $key") + dismissMediaData(key, 0L /* delay */) + } + return + } + // Update last active if media was still active. + if (it.active) { + it.lastActive = systemClock.elapsedRealtime() + } + it.active = !timedOut + if (DEBUG) Log.d(TAG, "Updating $key timedOut: $timedOut") + onMediaDataLoaded(key, key, it) + } + + if (key == smartspaceMediaData.targetId) { + if (DEBUG) Log.d(TAG, "smartspace card expired") + dismissSmartspaceRecommendation(key, delay = 0L) + } + } + + /** Called when the player's [PlaybackState] has been updated with new actions and/or state */ + private fun updateState(key: String, state: PlaybackState) { + mediaEntries.get(key)?.let { + val token = it.token + if (token == null) { + if (DEBUG) Log.d(TAG, "State updated, but token was null") + return + } + val actions = + createActionsFromState( + it.packageName, + mediaControllerFactory.create(it.token), + UserHandle(it.userId) + ) + + // Control buttons + // If flag is enabled and controller has a PlaybackState, + // create actions from session info + // otherwise, no need to update semantic actions. + val data = + if (actions != null) { + it.copy(semanticActions = actions, isPlaying = isPlayingState(state.state)) + } else { + it.copy(isPlaying = isPlayingState(state.state)) + } + if (DEBUG) Log.d(TAG, "State updated outside of notification") + onMediaDataLoaded(key, key, data) + } + } + + private fun removeEntry(key: String, logEvent: Boolean = true) { + mediaEntries.remove(key)?.let { + if (logEvent) { + logger.logMediaRemoved(it.appUid, it.packageName, it.instanceId) + } + } + notifyMediaDataRemoved(key) + } + + /** Dismiss a media entry. Returns false if the key was not found. */ + override fun dismissMediaData(key: String, delay: Long): Boolean { + val existed = mediaEntries[key] != null + backgroundExecutor.execute { + mediaEntries[key]?.let { mediaData -> + if (mediaData.isLocalSession()) { + mediaData.token?.let { + val mediaController = mediaControllerFactory.create(it) + mediaController.transportControls.stop() + } + } + } + } + foregroundExecutor.executeDelayed({ removeEntry(key) }, delay) + return existed + } + + /** + * Called whenever the recommendation has been expired or removed by the user. This will remove + * the recommendation card entirely from the carousel. + */ + override fun dismissSmartspaceRecommendation(key: String, delay: Long) { + if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { + // If this doesn't match, or we've already invalidated the data, no action needed + return + } + + if (DEBUG) Log.d(TAG, "Dismissing Smartspace media target") + if (smartspaceMediaData.isActive) { + smartspaceMediaData = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId + ) + } + foregroundExecutor.executeDelayed( + { notifySmartspaceMediaDataRemoved(smartspaceMediaData.targetId, immediately = true) }, + delay + ) + } + + /** Called when the recommendation card should no longer be visible in QQS or lockscreen */ + override fun setRecommendationInactive(key: String) { + if (!mediaFlags.isPersistentSsCardEnabled()) { + Log.e(TAG, "Only persistent recommendation can be inactive!") + return + } + if (DEBUG) Log.d(TAG, "Setting smartspace recommendation inactive") + + if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { + // If this doesn't match, or we've already invalidated the data, no action needed + return + } + + smartspaceMediaData = smartspaceMediaData.copy(isActive = false) + notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) + } + + private fun loadMediaDataInBgForResumption( + userId: Int, + desc: MediaDescription, + resumeAction: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) { + if (desc.title.isNullOrBlank()) { + Log.e(TAG, "Description incomplete") + // Delete the placeholder entry + mediaEntries.remove(packageName) + return + } + + if (DEBUG) { + Log.d(TAG, "adding track for $userId from browser: $desc") + } + + val currentEntry = mediaEntries.get(packageName) + val appUid = currentEntry?.appUid ?: Process.INVALID_UID + + // Album art + var artworkBitmap = desc.iconBitmap + if (artworkBitmap == null && desc.iconUri != null) { + artworkBitmap = loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName) + } + val artworkIcon = + if (artworkBitmap != null) { + Icon.createWithBitmap(artworkBitmap) + } else { + null + } + + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + val isExplicit = + desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + val progress = + if (mediaFlags.isResumeProgressEnabled()) { + MediaDataUtils.getDescriptionProgress(desc.extras) + } else null + + val mediaAction = getResumeMediaAction(resumeAction) + val lastActive = systemClock.elapsedRealtime() + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + foregroundExecutor.execute { + onMediaDataLoaded( + packageName, + null, + MediaData( + userId, + true, + appName, + null, + desc.subtitle, + desc.title, + artworkIcon, + listOf(mediaAction), + listOf(0), + MediaButton(playOrPause = mediaAction), + packageName, + token, + appIntent, + device = null, + active = false, + resumeAction = resumeAction, + resumption = true, + notificationKey = packageName, + hasCheckedForResume = true, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = appUid, + isExplicit = isExplicit, + resumeProgress = progress, + ) + ) + } + } + + fun loadMediaDataInBg( + key: String, + sbn: StatusBarNotification, + oldKey: String?, + isNewlyActiveEntry: Boolean = false, + ) { + val token = + sbn.notification.extras.getParcelable( + Notification.EXTRA_MEDIA_SESSION, + MediaSession.Token::class.java + ) + if (token == null) { + return + } + val mediaController = mediaControllerFactory.create(token) + val metadata = mediaController.metadata + val notif: Notification = sbn.notification + + val appInfo = + notif.extras.getParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO, + ApplicationInfo::class.java + ) + ?: getAppInfoFromPackage(sbn.packageName) + + // App name + val appName = getAppName(sbn, appInfo) + + // Song name + var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) + if (song.isNullOrBlank()) { + song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) + } + if (song.isNullOrBlank()) { + song = HybridGroupManager.resolveTitle(notif) + } + if (song.isNullOrBlank()) { + // For apps that don't include a title, log and add a placeholder + song = context.getString(R.string.controls_media_empty_title, appName) + try { + statusBarManager.logBlankMediaTitle(sbn.packageName, sbn.user.identifier) + } catch (e: RuntimeException) { + Log.e(TAG, "Error reporting blank media title for package ${sbn.packageName}") + } + } + + // Album art + var artworkBitmap = metadata?.let { loadBitmapFromUri(it) } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) + } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) + } + val artWorkIcon = + if (artworkBitmap == null) { + notif.getLargeIcon() + } else { + Icon.createWithBitmap(artworkBitmap) + } + + // App Icon + val smallIcon = sbn.notification.smallIcon + + // Explicit Indicator + var isExplicit = false + val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata) + isExplicit = + mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + // Artist name + var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) + if (artist.isNullOrBlank()) { + artist = HybridGroupManager.resolveText(notif) + } + + // Device name (used for remote cast notifications) + var device: MediaDeviceData? = null + if (isRemoteCastNotification(sbn)) { + val extras = sbn.notification.extras + val deviceName = extras.getCharSequence(Notification.EXTRA_MEDIA_REMOTE_DEVICE, null) + val deviceIcon = extras.getInt(Notification.EXTRA_MEDIA_REMOTE_ICON, -1) + val deviceIntent = + extras.getParcelable( + Notification.EXTRA_MEDIA_REMOTE_INTENT, + PendingIntent::class.java + ) + Log.d(TAG, "$key is RCN for $deviceName") + + if (deviceName != null && deviceIcon > -1) { + // Name and icon must be present, but intent may be null + val enabled = deviceIntent != null && deviceIntent.isActivity + val deviceDrawable = + Icon.createWithResource(sbn.packageName, deviceIcon) + .loadDrawable(sbn.getPackageContext(context)) + device = + MediaDeviceData( + enabled, + deviceDrawable, + deviceName, + deviceIntent, + showBroadcastButton = false + ) + } + } + + // Control buttons + // If flag is enabled and controller has a PlaybackState, create actions from session info + // Otherwise, use the notification actions + var actionIcons: List<MediaAction> = emptyList() + var actionsToShowCollapsed: List<Int> = emptyList() + val semanticActions = createActionsFromState(sbn.packageName, mediaController, sbn.user) + if (semanticActions == null) { + val actions = createActionsFromNotification(sbn) + actionIcons = actions.first + actionsToShowCollapsed = actions.second + } + + val playbackLocation = + if (isRemoteCastNotification(sbn)) MediaData.PLAYBACK_CAST_REMOTE + else if ( + mediaController.playbackInfo?.playbackType == + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL + ) + MediaData.PLAYBACK_LOCAL + else MediaData.PLAYBACK_CAST_LOCAL + val isPlaying = mediaController.playbackState?.let { isPlayingState(it.state) } ?: null + + val currentEntry = mediaEntries.get(key) + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + val appUid = appInfo?.uid ?: Process.INVALID_UID + + if (isNewlyActiveEntry) { + logSingleVsMultipleMediaAdded(appUid, sbn.packageName, instanceId) + logger.logActiveMediaAdded(appUid, sbn.packageName, instanceId, playbackLocation) + } else if (playbackLocation != currentEntry?.playbackLocation) { + logger.logPlaybackLocationChange(appUid, sbn.packageName, instanceId, playbackLocation) + } + + val lastActive = systemClock.elapsedRealtime() + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + foregroundExecutor.execute { + val resumeAction: Runnable? = mediaEntries[key]?.resumeAction + val hasCheckedForResume = mediaEntries[key]?.hasCheckedForResume == true + val active = mediaEntries[key]?.active ?: true + onMediaDataLoaded( + key, + oldKey, + MediaData( + sbn.normalizedUserId, + true, + appName, + smallIcon, + artist, + song, + artWorkIcon, + actionIcons, + actionsToShowCollapsed, + semanticActions, + sbn.packageName, + token, + notif.contentIntent, + device, + active, + resumeAction = resumeAction, + playbackLocation = playbackLocation, + notificationKey = key, + hasCheckedForResume = hasCheckedForResume, + isPlaying = isPlaying, + isClearable = !sbn.isOngoing, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = appUid, + isExplicit = isExplicit, + ) + ) + } + } + + private fun logSingleVsMultipleMediaAdded( + appUid: Int, + packageName: String, + instanceId: InstanceId + ) { + if (mediaEntries.size == 1) { + logger.logSingleMediaPlayerInCarousel(appUid, packageName, instanceId) + } else if (mediaEntries.size == 2) { + // Since this method is only called when there is a new media session added. + // logging needed once there is more than one media session in carousel. + logger.logMultipleMediaPlayersInCarousel(appUid, packageName, instanceId) + } + } + + private fun getAppInfoFromPackage(packageName: String): ApplicationInfo? { + try { + return context.packageManager.getApplicationInfo(packageName, 0) + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Could not get app info for $packageName", e) + } + return null + } + + private fun getAppName(sbn: StatusBarNotification, appInfo: ApplicationInfo?): String { + val name = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME) + if (name != null) { + return name + } + + return if (appInfo != null) { + context.packageManager.getApplicationLabel(appInfo).toString() + } else { + sbn.packageName + } + } + + /** Generate action buttons based on notification actions */ + private fun createActionsFromNotification( + sbn: StatusBarNotification + ): Pair<List<MediaAction>, List<Int>> { + val notif = sbn.notification + val actionIcons: MutableList<MediaAction> = ArrayList() + val actions = notif.actions + var actionsToShowCollapsed = + notif.extras.getIntArray(Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() + ?: mutableListOf() + if (actionsToShowCollapsed.size > MAX_COMPACT_ACTIONS) { + Log.e( + TAG, + "Too many compact actions for ${sbn.key}," + + "limiting to first $MAX_COMPACT_ACTIONS" + ) + actionsToShowCollapsed = actionsToShowCollapsed.subList(0, MAX_COMPACT_ACTIONS) + } + + if (actions != null) { + for ((index, action) in actions.withIndex()) { + if (index == MAX_NOTIFICATION_ACTIONS) { + Log.w( + TAG, + "Too many notification actions for ${sbn.key}," + + " limiting to first $MAX_NOTIFICATION_ACTIONS" + ) + break + } + if (action.getIcon() == null) { + if (DEBUG) Log.i(TAG, "No icon for action $index ${action.title}") + actionsToShowCollapsed.remove(index) + continue + } + val runnable = + if (action.actionIntent != null) { + Runnable { + if (action.actionIntent.isActivity) { + activityStarter.startPendingIntentDismissingKeyguard( + action.actionIntent + ) + } else if (action.isAuthenticationRequired()) { + activityStarter.dismissKeyguardThenExecute( + { + var result = sendPendingIntent(action.actionIntent) + result + }, + {}, + true + ) + } else { + sendPendingIntent(action.actionIntent) + } + } + } else { + null + } + val mediaActionIcon = + if (action.getIcon()?.getType() == Icon.TYPE_RESOURCE) { + Icon.createWithResource(sbn.packageName, action.getIcon()!!.getResId()) + } else { + action.getIcon() + } + .setTint(themeText) + .loadDrawable(context) + val mediaAction = MediaAction(mediaActionIcon, runnable, action.title, null) + actionIcons.add(mediaAction) + } + } + return Pair(actionIcons, actionsToShowCollapsed) + } + + /** + * Generates action button info for this media session based on the PlaybackState + * + * @param packageName Package name for the media app + * @param controller MediaController for the current session + * @return a Pair consisting of a list of media actions, and a list of ints representing which + * + * ``` + * of those actions should be shown in the compact player + * ``` + */ + private fun createActionsFromState( + packageName: String, + controller: MediaController, + user: UserHandle + ): MediaButton? { + val state = controller.playbackState + if (state == null || !mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { + return null + } + + // First, check for standard actions + val playOrPause = + if (isConnectingState(state.state)) { + // Spinner needs to be animating to render anything. Start it here. + val drawable = + context.getDrawable(com.android.internal.R.drawable.progress_small_material) + (drawable as Animatable).start() + MediaAction( + drawable, + null, // no action to perform when clicked + context.getString(R.string.controls_media_button_connecting), + context.getDrawable(R.drawable.ic_media_connecting_container), + // Specify a rebind id to prevent the spinner from restarting on later binds. + com.android.internal.R.drawable.progress_small_material + ) + } else if (isPlayingState(state.state)) { + getStandardAction(controller, state.actions, PlaybackState.ACTION_PAUSE) + } else { + getStandardAction(controller, state.actions, PlaybackState.ACTION_PLAY) + } + val prevButton = + getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_PREVIOUS) + val nextButton = + getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_NEXT) + + // Then, create a way to build any custom actions that will be needed + val customActions = + state.customActions + .asSequence() + .filterNotNull() + .map { getCustomAction(state, packageName, controller, it) } + .iterator() + fun nextCustomAction() = if (customActions.hasNext()) customActions.next() else null + + // Finally, assign the remaining button slots: play/pause A B C D + // A = previous, else custom action (if not reserved) + // B = next, else custom action (if not reserved) + // C and D are always custom actions + val reservePrev = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV + ) == true + val reserveNext = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT + ) == true + + val prevOrCustom = + if (prevButton != null) { + prevButton + } else if (!reservePrev) { + nextCustomAction() + } else { + null + } + + val nextOrCustom = + if (nextButton != null) { + nextButton + } else if (!reserveNext) { + nextCustomAction() + } else { + null + } + + return MediaButton( + playOrPause, + nextOrCustom, + prevOrCustom, + nextCustomAction(), + nextCustomAction(), + reserveNext, + reservePrev + ) + } + + /** + * Create a [MediaAction] for a given action and media session + * + * @param controller MediaController for the session + * @param stateActions The actions included with the session's [PlaybackState] + * @param action A [PlaybackState.Actions] value representing what action to generate. One of: + * ``` + * [PlaybackState.ACTION_PLAY] + * [PlaybackState.ACTION_PAUSE] + * [PlaybackState.ACTION_SKIP_TO_PREVIOUS] + * [PlaybackState.ACTION_SKIP_TO_NEXT] + * @return + * ``` + * + * A [MediaAction] with correct values set, or null if the state doesn't support it + */ + private fun getStandardAction( + controller: MediaController, + stateActions: Long, + @PlaybackState.Actions action: Long + ): MediaAction? { + if (!includesAction(stateActions, action)) { + return null + } + + return when (action) { + PlaybackState.ACTION_PLAY -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_play), + { controller.transportControls.play() }, + context.getString(R.string.controls_media_button_play), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + PlaybackState.ACTION_PAUSE -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_pause), + { controller.transportControls.pause() }, + context.getString(R.string.controls_media_button_pause), + context.getDrawable(R.drawable.ic_media_pause_container) + ) + } + PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_prev), + { controller.transportControls.skipToPrevious() }, + context.getString(R.string.controls_media_button_prev), + null + ) + } + PlaybackState.ACTION_SKIP_TO_NEXT -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_next), + { controller.transportControls.skipToNext() }, + context.getString(R.string.controls_media_button_next), + null + ) + } + else -> null + } + } + + /** Check whether the actions from a [PlaybackState] include a specific action */ + private fun includesAction(stateActions: Long, @PlaybackState.Actions action: Long): Boolean { + if ( + (action == PlaybackState.ACTION_PLAY || action == PlaybackState.ACTION_PAUSE) && + (stateActions and PlaybackState.ACTION_PLAY_PAUSE > 0L) + ) { + return true + } + return (stateActions and action != 0L) + } + + /** Get a [MediaAction] representing a [PlaybackState.CustomAction] */ + private fun getCustomAction( + state: PlaybackState, + packageName: String, + controller: MediaController, + customAction: PlaybackState.CustomAction + ): MediaAction { + return MediaAction( + Icon.createWithResource(packageName, customAction.icon).loadDrawable(context), + { controller.transportControls.sendCustomAction(customAction, customAction.extras) }, + customAction.name, + null + ) + } + + /** Load a bitmap from the various Art metadata URIs */ + private fun loadBitmapFromUri(metadata: MediaMetadata): Bitmap? { + for (uri in ART_URIS) { + val uriString = metadata.getString(uri) + if (!TextUtils.isEmpty(uriString)) { + val albumArt = loadBitmapFromUri(Uri.parse(uriString)) + if (albumArt != null) { + if (DEBUG) Log.d(TAG, "loaded art from $uri") + return albumArt + } + } + } + return null + } + + private fun sendPendingIntent(intent: PendingIntent): Boolean { + return try { + val options = BroadcastOptions.makeBasic() + options.setInteractive(true) + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED + ) + intent.send(options.toBundle()) + true + } catch (e: PendingIntent.CanceledException) { + Log.d(TAG, "Intent canceled", e) + false + } + } + + /** Returns a bitmap if the user can access the given URI, else null */ + private fun loadBitmapFromUriForUser( + uri: Uri, + userId: Int, + appUid: Int, + packageName: String, + ): Bitmap? { + try { + val ugm = UriGrantsManager.getService() + ugm.checkGrantUriPermission_ignoreNonSystem( + appUid, + packageName, + ContentProvider.getUriWithoutUserId(uri), + Intent.FLAG_GRANT_READ_URI_PERMISSION, + ContentProvider.getUserIdFromUri(uri, userId) + ) + return loadBitmapFromUri(uri) + } catch (e: SecurityException) { + Log.e(TAG, "Failed to get URI permission: $e") + } + return null + } + + /** + * Load a bitmap from a URI + * + * @param uri the uri to load + * @return bitmap, or null if couldn't be loaded + */ + private fun loadBitmapFromUri(uri: Uri): Bitmap? { + // ImageDecoder requires a scheme of the following types + if (uri.scheme == null) { + return null + } + + if ( + !uri.scheme.equals(ContentResolver.SCHEME_CONTENT) && + !uri.scheme.equals(ContentResolver.SCHEME_ANDROID_RESOURCE) && + !uri.scheme.equals(ContentResolver.SCHEME_FILE) + ) { + return null + } + + val source = ImageDecoder.createSource(context.contentResolver, uri) + return try { + ImageDecoder.decodeBitmap(source) { decoder, info, _ -> + val width = info.size.width + val height = info.size.height + val scale = + MediaDataUtils.getScaleFactor( + APair(width, height), + APair(artworkWidth, artworkHeight) + ) + + // Downscale if needed + if (scale != 0f && scale < 1) { + decoder.setTargetSize((scale * width).toInt(), (scale * height).toInt()) + } + decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE + } + } catch (e: IOException) { + Log.e(TAG, "Unable to load bitmap", e) + null + } catch (e: RuntimeException) { + Log.e(TAG, "Unable to load bitmap", e) + null + } + } + + private fun getResumeMediaAction(action: Runnable): MediaAction { + return MediaAction( + Icon.createWithResource(context, R.drawable.ic_media_play) + .setTint(themeText) + .loadDrawable(context), + action, + context.getString(R.string.controls_media_resume), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + + fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) = + traceSection("MediaDataManager#onMediaDataLoaded") { + Assert.isMainThread() + if (mediaEntries.containsKey(key)) { + // Otherwise this was removed already + mediaEntries.put(key, data) + notifyMediaDataLoaded(key, oldKey, data) + } + } + + override fun onSmartspaceTargetsUpdated(targets: List<Parcelable>) { + if (!allowMediaRecommendations) { + if (DEBUG) Log.d(TAG, "Smartspace recommendation is disabled in Settings.") + return + } + + val mediaTargets = targets.filterIsInstance<SmartspaceTarget>() + when (mediaTargets.size) { + 0 -> { + if (!smartspaceMediaData.isActive) { + return + } + if (DEBUG) { + Log.d(TAG, "Set Smartspace media to be inactive for the data update") + } + if (mediaFlags.isPersistentSsCardEnabled()) { + // Smartspace uses this signal to hide the card (e.g. when it expires or user + // disconnects headphones), so treat as setting inactive when flag is on + smartspaceMediaData = smartspaceMediaData.copy(isActive = false) + notifySmartspaceMediaDataLoaded( + smartspaceMediaData.targetId, + smartspaceMediaData, + ) + } else { + smartspaceMediaData = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId, + ) + notifySmartspaceMediaDataRemoved( + smartspaceMediaData.targetId, + immediately = false, + ) + } + } + 1 -> { + val newMediaTarget = mediaTargets.get(0) + if (smartspaceMediaData.targetId == newMediaTarget.smartspaceTargetId) { + // The same Smartspace updates can be received. Skip the duplicate updates. + return + } + if (DEBUG) Log.d(TAG, "Forwarding Smartspace media update.") + smartspaceMediaData = toSmartspaceMediaData(newMediaTarget) + notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) + } + else -> { + // There should NOT be more than 1 Smartspace media update. When it happens, it + // indicates a bad state or an error. Reset the status accordingly. + Log.wtf(TAG, "More than 1 Smartspace Media Update. Resetting the status...") + notifySmartspaceMediaDataRemoved( + smartspaceMediaData.targetId, + immediately = false, + ) + smartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA + } + } + } + + override fun onNotificationRemoved(key: String) { + Assert.isMainThread() + val removed = mediaEntries.remove(key) ?: return + if (keyguardUpdateMonitor.isUserInLockdown(removed.userId)) { + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } else if (isAbleToResume(removed)) { + convertToResumePlayer(key, removed) + } else if (mediaFlags.isRetainingPlayersEnabled()) { + handlePossibleRemoval(key, removed, notificationRemoved = true) + } else { + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } + } + + private fun onSessionDestroyed(key: String) { + if (DEBUG) Log.d(TAG, "session destroyed for $key") + val entry = mediaEntries.remove(key) ?: return + // Clear token since the session is no longer valid + val updated = entry.copy(token = null) + handlePossibleRemoval(key, updated) + } + + private fun isAbleToResume(data: MediaData): Boolean { + val isEligibleForResume = + data.isLocalSession() || + (mediaFlags.isRemoteResumeAllowed() && + data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE) + return useMediaResumption && data.resumeAction != null && isEligibleForResume + } + + /** + * Convert to resume state if the player is no longer valid and active, then notify listeners + * that the data was updated. Does not convert to resume state if the player is still valid, or + * if it was removed before becoming inactive. (Assumes that [removed] was removed from + * [mediaEntries] before this function was called) + */ + private fun handlePossibleRemoval( + key: String, + removed: MediaData, + notificationRemoved: Boolean = false + ) { + val hasSession = removed.token != null + if (hasSession && removed.semanticActions != null) { + // The app was using session actions, and the session is still valid: keep player + if (DEBUG) Log.d(TAG, "Notification removed but using session actions $key") + mediaEntries.put(key, removed) + notifyMediaDataLoaded(key, key, removed) + } else if (!notificationRemoved && removed.semanticActions == null) { + // The app was using notification actions, and notif wasn't removed yet: keep player + if (DEBUG) Log.d(TAG, "Session destroyed but using notification actions $key") + mediaEntries.put(key, removed) + notifyMediaDataLoaded(key, key, removed) + } else if (removed.active && !isAbleToResume(removed)) { + // This player was still active - it didn't last long enough to time out, + // and its app doesn't normally support resume: remove + if (DEBUG) Log.d(TAG, "Removing still-active player $key") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } else if (mediaFlags.isRetainingPlayersEnabled() || isAbleToResume(removed)) { + // Convert to resume + if (DEBUG) { + Log.d( + TAG, + "Notification ($notificationRemoved) and/or session " + + "($hasSession) gone for inactive player $key" + ) + } + convertToResumePlayer(key, removed) + } else { + // Retaining players flag is off and app doesn't support resume: remove player. + if (DEBUG) Log.d(TAG, "Removing player $key") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } + } + + /** Set the given [MediaData] as a resume state player and notify listeners */ + private fun convertToResumePlayer(key: String, data: MediaData) { + if (DEBUG) Log.d(TAG, "Converting $key to resume") + // Resumption controls must have a title. + if (data.song.isNullOrBlank()) { + Log.e(TAG, "Description incomplete") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) + return + } + // Move to resume key (aka package name) if that key doesn't already exist. + val resumeAction = data.resumeAction?.let { getResumeMediaAction(it) } + val actions = resumeAction?.let { listOf(resumeAction) } ?: emptyList() + val launcherIntent = + context.packageManager.getLaunchIntentForPackage(data.packageName)?.let { + PendingIntent.getActivity(context, 0, it, PendingIntent.FLAG_IMMUTABLE) + } + val lastActive = + if (data.active) { + systemClock.elapsedRealtime() + } else { + data.lastActive + } + val updated = + data.copy( + token = null, + actions = actions, + semanticActions = MediaButton(playOrPause = resumeAction), + actionsToShowInCompact = listOf(0), + active = false, + resumption = true, + isPlaying = false, + isClearable = true, + clickIntent = launcherIntent, + lastActive = lastActive, + ) + val pkg = data.packageName + val migrate = mediaEntries.put(pkg, updated) == null + // Notify listeners of "new" controls when migrating or removed and update when not + Log.d(TAG, "migrating? $migrate from $key -> $pkg") + if (migrate) { + notifyMediaDataLoaded(key = pkg, oldKey = key, info = updated) + } else { + // Since packageName is used for the key of the resumption controls, it is + // possible that another notification has already been reused for the resumption + // controls of this package. In this case, rather than renaming this player as + // packageName, just remove it and then send a update to the existing resumption + // controls. + notifyMediaDataRemoved(key) + notifyMediaDataLoaded(key = pkg, oldKey = pkg, info = updated) + } + logger.logActiveConvertedToResume(updated.appUid, pkg, updated.instanceId) + + // Limit total number of resume controls + val resumeEntries = mediaEntries.filter { (key, data) -> data.resumption } + val numResume = resumeEntries.size + if (numResume > ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) { + resumeEntries + .toList() + .sortedBy { (key, data) -> data.lastActive } + .subList(0, numResume - ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) + .forEach { (key, data) -> + Log.d(TAG, "Removing excess control $key") + mediaEntries.remove(key) + notifyMediaDataRemoved(key) + logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) + } + } + } + + override fun setMediaResumptionEnabled(isEnabled: Boolean) { + if (useMediaResumption == isEnabled) { + return + } + + useMediaResumption = isEnabled + + if (!useMediaResumption) { + // Remove any existing resume controls + val filtered = mediaEntries.filter { !it.value.active } + filtered.forEach { + mediaEntries.remove(it.key) + notifyMediaDataRemoved(it.key) + logger.logMediaRemoved(it.value.appUid, it.value.packageName, it.value.instanceId) + } + } + } + + /** Invoked when the user has dismissed the media carousel */ + override fun onSwipeToDismiss() = mediaDataFilter.onSwipeToDismiss() + + /** Are there any media notifications active, including the recommendations? */ + override fun hasActiveMediaOrRecommendation() = mediaDataFilter.hasActiveMediaOrRecommendation() + + /** + * Are there any media entries we should display, including the recommendations? + * - If resumption is enabled, this will include inactive players + * - If resumption is disabled, we only want to show active players + */ + override fun hasAnyMediaOrRecommendation() = mediaDataFilter.hasAnyMediaOrRecommendation() + + /** Are there any resume media notifications active, excluding the recommendations? */ + override fun hasActiveMedia() = mediaDataFilter.hasActiveMedia() + + /** + * Are there any resume media notifications active, excluding the recommendations? + * - If resumption is enabled, this will include inactive players + * - If resumption is disabled, we only want to show active players + */ + override fun hasAnyMedia() = mediaDataFilter.hasAnyMedia() + override fun isRecommendationActive() = smartspaceMediaData.isActive + + /** + * Converts the pass-in SmartspaceTarget to SmartspaceMediaData + * + * @return An empty SmartspaceMediaData with the valid target Id is returned if the + * SmartspaceTarget's data is invalid. + */ + private fun toSmartspaceMediaData(target: SmartspaceTarget): SmartspaceMediaData { + val baseAction: SmartspaceAction? = target.baseAction + val dismissIntent = + baseAction?.extras?.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY) as Intent? + + val isActive = + when { + !mediaFlags.isPersistentSsCardEnabled() -> true + baseAction == null -> true + else -> { + val triggerSource = baseAction.extras?.getString(EXTRA_KEY_TRIGGER_SOURCE) + triggerSource != EXTRA_VALUE_TRIGGER_PERIODIC + } + } + + packageName(target)?.let { + return SmartspaceMediaData( + targetId = target.smartspaceTargetId, + isActive = isActive, + packageName = it, + cardAction = target.baseAction, + recommendations = target.iconGrid, + dismissIntent = dismissIntent, + headphoneConnectionTimeMillis = target.creationTimeMillis, + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, + ) + } + return EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = target.smartspaceTargetId, + isActive = isActive, + dismissIntent = dismissIntent, + headphoneConnectionTimeMillis = target.creationTimeMillis, + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, + ) + } + + private fun packageName(target: SmartspaceTarget): String? { + val recommendationList = target.iconGrid + if (recommendationList == null || recommendationList.isEmpty()) { + Log.w(TAG, "Empty or null media recommendation list.") + return null + } + for (recommendation in recommendationList) { + val extras = recommendation.extras + extras?.let { + it.getString(EXTRAS_MEDIA_SOURCE_PACKAGE_NAME)?.let { packageName -> + return packageName + } + } + } + Log.w(TAG, "No valid package name is provided.") + return null + } + + override fun dump(pw: PrintWriter, args: Array<out String>) { + pw.apply { + println("internalListeners: $internalListeners") + println("externalListeners: ${mediaDataFilter.listeners}") + println("mediaEntries: $mediaEntries") + println("useMediaResumption: $useMediaResumption") + println("allowMediaRecommendations: $allowMediaRecommendations") + } + mediaDeviceManager.dump(pw) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImpl.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImpl.kt new file mode 100644 index 000000000000..a65db35030ea --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImpl.kt @@ -0,0 +1,353 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.content.Context +import android.content.pm.UserInfo +import android.os.SystemProperties +import android.util.Log +import com.android.internal.annotations.KeepForWeakReference +import com.android.internal.annotations.VisibleForTesting +import com.android.systemui.broadcast.BroadcastSender +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.media.controls.data.repository.MediaFilterRepository +import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_RESUME +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.media.controls.util.MediaUiEventLogger +import com.android.systemui.settings.UserTracker +import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.util.time.SystemClock +import java.util.SortedMap +import java.util.concurrent.Executor +import java.util.concurrent.TimeUnit +import javax.inject.Inject + +private const val TAG = "MediaDataFilter" +private const val DEBUG = true +private const val EXPORTED_SMARTSPACE_TRAMPOLINE_ACTIVITY_NAME = + ("com.google" + + ".android.apps.gsa.staticplugins.opa.smartspace.ExportedSmartspaceTrampolineActivity") +private const val RESUMABLE_MEDIA_MAX_AGE_SECONDS_KEY = "resumable_media_max_age_seconds" + +/** + * Filters data updates from [MediaDataCombineLatest] based on the current user ID, and handles user + * switches (removing entries for the previous user, adding back entries for the current user). Also + * filters out smartspace updates in favor of local recent media, when avaialble. + * + * This is added at the end of the pipeline since we may still need to handle callbacks from + * background users (e.g. timeouts). + */ +class MediaDataFilterImpl +@Inject +constructor( + private val context: Context, + userTracker: UserTracker, + private val broadcastSender: BroadcastSender, + private val lockscreenUserManager: NotificationLockscreenUserManager, + @Main private val executor: Executor, + private val systemClock: SystemClock, + private val logger: MediaUiEventLogger, + private val mediaFlags: MediaFlags, + private val mediaFilterRepository: MediaFilterRepository, +) : MediaDataManager.Listener { + private val _listeners: MutableSet<MediaDataManager.Listener> = mutableSetOf() + val listeners: Set<MediaDataManager.Listener> + get() = _listeners.toSet() + lateinit var mediaDataManager: MediaDataManager + + // Ensure the field (and associated reference) isn't removed during optimization. + @KeepForWeakReference + private val userTrackerCallback = + object : UserTracker.Callback { + override fun onUserChanged(newUser: Int, userContext: Context) { + handleUserSwitched() + } + + override fun onProfilesChanged(profiles: List<UserInfo>) { + handleProfileChanged() + } + } + + init { + userTracker.addCallback(userTrackerCallback, executor) + } + + override fun onMediaDataLoaded( + key: String, + oldKey: String?, + data: MediaData, + immediately: Boolean, + receivedSmartspaceCardLatency: Int, + isSsReactivated: Boolean + ) { + if (oldKey != null && oldKey != key) { + mediaFilterRepository.removeMediaEntry(oldKey) + } + mediaFilterRepository.addMediaEntry(key, data) + + if ( + !lockscreenUserManager.isCurrentProfile(data.userId) || + !lockscreenUserManager.isProfileAvailable(data.userId) + ) { + return + } + + if (oldKey != null && oldKey != key) { + mediaFilterRepository.removeSelectedUserMediaEntry(oldKey) + } + mediaFilterRepository.addSelectedUserMediaEntry(key, data) + + // Notify listeners + listeners.forEach { it.onMediaDataLoaded(key, oldKey, data) } + } + + override fun onSmartspaceMediaDataLoaded( + key: String, + data: SmartspaceMediaData, + shouldPrioritize: Boolean + ) { + // With persistent recommendation card, we could get a background update while inactive + // Otherwise, consider it an invalid update + if (!data.isActive && !mediaFlags.isPersistentSsCardEnabled()) { + Log.d(TAG, "Inactive recommendation data. Skip triggering.") + return + } + + // Override the pass-in value here, as the order of Smartspace card is only determined here. + var shouldPrioritizeMutable = false + mediaFilterRepository.setRecommendation(data) + + // Before forwarding the smartspace target, first check if we have recently inactive media + val selectedUserEntries = mediaFilterRepository.selectedUserEntries.value + val sorted = + selectedUserEntries.toSortedMap(compareBy { selectedUserEntries[it]?.lastActive ?: -1 }) + val timeSinceActive = timeSinceActiveForMostRecentMedia(sorted) + var smartspaceMaxAgeMillis = SMARTSPACE_MAX_AGE + data.cardAction?.extras?.let { + val smartspaceMaxAgeSeconds = it.getLong(RESUMABLE_MEDIA_MAX_AGE_SECONDS_KEY, 0) + if (smartspaceMaxAgeSeconds > 0) { + smartspaceMaxAgeMillis = TimeUnit.SECONDS.toMillis(smartspaceMaxAgeSeconds) + } + } + + // Check if smartspace has explicitly specified whether to re-activate resumable media. + // The default behavior is to trigger if the smartspace data is active. + val shouldTriggerResume = + data.cardAction?.extras?.getBoolean(EXTRA_KEY_TRIGGER_RESUME, true) ?: true + val shouldReactivate = + shouldTriggerResume && + !selectedUserEntries.any { it.value.active } && + selectedUserEntries.isNotEmpty() && + data.isActive + + if (timeSinceActive < smartspaceMaxAgeMillis) { + // It could happen there are existing active media resume cards, then we don't need to + // reactivate. + if (shouldReactivate) { + val lastActiveKey = sorted.lastKey() // most recently active + // Notify listeners to consider this media active + Log.d(TAG, "reactivating $lastActiveKey instead of smartspace") + mediaFilterRepository.setReactivatedKey(lastActiveKey) + val mediaData = sorted[lastActiveKey]!!.copy(active = true) + logger.logRecommendationActivated( + mediaData.appUid, + mediaData.packageName, + mediaData.instanceId + ) + listeners.forEach { + it.onMediaDataLoaded( + lastActiveKey, + lastActiveKey, + mediaData, + receivedSmartspaceCardLatency = + (systemClock.currentTimeMillis() - data.headphoneConnectionTimeMillis) + .toInt(), + isSsReactivated = true + ) + } + } + } else if (data.isActive) { + // Mark to prioritize Smartspace card if no recent media. + shouldPrioritizeMutable = true + } + + if (!data.isValid()) { + Log.d(TAG, "Invalid recommendation data. Skip showing the rec card") + return + } + val smartspaceMediaData = mediaFilterRepository.smartspaceMediaData.value + logger.logRecommendationAdded( + smartspaceMediaData.packageName, + smartspaceMediaData.instanceId + ) + listeners.forEach { it.onSmartspaceMediaDataLoaded(key, data, shouldPrioritizeMutable) } + } + + override fun onMediaDataRemoved(key: String) { + mediaFilterRepository.removeMediaEntry(key) + mediaFilterRepository.removeSelectedUserMediaEntry(key)?.let { + // Only notify listeners if something actually changed + listeners.forEach { it.onMediaDataRemoved(key) } + } + } + + override fun onSmartspaceMediaDataRemoved(key: String, immediately: Boolean) { + // First check if we had reactivated media instead of forwarding smartspace + mediaFilterRepository.reactivatedKey.value?.let { + val lastActiveKey = it + mediaFilterRepository.setReactivatedKey(null) + Log.d(TAG, "expiring reactivated key $lastActiveKey") + // Notify listeners to update with actual active value + mediaFilterRepository.selectedUserEntries.value[lastActiveKey]?.let { mediaData -> + listeners.forEach { listener -> + listener.onMediaDataLoaded(lastActiveKey, lastActiveKey, mediaData, immediately) + } + } + } + + val smartspaceMediaData = mediaFilterRepository.smartspaceMediaData.value + if (smartspaceMediaData.isActive) { + mediaFilterRepository.setRecommendation( + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId + ) + ) + } + listeners.forEach { it.onSmartspaceMediaDataRemoved(key, immediately) } + } + + @VisibleForTesting + internal fun handleProfileChanged() { + // TODO(b/317221348) re-add media removed when profile is available. + mediaFilterRepository.allUserEntries.value.forEach { (key, data) -> + if (!lockscreenUserManager.isProfileAvailable(data.userId)) { + // Only remove media when the profile is unavailable. + if (DEBUG) Log.d(TAG, "Removing $key after profile change") + mediaFilterRepository.removeSelectedUserMediaEntry(key, data) + listeners.forEach { listener -> listener.onMediaDataRemoved(key) } + } + } + } + + @VisibleForTesting + internal fun handleUserSwitched() { + // If the user changes, remove all current MediaData objects and inform listeners + val listenersCopy = listeners + val keyCopy = mediaFilterRepository.selectedUserEntries.value.keys.toMutableList() + // Clear the list first, to make sure callbacks from listeners if we have any entries + // are up to date + mediaFilterRepository.clearSelectedUserMedia() + keyCopy.forEach { + if (DEBUG) Log.d(TAG, "Removing $it after user change") + listenersCopy.forEach { listener -> listener.onMediaDataRemoved(it) } + } + + mediaFilterRepository.allUserEntries.value.forEach { (key, data) -> + if (lockscreenUserManager.isCurrentProfile(data.userId)) { + if (DEBUG) Log.d(TAG, "Re-adding $key after user change") + mediaFilterRepository.addSelectedUserMediaEntry(key, data) + listenersCopy.forEach { listener -> listener.onMediaDataLoaded(key, null, data) } + } + } + } + + /** Invoked when the user has dismissed the media carousel */ + fun onSwipeToDismiss() { + if (DEBUG) Log.d(TAG, "Media carousel swiped away") + val mediaKeys = mediaFilterRepository.selectedUserEntries.value.keys.toSet() + mediaKeys.forEach { + // Force updates to listeners, needed for re-activated card + mediaDataManager.setInactive(it, timedOut = true, forceUpdate = true) + } + val smartspaceMediaData = mediaFilterRepository.smartspaceMediaData.value + if (smartspaceMediaData.isActive) { + val dismissIntent = smartspaceMediaData.dismissIntent + if (dismissIntent == null) { + Log.w( + TAG, + "Cannot create dismiss action click action: extras missing dismiss_intent." + ) + } else if ( + dismissIntent.component?.className == EXPORTED_SMARTSPACE_TRAMPOLINE_ACTIVITY_NAME + ) { + // Dismiss the card Smartspace data through Smartspace trampoline activity. + context.startActivity(dismissIntent) + } else { + broadcastSender.sendBroadcast(dismissIntent) + } + + if (mediaFlags.isPersistentSsCardEnabled()) { + mediaFilterRepository.setRecommendation(smartspaceMediaData.copy(isActive = false)) + mediaDataManager.setRecommendationInactive(smartspaceMediaData.targetId) + } else { + mediaFilterRepository.setRecommendation( + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId, + ) + ) + mediaDataManager.dismissSmartspaceRecommendation( + smartspaceMediaData.targetId, + delay = 0L, + ) + } + } + } + + /** Add a listener for filtered [MediaData] changes */ + fun addListener(listener: MediaDataManager.Listener) = _listeners.add(listener) + + /** Remove a listener that was registered with addListener */ + fun removeListener(listener: MediaDataManager.Listener) = _listeners.remove(listener) + + /** + * Return the time since last active for the most-recent media. + * + * @param sortedEntries selectedUserEntries sorted from the earliest to the most-recent. + * @return The duration in milliseconds from the most-recent media's last active timestamp to + * the present. MAX_VALUE will be returned if there is no media. + */ + private fun timeSinceActiveForMostRecentMedia( + sortedEntries: SortedMap<String, MediaData> + ): Long { + if (sortedEntries.isEmpty()) { + return Long.MAX_VALUE + } + + val now = systemClock.elapsedRealtime() + val lastActiveKey = sortedEntries.lastKey() // most recently active + return sortedEntries[lastActiveKey]?.let { now - it.lastActive } ?: Long.MAX_VALUE + } + + companion object { + /** + * Maximum age of a media control to re-activate on smartspace signal. If there is no media + * control available within this time window, smartspace recommendations will be shown + * instead. + */ + @VisibleForTesting + internal val SMARTSPACE_MAX_AGE: Long + get() = + SystemProperties.getLong( + "debug.sysui.smartspace_max_age", + TimeUnit.MINUTES.toMillis(30) + ) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManager.kt index 865c49e1d817..2b1070cfeedf 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManager.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2024 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. @@ -16,554 +16,21 @@ package com.android.systemui.media.controls.domain.pipeline -import android.annotation.SuppressLint -import android.app.ActivityOptions -import android.app.BroadcastOptions -import android.app.Notification -import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME import android.app.PendingIntent -import android.app.StatusBarManager -import android.app.UriGrantsManager -import android.app.smartspace.SmartspaceAction -import android.app.smartspace.SmartspaceConfig -import android.app.smartspace.SmartspaceManager -import android.app.smartspace.SmartspaceSession -import android.app.smartspace.SmartspaceTarget -import android.content.BroadcastReceiver -import android.content.ContentProvider -import android.content.ContentResolver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.content.pm.ApplicationInfo -import android.content.pm.PackageManager -import android.graphics.Bitmap -import android.graphics.ImageDecoder -import android.graphics.drawable.Animatable -import android.graphics.drawable.Icon import android.media.MediaDescription -import android.media.MediaMetadata -import android.media.session.MediaController import android.media.session.MediaSession -import android.media.session.PlaybackState -import android.net.Uri -import android.os.Parcelable -import android.os.Process -import android.os.UserHandle -import android.provider.Settings import android.service.notification.StatusBarNotification -import android.support.v4.media.MediaMetadataCompat -import android.text.TextUtils -import android.util.Log -import android.util.Pair as APair -import androidx.media.utils.MediaConstants -import com.android.app.tracing.traceSection -import com.android.internal.annotations.Keep -import com.android.internal.logging.InstanceId -import com.android.keyguard.KeyguardUpdateMonitor -import com.android.systemui.Dumpable -import com.android.systemui.broadcast.BroadcastDispatcher -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.dump.DumpManager -import com.android.systemui.media.controls.domain.resume.MediaResumeListener -import com.android.systemui.media.controls.domain.resume.ResumeMediaBrowser -import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_SOURCE -import com.android.systemui.media.controls.shared.model.EXTRA_VALUE_TRIGGER_PERIODIC -import com.android.systemui.media.controls.shared.model.MediaAction -import com.android.systemui.media.controls.shared.model.MediaButton import com.android.systemui.media.controls.shared.model.MediaData -import com.android.systemui.media.controls.shared.model.MediaDeviceData import com.android.systemui.media.controls.shared.model.SmartspaceMediaData -import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider -import com.android.systemui.media.controls.ui.view.MediaViewHolder -import com.android.systemui.media.controls.util.MediaControllerFactory -import com.android.systemui.media.controls.util.MediaDataUtils -import com.android.systemui.media.controls.util.MediaFlags -import com.android.systemui.media.controls.util.MediaUiEventLogger -import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.plugins.BcSmartspaceDataPlugin -import com.android.systemui.res.R -import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState -import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState -import com.android.systemui.statusbar.notification.row.HybridGroupManager -import com.android.systemui.tuner.TunerService -import com.android.systemui.util.Assert -import com.android.systemui.util.Utils -import com.android.systemui.util.concurrency.DelayableExecutor -import com.android.systemui.util.concurrency.ThreadFactory -import com.android.systemui.util.time.SystemClock -import java.io.IOException -import java.io.PrintWriter -import java.util.concurrent.Executor -import javax.inject.Inject -// URI fields to try loading album art from -private val ART_URIS = - arrayOf( - MediaMetadata.METADATA_KEY_ALBUM_ART_URI, - MediaMetadata.METADATA_KEY_ART_URI, - MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI - ) - -private const val TAG = "MediaDataManager" -private const val DEBUG = true -private const val EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY = "dismiss_intent" - -private val LOADING = - MediaData( - userId = -1, - initialized = false, - app = null, - appIcon = null, - artist = null, - song = null, - artwork = null, - actions = emptyList(), - actionsToShowInCompact = emptyList(), - packageName = "INVALID", - token = null, - clickIntent = null, - device = null, - active = true, - resumeAction = null, - instanceId = InstanceId.fakeInstanceId(-1), - appUid = Process.INVALID_UID - ) - -internal val EMPTY_SMARTSPACE_MEDIA_DATA = - SmartspaceMediaData( - targetId = "INVALID", - isActive = false, - packageName = "INVALID", - cardAction = null, - recommendations = emptyList(), - dismissIntent = null, - headphoneConnectionTimeMillis = 0, - instanceId = InstanceId.fakeInstanceId(-1), - expiryTimeMs = 0, - ) - -const val MEDIA_TITLE_ERROR_MESSAGE = "Invalid media data: title is null or blank." - -fun isMediaNotification(sbn: StatusBarNotification): Boolean { - return sbn.notification.isMediaNotification() -} - -/** - * Allow recommendations from smartspace to show in media controls. Requires - * [Utils.useQsMediaPlayer] to be enabled. On by default, but can be disabled by setting to 0 - */ -private fun allowMediaRecommendations(context: Context): Boolean { - val flag = - Settings.Secure.getInt( - context.contentResolver, - Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, - 1 - ) - return Utils.useQsMediaPlayer(context) && flag > 0 -} - -/** A class that facilitates management and loading of Media Data, ready for binding. */ -@SysUISingleton -class MediaDataManager( - private val context: Context, - @Background private val backgroundExecutor: Executor, - @Main private val uiExecutor: Executor, - @Main private val foregroundExecutor: DelayableExecutor, - private val mediaControllerFactory: MediaControllerFactory, - private val broadcastDispatcher: BroadcastDispatcher, - dumpManager: DumpManager, - mediaTimeoutListener: MediaTimeoutListener, - mediaResumeListener: MediaResumeListener, - mediaSessionBasedFilter: MediaSessionBasedFilter, - mediaDeviceManager: MediaDeviceManager, - mediaDataCombineLatest: MediaDataCombineLatest, - private val mediaDataFilter: MediaDataFilter, - private val activityStarter: ActivityStarter, - private val smartspaceMediaDataProvider: SmartspaceMediaDataProvider, - private var useMediaResumption: Boolean, - private val useQsMediaPlayer: Boolean, - private val systemClock: SystemClock, - private val tunerService: TunerService, - private val mediaFlags: MediaFlags, - private val logger: MediaUiEventLogger, - private val smartspaceManager: SmartspaceManager?, - private val keyguardUpdateMonitor: KeyguardUpdateMonitor, -) : Dumpable, BcSmartspaceDataPlugin.SmartspaceTargetListener { - - companion object { - // UI surface label for subscribing Smartspace updates. - @JvmField val SMARTSPACE_UI_SURFACE_LABEL = "media_data_manager" - - // Smartspace package name's extra key. - @JvmField val EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name" - - // Maximum number of actions allowed in compact view - @JvmField val MAX_COMPACT_ACTIONS = 3 - - // Maximum number of actions allowed in expanded view - @JvmField val MAX_NOTIFICATION_ACTIONS = MediaViewHolder.genericButtonIds.size - } - - private val themeText = - com.android.settingslib.Utils.getColorAttr( - context, - com.android.internal.R.attr.textColorPrimary - ) - .defaultColor - - // Internal listeners are part of the internal pipeline. External listeners (those registered - // with [MediaDeviceManager.addListener]) receive events after they have propagated through - // the internal pipeline. - // Another way to think of the distinction between internal and external listeners is the - // following. Internal listeners are listeners that MediaDataManager depends on, and external - // listeners are listeners that depend on MediaDataManager. - // TODO(b/159539991#comment5): Move internal listeners to separate package. - private val internalListeners: MutableSet<Listener> = mutableSetOf() - private val mediaEntries: LinkedHashMap<String, MediaData> = LinkedHashMap() - // There should ONLY be at most one Smartspace media recommendation. - var smartspaceMediaData: SmartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA - @Keep private var smartspaceSession: SmartspaceSession? = null - private var allowMediaRecommendations = allowMediaRecommendations(context) - - private val artworkWidth = - context.resources.getDimensionPixelSize( - com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize - ) - private val artworkHeight = - context.resources.getDimensionPixelSize(R.dimen.qs_media_session_height_expanded) - - @SuppressLint("WrongConstant") // sysui allowed to call STATUS_BAR_SERVICE - private val statusBarManager = - context.getSystemService(Context.STATUS_BAR_SERVICE) as StatusBarManager - - /** Check whether this notification is an RCN */ - private fun isRemoteCastNotification(sbn: StatusBarNotification): Boolean { - return sbn.notification.extras.containsKey(Notification.EXTRA_MEDIA_REMOTE_DEVICE) - } - - @Inject - constructor( - context: Context, - threadFactory: ThreadFactory, - @Main uiExecutor: Executor, - @Main foregroundExecutor: DelayableExecutor, - mediaControllerFactory: MediaControllerFactory, - dumpManager: DumpManager, - broadcastDispatcher: BroadcastDispatcher, - mediaTimeoutListener: MediaTimeoutListener, - mediaResumeListener: MediaResumeListener, - mediaSessionBasedFilter: MediaSessionBasedFilter, - mediaDeviceManager: MediaDeviceManager, - mediaDataCombineLatest: MediaDataCombineLatest, - mediaDataFilter: MediaDataFilter, - activityStarter: ActivityStarter, - smartspaceMediaDataProvider: SmartspaceMediaDataProvider, - clock: SystemClock, - tunerService: TunerService, - mediaFlags: MediaFlags, - logger: MediaUiEventLogger, - smartspaceManager: SmartspaceManager?, - keyguardUpdateMonitor: KeyguardUpdateMonitor, - ) : this( - context, - // Loading bitmap for UMO background can take longer time, so it cannot run on the default - // background thread. Use a custom thread for media. - threadFactory.buildExecutorOnNewThread(TAG), - uiExecutor, - foregroundExecutor, - mediaControllerFactory, - broadcastDispatcher, - dumpManager, - mediaTimeoutListener, - mediaResumeListener, - mediaSessionBasedFilter, - mediaDeviceManager, - mediaDataCombineLatest, - mediaDataFilter, - activityStarter, - smartspaceMediaDataProvider, - Utils.useMediaResumption(context), - Utils.useQsMediaPlayer(context), - clock, - tunerService, - mediaFlags, - logger, - smartspaceManager, - keyguardUpdateMonitor, - ) - - private val appChangeReceiver = - object : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - when (intent.action) { - Intent.ACTION_PACKAGES_SUSPENDED -> { - val packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST) - packages?.forEach { removeAllForPackage(it) } - } - Intent.ACTION_PACKAGE_REMOVED, - Intent.ACTION_PACKAGE_RESTARTED -> { - intent.data?.encodedSchemeSpecificPart?.let { removeAllForPackage(it) } - } - } - } - } - - init { - dumpManager.registerDumpable(TAG, this) - - // Initialize the internal processing pipeline. The listeners at the front of the pipeline - // are set as internal listeners so that they receive events. From there, events are - // propagated through the pipeline. The end of the pipeline is currently mediaDataFilter, - // so it is responsible for dispatching events to external listeners. To achieve this, - // external listeners that are registered with [MediaDataManager.addListener] are actually - // registered as listeners to mediaDataFilter. - addInternalListener(mediaTimeoutListener) - addInternalListener(mediaResumeListener) - addInternalListener(mediaSessionBasedFilter) - mediaSessionBasedFilter.addListener(mediaDeviceManager) - mediaSessionBasedFilter.addListener(mediaDataCombineLatest) - mediaDeviceManager.addListener(mediaDataCombineLatest) - mediaDataCombineLatest.addListener(mediaDataFilter) - - // Set up links back into the pipeline for listeners that need to send events upstream. - mediaTimeoutListener.timeoutCallback = { key: String, timedOut: Boolean -> - setTimedOut(key, timedOut) - } - mediaTimeoutListener.stateCallback = { key: String, state: PlaybackState -> - updateState(key, state) - } - mediaTimeoutListener.sessionCallback = { key: String -> onSessionDestroyed(key) } - mediaResumeListener.setManager(this) - mediaDataFilter.mediaDataManager = this - - val suspendFilter = IntentFilter(Intent.ACTION_PACKAGES_SUSPENDED) - broadcastDispatcher.registerReceiver(appChangeReceiver, suspendFilter, null, UserHandle.ALL) - - val uninstallFilter = - IntentFilter().apply { - addAction(Intent.ACTION_PACKAGE_REMOVED) - addAction(Intent.ACTION_PACKAGE_RESTARTED) - addDataScheme("package") - } - // BroadcastDispatcher does not allow filters with data schemes - context.registerReceiver(appChangeReceiver, uninstallFilter) - - // Register for Smartspace data updates. - smartspaceMediaDataProvider.registerListener(this) - smartspaceSession = - smartspaceManager?.createSmartspaceSession( - SmartspaceConfig.Builder(context, SMARTSPACE_UI_SURFACE_LABEL).build() - ) - smartspaceSession?.let { - it.addOnTargetsAvailableListener( - // Use a main uiExecutor thread listening to Smartspace updates instead of using - // the existing background executor. - // SmartspaceSession has scheduled routine updates which can be unpredictable on - // test simulators, using the backgroundExecutor makes it's hard to test the threads - // numbers. - uiExecutor, - SmartspaceSession.OnTargetsAvailableListener { targets -> - smartspaceMediaDataProvider.onTargetsAvailable(targets) - } - ) - } - smartspaceSession?.let { it.requestSmartspaceUpdate() } - tunerService.addTunable( - object : TunerService.Tunable { - override fun onTuningChanged(key: String?, newValue: String?) { - allowMediaRecommendations = allowMediaRecommendations(context) - if (!allowMediaRecommendations) { - dismissSmartspaceRecommendation( - key = smartspaceMediaData.targetId, - delay = 0L - ) - } - } - }, - Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION - ) - } - - fun destroy() { - smartspaceMediaDataProvider.unregisterListener(this) - smartspaceSession?.close() - smartspaceSession = null - context.unregisterReceiver(appChangeReceiver) - } - - fun onNotificationAdded(key: String, sbn: StatusBarNotification) { - if (useQsMediaPlayer && isMediaNotification(sbn)) { - var isNewlyActiveEntry = false - Assert.isMainThread() - val oldKey = findExistingEntry(key, sbn.packageName) - if (oldKey == null) { - val instanceId = logger.getNewInstanceId() - val temp = - LOADING.copy( - packageName = sbn.packageName, - instanceId = instanceId, - createdTimestampMillis = systemClock.currentTimeMillis(), - ) - mediaEntries.put(key, temp) - isNewlyActiveEntry = true - } else if (oldKey != key) { - // Resume -> active conversion; move to new key - val oldData = mediaEntries.remove(oldKey)!! - isNewlyActiveEntry = true - mediaEntries.put(key, oldData) - } - loadMediaData(key, sbn, oldKey, isNewlyActiveEntry) - } else { - onNotificationRemoved(key) - } - } - - private fun removeAllForPackage(packageName: String) { - Assert.isMainThread() - val toRemove = mediaEntries.filter { it.value.packageName == packageName } - toRemove.forEach { removeEntry(it.key) } - } - - fun setResumeAction(key: String, action: Runnable?) { - mediaEntries.get(key)?.let { - it.resumeAction = action - it.hasCheckedForResume = true - } - } - - fun addResumptionControls( - userId: Int, - desc: MediaDescription, - action: Runnable, - token: MediaSession.Token, - appName: String, - appIntent: PendingIntent, - packageName: String - ) { - // Resume controls don't have a notification key, so store by package name instead - if (!mediaEntries.containsKey(packageName)) { - val instanceId = logger.getNewInstanceId() - val appUid = - try { - context.packageManager.getApplicationInfo(packageName, 0)?.uid!! - } catch (e: PackageManager.NameNotFoundException) { - Log.w(TAG, "Could not get app UID for $packageName", e) - Process.INVALID_UID - } - - val resumeData = - LOADING.copy( - packageName = packageName, - resumeAction = action, - hasCheckedForResume = true, - instanceId = instanceId, - appUid = appUid, - createdTimestampMillis = systemClock.currentTimeMillis(), - ) - mediaEntries.put(packageName, resumeData) - logSingleVsMultipleMediaAdded(appUid, packageName, instanceId) - logger.logResumeMediaAdded(appUid, packageName, instanceId) - } - backgroundExecutor.execute { - loadMediaDataInBgForResumption( - userId, - desc, - action, - token, - appName, - appIntent, - packageName - ) - } - } - - /** - * Check if there is an existing entry that matches the key or package name. Returns the key - * that matches, or null if not found. - */ - private fun findExistingEntry(key: String, packageName: String): String? { - if (mediaEntries.containsKey(key)) { - return key - } - // Check if we already had a resume player - if (mediaEntries.containsKey(packageName)) { - return packageName - } - return null - } - - private fun loadMediaData( - key: String, - sbn: StatusBarNotification, - oldKey: String?, - isNewlyActiveEntry: Boolean = false, - ) { - backgroundExecutor.execute { loadMediaDataInBg(key, sbn, oldKey, isNewlyActiveEntry) } - } +/** Facilitates management and loading of Media Data, ready for binding. */ +interface MediaDataManager { /** Add a listener for changes in this class */ - fun addListener(listener: Listener) { - // mediaDataFilter is the current end of the internal pipeline. Register external - // listeners as listeners to it. - mediaDataFilter.addListener(listener) - } + fun addListener(listener: Listener) /** Remove a listener for changes in this class */ - fun removeListener(listener: Listener) { - // Since mediaDataFilter is the current end of the internal pipelie, external listeners - // have been registered to it. So, they need to be removed from it too. - mediaDataFilter.removeListener(listener) - } - - /** Add a listener for internal events. */ - private fun addInternalListener(listener: Listener) = internalListeners.add(listener) - - /** - * Notify internal listeners of media loaded event. - * - * External listeners registered with [addListener] will be notified after the event propagates - * through the internal listener pipeline. - */ - private fun notifyMediaDataLoaded(key: String, oldKey: String?, info: MediaData) { - internalListeners.forEach { it.onMediaDataLoaded(key, oldKey, info) } - } - - /** - * Notify internal listeners of Smartspace media loaded event. - * - * External listeners registered with [addListener] will be notified after the event propagates - * through the internal listener pipeline. - */ - private fun notifySmartspaceMediaDataLoaded(key: String, info: SmartspaceMediaData) { - internalListeners.forEach { it.onSmartspaceMediaDataLoaded(key, info) } - } - - /** - * Notify internal listeners of media removed event. - * - * External listeners registered with [addListener] will be notified after the event propagates - * through the internal listener pipeline. - */ - private fun notifyMediaDataRemoved(key: String) { - internalListeners.forEach { it.onMediaDataRemoved(key) } - } - - /** - * Notify internal listeners of Smartspace media removed event. - * - * External listeners registered with [addListener] will be notified after the event propagates - * through the internal listener pipeline. - * - * @param immediately indicates should apply the UI changes immediately, otherwise wait until - * the next refresh-round before UI becomes visible. Should only be true if the update is - * initiated by user's interaction. - */ - private fun notifySmartspaceMediaDataRemoved(key: String, immediately: Boolean) { - internalListeners.forEach { it.onSmartspaceMediaDataRemoved(key, immediately) } - } + fun removeListener(listener: Listener) /** * Called whenever the player has been paused or stopped for a while, or swiped from QQS. This @@ -571,1055 +38,64 @@ class MediaDataManager( * * @see MediaData.active */ - internal fun setTimedOut(key: String, timedOut: Boolean, forceUpdate: Boolean = false) { - mediaEntries[key]?.let { - if (timedOut && !forceUpdate) { - // Only log this event when media expires on its own - logger.logMediaTimeout(it.appUid, it.packageName, it.instanceId) - } - if (it.active == !timedOut && !forceUpdate) { - if (it.resumption) { - if (DEBUG) Log.d(TAG, "timing out resume player $key") - dismissMediaData(key, 0L /* delay */) - } - return - } - // Update last active if media was still active. - if (it.active) { - it.lastActive = systemClock.elapsedRealtime() - } - it.active = !timedOut - if (DEBUG) Log.d(TAG, "Updating $key timedOut: $timedOut") - onMediaDataLoaded(key, key, it) - } + fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean = false) - if (key == smartspaceMediaData.targetId) { - if (DEBUG) Log.d(TAG, "smartspace card expired") - dismissSmartspaceRecommendation(key, delay = 0L) - } - } - - /** Called when the player's [PlaybackState] has been updated with new actions and/or state */ - private fun updateState(key: String, state: PlaybackState) { - mediaEntries.get(key)?.let { - val token = it.token - if (token == null) { - if (DEBUG) Log.d(TAG, "State updated, but token was null") - return - } - val actions = - createActionsFromState( - it.packageName, - mediaControllerFactory.create(it.token), - UserHandle(it.userId) - ) + /** Invoked when media notification is added. */ + fun onNotificationAdded(key: String, sbn: StatusBarNotification) - // Control buttons - // If flag is enabled and controller has a PlaybackState, - // create actions from session info - // otherwise, no need to update semantic actions. - val data = - if (actions != null) { - it.copy(semanticActions = actions, isPlaying = isPlayingState(state.state)) - } else { - it.copy(isPlaying = isPlayingState(state.state)) - } - if (DEBUG) Log.d(TAG, "State updated outside of notification") - onMediaDataLoaded(key, key, data) - } - } + fun destroy() - private fun removeEntry(key: String, logEvent: Boolean = true) { - mediaEntries.remove(key)?.let { - if (logEvent) { - logger.logMediaRemoved(it.appUid, it.packageName, it.instanceId) - } - } - notifyMediaDataRemoved(key) - } + /** Sets resume action. */ + fun setResumeAction(key: String, action: Runnable?) - /** Dismiss a media entry. Returns false if the key was not found. */ - fun dismissMediaData(key: String, delay: Long): Boolean { - val existed = mediaEntries[key] != null - backgroundExecutor.execute { - mediaEntries[key]?.let { mediaData -> - if (mediaData.isLocalSession()) { - mediaData.token?.let { - val mediaController = mediaControllerFactory.create(it) - mediaController.transportControls.stop() - } - } - } - } - foregroundExecutor.executeDelayed({ removeEntry(key) }, delay) - return existed - } - - /** - * Called whenever the recommendation has been expired or removed by the user. This will remove - * the recommendation card entirely from the carousel. - */ - fun dismissSmartspaceRecommendation(key: String, delay: Long) { - if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { - // If this doesn't match, or we've already invalidated the data, no action needed - return - } - - if (DEBUG) Log.d(TAG, "Dismissing Smartspace media target") - if (smartspaceMediaData.isActive) { - smartspaceMediaData = - EMPTY_SMARTSPACE_MEDIA_DATA.copy( - targetId = smartspaceMediaData.targetId, - instanceId = smartspaceMediaData.instanceId - ) - } - foregroundExecutor.executeDelayed( - { notifySmartspaceMediaDataRemoved(smartspaceMediaData.targetId, immediately = true) }, - delay - ) - } - - /** Called when the recommendation card should no longer be visible in QQS or lockscreen */ - fun setRecommendationInactive(key: String) { - if (!mediaFlags.isPersistentSsCardEnabled()) { - Log.e(TAG, "Only persistent recommendation can be inactive!") - return - } - if (DEBUG) Log.d(TAG, "Setting smartspace recommendation inactive") - - if (smartspaceMediaData.targetId != key || !smartspaceMediaData.isValid()) { - // If this doesn't match, or we've already invalidated the data, no action needed - return - } - - smartspaceMediaData = smartspaceMediaData.copy(isActive = false) - notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) - } - - private fun loadMediaDataInBgForResumption( + /** Adds resume media data. */ + fun addResumptionControls( userId: Int, desc: MediaDescription, - resumeAction: Runnable, + action: Runnable, token: MediaSession.Token, appName: String, appIntent: PendingIntent, packageName: String - ) { - if (desc.title.isNullOrBlank()) { - Log.e(TAG, "Description incomplete") - // Delete the placeholder entry - mediaEntries.remove(packageName) - return - } - - if (DEBUG) { - Log.d(TAG, "adding track for $userId from browser: $desc") - } - - val currentEntry = mediaEntries.get(packageName) - val appUid = currentEntry?.appUid ?: Process.INVALID_UID - - // Album art - var artworkBitmap = desc.iconBitmap - if (artworkBitmap == null && desc.iconUri != null) { - artworkBitmap = loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName) - } - val artworkIcon = - if (artworkBitmap != null) { - Icon.createWithBitmap(artworkBitmap) - } else { - null - } - - val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() - val isExplicit = - desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == - MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT - - val progress = - if (mediaFlags.isResumeProgressEnabled()) { - MediaDataUtils.getDescriptionProgress(desc.extras) - } else null - - val mediaAction = getResumeMediaAction(resumeAction) - val lastActive = systemClock.elapsedRealtime() - val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L - foregroundExecutor.execute { - onMediaDataLoaded( - packageName, - null, - MediaData( - userId, - true, - appName, - null, - desc.subtitle, - desc.title, - artworkIcon, - listOf(mediaAction), - listOf(0), - MediaButton(playOrPause = mediaAction), - packageName, - token, - appIntent, - device = null, - active = false, - resumeAction = resumeAction, - resumption = true, - notificationKey = packageName, - hasCheckedForResume = true, - lastActive = lastActive, - createdTimestampMillis = createdTimestampMillis, - instanceId = instanceId, - appUid = appUid, - isExplicit = isExplicit, - resumeProgress = progress, - ) - ) - } - } - - fun loadMediaDataInBg( - key: String, - sbn: StatusBarNotification, - oldKey: String?, - isNewlyActiveEntry: Boolean = false, - ) { - val token = - sbn.notification.extras.getParcelable( - Notification.EXTRA_MEDIA_SESSION, - MediaSession.Token::class.java - ) - if (token == null) { - return - } - val mediaController = mediaControllerFactory.create(token) - val metadata = mediaController.metadata - val notif: Notification = sbn.notification - - val appInfo = - notif.extras.getParcelable( - Notification.EXTRA_BUILDER_APPLICATION_INFO, - ApplicationInfo::class.java - ) - ?: getAppInfoFromPackage(sbn.packageName) - - // App name - val appName = getAppName(sbn, appInfo) - - // Song name - var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) - if (song.isNullOrBlank()) { - song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) - } - if (song.isNullOrBlank()) { - song = HybridGroupManager.resolveTitle(notif) - } - if (song.isNullOrBlank()) { - // For apps that don't include a title, log and add a placeholder - song = context.getString(R.string.controls_media_empty_title, appName) - try { - statusBarManager.logBlankMediaTitle(sbn.packageName, sbn.user.identifier) - } catch (e: RuntimeException) { - Log.e(TAG, "Error reporting blank media title for package ${sbn.packageName}") - } - } - - // Album art - var artworkBitmap = metadata?.let { loadBitmapFromUri(it) } - if (artworkBitmap == null) { - artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) - } - if (artworkBitmap == null) { - artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) - } - val artWorkIcon = - if (artworkBitmap == null) { - notif.getLargeIcon() - } else { - Icon.createWithBitmap(artworkBitmap) - } - - // App Icon - val smallIcon = sbn.notification.smallIcon - - // Explicit Indicator - var isExplicit = false - val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata) - isExplicit = - mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == - MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT - - // Artist name - var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) - if (artist.isNullOrBlank()) { - artist = HybridGroupManager.resolveText(notif) - } - - // Device name (used for remote cast notifications) - var device: MediaDeviceData? = null - if (isRemoteCastNotification(sbn)) { - val extras = sbn.notification.extras - val deviceName = extras.getCharSequence(Notification.EXTRA_MEDIA_REMOTE_DEVICE, null) - val deviceIcon = extras.getInt(Notification.EXTRA_MEDIA_REMOTE_ICON, -1) - val deviceIntent = - extras.getParcelable( - Notification.EXTRA_MEDIA_REMOTE_INTENT, - PendingIntent::class.java - ) - Log.d(TAG, "$key is RCN for $deviceName") - - if (deviceName != null && deviceIcon > -1) { - // Name and icon must be present, but intent may be null - val enabled = deviceIntent != null && deviceIntent.isActivity - val deviceDrawable = - Icon.createWithResource(sbn.packageName, deviceIcon) - .loadDrawable(sbn.getPackageContext(context)) - device = - MediaDeviceData( - enabled, - deviceDrawable, - deviceName, - deviceIntent, - showBroadcastButton = false - ) - } - } - - // Control buttons - // If flag is enabled and controller has a PlaybackState, create actions from session info - // Otherwise, use the notification actions - var actionIcons: List<MediaAction> = emptyList() - var actionsToShowCollapsed: List<Int> = emptyList() - val semanticActions = createActionsFromState(sbn.packageName, mediaController, sbn.user) - if (semanticActions == null) { - val actions = createActionsFromNotification(sbn) - actionIcons = actions.first - actionsToShowCollapsed = actions.second - } - - val playbackLocation = - if (isRemoteCastNotification(sbn)) MediaData.PLAYBACK_CAST_REMOTE - else if ( - mediaController.playbackInfo?.playbackType == - MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL - ) - MediaData.PLAYBACK_LOCAL - else MediaData.PLAYBACK_CAST_LOCAL - val isPlaying = mediaController.playbackState?.let { isPlayingState(it.state) } ?: null - - val currentEntry = mediaEntries.get(key) - val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() - val appUid = appInfo?.uid ?: Process.INVALID_UID - - if (isNewlyActiveEntry) { - logSingleVsMultipleMediaAdded(appUid, sbn.packageName, instanceId) - logger.logActiveMediaAdded(appUid, sbn.packageName, instanceId, playbackLocation) - } else if (playbackLocation != currentEntry?.playbackLocation) { - logger.logPlaybackLocationChange(appUid, sbn.packageName, instanceId, playbackLocation) - } - - val lastActive = systemClock.elapsedRealtime() - val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L - foregroundExecutor.execute { - val resumeAction: Runnable? = mediaEntries[key]?.resumeAction - val hasCheckedForResume = mediaEntries[key]?.hasCheckedForResume == true - val active = mediaEntries[key]?.active ?: true - onMediaDataLoaded( - key, - oldKey, - MediaData( - sbn.normalizedUserId, - true, - appName, - smallIcon, - artist, - song, - artWorkIcon, - actionIcons, - actionsToShowCollapsed, - semanticActions, - sbn.packageName, - token, - notif.contentIntent, - device, - active, - resumeAction = resumeAction, - playbackLocation = playbackLocation, - notificationKey = key, - hasCheckedForResume = hasCheckedForResume, - isPlaying = isPlaying, - isClearable = !sbn.isOngoing, - lastActive = lastActive, - createdTimestampMillis = createdTimestampMillis, - instanceId = instanceId, - appUid = appUid, - isExplicit = isExplicit, - ) - ) - } - } - - private fun logSingleVsMultipleMediaAdded( - appUid: Int, - packageName: String, - instanceId: InstanceId - ) { - if (mediaEntries.size == 1) { - logger.logSingleMediaPlayerInCarousel(appUid, packageName, instanceId) - } else if (mediaEntries.size == 2) { - // Since this method is only called when there is a new media session added. - // logging needed once there is more than one media session in carousel. - logger.logMultipleMediaPlayersInCarousel(appUid, packageName, instanceId) - } - } - - private fun getAppInfoFromPackage(packageName: String): ApplicationInfo? { - try { - return context.packageManager.getApplicationInfo(packageName, 0) - } catch (e: PackageManager.NameNotFoundException) { - Log.w(TAG, "Could not get app info for $packageName", e) - } - return null - } - - private fun getAppName(sbn: StatusBarNotification, appInfo: ApplicationInfo?): String { - val name = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME) - if (name != null) { - return name - } - - return if (appInfo != null) { - context.packageManager.getApplicationLabel(appInfo).toString() - } else { - sbn.packageName - } - } - - /** Generate action buttons based on notification actions */ - private fun createActionsFromNotification( - sbn: StatusBarNotification - ): Pair<List<MediaAction>, List<Int>> { - val notif = sbn.notification - val actionIcons: MutableList<MediaAction> = ArrayList() - val actions = notif.actions - var actionsToShowCollapsed = - notif.extras.getIntArray(Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() - ?: mutableListOf() - if (actionsToShowCollapsed.size > MAX_COMPACT_ACTIONS) { - Log.e( - TAG, - "Too many compact actions for ${sbn.key}," + - "limiting to first $MAX_COMPACT_ACTIONS" - ) - actionsToShowCollapsed = actionsToShowCollapsed.subList(0, MAX_COMPACT_ACTIONS) - } - - if (actions != null) { - for ((index, action) in actions.withIndex()) { - if (index == MAX_NOTIFICATION_ACTIONS) { - Log.w( - TAG, - "Too many notification actions for ${sbn.key}," + - " limiting to first $MAX_NOTIFICATION_ACTIONS" - ) - break - } - if (action.getIcon() == null) { - if (DEBUG) Log.i(TAG, "No icon for action $index ${action.title}") - actionsToShowCollapsed.remove(index) - continue - } - val runnable = - if (action.actionIntent != null) { - Runnable { - if (action.actionIntent.isActivity) { - activityStarter.startPendingIntentDismissingKeyguard( - action.actionIntent - ) - } else if (action.isAuthenticationRequired()) { - activityStarter.dismissKeyguardThenExecute( - { - var result = sendPendingIntent(action.actionIntent) - result - }, - {}, - true - ) - } else { - sendPendingIntent(action.actionIntent) - } - } - } else { - null - } - val mediaActionIcon = - if (action.getIcon()?.getType() == Icon.TYPE_RESOURCE) { - Icon.createWithResource(sbn.packageName, action.getIcon()!!.getResId()) - } else { - action.getIcon() - } - .setTint(themeText) - .loadDrawable(context) - val mediaAction = MediaAction(mediaActionIcon, runnable, action.title, null) - actionIcons.add(mediaAction) - } - } - return Pair(actionIcons, actionsToShowCollapsed) - } - - /** - * Generates action button info for this media session based on the PlaybackState - * - * @param packageName Package name for the media app - * @param controller MediaController for the current session - * @return a Pair consisting of a list of media actions, and a list of ints representing which - * - * ``` - * of those actions should be shown in the compact player - * ``` - */ - private fun createActionsFromState( - packageName: String, - controller: MediaController, - user: UserHandle - ): MediaButton? { - val state = controller.playbackState - if (state == null || !mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { - return null - } - - // First, check for standard actions - val playOrPause = - if (isConnectingState(state.state)) { - // Spinner needs to be animating to render anything. Start it here. - val drawable = - context.getDrawable(com.android.internal.R.drawable.progress_small_material) - (drawable as Animatable).start() - MediaAction( - drawable, - null, // no action to perform when clicked - context.getString(R.string.controls_media_button_connecting), - context.getDrawable(R.drawable.ic_media_connecting_container), - // Specify a rebind id to prevent the spinner from restarting on later binds. - com.android.internal.R.drawable.progress_small_material - ) - } else if (isPlayingState(state.state)) { - getStandardAction(controller, state.actions, PlaybackState.ACTION_PAUSE) - } else { - getStandardAction(controller, state.actions, PlaybackState.ACTION_PLAY) - } - val prevButton = - getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_PREVIOUS) - val nextButton = - getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_NEXT) - - // Then, create a way to build any custom actions that will be needed - val customActions = - state.customActions - .asSequence() - .filterNotNull() - .map { getCustomAction(state, packageName, controller, it) } - .iterator() - fun nextCustomAction() = if (customActions.hasNext()) customActions.next() else null - - // Finally, assign the remaining button slots: play/pause A B C D - // A = previous, else custom action (if not reserved) - // B = next, else custom action (if not reserved) - // C and D are always custom actions - val reservePrev = - controller.extras?.getBoolean( - MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV - ) == true - val reserveNext = - controller.extras?.getBoolean( - MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT - ) == true - - val prevOrCustom = - if (prevButton != null) { - prevButton - } else if (!reservePrev) { - nextCustomAction() - } else { - null - } - - val nextOrCustom = - if (nextButton != null) { - nextButton - } else if (!reserveNext) { - nextCustomAction() - } else { - null - } - - return MediaButton( - playOrPause, - nextOrCustom, - prevOrCustom, - nextCustomAction(), - nextCustomAction(), - reserveNext, - reservePrev - ) - } - - /** - * Create a [MediaAction] for a given action and media session - * - * @param controller MediaController for the session - * @param stateActions The actions included with the session's [PlaybackState] - * @param action A [PlaybackState.Actions] value representing what action to generate. One of: - * ``` - * [PlaybackState.ACTION_PLAY] - * [PlaybackState.ACTION_PAUSE] - * [PlaybackState.ACTION_SKIP_TO_PREVIOUS] - * [PlaybackState.ACTION_SKIP_TO_NEXT] - * @return - * ``` - * - * A [MediaAction] with correct values set, or null if the state doesn't support it - */ - private fun getStandardAction( - controller: MediaController, - stateActions: Long, - @PlaybackState.Actions action: Long - ): MediaAction? { - if (!includesAction(stateActions, action)) { - return null - } - - return when (action) { - PlaybackState.ACTION_PLAY -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_play), - { controller.transportControls.play() }, - context.getString(R.string.controls_media_button_play), - context.getDrawable(R.drawable.ic_media_play_container) - ) - } - PlaybackState.ACTION_PAUSE -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_pause), - { controller.transportControls.pause() }, - context.getString(R.string.controls_media_button_pause), - context.getDrawable(R.drawable.ic_media_pause_container) - ) - } - PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_prev), - { controller.transportControls.skipToPrevious() }, - context.getString(R.string.controls_media_button_prev), - null - ) - } - PlaybackState.ACTION_SKIP_TO_NEXT -> { - MediaAction( - context.getDrawable(R.drawable.ic_media_next), - { controller.transportControls.skipToNext() }, - context.getString(R.string.controls_media_button_next), - null - ) - } - else -> null - } - } - - /** Check whether the actions from a [PlaybackState] include a specific action */ - private fun includesAction(stateActions: Long, @PlaybackState.Actions action: Long): Boolean { - if ( - (action == PlaybackState.ACTION_PLAY || action == PlaybackState.ACTION_PAUSE) && - (stateActions and PlaybackState.ACTION_PLAY_PAUSE > 0L) - ) { - return true - } - return (stateActions and action != 0L) - } - - /** Get a [MediaAction] representing a [PlaybackState.CustomAction] */ - private fun getCustomAction( - state: PlaybackState, - packageName: String, - controller: MediaController, - customAction: PlaybackState.CustomAction - ): MediaAction { - return MediaAction( - Icon.createWithResource(packageName, customAction.icon).loadDrawable(context), - { controller.transportControls.sendCustomAction(customAction, customAction.extras) }, - customAction.name, - null - ) - } - - /** Load a bitmap from the various Art metadata URIs */ - private fun loadBitmapFromUri(metadata: MediaMetadata): Bitmap? { - for (uri in ART_URIS) { - val uriString = metadata.getString(uri) - if (!TextUtils.isEmpty(uriString)) { - val albumArt = loadBitmapFromUri(Uri.parse(uriString)) - if (albumArt != null) { - if (DEBUG) Log.d(TAG, "loaded art from $uri") - return albumArt - } - } - } - return null - } - - private fun sendPendingIntent(intent: PendingIntent): Boolean { - return try { - val options = BroadcastOptions.makeBasic() - options.setInteractive(true) - options.setPendingIntentBackgroundActivityStartMode( - ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED - ) - intent.send(options.toBundle()) - true - } catch (e: PendingIntent.CanceledException) { - Log.d(TAG, "Intent canceled", e) - false - } - } - - /** Returns a bitmap if the user can access the given URI, else null */ - private fun loadBitmapFromUriForUser( - uri: Uri, - userId: Int, - appUid: Int, - packageName: String, - ): Bitmap? { - try { - val ugm = UriGrantsManager.getService() - ugm.checkGrantUriPermission_ignoreNonSystem( - appUid, - packageName, - ContentProvider.getUriWithoutUserId(uri), - Intent.FLAG_GRANT_READ_URI_PERMISSION, - ContentProvider.getUserIdFromUri(uri, userId) - ) - return loadBitmapFromUri(uri) - } catch (e: SecurityException) { - Log.e(TAG, "Failed to get URI permission: $e") - } - return null - } - - /** - * Load a bitmap from a URI - * - * @param uri the uri to load - * @return bitmap, or null if couldn't be loaded - */ - private fun loadBitmapFromUri(uri: Uri): Bitmap? { - // ImageDecoder requires a scheme of the following types - if (uri.scheme == null) { - return null - } - - if ( - !uri.scheme.equals(ContentResolver.SCHEME_CONTENT) && - !uri.scheme.equals(ContentResolver.SCHEME_ANDROID_RESOURCE) && - !uri.scheme.equals(ContentResolver.SCHEME_FILE) - ) { - return null - } - - val source = ImageDecoder.createSource(context.contentResolver, uri) - return try { - ImageDecoder.decodeBitmap(source) { decoder, info, _ -> - val width = info.size.width - val height = info.size.height - val scale = - MediaDataUtils.getScaleFactor( - APair(width, height), - APair(artworkWidth, artworkHeight) - ) - - // Downscale if needed - if (scale != 0f && scale < 1) { - decoder.setTargetSize((scale * width).toInt(), (scale * height).toInt()) - } - decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE - } - } catch (e: IOException) { - Log.e(TAG, "Unable to load bitmap", e) - null - } catch (e: RuntimeException) { - Log.e(TAG, "Unable to load bitmap", e) - null - } - } - - private fun getResumeMediaAction(action: Runnable): MediaAction { - return MediaAction( - Icon.createWithResource(context, R.drawable.ic_media_play) - .setTint(themeText) - .loadDrawable(context), - action, - context.getString(R.string.controls_media_resume), - context.getDrawable(R.drawable.ic_media_play_container) - ) - } - - fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) = - traceSection("MediaDataManager#onMediaDataLoaded") { - Assert.isMainThread() - if (mediaEntries.containsKey(key)) { - // Otherwise this was removed already - mediaEntries.put(key, data) - notifyMediaDataLoaded(key, oldKey, data) - } - } - - override fun onSmartspaceTargetsUpdated(targets: List<Parcelable>) { - if (!allowMediaRecommendations) { - if (DEBUG) Log.d(TAG, "Smartspace recommendation is disabled in Settings.") - return - } - - val mediaTargets = targets.filterIsInstance<SmartspaceTarget>() - when (mediaTargets.size) { - 0 -> { - if (!smartspaceMediaData.isActive) { - return - } - if (DEBUG) { - Log.d(TAG, "Set Smartspace media to be inactive for the data update") - } - if (mediaFlags.isPersistentSsCardEnabled()) { - // Smartspace uses this signal to hide the card (e.g. when it expires or user - // disconnects headphones), so treat as setting inactive when flag is on - smartspaceMediaData = smartspaceMediaData.copy(isActive = false) - notifySmartspaceMediaDataLoaded( - smartspaceMediaData.targetId, - smartspaceMediaData, - ) - } else { - smartspaceMediaData = - EMPTY_SMARTSPACE_MEDIA_DATA.copy( - targetId = smartspaceMediaData.targetId, - instanceId = smartspaceMediaData.instanceId, - ) - notifySmartspaceMediaDataRemoved( - smartspaceMediaData.targetId, - immediately = false, - ) - } - } - 1 -> { - val newMediaTarget = mediaTargets.get(0) - if (smartspaceMediaData.targetId == newMediaTarget.smartspaceTargetId) { - // The same Smartspace updates can be received. Skip the duplicate updates. - return - } - if (DEBUG) Log.d(TAG, "Forwarding Smartspace media update.") - smartspaceMediaData = toSmartspaceMediaData(newMediaTarget) - notifySmartspaceMediaDataLoaded(smartspaceMediaData.targetId, smartspaceMediaData) - } - else -> { - // There should NOT be more than 1 Smartspace media update. When it happens, it - // indicates a bad state or an error. Reset the status accordingly. - Log.wtf(TAG, "More than 1 Smartspace Media Update. Resetting the status...") - notifySmartspaceMediaDataRemoved( - smartspaceMediaData.targetId, - immediately = false, - ) - smartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA - } - } - } - - fun onNotificationRemoved(key: String) { - Assert.isMainThread() - val removed = mediaEntries.remove(key) ?: return - if (keyguardUpdateMonitor.isUserInLockdown(removed.userId)) { - logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) - } else if (isAbleToResume(removed)) { - convertToResumePlayer(key, removed) - } else if (mediaFlags.isRetainingPlayersEnabled()) { - handlePossibleRemoval(key, removed, notificationRemoved = true) - } else { - notifyMediaDataRemoved(key) - logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) - } - } - - private fun onSessionDestroyed(key: String) { - if (DEBUG) Log.d(TAG, "session destroyed for $key") - val entry = mediaEntries.remove(key) ?: return - // Clear token since the session is no longer valid - val updated = entry.copy(token = null) - handlePossibleRemoval(key, updated) - } + ) - private fun isAbleToResume(data: MediaData): Boolean { - val isEligibleForResume = - data.isLocalSession() || - (mediaFlags.isRemoteResumeAllowed() && - data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE) - return useMediaResumption && data.resumeAction != null && isEligibleForResume - } + /** Dismiss a media entry. Returns false if the key was not found. */ + fun dismissMediaData(key: String, delay: Long): Boolean /** - * Convert to resume state if the player is no longer valid and active, then notify listeners - * that the data was updated. Does not convert to resume state if the player is still valid, or - * if it was removed before becoming inactive. (Assumes that [removed] was removed from - * [mediaEntries] before this function was called) + * Called whenever the recommendation has been expired or removed by the user. This will remove + * the recommendation card entirely from the carousel. */ - private fun handlePossibleRemoval( - key: String, - removed: MediaData, - notificationRemoved: Boolean = false - ) { - val hasSession = removed.token != null - if (hasSession && removed.semanticActions != null) { - // The app was using session actions, and the session is still valid: keep player - if (DEBUG) Log.d(TAG, "Notification removed but using session actions $key") - mediaEntries.put(key, removed) - notifyMediaDataLoaded(key, key, removed) - } else if (!notificationRemoved && removed.semanticActions == null) { - // The app was using notification actions, and notif wasn't removed yet: keep player - if (DEBUG) Log.d(TAG, "Session destroyed but using notification actions $key") - mediaEntries.put(key, removed) - notifyMediaDataLoaded(key, key, removed) - } else if (removed.active && !isAbleToResume(removed)) { - // This player was still active - it didn't last long enough to time out, - // and its app doesn't normally support resume: remove - if (DEBUG) Log.d(TAG, "Removing still-active player $key") - notifyMediaDataRemoved(key) - logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) - } else if (mediaFlags.isRetainingPlayersEnabled() || isAbleToResume(removed)) { - // Convert to resume - if (DEBUG) { - Log.d( - TAG, - "Notification ($notificationRemoved) and/or session " + - "($hasSession) gone for inactive player $key" - ) - } - convertToResumePlayer(key, removed) - } else { - // Retaining players flag is off and app doesn't support resume: remove player. - if (DEBUG) Log.d(TAG, "Removing player $key") - notifyMediaDataRemoved(key) - logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) - } - } - - /** Set the given [MediaData] as a resume state player and notify listeners */ - private fun convertToResumePlayer(key: String, data: MediaData) { - if (DEBUG) Log.d(TAG, "Converting $key to resume") - // Resumption controls must have a title. - if (data.song.isNullOrBlank()) { - Log.e(TAG, "Description incomplete") - notifyMediaDataRemoved(key) - logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) - return - } - // Move to resume key (aka package name) if that key doesn't already exist. - val resumeAction = data.resumeAction?.let { getResumeMediaAction(it) } - val actions = resumeAction?.let { listOf(resumeAction) } ?: emptyList() - val launcherIntent = - context.packageManager.getLaunchIntentForPackage(data.packageName)?.let { - PendingIntent.getActivity(context, 0, it, PendingIntent.FLAG_IMMUTABLE) - } - val lastActive = - if (data.active) { - systemClock.elapsedRealtime() - } else { - data.lastActive - } - val updated = - data.copy( - token = null, - actions = actions, - semanticActions = MediaButton(playOrPause = resumeAction), - actionsToShowInCompact = listOf(0), - active = false, - resumption = true, - isPlaying = false, - isClearable = true, - clickIntent = launcherIntent, - lastActive = lastActive, - ) - val pkg = data.packageName - val migrate = mediaEntries.put(pkg, updated) == null - // Notify listeners of "new" controls when migrating or removed and update when not - Log.d(TAG, "migrating? $migrate from $key -> $pkg") - if (migrate) { - notifyMediaDataLoaded(key = pkg, oldKey = key, info = updated) - } else { - // Since packageName is used for the key of the resumption controls, it is - // possible that another notification has already been reused for the resumption - // controls of this package. In this case, rather than renaming this player as - // packageName, just remove it and then send a update to the existing resumption - // controls. - notifyMediaDataRemoved(key) - notifyMediaDataLoaded(key = pkg, oldKey = pkg, info = updated) - } - logger.logActiveConvertedToResume(updated.appUid, pkg, updated.instanceId) + fun dismissSmartspaceRecommendation(key: String, delay: Long) - // Limit total number of resume controls - val resumeEntries = mediaEntries.filter { (key, data) -> data.resumption } - val numResume = resumeEntries.size - if (numResume > ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) { - resumeEntries - .toList() - .sortedBy { (key, data) -> data.lastActive } - .subList(0, numResume - ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) - .forEach { (key, data) -> - Log.d(TAG, "Removing excess control $key") - mediaEntries.remove(key) - notifyMediaDataRemoved(key) - logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) - } - } - } - - fun setMediaResumptionEnabled(isEnabled: Boolean) { - if (useMediaResumption == isEnabled) { - return - } + /** Called when the recommendation card should no longer be visible in QQS or lockscreen */ + fun setRecommendationInactive(key: String) - useMediaResumption = isEnabled + /** Invoked when notification is removed. */ + fun onNotificationRemoved(key: String) - if (!useMediaResumption) { - // Remove any existing resume controls - val filtered = mediaEntries.filter { !it.value.active } - filtered.forEach { - mediaEntries.remove(it.key) - notifyMediaDataRemoved(it.key) - logger.logMediaRemoved(it.value.appUid, it.value.packageName, it.value.instanceId) - } - } - } + fun setMediaResumptionEnabled(isEnabled: Boolean) /** Invoked when the user has dismissed the media carousel */ - fun onSwipeToDismiss() = mediaDataFilter.onSwipeToDismiss() + fun onSwipeToDismiss() /** Are there any media notifications active, including the recommendations? */ - fun hasActiveMediaOrRecommendation() = mediaDataFilter.hasActiveMediaOrRecommendation() + fun hasActiveMediaOrRecommendation(): Boolean - /** - * Are there any media entries we should display, including the recommendations? - * - If resumption is enabled, this will include inactive players - * - If resumption is disabled, we only want to show active players - */ - fun hasAnyMediaOrRecommendation() = mediaDataFilter.hasAnyMediaOrRecommendation() + /** Are there any media entries we should display, including the recommendations? */ + fun hasAnyMediaOrRecommendation(): Boolean /** Are there any resume media notifications active, excluding the recommendations? */ - fun hasActiveMedia() = mediaDataFilter.hasActiveMedia() + fun hasActiveMedia(): Boolean - /** - * Are there any resume media notifications active, excluding the recommendations? - * - If resumption is enabled, this will include inactive players - * - If resumption is disabled, we only want to show active players - */ - fun hasAnyMedia() = mediaDataFilter.hasAnyMedia() + /** Are there any resume media notifications active, excluding the recommendations? */ + fun hasAnyMedia(): Boolean + + /** Is recommendation card active? */ + fun isRecommendationActive(): Boolean - interface Listener { + // Uses [MediaDataProcessor.Listener] in order to link the new logic code with UI layer. + interface Listener : MediaDataProcessor.Listener { /** * Called whenever there's new MediaData Loaded for the consumption in views. @@ -1637,13 +113,13 @@ class MediaDataManager( * @param isSsReactivated indicates resume media card is reactivated by Smartspace * recommendation signal */ - fun onMediaDataLoaded( + override fun onMediaDataLoaded( key: String, oldKey: String?, data: MediaData, - immediately: Boolean = true, - receivedSmartspaceCardLatency: Int = 0, - isSsReactivated: Boolean = false + immediately: Boolean, + receivedSmartspaceCardLatency: Int, + isSsReactivated: Boolean, ) {} /** @@ -1653,14 +129,14 @@ class MediaDataManager( * it will be prioritized as the first card. Otherwise, it will show up as the last card * as default. */ - fun onSmartspaceMediaDataLoaded( + override fun onSmartspaceMediaDataLoaded( key: String, data: SmartspaceMediaData, - shouldPrioritize: Boolean = false + shouldPrioritize: Boolean, ) {} /** Called whenever a previously existing Media notification was removed. */ - fun onMediaDataRemoved(key: String) {} + override fun onMediaDataRemoved(key: String) {} /** * Called whenever a previously existing Smartspace media data was removed. @@ -1669,78 +145,14 @@ class MediaDataManager( * until the next refresh-round before UI becomes visible. True by default to take in * place immediately. */ - fun onSmartspaceMediaDataRemoved(key: String, immediately: Boolean = true) {} + override fun onSmartspaceMediaDataRemoved(key: String, immediately: Boolean) {} } - /** - * Converts the pass-in SmartspaceTarget to SmartspaceMediaData - * - * @return An empty SmartspaceMediaData with the valid target Id is returned if the - * SmartspaceTarget's data is invalid. - */ - private fun toSmartspaceMediaData(target: SmartspaceTarget): SmartspaceMediaData { - val baseAction: SmartspaceAction? = target.baseAction - val dismissIntent = - baseAction?.extras?.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY) as Intent? - - val isActive = - when { - !mediaFlags.isPersistentSsCardEnabled() -> true - baseAction == null -> true - else -> { - val triggerSource = baseAction.extras?.getString(EXTRA_KEY_TRIGGER_SOURCE) - triggerSource != EXTRA_VALUE_TRIGGER_PERIODIC - } - } - - packageName(target)?.let { - return SmartspaceMediaData( - targetId = target.smartspaceTargetId, - isActive = isActive, - packageName = it, - cardAction = target.baseAction, - recommendations = target.iconGrid, - dismissIntent = dismissIntent, - headphoneConnectionTimeMillis = target.creationTimeMillis, - instanceId = logger.getNewInstanceId(), - expiryTimeMs = target.expiryTimeMillis, - ) - } - return EMPTY_SMARTSPACE_MEDIA_DATA.copy( - targetId = target.smartspaceTargetId, - isActive = isActive, - dismissIntent = dismissIntent, - headphoneConnectionTimeMillis = target.creationTimeMillis, - instanceId = logger.getNewInstanceId(), - expiryTimeMs = target.expiryTimeMillis, - ) - } - - private fun packageName(target: SmartspaceTarget): String? { - val recommendationList = target.iconGrid - if (recommendationList == null || recommendationList.isEmpty()) { - Log.w(TAG, "Empty or null media recommendation list.") - return null - } - for (recommendation in recommendationList) { - val extras = recommendation.extras - extras?.let { - it.getString(EXTRAS_MEDIA_SOURCE_PACKAGE_NAME)?.let { packageName -> - return packageName - } - } - } - Log.w(TAG, "No valid package name is provided.") - return null - } + companion object { - override fun dump(pw: PrintWriter, args: Array<out String>) { - pw.apply { - println("internalListeners: $internalListeners") - println("externalListeners: ${mediaDataFilter.listeners}") - println("mediaEntries: $mediaEntries") - println("useMediaResumption: $useMediaResumption") - println("allowMediaRecommendations: $allowMediaRecommendations") + @JvmStatic + fun isMediaNotification(sbn: StatusBarNotification): Boolean { + return sbn.notification.isMediaNotification() } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt new file mode 100644 index 000000000000..7412290e8fc5 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt @@ -0,0 +1,1654 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.annotation.SuppressLint +import android.app.ActivityOptions +import android.app.BroadcastOptions +import android.app.Notification +import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME +import android.app.PendingIntent +import android.app.StatusBarManager +import android.app.UriGrantsManager +import android.app.smartspace.SmartspaceAction +import android.app.smartspace.SmartspaceConfig +import android.app.smartspace.SmartspaceManager +import android.app.smartspace.SmartspaceSession +import android.app.smartspace.SmartspaceTarget +import android.content.BroadcastReceiver +import android.content.ContentProvider +import android.content.ContentResolver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.graphics.ImageDecoder +import android.graphics.drawable.Animatable +import android.graphics.drawable.Icon +import android.media.MediaDescription +import android.media.MediaMetadata +import android.media.session.MediaController +import android.media.session.MediaSession +import android.media.session.PlaybackState +import android.net.Uri +import android.os.Handler +import android.os.Parcelable +import android.os.Process +import android.os.UserHandle +import android.provider.Settings +import android.service.notification.StatusBarNotification +import android.support.v4.media.MediaMetadataCompat +import android.text.TextUtils +import android.util.Log +import android.util.Pair as APair +import androidx.media.utils.MediaConstants +import com.android.app.tracing.traceSection +import com.android.internal.annotations.Keep +import com.android.internal.logging.InstanceId +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.CoreStartable +import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dump.DumpManager +import com.android.systemui.media.controls.data.repository.MediaDataRepository +import com.android.systemui.media.controls.domain.pipeline.MediaDataManager.Companion.isMediaNotification +import com.android.systemui.media.controls.domain.pipeline.interactor.MediaCarouselInteractor +import com.android.systemui.media.controls.domain.resume.ResumeMediaBrowser +import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_SOURCE +import com.android.systemui.media.controls.shared.model.EXTRA_VALUE_TRIGGER_PERIODIC +import com.android.systemui.media.controls.shared.model.MediaAction +import com.android.systemui.media.controls.shared.model.MediaButton +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.MediaDeviceData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider +import com.android.systemui.media.controls.ui.view.MediaViewHolder +import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaDataUtils +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.media.controls.util.MediaUiEventLogger +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.BcSmartspaceDataPlugin +import com.android.systemui.res.R +import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState +import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState +import com.android.systemui.statusbar.notification.row.HybridGroupManager +import com.android.systemui.util.Assert +import com.android.systemui.util.Utils +import com.android.systemui.util.concurrency.DelayableExecutor +import com.android.systemui.util.concurrency.ThreadFactory +import com.android.systemui.util.settings.SecureSettings +import com.android.systemui.util.settings.SettingsProxyExt.observerFlow +import com.android.systemui.util.time.SystemClock +import java.io.IOException +import java.io.PrintWriter +import java.util.concurrent.Executor +import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +// URI fields to try loading album art from +private val ART_URIS = + arrayOf( + MediaMetadata.METADATA_KEY_ALBUM_ART_URI, + MediaMetadata.METADATA_KEY_ART_URI, + MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI + ) + +private const val TAG = "MediaDataProcessor" +private const val DEBUG = true +private const val EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY = "dismiss_intent" + +/** Processes all media data fields and encapsulates logic for managing media data entries. */ +@SysUISingleton +class MediaDataProcessor( + private val context: Context, + @Application private val applicationScope: CoroutineScope, + @Background private val backgroundDispatcher: CoroutineDispatcher, + @Background private val backgroundExecutor: Executor, + @Main private val uiExecutor: Executor, + @Main private val foregroundExecutor: DelayableExecutor, + @Main private val handler: Handler, + private val mediaControllerFactory: MediaControllerFactory, + private val broadcastDispatcher: BroadcastDispatcher, + private val dumpManager: DumpManager, + private val activityStarter: ActivityStarter, + private val smartspaceMediaDataProvider: SmartspaceMediaDataProvider, + private var useMediaResumption: Boolean, + private val useQsMediaPlayer: Boolean, + private val systemClock: SystemClock, + private val secureSettings: SecureSettings, + private val mediaFlags: MediaFlags, + private val logger: MediaUiEventLogger, + private val smartspaceManager: SmartspaceManager?, + private val keyguardUpdateMonitor: KeyguardUpdateMonitor, + private val mediaDataRepository: MediaDataRepository, +) : CoreStartable, BcSmartspaceDataPlugin.SmartspaceTargetListener { + + companion object { + /** + * UI surface label for subscribing Smartspace updates. String must match with + * [BcSmartspaceDataPlugin.UI_SURFACE_MEDIA] + */ + @JvmField val SMARTSPACE_UI_SURFACE_LABEL = "media_data_manager" + + // Smartspace package name's extra key. + @JvmField val EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name" + + // Maximum number of actions allowed in compact view + @JvmField val MAX_COMPACT_ACTIONS = 3 + + /** + * Maximum number of actions allowed in expanded view. Number must match with the size of + * [MediaViewHolder.genericButtonIds] + */ + @JvmField val MAX_NOTIFICATION_ACTIONS = 5 + } + + private val themeText = + com.android.settingslib.Utils.getColorAttr( + context, + com.android.internal.R.attr.textColorPrimary + ) + .defaultColor + + // Internal listeners are part of the internal pipeline. External listeners (those registered + // with [MediaDeviceManager.addListener]) receive events after they have propagated through + // the internal pipeline. + // Another way to think of the distinction between internal and external listeners is the + // following. Internal listeners are listeners that MediaDataProcessor depends on, and external + // listeners are listeners that depend on MediaDataProcessor. + private val internalListeners: MutableSet<Listener> = mutableSetOf() + + // There should ONLY be at most one Smartspace media recommendation. + @Keep private var smartspaceSession: SmartspaceSession? = null + private var allowMediaRecommendations = false + + private val artworkWidth = + context.resources.getDimensionPixelSize( + com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize + ) + private val artworkHeight = + context.resources.getDimensionPixelSize(R.dimen.qs_media_session_height_expanded) + + @SuppressLint("WrongConstant") // sysui allowed to call STATUS_BAR_SERVICE + private val statusBarManager = + context.getSystemService(Context.STATUS_BAR_SERVICE) as StatusBarManager + + /** Check whether this notification is an RCN */ + private fun isRemoteCastNotification(sbn: StatusBarNotification): Boolean { + return sbn.notification.extras.containsKey(Notification.EXTRA_MEDIA_REMOTE_DEVICE) + } + + @Inject + constructor( + context: Context, + @Application applicationScope: CoroutineScope, + @Background backgroundDispatcher: CoroutineDispatcher, + threadFactory: ThreadFactory, + @Main uiExecutor: Executor, + @Main foregroundExecutor: DelayableExecutor, + @Main handler: Handler, + mediaControllerFactory: MediaControllerFactory, + dumpManager: DumpManager, + broadcastDispatcher: BroadcastDispatcher, + activityStarter: ActivityStarter, + smartspaceMediaDataProvider: SmartspaceMediaDataProvider, + clock: SystemClock, + secureSettings: SecureSettings, + mediaFlags: MediaFlags, + logger: MediaUiEventLogger, + smartspaceManager: SmartspaceManager?, + keyguardUpdateMonitor: KeyguardUpdateMonitor, + mediaDataRepository: MediaDataRepository, + ) : this( + context, + applicationScope, + backgroundDispatcher, + // Loading bitmap for UMO background can take longer time, so it cannot run on the default + // background thread. Use a custom thread for media. + threadFactory.buildExecutorOnNewThread(TAG), + uiExecutor, + foregroundExecutor, + handler, + mediaControllerFactory, + broadcastDispatcher, + dumpManager, + activityStarter, + smartspaceMediaDataProvider, + Utils.useMediaResumption(context), + Utils.useQsMediaPlayer(context), + clock, + secureSettings, + mediaFlags, + logger, + smartspaceManager, + keyguardUpdateMonitor, + mediaDataRepository, + ) + + private val appChangeReceiver = + object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + when (intent.action) { + Intent.ACTION_PACKAGES_SUSPENDED -> { + val packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST) + packages?.forEach { removeAllForPackage(it) } + } + Intent.ACTION_PACKAGE_REMOVED, + Intent.ACTION_PACKAGE_RESTARTED -> { + intent.data?.encodedSchemeSpecificPart?.let { removeAllForPackage(it) } + } + } + } + } + + override fun start() { + if (!mediaFlags.isMediaControlsRefactorEnabled()) { + return + } + + dumpManager.registerNormalDumpable(TAG, this) + + val suspendFilter = IntentFilter(Intent.ACTION_PACKAGES_SUSPENDED) + broadcastDispatcher.registerReceiver(appChangeReceiver, suspendFilter, null, UserHandle.ALL) + + val uninstallFilter = + IntentFilter().apply { + addAction(Intent.ACTION_PACKAGE_REMOVED) + addAction(Intent.ACTION_PACKAGE_RESTARTED) + addDataScheme("package") + } + // BroadcastDispatcher does not allow filters with data schemes + context.registerReceiver(appChangeReceiver, uninstallFilter) + + // Register for Smartspace data updates. + smartspaceMediaDataProvider.registerListener(this) + smartspaceSession = + smartspaceManager?.createSmartspaceSession( + SmartspaceConfig.Builder(context, SMARTSPACE_UI_SURFACE_LABEL).build() + ) + smartspaceSession?.let { + it.addOnTargetsAvailableListener( + // Use a main uiExecutor thread listening to Smartspace updates instead of using + // the existing background executor. + // SmartspaceSession has scheduled routine updates which can be unpredictable on + // test simulators, using the backgroundExecutor makes it's hard to test the threads + // numbers. + uiExecutor + ) { targets -> + smartspaceMediaDataProvider.onTargetsAvailable(targets) + } + } + smartspaceSession?.requestSmartspaceUpdate() + + // Track media controls recommendation setting. + applicationScope.launch { trackMediaControlsRecommendationSetting() } + } + + fun destroy() { + smartspaceMediaDataProvider.unregisterListener(this) + smartspaceSession?.close() + smartspaceSession = null + context.unregisterReceiver(appChangeReceiver) + internalListeners.clear() + } + + fun onNotificationAdded(key: String, sbn: StatusBarNotification) { + if (useQsMediaPlayer && isMediaNotification(sbn)) { + var isNewlyActiveEntry = false + Assert.isMainThread() + val oldKey = findExistingEntry(key, sbn.packageName) + if (oldKey == null) { + val instanceId = logger.getNewInstanceId() + val temp = + MediaData() + .copy( + packageName = sbn.packageName, + instanceId = instanceId, + createdTimestampMillis = systemClock.currentTimeMillis(), + ) + mediaDataRepository.addMediaEntry(key, temp) + isNewlyActiveEntry = true + } else if (oldKey != key) { + // Resume -> active conversion; move to new key + val oldData = mediaDataRepository.removeMediaEntry(oldKey)!! + isNewlyActiveEntry = true + mediaDataRepository.addMediaEntry(key, oldData) + } + loadMediaData(key, sbn, oldKey, isNewlyActiveEntry) + } else { + onNotificationRemoved(key) + } + } + + /** + * Allow recommendations from smartspace to show in media controls. Requires + * [Utils.useQsMediaPlayer] to be enabled. On by default, but can be disabled by setting to 0 + */ + private suspend fun allowMediaRecommendations(): Boolean { + return withContext(backgroundDispatcher) { + val flag = + secureSettings.getBoolForUser( + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, + true, + UserHandle.USER_CURRENT + ) + + useQsMediaPlayer && flag + } + } + + private suspend fun trackMediaControlsRecommendationSetting() { + secureSettings + .observerFlow(UserHandle.USER_ALL, Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION) + // perform a query at the beginning. + .onStart { emit(Unit) } + .map { allowMediaRecommendations() } + .distinctUntilChanged() + // only track the most recent emission + .collectLatest { + allowMediaRecommendations = it + if (!allowMediaRecommendations) { + dismissSmartspaceRecommendation( + key = mediaDataRepository.smartspaceMediaData.value.targetId, + delay = 0L + ) + } + } + } + + private fun removeAllForPackage(packageName: String) { + Assert.isMainThread() + val toRemove = + mediaDataRepository.mediaEntries.value.filter { it.value.packageName == packageName } + toRemove.forEach { removeEntry(it.key) } + } + + fun setResumeAction(key: String, action: Runnable?) { + mediaDataRepository.mediaEntries.value.get(key)?.let { + it.resumeAction = action + it.hasCheckedForResume = true + } + } + + fun addResumptionControls( + userId: Int, + desc: MediaDescription, + action: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) { + // Resume controls don't have a notification key, so store by package name instead + if (!mediaDataRepository.mediaEntries.value.containsKey(packageName)) { + val instanceId = logger.getNewInstanceId() + val appUid = + try { + context.packageManager.getApplicationInfo(packageName, 0).uid + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Could not get app UID for $packageName", e) + Process.INVALID_UID + } + + val resumeData = + MediaData() + .copy( + packageName = packageName, + resumeAction = action, + hasCheckedForResume = true, + instanceId = instanceId, + appUid = appUid, + createdTimestampMillis = systemClock.currentTimeMillis(), + ) + mediaDataRepository.addMediaEntry(packageName, resumeData) + logSingleVsMultipleMediaAdded(appUid, packageName, instanceId) + logger.logResumeMediaAdded(appUid, packageName, instanceId) + } + backgroundExecutor.execute { + loadMediaDataInBgForResumption( + userId, + desc, + action, + token, + appName, + appIntent, + packageName + ) + } + } + + /** + * Check if there is an existing entry that matches the key or package name. Returns the key + * that matches, or null if not found. + */ + private fun findExistingEntry(key: String, packageName: String): String? { + val mediaEntries = mediaDataRepository.mediaEntries.value + if (mediaEntries.containsKey(key)) { + return key + } + // Check if we already had a resume player + if (mediaEntries.containsKey(packageName)) { + return packageName + } + return null + } + + private fun loadMediaData( + key: String, + sbn: StatusBarNotification, + oldKey: String?, + isNewlyActiveEntry: Boolean = false, + ) { + backgroundExecutor.execute { loadMediaDataInBg(key, sbn, oldKey, isNewlyActiveEntry) } + } + + /** Add a listener for internal events. */ + fun addInternalListener(listener: Listener) = internalListeners.add(listener) + + /** + * Notify internal listeners of media loaded event. + * + * External listeners registered with [MediaCarouselInteractor.addListener] will be notified + * after the event propagates through the internal listener pipeline. + */ + private fun notifyMediaDataLoaded(key: String, oldKey: String?, info: MediaData) { + internalListeners.forEach { it.onMediaDataLoaded(key, oldKey, info) } + } + + /** + * Notify internal listeners of Smartspace media loaded event. + * + * External listeners registered with [MediaCarouselInteractor.addListener] will be notified + * after the event propagates through the internal listener pipeline. + */ + private fun notifySmartspaceMediaDataLoaded(key: String, info: SmartspaceMediaData) { + internalListeners.forEach { it.onSmartspaceMediaDataLoaded(key, info) } + } + + /** + * Notify internal listeners of media removed event. + * + * External listeners registered with [MediaCarouselInteractor.addListener] will be notified + * after the event propagates through the internal listener pipeline. + */ + private fun notifyMediaDataRemoved(key: String) { + internalListeners.forEach { it.onMediaDataRemoved(key) } + } + + /** + * Notify internal listeners of Smartspace media removed event. + * + * External listeners registered with [MediaCarouselInteractor.addListener] will be notified + * after the event propagates through the internal listener pipeline. + * + * @param immediately indicates should apply the UI changes immediately, otherwise wait until + * the next refresh-round before UI becomes visible. Should only be true if the update is + * initiated by user's interaction. + */ + private fun notifySmartspaceMediaDataRemoved(key: String, immediately: Boolean) { + internalListeners.forEach { it.onSmartspaceMediaDataRemoved(key, immediately) } + } + + /** + * Called whenever the player has been paused or stopped for a while, or swiped from QQS. This + * will make the player not active anymore, hiding it from QQS and Keyguard. + * + * @see MediaData.active + */ + fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean = false) { + mediaDataRepository.mediaEntries.value[key]?.let { + if (timedOut && !forceUpdate) { + // Only log this event when media expires on its own + logger.logMediaTimeout(it.appUid, it.packageName, it.instanceId) + } + if (it.active == !timedOut && !forceUpdate) { + if (it.resumption) { + if (DEBUG) Log.d(TAG, "timing out resume player $key") + dismissMediaData(key, 0L /* delay */) + } + return + } + // Update last active if media was still active. + if (it.active) { + it.lastActive = systemClock.elapsedRealtime() + } + it.active = !timedOut + if (DEBUG) Log.d(TAG, "Updating $key timedOut: $timedOut") + onMediaDataLoaded(key, key, it) + } + + if (key == mediaDataRepository.smartspaceMediaData.value.targetId) { + if (DEBUG) Log.d(TAG, "smartspace card expired") + dismissSmartspaceRecommendation(key, delay = 0L) + } + } + + /** Called when the player's [PlaybackState] has been updated with new actions and/or state */ + internal fun updateState(key: String, state: PlaybackState) { + mediaDataRepository.mediaEntries.value.get(key)?.let { + val token = it.token + if (token == null) { + if (DEBUG) Log.d(TAG, "State updated, but token was null") + return + } + val actions = + createActionsFromState( + it.packageName, + mediaControllerFactory.create(it.token), + UserHandle(it.userId) + ) + + // Control buttons + // If flag is enabled and controller has a PlaybackState, + // create actions from session info + // otherwise, no need to update semantic actions. + val data = + if (actions != null) { + it.copy(semanticActions = actions, isPlaying = isPlayingState(state.state)) + } else { + it.copy(isPlaying = isPlayingState(state.state)) + } + if (DEBUG) Log.d(TAG, "State updated outside of notification") + onMediaDataLoaded(key, key, data) + } + } + + private fun removeEntry(key: String, logEvent: Boolean = true) { + mediaDataRepository.removeMediaEntry(key)?.let { + if (logEvent) { + logger.logMediaRemoved(it.appUid, it.packageName, it.instanceId) + } + } + notifyMediaDataRemoved(key) + } + + /** Dismiss a media entry. Returns false if the key was not found. */ + fun dismissMediaData(key: String, delay: Long): Boolean { + val existed = mediaDataRepository.mediaEntries.value[key] != null + backgroundExecutor.execute { + mediaDataRepository.mediaEntries.value[key]?.let { mediaData -> + if (mediaData.isLocalSession()) { + mediaData.token?.let { + val mediaController = mediaControllerFactory.create(it) + mediaController.transportControls.stop() + } + } + } + } + foregroundExecutor.executeDelayed({ removeEntry(key) }, delay) + return existed + } + + /** + * Called whenever the recommendation has been expired or removed by the user. This will remove + * the recommendation card entirely from the carousel. + */ + fun dismissSmartspaceRecommendation(key: String, delay: Long) { + if (mediaDataRepository.dismissSmartspaceRecommendation(key)) { + foregroundExecutor.executeDelayed( + { notifySmartspaceMediaDataRemoved(key, immediately = true) }, + delay + ) + } + } + + /** Called when the recommendation card should no longer be visible in QQS or lockscreen */ + fun setRecommendationInactive(key: String) { + if (mediaDataRepository.setRecommendationInactive(key)) { + val recommendation = mediaDataRepository.smartspaceMediaData.value + notifySmartspaceMediaDataLoaded(recommendation.targetId, recommendation) + } + } + + private fun loadMediaDataInBgForResumption( + userId: Int, + desc: MediaDescription, + resumeAction: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) { + if (desc.title.isNullOrBlank()) { + Log.e(TAG, "Description incomplete") + // Delete the placeholder entry + mediaDataRepository.removeMediaEntry(packageName) + return + } + + if (DEBUG) { + Log.d(TAG, "adding track for $userId from browser: $desc") + } + + val currentEntry = mediaDataRepository.mediaEntries.value.get(packageName) + val appUid = currentEntry?.appUid ?: Process.INVALID_UID + + // Album art + var artworkBitmap = desc.iconBitmap + if (artworkBitmap == null && desc.iconUri != null) { + artworkBitmap = loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName) + } + val artworkIcon = + if (artworkBitmap != null) { + Icon.createWithBitmap(artworkBitmap) + } else { + null + } + + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + val isExplicit = + desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + val progress = + if (mediaFlags.isResumeProgressEnabled()) { + MediaDataUtils.getDescriptionProgress(desc.extras) + } else null + + val mediaAction = getResumeMediaAction(resumeAction) + val lastActive = systemClock.elapsedRealtime() + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + foregroundExecutor.execute { + onMediaDataLoaded( + packageName, + null, + MediaData( + userId, + true, + appName, + null, + desc.subtitle, + desc.title, + artworkIcon, + listOf(mediaAction), + listOf(0), + MediaButton(playOrPause = mediaAction), + packageName, + token, + appIntent, + device = null, + active = false, + resumeAction = resumeAction, + resumption = true, + notificationKey = packageName, + hasCheckedForResume = true, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = appUid, + isExplicit = isExplicit, + resumeProgress = progress, + ) + ) + } + } + + fun loadMediaDataInBg( + key: String, + sbn: StatusBarNotification, + oldKey: String?, + isNewlyActiveEntry: Boolean = false, + ) { + val token = + sbn.notification.extras.getParcelable( + Notification.EXTRA_MEDIA_SESSION, + MediaSession.Token::class.java + ) + if (token == null) { + return + } + val mediaController = mediaControllerFactory.create(token) + val metadata = mediaController.metadata + val notif: Notification = sbn.notification + + val appInfo = + notif.extras.getParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO, + ApplicationInfo::class.java + ) + ?: getAppInfoFromPackage(sbn.packageName) + + // App name + val appName = getAppName(sbn, appInfo) + + // Song name + var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE) + if (song.isNullOrBlank()) { + song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) + } + if (song.isNullOrBlank()) { + song = HybridGroupManager.resolveTitle(notif) + } + if (song.isNullOrBlank()) { + // For apps that don't include a title, log and add a placeholder + song = context.getString(R.string.controls_media_empty_title, appName) + try { + statusBarManager.logBlankMediaTitle(sbn.packageName, sbn.user.identifier) + } catch (e: RuntimeException) { + Log.e(TAG, "Error reporting blank media title for package ${sbn.packageName}") + } + } + + // Album art + var artworkBitmap = metadata?.let { loadBitmapFromUri(it) } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) + } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) + } + val artWorkIcon = + if (artworkBitmap == null) { + notif.getLargeIcon() + } else { + Icon.createWithBitmap(artworkBitmap) + } + + // App Icon + val smallIcon = sbn.notification.smallIcon + + // Explicit Indicator + val isExplicit: Boolean + val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata) + isExplicit = + mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + + // Artist name + var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) + if (artist.isNullOrBlank()) { + artist = HybridGroupManager.resolveText(notif) + } + + // Device name (used for remote cast notifications) + var device: MediaDeviceData? = null + if (isRemoteCastNotification(sbn)) { + val extras = sbn.notification.extras + val deviceName = extras.getCharSequence(Notification.EXTRA_MEDIA_REMOTE_DEVICE, null) + val deviceIcon = extras.getInt(Notification.EXTRA_MEDIA_REMOTE_ICON, -1) + val deviceIntent = + extras.getParcelable( + Notification.EXTRA_MEDIA_REMOTE_INTENT, + PendingIntent::class.java + ) + Log.d(TAG, "$key is RCN for $deviceName") + + if (deviceName != null && deviceIcon > -1) { + // Name and icon must be present, but intent may be null + val enabled = deviceIntent != null && deviceIntent.isActivity + val deviceDrawable = + Icon.createWithResource(sbn.packageName, deviceIcon) + .loadDrawable(sbn.getPackageContext(context)) + device = + MediaDeviceData( + enabled, + deviceDrawable, + deviceName, + deviceIntent, + showBroadcastButton = false + ) + } + } + + // Control buttons + // If flag is enabled and controller has a PlaybackState, create actions from session info + // Otherwise, use the notification actions + var actionIcons: List<MediaAction> = emptyList() + var actionsToShowCollapsed: List<Int> = emptyList() + val semanticActions = createActionsFromState(sbn.packageName, mediaController, sbn.user) + if (semanticActions == null) { + val actions = createActionsFromNotification(sbn) + actionIcons = actions.first + actionsToShowCollapsed = actions.second + } + + val playbackLocation = + if (isRemoteCastNotification(sbn)) MediaData.PLAYBACK_CAST_REMOTE + else if ( + mediaController.playbackInfo?.playbackType == + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL + ) + MediaData.PLAYBACK_LOCAL + else MediaData.PLAYBACK_CAST_LOCAL + val isPlaying = mediaController.playbackState?.let { isPlayingState(it.state) } + + val currentEntry = mediaDataRepository.mediaEntries.value.get(key) + val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() + val appUid = appInfo?.uid ?: Process.INVALID_UID + + if (isNewlyActiveEntry) { + logSingleVsMultipleMediaAdded(appUid, sbn.packageName, instanceId) + logger.logActiveMediaAdded(appUid, sbn.packageName, instanceId, playbackLocation) + } else if (playbackLocation != currentEntry?.playbackLocation) { + logger.logPlaybackLocationChange(appUid, sbn.packageName, instanceId, playbackLocation) + } + + val lastActive = systemClock.elapsedRealtime() + val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L + foregroundExecutor.execute { + val resumeAction: Runnable? = mediaDataRepository.mediaEntries.value[key]?.resumeAction + val hasCheckedForResume = + mediaDataRepository.mediaEntries.value[key]?.hasCheckedForResume == true + val active = mediaDataRepository.mediaEntries.value[key]?.active ?: true + onMediaDataLoaded( + key, + oldKey, + MediaData( + sbn.normalizedUserId, + true, + appName, + smallIcon, + artist, + song, + artWorkIcon, + actionIcons, + actionsToShowCollapsed, + semanticActions, + sbn.packageName, + token, + notif.contentIntent, + device, + active, + resumeAction = resumeAction, + playbackLocation = playbackLocation, + notificationKey = key, + hasCheckedForResume = hasCheckedForResume, + isPlaying = isPlaying, + isClearable = !sbn.isOngoing, + lastActive = lastActive, + createdTimestampMillis = createdTimestampMillis, + instanceId = instanceId, + appUid = appUid, + isExplicit = isExplicit, + ) + ) + } + } + + private fun logSingleVsMultipleMediaAdded( + appUid: Int, + packageName: String, + instanceId: InstanceId + ) { + if (mediaDataRepository.mediaEntries.value.size == 1) { + logger.logSingleMediaPlayerInCarousel(appUid, packageName, instanceId) + } else if (mediaDataRepository.mediaEntries.value.size == 2) { + // Since this method is only called when there is a new media session added. + // logging needed once there is more than one media session in carousel. + logger.logMultipleMediaPlayersInCarousel(appUid, packageName, instanceId) + } + } + + private fun getAppInfoFromPackage(packageName: String): ApplicationInfo? { + try { + return context.packageManager.getApplicationInfo(packageName, 0) + } catch (e: PackageManager.NameNotFoundException) { + Log.w(TAG, "Could not get app info for $packageName", e) + } + return null + } + + private fun getAppName(sbn: StatusBarNotification, appInfo: ApplicationInfo?): String { + val name = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME) + if (name != null) { + return name + } + + return if (appInfo != null) { + context.packageManager.getApplicationLabel(appInfo).toString() + } else { + sbn.packageName + } + } + + /** Generate action buttons based on notification actions */ + private fun createActionsFromNotification( + sbn: StatusBarNotification + ): Pair<List<MediaAction>, List<Int>> { + val notif = sbn.notification + val actionIcons: MutableList<MediaAction> = ArrayList() + val actions = notif.actions + var actionsToShowCollapsed = + notif.extras.getIntArray(Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() + ?: mutableListOf() + if (actionsToShowCollapsed.size > MAX_COMPACT_ACTIONS) { + Log.e( + TAG, + "Too many compact actions for ${sbn.key}," + + "limiting to first $MAX_COMPACT_ACTIONS" + ) + actionsToShowCollapsed = actionsToShowCollapsed.subList(0, MAX_COMPACT_ACTIONS) + } + + if (actions != null) { + for ((index, action) in actions.withIndex()) { + if (index == MAX_NOTIFICATION_ACTIONS) { + Log.w( + TAG, + "Too many notification actions for ${sbn.key}," + + " limiting to first $MAX_NOTIFICATION_ACTIONS" + ) + break + } + if (action.getIcon() == null) { + if (DEBUG) Log.i(TAG, "No icon for action $index ${action.title}") + actionsToShowCollapsed.remove(index) + continue + } + val runnable = + if (action.actionIntent != null) { + Runnable { + if (action.actionIntent.isActivity) { + activityStarter.startPendingIntentDismissingKeyguard( + action.actionIntent + ) + } else if (action.isAuthenticationRequired()) { + activityStarter.dismissKeyguardThenExecute( + { + var result = sendPendingIntent(action.actionIntent) + result + }, + {}, + true + ) + } else { + sendPendingIntent(action.actionIntent) + } + } + } else { + null + } + val mediaActionIcon = + if (action.getIcon()?.getType() == Icon.TYPE_RESOURCE) { + Icon.createWithResource(sbn.packageName, action.getIcon()!!.getResId()) + } else { + action.getIcon() + } + .setTint(themeText) + .loadDrawable(context) + val mediaAction = MediaAction(mediaActionIcon, runnable, action.title, null) + actionIcons.add(mediaAction) + } + } + return Pair(actionIcons, actionsToShowCollapsed) + } + + /** + * Generates action button info for this media session based on the PlaybackState + * + * @param packageName Package name for the media app + * @param controller MediaController for the current session + * @return a Pair consisting of a list of media actions, and a list of ints representing which + * + * ``` + * of those actions should be shown in the compact player + * ``` + */ + private fun createActionsFromState( + packageName: String, + controller: MediaController, + user: UserHandle + ): MediaButton? { + val state = controller.playbackState + if (state == null || !mediaFlags.areMediaSessionActionsEnabled(packageName, user)) { + return null + } + + // First, check for standard actions + val playOrPause = + if (isConnectingState(state.state)) { + // Spinner needs to be animating to render anything. Start it here. + val drawable = + context.getDrawable(com.android.internal.R.drawable.progress_small_material) + (drawable as Animatable).start() + MediaAction( + drawable, + null, // no action to perform when clicked + context.getString(R.string.controls_media_button_connecting), + context.getDrawable(R.drawable.ic_media_connecting_container), + // Specify a rebind id to prevent the spinner from restarting on later binds. + com.android.internal.R.drawable.progress_small_material + ) + } else if (isPlayingState(state.state)) { + getStandardAction(controller, state.actions, PlaybackState.ACTION_PAUSE) + } else { + getStandardAction(controller, state.actions, PlaybackState.ACTION_PLAY) + } + val prevButton = + getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_PREVIOUS) + val nextButton = + getStandardAction(controller, state.actions, PlaybackState.ACTION_SKIP_TO_NEXT) + + // Then, create a way to build any custom actions that will be needed + val customActions = + state.customActions + .asSequence() + .filterNotNull() + .map { getCustomAction(packageName, controller, it) } + .iterator() + fun nextCustomAction() = if (customActions.hasNext()) customActions.next() else null + + // Finally, assign the remaining button slots: play/pause A B C D + // A = previous, else custom action (if not reserved) + // B = next, else custom action (if not reserved) + // C and D are always custom actions + val reservePrev = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV + ) == true + val reserveNext = + controller.extras?.getBoolean( + MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT + ) == true + + val prevOrCustom = + if (prevButton != null) { + prevButton + } else if (!reservePrev) { + nextCustomAction() + } else { + null + } + + val nextOrCustom = + if (nextButton != null) { + nextButton + } else if (!reserveNext) { + nextCustomAction() + } else { + null + } + + return MediaButton( + playOrPause, + nextOrCustom, + prevOrCustom, + nextCustomAction(), + nextCustomAction(), + reserveNext, + reservePrev + ) + } + + /** + * Create a [MediaAction] for a given action and media session + * + * @param controller MediaController for the session + * @param stateActions The actions included with the session's [PlaybackState] + * @param action A [PlaybackState.Actions] value representing what action to generate. One of: + * ``` + * [PlaybackState.ACTION_PLAY] + * [PlaybackState.ACTION_PAUSE] + * [PlaybackState.ACTION_SKIP_TO_PREVIOUS] + * [PlaybackState.ACTION_SKIP_TO_NEXT] + * @return + * ``` + * + * A [MediaAction] with correct values set, or null if the state doesn't support it + */ + private fun getStandardAction( + controller: MediaController, + stateActions: Long, + @PlaybackState.Actions action: Long + ): MediaAction? { + if (!includesAction(stateActions, action)) { + return null + } + + return when (action) { + PlaybackState.ACTION_PLAY -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_play), + { controller.transportControls.play() }, + context.getString(R.string.controls_media_button_play), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + PlaybackState.ACTION_PAUSE -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_pause), + { controller.transportControls.pause() }, + context.getString(R.string.controls_media_button_pause), + context.getDrawable(R.drawable.ic_media_pause_container) + ) + } + PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_prev), + { controller.transportControls.skipToPrevious() }, + context.getString(R.string.controls_media_button_prev), + null + ) + } + PlaybackState.ACTION_SKIP_TO_NEXT -> { + MediaAction( + context.getDrawable(R.drawable.ic_media_next), + { controller.transportControls.skipToNext() }, + context.getString(R.string.controls_media_button_next), + null + ) + } + else -> null + } + } + + /** Check whether the actions from a [PlaybackState] include a specific action */ + private fun includesAction(stateActions: Long, @PlaybackState.Actions action: Long): Boolean { + if ( + (action == PlaybackState.ACTION_PLAY || action == PlaybackState.ACTION_PAUSE) && + (stateActions and PlaybackState.ACTION_PLAY_PAUSE > 0L) + ) { + return true + } + return (stateActions and action != 0L) + } + + /** Get a [MediaAction] representing a [PlaybackState.CustomAction] */ + private fun getCustomAction( + packageName: String, + controller: MediaController, + customAction: PlaybackState.CustomAction + ): MediaAction { + return MediaAction( + Icon.createWithResource(packageName, customAction.icon).loadDrawable(context), + { controller.transportControls.sendCustomAction(customAction, customAction.extras) }, + customAction.name, + null + ) + } + + /** Load a bitmap from the various Art metadata URIs */ + private fun loadBitmapFromUri(metadata: MediaMetadata): Bitmap? { + for (uri in ART_URIS) { + val uriString = metadata.getString(uri) + if (!TextUtils.isEmpty(uriString)) { + val albumArt = loadBitmapFromUri(Uri.parse(uriString)) + if (albumArt != null) { + if (DEBUG) Log.d(TAG, "loaded art from $uri") + return albumArt + } + } + } + return null + } + + private fun sendPendingIntent(intent: PendingIntent): Boolean { + return try { + val options = BroadcastOptions.makeBasic() + options.setInteractive(true) + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED + ) + intent.send(options.toBundle()) + true + } catch (e: PendingIntent.CanceledException) { + Log.d(TAG, "Intent canceled", e) + false + } + } + + /** Returns a bitmap if the user can access the given URI, else null */ + private fun loadBitmapFromUriForUser( + uri: Uri, + userId: Int, + appUid: Int, + packageName: String, + ): Bitmap? { + try { + val ugm = UriGrantsManager.getService() + ugm.checkGrantUriPermission_ignoreNonSystem( + appUid, + packageName, + ContentProvider.getUriWithoutUserId(uri), + Intent.FLAG_GRANT_READ_URI_PERMISSION, + ContentProvider.getUserIdFromUri(uri, userId) + ) + return loadBitmapFromUri(uri) + } catch (e: SecurityException) { + Log.e(TAG, "Failed to get URI permission: $e") + } + return null + } + + /** + * Load a bitmap from a URI + * + * @param uri the uri to load + * @return bitmap, or null if couldn't be loaded + */ + private fun loadBitmapFromUri(uri: Uri): Bitmap? { + // ImageDecoder requires a scheme of the following types + if (uri.scheme == null) { + return null + } + + if ( + !uri.scheme.equals(ContentResolver.SCHEME_CONTENT) && + !uri.scheme.equals(ContentResolver.SCHEME_ANDROID_RESOURCE) && + !uri.scheme.equals(ContentResolver.SCHEME_FILE) + ) { + return null + } + + val source = ImageDecoder.createSource(context.contentResolver, uri) + return try { + ImageDecoder.decodeBitmap(source) { decoder, info, _ -> + val width = info.size.width + val height = info.size.height + val scale = + MediaDataUtils.getScaleFactor( + APair(width, height), + APair(artworkWidth, artworkHeight) + ) + + // Downscale if needed + if (scale != 0f && scale < 1) { + decoder.setTargetSize((scale * width).toInt(), (scale * height).toInt()) + } + decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE + } + } catch (e: IOException) { + Log.e(TAG, "Unable to load bitmap", e) + null + } catch (e: RuntimeException) { + Log.e(TAG, "Unable to load bitmap", e) + null + } + } + + private fun getResumeMediaAction(action: Runnable): MediaAction { + return MediaAction( + Icon.createWithResource(context, R.drawable.ic_media_play) + .setTint(themeText) + .loadDrawable(context), + action, + context.getString(R.string.controls_media_resume), + context.getDrawable(R.drawable.ic_media_play_container) + ) + } + + fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) = + traceSection("MediaDataProcessor#onMediaDataLoaded") { + Assert.isMainThread() + if (mediaDataRepository.mediaEntries.value.containsKey(key)) { + // Otherwise this was removed already + mediaDataRepository.addMediaEntry(key, data) + notifyMediaDataLoaded(key, oldKey, data) + } + } + + override fun onSmartspaceTargetsUpdated(targets: List<Parcelable>) { + if (!allowMediaRecommendations) { + if (DEBUG) Log.d(TAG, "Smartspace recommendation is disabled in Settings.") + return + } + + val mediaTargets = targets.filterIsInstance<SmartspaceTarget>() + val smartspaceMediaData = mediaDataRepository.smartspaceMediaData.value + when (mediaTargets.size) { + 0 -> { + if (!smartspaceMediaData.isActive) { + return + } + if (DEBUG) { + Log.d(TAG, "Set Smartspace media to be inactive for the data update") + } + if (mediaFlags.isPersistentSsCardEnabled()) { + // Smartspace uses this signal to hide the card (e.g. when it expires or user + // disconnects headphones), so treat as setting inactive when flag is on + val recommendation = smartspaceMediaData.copy(isActive = false) + mediaDataRepository.setRecommendation(recommendation) + notifySmartspaceMediaDataLoaded(recommendation.targetId, recommendation) + } else { + notifySmartspaceMediaDataRemoved( + smartspaceMediaData.targetId, + immediately = false + ) + mediaDataRepository.setRecommendation( + SmartspaceMediaData( + targetId = smartspaceMediaData.targetId, + instanceId = smartspaceMediaData.instanceId, + ) + ) + } + } + 1 -> { + val newMediaTarget = mediaTargets.get(0) + if (smartspaceMediaData.targetId == newMediaTarget.smartspaceTargetId) { + // The same Smartspace updates can be received. Skip the duplicate updates. + return + } + if (DEBUG) Log.d(TAG, "Forwarding Smartspace media update.") + val recommendation = toSmartspaceMediaData(newMediaTarget) + mediaDataRepository.setRecommendation(recommendation) + notifySmartspaceMediaDataLoaded(recommendation.targetId, recommendation) + } + else -> { + // There should NOT be more than 1 Smartspace media update. When it happens, it + // indicates a bad state or an error. Reset the status accordingly. + Log.wtf(TAG, "More than 1 Smartspace Media Update. Resetting the status...") + notifySmartspaceMediaDataRemoved(smartspaceMediaData.targetId, immediately = false) + mediaDataRepository.setRecommendation(SmartspaceMediaData()) + } + } + } + + fun onNotificationRemoved(key: String) { + Assert.isMainThread() + val removed = mediaDataRepository.removeMediaEntry(key) ?: return + if (keyguardUpdateMonitor.isUserInLockdown(removed.userId)) { + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } else if (isAbleToResume(removed)) { + convertToResumePlayer(key, removed) + } else if (mediaFlags.isRetainingPlayersEnabled()) { + handlePossibleRemoval(key, removed, notificationRemoved = true) + } else { + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } + } + + internal fun onSessionDestroyed(key: String) { + if (DEBUG) Log.d(TAG, "session destroyed for $key") + val entry = mediaDataRepository.removeMediaEntry(key) ?: return + // Clear token since the session is no longer valid + val updated = entry.copy(token = null) + handlePossibleRemoval(key, updated) + } + + private fun isAbleToResume(data: MediaData): Boolean { + val isEligibleForResume = + data.isLocalSession() || + (mediaFlags.isRemoteResumeAllowed() && + data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE) + return useMediaResumption && data.resumeAction != null && isEligibleForResume + } + + /** + * Convert to resume state if the player is no longer valid and active, then notify listeners + * that the data was updated. Does not convert to resume state if the player is still valid, or + * if it was removed before becoming inactive. (Assumes that [removed] was removed from + * [mediaDataRepository.mediaEntries] state before this function was called) + */ + private fun handlePossibleRemoval( + key: String, + removed: MediaData, + notificationRemoved: Boolean = false + ) { + val hasSession = removed.token != null + if (hasSession && removed.semanticActions != null) { + // The app was using session actions, and the session is still valid: keep player + if (DEBUG) Log.d(TAG, "Notification removed but using session actions $key") + mediaDataRepository.addMediaEntry(key, removed) + notifyMediaDataLoaded(key, key, removed) + } else if (!notificationRemoved && removed.semanticActions == null) { + // The app was using notification actions, and notif wasn't removed yet: keep player + if (DEBUG) Log.d(TAG, "Session destroyed but using notification actions $key") + mediaDataRepository.addMediaEntry(key, removed) + notifyMediaDataLoaded(key, key, removed) + } else if (removed.active && !isAbleToResume(removed)) { + // This player was still active - it didn't last long enough to time out, + // and its app doesn't normally support resume: remove + if (DEBUG) Log.d(TAG, "Removing still-active player $key") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } else if (mediaFlags.isRetainingPlayersEnabled() || isAbleToResume(removed)) { + // Convert to resume + if (DEBUG) { + Log.d( + TAG, + "Notification ($notificationRemoved) and/or session " + + "($hasSession) gone for inactive player $key" + ) + } + convertToResumePlayer(key, removed) + } else { + // Retaining players flag is off and app doesn't support resume: remove player. + if (DEBUG) Log.d(TAG, "Removing player $key") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(removed.appUid, removed.packageName, removed.instanceId) + } + } + + /** Set the given [MediaData] as a resume state player and notify listeners */ + private fun convertToResumePlayer(key: String, data: MediaData) { + if (DEBUG) Log.d(TAG, "Converting $key to resume") + // Resumption controls must have a title. + if (data.song.isNullOrBlank()) { + Log.e(TAG, "Description incomplete") + notifyMediaDataRemoved(key) + logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) + return + } + // Move to resume key (aka package name) if that key doesn't already exist. + val resumeAction = data.resumeAction?.let { getResumeMediaAction(it) } + val actions = resumeAction?.let { listOf(resumeAction) } ?: emptyList() + val launcherIntent = + context.packageManager.getLaunchIntentForPackage(data.packageName)?.let { + PendingIntent.getActivity(context, 0, it, PendingIntent.FLAG_IMMUTABLE) + } + val lastActive = + if (data.active) { + systemClock.elapsedRealtime() + } else { + data.lastActive + } + val updated = + data.copy( + token = null, + actions = actions, + semanticActions = MediaButton(playOrPause = resumeAction), + actionsToShowInCompact = listOf(0), + active = false, + resumption = true, + isPlaying = false, + isClearable = true, + clickIntent = launcherIntent, + lastActive = lastActive, + ) + val pkg = data.packageName + val migrate = mediaDataRepository.addMediaEntry(pkg, updated) == null + // Notify listeners of "new" controls when migrating or removed and update when not + Log.d(TAG, "migrating? $migrate from $key -> $pkg") + if (migrate) { + notifyMediaDataLoaded(key = pkg, oldKey = key, info = updated) + } else { + // Since packageName is used for the key of the resumption controls, it is + // possible that another notification has already been reused for the resumption + // controls of this package. In this case, rather than renaming this player as + // packageName, just remove it and then send a update to the existing resumption + // controls. + notifyMediaDataRemoved(key) + notifyMediaDataLoaded(key = pkg, oldKey = pkg, info = updated) + } + logger.logActiveConvertedToResume(updated.appUid, pkg, updated.instanceId) + + // Limit total number of resume controls + val resumeEntries = + mediaDataRepository.mediaEntries.value.filter { (_, data) -> data.resumption } + val numResume = resumeEntries.size + if (numResume > ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) { + resumeEntries + .toList() + .sortedBy { (_, data) -> data.lastActive } + .subList(0, numResume - ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) + .forEach { (key, data) -> + Log.d(TAG, "Removing excess control $key") + mediaDataRepository.removeMediaEntry(key) + notifyMediaDataRemoved(key) + logger.logMediaRemoved(data.appUid, data.packageName, data.instanceId) + } + } + } + + fun setMediaResumptionEnabled(isEnabled: Boolean) { + if (useMediaResumption == isEnabled) { + return + } + + useMediaResumption = isEnabled + + if (!useMediaResumption) { + // Remove any existing resume controls + val filtered = mediaDataRepository.mediaEntries.value.filter { !it.value.active } + filtered.forEach { + mediaDataRepository.removeMediaEntry(it.key) + notifyMediaDataRemoved(it.key) + logger.logMediaRemoved(it.value.appUid, it.value.packageName, it.value.instanceId) + } + } + } + + /** Listener to data changes. */ + interface Listener { + + /** + * Called whenever there's new MediaData Loaded for the consumption in views. + * + * oldKey is provided to check whether the view has changed keys, which can happen when a + * player has gone from resume state (key is package name) to active state (key is + * notification key) or vice versa. + * + * @param immediately indicates should apply the UI changes immediately, otherwise wait + * until the next refresh-round before UI becomes visible. True by default to take in + * place immediately. + * @param receivedSmartspaceCardLatency is the latency between headphone connects and sysUI + * displays Smartspace media targets. Will be 0 if the data is not activated by Smartspace + * signal. + * @param isSsReactivated indicates resume media card is reactivated by Smartspace + * recommendation signal + */ + fun onMediaDataLoaded( + key: String, + oldKey: String?, + data: MediaData, + immediately: Boolean = true, + receivedSmartspaceCardLatency: Int = 0, + isSsReactivated: Boolean = false + ) {} + + /** + * Called whenever there's new Smartspace media data loaded. + * + * @param shouldPrioritize indicates the sorting priority of the Smartspace card. If true, + * it will be prioritized as the first card. Otherwise, it will show up as the last card + * as default. + */ + fun onSmartspaceMediaDataLoaded( + key: String, + data: SmartspaceMediaData, + shouldPrioritize: Boolean = false + ) {} + + /** Called whenever a previously existing Media notification was removed. */ + fun onMediaDataRemoved(key: String) {} + + /** + * Called whenever a previously existing Smartspace media data was removed. + * + * @param immediately indicates should apply the UI changes immediately, otherwise wait + * until the next refresh-round before UI becomes visible. True by default to take in + * place immediately. + */ + fun onSmartspaceMediaDataRemoved(key: String, immediately: Boolean = true) {} + } + + /** + * Converts the pass-in SmartspaceTarget to SmartspaceMediaData + * + * @return An empty SmartspaceMediaData with the valid target Id is returned if the + * SmartspaceTarget's data is invalid. + */ + private fun toSmartspaceMediaData(target: SmartspaceTarget): SmartspaceMediaData { + val baseAction: SmartspaceAction? = target.baseAction + val dismissIntent = + baseAction + ?.extras + ?.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY, Intent::class.java) + + val isActive = + when { + !mediaFlags.isPersistentSsCardEnabled() -> true + baseAction == null -> true + else -> { + val triggerSource = baseAction.extras?.getString(EXTRA_KEY_TRIGGER_SOURCE) + triggerSource != EXTRA_VALUE_TRIGGER_PERIODIC + } + } + + packageName(target)?.let { + return SmartspaceMediaData( + targetId = target.smartspaceTargetId, + isActive = isActive, + packageName = it, + cardAction = target.baseAction, + recommendations = target.iconGrid, + dismissIntent = dismissIntent, + headphoneConnectionTimeMillis = target.creationTimeMillis, + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, + ) + } + return SmartspaceMediaData( + targetId = target.smartspaceTargetId, + isActive = isActive, + dismissIntent = dismissIntent, + headphoneConnectionTimeMillis = target.creationTimeMillis, + instanceId = logger.getNewInstanceId(), + expiryTimeMs = target.expiryTimeMillis, + ) + } + + private fun packageName(target: SmartspaceTarget): String? { + val recommendationList: MutableList<SmartspaceAction> = target.iconGrid + if (recommendationList.isEmpty()) { + Log.w(TAG, "Empty or null media recommendation list.") + return null + } + for (recommendation in recommendationList) { + val extras = recommendation.extras + extras?.let { + it.getString(EXTRAS_MEDIA_SOURCE_PACKAGE_NAME)?.let { packageName -> + return packageName + } + } + } + Log.w(TAG, "No valid package name is provided.") + return null + } + + override fun dump(pw: PrintWriter, args: Array<out String>) { + pw.apply { + println("internalListeners: $internalListeners") + println("useMediaResumption: $useMediaResumption") + println("allowMediaRecommendations: $allowMediaRecommendations") + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt index f4d70a5e78c9..c7cfb0b7d775 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt @@ -35,10 +35,8 @@ import com.android.settingslib.flags.Flags.legacyLeAudioSharing import com.android.settingslib.media.LocalMediaManager import com.android.settingslib.media.MediaDevice import com.android.settingslib.media.PhoneMediaDevice -import com.android.systemui.Dumpable import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.dump.DumpManager import com.android.systemui.media.controls.shared.model.MediaData import com.android.systemui.media.controls.shared.model.MediaDeviceData import com.android.systemui.media.controls.util.LocalMediaManagerFactory @@ -70,16 +68,11 @@ constructor( private val localBluetoothManager: Lazy<LocalBluetoothManager?>, @Main private val fgExecutor: Executor, @Background private val bgExecutor: Executor, - dumpManager: DumpManager, -) : MediaDataManager.Listener, Dumpable { +) : MediaDataManager.Listener { private val listeners: MutableSet<Listener> = mutableSetOf() private val entries: MutableMap<String, Entry> = mutableMapOf() - init { - dumpManager.registerDumpable(this) - } - /** Add a listener for changes to the media route (ie. device). */ fun addListener(listener: Listener) = listeners.add(listener) @@ -123,7 +116,7 @@ constructor( token?.let { listeners.forEach { it.onKeyRemoved(key) } } } - override fun dump(pw: PrintWriter, args: Array<String>) { + fun dump(pw: PrintWriter) { with(pw) { println("MediaDeviceManager state:") entries.forEach { (key, entry) -> diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractor.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractor.kt new file mode 100644 index 000000000000..4a92b71f1155 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractor.kt @@ -0,0 +1,234 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline.interactor + +import android.app.PendingIntent +import android.media.MediaDescription +import android.media.session.MediaSession +import android.media.session.PlaybackState +import android.service.notification.StatusBarNotification +import com.android.systemui.CoreStartable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.media.controls.data.repository.MediaDataRepository +import com.android.systemui.media.controls.data.repository.MediaFilterRepository +import com.android.systemui.media.controls.domain.pipeline.MediaDataCombineLatest +import com.android.systemui.media.controls.domain.pipeline.MediaDataFilterImpl +import com.android.systemui.media.controls.domain.pipeline.MediaDataManager +import com.android.systemui.media.controls.domain.pipeline.MediaDataProcessor +import com.android.systemui.media.controls.domain.pipeline.MediaDeviceManager +import com.android.systemui.media.controls.domain.pipeline.MediaSessionBasedFilter +import com.android.systemui.media.controls.domain.pipeline.MediaTimeoutListener +import com.android.systemui.media.controls.domain.resume.MediaResumeListener +import com.android.systemui.media.controls.util.MediaFlags +import java.io.PrintWriter +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.flow.stateIn + +/** Encapsulates business logic for media pipeline. */ +@OptIn(ExperimentalCoroutinesApi::class) +@SysUISingleton +class MediaCarouselInteractor +@Inject +constructor( + @Application applicationScope: CoroutineScope, + private val mediaDataRepository: MediaDataRepository, + private val mediaDataProcessor: MediaDataProcessor, + private val mediaTimeoutListener: MediaTimeoutListener, + private val mediaResumeListener: MediaResumeListener, + private val mediaSessionBasedFilter: MediaSessionBasedFilter, + private val mediaDeviceManager: MediaDeviceManager, + private val mediaDataCombineLatest: MediaDataCombineLatest, + private val mediaDataFilter: MediaDataFilterImpl, + mediaFilterRepository: MediaFilterRepository, + private val mediaFlags: MediaFlags, +) : MediaDataManager, CoreStartable { + + /** Are there any media notifications active, including the recommendations? */ + val hasActiveMediaOrRecommendation: StateFlow<Boolean> = + combine( + mediaFilterRepository.selectedUserEntries, + mediaFilterRepository.smartspaceMediaData, + mediaFilterRepository.reactivatedKey + ) { entries, smartspaceMediaData, reactivatedKey -> + entries.any { it.value.active } || + (smartspaceMediaData.isActive && + (smartspaceMediaData.isValid() || reactivatedKey != null)) + } + .distinctUntilChanged() + .stateIn(applicationScope, SharingStarted.WhileSubscribed(), false) + + /** Are there any media entries we should display, including the recommendations? */ + val hasAnyMediaOrRecommendation: StateFlow<Boolean> = + combine( + mediaFilterRepository.selectedUserEntries, + mediaFilterRepository.smartspaceMediaData + ) { entries, smartspaceMediaData -> + entries.isNotEmpty() || + (if (mediaFlags.isPersistentSsCardEnabled()) { + smartspaceMediaData.isValid() + } else { + smartspaceMediaData.isActive && smartspaceMediaData.isValid() + }) + } + .distinctUntilChanged() + .stateIn(applicationScope, SharingStarted.WhileSubscribed(), false) + + /** Are there any media notifications active, excluding the recommendations? */ + val hasActiveMedia: StateFlow<Boolean> = + mediaFilterRepository.selectedUserEntries + .mapLatest { entries -> entries.any { it.value.active } } + .distinctUntilChanged() + .stateIn(applicationScope, SharingStarted.WhileSubscribed(), false) + + /** Are there any media notifications, excluding the recommendations? */ + val hasAnyMedia: StateFlow<Boolean> = + mediaFilterRepository.selectedUserEntries + .mapLatest { entries -> entries.isNotEmpty() } + .distinctUntilChanged() + .stateIn(applicationScope, SharingStarted.WhileSubscribed(), false) + + override fun start() { + if (!mediaFlags.isMediaControlsRefactorEnabled()) { + return + } + + // Initialize the internal processing pipeline. The listeners at the front of the pipeline + // are set as internal listeners so that they receive events. From there, events are + // propagated through the pipeline. The end of the pipeline is currently mediaDataFilter, + // so it is responsible for dispatching events to external listeners. To achieve this, + // external listeners that are registered with [MediaDataManager.addListener] are actually + // registered as listeners to mediaDataFilter. + addInternalListener(mediaTimeoutListener) + addInternalListener(mediaResumeListener) + addInternalListener(mediaSessionBasedFilter) + mediaSessionBasedFilter.addListener(mediaDeviceManager) + mediaSessionBasedFilter.addListener(mediaDataCombineLatest) + mediaDeviceManager.addListener(mediaDataCombineLatest) + mediaDataCombineLatest.addListener(mediaDataFilter) + + // Set up links back into the pipeline for listeners that need to send events upstream. + mediaTimeoutListener.timeoutCallback = { key: String, timedOut: Boolean -> + setInactive(key, timedOut) + } + mediaTimeoutListener.stateCallback = { key: String, state: PlaybackState -> + mediaDataProcessor.updateState(key, state) + } + mediaTimeoutListener.sessionCallback = { key: String -> + mediaDataProcessor.onSessionDestroyed(key) + } + mediaResumeListener.setManager(this) + mediaDataFilter.mediaDataManager = this + } + + override fun addListener(listener: MediaDataManager.Listener) { + mediaDataFilter.addListener(listener) + } + + override fun removeListener(listener: MediaDataManager.Listener) { + mediaDataFilter.removeListener(listener) + } + + override fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean) { + mediaDataProcessor.setInactive(key, timedOut, forceUpdate) + } + + override fun onNotificationAdded(key: String, sbn: StatusBarNotification) { + mediaDataProcessor.onNotificationAdded(key, sbn) + } + + override fun destroy() { + mediaSessionBasedFilter.removeListener(mediaDeviceManager) + mediaSessionBasedFilter.removeListener(mediaDataCombineLatest) + mediaDeviceManager.removeListener(mediaDataCombineLatest) + mediaDataCombineLatest.removeListener(mediaDataFilter) + mediaDataProcessor.destroy() + } + + override fun setResumeAction(key: String, action: Runnable?) { + mediaDataProcessor.setResumeAction(key, action) + } + + override fun addResumptionControls( + userId: Int, + desc: MediaDescription, + action: Runnable, + token: MediaSession.Token, + appName: String, + appIntent: PendingIntent, + packageName: String + ) { + mediaDataProcessor.addResumptionControls( + userId, + desc, + action, + token, + appName, + appIntent, + packageName + ) + } + + override fun dismissMediaData(key: String, delay: Long): Boolean { + return mediaDataProcessor.dismissMediaData(key, delay) + } + + override fun dismissSmartspaceRecommendation(key: String, delay: Long) { + return mediaDataProcessor.dismissSmartspaceRecommendation(key, delay) + } + + override fun setRecommendationInactive(key: String) { + mediaDataProcessor.setRecommendationInactive(key) + } + + override fun onNotificationRemoved(key: String) { + mediaDataProcessor.onNotificationRemoved(key) + } + + override fun setMediaResumptionEnabled(isEnabled: Boolean) { + mediaDataProcessor.setMediaResumptionEnabled(isEnabled) + } + + override fun onSwipeToDismiss() { + mediaDataFilter.onSwipeToDismiss() + } + + override fun hasActiveMediaOrRecommendation() = hasActiveMediaOrRecommendation.value + + override fun hasAnyMediaOrRecommendation() = hasAnyMediaOrRecommendation.value + + override fun hasActiveMedia() = hasActiveMedia.value + + override fun hasAnyMedia() = hasAnyMedia.value + + override fun isRecommendationActive() = mediaDataRepository.smartspaceMediaData.value.isActive + + /** Add a listener for internal events. */ + private fun addInternalListener(listener: MediaDataManager.Listener) = + mediaDataProcessor.addInternalListener(listener) + + override fun dump(pw: PrintWriter, args: Array<out String>) { + mediaDeviceManager.dump(pw) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/MediaData.kt b/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/MediaData.kt index 4fa7cb54431f..11a562911a85 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/MediaData.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/MediaData.kt @@ -20,48 +20,49 @@ import android.app.PendingIntent import android.graphics.drawable.Drawable import android.graphics.drawable.Icon import android.media.session.MediaSession +import android.os.Process import com.android.internal.logging.InstanceId import com.android.systemui.res.R /** State of a media view. */ data class MediaData( - val userId: Int, + val userId: Int = -1, val initialized: Boolean = false, /** App name that will be displayed on the player. */ - val app: String?, + val app: String? = null, /** App icon shown on player. */ - val appIcon: Icon?, + val appIcon: Icon? = null, /** Artist name. */ - val artist: CharSequence?, + val artist: CharSequence? = null, /** Song name. */ - val song: CharSequence?, + val song: CharSequence? = null, /** Album artwork. */ - val artwork: Icon?, + val artwork: Icon? = null, /** List of generic action buttons for the media player, based on notification actions */ - val actions: List<MediaAction>, + val actions: List<MediaAction> = emptyList(), /** Same as above, but shown on smaller versions of the player, like in QQS or keyguard. */ - val actionsToShowInCompact: List<Int>, + val actionsToShowInCompact: List<Int> = emptyList(), /** * Semantic actions buttons, based on the PlaybackState of the media session. If present, these * actions will be preferred in the UI over [actions] */ val semanticActions: MediaButton? = null, /** Package name of the app that's posting the media. */ - val packageName: String, + val packageName: String = "INVALID", /** Unique media session identifier. */ - val token: MediaSession.Token?, + val token: MediaSession.Token? = null, /** Action to perform when the player is tapped. This is unrelated to {@link #actions}. */ - val clickIntent: PendingIntent?, + val clickIntent: PendingIntent? = null, /** Where the media is playing: phone, headphones, ear buds, remote session. */ - val device: MediaDeviceData?, + val device: MediaDeviceData? = null, /** * When active, a player will be displayed on keyguard and quick-quick settings. This is * unrelated to the stream being playing or not, a player will not be active if timed out, or in * resumption mode. */ - var active: Boolean, + var active: Boolean = true, /** Action that should be performed to restart a non active session. */ - var resumeAction: Runnable?, + var resumeAction: Runnable? = null, /** Playback location: one of PLAYBACK_LOCAL, PLAYBACK_CAST_LOCAL, or PLAYBACK_CAST_REMOTE */ var playbackLocation: Int = PLAYBACK_LOCAL, /** @@ -88,10 +89,10 @@ data class MediaData( var createdTimestampMillis: Long = 0L, /** Instance ID for logging purposes */ - val instanceId: InstanceId, + val instanceId: InstanceId = InstanceId.fakeInstanceId(-1), /** The UID of the app, used for logging */ - val appUid: Int, + val appUid: Int = Process.INVALID_UID, /** Whether explicit indicator exists */ val isExplicit: Boolean = false, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/SmartspaceMediaData.kt b/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/SmartspaceMediaData.kt index 52c605f55665..b44658502f48 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/SmartspaceMediaData.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/shared/model/SmartspaceMediaData.kt @@ -30,23 +30,23 @@ import com.android.internal.logging.InstanceId /** State of a Smartspace media recommendations view. */ data class SmartspaceMediaData( /** Unique id of a Smartspace media target. */ - val targetId: String, + val targetId: String = "INVALID", /** Indicates if the status is active. */ - val isActive: Boolean, + val isActive: Boolean = false, /** Package name of the media recommendations' provider-app. */ - val packageName: String, + val packageName: String = "INVALID", /** Action to perform when the card is tapped. Also contains the target's extra info. */ - val cardAction: SmartspaceAction?, + val cardAction: SmartspaceAction? = null, /** List of media recommendations. */ - val recommendations: List<SmartspaceAction>, + val recommendations: List<SmartspaceAction> = emptyList(), /** Intent for the user's initiated dismissal. */ - val dismissIntent: Intent?, + val dismissIntent: Intent? = null, /** The timestamp in milliseconds that the card was generated */ - val headphoneConnectionTimeMillis: Long, + val headphoneConnectionTimeMillis: Long = 0L, /** Instance ID for [MediaUiEventLogger] */ - val instanceId: InstanceId, + val instanceId: InstanceId? = null, /** The timestamp in milliseconds indicating when the card should be removed */ - val expiryTimeMs: Long, + val expiryTimeMs: Long = 0L, ) { /** * Indicates if all the data is valid. diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt index b721236eab01..655e6a55fb95 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt @@ -1163,7 +1163,7 @@ constructor( // Only log media resume card when Smartspace data is available if ( !mediaControlKey.isSsMediaRec && - !mediaManager.smartspaceMediaData.isActive && + !mediaManager.isRecommendationActive() && MediaPlayerData.smartspaceMediaData == null ) { return diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java index 26c63f31fa46..899b9ed103cd 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java @@ -1306,7 +1306,7 @@ public class MediaControlPanel { TurbulenceNoiseAnimationConfig.DEFAULT_NOISE_SPEED_Z, // Color will be correctly updated in ColorSchemeTransition. /* color= */ mColorSchemeTransition.getAccentPrimary().getCurrentColor(), - /* backgroundColor= */ Color.BLACK, + /* screenColor= */ Color.BLACK, width, height, TurbulenceNoiseAnimationConfig.DEFAULT_MAX_DURATION_IN_MILLIS, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaUiEventLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaUiEventLogger.kt index f8c816ca0b52..2c25fe2ecb29 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaUiEventLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaUiEventLogger.kt @@ -161,7 +161,7 @@ class MediaUiEventLogger @Inject constructor(private val logger: UiEventLogger) logger.log(event) } - fun logRecommendationAdded(packageName: String, instanceId: InstanceId) { + fun logRecommendationAdded(packageName: String, instanceId: InstanceId?) { logger.logWithInstanceId( MediaUiEvent.MEDIA_RECOMMENDATION_ADDED, 0, @@ -170,7 +170,7 @@ class MediaUiEventLogger @Inject constructor(private val logger: UiEventLogger) ) } - fun logRecommendationRemoved(packageName: String, instanceId: InstanceId) { + fun logRecommendationRemoved(packageName: String, instanceId: InstanceId?) { logger.logWithInstanceId( MediaUiEvent.MEDIA_RECOMMENDATION_REMOVED, 0, diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java index d84e5dde6967..0fa3605ecd6d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java @@ -19,6 +19,7 @@ package com.android.systemui.media.dagger; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.log.LogBuffer; import com.android.systemui.log.LogBufferFactory; +import com.android.systemui.media.controls.domain.MediaDomainModule; import com.android.systemui.media.controls.domain.pipeline.MediaDataManager; import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager; import com.android.systemui.media.controls.ui.controller.MediaHostStatesManager; @@ -38,7 +39,11 @@ import java.util.Optional; import javax.inject.Named; /** Dagger module for the media package. */ -@Module(subcomponents = { +@Module( + includes = { + MediaDomainModule.class + }, + subcomponents = { MediaComplicationComponent.class, }) public interface MediaModule { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java index dfe41eb9f7f2..d49a513f6e9f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java @@ -243,7 +243,7 @@ public final class NavBarHelper implements Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED), false, mAssistContentObserver, UserHandle.USER_ALL); mContentResolver.registerContentObserver( - Settings.Secure.getUriFor(Secure.SEARCH_LONG_PRESS_HOME_ENABLED), + Settings.Secure.getUriFor(Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED), false, mAssistContentObserver, UserHandle.USER_ALL); mContentResolver.registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED), @@ -443,10 +443,10 @@ public final class NavBarHelper implements boolean overrideLongPressHome = mAssistManagerLazy.get() .shouldOverrideAssist(AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS); boolean longPressDefault = mContext.getResources().getBoolean(overrideLongPressHome - ? com.android.internal.R.bool.config_searchLongPressHomeEnabledDefault + ? com.android.internal.R.bool.config_searchAllEntrypointsEnabledDefault : com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault); mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver, - overrideLongPressHome ? Secure.SEARCH_LONG_PRESS_HOME_ENABLED + overrideLongPressHome ? Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED : Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0, mUserTracker.getUserId()) != 0; diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java index 1d820a14be4e..0a880293ca76 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java @@ -21,6 +21,9 @@ import static android.app.NotificationManager.INTERRUPTION_FILTER_ALARMS; import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL; import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE; import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY; +import static android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN; +import static android.appwidget.AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD; +import static android.appwidget.flags.Flags.generatedPreviews; import static android.content.Intent.ACTION_BOOT_COMPLETED; import static android.content.Intent.ACTION_PACKAGE_ADDED; import static android.content.Intent.ACTION_PACKAGE_REMOVED; @@ -56,6 +59,7 @@ import android.app.people.IPeopleManager; import android.app.people.PeopleManager; import android.app.people.PeopleSpaceTile; import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -80,12 +84,15 @@ import android.service.notification.StatusBarNotification; import android.service.notification.ZenModeConfig; import android.text.TextUtils; import android.util.Log; +import android.util.SparseBooleanArray; import android.widget.RemoteViews; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLoggerImpl; +import com.android.keyguard.KeyguardUpdateMonitor; +import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.Dumpable; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; @@ -96,6 +103,8 @@ import com.android.systemui.people.PeopleBackupFollowUpJob; import com.android.systemui.people.PeopleSpaceUtils; import com.android.systemui.people.PeopleTileViewHelper; import com.android.systemui.people.SharedPreferencesHelper; +import com.android.systemui.res.R; +import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -160,13 +169,27 @@ public class PeopleSpaceWidgetManager implements Dumpable { @GuardedBy("mLock") public static Map<Integer, PeopleSpaceTile> mTiles = new HashMap<>(); + @NonNull private final UserTracker mUserTracker; + @NonNull private final SparseBooleanArray mUpdatedPreviews = new SparseBooleanArray(); + @NonNull private final KeyguardUpdateMonitorCallback mKeyguardUpdateMonitorCallback = + new KeyguardUpdateMonitorCallback() { + @Override + public void onUserUnlocked() { + if (DEBUG) { + Log.d(TAG, "onUserUnlocked " + mUserTracker.getUserId()); + } + updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + } + }; + @Inject public PeopleSpaceWidgetManager(Context context, LauncherApps launcherApps, CommonNotifCollection notifCollection, PackageManager packageManager, Optional<Bubbles> bubblesOptional, UserManager userManager, NotificationManager notificationManager, BroadcastDispatcher broadcastDispatcher, @Background Executor bgExecutor, - DumpManager dumpManager) { + DumpManager dumpManager, @NonNull UserTracker userTracker, + @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor) { if (DEBUG) Log.d(TAG, "constructor"); mContext = context; mAppWidgetManager = AppWidgetManager.getInstance(context); @@ -187,6 +210,8 @@ public class PeopleSpaceWidgetManager implements Dumpable { mBroadcastDispatcher = broadcastDispatcher; mBgExecutor = bgExecutor; dumpManager.registerNormalDumpable(TAG, this); + mUserTracker = userTracker; + keyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback); } /** Initializes {@PeopleSpaceWidgetManager}. */ @@ -246,7 +271,7 @@ public class PeopleSpaceWidgetManager implements Dumpable { CommonNotifCollection notifCollection, PackageManager packageManager, Optional<Bubbles> bubblesOptional, UserManager userManager, BackupManager backupManager, INotificationManager iNotificationManager, NotificationManager notificationManager, - @Background Executor executor) { + @Background Executor executor, UserTracker userTracker) { mContext = context; mAppWidgetManager = appWidgetManager; mIPeopleManager = iPeopleManager; @@ -262,6 +287,7 @@ public class PeopleSpaceWidgetManager implements Dumpable { mManager = this; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); mBgExecutor = executor; + mUserTracker = userTracker; } /** @@ -1407,4 +1433,32 @@ public class PeopleSpaceWidgetManager implements Dumpable { Trace.traceEnd(Trace.TRACE_TAG_APP); } + + @VisibleForTesting + void updateGeneratedPreviewForUser(UserHandle user) { + if (!generatedPreviews() || mUpdatedPreviews.get(user.getIdentifier()) + || !mUserManager.isUserUnlocked(user)) { + return; + } + + // The widget provider may be disabled on SystemUI implementers, e.g. TvSystemUI. + ComponentName provider = new ComponentName(mContext, PeopleSpaceWidgetProvider.class); + List<AppWidgetProviderInfo> infos = mAppWidgetManager.getInstalledProvidersForPackage( + mContext.getPackageName(), user); + if (infos.stream().noneMatch(info -> info.provider.equals(provider))) { + return; + } + + if (DEBUG) { + Log.d(TAG, "Updating People Space widget preview for user " + user.getIdentifier()); + } + boolean success = mAppWidgetManager.setWidgetPreview( + provider, WIDGET_CATEGORY_HOME_SCREEN | WIDGET_CATEGORY_KEYGUARD, + new RemoteViews(mContext.getPackageName(), + R.layout.people_space_placeholder_layout)); + if (DEBUG && !success) { + Log.d(TAG, "Failed to update generated preview for user " + user.getIdentifier()); + } + mUpdatedPreviews.put(user.getIdentifier(), success); + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index 5d2aeef5eb16..b34b3701528b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -432,6 +432,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { for (int i = 0; i < NP; i++) { mPages.get(i).removeAllViews(); } + if (mPageIndicator != null) { + mPageIndicator.setNumPages(numPages); + } if (NP == numPages) { return; } @@ -443,7 +446,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { mLogger.d("Removing page"); mPages.remove(mPages.size() - 1); } - mPageIndicator.setNumPages(mPages.size()); setAdapter(mAdapter); mAdapter.notifyDataSetChanged(); if (mPageToRestore != NO_PAGE) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 7a7ee59fa63f..00757b7bd51a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -127,8 +127,9 @@ public class QSPanel extends LinearLayout implements Tunable { } - void initialize(QSLogger qsLogger) { + void initialize(QSLogger qsLogger, boolean usingMediaPlayer) { mQsLogger = qsLogger; + mUsingMediaPlayer = usingMediaPlayer; mTileLayout = getOrCreateTileLayout(); if (mUsingMediaPlayer) { @@ -163,22 +164,25 @@ public class QSPanel extends LinearLayout implements Tunable { } protected void setHorizontalContentContainerClipping() { - mHorizontalContentContainer.setClipChildren(true); - mHorizontalContentContainer.setClipToPadding(false); - // Don't clip on the top, that way, secondary pages tiles can animate up - // Clipping coordinates should be relative to this view, not absolute (parent coordinates) - mHorizontalContentContainer.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - if ((right - left) != (oldRight - oldLeft) - || ((bottom - top) != (oldBottom - oldTop))) { - mClippingRect.right = right - left; - mClippingRect.bottom = bottom - top; - mHorizontalContentContainer.setClipBounds(mClippingRect); - } - }); - mClippingRect.left = 0; - mClippingRect.top = -1000; - mHorizontalContentContainer.setClipBounds(mClippingRect); + if (mHorizontalContentContainer != null) { + mHorizontalContentContainer.setClipChildren(true); + mHorizontalContentContainer.setClipToPadding(false); + // Don't clip on the top, that way, secondary pages tiles can animate up + // Clipping coordinates should be relative to this view, not absolute + // (parent coordinates) + mHorizontalContentContainer.addOnLayoutChangeListener( + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { + if ((right - left) != (oldRight - oldLeft) + || ((bottom - top) != (oldBottom - oldTop))) { + mClippingRect.right = right - left; + mClippingRect.bottom = bottom - top; + mHorizontalContentContainer.setClipBounds(mClippingRect); + } + }); + mClippingRect.left = 0; + mClippingRect.top = -1000; + mHorizontalContentContainer.setClipBounds(mClippingRect); + } } /** @@ -412,7 +416,7 @@ public class QSPanel extends LinearLayout implements Tunable { } private void updateHorizontalLinearLayoutMargins() { - if (mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) { + if (mUsingMediaPlayer && mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) { LayoutParams lp = (LayoutParams) mHorizontalLinearLayout.getLayoutParams(); lp.bottomMargin = Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0); mHorizontalLinearLayout.setLayoutParams(lp); @@ -461,6 +465,11 @@ public class QSPanel extends LinearLayout implements Tunable { /** Call when orientation has changed and MediaHost needs to be adjusted. */ private void reAttachMediaHost(ViewGroup hostView, boolean horizontal) { if (!mUsingMediaPlayer) { + // If the host view was attached, detach it. + ViewGroup parent = (ViewGroup) hostView.getParent(); + if (parent != null) { + parent.removeView(hostView); + } return; } mMediaHostView = hostView; @@ -492,8 +501,10 @@ public class QSPanel extends LinearLayout implements Tunable { public void setExpanded(boolean expanded) { if (mExpanded == expanded) return; mExpanded = expanded; - if (!mExpanded && mTileLayout instanceof PagedTileLayout) { - ((PagedTileLayout) mTileLayout).setCurrentItem(0, false); + if (!mExpanded && mTileLayout instanceof PagedTileLayout tilesLayout) { + // Use post, so it will wait until the view is attached. If the view is not attached, + // it will not populate corresponding views (and will not do it later when attached). + tilesLayout.post(() -> tilesLayout.setCurrentItem(0, false)); } } @@ -616,7 +627,10 @@ public class QSPanel extends LinearLayout implements Tunable { if (horizontal != mUsingHorizontalLayout || force) { Log.d(getDumpableTag(), "setUsingHorizontalLayout: " + horizontal + ", " + force); mUsingHorizontalLayout = horizontal; - ViewGroup newParent = horizontal ? mHorizontalContentContainer : this; + // The tile layout should be reparented if horizontal and we are using media. If not + // using media, the parent should always be this. + ViewGroup newParent = + horizontal && mUsingMediaPlayer ? mHorizontalContentContainer : this; switchAllContentToParent(newParent, mTileLayout); reAttachMediaHost(mediaHostView, horizontal); if (needsDynamicRowsAndColumns()) { @@ -624,7 +638,9 @@ public class QSPanel extends LinearLayout implements Tunable { mTileLayout.setMaxColumns(horizontal ? 2 : 4); } updateMargins(mediaHostView); - mHorizontalLinearLayout.setVisibility(horizontal ? View.VISIBLE : View.GONE); + if (mHorizontalLinearLayout != null) { + mHorizontalLinearLayout.setVisibility(horizontal ? View.VISIBLE : View.GONE); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java index 5e12b9d4cc34..d8e81875bbbf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java @@ -167,7 +167,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr @Override protected void onInit() { - mView.initialize(mQSLogger); + mView.initialize(mQSLogger, mUsingMediaPlayer); mQSLogger.logAllTilesChangeListening(mView.isListening(), mView.getDumpableTag(), ""); mHost.addCallback(mQSHostCallback); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt index 63963ded2923..e1c543f8f025 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt @@ -37,7 +37,6 @@ import android.util.TypedValue import android.view.Gravity import android.view.LayoutInflater import android.view.View -import android.view.ViewConfiguration import android.view.ViewGroup import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityNodeInfo @@ -185,6 +184,8 @@ open class QSTileViewImpl @JvmOverloads constructor( private var initialLongPressProperties: QSLongPressProperties? = null private var finalLongPressProperties: QSLongPressProperties? = null private val colorEvaluator = ArgbEvaluator.getInstance() + val hasLongPressEffect: Boolean + get() = longPressEffect != null init { val typedValue = TypedValue() @@ -611,10 +612,9 @@ open class QSTileViewImpl @JvmOverloads constructor( // Long-press effects if (quickSettingsVisualHapticsLongpress()){ - if (state.handlesLongClick) { - // initialize the long-press effect and set it as the touch listener + if (state.handlesLongClick && maybeCreateAndInitializeLongPressEffect()) { + // set the valid long-press effect as the touch listener showRippleEffect = false - initializeLongPressEffect() setOnTouchListener(longPressEffect) QSLongPressEffectViewBinder.bind(this, longPressEffect) } else { @@ -751,7 +751,7 @@ open class QSTileViewImpl @JvmOverloads constructor( override fun onActivityLaunchAnimationEnd() = resetLongPressEffectProperties() fun updateLongPressEffectProperties(effectProgress: Float) { - if (!isLongClickable) return + if (!isLongClickable || longPressEffect == null) return setAllColors( colorEvaluator.evaluate( effectProgress, @@ -836,13 +836,25 @@ open class QSTileViewImpl @JvmOverloads constructor( icon.setTint(icon.mIcon as ImageView, lastIconTint) } - private fun initializeLongPressEffect() { + private fun maybeCreateAndInitializeLongPressEffect(): Boolean { + // Don't setup the effect if the long-press duration is invalid + val effectDuration = longPressEffectDuration + if (effectDuration <= 0) { + longPressEffect = null + return false + } + initializeLongPressProperties() - longPressEffect = - QSLongPressEffect( - vibratorHelper, - ViewConfiguration.getLongPressTimeout() - ViewConfiguration.getTapTimeout(), - ) + if (longPressEffect == null) { + longPressEffect = + QSLongPressEffect( + vibratorHelper, + effectDuration, + ) + } else { + longPressEffect?.resetWithDuration(effectDuration) + } + return true } private fun initializeLongPressProperties() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt index d82b1755ac80..b418a174d84e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt @@ -44,6 +44,7 @@ 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.recordissue.IssueRecordingService +import com.android.systemui.recordissue.IssueRecordingState import com.android.systemui.recordissue.RecordIssueDialogDelegate import com.android.systemui.res.R import com.android.systemui.screenrecord.RecordingService @@ -69,6 +70,7 @@ constructor( private val dialogTransitionAnimator: DialogTransitionAnimator, private val panelInteractor: PanelInteractor, private val userContextProvider: UserContextProvider, + private val issueRecordingState: IssueRecordingState, private val delegateFactory: RecordIssueDialogDelegate.Factory, ) : QSTileImpl<QSTile.BooleanState>( @@ -83,7 +85,16 @@ constructor( qsLogger ) { - @VisibleForTesting var isRecording: Boolean = false + private val onRecordingChangeListener = Runnable { refreshState() } + + override fun handleSetListening(listening: Boolean) { + super.handleSetListening(listening) + if (listening) { + issueRecordingState.addListener(onRecordingChangeListener) + } else { + issueRecordingState.removeListener(onRecordingChangeListener) + } + } override fun getTileLabel(): CharSequence = mContext.getString(R.string.qs_record_issue_label) @@ -103,13 +114,11 @@ constructor( @VisibleForTesting public override fun handleClick(view: View?) { - if (isRecording) { - isRecording = false + if (issueRecordingState.isRecording) { stopIssueRecordingService() } else { mUiHandler.post { showPrompt(view) } } - refreshState() } private fun startIssueRecordingService(screenRecord: Boolean, winscopeTracing: Boolean) = @@ -138,11 +147,9 @@ constructor( val dialog: AlertDialog = delegateFactory .create { - isRecording = true startIssueRecordingService(it.screenRecord, it.winscopeTracing) dialogTransitionAnimator.disableAllCurrentDialogsExitAnimations() panelInteractor.collapsePanels() - refreshState() } .createDialog() val dismissAction = @@ -168,7 +175,7 @@ constructor( @VisibleForTesting public override fun handleUpdateState(qsTileState: QSTile.BooleanState, arg: Any?) { qsTileState.apply { - if (isRecording) { + if (issueRecordingState.isRecording) { value = true state = Tile.STATE_ACTIVE forceExpandIcon = false diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt index 2b8c335cb0ad..c0fc52e85866 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt @@ -83,6 +83,7 @@ constructor( } } + sideViewIcon = QSTileState.SideViewIcon.Chevron contentDescription = label supportedActions = setOf(QSTileState.UserAction.CLICK) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt index c1b20374dbac..671050477042 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt @@ -23,16 +23,21 @@ import android.view.View import androidx.annotation.VisibleForTesting import androidx.asynclayoutinflater.view.AsyncLayoutInflater import com.android.settingslib.applications.InterestingConfigChanges +import com.android.systemui.Dumpable import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.qs.QSContainerController import com.android.systemui.qs.QSContainerImpl import com.android.systemui.qs.QSImpl import com.android.systemui.qs.dagger.QSSceneComponent import com.android.systemui.res.R +import com.android.systemui.shade.domain.interactor.ShadeInteractor +import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.util.kotlin.sample +import java.io.PrintWriter import javax.inject.Inject import javax.inject.Provider import kotlin.coroutines.resume @@ -107,11 +112,17 @@ interface QSSceneAdapter { } /** State for appearing QQS from Lockscreen or Gone */ - data class Unsquishing(override val squishiness: Float) : State { + data class UnsquishingQQS(override val squishiness: Float) : State { override val isVisible = true override val expansion = 0f } + /** State for appearing QS from Lockscreen or Gone, used in Split shade */ + data class UnsquishingQS(override val squishiness: Float) : State { + override val isVisible = true + override val expansion = 1f + } + companion object { // These are special cases of the expansion. val QQS = Expanding(0f) @@ -129,22 +140,28 @@ class QSSceneAdapterImpl constructor( private val qsSceneComponentFactory: QSSceneComponent.Factory, private val qsImplProvider: Provider<QSImpl>, + shadeInteractor: ShadeInteractor, + dumpManager: DumpManager, @Main private val mainDispatcher: CoroutineDispatcher, @Application applicationScope: CoroutineScope, private val configurationInteractor: ConfigurationInteractor, private val asyncLayoutInflaterFactory: (Context) -> AsyncLayoutInflater, -) : QSContainerController, QSSceneAdapter { +) : QSContainerController, QSSceneAdapter, Dumpable { @Inject constructor( qsSceneComponentFactory: QSSceneComponent.Factory, qsImplProvider: Provider<QSImpl>, + shadeInteractor: ShadeInteractor, + dumpManager: DumpManager, @Main dispatcher: CoroutineDispatcher, @Application scope: CoroutineScope, configurationInteractor: ConfigurationInteractor, ) : this( qsSceneComponentFactory, qsImplProvider, + shadeInteractor, + dumpManager, dispatcher, scope, configurationInteractor, @@ -182,6 +199,7 @@ constructor( ) init { + dumpManager.registerDumpable(this) applicationScope.launch { launch { state.sample(_isCustomizing, ::Pair).collect { (state, customizing) -> @@ -210,6 +228,11 @@ constructor( it.second.applyBottomNavBarToCustomizerPadding(it.first) } } + launch { + shadeInteractor.shadeMode.collect { + qsImpl.value?.setInSplitShade(it == ShadeMode.Split) + } + } } } @@ -256,9 +279,17 @@ constructor( private fun QSImpl.applyState(state: QSSceneAdapter.State) { setQsVisible(state.isVisible) - setExpanded(state.isVisible) + setExpanded(state.isVisible && state.expansion > 0f) setListening(state.isVisible) setQsExpansion(state.expansion, 1f, 0f, state.squishiness) - setTransitionToFullShadeProgress(false, 1f, state.squishiness) + } + + override fun dump(pw: PrintWriter, args: Array<out String>) { + pw.apply { + println("Last state: ${state.value}") + println("Customizing: ${isCustomizing.value}") + println("QQS height: $qqsHeight") + println("QS height: $qsHeight") + } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt index 34f66b85def1..c695d4c98308 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt @@ -48,6 +48,8 @@ constructor( qsSceneAdapter.isCustomizing.map { customizing -> if (customizing) { mapOf<UserAction, UserActionResult>(Back to UserActionResult(Scenes.QuickSettings)) + // TODO(b/330200163) Add an Up from Bottom to be able to collapse the shade + // while customizing } else { mapOf( Back to UserActionResult(Scenes.Shade), diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index d0ff33869a77..7c1a2c032bea 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -86,7 +86,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; -import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.KeyguardUnlockAnimationController; import com.android.systemui.keyguard.KeyguardWmStateRefactor; import com.android.systemui.keyguard.WakefulnessLifecycle; @@ -146,7 +145,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private static final long MAX_BACKOFF_MILLIS = 10 * 60 * 1000; private final Context mContext; - private final FeatureFlags mFeatureFlags; private final SceneContainerFlags mSceneContainerFlags; private final Executor mMainExecutor; private final ShellInterface mShellInterface; @@ -209,8 +207,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void onStatusBarTouchEvent(MotionEvent event) { verifyCallerAndClearCallingIdentity("onStatusBarTouchEvent", () -> { - // TODO move this logic to message queue - if (event.getActionMasked() == ACTION_DOWN) { + if (mSceneContainerFlags.isEnabled()) { + //TODO(b/329863123) implement latency tracking for shade scene + Log.i(TAG_OPS, "Scene container enabled. Latency tracking not started."); + } else if (event.getActionMasked() == ACTION_DOWN) { mShadeViewControllerLazy.get().startExpandLatencyTracking(); } mHandler.post(() -> { @@ -600,7 +600,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis KeyguardUnlockAnimationController sysuiUnlockAnimationController, InWindowLauncherUnlockAnimationManager inWindowLauncherUnlockAnimationManager, AssistUtils assistUtils, - FeatureFlags featureFlags, SceneContainerFlags sceneContainerFlags, DumpManager dumpManager, Optional<UnfoldTransitionProgressForwarder> unfoldTransitionProgressForwarder, @@ -613,7 +612,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } mContext = context; - mFeatureFlags = featureFlags; mSceneContainerFlags = sceneContainerFlags; mMainExecutor = mainExecutor; mShellInterface = shellInterface; diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt index 7009816942f2..5e4919d44f23 100644 --- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt +++ b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt @@ -59,6 +59,7 @@ constructor( keyguardDismissUtil: KeyguardDismissUtil, private val dialogTransitionAnimator: DialogTransitionAnimator, private val panelInteractor: PanelInteractor, + private val issueRecordingState: IssueRecordingState, ) : RecordingService( controller, @@ -90,6 +91,7 @@ constructor( DEFAULT_MAX_TRACE_SIZE, DEFAULT_MAX_TRACE_DURATION_IN_MINUTES ) + issueRecordingState.isRecording = true if (!intent.getBooleanExtra(EXTRA_SCREEN_RECORD, false)) { // If we don't want to record the screen, the ACTION_SHOW_START_NOTIF action // will circumvent the RecordingService's screen recording start code. @@ -103,6 +105,7 @@ constructor( // this line should be removed. getSystemService(LauncherApps::class.java)?.saveViewCaptureData() TraceUtils.traceStop(contentResolver) + issueRecordingState.isRecording = false } ACTION_SHARE -> { shareRecording(intent) diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt new file mode 100644 index 000000000000..394c5c2775a4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 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.recordissue + +import com.android.systemui.dagger.SysUISingleton +import java.util.concurrent.CopyOnWriteArrayList +import javax.inject.Inject + +@SysUISingleton +class IssueRecordingState @Inject constructor() { + + private val listeners = CopyOnWriteArrayList<Runnable>() + + var isRecording = false + set(value) { + field = value + listeners.forEach(Runnable::run) + } + + fun addListener(listener: Runnable) { + listeners.add(listener) + } + + fun removeListener(listener: Runnable) { + listeners.remove(listener) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt index 7313a49be1bf..832fc3f00022 100644 --- a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt @@ -17,6 +17,7 @@ package com.android.systemui.recordissue import android.annotation.SuppressLint +import android.app.AlertDialog import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -74,7 +75,6 @@ constructor( @SuppressLint("UseSwitchCompatOrMaterialCode") private lateinit var screenRecordSwitch: Switch private lateinit var issueTypeButton: Button - private var hasSelectedIssueType: Boolean = false @MainThread override fun beforeCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) { @@ -86,15 +86,13 @@ constructor( setPositiveButton( R.string.qs_record_issue_start, { _, _ -> - if (hasSelectedIssueType) { - onStarted.accept( - IssueRecordingConfig( - screenRecordSwitch.isChecked, - true /* TODO: Base this on issueType selected */ - ) + onStarted.accept( + IssueRecordingConfig( + screenRecordSwitch.isChecked, + true /* TODO: Base this on issueType selected */ ) - dismiss() - } + ) + dismiss() }, false ) @@ -115,8 +113,12 @@ constructor( bgExecutor.execute { onScreenRecordSwitchClicked() } } } + val startButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE) issueTypeButton = requireViewById(R.id.issue_type_button) - issueTypeButton.setOnClickListener { onIssueTypeClicked(context) } + issueTypeButton.setOnClickListener { + onIssueTypeClicked(context) { startButton.isEnabled = true } + } + startButton.isEnabled = false } } @@ -159,7 +161,7 @@ constructor( } @MainThread - private fun onIssueTypeClicked(context: Context) { + private fun onIssueTypeClicked(context: Context, onIssueTypeSelected: Runnable) { val selectedCategory = issueTypeButton.text.toString() val popupMenu = PopupMenu(context, issueTypeButton) @@ -174,11 +176,11 @@ constructor( popupMenu.apply { setOnMenuItemClickListener { issueTypeButton.text = it.title + onIssueTypeSelected.run() true } setForceShowIcon(true) show() } - hasSelectedIssueType = true } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt new file mode 100644 index 000000000000..abdbd6880b33 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2024 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.screenshot + +import android.content.Context +import android.content.Intent +import android.graphics.drawable.Drawable +import android.net.Uri +import android.os.UserHandle +import androidx.appcompat.content.res.AppCompatResources +import com.android.systemui.res.R +import javax.inject.Inject + +/** + * Provides static actions for screenshots. This class can be overridden by a vendor-specific SysUI + * implementation. + */ +interface ScreenshotActionsProvider { + data class ScreenshotAction( + val icon: Drawable?, + val text: String?, + val overrideTransition: Boolean, + val retrieveIntent: (Uri) -> Intent + ) + + fun getPreviewAction(context: Context, uri: Uri, user: UserHandle): Intent + fun getActions(context: Context, user: UserHandle): List<ScreenshotAction> +} + +class DefaultScreenshotActionsProvider @Inject constructor() : ScreenshotActionsProvider { + override fun getPreviewAction(context: Context, uri: Uri, user: UserHandle): Intent { + return ActionIntentCreator.createEdit(uri, context) + } + + override fun getActions( + context: Context, + user: UserHandle + ): List<ScreenshotActionsProvider.ScreenshotAction> { + val editAction = + ScreenshotActionsProvider.ScreenshotAction( + AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_edit), + context.resources.getString(R.string.screenshot_edit_label), + true + ) { uri -> + ActionIntentCreator.createEdit(uri, context) + } + val shareAction = + ScreenshotActionsProvider.ScreenshotAction( + AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_share), + context.resources.getString(R.string.screenshot_share_label), + false + ) { uri -> + ActionIntentCreator.createShare(uri) + } + return listOf(editAction, shareAction) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt new file mode 100644 index 000000000000..9354fd27ce5a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2024 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.screenshot + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.app.Notification +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Rect +import android.view.KeyEvent +import android.view.LayoutInflater +import android.view.ScrollCaptureResponse +import android.view.View +import android.view.ViewTreeObserver +import android.view.WindowInsets +import android.window.OnBackInvokedCallback +import android.window.OnBackInvokedDispatcher +import com.android.internal.logging.UiEventLogger +import com.android.systemui.log.DebugLogger.debugLog +import com.android.systemui.res.R +import com.android.systemui.screenshot.LogConfig.DEBUG_ACTIONS +import com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS +import com.android.systemui.screenshot.LogConfig.DEBUG_INPUT +import com.android.systemui.screenshot.LogConfig.DEBUG_WINDOW +import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_DISMISSED_OTHER +import com.android.systemui.screenshot.scroll.ScrollCaptureController +import com.android.systemui.screenshot.ui.ScreenshotAnimationController +import com.android.systemui.screenshot.ui.ScreenshotShelfView +import com.android.systemui.screenshot.ui.binder.ScreenshotShelfViewBinder +import com.android.systemui.screenshot.ui.viewmodel.ActionButtonViewModel +import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +/** Controls the screenshot view and viewModel. */ +class ScreenshotShelfViewProxy +@AssistedInject +constructor( + private val logger: UiEventLogger, + private val viewModel: ScreenshotViewModel, + private val staticActionsProvider: ScreenshotActionsProvider, + @Assisted private val context: Context, + @Assisted private val displayId: Int +) : ScreenshotViewProxy { + override val view: ScreenshotShelfView = + LayoutInflater.from(context).inflate(R.layout.screenshot_shelf, null) as ScreenshotShelfView + override val screenshotPreview: View + override var packageName: String = "" + override var callbacks: ScreenshotView.ScreenshotViewCallback? = null + override var screenshot: ScreenshotData? = null + set(value) { + viewModel.setScreenshotBitmap(value?.bitmap) + field = value + } + + override val isAttachedToWindow + get() = view.isAttachedToWindow + override var isDismissing = false + override var isPendingSharedTransition = false + + private val animationController = ScreenshotAnimationController(view) + + init { + ScreenshotShelfViewBinder.bind(view, viewModel, LayoutInflater.from(context)) + addPredictiveBackListener { requestDismissal(SCREENSHOT_DISMISSED_OTHER) } + setOnKeyListener { requestDismissal(SCREENSHOT_DISMISSED_OTHER) } + debugLog(DEBUG_WINDOW) { "adding OnComputeInternalInsetsListener" } + screenshotPreview = view.screenshotPreview + } + + override fun reset() { + animationController.cancel() + isPendingSharedTransition = false + viewModel.setScreenshotBitmap(null) + viewModel.setActions(listOf()) + } + override fun updateInsets(insets: WindowInsets) {} + override fun updateOrientation(insets: WindowInsets) {} + + override fun createScreenshotDropInAnimation(screenRect: Rect, showFlash: Boolean): Animator { + return animationController.getEntranceAnimation() + } + + override fun addQuickShareChip(quickShareAction: Notification.Action) {} + + override fun setChipIntents(imageData: ScreenshotController.SavedImageData) { + val staticActions = + staticActionsProvider.getActions(context, imageData.owner).map { + ActionButtonViewModel(it.icon, it.text) { + val intent = it.retrieveIntent(imageData.uri) + debugLog(DEBUG_ACTIONS) { "Action tapped: $intent" } + isPendingSharedTransition = true + callbacks?.onAction(intent, imageData.owner, it.overrideTransition) + } + } + + viewModel.setActions(staticActions) + } + + override fun requestDismissal(event: ScreenshotEvent) { + debugLog(DEBUG_DISMISS) { "screenshot dismissal requested: $event" } + + // If we're already animating out, don't restart the animation + if (isDismissing) { + debugLog(DEBUG_DISMISS) { "Already dismissing, ignoring duplicate command $event" } + return + } + logger.log(event, 0, packageName) + val animator = animationController.getExitAnimation() + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animator: Animator) { + isDismissing = true + } + override fun onAnimationEnd(animator: Animator) { + isDismissing = false + callbacks?.onDismiss() + } + } + ) + animator.start() + } + + override fun showScrollChip(packageName: String, onClick: Runnable) {} + + override fun hideScrollChip() {} + + override fun prepareScrollingTransition( + response: ScrollCaptureResponse, + screenBitmap: Bitmap, + newScreenshot: Bitmap, + screenshotTakenInPortrait: Boolean, + onTransitionPrepared: Runnable, + ) {} + + override fun startLongScreenshotTransition( + transitionDestination: Rect, + onTransitionEnd: Runnable, + longScreenshot: ScrollCaptureController.LongScreenshot + ) {} + + override fun restoreNonScrollingUi() {} + + override fun stopInputListening() {} + + override fun requestFocus() { + view.requestFocus() + } + + override fun announceForAccessibility(string: String) = view.announceForAccessibility(string) + + override fun prepareEntranceAnimation(runnable: Runnable) { + view.viewTreeObserver.addOnPreDrawListener( + object : ViewTreeObserver.OnPreDrawListener { + override fun onPreDraw(): Boolean { + debugLog(DEBUG_WINDOW) { "onPreDraw: startAnimation" } + view.viewTreeObserver.removeOnPreDrawListener(this) + runnable.run() + return true + } + } + ) + } + + private fun addPredictiveBackListener(onDismissRequested: (ScreenshotEvent) -> Unit) { + val onBackInvokedCallback = OnBackInvokedCallback { + debugLog(DEBUG_INPUT) { "Predictive Back callback dispatched" } + onDismissRequested.invoke(SCREENSHOT_DISMISSED_OTHER) + } + view.addOnAttachStateChangeListener( + object : View.OnAttachStateChangeListener { + override fun onViewAttachedToWindow(v: View) { + debugLog(DEBUG_INPUT) { "Registering Predictive Back callback" } + view + .findOnBackInvokedDispatcher() + ?.registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_DEFAULT, + onBackInvokedCallback + ) + } + + override fun onViewDetachedFromWindow(view: View) { + debugLog(DEBUG_INPUT) { "Unregistering Predictive Back callback" } + view + .findOnBackInvokedDispatcher() + ?.unregisterOnBackInvokedCallback(onBackInvokedCallback) + } + } + ) + } + private fun setOnKeyListener(onDismissRequested: (ScreenshotEvent) -> Unit) { + view.setOnKeyListener( + object : View.OnKeyListener { + override fun onKey(view: View, keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) { + debugLog(DEBUG_INPUT) { "onKeyEvent: $keyCode" } + onDismissRequested.invoke(SCREENSHOT_DISMISSED_OTHER) + return true + } + return false + } + } + ) + } + + @AssistedFactory + interface Factory : ScreenshotViewProxy.Factory { + override fun getProxy(context: Context, displayId: Int): ScreenshotShelfViewProxy + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java index cdb9abb15e84..9118ee1dfc73 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java @@ -16,16 +16,23 @@ package com.android.systemui.screenshot.dagger; +import static com.android.systemui.Flags.screenshotShelfUi; + import android.app.Service; +import android.view.accessibility.AccessibilityManager; +import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.screenshot.DefaultScreenshotActionsProvider; import com.android.systemui.screenshot.ImageCapture; import com.android.systemui.screenshot.ImageCaptureImpl; import com.android.systemui.screenshot.LegacyScreenshotViewProxy; import com.android.systemui.screenshot.RequestProcessor; +import com.android.systemui.screenshot.ScreenshotActionsProvider; import com.android.systemui.screenshot.ScreenshotPolicy; import com.android.systemui.screenshot.ScreenshotPolicyImpl; import com.android.systemui.screenshot.ScreenshotProxyService; import com.android.systemui.screenshot.ScreenshotRequestProcessor; +import com.android.systemui.screenshot.ScreenshotShelfViewProxy; import com.android.systemui.screenshot.ScreenshotSoundController; import com.android.systemui.screenshot.ScreenshotSoundControllerImpl; import com.android.systemui.screenshot.ScreenshotSoundProvider; @@ -34,6 +41,7 @@ import com.android.systemui.screenshot.ScreenshotViewProxy; import com.android.systemui.screenshot.TakeScreenshotService; import com.android.systemui.screenshot.appclips.AppClipsScreenshotHelperService; import com.android.systemui.screenshot.appclips.AppClipsService; +import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel; import dagger.Binds; import dagger.Module; @@ -85,9 +93,25 @@ public abstract class ScreenshotModule { abstract ScreenshotSoundController bindScreenshotSoundController( ScreenshotSoundControllerImpl screenshotSoundProviderImpl); + @Binds + abstract ScreenshotActionsProvider bindScreenshotActionsProvider( + DefaultScreenshotActionsProvider defaultScreenshotActionsProvider); + + @Provides + @SysUISingleton + static ScreenshotViewModel providesScreenshotViewModel( + AccessibilityManager accessibilityManager) { + return new ScreenshotViewModel(accessibilityManager); + } + @Provides static ScreenshotViewProxy.Factory providesScreenshotViewProxyFactory( + ScreenshotShelfViewProxy.Factory shelfScreenshotViewProxyFactory, LegacyScreenshotViewProxy.Factory legacyScreenshotViewProxyFactory) { - return legacyScreenshotViewProxyFactory; + if (screenshotShelfUi()) { + return shelfScreenshotViewProxyFactory; + } else { + return legacyScreenshotViewProxyFactory; + } } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotAnimationController.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotAnimationController.kt new file mode 100644 index 000000000000..2c178736d9c4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotAnimationController.kt @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 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.screenshot.ui + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.view.View + +class ScreenshotAnimationController(private val view: View) { + private var animator: Animator? = null + + fun getEntranceAnimation(): Animator { + val animator = ValueAnimator.ofFloat(0f, 1f) + animator.addUpdateListener { view.alpha = it.animatedFraction } + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animator: Animator) { + view.alpha = 0f + } + override fun onAnimationEnd(animator: Animator) { + view.alpha = 1f + } + } + ) + this.animator = animator + return animator + } + + fun getExitAnimation(): Animator { + val animator = ValueAnimator.ofFloat(1f, 0f) + animator.addUpdateListener { view.alpha = it.animatedValue as Float } + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationStart(animator: Animator) { + view.alpha = 1f + } + override fun onAnimationEnd(animator: Animator) { + view.alpha = 0f + } + } + ) + this.animator = animator + return animator + } + + fun cancel() { + animator?.cancel() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotShelfView.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotShelfView.kt new file mode 100644 index 000000000000..747ad4f9e48c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotShelfView.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 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.screenshot.ui + +import android.content.Context +import android.util.AttributeSet +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import com.android.systemui.res.R + +class ScreenshotShelfView(context: Context, attrs: AttributeSet? = null) : + ConstraintLayout(context, attrs) { + lateinit var screenshotPreview: ImageView + + override fun onFinishInflate() { + super.onFinishInflate() + screenshotPreview = requireViewById(R.id.screenshot_preview) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt new file mode 100644 index 000000000000..a5825b5f7797 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 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.screenshot.ui.binder + +import android.view.View +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.TextView +import com.android.systemui.res.R +import com.android.systemui.screenshot.ui.viewmodel.ActionButtonViewModel + +object ActionButtonViewBinder { + /** Binds the given view to the given view-model */ + fun bind(view: View, viewModel: ActionButtonViewModel) { + val iconView = view.requireViewById<ImageView>(R.id.overlay_action_chip_icon) + val textView = view.requireViewById<TextView>(R.id.overlay_action_chip_text) + iconView.setImageDrawable(viewModel.icon) + textView.text = viewModel.name + setMargins(iconView, textView, viewModel.name?.isNotEmpty() ?: false) + if (viewModel.onClicked != null) { + view.setOnClickListener { viewModel.onClicked.invoke() } + } else { + view.setOnClickListener(null) + } + view.visibility = View.VISIBLE + view.alpha = 1f + } + + private fun setMargins(iconView: View, textView: View, hasText: Boolean) { + val iconParams = iconView.layoutParams as LinearLayout.LayoutParams + val textParams = textView.layoutParams as LinearLayout.LayoutParams + if (hasText) { + iconParams.marginStart = iconView.dpToPx(R.dimen.overlay_action_chip_padding_start) + iconParams.marginEnd = iconView.dpToPx(R.dimen.overlay_action_chip_spacing) + textParams.marginStart = 0 + textParams.marginEnd = textView.dpToPx(R.dimen.overlay_action_chip_padding_end) + } else { + val paddingHorizontal = + iconView.dpToPx(R.dimen.overlay_action_chip_icon_only_padding_horizontal) + iconParams.marginStart = paddingHorizontal + iconParams.marginEnd = paddingHorizontal + } + iconView.layoutParams = iconParams + textView.layoutParams = textParams + } + + private fun View.dpToPx(dimenId: Int): Int { + return this.resources.getDimensionPixelSize(dimenId) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt new file mode 100644 index 000000000000..3bcd52cbc99e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2024 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.screenshot.ui.binder + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.res.R +import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel +import com.android.systemui.util.children +import kotlinx.coroutines.launch + +object ScreenshotShelfViewBinder { + fun bind( + view: ViewGroup, + viewModel: ScreenshotViewModel, + layoutInflater: LayoutInflater, + ) { + val previewView: ImageView = view.requireViewById(R.id.screenshot_preview) + val previewBorder = view.requireViewById<View>(R.id.screenshot_preview_border) + previewView.clipToOutline = true + val actionsContainer: LinearLayout = view.requireViewById(R.id.screenshot_actions) + view.requireViewById<View>(R.id.screenshot_dismiss_button).visibility = + if (viewModel.showDismissButton) View.VISIBLE else View.GONE + + view.repeatWhenAttached { + lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + launch { + viewModel.preview.collect { bitmap -> + if (bitmap != null) { + previewView.setImageBitmap(bitmap) + previewView.visibility = View.VISIBLE + previewBorder.visibility = View.VISIBLE + } else { + previewView.visibility = View.GONE + previewBorder.visibility = View.GONE + } + } + } + launch { + viewModel.actions.collect { actions -> + if (actions.isNotEmpty()) { + view + .requireViewById<View>(R.id.actions_container_background) + .visibility = View.VISIBLE + } + val viewPool = actionsContainer.children.toList() + actionsContainer.removeAllViews() + val actionButtons = + List(actions.size) { + viewPool.getOrElse(it) { + layoutInflater.inflate( + R.layout.overlay_action_chip, + actionsContainer, + false + ) + } + } + actionButtons.zip(actions).forEach { + actionsContainer.addView(it.first) + ActionButtonViewBinder.bind(it.first, it.second) + } + } + } + } + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt new file mode 100644 index 000000000000..6ee970534352 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 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.screenshot.ui.viewmodel + +import android.graphics.drawable.Drawable + +data class ActionButtonViewModel( + val icon: Drawable?, + val name: String?, + val onClicked: (() -> Unit)? +) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt new file mode 100644 index 000000000000..3a652d90bb78 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 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.screenshot.ui.viewmodel + +import android.graphics.Bitmap +import android.view.accessibility.AccessibilityManager +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow + +class ScreenshotViewModel(private val accessibilityManager: AccessibilityManager) { + private val _preview = MutableStateFlow<Bitmap?>(null) + val preview: StateFlow<Bitmap?> = _preview + private val _actions = MutableStateFlow(emptyList<ActionButtonViewModel>()) + val actions: StateFlow<List<ActionButtonViewModel>> = _actions + val showDismissButton: Boolean + get() = accessibilityManager.isEnabled + + fun setScreenshotBitmap(bitmap: Bitmap?) { + _preview.value = bitmap + } + + fun setActions(actions: List<ActionButtonViewModel>) { + _actions.value = actions + } +} diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 3a2a081663cb..9cb920ab0a88 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -3257,7 +3257,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mKeyguardStatusViewController.setStatusAccessibilityImportance(mode); } - @Override public void performHapticFeedback(int constant) { mVibratorHelper.performHapticFeedback(mView, constant); } diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java index 817f0eae815b..8dbceadbb7a8 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java @@ -979,9 +979,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum void updateQsState() { boolean qsFullScreen = getExpanded() && !mSplitShadeEnabled; mShadeRepository.setLegacyQsFullscreen(qsFullScreen); - if (!FooterViewRefactor.isEnabled()) { - mNotificationStackScrollLayoutController.setQsFullScreen(qsFullScreen); - } + mNotificationStackScrollLayoutController.setQsFullScreen(qsFullScreen); if (!SceneContainerFlag.isEnabled()) { mNotificationStackScrollLayoutController.setScrollingEnabled( mBarState != KEYGUARD && (!qsFullScreen || mExpansionFromOverscroll)); @@ -1282,18 +1280,20 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum mScrimController.setScrimCornerRadius(radius); - // Convert global clipping coordinates to local ones, - // relative to NotificationStackScrollLayout - int nsslLeft = calculateNsslLeft(left); - int nsslRight = calculateNsslRight(right); - int nsslTop = getNotificationsClippingTopBounds(top); - int nsslBottom = bottom - mNotificationStackScrollLayoutController.getTop(); - int bottomRadius = mSplitShadeEnabled ? radius : 0; - // TODO (b/265193930): remove dependency on NPVC - int topRadius = mSplitShadeEnabled - && mPanelViewControllerLazy.get().isExpandingFromHeadsUp() ? 0 : radius; - mNotificationStackScrollLayoutController.setRoundedClippingBounds( - nsslLeft, nsslTop, nsslRight, nsslBottom, topRadius, bottomRadius); + if (!SceneContainerFlag.isEnabled()) { + // Convert global clipping coordinates to local ones, + // relative to NotificationStackScrollLayout + int nsslLeft = calculateNsslLeft(left); + int nsslRight = calculateNsslRight(right); + int nsslTop = getNotificationsClippingTopBounds(top); + int nsslBottom = bottom - mNotificationStackScrollLayoutController.getTop(); + int bottomRadius = mSplitShadeEnabled ? radius : 0; + // TODO (b/265193930): remove dependency on NPVC + int topRadius = mSplitShadeEnabled + && mPanelViewControllerLazy.get().isExpandingFromHeadsUp() ? 0 : radius; + mNotificationStackScrollLayoutController.setRoundedClippingBounds( + nsslLeft, nsslTop, nsslRight, nsslBottom, topRadius, bottomRadius); + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java index 0a57b64b1ecf..813df1127fb8 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeController.java @@ -232,6 +232,13 @@ public interface ShadeController extends CoreStartable { /** Called when a launch animation ends. */ void onLaunchAnimationEnd(boolean launchIsFullScreen); + /** + * Performs haptic feedback from a view with a haptic feedback constant. + * + * @param constant One of android.view.HapticFeedbackConstants + */ + void performHapticFeedback(int constant); + /** Sets the listener for when the visibility of the shade changes. */ default void setVisibilityListener(ShadeVisibilityListener listener) {} diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt index 093690ffb881..d703a2763e75 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerEmptyImpl.kt @@ -63,4 +63,5 @@ open class ShadeControllerEmptyImpl @Inject constructor() : ShadeController { override fun onStatusBarTouch(event: MotionEvent?) {} override fun onLaunchAnimationCancelled(isLaunchForActivity: Boolean) {} override fun onLaunchAnimationEnd(launchIsFullScreen: Boolean) {} + override fun performHapticFeedback(constant: Int) {} } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java index d99d607879cc..5f5e5cedff84 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java @@ -271,6 +271,11 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { } @Override + public void performHapticFeedback(int constant) { + getNpvc().performHapticFeedback(constant); + } + + @Override public void instantCollapseShade() { getNpvc().instantCollapse(); runPostCollapseActions(); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt index 177c3db6b720..c20efea4700e 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt @@ -33,6 +33,7 @@ import com.android.systemui.shade.ShadeController.ShadeVisibilityListener import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationShadeWindowController +import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager import dagger.Lazy @@ -62,6 +63,7 @@ constructor( private val deviceEntryInteractor: DeviceEntryInteractor, private val notificationStackScrollLayout: NotificationStackScrollLayout, @ShadeTouchLog private val touchLog: LogBuffer, + private val vibratorHelper: VibratorHelper, commandQueue: CommandQueue, statusBarKeyguardViewManager: StatusBarKeyguardViewManager, notificationShadeWindowController: NotificationShadeWindowController, @@ -249,4 +251,8 @@ constructor( // The only call to this doesn't happen with migrateClocksToBlueprint() enabled throw UnsupportedOperationException() } + + override fun performHapticFeedback(constant: Int) { + vibratorHelper.performHapticFeedback(notificationStackScrollLayout, constant) + } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index d90bb0b98056..9902a32a536d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -44,6 +44,7 @@ interface ShadeViewController { fun disableHeader(state1: Int, state2: Int, animated: Boolean) /** If the latency tracker is enabled, begins tracking expand latency. */ + @Deprecated("No longer supported. Do not add new calls to this.") fun startExpandLatencyTracking() /** Sets the alpha value of the shade to a value between 0 and 255. */ @@ -57,13 +58,14 @@ interface ShadeViewController { fun setAlphaChangeAnimationEndAction(r: Runnable) /** Sets Qs ScrimEnabled and updates QS state. */ + @Deprecated("Does nothing when scene container is enabled.") fun setQsScrimEnabled(qsScrimEnabled: Boolean) /** Sets the top spacing for the ambient indicator. */ fun setAmbientIndicationTop(ambientIndicationTop: Int, ambientTextVisible: Boolean) /** Updates notification panel-specific flags on [SysUiState]. */ - fun updateSystemUiStateFlags() + @Deprecated("Does nothing when scene container is enabled.") fun updateSystemUiStateFlags() /** Ensures that the touchable region is updated. */ fun updateTouchableRegion() @@ -105,16 +107,6 @@ interface ShadeViewController { @Deprecated("No longer supported. Do not add new calls to this.") fun finishInputFocusTransfer(velocity: Float) - /** - * Performs haptic feedback from a view with a haptic feedback constant. - * - * The implementation of this method should use the [android.view.View.performHapticFeedback] - * method with the provided constant. - * - * @param[constant] One of [android.view.HapticFeedbackConstants] - */ - fun performHapticFeedback(constant: Int) - /** Returns the ShadeHeadsUpTracker. */ val shadeHeadsUpTracker: ShadeHeadsUpTracker diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt index 69849e826535..93c3772c6e36 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt @@ -84,8 +84,6 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : override fun startInputFocusTransfer() {} override fun cancelInputFocusTransfer() {} override fun finishInputFocusTransfer(velocity: Float) {} - override fun performHapticFeedback(constant: Int) {} - override val shadeHeadsUpTracker = ShadeHeadsUpTrackerEmptyImpl() override val shadeFoldAnimator = ShadeFoldAnimatorEmptyImpl() @Deprecated("Use SceneInteractor.currentScene instead.") diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModel.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModel.kt index ea549f2b7e53..24b7533d6c26 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModel.kt @@ -66,11 +66,13 @@ constructor( deviceEntryInteractor.isUnlocked, deviceEntryInteractor.canSwipeToEnter, shadeInteractor.shadeMode, - ) { isUnlocked, canSwipeToDismiss, shadeMode -> + qsSceneAdapter.isCustomizing + ) { isUnlocked, canSwipeToDismiss, shadeMode, isCustomizing -> destinationScenes( isUnlocked = isUnlocked, canSwipeToDismiss = canSwipeToDismiss, shadeMode = shadeMode, + isCustomizing = isCustomizing ) } .stateIn( @@ -81,6 +83,7 @@ constructor( isUnlocked = deviceEntryInteractor.isUnlocked.value, canSwipeToDismiss = deviceEntryInteractor.canSwipeToEnter.value, shadeMode = shadeInteractor.shadeMode.value, + isCustomizing = qsSceneAdapter.isCustomizing.value, ), ) @@ -120,6 +123,7 @@ constructor( isUnlocked: Boolean, canSwipeToDismiss: Boolean?, shadeMode: ShadeMode, + isCustomizing: Boolean, ): Map<UserAction, UserActionResult> { val up = when { @@ -131,7 +135,9 @@ constructor( val down = Scenes.QuickSettings.takeIf { shadeMode is ShadeMode.Single } return buildMap { - this[Swipe(SwipeDirection.Up)] = UserActionResult(up) + if (!isCustomizing) { + this[Swipe(SwipeDirection.Up)] = UserActionResult(up) + } // TODO(b/330200163) Add an else to be able to collapse the shade while customizing down?.let { this[Swipe(SwipeDirection.Down)] = UserActionResult(down) } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java index a12b9709a063..d6858cad6d0b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java @@ -560,11 +560,6 @@ public final class KeyboardShortcutListSearch { Pair.create( KeyEvent.KEYCODE_TAB, KeyEvent.META_SHIFT_ON | KeyEvent.META_ALT_ON))), - /* Hide and (re)show taskbar: Meta + T */ - new ShortcutKeyGroupMultiMappingInfo( - context.getString(R.string.group_system_hide_reshow_taskbar), - Arrays.asList( - Pair.create(KeyEvent.KEYCODE_T, KeyEvent.META_META_ON))), /* Access notification shade: Meta + N */ new ShortcutKeyGroupMultiMappingInfo( context.getString(R.string.group_system_access_notification_shade), @@ -636,34 +631,41 @@ public final class KeyboardShortcutListSearch { // Enter Split screen with current app to RHS: Meta + Ctrl + Right arrow // Enter Split screen with current app to LHS: Meta + Ctrl + Left arrow // Switch from Split screen to full screen: Meta + Ctrl + Up arrow - String[] shortcutLabels = { - context.getString(R.string.system_multitasking_rhs), - context.getString(R.string.system_multitasking_lhs), - context.getString(R.string.system_multitasking_full_screen), - }; - int[] keyCodes = { - KeyEvent.KEYCODE_DPAD_RIGHT, - KeyEvent.KEYCODE_DPAD_LEFT, - KeyEvent.KEYCODE_DPAD_UP, - }; - - for (int i = 0; i < shortcutLabels.length; i++) { - List<ShortcutKeyGroup> shortcutKeyGroups = Arrays.asList(new ShortcutKeyGroup( - new KeyboardShortcutInfo( - shortcutLabels[i], - keyCodes[i], - KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON), - null)); - ShortcutMultiMappingInfo shortcutMultiMappingInfo = - new ShortcutMultiMappingInfo( - shortcutLabels[i], - null, - shortcutKeyGroups); - systemMultitaskingGroup.addItem(shortcutMultiMappingInfo); - } + // Change split screen focus to RHS: Meta + Alt + Right arrow + // Change split screen focus to LHS: Meta + Alt + Left arrow + systemMultitaskingGroup.addItem( + getMultitaskingShortcut(context.getString(R.string.system_multitasking_rhs), + KeyEvent.KEYCODE_DPAD_RIGHT, + KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON)); + systemMultitaskingGroup.addItem( + getMultitaskingShortcut(context.getString(R.string.system_multitasking_lhs), + KeyEvent.KEYCODE_DPAD_LEFT, + KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON)); + systemMultitaskingGroup.addItem( + getMultitaskingShortcut(context.getString(R.string.system_multitasking_full_screen), + KeyEvent.KEYCODE_DPAD_UP, + KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON)); + systemMultitaskingGroup.addItem( + getMultitaskingShortcut( + context.getString(R.string.system_multitasking_splitscreen_focus_rhs), + KeyEvent.KEYCODE_DPAD_RIGHT, + KeyEvent.META_META_ON | KeyEvent.META_ALT_ON)); + systemMultitaskingGroup.addItem( + getMultitaskingShortcut( + context.getString(R.string.system_multitasking_splitscreen_focus_lhs), + KeyEvent.KEYCODE_DPAD_LEFT, + KeyEvent.META_META_ON | KeyEvent.META_ALT_ON)); return systemMultitaskingGroup; } + private static ShortcutMultiMappingInfo getMultitaskingShortcut(String shortcutLabel, + int keycode, int modifiers) { + List<ShortcutKeyGroup> shortcutKeyGroups = Arrays.asList( + new ShortcutKeyGroup(new KeyboardShortcutInfo(shortcutLabel, keycode, modifiers), + null)); + return new ShortcutMultiMappingInfo(shortcutLabel, null, shortcutKeyGroups); + } + private static KeyboardShortcutMultiMappingGroup getMultiMappingInputShortcuts( Context context) { List<ShortcutMultiMappingInfo> shortcutMultiMappingInfoList = Arrays.asList( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index c9046217e68a..815236e0820c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -757,8 +757,8 @@ public class KeyguardIndicationController { mRotateTextViewController.updateIndication( INDICATION_TYPE_ADAPTIVE_AUTH, new KeyguardIndication.Builder() - .setMessage(mContext - .getString(R.string.kg_prompt_after_adaptive_auth_lock)) + .setMessage(mContext.getString( + R.string.keyguard_indication_after_adaptive_auth_lock)) .setTextColor(mInitialTextColorState) .build(), true); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index 5171a5c9144c..9a82ecf01449 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -863,7 +863,7 @@ public class NotificationShelf extends ActivatableNotificationView { boolean isAppearing = row.isDrawingAppearAnimation() && !row.isInShelf(); iconState.hidden = isAppearing || (view instanceof ExpandableNotificationRow - && ((ExpandableNotificationRow) view).isLowPriority() + && ((ExpandableNotificationRow) view).isMinimized() && mShelfIcons.areIconsOverflowing()) || (transitionAmount == 0.0f && !iconState.isAnimating(icon)) || row.isAboveShelf() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java index dcfccd8398b2..0bbde21ba6a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator; -import static com.android.systemui.media.controls.domain.pipeline.MediaDataManagerKt.isMediaNotification; +import static com.android.systemui.media.controls.domain.pipeline.MediaDataManager.isMediaNotification; import android.os.RemoteException; import android.service.notification.StatusBarNotification; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java index dfb0f9bb2a87..7a7b18450b48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java @@ -363,7 +363,7 @@ public class PreparationCoordinator implements Coordinator { NotifInflater.Params getInflaterParams(NotifUiAdjustment adjustment, String reason) { return new NotifInflater.Params( - /* isLowPriority = */ adjustment.isMinimized(), + /* isMinimized = */ adjustment.isMinimized(), /* reason = */ reason, /* showSnooze = */ adjustment.isSnoozeEnabled(), /* isChildInGroup = */ adjustment.isChildInGroup(), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifInflater.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifInflater.kt index 7b8a062ec446..ff72888a5c26 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifInflater.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifInflater.kt @@ -56,7 +56,7 @@ interface NotifInflater { /** A class holding parameters used when inflating the notification row */ class Params( - val isLowPriority: Boolean, + val isMinimized: Boolean, val reason: String, val showSnooze: Boolean, val isChildInGroup: Boolean = false, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java index 4bbe0357b335..4a895c0571d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java @@ -243,7 +243,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { @Nullable NotificationRowContentBinder.InflationCallback inflationCallback) { final boolean useIncreasedCollapsedHeight = mMessagingUtil.isImportantMessaging(entry.getSbn(), entry.getImportance()); - final boolean isLowPriority = inflaterParams.isLowPriority(); + final boolean isMinimized = inflaterParams.isMinimized(); // Set show snooze action row.setShowSnooze(inflaterParams.getShowSnooze()); @@ -252,7 +252,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { params.requireContentViews(FLAG_CONTENT_VIEW_CONTRACTED); params.requireContentViews(FLAG_CONTENT_VIEW_EXPANDED); params.setUseIncreasedCollapsedHeight(useIncreasedCollapsedHeight); - params.setUseLowPriority(isLowPriority); + params.setUseMinimized(isMinimized); if (screenshareNotificationHiding() ? inflaterParams.getNeedsRedaction() @@ -275,7 +275,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { if (AsyncGroupHeaderViewInflation.isEnabled()) { if (inflaterParams.isGroupSummary()) { params.requireContentViews(FLAG_GROUP_SUMMARY_HEADER); - if (isLowPriority) { + if (isMinimized) { params.requireContentViews(FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER); } } else { @@ -288,7 +288,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { mRowContentBindStage.requestRebind(entry, en -> { mLogger.logRebindComplete(entry); row.setUsesIncreasedCollapsedHeight(useIncreasedCollapsedHeight); - row.setIsLowPriority(isLowPriority); + row.setIsMinimized(isMinimized); if (inflationCallback != null) { inflationCallback.onAsyncInflationFinished(en); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index c05c3c3df2c9..b8b4a03eae51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -327,7 +327,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private OnClickListener mExpandClickListener = new OnClickListener() { @Override public void onClick(View v) { - if (!shouldShowPublic() && (!mIsLowPriority || isExpanded()) + if (!shouldShowPublic() && (!mIsMinimized || isExpanded()) && mGroupMembershipManager.isGroupSummary(mEntry)) { mGroupExpansionChanging = true; final boolean wasExpanded = mGroupExpansionManager.isGroupExpanded(mEntry); @@ -382,7 +382,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private boolean mAboveShelf; private OnUserInteractionCallback mOnUserInteractionCallback; private NotificationGutsManager mNotificationGutsManager; - private boolean mIsLowPriority; + private boolean mIsMinimized; private boolean mUseIncreasedCollapsedHeight; private boolean mUseIncreasedHeadsUpHeight; private float mTranslationWhenRemoved; @@ -467,7 +467,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView if (viewWrapper != null) { setIconAnimationRunningForChild(running, viewWrapper.getIcon()); } - NotificationViewWrapper lowPriWrapper = mChildrenContainer.getLowPriorityViewWrapper(); + NotificationViewWrapper lowPriWrapper = mChildrenContainer + .getMinimizedGroupHeaderWrapper(); if (lowPriWrapper != null) { setIconAnimationRunningForChild(running, lowPriWrapper.getIcon()); } @@ -680,7 +681,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView if (color != Notification.COLOR_INVALID) { return color; } else { - return mEntry.getContrastedColor(mContext, mIsLowPriority && !isExpanded(), + return mEntry.getContrastedColor(mContext, mIsMinimized && !isExpanded(), getBackgroundColorWithoutTint()); } } @@ -1545,7 +1546,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView * Set the low-priority group notification header view * @param headerView header view to set */ - public void setLowPriorityGroupHeader(NotificationHeaderView headerView) { + public void setMinimizedGroupHeader(NotificationHeaderView headerView) { NotificationChildrenContainer childrenContainer = getChildrenContainerNonNull(); childrenContainer.setLowPriorityGroupHeader( /* headerViewLowPriority= */ headerView, @@ -1664,16 +1665,19 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } } - public void setIsLowPriority(boolean isLowPriority) { - mIsLowPriority = isLowPriority; - mPrivateLayout.setIsLowPriority(isLowPriority); + /** + * Set if the row is minimized. + */ + public void setIsMinimized(boolean isMinimized) { + mIsMinimized = isMinimized; + mPrivateLayout.setIsLowPriority(isMinimized); if (mChildrenContainer != null) { - mChildrenContainer.setIsLowPriority(isLowPriority); + mChildrenContainer.setIsMinimized(isMinimized); } } - public boolean isLowPriority() { - return mIsLowPriority; + public boolean isMinimized() { + return mIsMinimized; } public void setUsesIncreasedCollapsedHeight(boolean use) { @@ -2050,7 +2054,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView mChildrenContainerStub = findViewById(R.id.child_container_stub); mChildrenContainerStub.setOnInflateListener((stub, inflated) -> { mChildrenContainer = (NotificationChildrenContainer) inflated; - mChildrenContainer.setIsLowPriority(mIsLowPriority); + mChildrenContainer.setIsMinimized(mIsMinimized); mChildrenContainer.setContainingNotification(ExpandableNotificationRow.this); mChildrenContainer.onNotificationUpdated(); mChildrenContainer.setLogger(mChildrenContainerLogger); @@ -3435,7 +3439,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private void onExpansionChanged(boolean userAction, boolean wasExpanded) { boolean nowExpanded = isExpanded(); - if (mIsSummaryWithChildren && (!mIsLowPriority || wasExpanded)) { + if (mIsSummaryWithChildren && (!mIsMinimized || wasExpanded)) { nowExpanded = mGroupExpansionManager.isGroupExpanded(mEntry); } if (nowExpanded != wasExpanded) { @@ -3492,7 +3496,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView if (!expandable) { if (mIsSummaryWithChildren) { expandable = true; - if (!mIsLowPriority || isExpanded()) { + if (!mIsMinimized || isExpanded()) { isExpanded = isGroupExpanded(); } } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java index f835cca1a60c..ded635cb08bc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java @@ -150,7 +150,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder entry, mConversationProcessor, row, - bindParams.isLowPriority, + bindParams.isMinimized, bindParams.usesIncreasedHeight, bindParams.usesIncreasedHeadsUpHeight, callback, @@ -178,7 +178,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder SmartReplyStateInflater smartRepliesInflater) { InflationProgress result = createRemoteViews(reInflateFlags, builder, - bindParams.isLowPriority, + bindParams.isMinimized, bindParams.usesIncreasedHeight, bindParams.usesIncreasedHeadsUpHeight, packageContext, @@ -215,6 +215,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder apply( mInflationExecutor, inflateSynchronously, + bindParams.isMinimized, result, reInflateFlags, mRemoteViewCache, @@ -365,7 +366,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder } private static InflationProgress createRemoteViews(@InflationFlag int reInflateFlags, - Notification.Builder builder, boolean isLowPriority, boolean usesIncreasedHeight, + Notification.Builder builder, boolean isMinimized, boolean usesIncreasedHeight, boolean usesIncreasedHeadsUpHeight, Context packageContext, ExpandableNotificationRow row, NotifLayoutInflaterFactory.Provider notifLayoutInflaterFactoryProvider, @@ -376,13 +377,13 @@ public class NotificationContentInflater implements NotificationRowContentBinder if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) { logger.logAsyncTaskProgress(entryForLogging, "creating contracted remote view"); - result.newContentView = createContentView(builder, isLowPriority, + result.newContentView = createContentView(builder, isMinimized, usesIncreasedHeight); } if ((reInflateFlags & FLAG_CONTENT_VIEW_EXPANDED) != 0) { logger.logAsyncTaskProgress(entryForLogging, "creating expanded remote view"); - result.newExpandedView = createExpandedView(builder, isLowPriority); + result.newExpandedView = createExpandedView(builder, isMinimized); } if ((reInflateFlags & FLAG_CONTENT_VIEW_HEADS_UP) != 0) { @@ -393,7 +394,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder if ((reInflateFlags & FLAG_CONTENT_VIEW_PUBLIC) != 0) { logger.logAsyncTaskProgress(entryForLogging, "creating public remote view"); - result.newPublicView = builder.makePublicContentView(isLowPriority); + result.newPublicView = builder.makePublicContentView(isMinimized); } if (AsyncGroupHeaderViewInflation.isEnabled()) { @@ -406,7 +407,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder if ((reInflateFlags & FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER) != 0) { logger.logAsyncTaskProgress(entryForLogging, "creating low-priority group summary remote view"); - result.mNewLowPriorityGroupHeaderView = + result.mNewMinimizedGroupHeaderView = builder.makeLowPriorityContentView(true /* useRegularSubtext */); } } @@ -444,6 +445,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder private static CancellationSignal apply( Executor inflationExecutor, boolean inflateSynchronously, + boolean isMinimized, InflationProgress result, @InflationFlag int reInflateFlags, NotifRemoteViewCache remoteViewCache, @@ -475,7 +477,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder } }; logger.logAsyncTaskProgress(entry, "applying contracted view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, flag, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, result, + reInflateFlags, flag, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, privateLayout, privateLayout.getContractedChild(), privateLayout.getVisibleWrapper( @@ -502,7 +505,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder } }; logger.logAsyncTaskProgress(entry, "applying expanded view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, result, + reInflateFlags, flag, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, privateLayout, privateLayout.getExpandedChild(), privateLayout.getVisibleWrapper(VISIBLE_TYPE_EXPANDED), runningInflations, @@ -529,7 +533,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder } }; logger.logAsyncTaskProgress(entry, "applying heads up view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, + result, reInflateFlags, flag, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, privateLayout, privateLayout.getHeadsUpChild(), privateLayout.getVisibleWrapper(VISIBLE_TYPE_HEADSUP), runningInflations, @@ -555,7 +560,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder } }; logger.logAsyncTaskProgress(entry, "applying public view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, flag, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, + result, reInflateFlags, flag, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, publicLayout, publicLayout.getContractedChild(), publicLayout.getVisibleWrapper(NotificationContentView.VISIBLE_TYPE_CONTRACTED), @@ -583,11 +589,12 @@ public class NotificationContentInflater implements NotificationRowContentBinder } }; logger.logAsyncTaskProgress(entry, "applying group header view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, + result, reInflateFlags, /* inflationId = */ FLAG_GROUP_SUMMARY_HEADER, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, /* parentLayout = */ childrenContainer, - /* existingView = */ childrenContainer.getNotificationHeader(), + /* existingView = */ childrenContainer.getGroupHeader(), /* existingWrapper = */ childrenContainer.getNotificationHeaderWrapper(), runningInflations, applyCallback, logger); } @@ -595,7 +602,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder if ((reInflateFlags & FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER) != 0) { boolean isNewView = !canReapplyRemoteView( - /* newView = */ result.mNewLowPriorityGroupHeaderView, + /* newView = */ result.mNewMinimizedGroupHeaderView, /* oldView = */ remoteViewCache.getCachedView( entry, FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER)); ApplyCallback applyCallback = new ApplyCallback() { @@ -603,29 +610,30 @@ public class NotificationContentInflater implements NotificationRowContentBinder public void setResultView(View v) { logger.logAsyncTaskProgress(entry, "low-priority group header view applied"); - result.mInflatedLowPriorityGroupHeaderView = (NotificationHeaderView) v; + result.mInflatedMinimizedGroupHeaderView = (NotificationHeaderView) v; } @Override public RemoteViews getRemoteView() { - return result.mNewLowPriorityGroupHeaderView; + return result.mNewMinimizedGroupHeaderView; } }; logger.logAsyncTaskProgress(entry, "applying low priority group header view"); - applyRemoteView(inflationExecutor, inflateSynchronously, result, reInflateFlags, + applyRemoteView(inflationExecutor, inflateSynchronously, isMinimized, + result, reInflateFlags, /* inflationId = */ FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER, remoteViewCache, entry, row, isNewView, remoteViewClickHandler, callback, /* parentLayout = */ childrenContainer, - /* existingView = */ childrenContainer.getNotificationHeaderLowPriority(), + /* existingView = */ childrenContainer.getMinimizedNotificationHeader(), /* existingWrapper = */ childrenContainer - .getLowPriorityViewWrapper(), + .getMinimizedGroupHeaderWrapper(), runningInflations, applyCallback, logger); } } // Let's try to finish, maybe nobody is even inflating anything - finishIfDone(result, reInflateFlags, remoteViewCache, runningInflations, callback, entry, - row, logger); + finishIfDone(result, isMinimized, reInflateFlags, remoteViewCache, runningInflations, + callback, entry, row, logger); CancellationSignal cancellationSignal = new CancellationSignal(); cancellationSignal.setOnCancelListener( () -> { @@ -641,6 +649,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder static void applyRemoteView( Executor inflationExecutor, boolean inflateSynchronously, + boolean isMinimized, final InflationProgress result, final @InflationFlag int reInflateFlags, @InflationFlag int inflationId, @@ -707,7 +716,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder existingWrapper.onReinflated(); } runningInflations.remove(inflationId); - finishIfDone(result, reInflateFlags, remoteViewCache, runningInflations, + finishIfDone(result, isMinimized, + reInflateFlags, remoteViewCache, runningInflations, callback, entry, row, logger); } @@ -838,6 +848,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder * @return true if the inflation was finished */ private static boolean finishIfDone(InflationProgress result, + boolean isMinimized, @InflationFlag int reInflateFlags, NotifRemoteViewCache remoteViewCache, HashMap<Integer, CancellationSignal> runningInflations, @Nullable InflationCallback endListener, NotificationEntry entry, @@ -944,7 +955,9 @@ public class NotificationContentInflater implements NotificationRowContentBinder if (AsyncGroupHeaderViewInflation.isEnabled()) { if ((reInflateFlags & FLAG_GROUP_SUMMARY_HEADER) != 0) { if (result.mInflatedGroupHeaderView != null) { - row.setIsLowPriority(false); + // We need to set if the row is minimized before setting the group header to + // make sure the setting of header view works correctly + row.setIsMinimized(isMinimized); row.setGroupHeader(/* headerView= */ result.mInflatedGroupHeaderView); remoteViewCache.putCachedView(entry, FLAG_GROUP_SUMMARY_HEADER, result.mNewGroupHeaderView); @@ -957,13 +970,14 @@ public class NotificationContentInflater implements NotificationRowContentBinder } if ((reInflateFlags & FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER) != 0) { - if (result.mInflatedLowPriorityGroupHeaderView != null) { - // New view case, set row to low priority - row.setIsLowPriority(true); - row.setLowPriorityGroupHeader( - /* headerView= */ result.mInflatedLowPriorityGroupHeaderView); + if (result.mInflatedMinimizedGroupHeaderView != null) { + // We need to set if the row is minimized before setting the group header to + // make sure the setting of header view works correctly + row.setIsMinimized(isMinimized); + row.setMinimizedGroupHeader( + /* headerView= */ result.mInflatedMinimizedGroupHeaderView); remoteViewCache.putCachedView(entry, FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER, - result.mNewLowPriorityGroupHeaderView); + result.mNewMinimizedGroupHeaderView); } else if (remoteViewCache.hasCachedView(entry, FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER)) { // Re-inflation case. Only update if it's still cached (i.e. view has not @@ -984,12 +998,12 @@ public class NotificationContentInflater implements NotificationRowContentBinder } private static RemoteViews createExpandedView(Notification.Builder builder, - boolean isLowPriority) { + boolean isMinimized) { RemoteViews bigContentView = builder.createBigContentView(); if (bigContentView != null) { return bigContentView; } - if (isLowPriority) { + if (isMinimized) { RemoteViews contentView = builder.createContentView(); Notification.Builder.makeHeaderExpanded(contentView); return contentView; @@ -998,8 +1012,8 @@ public class NotificationContentInflater implements NotificationRowContentBinder } private static RemoteViews createContentView(Notification.Builder builder, - boolean isLowPriority, boolean useLarge) { - if (isLowPriority) { + boolean isMinimized, boolean useLarge) { + if (isMinimized) { return builder.makeLowPriorityContentView(false /* useRegularSubtext */); } return builder.createContentView(useLarge); @@ -1038,7 +1052,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder private final NotificationEntry mEntry; private final Context mContext; private final boolean mInflateSynchronously; - private final boolean mIsLowPriority; + private final boolean mIsMinimized; private final boolean mUsesIncreasedHeight; private final InflationCallback mCallback; private final boolean mUsesIncreasedHeadsUpHeight; @@ -1063,7 +1077,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder NotificationEntry entry, ConversationNotificationProcessor conversationProcessor, ExpandableNotificationRow row, - boolean isLowPriority, + boolean isMinimized, boolean usesIncreasedHeight, boolean usesIncreasedHeadsUpHeight, InflationCallback callback, @@ -1080,7 +1094,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder mRemoteViewCache = cache; mSmartRepliesInflater = smartRepliesInflater; mContext = mRow.getContext(); - mIsLowPriority = isLowPriority; + mIsMinimized = isMinimized; mUsesIncreasedHeight = usesIncreasedHeight; mUsesIncreasedHeadsUpHeight = usesIncreasedHeadsUpHeight; mRemoteViewClickHandler = remoteViewClickHandler; @@ -1150,7 +1164,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder mEntry, recoveredBuilder, mLogger); } InflationProgress inflationProgress = createRemoteViews(mReInflateFlags, - recoveredBuilder, mIsLowPriority, mUsesIncreasedHeight, + recoveredBuilder, mIsMinimized, mUsesIncreasedHeight, mUsesIncreasedHeadsUpHeight, packageContext, mRow, mNotifLayoutInflaterFactoryProvider, mLogger); @@ -1209,6 +1223,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder mCancellationSignal = apply( mInflationExecutor, mInflateSynchronously, + mIsMinimized, result, mReInflateFlags, mRemoteViewCache, @@ -1295,7 +1310,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder private RemoteViews newExpandedView; private RemoteViews newPublicView; private RemoteViews mNewGroupHeaderView; - private RemoteViews mNewLowPriorityGroupHeaderView; + private RemoteViews mNewMinimizedGroupHeaderView; @VisibleForTesting Context packageContext; @@ -1305,7 +1320,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder private View inflatedExpandedView; private View inflatedPublicView; private NotificationHeaderView mInflatedGroupHeaderView; - private NotificationHeaderView mInflatedLowPriorityGroupHeaderView; + private NotificationHeaderView mInflatedMinimizedGroupHeaderView; private CharSequence headsUpStatusBarText; private CharSequence headsUpStatusBarTextPublic; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java index 8a3e7e8a0580..6f00d96b6312 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java @@ -1514,7 +1514,7 @@ public class NotificationContentView extends FrameLayout implements Notification } ImageView bubbleButton = layout.findViewById(com.android.internal.R.id.bubble_button); View actionContainer = layout.findViewById(com.android.internal.R.id.actions_container); - LinearLayout actionListMarginTarget = layout.findViewById( + ViewGroup actionListMarginTarget = layout.findViewById( com.android.internal.R.id.notification_action_list_margin_target); if (bubbleButton == null || actionContainer == null) { return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java index b0fd47587782..33339a7fe025 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java @@ -128,9 +128,9 @@ public interface NotificationRowContentBinder { class BindParams { /** - * Bind a low priority version of the content views. + * Bind a minimized version of the content views. */ - public boolean isLowPriority; + public boolean isMinimized; /** * Use increased height when binding contracted view. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindParams.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindParams.java index 1494c275d061..bae89fbf626f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindParams.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindParams.java @@ -26,7 +26,7 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin * Parameters for {@link RowContentBindStage}. */ public final class RowContentBindParams { - private boolean mUseLowPriority; + private boolean mUseMinimized; private boolean mUseIncreasedHeight; private boolean mUseIncreasedHeadsUpHeight; private boolean mViewsNeedReinflation; @@ -41,17 +41,20 @@ public final class RowContentBindParams { private @InflationFlag int mDirtyContentViews = mContentViews; /** - * Set whether content should use a low priority version of its content views. + * Set whether content should use a minimized version of its content views. */ - public void setUseLowPriority(boolean useLowPriority) { - if (mUseLowPriority != useLowPriority) { + public void setUseMinimized(boolean useMinimized) { + if (mUseMinimized != useMinimized) { mDirtyContentViews |= (FLAG_CONTENT_VIEW_CONTRACTED | FLAG_CONTENT_VIEW_EXPANDED); } - mUseLowPriority = useLowPriority; + mUseMinimized = useMinimized; } - public boolean useLowPriority() { - return mUseLowPriority; + /** + * @return Whether the row uses the minimized style. + */ + public boolean useMinimized() { + return mUseMinimized; } /** @@ -149,9 +152,9 @@ public final class RowContentBindParams { @Override public String toString() { return String.format("RowContentBindParams[mContentViews=%x mDirtyContentViews=%x " - + "mUseLowPriority=%b mUseIncreasedHeight=%b " + + "mUseMinimized=%b mUseIncreasedHeight=%b " + "mUseIncreasedHeadsUpHeight=%b mViewsNeedReinflation=%b]", - mContentViews, mDirtyContentViews, mUseLowPriority, mUseIncreasedHeight, + mContentViews, mDirtyContentViews, mUseMinimized, mUseIncreasedHeight, mUseIncreasedHeadsUpHeight, mViewsNeedReinflation); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStage.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStage.java index f4f8374d0a9f..89fcda949b5b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStage.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/RowContentBindStage.java @@ -73,7 +73,7 @@ public class RowContentBindStage extends BindStage<RowContentBindParams> { mBinder.unbindContent(entry, row, contentToUnbind); BindParams bindParams = new BindParams(); - bindParams.isLowPriority = params.useLowPriority(); + bindParams.isMinimized = params.useMinimized(); bindParams.usesIncreasedHeight = params.useIncreasedHeight(); bindParams.usesIncreasedHeadsUpHeight = params.useIncreasedHeadsUpHeight(); boolean forceInflate = params.needsReinflation(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationsHeadsUpRefactor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationsHeadsUpRefactor.kt new file mode 100644 index 000000000000..62641fe2f229 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationsHeadsUpRefactor.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 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.statusbar.notification.shared + +import com.android.systemui.Flags +import com.android.systemui.flags.FlagToken +import com.android.systemui.flags.RefactorFlagUtils + +/** Helper for reading or using the notifications heads up refactor flag state. */ +@Suppress("NOTHING_TO_INLINE") +object NotificationsHeadsUpRefactor { + /** The aconfig flag name */ + const val FLAG_NAME = Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR + + /** A token used for dependency declaration */ + val token: FlagToken + get() = FlagToken(FLAG_NAME, isEnabled) + + /** Is the refactor enabled */ + @JvmStatic + inline val isEnabled + get() = Flags.notificationsHeadsUpRefactor() + + /** + * Called to ensure code is only run when the flag is enabled. This protects users from the + * unintended behaviors caused by accidentally running new logic, while also crashing on an eng + * build to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun isUnexpectedlyInLegacyMode() = + RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is enabled to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java index 28f874da0c74..5dc37e0525da 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java @@ -110,14 +110,14 @@ public class NotificationChildrenContainer extends ViewGroup */ private boolean mEnableShadowOnChildNotifications; - private NotificationHeaderView mNotificationHeader; - private NotificationHeaderViewWrapper mNotificationHeaderWrapper; - private NotificationHeaderView mNotificationHeaderLowPriority; - private NotificationHeaderViewWrapper mNotificationHeaderWrapperLowPriority; + private NotificationHeaderView mGroupHeader; + private NotificationHeaderViewWrapper mGroupHeaderWrapper; + private NotificationHeaderView mMinimizedGroupHeader; + private NotificationHeaderViewWrapper mMinimizedGroupHeaderWrapper; private NotificationGroupingUtil mGroupingUtil; private ViewState mHeaderViewState; private int mClipBottomAmount; - private boolean mIsLowPriority; + private boolean mIsMinimized; private OnClickListener mHeaderClickListener; private ViewGroup mCurrentHeader; private boolean mIsConversation; @@ -217,14 +217,14 @@ public class NotificationChildrenContainer extends ViewGroup int right = left + mOverflowNumber.getMeasuredWidth(); mOverflowNumber.layout(left, 0, right, mOverflowNumber.getMeasuredHeight()); } - if (mNotificationHeader != null) { - mNotificationHeader.layout(0, 0, mNotificationHeader.getMeasuredWidth(), - mNotificationHeader.getMeasuredHeight()); + if (mGroupHeader != null) { + mGroupHeader.layout(0, 0, mGroupHeader.getMeasuredWidth(), + mGroupHeader.getMeasuredHeight()); } - if (mNotificationHeaderLowPriority != null) { - mNotificationHeaderLowPriority.layout(0, 0, - mNotificationHeaderLowPriority.getMeasuredWidth(), - mNotificationHeaderLowPriority.getMeasuredHeight()); + if (mMinimizedGroupHeader != null) { + mMinimizedGroupHeader.layout(0, 0, + mMinimizedGroupHeader.getMeasuredWidth(), + mMinimizedGroupHeader.getMeasuredHeight()); } } @@ -271,11 +271,11 @@ public class NotificationChildrenContainer extends ViewGroup } int headerHeightSpec = MeasureSpec.makeMeasureSpec(mHeaderHeight, MeasureSpec.EXACTLY); - if (mNotificationHeader != null) { - mNotificationHeader.measure(widthMeasureSpec, headerHeightSpec); + if (mGroupHeader != null) { + mGroupHeader.measure(widthMeasureSpec, headerHeightSpec); } - if (mNotificationHeaderLowPriority != null) { - mNotificationHeaderLowPriority.measure(widthMeasureSpec, headerHeightSpec); + if (mMinimizedGroupHeader != null) { + mMinimizedGroupHeader.measure(widthMeasureSpec, headerHeightSpec); } setMeasuredDimension(width, height); @@ -308,11 +308,11 @@ public class NotificationChildrenContainer extends ViewGroup * appropriately. */ public void setNotificationGroupWhen(long whenMillis) { - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.setNotificationWhen(whenMillis); + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.setNotificationWhen(whenMillis); } - if (mNotificationHeaderWrapperLowPriority != null) { - mNotificationHeaderWrapperLowPriority.setNotificationWhen(whenMillis); + if (mMinimizedGroupHeaderWrapper != null) { + mMinimizedGroupHeaderWrapper.setNotificationWhen(whenMillis); } } @@ -410,28 +410,28 @@ public class NotificationChildrenContainer extends ViewGroup Trace.beginSection("recreateHeader#makeNotificationGroupHeader"); RemoteViews header = builder.makeNotificationGroupHeader(); Trace.endSection(); - if (mNotificationHeader == null) { + if (mGroupHeader == null) { Trace.beginSection("recreateHeader#apply"); - mNotificationHeader = (NotificationHeaderView) header.apply(getContext(), this); + mGroupHeader = (NotificationHeaderView) header.apply(getContext(), this); Trace.endSection(); - mNotificationHeader.findViewById(com.android.internal.R.id.expand_button) + mGroupHeader.findViewById(com.android.internal.R.id.expand_button) .setVisibility(VISIBLE); - mNotificationHeader.setOnClickListener(mHeaderClickListener); - mNotificationHeaderWrapper = + mGroupHeader.setOnClickListener(mHeaderClickListener); + mGroupHeaderWrapper = (NotificationHeaderViewWrapper) NotificationViewWrapper.wrap( getContext(), - mNotificationHeader, + mGroupHeader, mContainingNotification); - mNotificationHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); - addView(mNotificationHeader, 0); + mGroupHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); + addView(mGroupHeader, 0); invalidate(); } else { Trace.beginSection("recreateHeader#reapply"); - header.reapply(getContext(), mNotificationHeader); + header.reapply(getContext(), mGroupHeader); Trace.endSection(); } - mNotificationHeaderWrapper.setExpanded(mChildrenExpanded); - mNotificationHeaderWrapper.onContentUpdated(mContainingNotification); + mGroupHeaderWrapper.setExpanded(mChildrenExpanded); + mGroupHeaderWrapper.onContentUpdated(mContainingNotification); recreateLowPriorityHeader(builder, isConversation); updateHeaderVisibility(false /* animate */); updateChildrenAppearance(); @@ -439,21 +439,21 @@ public class NotificationChildrenContainer extends ViewGroup } private void removeGroupHeader() { - if (mNotificationHeader == null) { + if (mGroupHeader == null) { return; } - removeView(mNotificationHeader); - mNotificationHeader = null; - mNotificationHeaderWrapper = null; + removeView(mGroupHeader); + mGroupHeader = null; + mGroupHeaderWrapper = null; } private void removeLowPriorityGroupHeader() { - if (mNotificationHeaderLowPriority == null) { + if (mMinimizedGroupHeader == null) { return; } - removeView(mNotificationHeaderLowPriority); - mNotificationHeaderLowPriority = null; - mNotificationHeaderWrapperLowPriority = null; + removeView(mMinimizedGroupHeader); + mMinimizedGroupHeader = null; + mMinimizedGroupHeaderWrapper = null; } /** @@ -474,21 +474,21 @@ public class NotificationChildrenContainer extends ViewGroup return; } - mNotificationHeader = headerView; - mNotificationHeader.findViewById(com.android.internal.R.id.expand_button) + mGroupHeader = headerView; + mGroupHeader.findViewById(com.android.internal.R.id.expand_button) .setVisibility(VISIBLE); - mNotificationHeader.setOnClickListener(mHeaderClickListener); - mNotificationHeaderWrapper = + mGroupHeader.setOnClickListener(mHeaderClickListener); + mGroupHeaderWrapper = (NotificationHeaderViewWrapper) NotificationViewWrapper.wrap( getContext(), - mNotificationHeader, + mGroupHeader, mContainingNotification); - mNotificationHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); - addView(mNotificationHeader, 0); + mGroupHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); + addView(mGroupHeader, 0); invalidate(); - mNotificationHeaderWrapper.setExpanded(mChildrenExpanded); - mNotificationHeaderWrapper.onContentUpdated(mContainingNotification); + mGroupHeaderWrapper.setExpanded(mChildrenExpanded); + mGroupHeaderWrapper.onContentUpdated(mContainingNotification); updateHeaderVisibility(false /* animate */); updateChildrenAppearance(); @@ -511,20 +511,20 @@ public class NotificationChildrenContainer extends ViewGroup return; } - mNotificationHeaderLowPriority = headerViewLowPriority; - mNotificationHeaderLowPriority.findViewById(com.android.internal.R.id.expand_button) + mMinimizedGroupHeader = headerViewLowPriority; + mMinimizedGroupHeader.findViewById(com.android.internal.R.id.expand_button) .setVisibility(VISIBLE); - mNotificationHeaderLowPriority.setOnClickListener(onClickListener); - mNotificationHeaderWrapperLowPriority = + mMinimizedGroupHeader.setOnClickListener(onClickListener); + mMinimizedGroupHeaderWrapper = (NotificationHeaderViewWrapper) NotificationViewWrapper.wrap( getContext(), - mNotificationHeaderLowPriority, + mMinimizedGroupHeader, mContainingNotification); - mNotificationHeaderWrapperLowPriority.setOnRoundnessChangedListener(this::invalidate); - addView(mNotificationHeaderLowPriority, 0); + mMinimizedGroupHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); + addView(mMinimizedGroupHeader, 0); invalidate(); - mNotificationHeaderWrapperLowPriority.onContentUpdated(mContainingNotification); + mMinimizedGroupHeaderWrapper.onContentUpdated(mContainingNotification); updateHeaderVisibility(false /* animate */); updateChildrenAppearance(); } @@ -539,35 +539,35 @@ public class NotificationChildrenContainer extends ViewGroup AsyncGroupHeaderViewInflation.assertInLegacyMode(); RemoteViews header; StatusBarNotification notification = mContainingNotification.getEntry().getSbn(); - if (mIsLowPriority) { + if (mIsMinimized) { if (builder == null) { builder = Notification.Builder.recoverBuilder(getContext(), notification.getNotification()); } header = builder.makeLowPriorityContentView(true /* useRegularSubtext */); - if (mNotificationHeaderLowPriority == null) { - mNotificationHeaderLowPriority = (NotificationHeaderView) header.apply(getContext(), + if (mMinimizedGroupHeader == null) { + mMinimizedGroupHeader = (NotificationHeaderView) header.apply(getContext(), this); - mNotificationHeaderLowPriority.findViewById(com.android.internal.R.id.expand_button) + mMinimizedGroupHeader.findViewById(com.android.internal.R.id.expand_button) .setVisibility(VISIBLE); - mNotificationHeaderLowPriority.setOnClickListener(mHeaderClickListener); - mNotificationHeaderWrapperLowPriority = + mMinimizedGroupHeader.setOnClickListener(mHeaderClickListener); + mMinimizedGroupHeaderWrapper = (NotificationHeaderViewWrapper) NotificationViewWrapper.wrap( getContext(), - mNotificationHeaderLowPriority, + mMinimizedGroupHeader, mContainingNotification); - mNotificationHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); - addView(mNotificationHeaderLowPriority, 0); + mGroupHeaderWrapper.setOnRoundnessChangedListener(this::invalidate); + addView(mMinimizedGroupHeader, 0); invalidate(); } else { - header.reapply(getContext(), mNotificationHeaderLowPriority); + header.reapply(getContext(), mMinimizedGroupHeader); } - mNotificationHeaderWrapperLowPriority.onContentUpdated(mContainingNotification); - resetHeaderVisibilityIfNeeded(mNotificationHeaderLowPriority, calculateDesiredHeader()); + mMinimizedGroupHeaderWrapper.onContentUpdated(mContainingNotification); + resetHeaderVisibilityIfNeeded(mMinimizedGroupHeader, calculateDesiredHeader()); } else { - removeView(mNotificationHeaderLowPriority); - mNotificationHeaderLowPriority = null; - mNotificationHeaderWrapperLowPriority = null; + removeView(mMinimizedGroupHeader); + mMinimizedGroupHeader = null; + mMinimizedGroupHeaderWrapper = null; } } @@ -588,8 +588,8 @@ public class NotificationChildrenContainer extends ViewGroup public void updateGroupOverflow() { if (mShowGroupCountInExpander) { - setExpandButtonNumber(mNotificationHeaderWrapper); - setExpandButtonNumber(mNotificationHeaderWrapperLowPriority); + setExpandButtonNumber(mGroupHeaderWrapper); + setExpandButtonNumber(mMinimizedGroupHeaderWrapper); return; } int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* likeCollapsed */); @@ -641,9 +641,9 @@ public class NotificationChildrenContainer extends ViewGroup * @param alpha alpha value to apply to the content */ public void setContentAlpha(float alpha) { - if (mNotificationHeader != null) { - for (int i = 0; i < mNotificationHeader.getChildCount(); i++) { - mNotificationHeader.getChildAt(i).setAlpha(alpha); + if (mGroupHeader != null) { + for (int i = 0; i < mGroupHeader.getChildCount(); i++) { + mGroupHeader.getChildAt(i).setAlpha(alpha); } } for (ExpandableNotificationRow child : getAttachedChildren()) { @@ -683,7 +683,7 @@ public class NotificationChildrenContainer extends ViewGroup if (AsyncGroupHeaderViewInflation.isEnabled()) { return mHeaderHeight; } else { - return mNotificationHeaderLowPriority.getHeight(); + return mMinimizedGroupHeader.getHeight(); } } int intrinsicHeight = mNotificationHeaderMargin + mCurrentHeaderTranslation; @@ -837,15 +837,15 @@ public class NotificationChildrenContainer extends ViewGroup mGroupOverFlowState.setAlpha(0.0f); } } - if (mNotificationHeader != null) { + if (mGroupHeader != null) { if (mHeaderViewState == null) { mHeaderViewState = new ViewState(); } - mHeaderViewState.initFrom(mNotificationHeader); + mHeaderViewState.initFrom(mGroupHeader); if (mContainingNotification.hasExpandingChild()) { // Not modifying translationZ during expand animation. - mHeaderViewState.setZTranslation(mNotificationHeader.getTranslationZ()); + mHeaderViewState.setZTranslation(mGroupHeader.getTranslationZ()); } else if (childrenExpandedAndNotAnimating) { mHeaderViewState.setZTranslation(parentState.getZTranslation()); } else { @@ -898,7 +898,7 @@ public class NotificationChildrenContainer extends ViewGroup && !showingAsLowPriority()) { return NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED; } - if (mIsLowPriority + if (mIsMinimized || (!mContainingNotification.isOnKeyguard() && mContainingNotification.isExpanded()) || (mContainingNotification.isHeadsUpState() && mContainingNotification.canShowHeadsUp())) { @@ -946,7 +946,7 @@ public class NotificationChildrenContainer extends ViewGroup mNeverAppliedGroupState = false; } if (mHeaderViewState != null) { - mHeaderViewState.applyToView(mNotificationHeader); + mHeaderViewState.applyToView(mGroupHeader); } updateChildrenClipping(); } @@ -1006,8 +1006,8 @@ public class NotificationChildrenContainer extends ViewGroup } if (child instanceof NotificationHeaderView - && mNotificationHeaderWrapper.hasRoundedCorner()) { - float[] radii = mNotificationHeaderWrapper.getUpdatedRadii(); + && mGroupHeaderWrapper.hasRoundedCorner()) { + float[] radii = mGroupHeaderWrapper.getUpdatedRadii(); mHeaderPath.reset(); mHeaderPath.addRoundRect( child.getLeft(), @@ -1085,8 +1085,8 @@ public class NotificationChildrenContainer extends ViewGroup } mGroupOverFlowState.animateTo(mOverflowNumber, properties); } - if (mNotificationHeader != null) { - mHeaderViewState.applyToView(mNotificationHeader); + if (mGroupHeader != null) { + mHeaderViewState.applyToView(mGroupHeader); } updateChildrenClipping(); } @@ -1109,8 +1109,8 @@ public class NotificationChildrenContainer extends ViewGroup public void setChildrenExpanded(boolean childrenExpanded) { mChildrenExpanded = childrenExpanded; updateExpansionStates(); - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.setExpanded(childrenExpanded); + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.setExpanded(childrenExpanded); } final int count = mAttachedChildren.size(); for (int childIdx = 0; childIdx < count; childIdx++) { @@ -1130,11 +1130,11 @@ public class NotificationChildrenContainer extends ViewGroup } public NotificationViewWrapper getNotificationViewWrapper() { - return mNotificationHeaderWrapper; + return mGroupHeaderWrapper; } - public NotificationViewWrapper getLowPriorityViewWrapper() { - return mNotificationHeaderWrapperLowPriority; + public NotificationViewWrapper getMinimizedGroupHeaderWrapper() { + return mMinimizedGroupHeaderWrapper; } @VisibleForTesting @@ -1142,12 +1142,12 @@ public class NotificationChildrenContainer extends ViewGroup return mCurrentHeader; } - public NotificationHeaderView getNotificationHeader() { - return mNotificationHeader; + public NotificationHeaderView getGroupHeader() { + return mGroupHeader; } - public NotificationHeaderView getNotificationHeaderLowPriority() { - return mNotificationHeaderLowPriority; + public NotificationHeaderView getMinimizedNotificationHeader() { + return mMinimizedGroupHeader; } private void updateHeaderVisibility(boolean animate) { @@ -1171,7 +1171,7 @@ public class NotificationChildrenContainer extends ViewGroup NotificationViewWrapper hiddenWrapper = getWrapperForView(currentHeader); visibleWrapper.transformFrom(hiddenWrapper); hiddenWrapper.transformTo(visibleWrapper, () -> updateHeaderVisibility(false)); - startChildAlphaAnimations(desiredHeader == mNotificationHeader); + startChildAlphaAnimations(desiredHeader == mGroupHeader); } else { animate = false; } @@ -1192,8 +1192,8 @@ public class NotificationChildrenContainer extends ViewGroup } } - resetHeaderVisibilityIfNeeded(mNotificationHeader, desiredHeader); - resetHeaderVisibilityIfNeeded(mNotificationHeaderLowPriority, desiredHeader); + resetHeaderVisibilityIfNeeded(mGroupHeader, desiredHeader); + resetHeaderVisibilityIfNeeded(mMinimizedGroupHeader, desiredHeader); mCurrentHeader = desiredHeader; } @@ -1215,9 +1215,9 @@ public class NotificationChildrenContainer extends ViewGroup private ViewGroup calculateDesiredHeader() { ViewGroup desiredHeader; if (showingAsLowPriority()) { - desiredHeader = mNotificationHeaderLowPriority; + desiredHeader = mMinimizedGroupHeader; } else { - desiredHeader = mNotificationHeader; + desiredHeader = mGroupHeader; } return desiredHeader; } @@ -1244,20 +1244,20 @@ public class NotificationChildrenContainer extends ViewGroup private void updateHeaderTransformation() { if (mUserLocked && showingAsLowPriority()) { float fraction = getGroupExpandFraction(); - mNotificationHeaderWrapper.transformFrom(mNotificationHeaderWrapperLowPriority, + mGroupHeaderWrapper.transformFrom(mMinimizedGroupHeaderWrapper, fraction); - mNotificationHeader.setVisibility(VISIBLE); - mNotificationHeaderWrapperLowPriority.transformTo(mNotificationHeaderWrapper, + mGroupHeader.setVisibility(VISIBLE); + mMinimizedGroupHeaderWrapper.transformTo(mGroupHeaderWrapper, fraction); } } private NotificationViewWrapper getWrapperForView(View visibleHeader) { - if (visibleHeader == mNotificationHeader) { - return mNotificationHeaderWrapper; + if (visibleHeader == mGroupHeader) { + return mGroupHeaderWrapper; } - return mNotificationHeaderWrapperLowPriority; + return mMinimizedGroupHeaderWrapper; } /** @@ -1266,13 +1266,13 @@ public class NotificationChildrenContainer extends ViewGroup * @param expanded whether the group is expanded. */ public void updateHeaderForExpansion(boolean expanded) { - if (mNotificationHeader != null) { + if (mGroupHeader != null) { if (expanded) { ColorDrawable cd = new ColorDrawable(); cd.setColor(mContainingNotification.calculateBgColor()); - mNotificationHeader.setHeaderBackgroundDrawable(cd); + mGroupHeader.setHeaderBackgroundDrawable(cd); } else { - mNotificationHeader.setHeaderBackgroundDrawable(null); + mGroupHeader.setHeaderBackgroundDrawable(null); } } } @@ -1405,11 +1405,11 @@ public class NotificationChildrenContainer extends ViewGroup if (AsyncGroupHeaderViewInflation.isEnabled()) { return mHeaderHeight; } - if (mNotificationHeaderLowPriority == null) { + if (mMinimizedGroupHeader == null) { Log.e(TAG, "getMinHeight: low priority header is null", new Exception()); return 0; } - return mNotificationHeaderLowPriority.getHeight(); + return mMinimizedGroupHeader.getHeight(); } int minExpandHeight = mNotificationHeaderMargin + headerTranslation; int visibleChildren = 0; @@ -1443,20 +1443,20 @@ public class NotificationChildrenContainer extends ViewGroup } public boolean showingAsLowPriority() { - return mIsLowPriority && !mContainingNotification.isExpanded(); + return mIsMinimized && !mContainingNotification.isExpanded(); } public void reInflateViews(OnClickListener listener, StatusBarNotification notification) { if (!AsyncGroupHeaderViewInflation.isEnabled()) { // When Async header inflation is enabled, we do not reinflate headers because they are // inflated from the background thread - if (mNotificationHeader != null) { - removeView(mNotificationHeader); - mNotificationHeader = null; + if (mGroupHeader != null) { + removeView(mGroupHeader); + mGroupHeader = null; } - if (mNotificationHeaderLowPriority != null) { - removeView(mNotificationHeaderLowPriority); - mNotificationHeaderLowPriority = null; + if (mMinimizedGroupHeader != null) { + removeView(mMinimizedGroupHeader); + mMinimizedGroupHeader = null; } recreateNotificationHeader(listener, mIsConversation); } @@ -1489,8 +1489,8 @@ public class NotificationChildrenContainer extends ViewGroup } private void updateHeaderTouchability() { - if (mNotificationHeader != null) { - mNotificationHeader.setAcceptAllTouches(mChildrenExpanded || mUserLocked); + if (mGroupHeader != null) { + mGroupHeader.setAcceptAllTouches(mChildrenExpanded || mUserLocked); } } @@ -1534,8 +1534,11 @@ public class NotificationChildrenContainer extends ViewGroup updateChildrenClipping(); } - public void setIsLowPriority(boolean isLowPriority) { - mIsLowPriority = isLowPriority; + /** + * Set whether the children container is minimized. + */ + public void setIsMinimized(boolean isMinimized) { + mIsMinimized = isMinimized; if (mContainingNotification != null) { /* we're not yet set up yet otherwise */ if (!AsyncGroupHeaderViewInflation.isEnabled()) { recreateLowPriorityHeader(null /* existingBuilder */, mIsConversation); @@ -1552,13 +1555,13 @@ public class NotificationChildrenContainer extends ViewGroup */ public NotificationViewWrapper getVisibleWrapper() { if (showingAsLowPriority()) { - return mNotificationHeaderWrapperLowPriority; + return mMinimizedGroupHeaderWrapper; } - return mNotificationHeaderWrapper; + return mGroupHeaderWrapper; } public void onExpansionChanged() { - if (mIsLowPriority) { + if (mIsMinimized) { if (mUserLocked) { setUserLocked(mUserLocked); } @@ -1574,15 +1577,15 @@ public class NotificationChildrenContainer extends ViewGroup @Override public void applyRoundnessAndInvalidate() { boolean last = true; - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.requestTopRoundness( + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.requestTopRoundness( /* value = */ getTopRoundness(), /* sourceType = */ FROM_PARENT, /* animate = */ false ); } - if (mNotificationHeaderWrapperLowPriority != null) { - mNotificationHeaderWrapperLowPriority.requestTopRoundness( + if (mMinimizedGroupHeaderWrapper != null) { + mMinimizedGroupHeaderWrapper.requestTopRoundness( /* value = */ getTopRoundness(), /* sourceType = */ FROM_PARENT, /* animate = */ false @@ -1612,31 +1615,31 @@ public class NotificationChildrenContainer extends ViewGroup * Shows the given feedback icon, or hides the icon if null. */ public void setFeedbackIcon(@Nullable FeedbackIcon icon) { - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.setFeedbackIcon(icon); + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.setFeedbackIcon(icon); } - if (mNotificationHeaderWrapperLowPriority != null) { - mNotificationHeaderWrapperLowPriority.setFeedbackIcon(icon); + if (mMinimizedGroupHeaderWrapper != null) { + mMinimizedGroupHeaderWrapper.setFeedbackIcon(icon); } } public void setRecentlyAudiblyAlerted(boolean audiblyAlertedRecently) { - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.setRecentlyAudiblyAlerted(audiblyAlertedRecently); + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.setRecentlyAudiblyAlerted(audiblyAlertedRecently); } - if (mNotificationHeaderWrapperLowPriority != null) { - mNotificationHeaderWrapperLowPriority.setRecentlyAudiblyAlerted(audiblyAlertedRecently); + if (mMinimizedGroupHeaderWrapper != null) { + mMinimizedGroupHeaderWrapper.setRecentlyAudiblyAlerted(audiblyAlertedRecently); } } @Override public void setNotificationFaded(boolean faded) { mContainingNotificationIsFaded = faded; - if (mNotificationHeaderWrapper != null) { - mNotificationHeaderWrapper.setNotificationFaded(faded); + if (mGroupHeaderWrapper != null) { + mGroupHeaderWrapper.setNotificationFaded(faded); } - if (mNotificationHeaderWrapperLowPriority != null) { - mNotificationHeaderWrapperLowPriority.setNotificationFaded(faded); + if (mMinimizedGroupHeaderWrapper != null) { + mMinimizedGroupHeaderWrapper.setNotificationFaded(faded); } for (ExpandableNotificationRow child : mAttachedChildren) { child.setNotificationFaded(faded); @@ -1654,7 +1657,7 @@ public class NotificationChildrenContainer extends ViewGroup } public NotificationHeaderViewWrapper getNotificationHeaderWrapper() { - return mNotificationHeaderWrapper; + return mGroupHeaderWrapper; } public void setLogger(NotificationChildrenContainerLogger logger) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 947976299f8e..f2c593d7ffdb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -812,6 +812,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } else { mDebugTextUsedYPositions.clear(); } + + mDebugPaint.setColor(Color.DKGRAY); + canvas.drawPath(mRoundedClipPath, mDebugPaint); + int y = 0; drawDebugInfo(canvas, y, Color.RED, /* label= */ "y = " + y); @@ -843,14 +847,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable drawDebugInfo(canvas, y, Color.LTGRAY, /* label= */ "mAmbientState.getStackY() + mAmbientState.getStackHeight() = " + y); - y = (int) mAmbientState.getStackY() + mContentHeight; - drawDebugInfo(canvas, y, Color.MAGENTA, - /* label= */ "mAmbientState.getStackY() + mContentHeight = " + y); - y = (int) (mAmbientState.getStackY() + mIntrinsicContentHeight); drawDebugInfo(canvas, y, Color.YELLOW, /* label= */ "mAmbientState.getStackY() + mIntrinsicContentHeight = " + y); + y = mContentHeight; + drawDebugInfo(canvas, y, Color.MAGENTA, + /* label= */ "mContentHeight = " + y); + drawDebugInfo(canvas, mRoundedRectClippingBottom, Color.DKGRAY, /* label= */ "mRoundedRectClippingBottom) = " + y); } @@ -4940,6 +4944,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable println(pw, "intrinsicPadding", mIntrinsicPadding); println(pw, "topPadding", mTopPadding); println(pw, "bottomPadding", mBottomPadding); + dumpRoundedRectClipping(pw); + println(pw, "requestedClipBounds", mRequestedClipBounds); + println(pw, "isClipped", mIsClipped); println(pw, "translationX", getTranslationX()); println(pw, "translationY", getTranslationY()); println(pw, "translationZ", getTranslationZ()); @@ -4994,6 +5001,15 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable }); } + private void dumpRoundedRectClipping(IndentingPrintWriter pw) { + pw.append("roundedRectClipping{l=").print(mRoundedRectClippingLeft); + pw.append(" t=").print(mRoundedRectClippingTop); + pw.append(" r=").print(mRoundedRectClippingRight); + pw.append(" b=").print(mRoundedRectClippingBottom); + pw.append("} topRadius=").print(mBgCornerRadii[0]); + pw.append(" bottomRadius=").println(mBgCornerRadii[4]); + } + private void dumpFooterViewVisibility(IndentingPrintWriter pw) { FooterViewRefactor.assertInLegacyMode(); final boolean showDismissView = shouldShowDismissView(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 6553193fc980..8ed1ca28eaf1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -1260,9 +1260,10 @@ public class NotificationStackScrollLayoutController implements Dumpable { } public void setQsFullScreen(boolean fullScreen) { - FooterViewRefactor.assertInLegacyMode(); mView.setQsFullScreen(fullScreen); - updateShowEmptyShadeView(); + if (!FooterViewRefactor.isEnabled()) { + updateShowEmptyShadeView(); + } } public void setScrollingEnabled(boolean enabled) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index 9b1952ba63fd..b42c07d2c93c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -53,9 +53,7 @@ public class StackScrollAlgorithm { public static final float START_FRACTION = 0.5f; private static final String TAG = "StackScrollAlgorithm"; - private static final Boolean DEBUG = false; private static final SourceType STACK_SCROLL_ALGO = SourceType.from("StackScrollAlgorithm"); - private final ViewGroup mHostView; private float mPaddingBetweenElements; private float mGapHeight; @@ -247,13 +245,11 @@ public class StackScrollAlgorithm { >= ambientState.getMaxHeadsUpTranslation(); } - public static void log(String s) { - if (DEBUG) { - android.util.Log.i(TAG, s); - } + public static void debugLog(String s) { + android.util.Log.i(TAG, s); } - public static void logView(View view, String s) { + public static void debugLogView(View view, String s) { String viewString = ""; if (view instanceof ExpandableNotificationRow row) { if (row.getEntry() == null) { @@ -274,7 +270,7 @@ public class StackScrollAlgorithm { } else { viewString = view.toString(); } - log(viewString + " " + s); + debugLog(viewString + " " + s); } private void resetChildViewStates() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt index 9efe632f5dbb..79ba25e1e23e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/data/repository/NotificationStackAppearanceRepository.kt @@ -17,8 +17,8 @@ package com.android.systemui.statusbar.notification.stack.data.repository -import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.MutableStateFlow @SysUISingleton class NotificationStackAppearanceRepository @Inject constructor() { /** The bounds of the notification stack in the current scene. */ - val stackBounds = MutableStateFlow(NotificationContainerBounds()) + val stackBounds = MutableStateFlow(StackBounds()) /** * The height in px of the contents of notification stack. Depending on the number of diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt index 08df47388556..f05d01717a44 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractor.kt @@ -17,13 +17,19 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor -import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.shade.domain.interactor.ShadeInteractor +import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.statusbar.notification.stack.data.repository.NotificationStackAppearanceRepository +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds +import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOf /** An interactor which controls the appearance of the NSSL */ @SysUISingleton @@ -31,9 +37,30 @@ class NotificationStackAppearanceInteractor @Inject constructor( private val repository: NotificationStackAppearanceRepository, + shadeInteractor: ShadeInteractor, ) { /** The bounds of the notification stack in the current scene. */ - val stackBounds: StateFlow<NotificationContainerBounds> = repository.stackBounds.asStateFlow() + val stackBounds: StateFlow<StackBounds> = repository.stackBounds.asStateFlow() + + /** + * Whether the stack is expanding from GONE-with-HUN to SHADE + * + * TODO(b/296118689): implement this to match legacy QSController logic + */ + private val isExpandingFromHeadsUp: Flow<Boolean> = flowOf(false) + + /** The rounding of the notification stack. */ + val stackRounding: Flow<StackRounding> = + combine( + shadeInteractor.shadeMode, + isExpandingFromHeadsUp, + ) { shadeMode, isExpandingFromHeadsUp -> + StackRounding( + roundTop = !(shadeMode == ShadeMode.Split && isExpandingFromHeadsUp), + roundBottom = shadeMode != ShadeMode.Single, + ) + } + .distinctUntilChanged() /** * The height in px of the contents of notification stack. Depending on the number of @@ -59,7 +86,7 @@ constructor( val syntheticScroll: Flow<Float> = repository.syntheticScroll.asStateFlow() /** Sets the position of the notification stack in the current scene. */ - fun setStackBounds(bounds: NotificationContainerBounds) { + fun setStackBounds(bounds: StackBounds) { check(bounds.top <= bounds.bottom) { "Invalid bounds: $bounds" } repository.stackBounds.value = bounds } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackBounds.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackBounds.kt new file mode 100644 index 000000000000..1fc9a182a10c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackBounds.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 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.statusbar.notification.stack.shared.model + +/** Models the bounds of the notification stack. */ +data class StackBounds( + /** The position of the left of the stack in its window coordinate system, in pixels. */ + val left: Float = 0f, + /** The position of the top of the stack in its window coordinate system, in pixels. */ + val top: Float = 0f, + /** The position of the right of the stack in its window coordinate system, in pixels. */ + val right: Float = 0f, + /** The position of the bottom of the stack in its window coordinate system, in pixels. */ + val bottom: Float = 0f, +) { + /** The current height of the notification container. */ + val height: Float = bottom - top +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackClipping.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackClipping.kt new file mode 100644 index 000000000000..0c92b5023d1d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackClipping.kt @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2024 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.statusbar.notification.stack.shared.model + +/** Models the clipping rounded rectangle of the notification stack */ +data class StackClipping(val bounds: StackBounds, val rounding: StackRounding) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackRounding.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackRounding.kt new file mode 100644 index 000000000000..ddc5d7ea0d7f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/StackRounding.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 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.statusbar.notification.stack.shared.model + +/** Models the corner rounds of the notification stack. */ +data class StackRounding( + /** Whether the top corners of the notification stack should be rounded. */ + val roundTop: Boolean = false, + /** Whether the bottom corners of the notification stack should be rounded. */ + val roundBottom: Boolean = false, +) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackAppearanceViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackAppearanceViewBinder.kt deleted file mode 100644 index f10e5f1ab022..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackAppearanceViewBinder.kt +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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.statusbar.notification.stack.ui.viewbinder - -import android.content.Context -import android.util.TypedValue -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.repeatOnLifecycle -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.lifecycle.repeatWhenAttached -import com.android.systemui.statusbar.notification.stack.AmbientState -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController -import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer -import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel -import kotlin.math.roundToInt -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.DisposableHandle -import kotlinx.coroutines.launch - -/** Binds the shared notification container to its view-model. */ -object NotificationStackAppearanceViewBinder { - const val SCRIM_CORNER_RADIUS = 32f - - @JvmStatic - fun bind( - context: Context, - view: SharedNotificationContainer, - viewModel: NotificationStackAppearanceViewModel, - ambientState: AmbientState, - controller: NotificationStackScrollLayoutController, - @Main mainImmediateDispatcher: CoroutineDispatcher, - ): DisposableHandle { - return view.repeatWhenAttached(mainImmediateDispatcher) { - repeatOnLifecycle(Lifecycle.State.CREATED) { - launch { - viewModel.stackBounds.collect { bounds -> - val viewLeft = controller.view.left - val viewTop = controller.view.top - controller.setRoundedClippingBounds( - bounds.left.roundToInt() - viewLeft, - bounds.top.roundToInt() - viewTop, - bounds.right.roundToInt() - viewLeft, - bounds.bottom.roundToInt() - viewTop, - SCRIM_CORNER_RADIUS.dpToPx(context), - 0, - ) - } - } - - launch { - viewModel.contentTop.collect { - controller.updateTopPadding(it, controller.isAddOrRemoveAnimationPending) - } - } - - launch { - var wasExpanding = false - viewModel.expandFraction.collect { expandFraction -> - val nowExpanding = expandFraction != 0f && expandFraction != 1f - if (nowExpanding && !wasExpanding) { - controller.onExpansionStarted() - } - ambientState.expansionFraction = expandFraction - controller.expandedHeight = expandFraction * controller.view.height - if (!nowExpanding && wasExpanding) { - controller.onExpansionStopped() - } - wasExpanding = nowExpanding - } - } - - launch { viewModel.isScrollable.collect { controller.setScrollingEnabled(it) } } - } - } - } - - private fun Float.dpToPx(context: Context): Int { - return TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, - this, - context.resources.displayMetrics - ) - .roundToInt() - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt new file mode 100644 index 000000000000..1a34bb4f02c7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationStackViewBinder.kt @@ -0,0 +1,102 @@ +/* + * 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.statusbar.notification.stack.ui.viewbinder + +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.repeatOnLifecycle +import com.android.systemui.common.ui.ConfigurationState +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.res.R +import com.android.systemui.statusbar.notification.stack.AmbientState +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController +import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel +import javax.inject.Inject +import kotlin.math.roundToInt +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.DisposableHandle +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.launch + +/** Binds the NSSL/Controller/AmbientState to their ViewModel. */ +@SysUISingleton +class NotificationStackViewBinder +@Inject +constructor( + @Main private val mainImmediateDispatcher: CoroutineDispatcher, + private val ambientState: AmbientState, + private val view: NotificationStackScrollLayout, + private val controller: NotificationStackScrollLayoutController, + private val viewModel: NotificationStackAppearanceViewModel, + private val configuration: ConfigurationState, +) { + + fun bindWhileAttached(): DisposableHandle { + return view.repeatWhenAttached(mainImmediateDispatcher) { + repeatOnLifecycle(Lifecycle.State.CREATED) { bind() } + } + } + + suspend fun bind() = coroutineScope { + launch { + combine(viewModel.stackClipping, clipRadius, ::Pair).collect { (clipping, clipRadius) -> + val (bounds, rounding) = clipping + val viewLeft = controller.view.left + val viewTop = controller.view.top + controller.setRoundedClippingBounds( + bounds.left.roundToInt() - viewLeft, + bounds.top.roundToInt() - viewTop, + bounds.right.roundToInt() - viewLeft, + bounds.bottom.roundToInt() - viewTop, + if (rounding.roundTop) clipRadius else 0, + if (rounding.roundBottom) clipRadius else 0, + ) + } + } + + launch { + viewModel.contentTop.collect { + controller.updateTopPadding(it, controller.isAddOrRemoveAnimationPending) + } + } + + launch { + var wasExpanding = false + viewModel.expandFraction.collect { expandFraction -> + val nowExpanding = expandFraction != 0f && expandFraction != 1f + if (nowExpanding && !wasExpanding) { + controller.onExpansionStarted() + } + ambientState.expansionFraction = expandFraction + controller.expandedHeight = expandFraction * controller.view.height + if (!nowExpanding && wasExpanding) { + controller.onExpansionStopped() + } + wasExpanding = nowExpanding + } + } + + launch { viewModel.isScrollable.collect { controller.setScrollingEnabled(it) } } + } + + private val clipRadius: Flow<Int> + get() = configuration.getDimensionPixelOffset(R.dimen.notification_scrim_corner_radius) +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt index 7c76ddbec105..6db6719c76c7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt @@ -20,6 +20,7 @@ import android.view.View import android.view.WindowInsets import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor @@ -30,6 +31,8 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel +import com.android.systemui.util.kotlin.DisposableHandles +import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.DisposableHandle import kotlinx.coroutines.flow.MutableStateFlow @@ -38,18 +41,23 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch /** Binds the shared notification container to its view-model. */ -object SharedNotificationContainerBinder { +@SysUISingleton +class SharedNotificationContainerBinder +@Inject +constructor( + private val sceneContainerFlags: SceneContainerFlags, + private val controller: NotificationStackScrollLayoutController, + private val notificationStackSizeCalculator: NotificationStackSizeCalculator, + @Main private val mainImmediateDispatcher: CoroutineDispatcher, +) { - @JvmStatic fun bind( view: SharedNotificationContainer, viewModel: SharedNotificationContainerViewModel, - sceneContainerFlags: SceneContainerFlags, - controller: NotificationStackScrollLayoutController, - notificationStackSizeCalculator: NotificationStackSizeCalculator, - @Main mainImmediateDispatcher: CoroutineDispatcher, ): DisposableHandle { - val disposableHandle = + val disposables = DisposableHandles() + + disposables += view.repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.CREATED) { launch { @@ -72,24 +80,6 @@ object SharedNotificationContainerBinder { } } - // Required to capture keyguard media changes and ensure the notification count is correct - val layoutChangeListener = - object : View.OnLayoutChangeListener { - override fun onLayoutChange( - view: View, - left: Int, - top: Int, - right: Int, - bottom: Int, - oldLeft: Int, - oldTop: Int, - oldRight: Int, - oldBottom: Int - ) { - viewModel.notificationStackChanged() - } - } - val burnInParams = MutableStateFlow(BurnInParameters()) val viewState = ViewStateAccessor( @@ -100,7 +90,7 @@ object SharedNotificationContainerBinder { * For animation sensitive coroutines, immediately run just like applicationScope does * instead of doing a post() to the main thread. This extra delay can cause visible jitter. */ - val disposableHandleMainImmediate = + disposables += view.repeatWhenAttached(mainImmediateDispatcher) { repeatOnLifecycle(Lifecycle.State.CREATED) { launch { @@ -167,7 +157,8 @@ object SharedNotificationContainerBinder { } } - controller.setOnHeightChangedRunnable(Runnable { viewModel.notificationStackChanged() }) + controller.setOnHeightChangedRunnable { viewModel.notificationStackChanged() } + disposables += DisposableHandle { controller.setOnHeightChangedRunnable(null) } view.setOnApplyWindowInsetsListener { v: View, insets: WindowInsets -> val insetTypes = WindowInsets.Type.systemBars() or WindowInsets.Type.displayCutout() @@ -176,16 +167,16 @@ object SharedNotificationContainerBinder { } insets } - view.addOnLayoutChangeListener(layoutChangeListener) + disposables += DisposableHandle { view.setOnApplyWindowInsetsListener(null) } - return object : DisposableHandle { - override fun dispose() { - disposableHandle.dispose() - disposableHandleMainImmediate.dispose() - controller.setOnHeightChangedRunnable(null) - view.setOnApplyWindowInsetsListener(null) - view.removeOnLayoutChangeListener(layoutChangeListener) + // Required to capture keyguard media changes and ensure the notification count is correct + val layoutChangeListener = + View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> + viewModel.notificationStackChanged() } - } + view.addOnLayoutChangeListener(layoutChangeListener) + disposables += DisposableHandle { view.removeOnLayoutChangeListener(layoutChangeListener) } + + return disposables } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt index c85a18a8a896..4744fcbbc7f7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel +import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.domain.interactor.RemoteInputInteractor import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor @@ -33,10 +34,12 @@ import com.android.systemui.util.ui.AnimatedValue import com.android.systemui.util.ui.toAnimatedValueFlow import java.util.Optional import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart @@ -55,6 +58,7 @@ constructor( shadeInteractor: ShadeInteractor, userSetupInteractor: UserSetupInteractor, zenModeInteractor: ZenModeInteractor, + @Background bgDispatcher: CoroutineDispatcher, ) { /** * We want the NSSL to be unimportant for accessibility when there are no notifications in it @@ -72,6 +76,7 @@ constructor( ) { hasNotifications, isShowingOnLockscreen -> hasNotifications || !isShowingOnLockscreen } + .flowOn(bgDispatcher) .distinctUntilChanged() } } @@ -95,6 +100,7 @@ constructor( else -> true } } + .flowOn(bgDispatcher) .distinctUntilChanged() } } @@ -107,15 +113,13 @@ constructor( activeNotificationsInteractor.areAnyNotificationsPresent, userSetupInteractor.isUserSetUp, notificationStackInteractor.isShowingOnLockscreen, - shadeInteractor.qsExpansion, shadeInteractor.isQsFullscreen, remoteInputInteractor.isRemoteInputActive, - shadeInteractor.shadeExpansion.map { it == 0f } + shadeInteractor.shadeExpansion.map { it == 0f }.distinctUntilChanged(), ) { hasNotifications, isUserSetUp, isShowingOnLockscreen, - qsExpansion, qsFullScreen, isRemoteInputActive, isShadeClosed -> @@ -131,7 +135,7 @@ constructor( isShowingOnLockscreen -> VisibilityChange.HIDE_WITHOUT_ANIMATION // Do not show the footer if quick settings are fully expanded (except // for the foldable split shade view). See b/201427195 && b/222699879. - qsExpansion == 1f && qsFullScreen -> VisibilityChange.HIDE_WITH_ANIMATION + qsFullScreen -> VisibilityChange.HIDE_WITH_ANIMATION // Hide the footer if remote input is active (i.e. user is replying to a // notification). See b/75984847. isRemoteInputActive -> VisibilityChange.HIDE_WITH_ANIMATION @@ -140,6 +144,7 @@ constructor( else -> VisibilityChange.SHOW_WITH_ANIMATION } } + .flowOn(bgDispatcher) .distinctUntilChanged( // Equivalent unless visibility changes areEquivalent = { a: VisibilityChange, b: VisibilityChange -> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt index b6167e1ef0fb..a7cbc3374a0e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationStackAppearanceViewModel.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel import com.android.compose.animation.scene.ObservableTransitionState -import com.android.systemui.common.shared.model.NotificationContainerBounds import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager @@ -27,6 +26,7 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.Scenes.Shade import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor +import com.android.systemui.statusbar.notification.stack.shared.model.StackClipping import com.android.systemui.util.kotlin.FlowDumperImpl import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -83,8 +83,13 @@ constructor( .dumpWhileCollecting("expandFraction") /** The bounds of the notification stack in the current scene. */ - val stackBounds: Flow<NotificationContainerBounds> = - stackAppearanceInteractor.stackBounds.dumpValue("stackBounds") + val stackClipping: Flow<StackClipping> = + combine( + stackAppearanceInteractor.stackBounds, + stackAppearanceInteractor.stackRounding, + ::StackClipping + ) + .dumpWhileCollecting("stackClipping") /** The y-coordinate in px of top of the contents of the notification stack. */ val contentTop: StateFlow<Float> = stackAppearanceInteractor.contentTop.dumpValue("contentTop") diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt index 9e2497d5bb41..bd83121d9a34 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationsPlaceholderViewModel.kt @@ -24,6 +24,8 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor +import com.android.systemui.statusbar.notification.stack.shared.model.StackBounds +import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -61,12 +63,17 @@ constructor( right: Float, bottom: Float, ) { - val notificationContainerBounds = - NotificationContainerBounds(top = top, bottom = bottom, left = left, right = right) - keyguardInteractor.setNotificationContainerBounds(notificationContainerBounds) - interactor.setStackBounds(notificationContainerBounds) + keyguardInteractor.setNotificationContainerBounds( + NotificationContainerBounds(top = top, bottom = bottom) + ) + interactor.setStackBounds( + StackBounds(top = top, bottom = bottom, left = left, right = right) + ) } + /** Corner rounding of the stack */ + val stackRounding: Flow<StackRounding> = interactor.stackRounding + /** * The height in px of the contents of notification stack. Depending on the number of * notifications, this can exceed the space available on screen to show notifications, at which diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt index a38840b10b5f..ab6c14892eea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt @@ -386,7 +386,7 @@ constructor( // All transition view models are mututally exclusive, and safe to merge val alphaTransitions = merge( - alternateBouncerToGoneTransitionViewModel.lockscreenAlpha, + alternateBouncerToGoneTransitionViewModel.lockscreenAlpha(viewState), aodToLockscreenTransitionViewModel.notificationAlpha, aodToOccludedTransitionViewModel.lockscreenAlpha(viewState), dozingToLockscreenTransitionViewModel.lockscreenAlpha, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java index 0db5c64c4c4e..665fc0aab316 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java @@ -537,7 +537,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba @VisibleForTesting void vibrateOnNavigationKeyDown() { - mShadeViewController.performHapticFeedback( + mShadeController.performHapticFeedback( HapticFeedbackConstants.GESTURE_START ); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index 24be3db6231f..86bb844e7be3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java @@ -41,6 +41,7 @@ import com.android.systemui.statusbar.notification.collection.provider.OnReorder import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; +import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor; import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; import com.android.systemui.statusbar.policy.AnimationStateHandler; import com.android.systemui.statusbar.policy.AvalancheController; @@ -94,6 +95,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp @Override public HeadsUpEntryPhone acquire() { + NotificationsHeadsUpRefactor.assertInLegacyMode(); if (!mPoolObjects.isEmpty()) { return mPoolObjects.pop(); } @@ -102,6 +104,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp @Override public boolean release(@NonNull HeadsUpEntryPhone instance) { + NotificationsHeadsUpRefactor.assertInLegacyMode(); mPoolObjects.push(instance); return true; } @@ -371,15 +374,24 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp /////////////////////////////////////////////////////////////////////////////////////////////// // HeadsUpManager utility (protected) methods overrides: + @NonNull @Override - protected HeadsUpEntry createHeadsUpEntry() { - return mEntryPool.acquire(); + protected HeadsUpEntry createHeadsUpEntry(NotificationEntry entry) { + if (NotificationsHeadsUpRefactor.isEnabled()) { + return new HeadsUpEntryPhone(entry); + } else { + HeadsUpEntryPhone headsUpEntry = mEntryPool.acquire(); + headsUpEntry.setEntry(entry); + return headsUpEntry; + } } @Override protected void onEntryRemoved(HeadsUpEntry headsUpEntry) { super.onEntryRemoved(headsUpEntry); - mEntryPool.release((HeadsUpEntryPhone) headsUpEntry); + if (!NotificationsHeadsUpRefactor.isEnabled()) { + mEntryPool.release((HeadsUpEntryPhone) headsUpEntry); + } } @Override @@ -439,14 +451,22 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp */ private boolean extended; - @Override public boolean isSticky() { return super.isSticky() || mGutsShownPinned; } - public void setEntry(@NonNull final NotificationEntry entry) { - Runnable removeHeadsUpRunnable = () -> { + public HeadsUpEntryPhone() { + super(); + } + + public HeadsUpEntryPhone(NotificationEntry entry) { + super(entry); + } + + @Override + protected Runnable createRemoveRunnable(NotificationEntry entry) { + return () -> { if (!mVisualStabilityProvider.isReorderingAllowed() // We don't want to allow reordering while pulsing, but headsup need to // time out anyway @@ -460,8 +480,6 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp removeEntry(entry.getKey()); } }; - - setEntry(entry, removeHeadsUpRunnable); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt index 25e634a03ef7..82b10bc11cc1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.kt @@ -20,7 +20,6 @@ import android.content.res.Configuration import android.util.AttributeSet import android.view.View import android.view.ViewGroup -import android.view.WindowInsets import android.widget.FrameLayout import androidx.annotation.StringRes import com.android.keyguard.LockIconViewController @@ -148,16 +147,6 @@ constructor( return false } - override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - val bottom = insets.displayCutout?.safeInsetBottom ?: 0 - if (isPaddingRelative) { - setPaddingRelative(paddingStart, paddingTop, paddingEnd, bottom) - } else { - setPadding(paddingLeft, paddingTop, paddingRight, bottom) - } - return insets - } - override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { super.onLayout(changed, left, top, right, bottom) findViewById<View>(R.id.ambient_indication_container)?.let { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java index 50de3cba6b59..6f7e0468c246 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java @@ -39,6 +39,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.res.R; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag; +import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor; import com.android.systemui.util.ListenerSet; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.settings.GlobalSettings; @@ -162,11 +163,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { */ @Override public void showNotification(@NonNull NotificationEntry entry) { - HeadsUpEntry headsUpEntry = createHeadsUpEntry(); - - // Attach NotificationEntry for AvalancheController to log key and - // record mPostTime for AvalancheController sorting - headsUpEntry.setEntry(entry); + HeadsUpEntry headsUpEntry = createHeadsUpEntry(entry); Runnable runnable = () -> { // TODO(b/315362456) log outside runnable too @@ -375,7 +372,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { } /** - * Remove a notification and reset the entry. + * Remove a notification from the alerting entries. * @param key key of notification to remove */ protected final void removeEntry(@NonNull String key) { @@ -395,7 +392,11 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { mHeadsUpEntryMap.remove(key); onEntryRemoved(headsUpEntry); entry.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED); - headsUpEntry.reset(); + if (NotificationsHeadsUpRefactor.isEnabled()) { + headsUpEntry.cancelAutoRemovalCallbacks("removeEntry"); + } else { + headsUpEntry.reset(); + } }; mAvalancheController.delete(headsUpEntry, runnable, "removeEntry"); } @@ -657,8 +658,8 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { } @NonNull - protected HeadsUpEntry createHeadsUpEntry() { - return new HeadsUpEntry(); + protected HeadsUpEntry createHeadsUpEntry(NotificationEntry entry) { + return new HeadsUpEntry(entry); } /** @@ -694,11 +695,23 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { @Nullable private Runnable mCancelRemoveRunnable; + public HeadsUpEntry() { + NotificationsHeadsUpRefactor.assertInLegacyMode(); + } + + public HeadsUpEntry(NotificationEntry entry) { + // Attach NotificationEntry for AvalancheController to log key and + // record mPostTime for AvalancheController sorting + setEntry(entry, createRemoveRunnable(entry)); + } + + /** Attach a NotificationEntry. */ public void setEntry(@NonNull final NotificationEntry entry) { - setEntry(entry, () -> removeEntry(entry.getKey())); + NotificationsHeadsUpRefactor.assertInLegacyMode(); + setEntry(entry, createRemoveRunnable(entry)); } - public void setEntry(@NonNull final NotificationEntry entry, + private void setEntry(@NonNull final NotificationEntry entry, @Nullable Runnable removeRunnable) { mEntry = entry; mRemoveRunnable = removeRunnable; @@ -847,6 +860,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { } public void reset() { + NotificationsHeadsUpRefactor.assertInLegacyMode(); cancelAutoRemovalCallbacks("reset()"); mEntry = null; mRemoveRunnable = null; @@ -919,6 +933,11 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { } } + /** Creates a runnable to remove this notification from the alerting entries. */ + protected Runnable createRemoveRunnable(NotificationEntry entry) { + return () -> removeEntry(entry.getKey()); + } + /** * Calculate what the post time of a notification is at some current time. * @return the post time diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt index ac1d2803835a..e977014e00f2 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt @@ -91,7 +91,8 @@ constructor( ) controller.init() - applicationScope.launch(bgHandler.asCoroutineDispatcher()) { + val bgDispatcher = bgHandler.asCoroutineDispatcher("@UnfoldBg Handler") + applicationScope.launch(bgDispatcher) { powerInteractor.screenPowerState.collect { if (it == ScreenPowerState.SCREEN_ON) { readyCallback = null @@ -99,7 +100,7 @@ constructor( } } - applicationScope.launch(bgHandler.asCoroutineDispatcher()) { + applicationScope.launch(bgDispatcher) { deviceStateRepository.state .map { it == DeviceStateRepository.DeviceState.FOLDED } .distinctUntilChanged() diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/DisposableHandles.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/DisposableHandles.kt new file mode 100644 index 000000000000..de036eaebaa2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/DisposableHandles.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 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.util.kotlin + +import kotlinx.coroutines.DisposableHandle + +/** A mutable collection of [DisposableHandle] objects that is itself a [DisposableHandle] */ +class DisposableHandles : DisposableHandle { + private val handles = mutableListOf<DisposableHandle>() + + /** Add the provided handles to this collection. */ + fun add(vararg handles: DisposableHandle) { + this.handles.addAll(handles) + } + + /** Same as [add] */ + operator fun plusAssign(handle: DisposableHandle) { + this.handles.add(handle) + } + + /** Same as [add] */ + operator fun plusAssign(handles: Iterable<DisposableHandle>) { + this.handles.addAll(handles) + } + + /** [dispose] the current contents, then [add] the provided [handles] */ + fun replaceAll(vararg handles: DisposableHandle) { + dispose() + add(*handles) + } + + /** Dispose of all added handles and empty this collection. */ + override fun dispose() { + handles.forEach { it.dispose() } + handles.clear() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/dagger/MediaDevicesModule.kt b/packages/SystemUI/src/com/android/systemui/volume/dagger/MediaDevicesModule.kt index d134e60ef72f..155102c9b9a7 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dagger/MediaDevicesModule.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dagger/MediaDevicesModule.kt @@ -21,7 +21,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.settingslib.volume.data.repository.LocalMediaRepository import com.android.settingslib.volume.data.repository.MediaControllerRepository import com.android.settingslib.volume.data.repository.MediaControllerRepositoryImpl -import com.android.settingslib.volume.domain.interactor.LocalMediaInteractor import com.android.settingslib.volume.shared.AudioManagerEventsReceiver import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -52,13 +51,6 @@ interface MediaDevicesModule { @Provides @SysUISingleton - fun provideLocalMediaInteractor( - repository: LocalMediaRepository, - @Application scope: CoroutineScope, - ): LocalMediaInteractor = LocalMediaInteractor(repository, scope) - - @Provides - @SysUISingleton fun provideMediaDeviceSessionRepository( intentsReceiver: AudioManagerEventsReceiver, mediaSessionManager: MediaSessionManager, diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModel.kt index 8ff2837c44ef..46ea38239aa2 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModel.kt @@ -38,7 +38,8 @@ constructor( fun onSettingsClicked() { volumePanelViewModel.dismissPanel() activityStarter.startActivity( - Intent(Settings.ACTION_SOUND_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + Intent(Settings.ACTION_SOUND_SETTINGS) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), true, ) } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/data/repository/LocalMediaRepositoryFactory.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/data/repository/LocalMediaRepositoryFactory.kt index 11b4690e59ee..e052f243f7ea 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/data/repository/LocalMediaRepositoryFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/data/repository/LocalMediaRepositoryFactory.kt @@ -15,15 +15,12 @@ */ package com.android.systemui.volume.panel.component.mediaoutput.data.repository -import android.media.MediaRouter2Manager import com.android.settingslib.volume.data.repository.LocalMediaRepository import com.android.settingslib.volume.data.repository.LocalMediaRepositoryImpl import com.android.settingslib.volume.shared.AudioManagerEventsReceiver import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.media.controls.util.LocalMediaManagerFactory import javax.inject.Inject -import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope interface LocalMediaRepositoryFactory { @@ -35,18 +32,14 @@ class LocalMediaRepositoryFactoryImpl @Inject constructor( private val eventsReceiver: AudioManagerEventsReceiver, - private val mediaRouter2Manager: MediaRouter2Manager, private val localMediaManagerFactory: LocalMediaManagerFactory, @Application private val coroutineScope: CoroutineScope, - @Background private val backgroundCoroutineContext: CoroutineContext, ) : LocalMediaRepositoryFactory { override fun create(packageName: String?): LocalMediaRepository = LocalMediaRepositoryImpl( eventsReceiver, localMediaManagerFactory.create(packageName), - mediaRouter2Manager, coroutineScope, - backgroundCoroutineContext, ) } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt new file mode 100644 index 000000000000..b0c8a4a2d478 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2024 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.volume.panel.component.mediaoutput.domain.interactor + +import android.media.session.MediaController +import android.media.session.PlaybackState +import android.os.Handler +import com.android.settingslib.volume.data.repository.MediaControllerChange +import com.android.settingslib.volume.data.repository.MediaControllerRepository +import com.android.settingslib.volume.data.repository.stateChanges +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession +import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.FlowCollector +import kotlinx.coroutines.flow.filterIsInstance +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.withContext + +/** Allows to observe and change [MediaDeviceSession] state. */ +@OptIn(ExperimentalCoroutinesApi::class) +@VolumePanelScope +class MediaDeviceSessionInteractor +@Inject +constructor( + @Background private val backgroundCoroutineContext: CoroutineContext, + @Background private val backgroundHandler: Handler, + private val mediaControllerRepository: MediaControllerRepository, +) { + + /** [PlaybackState] changes for the [MediaDeviceSession]. */ + fun playbackState(session: MediaDeviceSession): Flow<PlaybackState?> { + return stateChanges(session) { + emit(MediaControllerChange.PlaybackStateChanged(it.playbackState)) + } + .filterIsInstance(MediaControllerChange.PlaybackStateChanged::class) + .map { it.state } + } + + /** [MediaController.PlaybackInfo] changes for the [MediaDeviceSession]. */ + fun playbackInfo(session: MediaDeviceSession): Flow<MediaController.PlaybackInfo?> { + return stateChanges(session) { + emit(MediaControllerChange.AudioInfoChanged(it.playbackInfo)) + } + .filterIsInstance(MediaControllerChange.AudioInfoChanged::class) + .map { it.info } + } + + private fun stateChanges( + session: MediaDeviceSession, + onStart: suspend FlowCollector<MediaControllerChange>.(controller: MediaController) -> Unit, + ): Flow<MediaControllerChange?> = + mediaControllerRepository.activeSessions + .flatMapLatest { controllers -> + val controller: MediaController = + findControllerForSession(controllers, session) + ?: return@flatMapLatest flowOf(null) + controller.stateChanges(backgroundHandler).onStart { onStart(controller) } + } + .flowOn(backgroundCoroutineContext) + + /** Set [MediaDeviceSession] volume to [volume]. */ + suspend fun setSessionVolume(mediaDeviceSession: MediaDeviceSession, volume: Int): Boolean { + if (!mediaDeviceSession.canAdjustVolume) { + return false + } + return withContext(backgroundCoroutineContext) { + val controller = + findControllerForSession( + mediaControllerRepository.activeSessions.value, + mediaDeviceSession, + ) + if (controller == null) { + false + } else { + controller.setVolumeTo(volume, 0) + true + } + } + } + + private fun findControllerForSession( + controllers: Collection<MediaController>, + mediaDeviceSession: MediaDeviceSession, + ): MediaController? = + controllers.firstOrNull { it.sessionToken == mediaDeviceSession.sessionToken } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputActionsInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputActionsInteractor.kt index cb16abe7e575..ea4c082f4660 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputActionsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputActionsInteractor.kt @@ -33,23 +33,15 @@ constructor( private val mediaOutputDialogManager: MediaOutputDialogManager, ) { - fun onBarClick(session: MediaDeviceSession, expandable: Expandable) { - when (session) { - is MediaDeviceSession.Active -> { - mediaOutputDialogManager.createAndShowWithController( - session.packageName, - false, - expandable.dialogController() - ) - } - is MediaDeviceSession.Inactive -> { - mediaOutputDialogManager.createAndShowForSystemRouting( - expandable.dialogController() - ) - } - else -> { - /* do nothing */ - } + fun onBarClick(session: MediaDeviceSession, isPlaybackActive: Boolean, expandable: Expandable) { + if (isPlaybackActive) { + mediaOutputDialogManager.createAndShowWithController( + session.packageName, + false, + expandable.dialogController() + ) + } else { + mediaOutputDialogManager.createAndShowForSystemRouting(expandable.dialogController()) } } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt index 0f5343701ac6..e60139ecf9cc 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt @@ -17,17 +17,16 @@ package com.android.systemui.volume.panel.component.mediaoutput.domain.interactor import android.content.pm.PackageManager +import android.media.VolumeProvider import android.media.session.MediaController -import android.os.Handler import android.util.Log import com.android.settingslib.media.MediaDevice import com.android.settingslib.volume.data.repository.LocalMediaRepository -import com.android.settingslib.volume.data.repository.MediaControllerChange import com.android.settingslib.volume.data.repository.MediaControllerRepository -import com.android.settingslib.volume.data.repository.stateChanges import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.volume.panel.component.mediaoutput.data.repository.LocalMediaRepositoryFactory import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession +import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSessions import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope import javax.inject.Inject import kotlin.coroutines.CoroutineContext @@ -38,12 +37,9 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.withContext @@ -58,35 +54,40 @@ constructor( private val packageManager: PackageManager, @VolumePanelScope private val coroutineScope: CoroutineScope, @Background private val backgroundCoroutineContext: CoroutineContext, - @Background private val backgroundHandler: Handler, - mediaControllerRepository: MediaControllerRepository + mediaControllerRepository: MediaControllerRepository, ) { - /** Current [MediaDeviceSession]. Emits when the session playback changes. */ - val mediaDeviceSession: StateFlow<MediaDeviceSession> = - mediaControllerRepository.activeLocalMediaController - .flatMapLatest { it?.mediaDeviceSession() ?: flowOf(MediaDeviceSession.Inactive) } - .flowOn(backgroundCoroutineContext) - .stateIn(coroutineScope, SharingStarted.Eagerly, MediaDeviceSession.Inactive) + private val activeMediaControllers: Flow<MediaControllers> = + mediaControllerRepository.activeSessions + .map { getMediaControllers(it) } + .shareIn(coroutineScope, SharingStarted.Eagerly, replay = 1) + + /** [MediaDeviceSessions] that contains currently active sessions. */ + val activeMediaDeviceSessions: Flow<MediaDeviceSessions> = + activeMediaControllers.map { + MediaDeviceSessions( + local = it.local?.mediaDeviceSession(), + remote = it.remote?.mediaDeviceSession() + ) + } - private fun MediaController.mediaDeviceSession(): Flow<MediaDeviceSession> { - return stateChanges(backgroundHandler) - .onStart { emit(MediaControllerChange.PlaybackStateChanged(playbackState)) } - .filterIsInstance<MediaControllerChange.PlaybackStateChanged>() + /** Returns the default [MediaDeviceSession] from [activeMediaDeviceSessions] */ + val defaultActiveMediaSession: StateFlow<MediaDeviceSession?> = + activeMediaControllers .map { - MediaDeviceSession.Active( - appLabel = getApplicationLabel(packageName) - ?: return@map MediaDeviceSession.Inactive, - packageName = packageName, - sessionToken = sessionToken, - playbackState = playbackState, - ) + when { + it.local?.playbackState?.isActive == true -> it.local.mediaDeviceSession() + it.remote?.playbackState?.isActive == true -> it.remote.mediaDeviceSession() + it.local != null -> it.local.mediaDeviceSession() + else -> null + } } - } + .flowOn(backgroundCoroutineContext) + .stateIn(coroutineScope, SharingStarted.Eagerly, null) private val localMediaRepository: SharedFlow<LocalMediaRepository> = - mediaDeviceSession - .map { (it as? MediaDeviceSession.Active)?.packageName } + defaultActiveMediaSession + .map { it?.packageName } .distinctUntilChanged() .map { localMediaRepositoryFactory.create(it) } .shareIn(coroutineScope, SharingStarted.Eagerly, replay = 1) @@ -111,6 +112,54 @@ constructor( } } + /** Finds local and remote media controllers. */ + private fun getMediaControllers( + controllers: Collection<MediaController>, + ): MediaControllers { + var localController: MediaController? = null + var remoteController: MediaController? = null + val remoteMediaSessions: MutableSet<String> = mutableSetOf() + for (controller in controllers) { + val playbackInfo: MediaController.PlaybackInfo = controller.playbackInfo ?: continue + when (playbackInfo.playbackType) { + MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE -> { + // MediaController can't be local if there is a remote one for the same package + if (localController?.packageName.equals(controller.packageName)) { + localController = null + } + if (!remoteMediaSessions.contains(controller.packageName)) { + remoteMediaSessions.add(controller.packageName) + if (remoteController == null) { + remoteController = controller + } + } + } + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL -> { + if (controller.packageName in remoteMediaSessions) continue + if (localController != null) continue + localController = controller + } + } + } + return MediaControllers(local = localController, remote = remoteController) + } + + private suspend fun MediaController.mediaDeviceSession(): MediaDeviceSession? { + return MediaDeviceSession( + packageName = packageName, + sessionToken = sessionToken, + canAdjustVolume = + playbackInfo != null && + playbackInfo?.volumeControl != VolumeProvider.VOLUME_CONTROL_FIXED, + appLabel = getApplicationLabel(packageName) ?: return null + ) + } + + private data class MediaControllers( + val local: MediaController?, + val remote: MediaController?, + ) + private companion object { const val TAG = "MediaOutputInteractor" } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSession.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSession.kt index 1bceee9b2d34..2a2ce796a2b7 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSession.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSession.kt @@ -17,26 +17,15 @@ package com.android.systemui.volume.panel.component.mediaoutput.domain.model import android.media.session.MediaSession -import android.media.session.PlaybackState /** Represents media playing on the connected device. */ -sealed interface MediaDeviceSession { +data class MediaDeviceSession( + val appLabel: CharSequence, + val packageName: String, + val sessionToken: MediaSession.Token, + val canAdjustVolume: Boolean, +) - /** Media is playing. */ - data class Active( - val appLabel: CharSequence, - val packageName: String, - val sessionToken: MediaSession.Token, - val playbackState: PlaybackState?, - ) : MediaDeviceSession - - /** Media is not playing. */ - data object Inactive : MediaDeviceSession - - /** Current media state is unknown yet. */ - data object Unknown : MediaDeviceSession -} - -/** Returns true when the audio is playing for the [MediaDeviceSession]. */ -fun MediaDeviceSession.isPlaying(): Boolean = - this is MediaDeviceSession.Active && playbackState?.isActive == true +/** Returns true when [other] controls the same sessions as [this]. */ +fun MediaDeviceSession.isTheSameSession(other: MediaDeviceSession?): Boolean = + sessionToken == other?.sessionToken diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSessions.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSessions.kt new file mode 100644 index 000000000000..ddc078421b9a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/model/MediaDeviceSessions.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 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.volume.panel.component.mediaoutput.domain.model + +/** Models a pair of local and remote [MediaDeviceSession]s. */ +data class MediaDeviceSessions( + val local: MediaDeviceSession?, + val remote: MediaDeviceSession?, +) { + + companion object { + /** Returns [MediaDeviceSessions.local]. */ + val Local: (MediaDeviceSessions) -> MediaDeviceSession? = { it.local } + /** Returns [MediaDeviceSessions.remote]. */ + val Remote: (MediaDeviceSessions) -> MediaDeviceSession? = { it.remote } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModel.kt index d49cb1ea6958..2530a3a46384 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/ui/viewmodel/MediaOutputViewModel.kt @@ -17,24 +17,30 @@ package com.android.systemui.volume.panel.component.mediaoutput.ui.viewmodel import android.content.Context +import android.media.session.PlaybackState import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.Color import com.android.systemui.common.shared.model.Icon import com.android.systemui.res.R +import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaDeviceSessionInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputActionsInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession -import com.android.systemui.volume.panel.component.mediaoutput.domain.model.isPlaying import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn /** Models the UI of the Media Output Volume Panel component. */ +@OptIn(ExperimentalCoroutinesApi::class) @VolumePanelScope class MediaOutputViewModel @Inject @@ -43,25 +49,36 @@ constructor( @VolumePanelScope private val coroutineScope: CoroutineScope, private val volumePanelViewModel: VolumePanelViewModel, private val actionsInteractor: MediaOutputActionsInteractor, + private val mediaDeviceSessionInteractor: MediaDeviceSessionInteractor, interactor: MediaOutputInteractor, ) { - private val mediaDeviceSession: StateFlow<MediaDeviceSession> = - interactor.mediaDeviceSession.stateIn( - coroutineScope, - SharingStarted.Eagerly, - MediaDeviceSession.Unknown, - ) + private val sessionWithPlayback: StateFlow<SessionWithPlayback?> = + interactor.defaultActiveMediaSession + .flatMapLatest { session -> + if (session == null) { + flowOf(null) + } else { + mediaDeviceSessionInteractor.playbackState(session).map { playback -> + playback?.let { SessionWithPlayback(session, it) } + } + } + } + .stateIn( + coroutineScope, + SharingStarted.Eagerly, + null, + ) val connectedDeviceViewModel: StateFlow<ConnectedDeviceViewModel?> = - combine(mediaDeviceSession, interactor.currentConnectedDevice) { + combine(sessionWithPlayback, interactor.currentConnectedDevice) { mediaDeviceSession, currentConnectedDevice -> ConnectedDeviceViewModel( - if (mediaDeviceSession.isPlaying()) { + if (mediaDeviceSession?.playback?.isActive == true) { context.getString( R.string.media_output_label_title, - (mediaDeviceSession as MediaDeviceSession.Active).appLabel + mediaDeviceSession.session.appLabel ) } else { context.getString(R.string.media_output_title_without_playing) @@ -76,10 +93,10 @@ constructor( ) val deviceIconViewModel: StateFlow<DeviceIconViewModel?> = - combine(mediaDeviceSession, interactor.currentConnectedDevice) { + combine(sessionWithPlayback, interactor.currentConnectedDevice) { mediaDeviceSession, currentConnectedDevice -> - if (mediaDeviceSession.isPlaying()) { + if (mediaDeviceSession?.playback?.isActive == true) { val icon = currentConnectedDevice?.icon?.let { Icon.Loaded(it, null) } ?: Icon.Resource( @@ -112,7 +129,14 @@ constructor( ) fun onBarClick(expandable: Expandable) { - actionsInteractor.onBarClick(mediaDeviceSession.value, expandable) + sessionWithPlayback.value?.let { + actionsInteractor.onBarClick(it.session, it.playback.isActive, expandable) + } volumePanelViewModel.dismissPanel() } + + private data class SessionWithPlayback( + val session: MediaDeviceSession, + val playback: PlaybackState, + ) } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/domain/interactor/CastVolumeInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/domain/interactor/CastVolumeInteractor.kt deleted file mode 100644 index 6b62074e023d..000000000000 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/domain/interactor/CastVolumeInteractor.kt +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2024 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.volume.panel.component.volume.domain.interactor - -import com.android.settingslib.volume.domain.interactor.LocalMediaInteractor -import com.android.settingslib.volume.domain.model.RoutingSession -import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope -import javax.inject.Inject -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.stateIn - -/** Provides a remote media casting state. */ -@VolumePanelScope -class CastVolumeInteractor -@Inject -constructor( - @VolumePanelScope private val coroutineScope: CoroutineScope, - private val localMediaInteractor: LocalMediaInteractor, -) { - - /** Returns a list of [RoutingSession] to show in the UI. */ - val remoteRoutingSessions: StateFlow<List<RoutingSession>> = - localMediaInteractor.remoteRoutingSessions - .map { it.filter { routingSession -> routingSession.isVolumeSeekBarEnabled } } - .stateIn(coroutineScope, SharingStarted.Eagerly, emptyList()) - - /** Sets [routingSession] volume to [volume]. */ - suspend fun setVolume(routingSession: RoutingSession, volume: Int) { - localMediaInteractor.adjustSessionVolume(routingSession.routingSessionInfo.id, volume) - } -} diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt index 1b732081a12a..3242c2814bc5 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt @@ -80,7 +80,7 @@ constructor( ) { model, isEnabled, ringerMode -> model.toState(isEnabled, ringerMode) } - .stateIn(coroutineScope, SharingStarted.Eagerly, EmptyState) + .stateIn(coroutineScope, SharingStarted.Eagerly, SliderState.Empty) override fun onValueChanged(state: SliderState, newValue: Float) { val audioViewModel = state as? State @@ -116,6 +116,7 @@ constructor( isEnabled = isEnabled, a11yStep = volumeRange.step, audioStreamModel = this, + isMutable = audioVolumeInteractor.isMutable(audioStream), ) } @@ -160,20 +161,10 @@ constructor( override val disabledMessage: String?, override val isEnabled: Boolean, override val a11yStep: Int, + override val isMutable: Boolean, val audioStreamModel: AudioStreamModel, ) : SliderState - private data object EmptyState : SliderState { - override val value: Float = 0f - override val valueRange: ClosedFloatingPointRange<Float> = 0f..1f - override val icon: Icon? = null - override val valueText: String = "" - override val label: String = "" - override val disabledMessage: String? = null - override val a11yStep: Int = 0 - override val isEnabled: Boolean = true - } - @AssistedFactory interface Factory { diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/CastVolumeSliderViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/CastVolumeSliderViewModel.kt index 86b2d73de3e3..73c8bbfce6d9 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/CastVolumeSliderViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/CastVolumeSliderViewModel.kt @@ -17,11 +17,11 @@ package com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel import android.content.Context -import com.android.settingslib.volume.domain.model.RoutingSession +import android.media.session.MediaController.PlaybackInfo import com.android.systemui.common.shared.model.Icon import com.android.systemui.res.R -import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor -import com.android.systemui.volume.panel.component.volume.domain.interactor.CastVolumeInteractor +import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaDeviceSessionInteractor +import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession import com.android.systemui.volume.panel.component.volume.domain.interactor.VolumeSliderInteractor import dagger.assisted.Assisted import dagger.assisted.AssistedFactory @@ -30,30 +30,29 @@ import kotlin.math.roundToInt import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch class CastVolumeSliderViewModel @AssistedInject constructor( - @Assisted private val routingSession: RoutingSession, + @Assisted private val session: MediaDeviceSession, @Assisted private val coroutineScope: CoroutineScope, private val context: Context, - mediaOutputInteractor: MediaOutputInteractor, + private val mediaDeviceSessionInteractor: MediaDeviceSessionInteractor, private val volumeSliderInteractor: VolumeSliderInteractor, - private val castVolumeInteractor: CastVolumeInteractor, ) : SliderViewModel { - private val volumeRange = 0..routingSession.routingSessionInfo.volumeMax - override val slider: StateFlow<SliderState> = - combine(mediaOutputInteractor.currentConnectedDevice) { _ -> getCurrentState() } - .stateIn(coroutineScope, SharingStarted.Eagerly, getCurrentState()) + mediaDeviceSessionInteractor + .playbackInfo(session) + .mapNotNull { it?.getCurrentState() } + .stateIn(coroutineScope, SharingStarted.Eagerly, SliderState.Empty) override fun onValueChanged(state: SliderState, newValue: Float) { coroutineScope.launch { - castVolumeInteractor.setVolume(routingSession, newValue.roundToInt()) + mediaDeviceSessionInteractor.setSessionVolume(session, newValue.roundToInt()) } } @@ -61,15 +60,16 @@ constructor( // do nothing because this action isn't supported for Cast sliders. } - private fun getCurrentState(): State = - State( - value = routingSession.routingSessionInfo.volume.toFloat(), + private fun PlaybackInfo.getCurrentState(): State { + val volumeRange = 0..maxVolume + return State( + value = currentVolume.toFloat(), valueRange = volumeRange.first.toFloat()..volumeRange.last.toFloat(), icon = Icon.Resource(R.drawable.ic_cast, null), valueText = SliderViewModel.formatValue( volumeSliderInteractor.processVolumeToValue( - volume = routingSession.routingSessionInfo.volume, + volume = currentVolume, volumeRange = volumeRange, ) ), @@ -77,6 +77,7 @@ constructor( isEnabled = true, a11yStep = 1 ) + } private data class State( override val value: Float, @@ -89,13 +90,15 @@ constructor( ) : SliderState { override val disabledMessage: String? get() = null + override val isMutable: Boolean + get() = false } @AssistedFactory interface Factory { fun create( - routingSession: RoutingSession, + session: MediaDeviceSession, coroutineScope: CoroutineScope, ): CastVolumeSliderViewModel } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/SliderState.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/SliderState.kt index b87d0a786740..8eb0b8947c37 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/SliderState.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/SliderState.kt @@ -36,4 +36,17 @@ sealed interface SliderState { */ val a11yStep: Int val disabledMessage: String? + val isMutable: Boolean + + data object Empty : SliderState { + override val value: Float = 0f + override val valueRange: ClosedFloatingPointRange<Float> = 0f..1f + override val icon: Icon? = null + override val valueText: String = "" + override val label: String = "" + override val disabledMessage: String? = null + override val a11yStep: Int = 0 + override val isEnabled: Boolean = true + override val isMutable: Boolean = false + } } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/ui/viewmodel/AudioVolumeComponentViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/ui/viewmodel/AudioVolumeComponentViewModel.kt index aaee24b9357f..4e9a45635f7b 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/ui/viewmodel/AudioVolumeComponentViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/ui/viewmodel/AudioVolumeComponentViewModel.kt @@ -18,9 +18,10 @@ package com.android.systemui.volume.panel.component.volume.ui.viewmodel import android.media.AudioManager import com.android.settingslib.volume.shared.model.AudioStream +import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaDeviceSessionInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor -import com.android.systemui.volume.panel.component.mediaoutput.domain.model.isPlaying -import com.android.systemui.volume.panel.component.volume.domain.interactor.CastVolumeInteractor +import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSession +import com.android.systemui.volume.panel.component.mediaoutput.domain.model.isTheSameSession import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.AudioStreamSliderViewModel import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.CastVolumeSliderViewModel import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.SliderViewModel @@ -29,17 +30,15 @@ import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.combineTransform +import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge -import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn -import kotlinx.coroutines.flow.transformLatest import kotlinx.coroutines.launch /** @@ -52,50 +51,34 @@ class AudioVolumeComponentViewModel @Inject constructor( @VolumePanelScope private val scope: CoroutineScope, - castVolumeInteractor: CastVolumeInteractor, mediaOutputInteractor: MediaOutputInteractor, + private val mediaDeviceSessionInteractor: MediaDeviceSessionInteractor, private val streamSliderViewModelFactory: AudioStreamSliderViewModel.Factory, private val castVolumeSliderViewModelFactory: CastVolumeSliderViewModel.Factory, ) { - private val remoteSessionsViewModels: Flow<List<SliderViewModel>> = - castVolumeInteractor.remoteRoutingSessions.transformLatest { routingSessions -> - coroutineScope { - emit( - routingSessions.map { routingSession -> - castVolumeSliderViewModelFactory.create(routingSession, this) - } - ) - } - } - private val streamViewModels: Flow<List<SliderViewModel>> = - flowOf( - listOf( - AudioStream(AudioManager.STREAM_MUSIC), - AudioStream(AudioManager.STREAM_VOICE_CALL), - AudioStream(AudioManager.STREAM_RING), - AudioStream(AudioManager.STREAM_NOTIFICATION), - AudioStream(AudioManager.STREAM_ALARM), - ) - ) - .transformLatest { streams -> + val sliderViewModels: StateFlow<List<SliderViewModel>> = + combineTransform( + mediaOutputInteractor.activeMediaDeviceSessions, + mediaOutputInteractor.defaultActiveMediaSession, + ) { activeSessions, defaultSession -> coroutineScope { - emit( - streams.map { stream -> - streamSliderViewModelFactory.create( - AudioStreamSliderViewModel.FactoryAudioStreamWrapper(stream), - this, - ) + val viewModels = buildList { + if (defaultSession?.isTheSameSession(activeSessions.remote) == true) { + addRemoteViewModelIfNeeded(this, activeSessions.remote) + addStreamViewModel(this, AudioManager.STREAM_MUSIC) + } else { + addStreamViewModel(this, AudioManager.STREAM_MUSIC) + addRemoteViewModelIfNeeded(this, activeSessions.remote) } - ) - } - } - val sliderViewModels: StateFlow<List<SliderViewModel>> = - combine(remoteSessionsViewModels, streamViewModels) { - remoteSessionsViewModels, - streamViewModels -> - remoteSessionsViewModels + streamViewModels + addStreamViewModel(this, AudioManager.STREAM_VOICE_CALL) + addStreamViewModel(this, AudioManager.STREAM_RING) + addStreamViewModel(this, AudioManager.STREAM_NOTIFICATION) + addStreamViewModel(this, AudioManager.STREAM_ALARM) + } + emit(viewModels) + } } .stateIn(scope, SharingStarted.Eagerly, emptyList()) @@ -103,12 +86,41 @@ constructor( val isExpanded: StateFlow<Boolean> = merge( - mutableIsExpanded.onStart { emit(false) }, - mediaOutputInteractor.mediaDeviceSession.map { !it.isPlaying() }, + mutableIsExpanded, + mediaOutputInteractor.defaultActiveMediaSession.flatMapLatest { + if (it == null) flowOf(true) + else mediaDeviceSessionInteractor.playbackState(it).map { it?.isActive != true } + }, ) .stateIn(scope, SharingStarted.Eagerly, false) fun onExpandedChanged(isExpanded: Boolean) { scope.launch { mutableIsExpanded.emit(isExpanded) } } + + private fun CoroutineScope.addRemoteViewModelIfNeeded( + list: MutableList<SliderViewModel>, + remoteMediaDeviceSession: MediaDeviceSession? + ) { + if (remoteMediaDeviceSession?.canAdjustVolume == true) { + val viewModel = + castVolumeSliderViewModelFactory.create( + remoteMediaDeviceSession, + this, + ) + list.add(viewModel) + } + } + + private fun CoroutineScope.addStreamViewModel( + list: MutableList<SliderViewModel>, + stream: Int, + ) { + val viewModel = + streamSliderViewModelFactory.create( + AudioStreamSliderViewModel.FactoryAudioStreamWrapper(AudioStream(stream)), + this, + ) + list.add(viewModel) + } } diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/activity/VolumePanelActivity.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/activity/VolumePanelActivity.kt index d430e65770fd..c728fefa77e6 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/panel/ui/activity/VolumePanelActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/panel/ui/activity/VolumePanelActivity.kt @@ -42,7 +42,6 @@ constructor( override fun onCreate(savedInstanceState: Bundle?) { enableEdgeToEdge() super.onCreate(savedInstanceState) - volumePanelFlag.assertNewVolumePanel() setContent { VolumePanelRoot(viewModel = viewModel, onDismiss = ::finish) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt index b73e4e6ab015..9182e4101f36 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt @@ -36,6 +36,7 @@ import org.junit.runner.RunWith import org.mockito.Mockito.any import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule @SmallTest @RunWith(AndroidTestingRunner::class) @@ -44,8 +45,8 @@ class DialogTransitionAnimatorTest : SysuiTestCase() { private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator private val attachedViews = mutableSetOf<View>() - val interactionJankMonitor = Kosmos().interactionJankMonitor - @get:Rule val rule = MockitoJUnit.rule() + private val interactionJankMonitor = Kosmos().interactionJankMonitor + @get:Rule val rule: MockitoRule = MockitoJUnit.rule() @Before fun setUp() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java index 206babf9ec44..09675e28f5da 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import android.testing.AndroidTestingRunner; +import androidx.lifecycle.ViewModel; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; @@ -56,7 +57,8 @@ public class ComplicationViewModelTransformerTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); when(mFactory.create(Mockito.any(), Mockito.any())).thenReturn(mComponent); when(mComponent.getViewModelProvider()).thenReturn(mViewModelProvider); - when(mViewModelProvider.get(Mockito.any(), Mockito.any())).thenReturn(mViewModel); + when(mViewModelProvider.get(Mockito.any(), Mockito.<Class<ViewModel>>any())) + .thenReturn(mViewModel); } /** diff --git a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt index 66fdf538e284..933ddb5739e9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt @@ -16,25 +16,22 @@ package com.android.systemui.haptics.slider -import android.os.VibrationAttributes import android.os.VibrationEffect import android.view.VelocityTracker import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.statusbar.VibratorHelper -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.eq +import com.android.systemui.haptics.vibratorHelper +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.whenever -import com.android.systemui.util.time.FakeSystemClock +import com.android.systemui.util.time.fakeSystemClock import kotlin.math.max import kotlin.test.assertEquals +import kotlin.test.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito.times -import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @SmallTest @@ -42,10 +39,10 @@ import org.mockito.MockitoAnnotations class SliderHapticFeedbackProviderTest : SysuiTestCase() { @Mock private lateinit var velocityTracker: VelocityTracker - @Mock private lateinit var vibratorHelper: VibratorHelper + + private val kosmos = testKosmos() private val config = SliderHapticFeedbackConfig() - private val clock = FakeSystemClock() private val lowTickDuration = 12 // Mocked duration of a low tick private val dragTextureThresholdMillis = @@ -55,250 +52,278 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { @Before fun setup() { MockitoAnnotations.initMocks(this) - whenever(vibratorHelper.getPrimitiveDurations(any())) - .thenReturn(intArrayOf(lowTickDuration)) whenever(velocityTracker.isAxisSupported(config.velocityAxis)).thenReturn(true) whenever(velocityTracker.getAxisVelocity(config.velocityAxis)) .thenReturn(config.maxVelocityToScale) + + kosmos.vibratorHelper.primitiveDurations[VibrationEffect.Composition.PRIMITIVE_LOW_TICK] = + lowTickDuration sliderHapticFeedbackProvider = - SliderHapticFeedbackProvider(vibratorHelper, velocityTracker, config, clock) + SliderHapticFeedbackProvider( + kosmos.vibratorHelper, + velocityTracker, + config, + kosmos.fakeSystemClock, + ) } @Test - fun playHapticAtLowerBookend_playsClick() { - val vibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), - ) - .compose() - - sliderHapticFeedbackProvider.onLowerBookend() - - verify(vibratorHelper).vibrate(eq(vibration), any(VibrationAttributes::class.java)) - } + fun playHapticAtLowerBookend_playsClick() = + with(kosmos) { + val vibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision( + config.maxVelocityToScale + ), + ) + .compose() + + sliderHapticFeedbackProvider.onLowerBookend() + + assertTrue(vibratorHelper.hasVibratedWithEffects(vibration)) + } @Test - fun playHapticAtLowerBookend_twoTimes_playsClickOnlyOnce() { - val vibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale) - ) - .compose() - - sliderHapticFeedbackProvider.onLowerBookend() - sliderHapticFeedbackProvider.onLowerBookend() - - verify(vibratorHelper).vibrate(eq(vibration), any(VibrationAttributes::class.java)) - } + fun playHapticAtLowerBookend_twoTimes_playsClickOnlyOnce() = + with(kosmos) { + val vibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale) + ) + .compose() + + sliderHapticFeedbackProvider.onLowerBookend() + sliderHapticFeedbackProvider.onLowerBookend() + + assertTrue(vibratorHelper.hasVibratedWithEffects(vibration)) + } @Test - fun playHapticAtUpperBookend_playsClick() { - val vibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), - ) - .compose() - - sliderHapticFeedbackProvider.onUpperBookend() + fun playHapticAtUpperBookend_playsClick() = + with(kosmos) { + val vibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision( + config.maxVelocityToScale + ), + ) + .compose() + + sliderHapticFeedbackProvider.onUpperBookend() + + assertTrue(vibratorHelper.hasVibratedWithEffects(vibration)) + } - verify(vibratorHelper).vibrate(eq(vibration), any(VibrationAttributes::class.java)) - } + @Test + fun playHapticAtUpperBookend_twoTimes_playsClickOnlyOnce() = + with(kosmos) { + val vibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision( + config.maxVelocityToScale + ), + ) + .compose() + + sliderHapticFeedbackProvider.onUpperBookend() + sliderHapticFeedbackProvider.onUpperBookend() + + assertEquals(/* expected=*/ 1, vibratorHelper.timesVibratedWithEffect(vibration)) + } @Test - fun playHapticAtUpperBookend_twoTimes_playsClickOnlyOnce() { - val vibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), + fun playHapticAtProgress_onQuickSuccession_playsLowTicksOnce() = + with(kosmos) { + // GIVEN max velocity and slider progress + val progress = 1f + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, ) - .compose() + val ticks = VibrationEffect.startComposition() + repeat(config.numberOfLowTicks) { + ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) + } - sliderHapticFeedbackProvider.onUpperBookend() - sliderHapticFeedbackProvider.onUpperBookend() + // GIVEN system running for 1s + fakeSystemClock.advanceTime(1000) - verify(vibratorHelper, times(1)) - .vibrate(eq(vibration), any(VibrationAttributes::class.java)) - } + // WHEN two calls to play occur immediately + sliderHapticFeedbackProvider.onProgress(progress) + sliderHapticFeedbackProvider.onProgress(progress) - @Test - fun playHapticAtProgress_onQuickSuccession_playsLowTicksOnce() { - // GIVEN max velocity and slider progress - val progress = 1f - val expectedScale = - sliderHapticFeedbackProvider.scaleOnDragTexture( - config.maxVelocityToScale, - progress, - ) - val ticks = VibrationEffect.startComposition() - repeat(config.numberOfLowTicks) { - ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) + // THEN the correct composition only plays once + assertEquals(/* expected=*/ 1, vibratorHelper.timesVibratedWithEffect(ticks.compose())) } - // GIVEN system running for 1s - clock.advanceTime(1000) - - // WHEN two calls to play occur immediately - sliderHapticFeedbackProvider.onProgress(progress) - sliderHapticFeedbackProvider.onProgress(progress) - - // THEN the correct composition only plays once - verify(vibratorHelper, times(1)) - .vibrate(eq(ticks.compose()), any(VibrationAttributes::class.java)) - } - @Test - fun playHapticAtProgress_beforeNextDragThreshold_playsLowTicksOnce() { - // GIVEN max velocity and a slider progress at half progress - val firstProgress = 0.5f - val firstTicks = generateTicksComposition(config.maxVelocityToScale, firstProgress) - - // Given a second slider progress event smaller than the progress threshold - val secondProgress = firstProgress + max(0f, config.deltaProgressForDragThreshold - 0.01f) - - // GIVEN system running for 1s - clock.advanceTime(1000) - - // WHEN two calls to play occur with the required threshold separation (time and progress) - sliderHapticFeedbackProvider.onProgress(firstProgress) - clock.advanceTime(dragTextureThresholdMillis.toLong()) - sliderHapticFeedbackProvider.onProgress(secondProgress) - - // THEN Only the first compositions plays - verify(vibratorHelper, times(1)) - .vibrate(eq(firstTicks), any(VibrationAttributes::class.java)) - verify(vibratorHelper, times(1)) - .vibrate(any(VibrationEffect::class.java), any(VibrationAttributes::class.java)) - } + fun playHapticAtProgress_beforeNextDragThreshold_playsLowTicksOnce() = + with(kosmos) { + // GIVEN max velocity and a slider progress at half progress + val firstProgress = 0.5f + val firstTicks = generateTicksComposition(config.maxVelocityToScale, firstProgress) + + // Given a second slider progress event smaller than the progress threshold + val secondProgress = + firstProgress + max(0f, config.deltaProgressForDragThreshold - 0.01f) + + // GIVEN system running for 1s + fakeSystemClock.advanceTime(1000) + + // WHEN two calls to play occur with the required threshold separation (time and + // progress) + sliderHapticFeedbackProvider.onProgress(firstProgress) + fakeSystemClock.advanceTime(dragTextureThresholdMillis.toLong()) + sliderHapticFeedbackProvider.onProgress(secondProgress) + + // THEN Only the first compositions plays + assertEquals(/* expected= */ 1, vibratorHelper.timesVibratedWithEffect(firstTicks)) + assertEquals(/* expected= */ 1, vibratorHelper.totalVibrations) + } @Test - fun playHapticAtProgress_afterNextDragThreshold_playsLowTicksTwice() { - // GIVEN max velocity and a slider progress at half progress - val firstProgress = 0.5f - val firstTicks = generateTicksComposition(config.maxVelocityToScale, firstProgress) - - // Given a second slider progress event beyond progress threshold - val secondProgress = firstProgress + config.deltaProgressForDragThreshold + 0.01f - val secondTicks = generateTicksComposition(config.maxVelocityToScale, secondProgress) - - // GIVEN system running for 1s - clock.advanceTime(1000) - - // WHEN two calls to play occur with the required threshold separation (time and progress) - sliderHapticFeedbackProvider.onProgress(firstProgress) - clock.advanceTime(dragTextureThresholdMillis.toLong()) - sliderHapticFeedbackProvider.onProgress(secondProgress) - - // THEN the correct compositions play - verify(vibratorHelper, times(1)) - .vibrate(eq(firstTicks), any(VibrationAttributes::class.java)) - verify(vibratorHelper, times(1)) - .vibrate(eq(secondTicks), any(VibrationAttributes::class.java)) - } + fun playHapticAtProgress_afterNextDragThreshold_playsLowTicksTwice() = + with(kosmos) { + // GIVEN max velocity and a slider progress at half progress + val firstProgress = 0.5f + val firstTicks = generateTicksComposition(config.maxVelocityToScale, firstProgress) + + // Given a second slider progress event beyond progress threshold + val secondProgress = firstProgress + config.deltaProgressForDragThreshold + 0.01f + val secondTicks = generateTicksComposition(config.maxVelocityToScale, secondProgress) + + // GIVEN system running for 1s + fakeSystemClock.advanceTime(1000) + + // WHEN two calls to play occur with the required threshold separation (time and + // progress) + sliderHapticFeedbackProvider.onProgress(firstProgress) + fakeSystemClock.advanceTime(dragTextureThresholdMillis.toLong()) + sliderHapticFeedbackProvider.onProgress(secondProgress) + + // THEN the correct compositions play + assertEquals(/* expected= */ 1, vibratorHelper.timesVibratedWithEffect(firstTicks)) + assertEquals(/* expected= */ 1, vibratorHelper.timesVibratedWithEffect(secondTicks)) + } @Test - fun playHapticAtLowerBookend_afterPlayingAtProgress_playsTwice() { - // GIVEN max velocity and slider progress - val progress = 1f - val expectedScale = - sliderHapticFeedbackProvider.scaleOnDragTexture( - config.maxVelocityToScale, - progress, + fun playHapticAtLowerBookend_afterPlayingAtProgress_playsTwice() = + with(kosmos) { + // GIVEN max velocity and slider progress + val progress = 1f + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, + ) + val ticks = VibrationEffect.startComposition() + repeat(config.numberOfLowTicks) { + ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) + } + val bookendVibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision( + config.maxVelocityToScale + ), + ) + .compose() + + // GIVEN a vibration at the lower bookend followed by a request to vibrate at progress + sliderHapticFeedbackProvider.onLowerBookend() + sliderHapticFeedbackProvider.onProgress(progress) + + // WHEN a vibration is to trigger again at the lower bookend + sliderHapticFeedbackProvider.onLowerBookend() + + // THEN there are two bookend vibrations + assertEquals( + /* expected= */ 2, + vibratorHelper.timesVibratedWithEffect(bookendVibration) ) - val ticks = VibrationEffect.startComposition() - repeat(config.numberOfLowTicks) { - ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) } - val bookendVibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), - ) - .compose() - - // GIVEN a vibration at the lower bookend followed by a request to vibrate at progress - sliderHapticFeedbackProvider.onLowerBookend() - sliderHapticFeedbackProvider.onProgress(progress) - - // WHEN a vibration is to trigger again at the lower bookend - sliderHapticFeedbackProvider.onLowerBookend() - - // THEN there are two bookend vibrations - verify(vibratorHelper, times(2)) - .vibrate(eq(bookendVibration), any(VibrationAttributes::class.java)) - } @Test - fun playHapticAtUpperBookend_afterPlayingAtProgress_playsTwice() { - // GIVEN max velocity and slider progress - val progress = 1f - val expectedScale = - sliderHapticFeedbackProvider.scaleOnDragTexture( - config.maxVelocityToScale, - progress, + fun playHapticAtUpperBookend_afterPlayingAtProgress_playsTwice() = + with(kosmos) { + // GIVEN max velocity and slider progress + val progress = 1f + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, + ) + val ticks = VibrationEffect.startComposition() + repeat(config.numberOfLowTicks) { + ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) + } + val bookendVibration = + VibrationEffect.startComposition() + .addPrimitive( + VibrationEffect.Composition.PRIMITIVE_CLICK, + sliderHapticFeedbackProvider.scaleOnEdgeCollision( + config.maxVelocityToScale + ), + ) + .compose() + + // GIVEN a vibration at the upper bookend followed by a request to vibrate at progress + sliderHapticFeedbackProvider.onUpperBookend() + sliderHapticFeedbackProvider.onProgress(progress) + + // WHEN a vibration is to trigger again at the upper bookend + sliderHapticFeedbackProvider.onUpperBookend() + + // THEN there are two bookend vibrations + assertEquals( + /* expected= */ 2, + vibratorHelper.timesVibratedWithEffect(bookendVibration) ) - val ticks = VibrationEffect.startComposition() - repeat(config.numberOfLowTicks) { - ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) } - val bookendVibration = - VibrationEffect.startComposition() - .addPrimitive( - VibrationEffect.Composition.PRIMITIVE_CLICK, - sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), - ) - .compose() - - // GIVEN a vibration at the upper bookend followed by a request to vibrate at progress - sliderHapticFeedbackProvider.onUpperBookend() - sliderHapticFeedbackProvider.onProgress(progress) - // WHEN a vibration is to trigger again at the upper bookend - sliderHapticFeedbackProvider.onUpperBookend() + fun dragTextureLastProgress_afterDragTextureHaptics_keepsLastDragTextureProgress() = + with(kosmos) { + // GIVEN max velocity and a slider progress at half progress + val progress = 0.5f - // THEN there are two bookend vibrations - verify(vibratorHelper, times(2)) - .vibrate(eq(bookendVibration), any(VibrationAttributes::class.java)) - } + // GIVEN system running for 1s + fakeSystemClock.advanceTime(1000) - fun dragTextureLastProgress_afterDragTextureHaptics_keepsLastDragTextureProgress() { - // GIVEN max velocity and a slider progress at half progress - val progress = 0.5f + // WHEN a drag texture plays + sliderHapticFeedbackProvider.onProgress(progress) - // GIVEN system running for 1s - clock.advanceTime(1000) - - // WHEN a drag texture plays - sliderHapticFeedbackProvider.onProgress(progress) - - // THEN the dragTextureLastProgress remembers the latest progress - assertEquals(progress, sliderHapticFeedbackProvider.dragTextureLastProgress) - } + // THEN the dragTextureLastProgress remembers the latest progress + assertEquals(progress, sliderHapticFeedbackProvider.dragTextureLastProgress) + } @Test - fun dragTextureLastProgress_afterDragTextureHaptics_resetsOnHandleReleased() { - // GIVEN max velocity and a slider progress at half progress - val progress = 0.5f + fun dragTextureLastProgress_afterDragTextureHaptics_resetsOnHandleReleased() = + with(kosmos) { + // GIVEN max velocity and a slider progress at half progress + val progress = 0.5f - // GIVEN system running for 1s - clock.advanceTime(1000) + // GIVEN system running for 1s + fakeSystemClock.advanceTime(1000) - // WHEN a drag texture plays - sliderHapticFeedbackProvider.onProgress(progress) + // WHEN a drag texture plays + sliderHapticFeedbackProvider.onProgress(progress) - // WHEN the handle is released - sliderHapticFeedbackProvider.onHandleReleasedFromTouch() + // WHEN the handle is released + sliderHapticFeedbackProvider.onHandleReleasedFromTouch() - // THEN the dragTextureLastProgress tracker is reset - assertEquals(-1f, sliderHapticFeedbackProvider.dragTextureLastProgress) - } + // THEN the dragTextureLastProgress tracker is reset + assertEquals(-1f, sliderHapticFeedbackProvider.dragTextureLastProgress) + } private fun generateTicksComposition(velocity: Float, progress: Float): VibrationEffect { val ticks = VibrationEffect.startComposition() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinderTest.kt index 5dd37ae46ee8..66aa572dbc48 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinderTest.kt @@ -131,7 +131,6 @@ class KeyguardClockViewBinderTest : SysuiTestCase() { whenever(clock.smallClock).thenReturn(smallClock) whenever(largeClock.layout).thenReturn(largeClockFaceLayout) whenever(smallClock.layout).thenReturn(smallClockFaceLayout) - whenever(clockViewModel.clock).thenReturn(clock) currentClock.value = clock } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt index 59eb7bb73de7..e56a25345436 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt @@ -66,7 +66,7 @@ private val SMARTSPACE_INSTANCE_ID = InstanceId.fakeInstanceId(456)!! @SmallTest @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper -class MediaDataFilterTest : SysuiTestCase() { +class LegacyMediaDataFilterImplTest : SysuiTestCase() { @Mock private lateinit var listener: MediaDataManager.Listener @Mock private lateinit var userTracker: UserTracker @@ -80,7 +80,7 @@ class MediaDataFilterTest : SysuiTestCase() { @Mock private lateinit var mediaFlags: MediaFlags @Mock private lateinit var cardAction: SmartspaceAction - private lateinit var mediaDataFilter: MediaDataFilter + private lateinit var mediaDataFilter: LegacyMediaDataFilterImpl private lateinit var dataMain: MediaData private lateinit var dataGuest: MediaData private lateinit var dataPrivateProfile: MediaData @@ -92,7 +92,7 @@ class MediaDataFilterTest : SysuiTestCase() { MediaPlayerData.clear() whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) mediaDataFilter = - MediaDataFilter( + LegacyMediaDataFilterImpl( context, userTracker, broadcastSender, @@ -370,7 +370,7 @@ class MediaDataFilterTest : SysuiTestCase() { mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) mediaDataFilter.onSwipeToDismiss() - verify(mediaDataManager).setTimedOut(eq(KEY), eq(true), eq(true)) + verify(mediaDataManager).setInactive(eq(KEY), eq(true), eq(true)) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt index 61bfdb548b4f..5a2d22d0d503 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt @@ -114,7 +114,7 @@ private fun <T> anyObject(): T { @SmallTest @RunWithLooper(setAsMainLooper = true) @RunWith(AndroidTestingRunner::class) -class MediaDataManagerTest : SysuiTestCase() { +class LegacyMediaDataManagerImplTest : SysuiTestCase() { @JvmField @Rule val mockito = MockitoJUnit.rule() @Mock lateinit var mediaControllerFactory: MediaControllerFactory @@ -133,7 +133,7 @@ class MediaDataManagerTest : SysuiTestCase() { @Mock lateinit var mediaSessionBasedFilter: MediaSessionBasedFilter @Mock lateinit var mediaDeviceManager: MediaDeviceManager @Mock lateinit var mediaDataCombineLatest: MediaDataCombineLatest - @Mock lateinit var mediaDataFilter: MediaDataFilter + @Mock lateinit var mediaDataFilter: LegacyMediaDataFilterImpl @Mock lateinit var listener: MediaDataManager.Listener @Mock lateinit var pendingIntent: PendingIntent @Mock lateinit var activityStarter: ActivityStarter @@ -146,7 +146,7 @@ class MediaDataManagerTest : SysuiTestCase() { @Mock private lateinit var mediaSmartspaceBaseAction: SmartspaceAction @Mock private lateinit var mediaFlags: MediaFlags @Mock private lateinit var logger: MediaUiEventLogger - lateinit var mediaDataManager: MediaDataManager + lateinit var mediaDataManager: LegacyMediaDataManagerImpl lateinit var mediaNotification: StatusBarNotification lateinit var remoteCastNotification: StatusBarNotification @Captor lateinit var mediaDataCaptor: ArgumentCaptor<MediaData> @@ -189,7 +189,7 @@ class MediaDataManagerTest : SysuiTestCase() { 1 ) mediaDataManager = - MediaDataManager( + LegacyMediaDataManagerImpl( context = context, backgroundExecutor = backgroundExecutor, uiExecutor = uiExecutor, @@ -304,13 +304,13 @@ class MediaDataManagerTest : SysuiTestCase() { val data = mediaDataCaptor.value assertThat(data.active).isTrue() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) assertThat(data.active).isFalse() verify(logger).logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) } @Test - fun testSetTimedOut_resume_dismissesMedia() { + fun testsetInactive_resume_dismissesMedia() { // WHEN resume controls are present, and time out val desc = MediaDescription.Builder().run { @@ -339,7 +339,7 @@ class MediaDataManagerTest : SysuiTestCase() { eq(false) ) - mediaDataManager.setTimedOut(PACKAGE_NAME, timedOut = true) + mediaDataManager.setInactive(PACKAGE_NAME, timedOut = true) verify(logger) .logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(mediaDataCaptor.value.instanceId)) @@ -1485,7 +1485,7 @@ class MediaDataManagerTest : SysuiTestCase() { // WHEN the notification times out clock.advanceTime(100) val currentTime = clock.elapsedRealtime() - mediaDataManager.setTimedOut(KEY, true, true) + mediaDataManager.setInactive(KEY, true, true) // THEN the last active time is changed verify(listener) @@ -1602,7 +1602,7 @@ class MediaDataManagerTest : SysuiTestCase() { eq(false) ) assertThat(mediaDataCaptor.value.actionsToShowInCompact.size) - .isEqualTo(MediaDataManager.MAX_COMPACT_ACTIONS) + .isEqualTo(LegacyMediaDataManagerImpl.MAX_COMPACT_ACTIONS) } @Test @@ -1615,7 +1615,7 @@ class MediaDataManagerTest : SysuiTestCase() { modifyNotification(context).also { it.setSmallIcon(android.R.drawable.ic_media_pause) it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) - for (i in 0..MediaDataManager.MAX_NOTIFICATION_ACTIONS) { + for (i in 0..LegacyMediaDataManagerImpl.MAX_NOTIFICATION_ACTIONS) { it.addAction(action) } } @@ -1638,7 +1638,7 @@ class MediaDataManagerTest : SysuiTestCase() { eq(false) ) assertThat(mediaDataCaptor.value.actions.size) - .isEqualTo(MediaDataManager.MAX_NOTIFICATION_ACTIONS) + .isEqualTo(LegacyMediaDataManagerImpl.MAX_NOTIFICATION_ACTIONS) } @Test @@ -2040,7 +2040,7 @@ class MediaDataManagerTest : SysuiTestCase() { // When a media control based on notification is added, times out, and then removed addNotificationAndLoad() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) assertThat(mediaDataCaptor.value.active).isFalse() mediaDataManager.onNotificationRemoved(KEY) @@ -2070,7 +2070,7 @@ class MediaDataManagerTest : SysuiTestCase() { // When a media control based on notification is added and times out addNotificationAndLoad() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) assertThat(mediaDataCaptor.value.active).isFalse() // and then the session is destroyed @@ -2142,7 +2142,7 @@ class MediaDataManagerTest : SysuiTestCase() { addNotificationAndLoad() val data = mediaDataCaptor.value assertThat(data.active).isTrue() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) mediaDataManager.onNotificationRemoved(KEY) // It remains as a regular player @@ -2162,7 +2162,7 @@ class MediaDataManagerTest : SysuiTestCase() { addNotificationAndLoad() val data = mediaDataCaptor.value assertThat(data.active).isTrue() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) sessionCallbackCaptor.value.invoke(KEY) // It is converted to a resume player @@ -2249,7 +2249,7 @@ class MediaDataManagerTest : SysuiTestCase() { addNotificationAndLoad() val data = mediaDataCaptor.value assertThat(data.active).isTrue() - mediaDataManager.setTimedOut(KEY, timedOut = true) + mediaDataManager.setInactive(KEY, timedOut = true) sessionCallbackCaptor.value.invoke(KEY) // It is fully removed. diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt new file mode 100644 index 000000000000..564bdc3f5880 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt @@ -0,0 +1,931 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.smartspace.SmartspaceAction +import android.os.Bundle +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.internal.logging.InstanceId +import com.android.systemui.SysuiTestCase +import com.android.systemui.broadcast.BroadcastSender +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.media.controls.MediaTestUtils +import com.android.systemui.media.controls.data.repository.MediaFilterRepository +import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_RESUME +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.ui.controller.MediaPlayerData +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.media.controls.util.MediaUiEventLogger +import com.android.systemui.settings.UserTracker +import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.time.FakeSystemClock +import com.google.common.truth.Truth.assertThat +import java.util.concurrent.Executor +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.anyLong +import org.mockito.Mock +import org.mockito.Mockito.never +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +private const val KEY = "TEST_KEY" +private const val KEY_ALT = "TEST_KEY_2" +private const val USER_MAIN = 0 +private const val USER_GUEST = 10 +private const val PRIVATE_PROFILE = 12 +private const val PACKAGE = "PKG" +private val INSTANCE_ID = InstanceId.fakeInstanceId(123)!! +private const val APP_UID = 99 +private const val SMARTSPACE_KEY = "SMARTSPACE_KEY" +private const val SMARTSPACE_PACKAGE = "SMARTSPACE_PKG" +private val SMARTSPACE_INSTANCE_ID = InstanceId.fakeInstanceId(456)!! + +@ExperimentalCoroutinesApi +@SmallTest +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +class MediaDataFilterImplTest : SysuiTestCase() { + + @Mock private lateinit var listener: MediaDataManager.Listener + @Mock private lateinit var userTracker: UserTracker + @Mock private lateinit var broadcastSender: BroadcastSender + @Mock private lateinit var mediaDataManager: MediaDataManager + @Mock private lateinit var lockscreenUserManager: NotificationLockscreenUserManager + @Mock private lateinit var executor: Executor + @Mock private lateinit var smartspaceData: SmartspaceMediaData + @Mock private lateinit var smartspaceMediaRecommendationItem: SmartspaceAction + @Mock private lateinit var logger: MediaUiEventLogger + @Mock private lateinit var mediaFlags: MediaFlags + @Mock private lateinit var cardAction: SmartspaceAction + + private lateinit var mediaDataFilter: MediaDataFilterImpl + private lateinit var mediaFilterRepository: MediaFilterRepository + private lateinit var testScope: TestScope + private lateinit var dataMain: MediaData + private lateinit var dataGuest: MediaData + private lateinit var dataPrivateProfile: MediaData + private val clock = FakeSystemClock() + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + MediaPlayerData.clear() + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) + testScope = TestScope() + mediaFilterRepository = MediaFilterRepository() + mediaDataFilter = + MediaDataFilterImpl( + context, + userTracker, + broadcastSender, + lockscreenUserManager, + executor, + clock, + logger, + mediaFlags, + mediaFilterRepository, + ) + mediaDataFilter.mediaDataManager = mediaDataManager + mediaDataFilter.addListener(listener) + + // Start all tests as main user + setUser(USER_MAIN) + + // Set up test media data + dataMain = + MediaTestUtils.emptyMediaData.copy( + userId = USER_MAIN, + packageName = PACKAGE, + instanceId = INSTANCE_ID, + appUid = APP_UID + ) + dataGuest = dataMain.copy(userId = USER_GUEST) + dataPrivateProfile = dataMain.copy(userId = PRIVATE_PROFILE) + + whenever(smartspaceData.targetId).thenReturn(SMARTSPACE_KEY) + whenever(smartspaceData.isActive).thenReturn(true) + whenever(smartspaceData.isValid()).thenReturn(true) + whenever(smartspaceData.packageName).thenReturn(SMARTSPACE_PACKAGE) + whenever(smartspaceData.recommendations) + .thenReturn(listOf(smartspaceMediaRecommendationItem)) + whenever(smartspaceData.headphoneConnectionTimeMillis) + .thenReturn(clock.currentTimeMillis() - 100) + whenever(smartspaceData.instanceId).thenReturn(SMARTSPACE_INSTANCE_ID) + whenever(smartspaceData.cardAction).thenReturn(cardAction) + } + + private fun setUser(id: Int) { + whenever(lockscreenUserManager.isCurrentProfile(anyInt())).thenReturn(false) + whenever(lockscreenUserManager.isProfileAvailable(anyInt())).thenReturn(false) + whenever(lockscreenUserManager.isCurrentProfile(eq(id))).thenReturn(true) + whenever(lockscreenUserManager.isProfileAvailable(eq(id))).thenReturn(true) + whenever(lockscreenUserManager.isProfileAvailable(eq(PRIVATE_PROFILE))).thenReturn(true) + mediaDataFilter.handleUserSwitched() + } + + private fun setPrivateProfileUnavailable() { + whenever(lockscreenUserManager.isCurrentProfile(anyInt())).thenReturn(false) + whenever(lockscreenUserManager.isCurrentProfile(eq(USER_MAIN))).thenReturn(true) + whenever(lockscreenUserManager.isCurrentProfile(eq(PRIVATE_PROFILE))).thenReturn(true) + whenever(lockscreenUserManager.isProfileAvailable(eq(PRIVATE_PROFILE))).thenReturn(false) + mediaDataFilter.handleProfileChanged() + } + + @Test + fun testOnDataLoadedForCurrentUser_callsListener() { + // GIVEN a media for main user + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + + // THEN we should tell the listener + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataMain), eq(true), eq(0), eq(false)) + } + + @Test + fun testOnDataLoadedForGuest_doesNotCallListener() { + // GIVEN a media for guest user + mediaDataFilter.onMediaDataLoaded(KEY, null, dataGuest) + + // THEN we should NOT tell the listener + verify(listener, never()) + .onMediaDataLoaded(any(), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testOnRemovedForCurrent_callsListener() { + // GIVEN a media was removed for main user + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + mediaDataFilter.onMediaDataRemoved(KEY) + + // THEN we should tell the listener + verify(listener).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testOnRemovedForGuest_doesNotCallListener() { + // GIVEN a media was removed for guest user + mediaDataFilter.onMediaDataLoaded(KEY, null, dataGuest) + mediaDataFilter.onMediaDataRemoved(KEY) + + // THEN we should NOT tell the listener + verify(listener, never()).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testOnUserSwitched_removesOldUserControls() { + // GIVEN that we have a media loaded for main user + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + + // and we switch to guest user + setUser(USER_GUEST) + + // THEN we should remove the main user's media + verify(listener).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testOnUserSwitched_addsNewUserControls() { + // GIVEN that we had some media for both users + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + mediaDataFilter.onMediaDataLoaded(KEY_ALT, null, dataGuest) + reset(listener) + + // and we switch to guest user + setUser(USER_GUEST) + + // THEN we should add back the guest user media + verify(listener) + .onMediaDataLoaded(eq(KEY_ALT), eq(null), eq(dataGuest), eq(true), eq(0), eq(false)) + + // but not the main user's + verify(listener, never()) + .onMediaDataLoaded(eq(KEY), any(), eq(dataMain), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testOnProfileChanged_profileUnavailable_loadControls() { + // GIVEN that we had some media for both profiles + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + mediaDataFilter.onMediaDataLoaded(KEY_ALT, null, dataPrivateProfile) + reset(listener) + + // and we change profile status + setPrivateProfileUnavailable() + + // THEN we should add the private profile media + verify(listener).onMediaDataRemoved(eq(KEY_ALT)) + } + + @Test + fun hasAnyMedia_mediaSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = dataMain) + + assertThat(hasAnyMedia(selectedUserEntries)).isTrue() + } + + @Test + fun hasAnyMedia_recommendationSet_returnsFalse() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat(hasAnyMedia(selectedUserEntries)).isFalse() + } + + @Test + fun hasAnyMediaOrRecommendation_mediaSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = dataMain) + + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isTrue() + } + + @Test + fun hasAnyMediaOrRecommendation_recommendationSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isTrue() + } + + @Test + fun hasActiveMedia_inactiveMediaSet_returnsFalse() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + + val data = dataMain.copy(active = false) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = data) + + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + } + + @Test + fun hasActiveMedia_activeMediaSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val data = dataMain.copy(active = true) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = data) + + assertThat(hasActiveMedia(selectedUserEntries)).isTrue() + } + + @Test + fun hasActiveMediaOrRecommendation_inactiveMediaSet_returnsFalse() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + val data = dataMain.copy(active = false) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = data) + + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + } + + @Test + fun hasActiveMediaOrRecommendation_activeMediaSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + val data = dataMain.copy(active = true) + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = data) + + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + } + + @Test + fun hasActiveMediaOrRecommendation_inactiveRecommendationSet_returnsFalse() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(smartspaceData.isActive).thenReturn(false) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + } + + @Test + fun hasActiveMediaOrRecommendation_invalidRecommendationSet_returnsFalse() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(smartspaceData.isValid()).thenReturn(false) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + } + + @Test + fun hasActiveMediaOrRecommendation_activeAndValidRecommendationSet_returnsTrue() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(smartspaceData.isActive).thenReturn(true) + whenever(smartspaceData.isValid()).thenReturn(true) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + } + + @Test + fun testHasAnyMediaOrRecommendation_onlyCurrentUser() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isFalse() + + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = dataGuest) + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isFalse() + assertThat(hasAnyMedia(selectedUserEntries)).isFalse() + } + + @Test + fun testHasActiveMediaOrRecommendation_onlyCurrentUser() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + val data = dataGuest.copy(active = true) + + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = data) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasAnyMedia(selectedUserEntries)).isFalse() + } + + @Test + fun testOnNotificationRemoved_doesNotHaveMedia() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + + mediaDataFilter.onMediaDataLoaded(KEY, oldKey = null, data = dataMain) + mediaDataFilter.onMediaDataRemoved(KEY) + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isFalse() + assertThat(hasAnyMedia(selectedUserEntries)).isFalse() + } + + @Test + fun testOnSwipeToDismiss_setsTimedOut() { + mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain) + mediaDataFilter.onSwipeToDismiss() + + verify(mediaDataManager).setInactive(eq(KEY), eq(true), eq(true)) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_noMedia_activeValidRec_prioritizesSmartspace() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(true)) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + verify(logger).logRecommendationAdded(SMARTSPACE_PACKAGE, SMARTSPACE_INSTANCE_ID) + verify(logger, never()).logRecommendationActivated(any(), any(), any()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_noMedia_inactiveRec_showsNothing() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + + whenever(smartspaceData.isActive).thenReturn(false) + + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener, never()) + .onMediaDataLoaded(any(), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + verify(listener, never()).onSmartspaceMediaDataLoaded(any(), any(), anyBoolean()) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + verify(logger, never()).logRecommendationAdded(any(), any()) + verify(logger, never()).logRecommendationActivated(any(), any(), any()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_noRecentMedia_activeValidRec_prioritizesSmartspace() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + val dataOld = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataOld) + clock.advanceTime(MediaDataFilterImpl.SMARTSPACE_MAX_AGE + 100) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(true)) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + verify(logger).logRecommendationAdded(SMARTSPACE_PACKAGE, SMARTSPACE_INSTANCE_ID) + verify(logger, never()).logRecommendationActivated(any(), any(), any()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_noRecentMedia_inactiveRec_showsNothing() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(smartspaceData.isActive).thenReturn(false) + + val dataOld = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataOld) + clock.advanceTime(MediaDataFilterImpl.SMARTSPACE_MAX_AGE + 100) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener, never()).onSmartspaceMediaDataLoaded(any(), any(), anyBoolean()) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + verify(logger, never()).logRecommendationAdded(any(), any()) + verify(logger, never()).logRecommendationActivated(any(), any(), any()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasRecentMedia_inactiveRec_showsNothing() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + + whenever(smartspaceData.isActive).thenReturn(false) + + // WHEN we have media that was recently played, but not currently active + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // AND we get a smartspace signal + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // THEN we should tell listeners to treat the media as not active instead + verify(listener, never()) + .onMediaDataLoaded(eq(KEY), eq(KEY), any(), anyBoolean(), anyInt(), anyBoolean()) + verify(listener, never()).onSmartspaceMediaDataLoaded(any(), any(), anyBoolean()) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + verify(logger, never()).logRecommendationAdded(any(), any()) + verify(logger, never()).logRecommendationActivated(any(), any(), any()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasRecentMedia_activeInvalidRec_usesMedia() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(smartspaceData.isValid()).thenReturn(false) + + // WHEN we have media that was recently played, but not currently active + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // AND we get a smartspace signal + runCurrent() + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // THEN we should tell listeners to treat the media as active instead + val dataCurrentAndActive = dataCurrent.copy(active = true) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + eq(dataCurrentAndActive), + eq(true), + eq(100), + eq(true) + ) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + // Smartspace update shouldn't be propagated for the empty rec list. + verify(listener, never()).onSmartspaceMediaDataLoaded(any(), any(), anyBoolean()) + verify(logger, never()).logRecommendationAdded(any(), any()) + verify(logger).logRecommendationActivated(eq(APP_UID), eq(PACKAGE), eq(INSTANCE_ID)) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasRecentMedia_activeValidRec_usesBoth() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + // WHEN we have media that was recently played, but not currently active + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // AND we get a smartspace signal + runCurrent() + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // THEN we should tell listeners to treat the media as active instead + val dataCurrentAndActive = dataCurrent.copy(active = true) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + eq(dataCurrentAndActive), + eq(true), + eq(100), + eq(true) + ) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + // Smartspace update should also be propagated but not prioritized. + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + verify(logger).logRecommendationAdded(SMARTSPACE_PACKAGE, SMARTSPACE_INSTANCE_ID) + verify(logger).logRecommendationActivated(eq(APP_UID), eq(PACKAGE), eq(INSTANCE_ID)) + } + + @Test + fun testOnSmartspaceMediaDataRemoved_usedSmartspace_clearsSmartspace() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + mediaDataFilter.onSmartspaceMediaDataRemoved(SMARTSPACE_KEY) + + verify(listener).onSmartspaceMediaDataRemoved(SMARTSPACE_KEY) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + } + + @Test + fun testOnSmartspaceMediaDataRemoved_usedMediaAndSmartspace_clearsBoth() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + runCurrent() + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + val dataCurrentAndActive = dataCurrent.copy(active = true) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + eq(dataCurrentAndActive), + eq(true), + eq(100), + eq(true) + ) + + mediaDataFilter.onSmartspaceMediaDataRemoved(SMARTSPACE_KEY) + + verify(listener).onSmartspaceMediaDataRemoved(SMARTSPACE_KEY) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasActiveMedia(selectedUserEntries)).isFalse() + } + + @Test + fun testOnSmartspaceLoaded_persistentEnabled_isInactive_notifiesListeners() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + whenever(smartspaceData.isActive).thenReturn(false) + + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isTrue() + } + + @Test + fun testOnSmartspaceLoaded_persistentEnabled_inactive_hasRecentMedia_staysInactive() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + whenever(smartspaceData.isActive).thenReturn(false) + + // If there is media that was recently played but inactive + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // And an inactive recommendation is loaded + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // Smartspace is loaded but the media stays inactive + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + verify(listener, never()) + .onMediaDataLoaded(any(), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isFalse() + assertThat(hasAnyMediaOrRecommendation(selectedUserEntries, smartspaceMediaData)) + .isTrue() + } + + @Test + fun testOnSwipeToDismiss_persistentEnabled_recommendationSetInactive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + val data = + EMPTY_SMARTSPACE_MEDIA_DATA.copy( + targetId = SMARTSPACE_KEY, + isActive = true, + packageName = SMARTSPACE_PACKAGE, + recommendations = listOf(smartspaceMediaRecommendationItem), + ) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, data) + mediaDataFilter.onSwipeToDismiss() + + verify(mediaDataManager).setRecommendationInactive(eq(SMARTSPACE_KEY)) + verify(mediaDataManager, never()) + .dismissSmartspaceRecommendation(eq(SMARTSPACE_KEY), anyLong()) + } + + @Test + fun testSmartspaceLoaded_shouldTriggerResume_doesTrigger() = + testScope.runTest { + val selectedUserEntries by collectLastValue(mediaFilterRepository.selectedUserEntries) + val smartspaceMediaData by collectLastValue(mediaFilterRepository.smartspaceMediaData) + val reactivatedKey by collectLastValue(mediaFilterRepository.reactivatedKey) + // WHEN we have media that was recently played, but not currently active + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // AND we get a smartspace signal with extra to trigger resume + runCurrent() + val extras = Bundle().apply { putBoolean(EXTRA_KEY_TRIGGER_RESUME, true) } + whenever(cardAction.extras).thenReturn(extras) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // THEN we should tell listeners to treat the media as active instead + val dataCurrentAndActive = dataCurrent.copy(active = true) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + eq(dataCurrentAndActive), + eq(true), + eq(100), + eq(true) + ) + assertThat( + hasActiveMediaOrRecommendation( + selectedUserEntries, + smartspaceMediaData, + reactivatedKey + ) + ) + .isTrue() + // And send the smartspace data, but not prioritized + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + } + + @Test + fun testSmartspaceLoaded_notShouldTriggerResume_doesNotTrigger() { + // WHEN we have media that was recently played, but not currently active + val dataCurrent = dataMain.copy(active = false, lastActive = clock.elapsedRealtime()) + mediaDataFilter.onMediaDataLoaded(KEY, null, dataCurrent) + verify(listener) + .onMediaDataLoaded(eq(KEY), eq(null), eq(dataCurrent), eq(true), eq(0), eq(false)) + + // AND we get a smartspace signal with extra to not trigger resume + val extras = Bundle().apply { putBoolean(EXTRA_KEY_TRIGGER_RESUME, false) } + whenever(cardAction.extras).thenReturn(extras) + mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, smartspaceData) + + // THEN listeners are not updated to show media + verify(listener, never()) + .onMediaDataLoaded(eq(KEY), eq(KEY), any(), eq(true), eq(100), eq(true)) + // But the smartspace update is still propagated + verify(listener) + .onSmartspaceMediaDataLoaded(eq(SMARTSPACE_KEY), eq(smartspaceData), eq(false)) + } + + private fun hasActiveMediaOrRecommendation( + entries: Map<String, MediaData>?, + smartspaceMediaData: SmartspaceMediaData?, + reactivatedKey: String? + ): Boolean { + if (entries == null || smartspaceMediaData == null) { + return false + } + return entries.any { it.value.active } || + (smartspaceMediaData.isActive && + (smartspaceMediaData.isValid() || reactivatedKey != null)) + } + + private fun hasActiveMedia(entries: Map<String, MediaData>?): Boolean { + return entries?.any { it.value.active } ?: false + } + + private fun hasAnyMediaOrRecommendation( + entries: Map<String, MediaData>?, + smartspaceMediaData: SmartspaceMediaData? + ): Boolean { + if (entries == null || smartspaceMediaData == null) { + return false + } + return entries.isNotEmpty() || + (if (mediaFlags.isPersistentSsCardEnabled()) { + smartspaceMediaData.isValid() + } else { + smartspaceMediaData.isActive && smartspaceMediaData.isValid() + }) + } + + private fun hasAnyMedia(entries: Map<String, MediaData>?): Boolean { + return entries?.isNotEmpty() ?: false + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt new file mode 100644 index 000000000000..5c275b454681 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt @@ -0,0 +1,2474 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.IUriGrantsManager +import android.app.Notification +import android.app.Notification.FLAG_NO_CLEAR +import android.app.Notification.MediaStyle +import android.app.PendingIntent +import android.app.UriGrantsManager +import android.app.smartspace.SmartspaceAction +import android.app.smartspace.SmartspaceConfig +import android.app.smartspace.SmartspaceManager +import android.app.smartspace.SmartspaceTarget +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.graphics.ImageDecoder +import android.graphics.drawable.Icon +import android.media.MediaDescription +import android.media.MediaMetadata +import android.media.session.MediaController +import android.media.session.MediaSession +import android.media.session.PlaybackState +import android.net.Uri +import android.os.Bundle +import android.provider.Settings +import android.service.notification.StatusBarNotification +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import android.testing.TestableLooper.RunWithLooper +import androidx.media.utils.MediaConstants +import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito +import com.android.internal.logging.InstanceId +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.InstanceIdSequenceFake +import com.android.systemui.SysuiTestCase +import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.dump.DumpManager +import com.android.systemui.media.controls.data.repository.MediaDataRepository +import com.android.systemui.media.controls.data.repository.MediaFilterRepository +import com.android.systemui.media.controls.domain.pipeline.interactor.MediaCarouselInteractor +import com.android.systemui.media.controls.domain.resume.MediaResumeListener +import com.android.systemui.media.controls.domain.resume.ResumeMediaBrowser +import com.android.systemui.media.controls.shared.model.EXTRA_KEY_TRIGGER_SOURCE +import com.android.systemui.media.controls.shared.model.EXTRA_VALUE_TRIGGER_PERIODIC +import com.android.systemui.media.controls.shared.model.MediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaData +import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider +import com.android.systemui.media.controls.util.MediaControllerFactory +import com.android.systemui.media.controls.util.MediaFlags +import com.android.systemui.media.controls.util.MediaUiEventLogger +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.res.R +import com.android.systemui.statusbar.SbnBuilder +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.settings.FakeSettings +import com.android.systemui.util.time.FakeSystemClock +import com.android.systemui.utils.os.FakeHandler +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.TestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.mock +import org.mockito.Mockito.never +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.Mockito.verifyNoMoreInteractions +import org.mockito.MockitoSession +import org.mockito.junit.MockitoJUnit +import org.mockito.quality.Strictness + +private const val KEY = "KEY" +private const val KEY_2 = "KEY_2" +private const val KEY_MEDIA_SMARTSPACE = "MEDIA_SMARTSPACE_ID" +private const val SMARTSPACE_CREATION_TIME = 1234L +private const val SMARTSPACE_EXPIRY_TIME = 5678L +private const val PACKAGE_NAME = "com.example.app" +private const val SYSTEM_PACKAGE_NAME = "com.android.systemui" +private const val APP_NAME = "SystemUI" +private const val SESSION_ARTIST = "artist" +private const val SESSION_TITLE = "title" +private const val SESSION_BLANK_TITLE = " " +private const val SESSION_EMPTY_TITLE = "" +private const val USER_ID = 0 +private val DISMISS_INTENT = Intent().apply { action = "dismiss" } + +private fun <T> anyObject(): T { + return Mockito.anyObject<T>() +} + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWithLooper(setAsMainLooper = true) +@RunWith(AndroidTestingRunner::class) +class MediaDataProcessorTest : SysuiTestCase() { + + @JvmField @Rule val mockito = MockitoJUnit.rule() + @Mock lateinit var mediaControllerFactory: MediaControllerFactory + @Mock lateinit var controller: MediaController + @Mock lateinit var transportControls: MediaController.TransportControls + @Mock lateinit var playbackInfo: MediaController.PlaybackInfo + lateinit var session: MediaSession + private lateinit var metadataBuilder: MediaMetadata.Builder + lateinit var backgroundExecutor: FakeExecutor + private lateinit var foregroundExecutor: FakeExecutor + lateinit var uiExecutor: FakeExecutor + @Mock lateinit var dumpManager: DumpManager + @Mock lateinit var broadcastDispatcher: BroadcastDispatcher + @Mock lateinit var mediaTimeoutListener: MediaTimeoutListener + @Mock lateinit var mediaResumeListener: MediaResumeListener + @Mock lateinit var mediaSessionBasedFilter: MediaSessionBasedFilter + @Mock lateinit var mediaDeviceManager: MediaDeviceManager + @Mock lateinit var mediaDataCombineLatest: MediaDataCombineLatest + @Mock lateinit var mediaDataFilter: MediaDataFilterImpl + @Mock lateinit var listener: MediaDataManager.Listener + @Mock lateinit var pendingIntent: PendingIntent + @Mock lateinit var activityStarter: ActivityStarter + @Mock lateinit var smartspaceManager: SmartspaceManager + @Mock lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor + private lateinit var smartspaceMediaDataProvider: SmartspaceMediaDataProvider + @Mock lateinit var mediaSmartspaceTarget: SmartspaceTarget + @Mock private lateinit var mediaRecommendationItem: SmartspaceAction + private lateinit var validRecommendationList: List<SmartspaceAction> + @Mock private lateinit var mediaSmartspaceBaseAction: SmartspaceAction + @Mock private lateinit var mediaFlags: MediaFlags + @Mock private lateinit var logger: MediaUiEventLogger + private lateinit var mediaCarouselInteractor: MediaCarouselInteractor + private lateinit var mediaDataProcessor: MediaDataProcessor + private lateinit var mediaNotification: StatusBarNotification + private lateinit var remoteCastNotification: StatusBarNotification + @Captor lateinit var mediaDataCaptor: ArgumentCaptor<MediaData> + private val clock = FakeSystemClock() + @Captor lateinit var stateCallbackCaptor: ArgumentCaptor<(String, PlaybackState) -> Unit> + @Captor lateinit var sessionCallbackCaptor: ArgumentCaptor<(String) -> Unit> + @Captor lateinit var smartSpaceConfigBuilderCaptor: ArgumentCaptor<SmartspaceConfig> + @Mock private lateinit var ugm: IUriGrantsManager + @Mock private lateinit var imageSource: ImageDecoder.Source + private lateinit var mediaDataRepository: MediaDataRepository + private lateinit var mediaFilterRepository: MediaFilterRepository + private lateinit var testScope: TestScope + private lateinit var testDispatcher: TestDispatcher + private lateinit var testableLooper: TestableLooper + private lateinit var fakeHandler: FakeHandler + + private val settings = FakeSettings() + private val instanceIdSequence = InstanceIdSequenceFake(1 shl 20) + + private val originalSmartspaceSetting = + Settings.Secure.getInt( + context.contentResolver, + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, + 1 + ) + + private lateinit var staticMockSession: MockitoSession + + @Before + fun setup() { + whenever(mediaFlags.isMediaControlsRefactorEnabled()).thenReturn(true) + + staticMockSession = + ExtendedMockito.mockitoSession() + .mockStatic<UriGrantsManager>(UriGrantsManager::class.java) + .mockStatic<ImageDecoder>(ImageDecoder::class.java) + .strictness(Strictness.LENIENT) + .startMocking() + whenever(UriGrantsManager.getService()).thenReturn(ugm) + foregroundExecutor = FakeExecutor(clock) + backgroundExecutor = FakeExecutor(clock) + uiExecutor = FakeExecutor(clock) + testableLooper = TestableLooper.get(this) + fakeHandler = FakeHandler(testableLooper.looper) + smartspaceMediaDataProvider = SmartspaceMediaDataProvider() + Settings.Secure.putInt( + context.contentResolver, + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, + 1 + ) + testDispatcher = UnconfinedTestDispatcher() + testScope = TestScope(testDispatcher) + mediaFilterRepository = MediaFilterRepository() + mediaDataRepository = MediaDataRepository(mediaFlags, dumpManager) + mediaDataProcessor = + MediaDataProcessor( + context = context, + applicationScope = testScope, + backgroundDispatcher = testDispatcher, + backgroundExecutor = backgroundExecutor, + uiExecutor = uiExecutor, + foregroundExecutor = foregroundExecutor, + handler = fakeHandler, + mediaControllerFactory = mediaControllerFactory, + broadcastDispatcher = broadcastDispatcher, + dumpManager = dumpManager, + activityStarter = activityStarter, + smartspaceMediaDataProvider = smartspaceMediaDataProvider, + useMediaResumption = true, + useQsMediaPlayer = true, + systemClock = clock, + secureSettings = settings, + mediaFlags = mediaFlags, + logger = logger, + smartspaceManager = smartspaceManager, + keyguardUpdateMonitor = keyguardUpdateMonitor, + mediaDataRepository = mediaDataRepository, + ) + mediaDataProcessor.start() + mediaCarouselInteractor = + MediaCarouselInteractor( + applicationScope = testScope.backgroundScope, + mediaDataRepository = mediaDataRepository, + mediaDataProcessor = mediaDataProcessor, + mediaTimeoutListener = mediaTimeoutListener, + mediaResumeListener = mediaResumeListener, + mediaSessionBasedFilter = mediaSessionBasedFilter, + mediaDeviceManager = mediaDeviceManager, + mediaDataCombineLatest = mediaDataCombineLatest, + mediaDataFilter = mediaDataFilter, + mediaFilterRepository = mediaFilterRepository, + mediaFlags = mediaFlags + ) + mediaCarouselInteractor.start() + verify(mediaTimeoutListener).stateCallback = capture(stateCallbackCaptor) + verify(mediaTimeoutListener).sessionCallback = capture(sessionCallbackCaptor) + session = MediaSession(context, "MediaDataProcessorTestSession") + mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + } + build() + } + remoteCastNotification = + SbnBuilder().run { + setPkg(SYSTEM_PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle( + MediaStyle().apply { + setMediaSession(session.sessionToken) + setRemotePlaybackInfo("Remote device", 0, null) + } + ) + } + build() + } + metadataBuilder = + MediaMetadata.Builder().apply { + putString(MediaMetadata.METADATA_KEY_ARTIST, SESSION_ARTIST) + putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_TITLE) + } + verify(smartspaceManager).createSmartspaceSession(capture(smartSpaceConfigBuilderCaptor)) + whenever(mediaControllerFactory.create(eq(session.sessionToken))).thenReturn(controller) + whenever(controller.transportControls).thenReturn(transportControls) + whenever(controller.playbackInfo).thenReturn(playbackInfo) + whenever(controller.metadata).thenReturn(metadataBuilder.build()) + whenever(playbackInfo.playbackType) + .thenReturn(MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) + + // This is an ugly hack for now. The mediaSessionBasedFilter is one of the internal + // listeners in the internal processing pipeline. It receives events, but ince it is a + // mock, it doesn't pass those events along the chain to the external listeners. So, just + // treat mediaSessionBasedFilter as a listener for testing. + listener = mediaSessionBasedFilter + + val recommendationExtras = + Bundle().apply { + putString("package_name", PACKAGE_NAME) + putParcelable("dismiss_intent", DISMISS_INTENT) + } + val icon = Icon.createWithResource(context, android.R.drawable.ic_media_play) + whenever(mediaSmartspaceBaseAction.extras).thenReturn(recommendationExtras) + whenever(mediaSmartspaceTarget.baseAction).thenReturn(mediaSmartspaceBaseAction) + whenever(mediaRecommendationItem.extras).thenReturn(recommendationExtras) + whenever(mediaRecommendationItem.icon).thenReturn(icon) + validRecommendationList = + listOf(mediaRecommendationItem, mediaRecommendationItem, mediaRecommendationItem) + whenever(mediaSmartspaceTarget.smartspaceTargetId).thenReturn(KEY_MEDIA_SMARTSPACE) + whenever(mediaSmartspaceTarget.featureType).thenReturn(SmartspaceTarget.FEATURE_MEDIA) + whenever(mediaSmartspaceTarget.iconGrid).thenReturn(validRecommendationList) + whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(SMARTSPACE_CREATION_TIME) + whenever(mediaSmartspaceTarget.expiryTimeMillis).thenReturn(SMARTSPACE_EXPIRY_TIME) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(false) + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(false) + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) + whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(false) + whenever(logger.getNewInstanceId()).thenReturn(instanceIdSequence.newInstanceId()) + whenever(keyguardUpdateMonitor.isUserInLockdown(any())).thenReturn(false) + } + + @After + fun tearDown() { + staticMockSession.finishMocking() + session.release() + mediaDataProcessor.destroy() + Settings.Secure.putInt( + context.contentResolver, + Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, + originalSmartspaceSetting + ) + } + + @Test + fun testsetInactive_active_deactivatesMedia() { + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + + mediaDataProcessor.setInactive(KEY, timedOut = true) + assertThat(data.active).isFalse() + verify(logger).logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testsetInactive_resume_dismissesMedia() { + // WHEN resume controls are present, and time out + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + mediaDataProcessor.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME + ) + + backgroundExecutor.runAllReady() + foregroundExecutor.runAllReady() + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + + mediaDataProcessor.setInactive(PACKAGE_NAME, timedOut = true) + verify(logger) + .logMediaTimeout(anyInt(), eq(PACKAGE_NAME), eq(mediaDataCaptor.value.instanceId)) + + // THEN it is removed and listeners are informed + foregroundExecutor.advanceClockToLast() + foregroundExecutor.runAllReady() + verify(listener).onMediaDataRemoved(PACKAGE_NAME) + } + + @Test + fun testLoadsMetadataOnBackground() { + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + assertThat(backgroundExecutor.numPending()).isEqualTo(1) + } + + @Test + fun testLoadMetadata_withExplicitIndicator() { + whenever(controller.metadata) + .thenReturn( + metadataBuilder + .putLong( + MediaConstants.METADATA_KEY_IS_EXPLICIT, + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + ) + .build() + ) + + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value!!.isExplicit).isTrue() + } + + @Test + fun testOnMetaDataLoaded_withoutExplicitIndicator() { + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value!!.isExplicit).isFalse() + } + + @Test + fun testOnMetaDataLoaded_callsListener() { + addNotificationAndLoad() + verify(logger) + .logActiveMediaAdded( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId), + eq(MediaData.PLAYBACK_LOCAL) + ) + } + + @Test + fun testOnMetaDataLoaded_conservesActiveFlag() { + whenever(mediaControllerFactory.create(anyObject())).thenReturn(controller) + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value!!.active).isTrue() + } + + @Test + fun testOnNotificationAdded_isRcn_markedRemote() { + addNotificationAndLoad(remoteCastNotification) + + assertThat(mediaDataCaptor.value!!.playbackLocation) + .isEqualTo(MediaData.PLAYBACK_CAST_REMOTE) + verify(logger) + .logActiveMediaAdded( + anyInt(), + eq(SYSTEM_PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId), + eq(MediaData.PLAYBACK_CAST_REMOTE) + ) + } + + @Test + fun testOnNotificationAdded_hasSubstituteName_isUsed() { + val subName = "Substitute Name" + val notif = + SbnBuilder().run { + modifyNotification(context).also { + it.extras = + Bundle().apply { + putString(Notification.EXTRA_SUBSTITUTE_APP_NAME, subName) + } + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + } + build() + } + + mediaDataProcessor.onNotificationAdded(KEY, notif) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + + assertThat(mediaDataCaptor.value!!.app).isEqualTo(subName) + } + + @Test + fun testLoadMediaDataInBg_invalidTokenNoCrash() { + val bundle = Bundle() + // wrong data type + bundle.putParcelable(Notification.EXTRA_MEDIA_SESSION, Bundle()) + val rcn = + SbnBuilder().run { + setPkg(SYSTEM_PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.addExtras(bundle) + it.setStyle( + MediaStyle().apply { setRemotePlaybackInfo("Remote device", 0, null) } + ) + } + build() + } + + mediaDataProcessor.loadMediaDataInBg(KEY, rcn, null) + // no crash even though the data structure is incorrect + } + + @Test + fun testLoadMediaDataInBg_invalidMediaRemoteIntentNoCrash() { + val bundle = Bundle() + // wrong data type + bundle.putParcelable(Notification.EXTRA_MEDIA_REMOTE_INTENT, Bundle()) + val rcn = + SbnBuilder().run { + setPkg(SYSTEM_PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.addExtras(bundle) + it.setStyle( + MediaStyle().apply { + setMediaSession(session.sessionToken) + setRemotePlaybackInfo("Remote device", 0, null) + } + ) + } + build() + } + + mediaDataProcessor.loadMediaDataInBg(KEY, rcn, null) + // no crash even though the data structure is incorrect + } + + @Test + fun testOnNotificationRemoved_callsListener() { + addNotificationAndLoad() + val data = mediaDataCaptor.value + mediaDataProcessor.onNotificationRemoved(KEY) + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testOnNotificationAdded_emptyTitle_hasPlaceholder() { + // When the manager has a notification with an empty title, and the app is not + // required to include a non-empty title + val mockPackageManager = mock(PackageManager::class.java) + context.setMockPackageManager(mockPackageManager) + whenever(mockPackageManager.getApplicationLabel(any())).thenReturn(APP_NAME) + whenever(controller.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_EMPTY_TITLE) + .build() + ) + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + + // Then a media control is created with a placeholder title string + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + val placeholderTitle = context.getString(R.string.controls_media_empty_title, APP_NAME) + assertThat(mediaDataCaptor.value.song).isEqualTo(placeholderTitle) + } + + @Test + fun testOnNotificationAdded_blankTitle_hasPlaceholder() { + // GIVEN that the manager has a notification with a blank title, and the app is not + // required to include a non-empty title + val mockPackageManager = mock(PackageManager::class.java) + context.setMockPackageManager(mockPackageManager) + whenever(mockPackageManager.getApplicationLabel(any())).thenReturn(APP_NAME) + whenever(controller.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_BLANK_TITLE) + .build() + ) + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + + // Then a media control is created with a placeholder title string + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + val placeholderTitle = context.getString(R.string.controls_media_empty_title, APP_NAME) + assertThat(mediaDataCaptor.value.song).isEqualTo(placeholderTitle) + } + + @Test + fun testOnNotificationAdded_emptyMetadata_usesNotificationTitle() { + // When the app sets the metadata title fields to empty strings, but does include a + // non-blank notification title + val mockPackageManager = mock(PackageManager::class.java) + context.setMockPackageManager(mockPackageManager) + whenever(mockPackageManager.getApplicationLabel(any())).thenReturn(APP_NAME) + whenever(controller.metadata) + .thenReturn( + metadataBuilder + .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_EMPTY_TITLE) + .putString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE, SESSION_EMPTY_TITLE) + .build() + ) + mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setContentTitle(SESSION_TITLE) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + } + build() + } + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + + // Then the media control is added using the notification's title + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.song).isEqualTo(SESSION_TITLE) + } + + @Test + fun testOnNotificationRemoved_emptyTitle_notConverted() { + // GIVEN that the manager has a notification with a resume action and empty title. + addNotificationAndLoad() + val data = mediaDataCaptor.value + val instanceId = data.instanceId + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded( + KEY, + null, + data.copy(song = SESSION_EMPTY_TITLE, resumeAction = Runnable {}) + ) + + // WHEN the notification is removed + reset(listener) + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN active media is not converted to resume. + verify(listener, never()) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + verify(logger, never()) + .logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + verify(logger, never()).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), any()) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + } + + @Test + fun testOnNotificationRemoved_blankTitle_notConverted() { + // GIVEN that the manager has a notification with a resume action and blank title. + addNotificationAndLoad() + val data = mediaDataCaptor.value + val instanceId = data.instanceId + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded( + KEY, + null, + data.copy(song = SESSION_BLANK_TITLE, resumeAction = Runnable {}) + ) + + // WHEN the notification is removed + reset(listener) + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN active media is not converted to resume. + verify(listener, never()) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + verify(logger, never()) + .logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + verify(logger, never()).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), any()) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + } + + @Test + fun testOnNotificationRemoved_withResumption() { + // GIVEN that the manager has a notification with a resume action + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded(KEY, null, data.copy(resumeAction = Runnable {})) + // WHEN the notification is removed + mediaDataProcessor.onNotificationRemoved(KEY) + // THEN the media data indicates that it is for resumption + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + verify(logger).logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testOnNotificationRemoved_twoWithResumption() { + // GIVEN that the manager has two notifications with resume actions + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + mediaDataProcessor.onNotificationAdded(KEY_2, mediaNotification) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(2) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(2) + + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + val data = mediaDataCaptor.value + assertThat(data.resumption).isFalse() + + verify(listener) + .onMediaDataLoaded( + eq(KEY_2), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + val data2 = mediaDataCaptor.value + assertThat(data2.resumption).isFalse() + + mediaDataProcessor.onMediaDataLoaded(KEY, null, data.copy(resumeAction = Runnable {})) + mediaDataProcessor.onMediaDataLoaded(KEY_2, null, data2.copy(resumeAction = Runnable {})) + reset(listener) + // WHEN the first is removed + mediaDataProcessor.onNotificationRemoved(KEY) + // THEN the data is for resumption and the key is migrated to the package name + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + verify(listener, never()).onMediaDataRemoved(eq(KEY)) + // WHEN the second is removed + mediaDataProcessor.onNotificationRemoved(KEY_2) + // THEN the data is for resumption and the second key is removed + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(PACKAGE_NAME), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + verify(listener).onMediaDataRemoved(eq(KEY_2)) + } + + @Test + fun testOnNotificationRemoved_withResumption_butNotLocal() { + // GIVEN that the manager has a notification with a resume action, but is not local + whenever(playbackInfo.playbackType) + .thenReturn(MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE) + addNotificationAndLoad() + val data = mediaDataCaptor.value + val dataRemoteWithResume = + data.copy(resumeAction = Runnable {}, playbackLocation = MediaData.PLAYBACK_CAST_LOCAL) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataRemoteWithResume) + verify(logger) + .logActiveMediaAdded( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId), + eq(MediaData.PLAYBACK_CAST_LOCAL) + ) + + // WHEN the notification is removed + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN the media data is removed + verify(listener).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testOnNotificationRemoved_withResumption_isRemoteAndRemoteAllowed() { + // With the flag enabled to allow remote media to resume + whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(true) + + // GIVEN that the manager has a notification with a resume action, but is not local + whenever(controller.metadata).thenReturn(metadataBuilder.build()) + whenever(playbackInfo.playbackType) + .thenReturn(MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE) + addNotificationAndLoad() + val data = mediaDataCaptor.value + val dataRemoteWithResume = + data.copy(resumeAction = Runnable {}, playbackLocation = MediaData.PLAYBACK_CAST_LOCAL) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataRemoteWithResume) + + // WHEN the notification is removed + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN the media data is converted to a resume state + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + } + + @Test + fun testOnNotificationRemoved_withResumption_isRcnAndRemoteAllowed() { + // With the flag enabled to allow remote media to resume + whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(true) + + // GIVEN that the manager has a remote cast notification + addNotificationAndLoad(remoteCastNotification) + val data = mediaDataCaptor.value + assertThat(data.playbackLocation).isEqualTo(MediaData.PLAYBACK_CAST_REMOTE) + val dataRemoteWithResume = data.copy(resumeAction = Runnable {}) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataRemoteWithResume) + + // WHEN the RCN is removed + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN the media data is removed + verify(listener).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testOnNotificationRemoved_withResumption_tooManyPlayers() { + // Given the maximum number of resume controls already + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + for (i in 0..ResumeMediaBrowser.MAX_RESUMPTION_CONTROLS) { + addResumeControlAndLoad(desc, "$i:$PACKAGE_NAME") + clock.advanceTime(1000) + } + + // And an active, resumable notification + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded(KEY, null, data.copy(resumeAction = Runnable {})) + + // When the notification is removed + mediaDataProcessor.onNotificationRemoved(KEY) + + // Then it is converted to resumption + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + + // And the oldest resume control was removed + verify(listener).onMediaDataRemoved(eq("0:$PACKAGE_NAME")) + } + + fun testOnNotificationRemoved_lockDownMode() { + whenever(keyguardUpdateMonitor.isUserInLockdown(any())).thenReturn(true) + + addNotificationAndLoad() + val data = mediaDataCaptor.value + mediaDataProcessor.onNotificationRemoved(KEY) + + verify(listener, never()).onMediaDataRemoved(eq(KEY)) + verify(logger, never()) + .logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testAddResumptionControls() { + // WHEN resumption controls are added + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + val currentTime = clock.elapsedRealtime() + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.song).isEqualTo(SESSION_TITLE) + assertThat(data.app).isEqualTo(APP_NAME) + assertThat(data.actions).hasSize(1) + assertThat(data.semanticActions!!.playOrPause).isNotNull() + assertThat(data.lastActive).isAtLeast(currentTime) + verify(logger).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testAddResumptionControls_withExplicitIndicator() { + val bundle = Bundle() + // WHEN resumption controls are added with explicit indicator + bundle.putLong( + MediaConstants.METADATA_KEY_IS_EXPLICIT, + MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT + ) + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(bundle) + build() + } + val currentTime = clock.elapsedRealtime() + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.song).isEqualTo(SESSION_TITLE) + assertThat(data.app).isEqualTo(APP_NAME) + assertThat(data.actions).hasSize(1) + assertThat(data.semanticActions!!.playOrPause).isNotNull() + assertThat(data.lastActive).isAtLeast(currentTime) + assertThat(data.isExplicit).isTrue() + verify(logger).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testAddResumptionControls_hasPartialProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added with partial progress + val progress = 0.5 + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_PARTIALLY_PLAYED + ) + putDouble(MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_PERCENTAGE, progress) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(progress) + } + + @Test + fun testAddResumptionControls_hasNotPlayedProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added that have not been played + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED + ) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(0) + } + + @Test + fun testAddResumptionControls_hasFullProgress() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added with progress info + val extras = + Bundle().apply { + putInt( + MediaConstants.DESCRIPTION_EXTRAS_KEY_COMPLETION_STATUS, + MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_FULLY_PLAYED + ) + } + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setExtras(extras) + build() + } + addResumeControlAndLoad(desc) + + // THEN the media data includes the progress + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(1) + } + + @Test + fun testAddResumptionControls_hasNoExtras() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added that do not have any extras + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + addResumeControlAndLoad(desc) + + // Resume progress is null + val data = mediaDataCaptor.value + assertThat(data.resumption).isTrue() + assertThat(data.resumeProgress).isEqualTo(null) + } + + @Test + fun testAddResumptionControls_hasEmptyTitle() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added that have empty title + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_EMPTY_TITLE) + build() + } + mediaDataProcessor.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME + ) + + // Resumption controls are not added. + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(0) + verify(listener, never()) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } + + @Test + fun testAddResumptionControls_hasBlankTitle() { + whenever(mediaFlags.isResumeProgressEnabled()).thenReturn(true) + + // WHEN resumption controls are added that have a blank title + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_BLANK_TITLE) + build() + } + mediaDataProcessor.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME + ) + + // Resumption controls are not added. + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(0) + verify(listener, never()) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } + + @Test + fun testResumptionDisabled_dismissesResumeControls() { + // WHEN there are resume controls and resumption is switched off + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + addResumeControlAndLoad(desc) + + val data = mediaDataCaptor.value + mediaDataProcessor.setMediaResumptionEnabled(false) + + // THEN the resume controls are dismissed + verify(listener).onMediaDataRemoved(eq(PACKAGE_NAME)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testDismissMedia_listenerCalled() { + addNotificationAndLoad() + val data = mediaDataCaptor.value + val removed = mediaDataProcessor.dismissMediaData(KEY, 0L) + assertThat(removed).isTrue() + + foregroundExecutor.advanceClockToLast() + foregroundExecutor.runAllReady() + + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + } + + @Test + fun testDismissMedia_keyDoesNotExist_returnsFalse() { + val removed = mediaDataProcessor.dismissMediaData(KEY, 0L) + assertThat(removed).isFalse() + } + + @Test + fun testBadArtwork_doesNotUse() { + // WHEN notification has a too-small artwork + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val notif = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.setLargeIcon(artwork) + } + build() + } + mediaDataProcessor.onNotificationAdded(KEY, notif) + + // THEN it still loads + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasNewValidMediaTarget_callsListener() { + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + verify(logger).getNewInstanceId() + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasNewInvalidMediaTarget_callsListener() { + whenever(mediaSmartspaceTarget.iconGrid).thenReturn(listOf()) + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + verify(logger).getNewInstanceId() + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasNullIntent_callsListener() { + val recommendationExtras = + Bundle().apply { + putString("package_name", PACKAGE_NAME) + putParcelable("dismiss_intent", null) + } + whenever(mediaSmartspaceBaseAction.extras).thenReturn(recommendationExtras) + whenever(mediaSmartspaceTarget.baseAction).thenReturn(mediaSmartspaceBaseAction) + whenever(mediaSmartspaceTarget.iconGrid).thenReturn(listOf()) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + verify(logger).getNewInstanceId() + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + dismissIntent = null, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasNoneMediaTarget_notCallsListener() { + smartspaceMediaDataProvider.onTargetsAvailable(listOf()) + verify(logger, never()).getNewInstanceId() + verify(listener, never()) + .onSmartspaceMediaDataLoaded(anyObject(), anyObject(), anyBoolean()) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_hasNoneMediaTarget_callsRemoveListener() { + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + verify(logger).getNewInstanceId() + + smartspaceMediaDataProvider.onTargetsAvailable(listOf()) + uiExecutor.advanceClockToLast() + uiExecutor.runAllReady() + + verify(listener).onSmartspaceMediaDataRemoved(eq(KEY_MEDIA_SMARTSPACE), eq(false)) + verifyNoMoreInteractions(logger) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_headphoneTrigger_isActive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = true, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_periodicTrigger_notActive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + val extras = + Bundle().apply { + putString("package_name", PACKAGE_NAME) + putParcelable("dismiss_intent", DISMISS_INTENT) + putString(EXTRA_KEY_TRIGGER_SOURCE, EXTRA_VALUE_TRIGGER_PERIODIC) + } + whenever(mediaSmartspaceBaseAction.extras).thenReturn(extras) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_persistentEnabled_noTargets_inactive() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + smartspaceMediaDataProvider.onTargetsAvailable(listOf()) + uiExecutor.advanceClockToLast() + uiExecutor.runAllReady() + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + verify(listener, never()).onSmartspaceMediaDataRemoved(eq(KEY_MEDIA_SMARTSPACE), eq(false)) + } + + @Test + fun testSetRecommendationInactive_notifiesListeners() { + whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(true) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + val instanceId = instanceIdSequence.lastInstanceId + + mediaDataProcessor.setRecommendationInactive(KEY_MEDIA_SMARTSPACE) + uiExecutor.advanceClockToLast() + uiExecutor.runAllReady() + + verify(listener) + .onSmartspaceMediaDataLoaded( + eq(KEY_MEDIA_SMARTSPACE), + eq( + SmartspaceMediaData( + targetId = KEY_MEDIA_SMARTSPACE, + isActive = false, + packageName = PACKAGE_NAME, + cardAction = mediaSmartspaceBaseAction, + recommendations = validRecommendationList, + dismissIntent = DISMISS_INTENT, + headphoneConnectionTimeMillis = SMARTSPACE_CREATION_TIME, + instanceId = InstanceId.fakeInstanceId(instanceId), + expiryTimeMs = SMARTSPACE_EXPIRY_TIME, + ) + ), + eq(false) + ) + } + + @Test + fun testOnSmartspaceMediaDataLoaded_settingDisabled_doesNothing() { + // WHEN media recommendation setting is off + settings.putInt(Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 0) + + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + + // THEN smartspace signal is ignored + verify(listener, never()) + .onSmartspaceMediaDataLoaded(anyObject(), anyObject(), anyBoolean()) + } + + @Test + fun testMediaRecommendationDisabled_removesSmartspaceData() { + // GIVEN a media recommendation card is present + smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget)) + verify(listener) + .onSmartspaceMediaDataLoaded(eq(KEY_MEDIA_SMARTSPACE), anyObject(), anyBoolean()) + + // WHEN the media recommendation setting is turned off + settings.putInt(Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION, 0) + + // THEN listeners are notified + uiExecutor.advanceClockToLast() + foregroundExecutor.advanceClockToLast() + uiExecutor.runAllReady() + foregroundExecutor.runAllReady() + verify(listener).onSmartspaceMediaDataRemoved(eq(KEY_MEDIA_SMARTSPACE), eq(true)) + } + + @Test + fun testOnMediaDataChanged_updatesLastActiveTime() { + val currentTime = clock.elapsedRealtime() + addNotificationAndLoad() + assertThat(mediaDataCaptor.value!!.lastActive).isAtLeast(currentTime) + } + + @Test + fun testOnMediaDataTimedOut_updatesLastActiveTime() { + // GIVEN that the manager has a notification + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + // WHEN the notification times out + clock.advanceTime(100) + val currentTime = clock.elapsedRealtime() + mediaDataProcessor.setInactive(KEY, timedOut = true, forceUpdate = true) + + // THEN the last active time is changed + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.lastActive).isAtLeast(currentTime) + } + + @Test + fun testOnActiveMediaConverted_updatesLastActiveTime() { + // GIVEN that the manager has a notification with a resume action + addNotificationAndLoad() + val data = mediaDataCaptor.value + val instanceId = data.instanceId + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded(KEY, null, data.copy(resumeAction = Runnable {})) + + // WHEN the notification is removed + clock.advanceTime(100) + val currentTime = clock.elapsedRealtime() + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN the last active time is changed + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.lastActive).isAtLeast(currentTime) + + // Log as a conversion event, not as a new resume control + verify(logger).logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + verify(logger, never()).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), any()) + } + + @Test + fun testOnInactiveMediaConverted_doesNotUpdateLastActiveTime() { + // GIVEN that the manager has a notification with a resume action + addNotificationAndLoad() + val data = mediaDataCaptor.value + val instanceId = data.instanceId + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded( + KEY, + null, + data.copy(resumeAction = Runnable {}, active = false) + ) + + // WHEN the notification is removed + clock.advanceTime(100) + val currentTime = clock.elapsedRealtime() + mediaDataProcessor.onNotificationRemoved(KEY) + + // THEN the last active time is not changed + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.lastActive).isLessThan(currentTime) + + // Log as a conversion event, not as a new resume control + verify(logger).logActiveConvertedToResume(anyInt(), eq(PACKAGE_NAME), eq(instanceId)) + verify(logger, never()).logResumeMediaAdded(anyInt(), eq(PACKAGE_NAME), any()) + } + + @Test + fun testTooManyCompactActions_isTruncated() { + // GIVEN a notification where too many compact actions were specified + val notif = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle( + MediaStyle().apply { + setMediaSession(session.sessionToken) + setShowActionsInCompactView(0, 1, 2, 3, 4) + } + ) + } + build() + } + + // WHEN the notification is loaded + mediaDataProcessor.onNotificationAdded(KEY, notif) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + // THEN only the first MAX_COMPACT_ACTIONS are actually set + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.actionsToShowInCompact.size) + .isEqualTo(MediaDataProcessor.MAX_COMPACT_ACTIONS) + } + + @Test + fun testTooManyNotificationActions_isTruncated() { + // GIVEN a notification where too many notification actions are added + val action = Notification.Action(R.drawable.ic_android, "action", null) + val notif = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + for (i in 0..MediaDataProcessor.MAX_NOTIFICATION_ACTIONS) { + it.addAction(action) + } + } + build() + } + + // WHEN the notification is loaded + mediaDataProcessor.onNotificationAdded(KEY, notif) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + // THEN only the first MAX_NOTIFICATION_ACTIONS are actually included + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.actions.size) + .isEqualTo(MediaDataProcessor.MAX_NOTIFICATION_ACTIONS) + } + + @Test + fun testPlaybackActions_noState_usesNotification() { + val desc = "Notification Action" + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + whenever(controller.playbackState).thenReturn(null) + + val notifWithAction = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.addAction(android.R.drawable.ic_media_play, desc, null) + } + build() + } + mediaDataProcessor.onNotificationAdded(KEY, notifWithAction) + + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + + assertThat(mediaDataCaptor.value!!.semanticActions).isNull() + assertThat(mediaDataCaptor.value!!.actions).hasSize(1) + assertThat(mediaDataCaptor.value!!.actions[0]!!.contentDescription).isEqualTo(desc) + } + + @Test + fun testPlaybackActions_hasPrevNext() { + val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4") + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val stateActions = + PlaybackState.ACTION_PLAY or + PlaybackState.ACTION_SKIP_TO_PREVIOUS or + PlaybackState.ACTION_SKIP_TO_NEXT + val stateBuilder = PlaybackState.Builder().setActions(stateActions) + customDesc.forEach { + stateBuilder.addCustomAction("action: $it", it, android.R.drawable.ic_media_pause) + } + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + + addNotificationAndLoad() + + assertThat(mediaDataCaptor.value!!.semanticActions).isNotNull() + val actions = mediaDataCaptor.value!!.semanticActions!! + + assertThat(actions.playOrPause).isNotNull() + assertThat(actions.playOrPause!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_play)) + actions.playOrPause!!.action!!.run() + verify(transportControls).play() + + assertThat(actions.prevOrCustom).isNotNull() + assertThat(actions.prevOrCustom!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_prev)) + actions.prevOrCustom!!.action!!.run() + verify(transportControls).skipToPrevious() + + assertThat(actions.nextOrCustom).isNotNull() + assertThat(actions.nextOrCustom!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_next)) + actions.nextOrCustom!!.action!!.run() + verify(transportControls).skipToNext() + + assertThat(actions.custom0).isNotNull() + assertThat(actions.custom0!!.contentDescription).isEqualTo(customDesc[0]) + + assertThat(actions.custom1).isNotNull() + assertThat(actions.custom1!!.contentDescription).isEqualTo(customDesc[1]) + } + + @Test + fun testPlaybackActions_noPrevNext_usesCustom() { + val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4", "custom 5") + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val stateActions = PlaybackState.ACTION_PLAY + val stateBuilder = PlaybackState.Builder().setActions(stateActions) + customDesc.forEach { + stateBuilder.addCustomAction("action: $it", it, android.R.drawable.ic_media_pause) + } + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + + addNotificationAndLoad() + + assertThat(mediaDataCaptor.value!!.semanticActions).isNotNull() + val actions = mediaDataCaptor.value!!.semanticActions!! + + assertThat(actions.playOrPause).isNotNull() + assertThat(actions.playOrPause!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_play)) + + assertThat(actions.prevOrCustom).isNotNull() + assertThat(actions.prevOrCustom!!.contentDescription).isEqualTo(customDesc[0]) + + assertThat(actions.nextOrCustom).isNotNull() + assertThat(actions.nextOrCustom!!.contentDescription).isEqualTo(customDesc[1]) + + assertThat(actions.custom0).isNotNull() + assertThat(actions.custom0!!.contentDescription).isEqualTo(customDesc[2]) + + assertThat(actions.custom1).isNotNull() + assertThat(actions.custom1!!.contentDescription).isEqualTo(customDesc[3]) + } + + @Test + fun testPlaybackActions_connecting() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val stateActions = PlaybackState.ACTION_PLAY + val stateBuilder = + PlaybackState.Builder() + .setState(PlaybackState.STATE_BUFFERING, 0, 10f) + .setActions(stateActions) + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + + addNotificationAndLoad() + + assertThat(mediaDataCaptor.value!!.semanticActions).isNotNull() + val actions = mediaDataCaptor.value!!.semanticActions!! + + assertThat(actions.playOrPause).isNotNull() + assertThat(actions.playOrPause!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_connecting)) + } + + @Test + fun testPlaybackActions_reservedSpace() { + val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4") + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val stateActions = PlaybackState.ACTION_PLAY + val stateBuilder = PlaybackState.Builder().setActions(stateActions) + customDesc.forEach { + stateBuilder.addCustomAction("action: $it", it, android.R.drawable.ic_media_pause) + } + val extras = + Bundle().apply { + putBoolean(MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_PREV, true) + putBoolean(MediaConstants.SESSION_EXTRAS_KEY_SLOT_RESERVATION_SKIP_TO_NEXT, true) + } + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + whenever(controller.extras).thenReturn(extras) + + addNotificationAndLoad() + + assertThat(mediaDataCaptor.value!!.semanticActions).isNotNull() + val actions = mediaDataCaptor.value!!.semanticActions!! + + assertThat(actions.playOrPause).isNotNull() + assertThat(actions.playOrPause!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_play)) + + assertThat(actions.prevOrCustom).isNull() + assertThat(actions.nextOrCustom).isNull() + + assertThat(actions.custom0).isNotNull() + assertThat(actions.custom0!!.contentDescription).isEqualTo(customDesc[0]) + + assertThat(actions.custom1).isNotNull() + assertThat(actions.custom1!!.contentDescription).isEqualTo(customDesc[1]) + + assertThat(actions.reserveNext).isTrue() + assertThat(actions.reservePrev).isTrue() + } + + @Test + fun testPlaybackActions_playPause_hasButton() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val stateActions = PlaybackState.ACTION_PLAY_PAUSE + val stateBuilder = PlaybackState.Builder().setActions(stateActions) + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + + addNotificationAndLoad() + + assertThat(mediaDataCaptor.value!!.semanticActions).isNotNull() + val actions = mediaDataCaptor.value!!.semanticActions!! + + assertThat(actions.playOrPause).isNotNull() + assertThat(actions.playOrPause!!.contentDescription) + .isEqualTo(context.getString(R.string.controls_media_button_play)) + actions.playOrPause!!.action!!.run() + verify(transportControls).play() + } + + @Test + fun testPlaybackLocationChange_isLogged() { + // Media control added for local playback + addNotificationAndLoad() + val instanceId = mediaDataCaptor.value.instanceId + + // Location is updated to local cast + whenever(playbackInfo.playbackType) + .thenReturn(MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE) + addNotificationAndLoad() + verify(logger) + .logPlaybackLocationChange( + anyInt(), + eq(PACKAGE_NAME), + eq(instanceId), + eq(MediaData.PLAYBACK_CAST_LOCAL) + ) + + // update to remote cast + mediaDataProcessor.onNotificationAdded(KEY, remoteCastNotification) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(logger) + .logPlaybackLocationChange( + anyInt(), + eq(SYSTEM_PACKAGE_NAME), + eq(instanceId), + eq(MediaData.PLAYBACK_CAST_REMOTE) + ) + } + + @Test + fun testPlaybackStateChange_keyExists_callsListener() { + // Notification has been added + addNotificationAndLoad() + + // Callback gets an updated state + val state = PlaybackState.Builder().setState(PlaybackState.STATE_PLAYING, 0L, 1f).build() + stateCallbackCaptor.value.invoke(KEY, state) + + // Listener is notified of updated state + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.isPlaying).isTrue() + } + + @Test + fun testPlaybackStateChange_keyDoesNotExist_doesNothing() { + val state = PlaybackState.Builder().build() + + // No media added with this key + + stateCallbackCaptor.value.invoke(KEY, state) + verify(listener, never()) + .onMediaDataLoaded(eq(KEY), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testPlaybackStateChange_keyHasNullToken_doesNothing() { + // When we get an update that sets the data's token to null + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.resumption).isFalse() + mediaDataProcessor.onMediaDataLoaded(KEY, null, data.copy(token = null)) + + // And then get a state update + val state = PlaybackState.Builder().build() + + // Then no changes are made + stateCallbackCaptor.value.invoke(KEY, state) + verify(listener, never()) + .onMediaDataLoaded(eq(KEY), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testPlaybackState_PauseWhenFlagTrue_keyExists_callsListener() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + val state = PlaybackState.Builder().setState(PlaybackState.STATE_PAUSED, 0L, 1f).build() + whenever(controller.playbackState).thenReturn(state) + + addNotificationAndLoad() + stateCallbackCaptor.value.invoke(KEY, state) + + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + assertThat(mediaDataCaptor.value.semanticActions).isNotNull() + } + + @Test + fun testPlaybackState_PauseStateAfterAddingResumption_keyExists_callsListener() { + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + build() + } + val state = + PlaybackState.Builder() + .setState(PlaybackState.STATE_PAUSED, 0L, 1f) + .setActions(PlaybackState.ACTION_PLAY_PAUSE) + .build() + + // Add resumption controls in order to have semantic actions. + // To make sure that they are not null after changing state. + mediaDataProcessor.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + PACKAGE_NAME + ) + backgroundExecutor.runAllReady() + foregroundExecutor.runAllReady() + + stateCallbackCaptor.value.invoke(PACKAGE_NAME, state) + + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(PACKAGE_NAME), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + assertThat(mediaDataCaptor.value.semanticActions).isNotNull() + } + + @Test + fun testPlaybackStateNull_Pause_keyExists_callsListener() { + whenever(controller.playbackState).thenReturn(null) + val state = + PlaybackState.Builder() + .setState(PlaybackState.STATE_PAUSED, 0L, 1f) + .setActions(PlaybackState.ACTION_PLAY_PAUSE) + .build() + + addNotificationAndLoad() + stateCallbackCaptor.value.invoke(KEY, state) + + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.isPlaying).isFalse() + assertThat(mediaDataCaptor.value.semanticActions).isNull() + } + + @Test + fun testNoClearNotOngoing_canDismiss() { + mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.setOngoing(false) + it.setFlag(FLAG_NO_CLEAR, true) + } + build() + } + addNotificationAndLoad() + assertThat(mediaDataCaptor.value.isClearable).isTrue() + } + + @Test + fun testOngoing_cannotDismiss() { + mediaNotification = + SbnBuilder().run { + setPkg(PACKAGE_NAME) + modifyNotification(context).also { + it.setSmallIcon(android.R.drawable.ic_media_pause) + it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) }) + it.setOngoing(true) + } + build() + } + addNotificationAndLoad() + assertThat(mediaDataCaptor.value.isClearable).isFalse() + } + + @Test + fun testRetain_notifPlayer_notifRemoved_setToResume() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + + // When a media control based on notification is added, times out, and then removed + addNotificationAndLoad() + mediaDataProcessor.setInactive(KEY, timedOut = true) + assertThat(mediaDataCaptor.value.active).isFalse() + mediaDataProcessor.onNotificationRemoved(KEY) + + // It is converted to a resume player + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.active).isFalse() + verify(logger) + .logActiveConvertedToResume( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId) + ) + } + + @Test + fun testRetain_notifPlayer_sessionDestroyed_doesNotChange() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + + // When a media control based on notification is added and times out + addNotificationAndLoad() + mediaDataProcessor.setInactive(KEY, timedOut = true) + assertThat(mediaDataCaptor.value.active).isFalse() + + // and then the session is destroyed + sessionCallbackCaptor.value.invoke(KEY) + + // It remains as a regular player + verify(listener, never()).onMediaDataRemoved(eq(KEY)) + verify(listener, never()) + .onMediaDataLoaded(eq(PACKAGE_NAME), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testRetain_notifPlayer_removeWhileActive_fullyRemoved() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + + // When a media control based on notification is added and then removed, without timing out + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + mediaDataProcessor.onNotificationRemoved(KEY) + + // It is fully removed + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + verify(listener, never()) + .onMediaDataLoaded(eq(PACKAGE_NAME), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testRetain_canResume_removeWhileActive_setToResume() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + + // When a media control that supports resumption is added + addNotificationAndLoad() + val dataResumable = mediaDataCaptor.value.copy(resumeAction = Runnable {}) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataResumable) + + // And then removed while still active + mediaDataProcessor.onNotificationRemoved(KEY) + + // It is converted to a resume player + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.active).isFalse() + verify(logger) + .logActiveConvertedToResume( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId) + ) + } + + @Test + fun testRetain_sessionPlayer_notifRemoved_doesNotChange() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control with PlaybackState actions is added, times out, + // and then the notification is removed + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + mediaDataProcessor.setInactive(KEY, timedOut = true) + mediaDataProcessor.onNotificationRemoved(KEY) + + // It remains as a regular player + verify(listener, never()).onMediaDataRemoved(eq(KEY)) + verify(listener, never()) + .onMediaDataLoaded(eq(PACKAGE_NAME), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testRetain_sessionPlayer_sessionDestroyed_setToResume() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control with PlaybackState actions is added, times out, + // and then the session is destroyed + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + mediaDataProcessor.setInactive(KEY, timedOut = true) + sessionCallbackCaptor.value.invoke(KEY) + + // It is converted to a resume player + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.active).isFalse() + verify(logger) + .logActiveConvertedToResume( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId) + ) + } + + @Test + fun testRetain_sessionPlayer_destroyedWhileActive_noResume_fullyRemoved() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control using session actions is added, and then the session is destroyed + // without timing out first + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + sessionCallbackCaptor.value.invoke(KEY) + + // It is fully removed + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + verify(listener, never()) + .onMediaDataLoaded(eq(PACKAGE_NAME), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testRetain_sessionPlayer_canResume_destroyedWhileActive_setToResume() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control using session actions and that does allow resumption is added, + addNotificationAndLoad() + val dataResumable = mediaDataCaptor.value.copy(resumeAction = Runnable {}) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataResumable) + + // And then the session is destroyed without timing out first + sessionCallbackCaptor.value.invoke(KEY) + + // It is converted to a resume player + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.active).isFalse() + verify(logger) + .logActiveConvertedToResume( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId) + ) + } + + @Test + fun testSessionPlayer_sessionDestroyed_noResume_fullyRemoved() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control with PlaybackState actions is added, times out, + // and then the session is destroyed + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + mediaDataProcessor.setInactive(KEY, timedOut = true) + sessionCallbackCaptor.value.invoke(KEY) + + // It is fully removed. + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + verify(listener, never()) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } + + @Test + fun testSessionPlayer_destroyedWhileActive_noResume_fullyRemoved() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control using session actions is added, and then the session is destroyed + // without timing out first + addNotificationAndLoad() + val data = mediaDataCaptor.value + assertThat(data.active).isTrue() + sessionCallbackCaptor.value.invoke(KEY) + + // It is fully removed + verify(listener).onMediaDataRemoved(eq(KEY)) + verify(logger).logMediaRemoved(anyInt(), eq(PACKAGE_NAME), eq(data.instanceId)) + verify(listener, never()) + .onMediaDataLoaded(eq(PACKAGE_NAME), any(), any(), anyBoolean(), anyInt(), anyBoolean()) + } + + @Test + fun testSessionPlayer_canResume_destroyedWhileActive_setToResume() { + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + addPlaybackStateAction() + + // When a media control using session actions and that does allow resumption is added, + addNotificationAndLoad() + val dataResumable = mediaDataCaptor.value.copy(resumeAction = Runnable {}) + mediaDataProcessor.onMediaDataLoaded(KEY, null, dataResumable) + + // And then the session is destroyed without timing out first + sessionCallbackCaptor.value.invoke(KEY) + + // It is converted to a resume player + verify(listener) + .onMediaDataLoaded( + eq(PACKAGE_NAME), + eq(KEY), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + assertThat(mediaDataCaptor.value.resumption).isTrue() + assertThat(mediaDataCaptor.value.active).isFalse() + verify(logger) + .logActiveConvertedToResume( + anyInt(), + eq(PACKAGE_NAME), + eq(mediaDataCaptor.value.instanceId) + ) + } + + @Test + fun testSessionDestroyed_noNotificationKey_stillRemoved() { + whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(true) + whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(true) + + // When a notiifcation is added and then removed before it is fully processed + mediaDataProcessor.onNotificationAdded(KEY, mediaNotification) + backgroundExecutor.runAllReady() + mediaDataProcessor.onNotificationRemoved(KEY) + + // We still make sure to remove it + verify(listener).onMediaDataRemoved(eq(KEY)) + } + + @Test + fun testResumeMediaLoaded_hasArtPermission_artLoaded() { + // When resume media is loaded and user/app has permission to access the art URI, + whenever( + ugm.checkGrantUriPermission_ignoreNonSystem( + anyInt(), + any(), + any(), + anyInt(), + anyInt() + ) + ) + .thenReturn(1) + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val uri = Uri.parse("content://example") + whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource) + whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork) + + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setIconUri(uri) + build() + } + addResumeControlAndLoad(desc) + + // Then the artwork is loaded + assertThat(mediaDataCaptor.value.artwork).isNotNull() + } + + @Test + fun testResumeMediaLoaded_noArtPermission_noArtLoaded() { + // When resume media is loaded and user/app does not have permission to access the art URI + whenever( + ugm.checkGrantUriPermission_ignoreNonSystem( + anyInt(), + any(), + any(), + anyInt(), + anyInt() + ) + ) + .thenThrow(SecurityException("Test no permission")) + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val uri = Uri.parse("content://example") + whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource) + whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork) + + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setIconUri(uri) + build() + } + addResumeControlAndLoad(desc) + + // Then the artwork is not loaded + assertThat(mediaDataCaptor.value.artwork).isNull() + } + + /** Helper function to add a basic media notification and capture the resulting MediaData */ + private fun addNotificationAndLoad() { + addNotificationAndLoad(mediaNotification) + } + + /** Helper function to add the given notification and capture the resulting MediaData */ + private fun addNotificationAndLoad(sbn: StatusBarNotification) { + mediaDataProcessor.onNotificationAdded(KEY, sbn) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + verify(listener) + .onMediaDataLoaded( + eq(KEY), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } + + /** Helper function to set up a PlaybackState with action */ + private fun addPlaybackStateAction() { + val stateActions = PlaybackState.ACTION_PLAY_PAUSE + val stateBuilder = PlaybackState.Builder().setActions(stateActions) + stateBuilder.setState(PlaybackState.STATE_PAUSED, 0, 1.0f) + whenever(controller.playbackState).thenReturn(stateBuilder.build()) + } + + /** Helper function to add a resumption control and capture the resulting MediaData */ + private fun addResumeControlAndLoad( + desc: MediaDescription, + packageName: String = PACKAGE_NAME + ) { + mediaDataProcessor.addResumptionControls( + USER_ID, + desc, + Runnable {}, + session.sessionToken, + APP_NAME, + pendingIntent, + packageName + ) + assertThat(backgroundExecutor.runAllReady()).isEqualTo(1) + assertThat(foregroundExecutor.runAllReady()).isEqualTo(1) + + verify(listener) + .onMediaDataLoaded( + eq(packageName), + eq(null), + capture(mediaDataCaptor), + eq(true), + eq(0), + eq(false) + ) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt index 7f3d79f7e288..a447e442a384 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt @@ -41,7 +41,6 @@ import com.android.settingslib.media.LocalMediaManager import com.android.settingslib.media.MediaDevice import com.android.settingslib.media.PhoneMediaDevice import com.android.systemui.SysuiTestCase -import com.android.systemui.dump.DumpManager import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.shared.model.MediaData import com.android.systemui.media.controls.shared.model.MediaDeviceData @@ -98,7 +97,6 @@ public class MediaDeviceManagerTest : SysuiTestCase() { @Mock private lateinit var muteAwaitManager: MediaMuteAwaitConnectionManager private lateinit var fakeFgExecutor: FakeExecutor private lateinit var fakeBgExecutor: FakeExecutor - @Mock private lateinit var dumpster: DumpManager @Mock private lateinit var listener: MediaDeviceManager.Listener @Mock private lateinit var device: MediaDevice @Mock private lateinit var icon: Drawable @@ -133,7 +131,6 @@ public class MediaDeviceManagerTest : SysuiTestCase() { { localBluetoothManager }, fakeFgExecutor, fakeBgExecutor, - dumpster, ) manager.addListener(listener) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt index f755199b4c72..59e2696c6123 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt @@ -41,7 +41,6 @@ import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.domain.pipeline.EMPTY_SMARTSPACE_MEDIA_DATA import com.android.systemui.media.controls.domain.pipeline.MediaDataManager import com.android.systemui.media.controls.shared.model.MediaData -import com.android.systemui.media.controls.shared.model.SmartspaceMediaData import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS import com.android.systemui.media.controls.ui.view.MediaHostState import com.android.systemui.media.controls.ui.view.MediaScrollView @@ -111,7 +110,6 @@ class MediaCarouselControllerTest : SysuiTestCase() { @Mock lateinit var logger: MediaUiEventLogger @Mock lateinit var debugLogger: MediaCarouselControllerLogger @Mock lateinit var mediaViewController: MediaViewController - @Mock lateinit var smartspaceMediaData: SmartspaceMediaData @Mock lateinit var mediaCarousel: MediaScrollView @Mock lateinit var pageIndicator: PageIndicator @Mock lateinit var mediaFlags: MediaFlags @@ -165,7 +163,6 @@ class MediaCarouselControllerTest : SysuiTestCase() { verify(mediaHostStatesManager).addCallback(capture(hostStateCallback)) whenever(mediaControlPanelFactory.get()).thenReturn(panel) whenever(panel.mediaViewController).thenReturn(mediaViewController) - whenever(mediaDataManager.smartspaceMediaData).thenReturn(smartspaceMediaData) whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false) MediaPlayerData.clear() verify(globalSettings) diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt index aa54565c2aa0..6e0919f5f1d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt @@ -28,9 +28,10 @@ import android.view.MotionEvent.ACTION_UP import android.view.ViewConfiguration import android.view.WindowManager import androidx.test.filters.SmallTest -import com.android.internal.jank.InteractionJankMonitor import com.android.internal.util.LatencyTracker import com.android.systemui.SysuiTestCase +import com.android.systemui.jank.interactionJankMonitor +import com.android.systemui.kosmos.Kosmos import com.android.systemui.plugins.NavigationEdgeBackPlugin import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.ConfigurationController @@ -41,10 +42,8 @@ import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.eq import org.mockito.Mock -import org.mockito.Mockito.anyInt import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations @SmallTest @@ -62,16 +61,13 @@ class BackPanelControllerTest : SysuiTestCase() { @Mock private lateinit var windowManager: WindowManager @Mock private lateinit var configurationController: ConfigurationController @Mock private lateinit var latencyTracker: LatencyTracker - @Mock private lateinit var interactionJankMonitor: InteractionJankMonitor + private val interactionJankMonitor = Kosmos().interactionJankMonitor @Mock private lateinit var layoutParams: WindowManager.LayoutParams @Mock private lateinit var backCallback: NavigationEdgeBackPlugin.BackCallback @Before fun setup() { MockitoAnnotations.initMocks(this) - `when`(interactionJankMonitor.begin(any(), anyInt())).thenReturn(true) - `when`(interactionJankMonitor.end(anyInt())).thenReturn(true) - `when`(interactionJankMonitor.cancel(anyInt())).thenReturn(true) mBackPanelController = BackPanelController( context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java index a63b2211f71a..db0c0bcfa8f5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java @@ -80,6 +80,8 @@ import android.app.people.IPeopleManager; import android.app.people.PeopleManager; import android.app.people.PeopleSpaceTile; import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -101,11 +103,12 @@ import android.text.TextUtils; import androidx.preference.PreferenceManager; import androidx.test.filters.SmallTest; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.people.PeopleBackupFollowUpJob; import com.android.systemui.people.PeopleSpaceUtils; import com.android.systemui.people.SharedPreferencesHelper; +import com.android.systemui.res.R; +import com.android.systemui.settings.FakeUserTracker; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; import com.android.systemui.statusbar.SbnBuilder; @@ -265,6 +268,8 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { private final FakeExecutor mFakeExecutor = new FakeExecutor(mClock); + private final FakeUserTracker mUserTracker = new FakeUserTracker(); + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -272,7 +277,7 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { mManager = new PeopleSpaceWidgetManager(mContext, mAppWidgetManager, mIPeopleManager, mPeopleManager, mLauncherApps, mNotifCollection, mPackageManager, Optional.of(mBubbles), mUserManager, mBackupManager, mINotificationManager, - mNotificationManager, mFakeExecutor); + mNotificationManager, mFakeExecutor, mUserTracker); mManager.attach(mListenerService); verify(mListenerService).addNotificationHandler(mListenerCaptor.capture()); @@ -309,6 +314,12 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { .setId(1) .setShortcutInfo(mShortcutInfo) .build(); + + AppWidgetProviderInfo providerInfo = new AppWidgetProviderInfo(); + providerInfo.provider = new ComponentName("com.android.systemui.tests", + "com.android.systemui.people.widget.PeopleSpaceWidgetProvider"); + when(mAppWidgetManager.getInstalledProvidersForPackage(anyString(), any())) + .thenReturn(List.of(providerInfo)); } @Test @@ -1562,6 +1573,43 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS)); } + @Test + public void testUpdateGeneratedPreview_flagDisabled() { + mSetFlagsRule.disableFlags(android.appwidget.flags.Flags.FLAG_GENERATED_PREVIEWS); + mManager.updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + verify(mAppWidgetManager, times(0)).setWidgetPreview(any(), anyInt(), any()); + } + + @Test + public void testUpdateGeneratedPreview_userLocked() { + mSetFlagsRule.enableFlags(android.appwidget.flags.Flags.FLAG_GENERATED_PREVIEWS); + when(mUserManager.isUserUnlocked(mUserTracker.getUserHandle())).thenReturn(false); + + mManager.updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + verify(mAppWidgetManager, times(0)).setWidgetPreview(any(), anyInt(), any()); + } + + @Test + public void testUpdateGeneratedPreview_userUnlocked() { + mSetFlagsRule.enableFlags(android.appwidget.flags.Flags.FLAG_GENERATED_PREVIEWS); + when(mUserManager.isUserUnlocked(mUserTracker.getUserHandle())).thenReturn(true); + when(mAppWidgetManager.setWidgetPreview(any(), anyInt(), any())).thenReturn(true); + + mManager.updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + verify(mAppWidgetManager, times(1)).setWidgetPreview(any(), anyInt(), any()); + } + + @Test + public void testUpdateGeneratedPreview_doesNotSetTwice() { + mSetFlagsRule.enableFlags(android.appwidget.flags.Flags.FLAG_GENERATED_PREVIEWS); + when(mUserManager.isUserUnlocked(mUserTracker.getUserHandle())).thenReturn(true); + when(mAppWidgetManager.setWidgetPreview(any(), anyInt(), any())).thenReturn(true); + + mManager.updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + mManager.updateGeneratedPreviewForUser(mUserTracker.getUserHandle()); + verify(mAppWidgetManager, times(1)).setWidgetPreview(any(), anyInt(), any()); + } + private void setFinalField(String fieldName, int value) { try { Field field = NotificationManager.Policy.class.getDeclaredField(fieldName); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt index cc48640b15bc..5c6ed70c85a6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt @@ -21,6 +21,7 @@ import android.testing.TestableLooper.RunWithLooper import android.testing.ViewUtils import android.view.ContextThemeWrapper import android.view.View +import android.view.ViewGroup import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.accessibility.AccessibilityNodeInfo import android.widget.FrameLayout @@ -71,7 +72,7 @@ class QSPanelTest : SysuiTestCase() { qsPanel = QSPanel(themedContext, null) qsPanel.mUsingMediaPlayer = true - qsPanel.initialize(qsLogger) + qsPanel.initialize(qsLogger, true) // QSPanel inflates a footer inside of it, mocking it here footer = LinearLayout(themedContext).apply { id = R.id.qs_footer } qsPanel.addView(footer, MATCH_PARENT, 100) @@ -218,6 +219,62 @@ class QSPanelTest : SysuiTestCase() { verify(tile).addCallback(record.callback) } + @Test + fun initializedWithNoMedia_tileLayoutParentIsAlwaysQsPanel() { + lateinit var panel: QSPanel + lateinit var tileLayout: View + testableLooper.runWithLooper { + panel = QSPanel(themedContext, null) + panel.mUsingMediaPlayer = true + + panel.initialize(qsLogger, /* usingMediaPlayer= */ false) + tileLayout = panel.orCreateTileLayout as View + // QSPanel inflates a footer inside of it, mocking it here + footer = LinearLayout(themedContext).apply { id = R.id.qs_footer } + panel.addView(footer, MATCH_PARENT, 100) + panel.onFinishInflate() + // Provides a parent with non-zero size for QSPanel + ViewUtils.attachView(panel) + } + val mockMediaHost = mock(ViewGroup::class.java) + + panel.setUsingHorizontalLayout(false, mockMediaHost, true) + + assertThat(tileLayout.parent).isSameInstanceAs(panel) + + panel.setUsingHorizontalLayout(true, mockMediaHost, true) + assertThat(tileLayout.parent).isSameInstanceAs(panel) + + ViewUtils.detachView(panel) + } + + @Test + fun initializeWithNoMedia_mediaNeverAttached() { + lateinit var panel: QSPanel + testableLooper.runWithLooper { + panel = QSPanel(themedContext, null) + panel.mUsingMediaPlayer = true + + panel.initialize(qsLogger, /* usingMediaPlayer= */ false) + panel.orCreateTileLayout as View + // QSPanel inflates a footer inside of it, mocking it here + footer = LinearLayout(themedContext).apply { id = R.id.qs_footer } + panel.addView(footer, MATCH_PARENT, 100) + panel.onFinishInflate() + // Provides a parent with non-zero size for QSPanel + ViewUtils.attachView(panel) + } + val mockMediaHost = FrameLayout(themedContext) + + panel.setUsingHorizontalLayout(false, mockMediaHost, true) + assertThat(mockMediaHost.parent).isNull() + + panel.setUsingHorizontalLayout(true, mockMediaHost, true) + assertThat(mockMediaHost.parent).isNull() + + ViewUtils.detachView(panel) + } + private infix fun View.isLeftOf(other: View): Boolean { val rect = Rect() getBoundsOnScreen(rect) diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelTest.kt index 3fba3938db19..e5369fcae0b9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelTest.kt @@ -36,7 +36,7 @@ class QuickQSPanelTest : SysuiTestCase() { testableLooper.runWithLooper { quickQSPanel = QuickQSPanel(mContext, null) - quickQSPanel.initialize(qsLogger) + quickQSPanel.initialize(qsLogger, true) quickQSPanel.onFinishInflate() // Provides a parent with non-zero size for QSPanel diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt index e0fff9c10873..04e214ac7a04 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt @@ -18,6 +18,7 @@ package com.android.systemui.qs.tileimpl import android.content.Context import android.graphics.drawable.Drawable +import android.platform.test.annotations.EnableFlags import android.service.quicksettings.Tile import android.testing.AndroidTestingRunner import android.testing.TestableLooper @@ -27,6 +28,7 @@ import android.view.View import android.view.accessibility.AccessibilityNodeInfo import android.widget.TextView import androidx.test.filters.SmallTest +import com.android.systemui.Flags.FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS import com.android.systemui.res.R import com.android.systemui.SysuiTestCase import com.android.systemui.plugins.qs.QSTile @@ -380,6 +382,34 @@ class QSTileViewImplTest : SysuiTestCase() { assertThat(tileView.stateDescription?.contains(unavailableString)).isTrue() } + @Test + @EnableFlags(FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS) + fun onStateChange_longPressEffectActive_withInvalidDuration_doesNotCreateEffect() { + val state = QSTile.State() // A state that handles longPress + + // GIVEN an invalid long-press effect duration + tileView.constantLongPressEffectDuration = -1 + + // WHEN the state changes + tileView.changeState(state) + + // THEN the long-press effect is not created + assertThat(tileView.hasLongPressEffect).isFalse() + } + + @Test + @EnableFlags(FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS) + fun onStateChange_longPressEffectActive_withValidDuration_createsEffect() { + // GIVEN a test state that handles long-press and a valid long-press effect duration + val state = QSTile.State() + + // WHEN the state changes + tileView.changeState(state) + + // THEN the long-press effect created + assertThat(tileView.hasLongPressEffect).isTrue() + } + class FakeTileView( context: Context, collapsed: Boolean @@ -387,6 +417,9 @@ class QSTileViewImplTest : SysuiTestCase() { ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings), collapsed ) { + var constantLongPressEffectDuration = 500 + + override fun getLongPressEffectDuration(): Int = constantLongPressEffectDuration fun changeState(state: QSTile.State) { handleStateChanged(state) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt index 761c411bdcb8..37654d515a21 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.qs.QSHost 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.recordissue.IssueRecordingState import com.android.systemui.recordissue.RecordIssueDialogDelegate import com.android.systemui.res.R import com.android.systemui.settings.UserContextProvider @@ -74,6 +75,7 @@ class RecordIssueTileTest : SysuiTestCase() { @Mock private lateinit var dialog: SystemUIDialog private lateinit var testableLooper: TestableLooper + private val issueRecordingState = IssueRecordingState() private lateinit var tile: RecordIssueTile @Before @@ -100,13 +102,14 @@ class RecordIssueTileTest : SysuiTestCase() { dialogLauncherAnimator, panelInteractor, userContextProvider, + issueRecordingState, delegateFactory, ) } @Test fun qsTileUi_shouldLookCorrect_whenInactive() { - tile.isRecording = false + issueRecordingState.isRecording = false val testState = tile.newTileState() tile.handleUpdateState(testState, null) @@ -118,8 +121,7 @@ class RecordIssueTileTest : SysuiTestCase() { @Test fun qsTileUi_shouldLookCorrect_whenRecording() { - tile.isRecording = true - + issueRecordingState.isRecording = true val testState = tile.newTileState() tile.handleUpdateState(testState, null) @@ -130,7 +132,7 @@ class RecordIssueTileTest : SysuiTestCase() { @Test fun inActiveQsTile_switchesToActive_whenClicked() { - tile.isRecording = false + issueRecordingState.isRecording = false val testState = tile.newTileState() tile.handleUpdateState(testState, null) @@ -140,7 +142,7 @@ class RecordIssueTileTest : SysuiTestCase() { @Test fun activeQsTile_switchesToInActive_whenClicked() { - tile.isRecording = true + issueRecordingState.isRecording = true val testState = tile.newTileState() tile.handleUpdateState(testState, null) @@ -150,7 +152,8 @@ class RecordIssueTileTest : SysuiTestCase() { @Test fun showPrompt_shouldUseKeyguardDismissUtil_ToShowDialog() { - tile.isRecording = false + issueRecordingState.isRecording = false + tile.handleClick(null) testableLooper.processAllMessages() diff --git a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt index 10d6ebf11be7..1313227c7f3d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt @@ -21,7 +21,7 @@ import android.content.Context import android.content.pm.PackageManager import android.content.pm.ResolveInfo import android.os.PowerManager -import android.os.Process; +import android.os.Process import android.os.UserHandle import android.testing.AndroidTestingRunner import android.testing.TestableContext @@ -34,8 +34,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager -import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.keyguard.KeyguardUnlockAnimationController import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.keyguard.ui.view.InWindowLauncherUnlockAnimationManager @@ -96,7 +94,6 @@ class OverviewProxyServiceTest : SysuiTestCase() { private val displayTracker = FakeDisplayTracker(mContext) private val fakeSystemClock = FakeSystemClock() private val sysUiState = SysUiState(displayTracker, kosmos.sceneContainerPlugin) - private val featureFlags = FakeFeatureFlags() private val wakefulnessLifecycle = WakefulnessLifecycle(mContext, null, fakeSystemClock, dumpManager) @@ -121,8 +118,7 @@ class OverviewProxyServiceTest : SysuiTestCase() { @Mock private lateinit var unfoldTransitionProgressForwarder: Optional<UnfoldTransitionProgressForwarder> - @Mock - private lateinit var broadcastDispatcher: BroadcastDispatcher + @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher @Before fun setUp() { @@ -205,16 +201,14 @@ class OverviewProxyServiceTest : SysuiTestCase() { @Test fun connectToOverviewService_primaryUser_expectBindService() { - val mockitoSession = ExtendedMockito.mockitoSession() - .spyStatic(Process::class.java) - .startMocking() + val mockitoSession = + ExtendedMockito.mockitoSession().spyStatic(Process::class.java).startMocking() try { `when`(Process.myUserHandle()).thenReturn(UserHandle.SYSTEM) val spyContext = spy(context) val ops = createOverviewProxyService(spyContext) ops.startConnectionToCurrentUser() - verify(spyContext, atLeast(1)).bindServiceAsUser(any(), any(), - anyInt(), any()) + verify(spyContext, atLeast(1)).bindServiceAsUser(any(), any(), anyInt(), any()) } finally { mockitoSession.finishMocking() } @@ -222,22 +216,20 @@ class OverviewProxyServiceTest : SysuiTestCase() { @Test fun connectToOverviewService_nonPrimaryUser_expectNoBindService() { - val mockitoSession = ExtendedMockito.mockitoSession() - .spyStatic(Process::class.java) - .startMocking() + val mockitoSession = + ExtendedMockito.mockitoSession().spyStatic(Process::class.java).startMocking() try { `when`(Process.myUserHandle()).thenReturn(UserHandle.of(12345)) val spyContext = spy(context) val ops = createOverviewProxyService(spyContext) ops.startConnectionToCurrentUser() - verify(spyContext, times(0)).bindServiceAsUser(any(), any(), - anyInt(), any()) + verify(spyContext, times(0)).bindServiceAsUser(any(), any(), anyInt(), any()) } finally { mockitoSession.finishMocking() } } - private fun createOverviewProxyService(ctx: Context) : OverviewProxyService { + private fun createOverviewProxyService(ctx: Context): OverviewProxyService { return OverviewProxyService( ctx, executor, @@ -257,7 +249,6 @@ class OverviewProxyServiceTest : SysuiTestCase() { sysuiUnlockAnimationController, inWindowLauncherUnlockAnimationManager, assistUtils, - featureFlags, FakeSceneContainerFlags(), dumpManager, unfoldTransitionProgressForwarder, diff --git a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt index 2e8160baa257..1cfca68cd452 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt @@ -222,4 +222,9 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() { ) verify(factory, never()).create(any<ScreenCapturePermissionDialogDelegate>()) } + + @Test + fun startButton_isDisabled_beforeIssueTypeIsSelected() { + assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled).isFalse() + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index 43fcdf3eeedd..c25b910557a7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -62,7 +62,6 @@ import android.view.accessibility.AccessibilityManager; import androidx.constraintlayout.widget.ConstraintSet; -import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.testing.UiEventLoggerFake; @@ -299,7 +298,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock protected RecordingController mRecordingController; @Mock protected LockscreenGestureLogger mLockscreenGestureLogger; @Mock protected DumpManager mDumpManager; - @Mock protected InteractionJankMonitor mInteractionJankMonitor; @Mock protected NotificationsQSContainerController mNotificationsQSContainerController; @Mock protected QsFrameTranslateController mQsFrameTranslateController; @Mock protected StatusBarWindowStateController mStatusBarWindowStateController; @@ -441,7 +439,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { SystemClock systemClock = new FakeSystemClock(); mStatusBarStateController = new StatusBarStateControllerImpl( mUiEventLogger, - mInteractionJankMonitor, + mKosmos.getInteractionJankMonitor(), mJavaAdapter, () -> mShadeInteractor, () -> mKosmos.getDeviceUnlockedInteractor(), @@ -459,7 +457,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mDozeParameters, mScreenOffAnimationController, mKeyguardLogger, - mInteractionJankMonitor, + mKosmos.getInteractionJankMonitor(), mKeyguardInteractor, mDumpManager, mPowerInteractor)); @@ -611,7 +609,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mock(HeadsUpManager.class), new StatusBarStateControllerImpl( new UiEventLoggerFake(), - mInteractionJankMonitor, + mKosmos.getInteractionJankMonitor(), mJavaAdapter, () -> mShadeInteractor, () -> mKosmos.getDeviceUnlockedInteractor(), @@ -651,10 +649,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { .thenReturn(mKeyguardBottomArea); when(mNotificationRemoteInputManager.isRemoteInputActive()) .thenReturn(false); - when(mInteractionJankMonitor.begin(any(), anyInt())) - .thenReturn(true); - when(mInteractionJankMonitor.end(anyInt())) - .thenReturn(true); doAnswer(invocation -> { ((Runnable) invocation.getArgument(0)).run(); return null; @@ -820,7 +814,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mAccessibilityManager, mLockscreenGestureLogger, mMetricsLogger, - mInteractionJankMonitor, + mKosmos.getInteractionJankMonitor(), mShadeLog, mDumpManager, mDeviceEntryFaceAuthInteractor, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java index 419b0fd2f89b..118d27a68c8c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java @@ -251,7 +251,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase { mCollectionListener.onEntryInit(mEntry); mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry)); verify(mNotifInflater).inflateViews(eq(mEntry), mParamsCaptor.capture(), any()); - assertFalse(mParamsCaptor.getValue().isLowPriority()); + assertFalse(mParamsCaptor.getValue().isMinimized()); mNotifInflater.invokeInflateCallbackForEntry(mEntry); // WHEN notification moves to a min priority section @@ -260,7 +260,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase { // THEN we rebind it verify(mNotifInflater).rebindViews(eq(mEntry), mParamsCaptor.capture(), any()); - assertTrue(mParamsCaptor.getValue().isLowPriority()); + assertTrue(mParamsCaptor.getValue().isMinimized()); // THEN we do not filter it because it's not the first inflation. assertFalse(mUninflatedFilter.shouldFilterOut(mEntry, 0)); @@ -273,7 +273,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase { mCollectionListener.onEntryInit(mEntry); mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry)); verify(mNotifInflater).inflateViews(eq(mEntry), mParamsCaptor.capture(), any()); - assertTrue(mParamsCaptor.getValue().isLowPriority()); + assertTrue(mParamsCaptor.getValue().isMinimized()); mNotifInflater.invokeInflateCallbackForEntry(mEntry); // WHEN notification is moved under a parent @@ -282,7 +282,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase { // THEN we rebind it as not-minimized verify(mNotifInflater).rebindViews(eq(mEntry), mParamsCaptor.capture(), any()); - assertFalse(mParamsCaptor.getValue().isLowPriority()); + assertFalse(mParamsCaptor.getValue().isMinimized()); // THEN we do not filter it because it's not the first inflation. assertFalse(mUninflatedFilter.shouldFilterOut(mEntry, 0)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java index b114e13bb25c..ee2eb806341f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java @@ -741,7 +741,7 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { when(mockViewWrapper.getIcon()).thenReturn(mockIcon); NotificationViewWrapper mockLowPriorityViewWrapper = mock(NotificationViewWrapper.class); - when(mockContainer.getLowPriorityViewWrapper()).thenReturn(mockLowPriorityViewWrapper); + when(mockContainer.getMinimizedGroupHeaderWrapper()).thenReturn(mockLowPriorityViewWrapper); CachingIconView mockLowPriorityIcon = mock(CachingIconView.class); when(mockLowPriorityViewWrapper.getIcon()).thenReturn(mockLowPriorityIcon); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java index a0d10759ba56..8c225113677b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java @@ -231,6 +231,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { NotificationContentInflater.applyRemoteView( AsyncTask.SERIAL_EXECUTOR, false /* inflateSynchronously */, + /* isMinimized= */ false, result, FLAG_CONTENT_VIEW_EXPANDED, 0, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/RowContentBindStageTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/RowContentBindStageTest.java index 76470dbe6d21..1534c84fd99a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/RowContentBindStageTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/RowContentBindStageTest.java @@ -197,7 +197,7 @@ public class RowContentBindStageTest extends SysuiTestCase { params.clearDirtyContentViews(); // WHEN low priority is set and stage executed. - params.setUseLowPriority(true); + params.setUseMinimized(true); mRowContentBindStage.executeStage(mEntry, mRow, (en) -> { }); // THEN binder is called with use low priority and contracted/expanded are called to bind. @@ -210,7 +210,7 @@ public class RowContentBindStageTest extends SysuiTestCase { anyBoolean(), any()); BindParams usedParams = bindParamsCaptor.getValue(); - assertTrue(usedParams.isLowPriority); + assertTrue(usedParams.isMinimized); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainerTest.java index 1f38a73020b2..3b16f1416935 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainerTest.java @@ -67,7 +67,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test public void testGetMaxAllowedVisibleChildren_lowPriority() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); Assert.assertEquals(mChildrenContainer.getMaxAllowedVisibleChildren(), NotificationChildrenContainer.NUMBER_OF_CHILDREN_WHEN_SYSTEM_EXPANDED); } @@ -81,7 +81,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test public void testGetMaxAllowedVisibleChildren_lowPriority_expandedChildren() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); mChildrenContainer.setChildrenExpanded(true); Assert.assertEquals(mChildrenContainer.getMaxAllowedVisibleChildren(), NotificationChildrenContainer.NUMBER_OF_CHILDREN_WHEN_SYSTEM_EXPANDED); @@ -89,7 +89,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test public void testGetMaxAllowedVisibleChildren_lowPriority_userLocked() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); mChildrenContainer.setUserLocked(true); Assert.assertEquals(mChildrenContainer.getMaxAllowedVisibleChildren(), NotificationChildrenContainer.NUMBER_OF_CHILDREN_WHEN_SYSTEM_EXPANDED); @@ -118,7 +118,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test public void testShowingAsLowPriority_lowPriority() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); Assert.assertTrue(mChildrenContainer.showingAsLowPriority()); } @@ -129,7 +129,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test public void testShowingAsLowPriority_lowPriority_expanded() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); mGroup.setExpandable(true); mGroup.setUserExpanded(true, false); Assert.assertFalse(mChildrenContainer.showingAsLowPriority()); @@ -140,7 +140,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { mGroup.setUserLocked(true); mGroup.setExpandable(true); mGroup.setUserExpanded(true); - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); Assert.assertEquals(mChildrenContainer.getMaxAllowedVisibleChildren(), NotificationChildrenContainer.NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED); } @@ -148,14 +148,14 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test @DisableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME) public void testLowPriorityHeaderCleared() { - mGroup.setIsLowPriority(true); + mGroup.setIsMinimized(true); NotificationHeaderView lowPriorityHeaderView = - mChildrenContainer.getLowPriorityViewWrapper().getNotificationHeader(); + mChildrenContainer.getMinimizedGroupHeaderWrapper().getNotificationHeader(); Assert.assertEquals(View.VISIBLE, lowPriorityHeaderView.getVisibility()); Assert.assertSame(mChildrenContainer, lowPriorityHeaderView.getParent()); - mGroup.setIsLowPriority(false); + mGroup.setIsMinimized(false); assertNull(lowPriorityHeaderView.getParent()); - assertNull(mChildrenContainer.getLowPriorityViewWrapper()); + assertNull(mChildrenContainer.getMinimizedGroupHeaderWrapper()); } @Test @@ -169,7 +169,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test @EnableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME) public void testSetLowPriorityWithAsyncInflation_noHeaderReInflation() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); assertNull("We don't inflate header from the main thread with Async " + "Inflation enabled", mChildrenContainer.getCurrentHeaderView()); } @@ -179,21 +179,21 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { public void setLowPriorityBeforeLowPriorityHeaderSet() { //Given: the children container does not have a low-priority header, and is not low-priority - assertNull(mChildrenContainer.getLowPriorityViewWrapper()); - mGroup.setIsLowPriority(false); + assertNull(mChildrenContainer.getMinimizedGroupHeaderWrapper()); + mGroup.setIsMinimized(false); //When: set the children container to be low-priority and set the low-priority header - mGroup.setIsLowPriority(true); - mGroup.setLowPriorityGroupHeader(createHeaderView(/* lowPriorityHeader= */ true)); + mGroup.setIsMinimized(true); + mGroup.setMinimizedGroupHeader(createHeaderView(/* lowPriorityHeader= */ true)); //Then: the low-priority group header should be visible NotificationHeaderView lowPriorityHeaderView = - mChildrenContainer.getLowPriorityViewWrapper().getNotificationHeader(); + mChildrenContainer.getMinimizedGroupHeaderWrapper().getNotificationHeader(); Assert.assertEquals(View.VISIBLE, lowPriorityHeaderView.getVisibility()); Assert.assertSame(mChildrenContainer, lowPriorityHeaderView.getParent()); //When: set the children container to be not low-priority and set the normal header - mGroup.setIsLowPriority(false); + mGroup.setIsMinimized(false); mGroup.setGroupHeader(createHeaderView(/* lowPriorityHeader= */ false)); //Then: the low-priority group header should not be visible , normal header should be @@ -211,9 +211,9 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { public void changeLowPriorityAfterHeaderSet() { //Given: the children container does not have headers, and is not low-priority - assertNull(mChildrenContainer.getLowPriorityViewWrapper()); + assertNull(mChildrenContainer.getMinimizedGroupHeaderWrapper()); assertNull(mChildrenContainer.getNotificationHeaderWrapper()); - mGroup.setIsLowPriority(false); + mGroup.setIsMinimized(false); //When: set the set the normal header mGroup.setGroupHeader(createHeaderView(/* lowPriorityHeader= */ false)); @@ -225,14 +225,14 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { Assert.assertSame(mChildrenContainer, headerView.getParent()); //When: set the set the row to be low priority, and set the low-priority header - mGroup.setIsLowPriority(true); - mGroup.setLowPriorityGroupHeader(createHeaderView(/* lowPriorityHeader= */ true)); + mGroup.setIsMinimized(true); + mGroup.setMinimizedGroupHeader(createHeaderView(/* lowPriorityHeader= */ true)); //Then: the header view should not be visible, the low-priority group header should be // visible Assert.assertEquals(View.INVISIBLE, headerView.getVisibility()); NotificationHeaderView lowPriorityHeaderView = - mChildrenContainer.getLowPriorityViewWrapper().getNotificationHeader(); + mChildrenContainer.getMinimizedGroupHeaderWrapper().getNotificationHeader(); Assert.assertEquals(View.VISIBLE, lowPriorityHeaderView.getVisibility()); } @@ -263,7 +263,7 @@ public class NotificationChildrenContainerTest extends SysuiTestCase { @Test @DisableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME) public void applyRoundnessAndInvalidate_should_be_immediately_applied_on_headerLowPriority() { - mChildrenContainer.setIsLowPriority(true); + mChildrenContainer.setIsMinimized(true); NotificationHeaderViewWrapper header = mChildrenContainer.getNotificationHeaderWrapper(); Assert.assertEquals(0f, header.getTopRoundness(), 0.001f); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java index d5c40538586e..8e8dd4d91e8b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacksTest.java @@ -188,7 +188,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase { public void vibrateOnNavigationKeyDown_usesPerformHapticFeedback() { mSbcqCallbacks.vibrateOnNavigationKeyDown(); - verify(mShadeViewController).performHapticFeedback( + verify(mShadeController).performHapticFeedback( HapticFeedbackConstants.GESTURE_START ); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt index 7c36a85243a2..7a83cfe852d6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt @@ -19,7 +19,9 @@ package com.android.systemui.surfaceeffects.loadingeffect import android.graphics.Paint import android.graphics.RenderEffect import android.testing.AndroidTestingRunner +import android.testing.TestableLooper import androidx.test.filters.SmallTest +import com.android.systemui.animation.AnimatorTestRule import com.android.systemui.model.SysUiStateTest import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState.EASE_IN @@ -31,18 +33,17 @@ import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.RenderEffectDrawCallback import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseAnimationConfig import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader -import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @SmallTest @RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) class LoadingEffectTest : SysUiStateTest() { - private val fakeSystemClock = FakeSystemClock() - private val fakeExecutor = FakeExecutor(fakeSystemClock) + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Test fun play_paintCallback_triggersDrawCallback() { @@ -61,14 +62,12 @@ class LoadingEffectTest : SysUiStateTest() { animationStateChangedCallback = null ) - fakeExecutor.execute { - assertThat(paintFromCallback).isNull() + assertThat(paintFromCallback).isNull() - loadingEffect.play() - fakeSystemClock.advanceTime(500L) + loadingEffect.play() + animatorTestRule.advanceTimeBy(500L) - assertThat(paintFromCallback).isNotNull() - } + assertThat(paintFromCallback).isNotNull() } @Test @@ -88,25 +87,22 @@ class LoadingEffectTest : SysUiStateTest() { animationStateChangedCallback = null ) - fakeExecutor.execute { - assertThat(renderEffectFromCallback).isNull() + assertThat(renderEffectFromCallback).isNull() - loadingEffect.play() - fakeSystemClock.advanceTime(500L) + loadingEffect.play() + animatorTestRule.advanceTimeBy(500L) - assertThat(renderEffectFromCallback).isNotNull() - } + assertThat(renderEffectFromCallback).isNotNull() } @Test fun play_animationStateChangesInOrder() { val config = TurbulenceNoiseAnimationConfig() - val expectedStates = arrayOf(NOT_PLAYING, EASE_IN, MAIN, EASE_OUT, NOT_PLAYING) - val actualStates = mutableListOf(NOT_PLAYING) + val states = mutableListOf(NOT_PLAYING) val stateChangedCallback = object : AnimationStateChangedCallback { override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { - actualStates.add(newState) + states.add(newState) } } val drawCallback = @@ -121,16 +117,15 @@ class LoadingEffectTest : SysUiStateTest() { stateChangedCallback ) - val timeToAdvance = - config.easeInDuration + config.maxDuration + config.easeOutDuration + 100 + loadingEffect.play() - fakeExecutor.execute { - loadingEffect.play() + // Execute all the animators by advancing each duration with some buffer. + animatorTestRule.advanceTimeBy(config.easeInDuration.toLong()) + animatorTestRule.advanceTimeBy(config.maxDuration.toLong()) + animatorTestRule.advanceTimeBy(config.easeOutDuration.toLong()) + animatorTestRule.advanceTimeBy(500) - fakeSystemClock.advanceTime(timeToAdvance.toLong()) - - assertThat(actualStates).isEqualTo(expectedStates) - } + assertThat(states).containsExactly(NOT_PLAYING, EASE_IN, MAIN, EASE_OUT, NOT_PLAYING) } @Test @@ -157,17 +152,15 @@ class LoadingEffectTest : SysUiStateTest() { stateChangedCallback ) - fakeExecutor.execute { - assertThat(numPlay).isEqualTo(0) + assertThat(numPlay).isEqualTo(0) - loadingEffect.play() - loadingEffect.play() - loadingEffect.play() - loadingEffect.play() - loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() - assertThat(numPlay).isEqualTo(1) - } + assertThat(numPlay).isEqualTo(1) } @Test @@ -181,7 +174,7 @@ class LoadingEffectTest : SysUiStateTest() { val stateChangedCallback = object : AnimationStateChangedCallback { override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { - if (oldState == MAIN && newState == NOT_PLAYING) { + if (oldState == EASE_OUT && newState == NOT_PLAYING) { isFinished = true } } @@ -194,18 +187,17 @@ class LoadingEffectTest : SysUiStateTest() { stateChangedCallback ) - fakeExecutor.execute { - assertThat(isFinished).isFalse() + assertThat(isFinished).isFalse() - loadingEffect.play() - fakeSystemClock.advanceTime(config.easeInDuration.toLong() + 500L) + loadingEffect.play() + animatorTestRule.advanceTimeBy(config.easeInDuration.toLong() + 500L) - assertThat(isFinished).isFalse() + assertThat(isFinished).isFalse() - loadingEffect.finish() + loadingEffect.finish() + animatorTestRule.advanceTimeBy(config.easeOutDuration.toLong() + 500L) - assertThat(isFinished).isTrue() - } + assertThat(isFinished).isTrue() } @Test @@ -232,13 +224,11 @@ class LoadingEffectTest : SysUiStateTest() { stateChangedCallback ) - fakeExecutor.execute { - assertThat(isFinished).isFalse() + assertThat(isFinished).isFalse() - loadingEffect.finish() + loadingEffect.finish() - assertThat(isFinished).isFalse() - } + assertThat(isFinished).isFalse() } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShaderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShaderTest.kt index 549280a809e2..e62ca645d772 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShaderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShaderTest.kt @@ -20,6 +20,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE_FRACTAL +import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE_SPARKLE import org.junit.Test import org.junit.runner.RunWith @@ -38,4 +39,9 @@ class TurbulenceNoiseShaderTest : SysuiTestCase() { fun compilesFractalNoise() { turbulenceNoiseShader = TurbulenceNoiseShader(baseType = SIMPLEX_NOISE_FRACTAL) } + + @Test + fun compilesSparkleNoise() { + turbulenceNoiseShader = TurbulenceNoiseShader(baseType = SIMPLEX_NOISE_SPARKLE) + } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FacePropertyRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FacePropertyRepositoryKosmos.kt index 6ef74194fd85..ba07a849469d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FacePropertyRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FacePropertyRepositoryKosmos.kt @@ -19,4 +19,5 @@ package com.android.systemui.biometrics.data.repository import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture -val Kosmos.facePropertyRepository by Fixture { FakeFacePropertyRepository() } +val Kosmos.fakeFacePropertyRepository by Fixture { FakeFacePropertyRepository() } +val Kosmos.facePropertyRepository by Fixture { fakeFacePropertyRepository } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorKosmos.kt index 27803b22de29..c06554573bd7 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractorKosmos.kt @@ -16,7 +16,6 @@ package com.android.systemui.bouncer.domain.interactor -import android.content.applicationContext import com.android.systemui.authentication.domain.interactor.authenticationInteractor import com.android.systemui.bouncer.data.repository.bouncerRepository import com.android.systemui.classifier.domain.interactor.falsingInteractor @@ -29,12 +28,10 @@ import com.android.systemui.power.domain.interactor.powerInteractor val Kosmos.bouncerInteractor by Fixture { BouncerInteractor( applicationScope = testScope.backgroundScope, - applicationContext = applicationContext, repository = bouncerRepository, authenticationInteractor = authenticationInteractor, deviceEntryFaceAuthInteractor = deviceEntryFaceAuthInteractor, falsingInteractor = falsingInteractor, powerInteractor = powerInteractor, - simBouncerInteractor = simBouncerInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractorKosmos.kt index 8ed9f45bd1ba..02b79af15c05 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractorKosmos.kt @@ -38,7 +38,7 @@ val Kosmos.simBouncerInteractor by Fixture { telephonyManager = telephonyManager, resources = mainResources, keyguardUpdateMonitor = keyguardUpdateMonitor, - euiccManager = applicationContext.getSystemService(Context.EUICC_SERVICE) as EuiccManager, + euiccManager = applicationContext.getSystemService(Context.EUICC_SERVICE) as EuiccManager?, mobileConnectionsRepository = mobileConnectionsRepository, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelKosmos.kt new file mode 100644 index 000000000000..4b6441628500 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerMessageViewModelKosmos.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 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.bouncer.ui.viewmodel + +import android.content.applicationContext +import com.android.systemui.authentication.domain.interactor.authenticationInteractor +import com.android.systemui.bouncer.domain.interactor.bouncerInteractor +import com.android.systemui.bouncer.domain.interactor.simBouncerInteractor +import com.android.systemui.bouncer.shared.flag.composeBouncerFlags +import com.android.systemui.deviceentry.domain.interactor.biometricMessageInteractor +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFaceAuthInteractor +import com.android.systemui.deviceentry.domain.interactor.deviceEntryFingerprintAuthInteractor +import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.user.ui.viewmodel.userSwitcherViewModel +import com.android.systemui.util.time.systemClock +import kotlinx.coroutines.ExperimentalCoroutinesApi + +@ExperimentalCoroutinesApi +val Kosmos.bouncerMessageViewModel by + Kosmos.Fixture { + BouncerMessageViewModel( + applicationContext = applicationContext, + applicationScope = testScope.backgroundScope, + bouncerInteractor = bouncerInteractor, + simBouncerInteractor = simBouncerInteractor, + authenticationInteractor = authenticationInteractor, + selectedUser = userSwitcherViewModel.selectedUser, + clock = systemClock, + biometricMessageInteractor = biometricMessageInteractor, + faceAuthInteractor = deviceEntryFaceAuthInteractor, + deviceEntryInteractor = deviceEntryInteractor, + fingerprintInteractor = deviceEntryFingerprintAuthInteractor, + flags = composeBouncerFlags, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelKosmos.kt index 6d97238ba48b..0f6c7cf13211 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModelKosmos.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:OptIn(ExperimentalCoroutinesApi::class) + package com.android.systemui.bouncer.ui.viewmodel import android.content.applicationContext @@ -30,7 +32,7 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.user.domain.interactor.selectedUserInteractor import com.android.systemui.user.ui.viewmodel.userSwitcherViewModel import com.android.systemui.util.mockito.mock -import com.android.systemui.util.time.systemClock +import kotlinx.coroutines.ExperimentalCoroutinesApi val Kosmos.bouncerViewModel by Fixture { BouncerViewModel( @@ -47,7 +49,7 @@ val Kosmos.bouncerViewModel by Fixture { users = userSwitcherViewModel.users, userSwitcherMenu = userSwitcherViewModel.menu, actionButton = bouncerActionButtonInteractor.actionButton, - clock = systemClock, devicePolicyManager = mock(), + bouncerMessageViewModel = bouncerMessageViewModel, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/EmptyVibrator.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/EmptyVibrator.kt new file mode 100644 index 000000000000..875f6ed8d4a8 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/EmptyVibrator.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024 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.haptics + +import android.os.VibrationAttributes +import android.os.VibrationEffect +import android.os.Vibrator + +/** A simple empty vibrator required for the [FakeVibratorHelper] */ +class EmptyVibrator : Vibrator() { + override fun cancel() {} + + override fun cancel(usageFilter: Int) {} + + override fun hasAmplitudeControl(): Boolean = true + + override fun hasVibrator(): Boolean = true + + override fun vibrate( + uid: Int, + opPkg: String, + vibe: VibrationEffect, + reason: String, + attributes: VibrationAttributes, + ) {} +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/FakeVibratorHelper.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/FakeVibratorHelper.kt new file mode 100644 index 000000000000..4c0b132210f1 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/FakeVibratorHelper.kt @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2024 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.haptics + +import android.annotation.SuppressLint +import android.media.AudioAttributes +import android.os.VibrationAttributes +import android.os.VibrationEffect +import com.android.systemui.statusbar.VibratorHelper +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.time.FakeSystemClock + +/** A fake [VibratorHelper] that only keeps track of the latest vibration effects delivered */ +@SuppressLint("VisibleForTests") +class FakeVibratorHelper : VibratorHelper(EmptyVibrator(), FakeExecutor(FakeSystemClock())) { + + /** A customizable map of primitive ids and their durations in ms */ + val primitiveDurations: HashMap<Int, Int> = ALL_PRIMITIVE_DURATIONS + + private val vibrationEffectHistory = ArrayList<VibrationEffect>() + + val totalVibrations: Int + get() = vibrationEffectHistory.size + + override fun vibrate(effect: VibrationEffect) { + vibrationEffectHistory.add(effect) + } + + override fun vibrate(effect: VibrationEffect, attributes: VibrationAttributes) = vibrate(effect) + + override fun vibrate(effect: VibrationEffect, attributes: AudioAttributes) = vibrate(effect) + + override fun vibrate( + uid: Int, + opPkg: String?, + vibe: VibrationEffect, + reason: String?, + attributes: VibrationAttributes, + ) = vibrate(vibe) + + override fun getPrimitiveDurations(vararg primitiveIds: Int): IntArray = + primitiveIds.map { primitiveDurations[it] ?: 0 }.toIntArray() + + fun hasVibratedWithEffects(vararg effects: VibrationEffect): Boolean = + vibrationEffectHistory.containsAll(effects.toList()) + + fun timesVibratedWithEffect(effect: VibrationEffect): Int = + vibrationEffectHistory.count { it == effect } + + companion object { + val ALL_PRIMITIVE_DURATIONS = + hashMapOf( + VibrationEffect.Composition.PRIMITIVE_NOOP to 0, + VibrationEffect.Composition.PRIMITIVE_CLICK to 12, + VibrationEffect.Composition.PRIMITIVE_THUD to 300, + VibrationEffect.Composition.PRIMITIVE_SPIN to 133, + VibrationEffect.Composition.PRIMITIVE_QUICK_RISE to 150, + VibrationEffect.Composition.PRIMITIVE_SLOW_RISE to 500, + VibrationEffect.Composition.PRIMITIVE_QUICK_FALL to 100, + VibrationEffect.Composition.PRIMITIVE_TICK to 5, + VibrationEffect.Composition.PRIMITIVE_LOW_TICK to 12, + ) + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/VibratorHelperKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/VibratorHelperKosmos.kt new file mode 100644 index 000000000000..434953fb2f43 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/haptics/VibratorHelperKosmos.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 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.haptics + +import com.android.systemui.kosmos.Kosmos + +var Kosmos.vibratorHelper by Kosmos.Fixture { FakeVibratorHelper() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowKosmos.kt index dad1887cbd85..f7de5a4c20c7 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlowKosmos.kt @@ -23,11 +23,13 @@ import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInterac import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher import kotlinx.coroutines.ExperimentalCoroutinesApi val Kosmos.keyguardTransitionAnimationFlow by Fixture { KeyguardTransitionAnimationFlow( scope = applicationCoroutineScope, + mainDispatcher = testDispatcher, transitionInteractor = keyguardTransitionInteractor, logger = keyguardTransitionAnimationLogger, ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelKosmos.kt index 73fd9991945c..709f86426f94 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModelKosmos.kt @@ -25,6 +25,7 @@ import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInterac import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.systemui.kosmos.testScope import com.android.systemui.scene.shared.flag.sceneContainerFlags import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.phone.statusBarKeyguardViewManager @@ -50,5 +51,6 @@ val Kosmos.deviceEntryIconViewModel by Fixture { keyguardViewController = { statusBarKeyguardViewManager }, deviceEntryInteractor = deviceEntryInteractor, deviceEntrySourceInteractor = deviceEntrySourceInteractor, + scope = testScope.backgroundScope, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModelKosmos.kt new file mode 100644 index 000000000000..f389142554b1 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModelKosmos.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 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.keyguard.ui.viewmodel + +import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow +import com.android.systemui.kosmos.Kosmos +import kotlinx.coroutines.ExperimentalCoroutinesApi + +@ExperimentalCoroutinesApi +val Kosmos.dreamingToGoneTransitionViewModel by + Kosmos.Fixture { + DreamingToGoneTransitionViewModel( + animationFlow = keyguardTransitionAnimationFlow, + ) + }
\ No newline at end of file diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelKosmos.kt index a863edfc5198..a84899e0e6ab 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelKosmos.kt @@ -46,10 +46,12 @@ val Kosmos.keyguardRootViewModel by Fixture { dozingToGoneTransitionViewModel = dozingToGoneTransitionViewModel, dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel, dozingToOccludedTransitionViewModel = dozingToOccludedTransitionViewModel, + dreamingToGoneTransitionViewModel = dreamingToGoneTransitionViewModel, dreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel, glanceableHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel, goneToAodTransitionViewModel = goneToAodTransitionViewModel, goneToDozingTransitionViewModel = goneToDozingTransitionViewModel, + goneToDreamingTransitionViewModel = goneToDreamingTransitionViewModel, lockscreenToAodTransitionViewModel = lockscreenToAodTransitionViewModel, lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel, lockscreenToDreamingTransitionViewModel = lockscreenToDreamingTransitionViewModel, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelKosmos.kt index 85662512a5ee..370afc3b660b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModelKosmos.kt @@ -18,7 +18,6 @@ package com.android.systemui.keyguard.ui.viewmodel -import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture @@ -26,7 +25,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi val Kosmos.primaryBouncerToLockscreenTransitionViewModel by Fixture { PrimaryBouncerToLockscreenTransitionViewModel( - deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor, animationFlow = keyguardTransitionAnimationFlow, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryKosmos.kt new file mode 100644 index 000000000000..5c17cb95de84 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaDataRepositoryKosmos.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import com.android.systemui.dump.dumpManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.systemui.media.controls.util.mediaFlags + +val Kosmos.mediaDataRepository by Fixture { + MediaDataRepository(mediaFlags = mediaFlags, dumpManager = dumpManager) +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt new file mode 100644 index 000000000000..7ce810eb7818 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 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.media.controls.data.repository + +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaFilterRepository by Kosmos.Fixture { MediaFilterRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataCombineLatestKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataCombineLatestKosmos.kt new file mode 100644 index 000000000000..12a63250fcfc --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataCombineLatestKosmos.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaDataCombineLatest by Kosmos.Fixture { MediaDataCombineLatest() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterKosmos.kt new file mode 100644 index 000000000000..d56222ed45a4 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterKosmos.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.content.applicationContext +import com.android.systemui.broadcast.BroadcastSender +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.media.controls.data.repository.mediaFilterRepository +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.media.controls.util.mediaUiEventLogger +import com.android.systemui.settings.userTracker +import com.android.systemui.statusbar.notificationLockscreenUserManager +import com.android.systemui.util.time.systemClock +import com.android.systemui.util.wakelock.WakeLockFake + +val Kosmos.mediaDataFilter by + Kosmos.Fixture { + MediaDataFilterImpl( + context = applicationContext, + userTracker = userTracker, + broadcastSender = + BroadcastSender( + applicationContext, + WakeLockFake.Builder(applicationContext), + fakeExecutor + ), + lockscreenUserManager = notificationLockscreenUserManager, + executor = fakeExecutor, + systemClock = systemClock, + logger = mediaUiEventLogger, + mediaFlags = mediaFlags, + mediaFilterRepository = mediaFilterRepository, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt new file mode 100644 index 000000000000..cc1ad1fda6dd --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorKosmos.kt @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.app.smartspace.SmartspaceManager +import android.content.applicationContext +import android.os.fakeExecutorHandler +import com.android.keyguard.keyguardUpdateMonitor +import com.android.systemui.broadcast.broadcastDispatcher +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.dump.dumpManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.media.controls.data.repository.mediaDataRepository +import com.android.systemui.media.controls.shared.model.SmartspaceMediaDataProvider +import com.android.systemui.media.controls.util.mediaControllerFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.media.controls.util.mediaUiEventLogger +import com.android.systemui.plugins.activityStarter +import com.android.systemui.util.Utils +import com.android.systemui.util.settings.fakeSettings +import com.android.systemui.util.time.systemClock + +val Kosmos.mediaDataProcessor by + Kosmos.Fixture { + MediaDataProcessor( + context = applicationContext, + applicationScope = applicationCoroutineScope, + backgroundDispatcher = testDispatcher, + backgroundExecutor = fakeExecutor, + uiExecutor = fakeExecutor, + foregroundExecutor = fakeExecutor, + handler = fakeExecutorHandler, + mediaControllerFactory = mediaControllerFactory, + broadcastDispatcher = broadcastDispatcher, + dumpManager = dumpManager, + activityStarter = activityStarter, + smartspaceMediaDataProvider = SmartspaceMediaDataProvider(), + useMediaResumption = Utils.useMediaResumption(applicationContext), + useQsMediaPlayer = Utils.useQsMediaPlayer(applicationContext), + systemClock = systemClock, + secureSettings = fakeSettings, + mediaFlags = mediaFlags, + logger = mediaUiEventLogger, + smartspaceManager = SmartspaceManager(applicationContext), + keyguardUpdateMonitor = keyguardUpdateMonitor, + mediaDataRepository = mediaDataRepository, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt new file mode 100644 index 000000000000..b98f557c0c34 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerKosmos.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.content.applicationContext +import android.media.MediaRouter2Manager +import android.os.fakeExecutorHandler +import com.android.settingslib.bluetooth.LocalBluetoothManager +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.media.controls.util.localMediaManagerFactory +import com.android.systemui.media.controls.util.mediaControllerFactory +import com.android.systemui.media.muteawait.mediaMuteAwaitConnectionManagerFactory +import com.android.systemui.statusbar.policy.configurationController + +val Kosmos.mediaDeviceManager by + Kosmos.Fixture { + MediaDeviceManager( + context = applicationContext, + controllerFactory = mediaControllerFactory, + localMediaManagerFactory = localMediaManagerFactory, + mr2manager = { MediaRouter2Manager.getInstance(applicationContext) }, + muteAwaitConnectionManagerFactory = mediaMuteAwaitConnectionManagerFactory, + configurationController = configurationController, + localBluetoothManager = { + LocalBluetoothManager.create(applicationContext, fakeExecutorHandler) + }, + fgExecutor = fakeExecutor, + bgExecutor = fakeExecutor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaResumeListenerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaResumeListenerKosmos.kt new file mode 100644 index 000000000000..2a3e84b74369 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaResumeListenerKosmos.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.content.applicationContext +import com.android.systemui.broadcast.broadcastDispatcher +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.dump.dumpManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.media.controls.domain.resume.MediaResumeListener +import com.android.systemui.media.controls.domain.resume.resumeMediaBrowserFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.settings.userTracker +import com.android.systemui.tuner.TunerService +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.time.systemClock + +val Kosmos.mediaResumeListener by + Kosmos.Fixture { + MediaResumeListener( + context = applicationContext, + broadcastDispatcher = broadcastDispatcher, + userTracker = userTracker, + mainExecutor = fakeExecutor, + backgroundExecutor = fakeExecutor, + tunerService = mock<TunerService> {}, + mediaBrowserFactory = resumeMediaBrowserFactory, + dumpManager = dumpManager, + systemClock = systemClock, + mediaFlags = mediaFlags, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterKosmos.kt new file mode 100644 index 000000000000..9b02a5b10492 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterKosmos.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import android.content.applicationContext +import android.media.session.MediaSessionManager +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaSessionBasedFilter by + Kosmos.Fixture { + MediaSessionBasedFilter( + context = applicationContext, + sessionManager = MediaSessionManager(applicationContext), + foregroundExecutor = fakeExecutor, + backgroundExecutor = fakeExecutor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt new file mode 100644 index 000000000000..6ec6378e3bc2 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerKosmos.kt @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline + +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.media.controls.util.mediaControllerFactory +import com.android.systemui.media.controls.util.mediaFlags +import com.android.systemui.plugins.statusbar.statusBarStateController +import com.android.systemui.util.time.systemClock + +val Kosmos.mediaTimeoutListener by + Kosmos.Fixture { + MediaTimeoutListener( + mediaControllerFactory = mediaControllerFactory, + mainExecutor = fakeExecutor, + logger = MediaTimeoutLogger(logcatLogBuffer("MediaTimeoutLogBuffer")), + statusBarStateController = statusBarStateController, + systemClock = systemClock, + mediaFlags = mediaFlags, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractorKosmos.kt new file mode 100644 index 000000000000..e5e2affdc49a --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractorKosmos.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.pipeline.interactor + +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.media.controls.data.repository.mediaDataRepository +import com.android.systemui.media.controls.data.repository.mediaFilterRepository +import com.android.systemui.media.controls.domain.pipeline.mediaDataCombineLatest +import com.android.systemui.media.controls.domain.pipeline.mediaDataFilter +import com.android.systemui.media.controls.domain.pipeline.mediaDataProcessor +import com.android.systemui.media.controls.domain.pipeline.mediaDeviceManager +import com.android.systemui.media.controls.domain.pipeline.mediaResumeListener +import com.android.systemui.media.controls.domain.pipeline.mediaSessionBasedFilter +import com.android.systemui.media.controls.domain.pipeline.mediaTimeoutListener +import com.android.systemui.media.controls.util.mediaFlags + +val Kosmos.mediaCarouselInteractor by + Kosmos.Fixture { + MediaCarouselInteractor( + applicationScope = applicationCoroutineScope, + mediaDataRepository = mediaDataRepository, + mediaDataProcessor = mediaDataProcessor, + mediaTimeoutListener = mediaTimeoutListener, + mediaResumeListener = mediaResumeListener, + mediaSessionBasedFilter = mediaSessionBasedFilter, + mediaDeviceManager = mediaDeviceManager, + mediaDataCombineLatest = mediaDataCombineLatest, + mediaDataFilter = mediaDataFilter, + mediaFilterRepository = mediaFilterRepository, + mediaFlags = mediaFlags, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/MediaBrowserFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/MediaBrowserFactoryKosmos.kt new file mode 100644 index 000000000000..2621869786d0 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/MediaBrowserFactoryKosmos.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.resume + +import android.content.applicationContext +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaBrowserFactory by Kosmos.Fixture { MediaBrowserFactory(applicationContext) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/ResumeMediaBrowserFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/ResumeMediaBrowserFactoryKosmos.kt new file mode 100644 index 000000000000..ed720bd7d7ca --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/domain/resume/ResumeMediaBrowserFactoryKosmos.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 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.media.controls.domain.resume + +import android.content.applicationContext +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.log.logcatLogBuffer + +val Kosmos.resumeMediaBrowserFactory by + Kosmos.Fixture { + ResumeMediaBrowserFactory( + applicationContext, + mediaBrowserFactory, + ResumeMediaBrowserLogger(logcatLogBuffer("ResumeMediaLogBuffer")) + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/LocalMediaManagerFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/LocalMediaManagerFactoryKosmos.kt new file mode 100644 index 000000000000..2e0c9b848d1f --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/LocalMediaManagerFactoryKosmos.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 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.media.controls.util + +import android.content.applicationContext +import android.os.fakeExecutorHandler +import com.android.settingslib.bluetooth.LocalBluetoothManager +import com.android.systemui.kosmos.Kosmos + +val Kosmos.localMediaManagerFactory by + Kosmos.Fixture { + LocalMediaManagerFactory( + context = applicationContext, + localBluetoothManager = + LocalBluetoothManager.create(applicationContext, fakeExecutorHandler), + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt new file mode 100644 index 000000000000..1ce6e82f71d8 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaControllerFactoryKosmos.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 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.media.controls.util + +import android.content.applicationContext +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaControllerFactory by Kosmos.Fixture { MediaControllerFactory(applicationContext) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaFlagsKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaFlagsKosmos.kt new file mode 100644 index 000000000000..6f652f224975 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaFlagsKosmos.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 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.media.controls.util + +import com.android.systemui.flags.featureFlagsClassic +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.scene.shared.flag.sceneContainerFlags + +val Kosmos.mediaFlags by + Kosmos.Fixture { + MediaFlags(featureFlags = featureFlagsClassic, sceneContainerFlags = sceneContainerFlags) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaUiEventLoggerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaUiEventLoggerKosmos.kt new file mode 100644 index 000000000000..b01876d887bb --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/util/MediaUiEventLoggerKosmos.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 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.media.controls.util + +import com.android.internal.logging.uiEventLogger +import com.android.systemui.kosmos.Kosmos + +val Kosmos.mediaUiEventLogger by Kosmos.Fixture { MediaUiEventLogger(uiEventLogger) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactoryKosmos.kt new file mode 100644 index 000000000000..b78bd588869f --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactoryKosmos.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 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.media.muteawait + +import android.content.applicationContext +import com.android.systemui.concurrency.fakeExecutor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.log.logcatLogBuffer + +val Kosmos.mediaMuteAwaitConnectionManagerFactory by + Kosmos.Fixture { + MediaMuteAwaitConnectionManagerFactory( + context = applicationContext, + logger = MediaMuteAwaitLogger(logcatLogBuffer("MediaMuteAwaitLogBuffer")), + mainExecutor = fakeExecutor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt index f4acf4d8fb53..16c5b72a59e0 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeControllerKosmos.kt @@ -31,6 +31,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.NotificationShadeWindowController +import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.notification.row.NotificationGutsManager import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout import com.android.systemui.statusbar.notification.stack.ui.viewmodel.windowRootViewVisibilityInteractor @@ -52,6 +53,7 @@ val Kosmos.shadeControllerSceneImpl by notificationStackScrollLayout = mock<NotificationStackScrollLayout>(), deviceEntryInteractor = deviceEntryInteractor, touchLog = mock<LogBuffer>(), + vibratorHelper = mock<VibratorHelper>(), commandQueue = mock<CommandQueue>(), statusBarKeyguardViewManager = mock<StatusBarKeyguardViewManager>(), notificationShadeWindowController = mock<NotificationShadeWindowController>(), diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt index 546a1e019c6b..5605d1000f4e 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorKosmos.kt @@ -18,10 +18,12 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.notification.stack.data.repository.notificationStackAppearanceRepository val Kosmos.notificationStackAppearanceInteractor by Fixture { NotificationStackAppearanceInteractor( repository = notificationStackAppearanceRepository, + shadeInteractor = shadeInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelKosmos.kt index f1767ebb10d1..930a4bbb2daa 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelKosmos.kt @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.systemui.kosmos.testDispatcher import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.domain.interactor.remoteInputInteractor import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor @@ -42,5 +43,6 @@ val Kosmos.notificationListViewModel by Fixture { shadeInteractor, userSetupInteractor, zenModeInteractor, + testDispatcher, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaControllerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaControllerKosmos.kt new file mode 100644 index 000000000000..5db17243c4e3 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaControllerKosmos.kt @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2024 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.volume + +import android.content.packageManager +import android.content.pm.ApplicationInfo +import android.media.AudioAttributes +import android.media.session.MediaController +import android.media.session.MediaSession +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.whenever + +private const val LOCAL_PACKAGE = "local.test.pkg" +var Kosmos.localMediaController: MediaController by + Kosmos.Fixture { + val appInfo: ApplicationInfo = mock { + whenever(loadLabel(any())).thenReturn("local_media_controller_label") + } + whenever(packageManager.getApplicationInfo(eq(LOCAL_PACKAGE), any<Int>())) + .thenReturn(appInfo) + + val localSessionToken: MediaSession.Token = MediaSession.Token(0, mock {}) + mock { + whenever(packageName).thenReturn(LOCAL_PACKAGE) + whenever(playbackInfo) + .thenReturn( + MediaController.PlaybackInfo( + MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL, + 0, + 0, + 0, + AudioAttributes.Builder().build(), + "", + ) + ) + whenever(sessionToken).thenReturn(localSessionToken) + } + } + +private const val REMOTE_PACKAGE = "remote.test.pkg" +var Kosmos.remoteMediaController: MediaController by + Kosmos.Fixture { + val appInfo: ApplicationInfo = mock { + whenever(loadLabel(any())).thenReturn("remote_media_controller_label") + } + whenever(packageManager.getApplicationInfo(eq(REMOTE_PACKAGE), any<Int>())) + .thenReturn(appInfo) + + val remoteSessionToken: MediaSession.Token = MediaSession.Token(0, mock {}) + mock { + whenever(packageName).thenReturn(REMOTE_PACKAGE) + whenever(playbackInfo) + .thenReturn( + MediaController.PlaybackInfo( + MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE, + 0, + 0, + 0, + AudioAttributes.Builder().build(), + "", + ) + ) + whenever(sessionToken).thenReturn(remoteSessionToken) + } + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaOutputKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaOutputKosmos.kt index 3938f77b9c54..fa3a19bae655 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaOutputKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/MediaOutputKosmos.kt @@ -18,7 +18,6 @@ package com.android.systemui.volume import android.content.packageManager import android.content.pm.ApplicationInfo -import android.media.session.MediaController import android.os.Handler import android.testing.TestableLooper import com.android.systemui.kosmos.Kosmos @@ -32,11 +31,10 @@ import com.android.systemui.volume.data.repository.FakeLocalMediaRepository import com.android.systemui.volume.data.repository.FakeMediaControllerRepository import com.android.systemui.volume.panel.component.mediaoutput.data.repository.FakeLocalMediaRepositoryFactory import com.android.systemui.volume.panel.component.mediaoutput.data.repository.LocalMediaRepositoryFactory +import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaDeviceSessionInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputActionsInteractor import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor -var Kosmos.mediaController: MediaController by Kosmos.Fixture { mock {} } - val Kosmos.localMediaRepository by Kosmos.Fixture { FakeLocalMediaRepository() } val Kosmos.localMediaRepositoryFactory: LocalMediaRepositoryFactory by Kosmos.Fixture { FakeLocalMediaRepositoryFactory { localMediaRepository } } @@ -56,6 +54,14 @@ val Kosmos.mediaOutputInteractor by }, testScope.backgroundScope, testScope.testScheduler, + mediaControllerRepository, + ) + } + +val Kosmos.mediaDeviceSessionInteractor by + Kosmos.Fixture { + MediaDeviceSessionInteractor( + testScope.testScheduler, Handler(TestableLooper.get(testCase).looper), mediaControllerRepository, ) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeLocalMediaRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeLocalMediaRepository.kt index 284bd55f15d7..909be7507d34 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeLocalMediaRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeLocalMediaRepository.kt @@ -17,7 +17,6 @@ package com.android.systemui.volume.data.repository import com.android.settingslib.media.MediaDevice -import com.android.settingslib.volume.data.model.RoutingSession import com.android.settingslib.volume.data.repository.LocalMediaRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -25,35 +24,11 @@ import kotlinx.coroutines.flow.asStateFlow class FakeLocalMediaRepository : LocalMediaRepository { - private val volumeBySession: MutableMap<String?, Int> = mutableMapOf() - - private val mutableMediaDevices = MutableStateFlow<List<MediaDevice>>(emptyList()) - override val mediaDevices: StateFlow<List<MediaDevice>> - get() = mutableMediaDevices.asStateFlow() - private val mutableCurrentConnectedDevice = MutableStateFlow<MediaDevice?>(null) override val currentConnectedDevice: StateFlow<MediaDevice?> get() = mutableCurrentConnectedDevice.asStateFlow() - private val mutableRemoteRoutingSessions = MutableStateFlow<List<RoutingSession>>(emptyList()) - override val remoteRoutingSessions: StateFlow<List<RoutingSession>> - get() = mutableRemoteRoutingSessions.asStateFlow() - - fun updateMediaDevices(devices: List<MediaDevice>) { - mutableMediaDevices.value = devices - } - fun updateCurrentConnectedDevice(device: MediaDevice?) { mutableCurrentConnectedDevice.value = device } - - fun updateRemoteRoutingSessions(sessions: List<RoutingSession>) { - mutableRemoteRoutingSessions.value = sessions - } - - fun getSessionVolume(sessionId: String?): Int = volumeBySession.getOrDefault(sessionId, 0) - - override suspend fun adjustSessionVolume(sessionId: String?, volume: Int) { - volumeBySession[sessionId] = volume - } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeMediaControllerRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeMediaControllerRepository.kt index 6d52e525d238..8ab5bd903fdf 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeMediaControllerRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/data/repository/FakeMediaControllerRepository.kt @@ -24,11 +24,11 @@ import kotlinx.coroutines.flow.asStateFlow class FakeMediaControllerRepository : MediaControllerRepository { - private val mutableActiveLocalMediaController = MutableStateFlow<MediaController?>(null) - override val activeLocalMediaController: StateFlow<MediaController?> = - mutableActiveLocalMediaController.asStateFlow() + private val mutableActiveSessions = MutableStateFlow<List<MediaController>>(emptyList()) + override val activeSessions: StateFlow<List<MediaController>> + get() = mutableActiveSessions.asStateFlow() - fun setActiveLocalMediaController(controller: MediaController?) { - mutableActiveLocalMediaController.value = controller + fun setActiveSessions(sessions: List<MediaController>) { + mutableActiveSessions.value = sessions } } diff --git a/services/Android.bp b/services/Android.bp index 98a7979de30a..7bbb42e9a88f 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -253,6 +253,7 @@ java_library { required: [ "libukey2_jni_shared", + "protolog.conf.json.gz", ], lint: { baseline_filename: "lint-baseline.xml", diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 4e14dee8acba..880a68776055 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -993,6 +993,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub intent.getStringExtra(Intent.EXTRA_SETTING_PREVIOUS_VALUE), intent.getStringExtra(Intent.EXTRA_SETTING_NEW_VALUE)); } + } else if (Settings.Secure.ACCESSIBILITY_QS_TARGETS.equals(which)) { + if (!android.view.accessibility.Flags.a11yQsShortcut()) { + return; + } + restoreAccessibilityQsTargets( + intent.getStringExtra(Intent.EXTRA_SETTING_NEW_VALUE)); } } } @@ -2131,6 +2137,29 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub onUserStateChangedLocked(userState); } + /** + * User could configure accessibility shortcut during the SUW before restoring user data. + * Merges the current value and the new value to make sure we don't lost the setting the user's + * preferences of accessibility qs shortcut updated in SUW are not lost. + * + * Called only during settings restore; currently supports only the owner user + * TODO: http://b/22388012 + */ + private void restoreAccessibilityQsTargets(String newValue) { + synchronized (mLock) { + final AccessibilityUserState userState = getUserStateLocked(UserHandle.USER_SYSTEM); + final Set<String> mergedTargets = userState.getA11yQsTargets(); + readColonDelimitedStringToSet(newValue, str -> str, mergedTargets, + /* doMerge = */ true); + + userState.updateA11yQsTargetLocked(mergedTargets); + persistColonDelimitedSetToSettingLocked(Settings.Secure.ACCESSIBILITY_QS_TARGETS, + UserHandle.USER_SYSTEM, mergedTargets, str -> str); + scheduleNotifyClientsOfServicesStateChangeLocked(userState); + onUserStateChangedLocked(userState); + } + } + private int getClientStateLocked(AccessibilityUserState userState) { return userState.getClientStateLocked( mUiAutomationManager.canIntrospect(), diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java index 9a1d3793e447..7008e8e0f0ba 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java @@ -112,6 +112,10 @@ class AccessibilityUserState { * TileService's or the a11y framework tile component names (e.g. * {@link AccessibilityShortcutController#COLOR_INVERSION_TILE_COMPONENT_NAME}) instead of the * A11y Feature's component names. + * <p/> + * In addition, {@link #mA11yTilesInQsPanel} stores what's on the QS Panel, whereas + * {@link #mAccessibilityQsTargets} stores the targets that configured qs as their shortcut and + * also grant full device control permission. */ private final ArraySet<ComponentName> mA11yTilesInQsPanel = new ArraySet<>(); diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index e4f1d3acce6d..07fcb5042cbc 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -718,7 +718,9 @@ public final class AutofillManagerService + ", mPccUseFallbackDetection=" + mPccUseFallbackDetection + ", mPccProviderHints=" + mPccProviderHints + ", mAutofillCredmanIntegrationEnabled=" - + mAutofillCredmanIntegrationEnabled); + + mAutofillCredmanIntegrationEnabled + + ", mIsFillFieldsFromCurrentSessionOnly=" + + mIsFillFieldsFromCurrentSessionOnly); } } } diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index e1291e5f75ec..14a331c6ffe0 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -1672,9 +1672,10 @@ final class AutofillManagerServiceImpl @Override // from InlineSuggestionRenderCallbacksImpl public void onServiceDied(@NonNull RemoteInlineSuggestionRenderService service) { - // Don't do anything; eventually the system will bind to it again... Slog.w(TAG, "remote service died: " + service); - mRemoteInlineSuggestionRenderService = null; + synchronized (mLock) { + resetExtServiceLocked(); + } } } diff --git a/services/core/Android.bp b/services/core/Android.bp index d1d7ee7ba0e4..7f5867fb1a74 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -242,6 +242,7 @@ java_library_static { "apache-commons-math", "backstage_power_flags_lib", "notification_flags_lib", + "power_hint_flags_lib", "biometrics_flags_lib", "am_flags_lib", "com_android_server_accessibility_flags_lib", diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 08093c0c037f..e64a87f3966b 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -45,7 +45,6 @@ import android.util.SparseArray; import com.android.internal.pm.pkg.component.ParsedMainComponent; import com.android.internal.util.function.pooled.PooledLambda; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.KnownPackages; import com.android.server.pm.PackageArchiver; import com.android.server.pm.PackageList; @@ -1396,21 +1395,6 @@ public abstract class PackageManagerInternal { @UserIdInt int userId, @Nullable String recentCallingPackage, @NonNull String debugInfo); - /** @deprecated For legacy shell command only. */ - @Deprecated - public abstract void legacyDumpProfiles(@NonNull String packageName, - boolean dumpClassesAndMethods) throws LegacyDexoptDisabledException; - - /** @deprecated For legacy shell command only. */ - @Deprecated - public abstract void legacyForceDexOpt(@NonNull String packageName) - throws LegacyDexoptDisabledException; - - /** @deprecated For legacy shell command only. */ - @Deprecated - public abstract void legacyReconcileSecondaryDexFiles(String packageName) - throws LegacyDexoptDisabledException; - /** * Gets {@link PackageManager.DistractionRestriction restrictions} of the given * packages of the given user. diff --git a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java index ecd14ce67d7e..cc4094092572 100644 --- a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java +++ b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java @@ -77,23 +77,24 @@ public final class SensitiveContentProtectionManagerService extends SystemServic @Override public void onStart(MediaProjectionInfo info) { if (DEBUG) Log.d(TAG, "onStart projection: " + info); - Trace.beginSection( + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "SensitiveContentProtectionManagerService.onProjectionStart"); try { onProjectionStart(info.getPackageName()); } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } @Override public void onStop(MediaProjectionInfo info) { if (DEBUG) Log.d(TAG, "onStop projection: " + info); - Trace.beginSection("SensitiveContentProtectionManagerService.onProjectionStop"); + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, + "SensitiveContentProtectionManagerService.onProjectionStop"); try { onProjectionEnd(); } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } }; @@ -285,7 +286,8 @@ public final class SensitiveContentProtectionManagerService extends SystemServic @Override public void onListenerConnected() { super.onListenerConnected(); - Trace.beginSection("SensitiveContentProtectionManagerService.onListenerConnected"); + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, + "SensitiveContentProtectionManagerService.onListenerConnected"); try { // Projection started before notification listener was connected synchronized (mSensitiveContentProtectionLock) { @@ -294,14 +296,15 @@ public final class SensitiveContentProtectionManagerService extends SystemServic } } } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } @Override public void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap) { super.onNotificationPosted(sbn, rankingMap); - Trace.beginSection("SensitiveContentProtectionManagerService.onNotificationPosted"); + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, + "SensitiveContentProtectionManagerService.onNotificationPosted"); try { synchronized (mSensitiveContentProtectionLock) { if (!mProjectionActive) { @@ -317,14 +320,14 @@ public final class SensitiveContentProtectionManagerService extends SystemServic } } } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } @Override public void onNotificationRankingUpdate(RankingMap rankingMap) { super.onNotificationRankingUpdate(rankingMap); - Trace.beginSection( + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "SensitiveContentProtectionManagerService.onNotificationRankingUpdate"); try { synchronized (mSensitiveContentProtectionLock) { @@ -333,7 +336,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic } } } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } } @@ -382,7 +385,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic public void setSensitiveContentProtection(IBinder windowToken, String packageName, boolean isShowingSensitiveContent) { - Trace.beginSection( + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "SensitiveContentProtectionManagerService.setSensitiveContentProtection"); try { int callingUid = Binder.getCallingUid(); @@ -395,7 +398,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic Binder.restoreCallingIdentity(identity); } } finally { - Trace.endSection(); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 4ebabdc4cc66..5a97e87f53f7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -1164,8 +1164,7 @@ final class ActivityManagerShellCommand extends ShellCommand { synchronized (mInternal) { synchronized (mInternal.mProcLock) { app.mOptRecord.setFreezeSticky(isSticky); - mInternal.mOomAdjuster.mCachedAppOptimizer.freezeAppAsyncInternalLSP( - app, 0 /* delayMillis */, true /* force */, false /* immediate */); + mInternal.mOomAdjuster.mCachedAppOptimizer.forceFreezeAppAsyncLSP(app); } } return 0; diff --git a/services/core/java/com/android/server/am/BroadcastSkipPolicy.java b/services/core/java/com/android/server/am/BroadcastSkipPolicy.java index 66abb4238726..b8ef03f36c23 100644 --- a/services/core/java/com/android/server/am/BroadcastSkipPolicy.java +++ b/services/core/java/com/android/server/am/BroadcastSkipPolicy.java @@ -19,6 +19,7 @@ package com.android.server.am; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PERMISSIONS_REVIEW; import static com.android.server.am.ActivityManagerService.checkComponentPermission; import static com.android.server.am.BroadcastQueue.TAG; +import static com.android.server.am.Flags.usePermissionManagerForBroadcastDeliveryCheck; import android.annotation.NonNull; import android.annotation.Nullable; @@ -27,6 +28,7 @@ import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.BroadcastOptions; import android.app.PendingIntent; +import android.content.AttributionSource; import android.content.ComponentName; import android.content.IIntentSender; import android.content.Intent; @@ -39,6 +41,7 @@ import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; import android.permission.IPermissionManager; +import android.permission.PermissionManager; import android.util.Slog; import com.android.internal.util.ArrayUtils; @@ -54,6 +57,9 @@ import java.util.Objects; public class BroadcastSkipPolicy { private final ActivityManagerService mService; + @Nullable + private PermissionManager mPermissionManager; + public BroadcastSkipPolicy(@NonNull ActivityManagerService service) { mService = Objects.requireNonNull(service); } @@ -283,14 +289,35 @@ public class BroadcastSkipPolicy { if (info.activityInfo.applicationInfo.uid != Process.SYSTEM_UID && r.requiredPermissions != null && r.requiredPermissions.length > 0) { + final AttributionSource attributionSource; + if (usePermissionManagerForBroadcastDeliveryCheck()) { + attributionSource = + new AttributionSource.Builder(info.activityInfo.applicationInfo.uid) + .setPackageName(info.activityInfo.packageName) + .build(); + } else { + attributionSource = null; + } for (int i = 0; i < r.requiredPermissions.length; i++) { String requiredPermission = r.requiredPermissions[i]; try { - perm = AppGlobals.getPackageManager(). - checkPermission(requiredPermission, - info.activityInfo.applicationInfo.packageName, - UserHandle - .getUserId(info.activityInfo.applicationInfo.uid)); + if (usePermissionManagerForBroadcastDeliveryCheck()) { + final PermissionManager permissionManager = getPermissionManager(); + if (permissionManager != null) { + perm = permissionManager.checkPermissionForDataDelivery( + requiredPermission, attributionSource, null /* message */); + } else { + // Assume permission denial if PermissionManager is not yet available. + perm = PackageManager.PERMISSION_DENIED; + } + } else { + perm = AppGlobals.getPackageManager() + .checkPermission( + requiredPermission, + info.activityInfo.applicationInfo.packageName, + UserHandle + .getUserId(info.activityInfo.applicationInfo.uid)); + } } catch (RemoteException e) { perm = PackageManager.PERMISSION_DENIED; } @@ -302,11 +329,13 @@ public class BroadcastSkipPolicy { + " due to sender " + r.callerPackage + " (uid " + r.callingUid + ")"; } - int appOp = AppOpsManager.permissionToOpCode(requiredPermission); - if (appOp != AppOpsManager.OP_NONE && appOp != r.appOp) { - if (!noteOpForManifestReceiver(appOp, r, info, component)) { - return "Skipping delivery to " + info.activityInfo.packageName - + " due to required appop " + appOp; + if (!usePermissionManagerForBroadcastDeliveryCheck()) { + int appOp = AppOpsManager.permissionToOpCode(requiredPermission); + if (appOp != AppOpsManager.OP_NONE && appOp != r.appOp) { + if (!noteOpForManifestReceiver(appOp, r, info, component)) { + return "Skipping delivery to " + info.activityInfo.packageName + + " due to required appop " + appOp; + } } } } @@ -694,4 +723,11 @@ public class BroadcastSkipPolicy { return false; } + + private PermissionManager getPermissionManager() { + if (mPermissionManager == null) { + mPermissionManager = mService.mContext.getSystemService(PermissionManager.class); + } + return mPermissionManager; + } } diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 0cf557588958..6e20f6cc877d 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -1414,8 +1414,13 @@ public final class CachedAppOptimizer { } @GuardedBy({"mAm", "mProcLock"}) + void forceFreezeAppAsyncLSP(ProcessRecord app) { + freezeAppAsyncInternalLSP(app, 0 /* delayMillis */, true /* force */); + } + + @GuardedBy({"mAm", "mProcLock"}) private void freezeAppAsyncLSP(ProcessRecord app, @UptimeMillisLong long delayMillis) { - freezeAppAsyncInternalLSP(app, delayMillis, false, false); + freezeAppAsyncInternalLSP(app, delayMillis, false /* force */); } @GuardedBy({"mAm", "mProcLock"}) @@ -1427,17 +1432,18 @@ public final class CachedAppOptimizer { // and remove this method. @GuardedBy({"mAm", "mProcLock"}) void freezeAppAsyncImmediateLSP(ProcessRecord app) { - freezeAppAsyncInternalLSP(app, 0, false, true); + freezeAppAsyncInternalLSP(app, 0 /* delayMillis */, false /* force */); } - // TODO: Update this method to be private and have the existing clients call different methods. - // This "internal" method should not be directly triggered by clients outside this class. @GuardedBy({"mAm", "mProcLock"}) - void freezeAppAsyncInternalLSP(ProcessRecord app, @UptimeMillisLong long delayMillis, - boolean force, boolean immediate) { + private void freezeAppAsyncInternalLSP(ProcessRecord app, @UptimeMillisLong long delayMillis, + boolean force) { final ProcessCachedOptimizerRecord opt = app.mOptRecord; if (opt.isPendingFreeze()) { - if (immediate) { + if (delayMillis == 0) { + // Caller is requesting to freeze the process without delay, so remove + // any already posted messages which would have been handled with a delay and + // post a new message without a delay. mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app); mFreezeHandler.sendMessage(mFreezeHandler.obtainMessage( SET_FROZEN_PROCESS_MSG, DO_FREEZE, 0, app)); diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 7df5fdd282c3..48d3c09290ce 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -127,6 +127,7 @@ public class SettingsToPropertiesMapper { "avic", "bluetooth", "brownout_mitigation_audio", + "brownout_mitigation_modem", "build", "biometrics", "biometrics_framework", @@ -168,6 +169,7 @@ public class SettingsToPropertiesMapper { "pixel_biometrics_face", "pixel_bluetooth", "pixel_connectivity_gps", + "pixel_sensors", "pixel_system_sw_video", "pixel_watch", "platform_compat", diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 70d447fce18a..a91790936931 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -276,7 +276,15 @@ class UserController implements Handler.Callback { private final SparseArray<UserState> mStartedUsers = new SparseArray<>(); /** - * LRU list of history of current users. Most recently current is at the end. + * LRU list of history of running users, in order of when we last needed to start them. + * + * Switching to a user will move it towards the end. Attempting to start a user/profile (even + * if it was already running) will move it towards the end. + * + * <p>Guarantees (by the end of startUser): + * <li>The current user will always be at the end, even if background users were started + * subsequently. + * <li>Parents always come later than (but not necessarily adjacent to) their profiles. */ @GuardedBy("mLock") private final ArrayList<Integer> mUserLru = new ArrayList<>(); @@ -299,6 +307,9 @@ class UserController implements Handler.Callback { /** * Mapping from each known user ID to the profile group ID it is associated with. * <p>Users not present in this array have a profile group of NO_PROFILE_GROUP_ID. + * + * <p>For better or worse, this class sometimes assumes that the profileGroupId of a parent user + * is always identical with its userId. If that ever becomes false, this class needs updating. */ @GuardedBy("mLock") private final SparseIntArray mUserProfileGroupIds = new SparseIntArray(); @@ -499,6 +510,23 @@ class UserController implements Handler.Callback { }); } + /** Adds a user to mUserLru, moving it to the end of the list if it was already present. */ + private void addUserToUserLru(@UserIdInt int userId) { + synchronized (mLock) { + final Integer userIdObj = userId; + mUserLru.remove(userIdObj); + mUserLru.add(userIdObj); + + // Now also move the user's parent to the end (if applicable). + Integer parentIdObj = mUserProfileGroupIds.get(userId, UserInfo.NO_PROFILE_GROUP_ID); + if (parentIdObj != UserInfo.NO_PROFILE_GROUP_ID && !parentIdObj.equals(userIdObj) + && mUserLru.remove(parentIdObj)) { + mUserLru.add(parentIdObj); + } + } + } + + /** Returns a list of running users, in order of when they were started (oldest first). */ @GuardedBy("mLock") @VisibleForTesting List<Integer> getRunningUsersLU() { @@ -536,9 +564,9 @@ class UserController implements Handler.Callback { @GuardedBy("mLock") private void stopExcessRunningUsersLU(int maxRunningUsers, ArraySet<Integer> exemptedUsers) { - List<Integer> currentlyRunning = getRunningUsersLU(); - Iterator<Integer> iterator = currentlyRunning.iterator(); - while (currentlyRunning.size() > maxRunningUsers && iterator.hasNext()) { + List<Integer> currentlyRunningLru = getRunningUsersLU(); + Iterator<Integer> iterator = currentlyRunningLru.iterator(); + while (currentlyRunningLru.size() > maxRunningUsers && iterator.hasNext()) { Integer userId = iterator.next(); if (userId == UserHandle.USER_SYSTEM || userId == mCurrentUserId @@ -551,6 +579,10 @@ class UserController implements Handler.Callback { if (stopUsersLU(userId, /* force= */ false, /* allowDelayedLocking= */ true, /* stopUserCallback= */ null, /* keyEvictedCallback= */ null) == USER_OP_SUCCESS) { + // Technically, stopUsersLU can remove more than one user when stopping a parent. + // But mUserLru is designed so that profiles always precede their parent, so this + // normally won't happen here, and therefore won't cause underestimating the number + // removed. iterator.remove(); } } @@ -947,7 +979,7 @@ class UserController implements Handler.Callback { } /** - * Stops the user along with its related users. The method calls + * Stops the user along with its profiles. The method calls * {@link #getUsersToStopLU(int)} to determine the list of users that should be stopped. */ @GuardedBy("mLock") @@ -992,7 +1024,12 @@ class UserController implements Handler.Callback { } /** - * Stops a single User. This can also trigger locking user data out depending on device's + * Stops a single User. + * + * This should only ever be called by {@link #stopUsersLU}, + * which is responsible to making sure any associated users are appropriately stopped too. + * + * This can also trigger locking user data out depending on device's * config ({@code mDelayUserDataLocking}) and arguments. * * In the default configuration for most device and users, users will be locked when stopping. @@ -1425,7 +1462,8 @@ class UserController implements Handler.Callback { /** * Determines the list of users that should be stopped together with the specified - * {@code userId}. The returned list includes {@code userId}. + * {@code userId}, i.e. the user and its profiles (if the given user is a parent). + * The returned list includes {@code userId}. */ @GuardedBy("mLock") private @NonNull int[] getUsersToStopLU(@UserIdInt int userId) { @@ -1433,20 +1471,23 @@ class UserController implements Handler.Callback { IntArray userIds = new IntArray(); userIds.add(userId); int userGroupId = mUserProfileGroupIds.get(userId, UserInfo.NO_PROFILE_GROUP_ID); - for (int i = 0; i < startedUsersSize; i++) { - UserState uss = mStartedUsers.valueAt(i); - int startedUserId = uss.mHandle.getIdentifier(); - // Skip unrelated users (profileGroupId mismatch) - int startedUserGroupId = mUserProfileGroupIds.get(startedUserId, - UserInfo.NO_PROFILE_GROUP_ID); - boolean sameGroup = (userGroupId != UserInfo.NO_PROFILE_GROUP_ID) - && (userGroupId == startedUserGroupId); - // userId has already been added - boolean sameUserId = startedUserId == userId; - if (!sameGroup || sameUserId) { - continue; + if (userGroupId == userId) { + // The user is the parent of the profile group. Stop its profiles too. + for (int i = 0; i < startedUsersSize; i++) { + UserState uss = mStartedUsers.valueAt(i); + int startedUserId = uss.mHandle.getIdentifier(); + // Skip unrelated users (profileGroupId mismatch) + int startedUserGroupId = mUserProfileGroupIds.get(startedUserId, + UserInfo.NO_PROFILE_GROUP_ID); + boolean sameGroup = (userGroupId != UserInfo.NO_PROFILE_GROUP_ID) + && (userGroupId == startedUserGroupId); + // userId has already been added + boolean sameUserId = startedUserId == userId; + if (!sameGroup || sameUserId) { + continue; + } + userIds.add(startedUserId); } - userIds.add(startedUserId); } return userIds.toArray(); } @@ -1519,6 +1560,7 @@ class UserController implements Handler.Callback { }); } + /** Starts all applicable profiles of the current user. */ private void startProfiles() { int currentUserId = getCurrentUserId(); if (DEBUG_MU) Slogf.i(TAG, "startProfilesLocked"); @@ -1711,6 +1753,7 @@ class UserController implements Handler.Callback { t.traceBegin("getStartedUserState"); final int oldUserId = getCurrentUserId(); if (oldUserId == userId) { + // The user we're requested to start is already the current user. final UserState state = getStartedUserState(userId); if (state == null) { Slogf.wtf(TAG, "Current user has no UserState"); @@ -1793,10 +1836,12 @@ class UserController implements Handler.Callback { t.traceEnd(); // updateStartedUserArrayStarting return true; } - final Integer userIdInt = userId; - mUserLru.remove(userIdInt); - mUserLru.add(userIdInt); } + + // No matter what, the fact that we're requested to start the user (even if it is + // already running) puts it towards the end of the mUserLru list. + addUserToUserLru(userId); + if (unlockListener != null) { uss.mUnlockProgress.addListener(unlockListener); } @@ -1835,12 +1880,10 @@ class UserController implements Handler.Callback { } } else { - final Integer currentUserIdInt = mCurrentUserId; updateProfileRelatedCaches(); - synchronized (mLock) { - mUserLru.remove(currentUserIdInt); - mUserLru.add(currentUserIdInt); - } + // We are starting a non-foreground user. They have already been added to the end + // of mUserLru, so we need to ensure that the foreground user isn't displaced. + addUserToUserLru(mCurrentUserId); } t.traceEnd(); diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig index 0209944f9fd0..fd847f11157f 100644 --- a/services/core/java/com/android/server/am/flags.aconfig +++ b/services/core/java/com/android/server/am/flags.aconfig @@ -86,3 +86,11 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + namespace: "backstage_power" + name: "use_permission_manager_for_broadcast_delivery_check" + description: "Use PermissionManager API for broadcast delivery permission checks." + bug: "315468967" + is_fixed_read_only: true +} diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index e8c05c6d9899..de000bf64c38 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -73,6 +73,7 @@ import android.app.role.RoleManager; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHeadset; import android.bluetooth.BluetoothProfile; +import android.content.AttributionSource; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -12207,7 +12208,9 @@ public class AudioService extends IAudioService.Stub //========================================================================================== public String registerAudioPolicy(AudioPolicyConfig policyConfig, IAudioPolicyCallback pcb, boolean hasFocusListener, boolean isFocusPolicy, boolean isTestFocusPolicy, - boolean isVolumeController, IMediaProjection projection) { + boolean isVolumeController, IMediaProjection projection, + AttributionSource attributionSource) { + Objects.requireNonNull(attributionSource); AudioSystem.setDynamicPolicyCallback(mDynPolicyCallback); if (!isPolicyRegisterAllowed(policyConfig, @@ -12228,7 +12231,8 @@ public class AudioService extends IAudioService.Stub } try { AudioPolicyProxy app = new AudioPolicyProxy(policyConfig, pcb, hasFocusListener, - isFocusPolicy, isTestFocusPolicy, isVolumeController, projection); + isFocusPolicy, isTestFocusPolicy, isVolumeController, projection, + attributionSource); pcb.asBinder().linkToDeath(app, 0/*flags*/); // logging after registration so we have the registration id @@ -13200,6 +13204,7 @@ public class AudioService extends IAudioService.Stub public class AudioPolicyProxy extends AudioPolicyConfig implements IBinder.DeathRecipient { private static final String TAG = "AudioPolicyProxy"; final IAudioPolicyCallback mPolicyCallback; + final AttributionSource mAttributionSource; final boolean mHasFocusListener; final boolean mIsVolumeController; final HashMap<Integer, AudioDeviceArray> mUidDeviceAffinities = @@ -13239,10 +13244,12 @@ public class AudioService extends IAudioService.Stub AudioPolicyProxy(AudioPolicyConfig config, IAudioPolicyCallback token, boolean hasFocusListener, boolean isFocusPolicy, boolean isTestFocusPolicy, - boolean isVolumeController, IMediaProjection projection) { + boolean isVolumeController, IMediaProjection projection, + AttributionSource attributionSource) { super(config); setRegistration(new String(config.hashCode() + ":ap:" + mAudioPolicyCounter++)); mPolicyCallback = token; + mAttributionSource = attributionSource; mHasFocusListener = hasFocusListener; mIsVolumeController = isVolumeController; mProjection = projection; @@ -13370,6 +13377,7 @@ public class AudioService extends IAudioService.Stub if (android.media.audiopolicy.Flags.audioMixOwnership()) { for (AudioMix mix : mixes) { setMixRegistration(mix); + mix.setVirtualDeviceId(mAttributionSource.getDeviceId()); } int result = mAudioSystem.registerPolicyMixes(mixes, true); @@ -13393,6 +13401,9 @@ public class AudioService extends IAudioService.Stub @AudioSystem.AudioSystemError int connectMixes() { final long identity = Binder.clearCallingIdentity(); try { + for (AudioMix mix : mMixes) { + mix.setVirtualDeviceId(mAttributionSource.getDeviceId()); + } return mAudioSystem.registerPolicyMixes(mMixes, true); } finally { Binder.restoreCallingIdentity(identity); @@ -13406,6 +13417,9 @@ public class AudioService extends IAudioService.Stub Objects.requireNonNull(mixesToUpdate); Objects.requireNonNull(updatedMixingRules); + for (AudioMix mix : mixesToUpdate) { + mix.setVirtualDeviceId(mAttributionSource.getDeviceId()); + } if (mixesToUpdate.length != updatedMixingRules.length) { Log.e(TAG, "Provided list of audio mixes to update and corresponding mixing rules " + "have mismatching length (mixesToUpdate.length = " + mixesToUpdate.length diff --git a/services/core/java/com/android/server/broadcastradio/aidl/BroadcastRadioServiceImpl.java b/services/core/java/com/android/server/broadcastradio/aidl/BroadcastRadioServiceImpl.java index d93ff9dac91f..086f3aa8ad65 100644 --- a/services/core/java/com/android/server/broadcastradio/aidl/BroadcastRadioServiceImpl.java +++ b/services/core/java/com/android/server/broadcastradio/aidl/BroadcastRadioServiceImpl.java @@ -138,7 +138,9 @@ public final class BroadcastRadioServiceImpl { /** * Constructs BroadcastRadioServiceImpl using AIDL HAL using the list of names of AIDL - * BroadcastRadio HAL services {@code serviceNameList} + * BroadcastRadio HAL services + * + * @param serviceNameList list of names of AIDL BroadcastRadio HAL services */ public BroadcastRadioServiceImpl(ArrayList<String> serviceNameList) { mNextModuleId = 0; @@ -169,7 +171,11 @@ public final class BroadcastRadioServiceImpl { } /** - * Gets the AIDL RadioModule for the given {@code moduleId}. Null will be returned if not found. + * Gets the AIDL RadioModule for the given module Id. + * + * @param id Id of {@link RadioModule} of AIDL BroadcastRadio HAL service + * @return {@code true} if {@link RadioModule} of AIDL BroadcastRadio HAL service is found, + * {@code false} otherwise */ public boolean hasModule(int id) { synchronized (mLock) { diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index b7ece2ea65b1..5905b7de5b6e 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -366,7 +366,6 @@ public class Vpn { private PendingIntent mStatusIntent; private volatile boolean mEnableTeardown = true; - private final INetworkManagementService mNms; private final INetd mNetd; @VisibleForTesting @GuardedBy("this") @@ -626,7 +625,6 @@ public class Vpn { mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class); mDeps = deps; - mNms = netService; mNetd = netd; mUserId = userId; mLooper = looper; diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 40325146ca25..4aab9d26dbcb 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -54,6 +54,7 @@ import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.os.BackgroundThread; import com.android.server.EventLogTags; import com.android.server.display.brightness.BrightnessEvent; +import com.android.server.display.brightness.clamper.BrightnessClamperController; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -252,6 +253,7 @@ public class AutomaticBrightnessController { // Controls Brightness range (including High Brightness Mode). private final BrightnessRangeController mBrightnessRangeController; + private final BrightnessClamperController mBrightnessClamperController; // Throttles (caps) maximum allowed brightness private final BrightnessThrottler mBrightnessThrottler; @@ -287,7 +289,8 @@ public class AutomaticBrightnessController { HysteresisLevels screenBrightnessThresholdsIdle, Context context, BrightnessRangeController brightnessModeController, BrightnessThrottler brightnessThrottler, int ambientLightHorizonShort, - int ambientLightHorizonLong, float userLux, float userNits) { + int ambientLightHorizonLong, float userLux, float userNits, + BrightnessClamperController brightnessClamperController) { this(new Injector(), callbacks, looper, sensorManager, lightSensor, brightnessMappingStrategyMap, lightSensorWarmUpTime, brightnessMin, brightnessMax, dozeScaleFactor, lightSensorRate, initialLightSensorRate, @@ -297,7 +300,7 @@ public class AutomaticBrightnessController { screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, context, brightnessModeController, brightnessThrottler, ambientLightHorizonShort, ambientLightHorizonLong, userLux, - userNits + userNits, brightnessClamperController ); } @@ -313,9 +316,10 @@ public class AutomaticBrightnessController { HysteresisLevels screenBrightnessThresholds, HysteresisLevels ambientBrightnessThresholdsIdle, HysteresisLevels screenBrightnessThresholdsIdle, Context context, - BrightnessRangeController brightnessModeController, + BrightnessRangeController brightnessRangeController, BrightnessThrottler brightnessThrottler, int ambientLightHorizonShort, - int ambientLightHorizonLong, float userLux, float userNits) { + int ambientLightHorizonLong, float userLux, float userNits, + BrightnessClamperController brightnessClamperController) { mInjector = injector; mClock = injector.createClock(); mContext = context; @@ -358,7 +362,8 @@ public class AutomaticBrightnessController { mPendingForegroundAppPackageName = null; mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; - mBrightnessRangeController = brightnessModeController; + mBrightnessRangeController = brightnessRangeController; + mBrightnessClamperController = brightnessClamperController; mBrightnessThrottler = brightnessThrottler; mBrightnessMappingStrategyMap = brightnessMappingStrategyMap; @@ -791,7 +796,7 @@ public class AutomaticBrightnessController { mAmbientBrightnessThresholds.getDarkeningThreshold(lux); } mBrightnessRangeController.onAmbientLuxChange(mAmbientLux); - + mBrightnessClamperController.onAmbientLuxChange(mAmbientLux); // If the short term model was invalidated and the change is drastic enough, reset it. mShortTermModel.maybeReset(mAmbientLux); diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 411666942b6d..04e7f77615a6 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -61,6 +61,7 @@ import com.android.server.display.config.IdleScreenRefreshRateTimeout; import com.android.server.display.config.IdleScreenRefreshRateTimeoutLuxThresholdPoint; import com.android.server.display.config.IdleScreenRefreshRateTimeoutLuxThresholds; import com.android.server.display.config.IntegerArray; +import com.android.server.display.config.LowBrightnessData; import com.android.server.display.config.LuxThrottling; import com.android.server.display.config.NitsMap; import com.android.server.display.config.NonNegativeFloatToFloatPoint; @@ -555,6 +556,24 @@ import javax.xml.datatype.DatatypeConfigurationException; * <majorVersion>2</majorVersion> * <minorVersion>0</minorVersion> * </usiVersion> + * <lowBrightness enabled="true"> + * <transitionPoint>0.1</transitionPoint> + * + * <nits>0.2</nits> + * <nits>2.0</nits> + * <nits>500.0</nits> + * <nits>1000.0</nits> + * + * <backlight>0</backlight> + * <backlight>0.0001</backlight> + * <backlight>0.5</backlight> + * <backlight>1.0</backlight> + * + * <brightness>0</brightness> + * <brightness>0.1</brightness> + * <brightness>0.5</brightness> + * <brightness>1.0</brightness> + * </lowBrightness> * <screenBrightnessCapForWearBedtimeMode>0.1</screenBrightnessCapForWearBedtimeMode> * <idleScreenRefreshRateTimeout> * <luxThresholds> @@ -568,6 +587,8 @@ import javax.xml.datatype.DatatypeConfigurationException; * </point> * </luxThresholds> * </idleScreenRefreshRateTimeout> + * + * * </displayConfiguration> * } * </pre> @@ -732,6 +753,7 @@ public class DisplayDeviceConfig { private Spline mBacklightToBrightnessSpline; private Spline mBacklightToNitsSpline; private Spline mNitsToBacklightSpline; + private List<String> mQuirks; private boolean mIsHighBrightnessModeEnabled = false; private HighBrightnessModeData mHbmData; @@ -872,6 +894,9 @@ public class DisplayDeviceConfig { @Nullable private HdrBrightnessData mHdrBrightnessData; + @Nullable + public LowBrightnessData mLowBrightnessData; + /** * Maximum screen brightness setting when screen brightness capped in Wear Bedtime mode. */ @@ -1814,6 +1839,15 @@ public class DisplayDeviceConfig { } /** + * + * @return true if low brightness mode is enabled + */ + @VisibleForTesting + public boolean getLbmEnabled() { + return mLowBrightnessData != null; + } + + /** * @return Maximum screen brightness setting when screen brightness capped in Wear Bedtime mode. */ public float getBrightnessCapForWearBedtimeMode() { @@ -1952,6 +1986,8 @@ public class DisplayDeviceConfig { + "mUsiVersion= " + mHostUsiVersion + "\n" + "mHdrBrightnessData= " + mHdrBrightnessData + "\n" + "mBrightnessCapForWearBedtimeMode= " + mBrightnessCapForWearBedtimeMode + + "\n" + + (mLowBrightnessData != null ? mLowBrightnessData.toString() : "") + "}"; } @@ -2002,6 +2038,9 @@ public class DisplayDeviceConfig { loadDensityMapping(config); loadBrightnessDefaultFromDdcXml(config); loadBrightnessConstraintsFromConfigXml(); + if (mFlags.isEvenDimmerEnabled()) { + mLowBrightnessData = LowBrightnessData.loadConfig(config); + } loadBrightnessMap(config); loadThermalThrottlingConfig(config); loadPowerThrottlingConfigData(config); @@ -2793,6 +2832,18 @@ public class DisplayDeviceConfig { // These splines are used to convert from the system brightness value to the HAL backlight // value private void createBacklightConversionSplines() { + if (mLowBrightnessData != null) { + mBrightnessToBacklightSpline = mLowBrightnessData.mBrightnessToBacklight; + mBacklightToBrightnessSpline = mLowBrightnessData.mBacklightToBrightness; + mBacklightToNitsSpline = mLowBrightnessData.mBacklightToNits; + mNitsToBacklightSpline = mLowBrightnessData.mNitsToBacklight; + + mNits = mLowBrightnessData.mNits; + mBrightness = mLowBrightnessData.mBrightness; + mBacklight = mLowBrightnessData.mBacklight; + return; + } + mBrightness = new float[mBacklight.length]; for (int i = 0; i < mBrightness.length; i++) { mBrightness[i] = MathUtils.map(mBacklight[0], diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 87d017c978b1..90ad8c02c29c 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -1165,7 +1165,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, mContext, mBrightnessRangeController, mBrightnessThrottler, mDisplayDeviceConfig.getAmbientHorizonShort(), - mDisplayDeviceConfig.getAmbientHorizonLong(), userLux, userNits); + mDisplayDeviceConfig.getAmbientHorizonLong(), userLux, userNits, + mBrightnessClamperController); mDisplayBrightnessController.setAutomaticBrightnessController( mAutomaticBrightnessController); @@ -2479,6 +2480,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux, boolean slowChange) { mBrightnessRangeController.onAmbientLuxChange(ambientLux); + mBrightnessClamperController.onAmbientLuxChange(ambientLux); if (nits == BrightnessMappingStrategy.INVALID_NITS) { mDisplayBrightnessController.setBrightnessToFollow(leadDisplayBrightness, slowChange); } else { @@ -3176,7 +3178,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call HysteresisLevels screenBrightnessThresholdsIdle, Context context, BrightnessRangeController brightnessModeController, BrightnessThrottler brightnessThrottler, int ambientLightHorizonShort, - int ambientLightHorizonLong, float userLux, float userNits) { + int ambientLightHorizonLong, float userLux, float userNits, + BrightnessClamperController brightnessClamperController) { + return new AutomaticBrightnessController(callbacks, looper, sensorManager, lightSensor, brightnessMappingStrategyMap, lightSensorWarmUpTime, brightnessMin, brightnessMax, dozeScaleFactor, lightSensorRate, initialLightSensorRate, @@ -3186,7 +3190,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call screenBrightnessThresholds, ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, context, brightnessModeController, brightnessThrottler, ambientLightHorizonShort, ambientLightHorizonLong, userLux, - userNits); + userNits, brightnessClamperController); } BrightnessMappingStrategy getDefaultModeBrightnessMapper(Context context, diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index b2fd9edf61fe..3b3a03bce524 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -37,6 +37,7 @@ import android.os.SystemProperties; import android.os.Trace; import android.util.DisplayUtils; import android.util.LongSparseArray; +import android.util.MathUtils; import android.util.Slog; import android.util.SparseArray; import android.view.Display; @@ -78,6 +79,13 @@ final class LocalDisplayAdapter extends DisplayAdapter { private static final String UNIQUE_ID_PREFIX = "local:"; private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.boot.emulator.circular"; + // Min and max strengths for even dimmer feature. + private static final float EVEN_DIMMER_MIN_STRENGTH = 0.0f; + private static final float EVEN_DIMMER_MAX_STRENGTH = 70.0f; // not too dim yet. + private static final float BRIGHTNESS_MIN = 0.0f; + // The brightness at which we start using color matrices rather than backlight, + // to dim the display + private static final float BACKLIGHT_COLOR_TRANSITION_POINT = 0.1f; private final LongSparseArray<LocalDisplayDevice> mDevices = new LongSparseArray<>(); @@ -91,6 +99,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { private Context mOverlayContext; + private int mEvenDimmerStrength = -1; + // Called with SyncRoot lock held. LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot, Context context, Handler handler, Listener listener, DisplayManagerFlags flags, @@ -928,6 +938,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { final float nits = backlightToNits(backlight); final float sdrNits = backlightToNits(sdrBacklight); + if (getFeatureFlags().isEvenDimmerEnabled()) { + applyColorMatrixBasedDimming(brightnessState); + } + mBacklightAdapter.setBacklight(sdrBacklight, sdrNits, backlight, nits); Trace.traceCounter(Trace.TRACE_TAG_POWER, "ScreenBrightness", @@ -974,6 +988,22 @@ final class LocalDisplayAdapter extends DisplayAdapter { } } } + + private void applyColorMatrixBasedDimming(float brightnessState) { + int strength = (int) (MathUtils.constrainedMap( + EVEN_DIMMER_MAX_STRENGTH, EVEN_DIMMER_MIN_STRENGTH, // to this range + BRIGHTNESS_MIN, BACKLIGHT_COLOR_TRANSITION_POINT, // from this range + brightnessState) + 0.5); // map this (+ rounded up) + + if (mEvenDimmerStrength < 0 // uninitialised + || MathUtils.abs(mEvenDimmerStrength - strength) > 1 + || strength <= 1) { + mEvenDimmerStrength = strength; + } + + // TODO: use `enabled` and `mRbcStrength` to set color matrices here + // TODO: boolean enabled = mEvenDimmerStrength > 0.0f; + } }; } return null; 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 18e8fab54e3e..d8a45009f236 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 @@ -189,6 +189,13 @@ public class BrightnessClamperController { mModifiers.forEach(BrightnessStateModifier::stop); } + /** + * Notifies modifiers that ambient lux has changed. + * @param ambientLux current lux, debounced + */ + public void onAmbientLuxChange(float ambientLux) { + mModifiers.forEach(modifier -> modifier.onAmbientLuxChange(ambientLux)); + } // Called in DisplayControllerHandler private void recalculateBrightnessCap() { diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessLowLuxModifier.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessLowLuxModifier.java index 7f1f7a99e438..a91bb59b0bc0 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessLowLuxModifier.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessLowLuxModifier.java @@ -39,21 +39,21 @@ import java.io.PrintWriter; * Class used to prevent the screen brightness dipping below a certain value, based on current * lux conditions and user preferred minimum. */ -public class BrightnessLowLuxModifier implements - BrightnessStateModifier { +public class BrightnessLowLuxModifier extends BrightnessModifier { // To enable these logs, run: // 'adb shell setprop persist.log.tag.BrightnessLowLuxModifier DEBUG && adb reboot' private static final String TAG = "BrightnessLowLuxModifier"; private static final boolean DEBUG = DebugUtils.isDebuggable(TAG); + private static final float MIN_NITS = 2.0f; private final SettingsObserver mSettingsObserver; private final ContentResolver mContentResolver; private final Handler mHandler; private final BrightnessClamperController.ClamperChangeListener mChangeListener; - protected float mSettingNitsLowerBound = PowerManager.BRIGHTNESS_MIN; private int mReason; private float mBrightnessLowerBound; private boolean mIsActive; + private float mAmbientLux; @VisibleForTesting BrightnessLowLuxModifier(Handler handler, @@ -78,17 +78,17 @@ public class BrightnessLowLuxModifier implements int userId = UserHandle.USER_CURRENT; float settingNitsLowerBound = Settings.Secure.getFloatForUser( mContentResolver, Settings.Secure.EVEN_DIMMER_MIN_NITS, - /* def= */ PowerManager.BRIGHTNESS_MIN, userId); + /* def= */ MIN_NITS, userId); - boolean isActive = Settings.Secure.getIntForUser(mContentResolver, + boolean isActive = Settings.Secure.getFloatForUser(mContentResolver, Settings.Secure.EVEN_DIMMER_ACTIVATED, - /* def= */ 0, userId) == 1; + /* def= */ 0, userId) == 1.0f; - // TODO: luxBasedNitsLowerBound = mMinNitsToLuxSpline(currentLux); - float luxBasedNitsLowerBound = 0.0f; + // TODO: luxBasedNitsLowerBound = mMinLuxToNitsSpline(currentLux); + float luxBasedNitsLowerBound = 2.0f; - // TODO: final float nitsLowerBound = isActive ? Math.max(settingNitsLowerBound, - // luxBasedNitsLowerBound) : PowerManager.BRIGHTNESS_MIN; + final float nitsLowerBound = isActive ? Math.max(settingNitsLowerBound, + luxBasedNitsLowerBound) : MIN_NITS; final int reason = settingNitsLowerBound > luxBasedNitsLowerBound ? BrightnessReason.MODIFIER_MIN_USER_SET_LOWER_BOUND @@ -104,8 +104,13 @@ public class BrightnessLowLuxModifier implements mReason = reason; if (DEBUG) { Slog.i(TAG, "isActive: " + isActive - + ", settingNitsLowerBound: " + settingNitsLowerBound - + ", lowerBound: " + brightnessLowerBound); + + ", brightnessLowerBound: " + brightnessLowerBound + + ", mAmbientLux: " + mAmbientLux + + ", mReason: " + ( + mReason == BrightnessReason.MODIFIER_MIN_USER_SET_LOWER_BOUND ? "minSetting" + : "lux") + + ", nitsLowerBound: " + nitsLowerBound + ); } mBrightnessLowerBound = brightnessLowerBound; mChangeListener.onChanged(); @@ -132,6 +137,22 @@ public class BrightnessLowLuxModifier implements } @Override + boolean shouldApply(DisplayManagerInternal.DisplayPowerRequest request) { + return mIsActive; + } + + @Override + float getBrightnessAdjusted(float currentBrightness, + DisplayManagerInternal.DisplayPowerRequest request) { + return Math.max(mBrightnessLowerBound, currentBrightness); + } + + @Override + int getModifier() { + return mReason; + } + + @Override public void apply(DisplayManagerInternal.DisplayPowerRequest request, DisplayBrightnessState.Builder stateBuilder) { stateBuilder.setMinBrightness(mBrightnessLowerBound); @@ -150,10 +171,16 @@ public class BrightnessLowLuxModifier implements } @Override + public void onAmbientLuxChange(float ambientLux) { + mAmbientLux = ambientLux; + recalculateLowerBound(); + } + + @Override public void dump(PrintWriter pw) { pw.println("BrightnessLowLuxModifier:"); - pw.println(" mBrightnessLowerBound=" + mBrightnessLowerBound); pw.println(" mIsActive=" + mIsActive); + pw.println(" mBrightnessLowerBound=" + mBrightnessLowerBound); pw.println(" mReason=" + mReason); } diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessModifier.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessModifier.java index be8fa5a0f0ce..2a3dd8752615 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessModifier.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessModifier.java @@ -68,4 +68,9 @@ abstract class BrightnessModifier implements BrightnessStateModifier { public void stop() { // do nothing } + + @Override + public void onAmbientLuxChange(float ambientLux) { + // do nothing + } } diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessStateModifier.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessStateModifier.java index 441ba8f1a1fc..22342581fa8b 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessStateModifier.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessStateModifier.java @@ -42,4 +42,10 @@ public interface BrightnessStateModifier { * Called when stopped. Listeners can be unregistered here. */ void stop(); + + /** + * Allows modifiers to react to ambient lux changes. + * @param ambientLux current debounced lux. + */ + void onAmbientLuxChange(float ambientLux); } diff --git a/services/core/java/com/android/server/display/config/LowBrightnessData.java b/services/core/java/com/android/server/display/config/LowBrightnessData.java new file mode 100644 index 000000000000..aa82533bf6a7 --- /dev/null +++ b/services/core/java/com/android/server/display/config/LowBrightnessData.java @@ -0,0 +1,142 @@ +/* + * 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.server.display.config; + +import android.annotation.Nullable; +import android.util.Slog; +import android.util.Spline; + +import com.android.internal.annotations.VisibleForTesting; + +import java.util.Arrays; +import java.util.List; + +/** + * Brightness config for low brightness mode + */ +public class LowBrightnessData { + private static final String TAG = "LowBrightnessData"; + + /** + * Brightness value at which lower brightness methods are used. + */ + public final float mTransitionPoint; + + /** + * Nits array, maps to mBacklight + */ + public final float[] mNits; + + /** + * Backlight array, maps to mBrightness and mNits + */ + public final float[] mBacklight; + + /** + * Brightness array, maps to mBacklight + */ + public final float[] mBrightness; + /** + * Spline, mapping between backlight and nits + */ + public final Spline mBacklightToNits; + /** + * Spline, mapping between nits and backlight + */ + public final Spline mNitsToBacklight; + /** + * Spline, mapping between brightness and backlight + */ + public final Spline mBrightnessToBacklight; + /** + * Spline, mapping between backlight and brightness + */ + public final Spline mBacklightToBrightness; + + @VisibleForTesting + public LowBrightnessData(float transitionPoint, float[] nits, + float[] backlight, float[] brightness, Spline backlightToNits, + Spline nitsToBacklight, Spline brightnessToBacklight, Spline backlightToBrightness) { + mTransitionPoint = transitionPoint; + mNits = nits; + mBacklight = backlight; + mBrightness = brightness; + mBacklightToNits = backlightToNits; + mNitsToBacklight = nitsToBacklight; + mBrightnessToBacklight = brightnessToBacklight; + mBacklightToBrightness = backlightToBrightness; + } + + @Override + public String toString() { + return "LowBrightnessData {" + + "mTransitionPoint: " + mTransitionPoint + + ", mNits: " + Arrays.toString(mNits) + + ", mBacklight: " + Arrays.toString(mBacklight) + + ", mBrightness: " + Arrays.toString(mBrightness) + + ", mBacklightToNits: " + mBacklightToNits + + ", mNitsToBacklight: " + mNitsToBacklight + + ", mBrightnessToBacklight: " + mBrightnessToBacklight + + ", mBacklightToBrightness: " + mBacklightToBrightness + + "} "; + } + + /** + * Loads LowBrightnessData from DisplayConfiguration + */ + @Nullable + public static LowBrightnessData loadConfig(DisplayConfiguration config) { + final LowBrightnessMode lbm = config.getLowBrightness(); + if (lbm == null) { + return null; + } + + boolean lbmIsEnabled = lbm.getEnabled(); + if (!lbmIsEnabled) { + return null; + } + + List<Float> nitsList = lbm.getNits(); + List<Float> backlightList = lbm.getBacklight(); + List<Float> brightnessList = lbm.getBrightness(); + float transitionPoints = lbm.getTransitionPoint().floatValue(); + + if (nitsList.isEmpty() + || backlightList.size() != brightnessList.size() + || backlightList.size() != nitsList.size()) { + Slog.e(TAG, "Invalid low brightness array lengths"); + return null; + } + + float[] nits = new float[nitsList.size()]; + float[] backlight = new float[nitsList.size()]; + float[] brightness = new float[nitsList.size()]; + + for (int i = 0; i < nitsList.size(); i++) { + nits[i] = nitsList.get(i); + backlight[i] = backlightList.get(i); + brightness[i] = brightnessList.get(i); + } + + return new LowBrightnessData(transitionPoints, nits, backlight, brightness, + Spline.createSpline(backlight, nits), + Spline.createSpline(nits, backlight), + Spline.createSpline(brightness, backlight), + Spline.createSpline(backlight, brightness) + ); + } +} diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 05b1cb69235b..468b90259fc7 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -2604,6 +2604,19 @@ public class InputManagerService extends IInputManager.Stub mBatteryController.notifyStylusGestureStarted(deviceId, eventTime); } + // Native callback. + @SuppressWarnings("unused") + private int getPackageUid(String pkg) { + if (TextUtils.isEmpty(pkg)) { + return Process.INVALID_UID; + } + try { + return mContext.getPackageManager().getPackageUid(pkg, 0 /*flags*/); + } catch (PackageManager.NameNotFoundException e) { + return Process.INVALID_UID; + } + } + /** * Flatten a map into a string list, with value positioned directly next to the * key. diff --git a/services/core/java/com/android/server/input/KeyboardLayoutManager.java b/services/core/java/com/android/server/input/KeyboardLayoutManager.java index 283e692ffbab..661008103a25 100644 --- a/services/core/java/com/android/server/input/KeyboardLayoutManager.java +++ b/services/core/java/com/android/server/input/KeyboardLayoutManager.java @@ -459,13 +459,16 @@ class KeyboardLayoutManager implements InputManager.InputDeviceListener { for (ResolveInfo resolveInfo : pm.queryBroadcastReceiversAsUser(intent, PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, UserHandle.USER_SYSTEM)) { + if (resolveInfo == null || resolveInfo.activityInfo == null) { + continue; + } final ActivityInfo activityInfo = resolveInfo.activityInfo; final int priority = resolveInfo.priority; visitKeyboardLayoutsInPackage(pm, activityInfo, null, priority, visitor); } } - private void visitKeyboardLayout(String keyboardLayoutDescriptor, + private void visitKeyboardLayout(@NonNull String keyboardLayoutDescriptor, KeyboardLayoutVisitor visitor) { KeyboardLayoutDescriptor d = KeyboardLayoutDescriptor.parse(keyboardLayoutDescriptor); if (d != null) { @@ -482,8 +485,8 @@ class KeyboardLayoutManager implements InputManager.InputDeviceListener { } } - private void visitKeyboardLayoutsInPackage(PackageManager pm, ActivityInfo receiver, - String keyboardName, int requestedPriority, KeyboardLayoutVisitor visitor) { + private void visitKeyboardLayoutsInPackage(PackageManager pm, @NonNull ActivityInfo receiver, + @Nullable String keyboardName, int requestedPriority, KeyboardLayoutVisitor visitor) { Bundle metaData = receiver.metaData; if (metaData == null) { return; @@ -1415,7 +1418,7 @@ class KeyboardLayoutManager implements InputManager.InputDeviceListener { return packageName + "/" + receiverName + "/" + keyboardName; } - public static KeyboardLayoutDescriptor parse(String descriptor) { + public static KeyboardLayoutDescriptor parse(@NonNull String descriptor) { int pos = descriptor.indexOf('/'); if (pos < 0 || pos + 1 == descriptor.length()) { return null; diff --git a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java index 23fe5cca3d96..dbdac4184f28 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java @@ -16,6 +16,8 @@ package com.android.server.inputmethod; +import static com.android.text.flags.Flags.handwritingEndOfLineTap; + import android.Manifest; import android.annotation.AnyThread; import android.annotation.NonNull; @@ -30,6 +32,7 @@ import android.hardware.input.InputManagerGlobal; import android.os.Handler; import android.os.IBinder; import android.os.Looper; +import android.os.SystemClock; import android.text.TextUtils; import android.util.Slog; import android.view.BatchedInputEventReceiver; @@ -66,6 +69,7 @@ final class HandwritingModeController { // Use getHandwritingBufferSize() and not this value directly. private static final int LONG_EVENT_BUFFER_SIZE = EVENT_BUFFER_SIZE * 20; private static final long HANDWRITING_DELEGATION_IDLE_TIMEOUT_MS = 3000; + private static final long AFTER_STYLUS_UP_ALLOW_PERIOD_MS = 200L; private final Context mContext; // This must be the looper for the UiThread. @@ -78,6 +82,7 @@ final class HandwritingModeController { private InputEventReceiver mHandwritingEventReceiver; private Runnable mInkWindowInitRunnable; private boolean mRecordingGesture; + private boolean mRecordingGestureAfterStylusUp; private int mCurrentDisplayId; // when set, package names are used for handwriting delegation. private @Nullable String mDelegatePackageName; @@ -155,6 +160,15 @@ final class HandwritingModeController { } boolean isStylusGestureOngoing() { + if (mRecordingGestureAfterStylusUp && !mHandwritingBuffer.isEmpty()) { + // If it is less than AFTER_STYLUS_UP_ALLOW_PERIOD_MS after the stylus up event, return + // true so that handwriting can start. + MotionEvent lastEvent = mHandwritingBuffer.get(mHandwritingBuffer.size() - 1); + if (lastEvent.getActionMasked() == MotionEvent.ACTION_UP) { + return SystemClock.uptimeMillis() - lastEvent.getEventTime() + < AFTER_STYLUS_UP_ALLOW_PERIOD_MS; + } + } return mRecordingGesture; } @@ -277,7 +291,7 @@ final class HandwritingModeController { Slog.e(TAG, "Cannot start handwriting session: Invalid request id: " + requestId); return null; } - if (!mRecordingGesture || mHandwritingBuffer.isEmpty()) { + if (!isStylusGestureOngoing()) { Slog.e(TAG, "Cannot start handwriting session: No stylus gesture is being recorded."); return null; } @@ -300,6 +314,7 @@ final class HandwritingModeController { mHandwritingEventReceiver.dispose(); mHandwritingEventReceiver = null; mRecordingGesture = false; + mRecordingGestureAfterStylusUp = false; if (mHandwritingSurface.isIntercepting()) { throw new IllegalStateException( @@ -362,6 +377,7 @@ final class HandwritingModeController { clearPendingHandwritingDelegation(); } mRecordingGesture = false; + mRecordingGestureAfterStylusUp = false; } private boolean onInputEvent(InputEvent ev) { @@ -412,15 +428,20 @@ final class HandwritingModeController { if ((TextUtils.isEmpty(mDelegatePackageName) || mDelegationConnectionlessFlow) && (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL)) { mRecordingGesture = false; - mHandwritingBuffer.clear(); - return; + if (handwritingEndOfLineTap() && action == MotionEvent.ACTION_UP) { + mRecordingGestureAfterStylusUp = true; + } else { + mHandwritingBuffer.clear(); + return; + } } if (action == MotionEvent.ACTION_DOWN) { + clearBufferIfRecordingAfterStylusUp(); mRecordingGesture = true; } - if (!mRecordingGesture) { + if (!mRecordingGesture && !mRecordingGestureAfterStylusUp) { return; } @@ -430,12 +451,20 @@ final class HandwritingModeController { + " The rest of the gesture will not be recorded."); } mRecordingGesture = false; + clearBufferIfRecordingAfterStylusUp(); return; } mHandwritingBuffer.add(MotionEvent.obtain(event)); } + private void clearBufferIfRecordingAfterStylusUp() { + if (mRecordingGestureAfterStylusUp) { + mHandwritingBuffer.clear(); + mRecordingGestureAfterStylusUp = false; + } + } + static final class HandwritingSession { private final int mRequestId; private final InputChannel mHandwritingChannel; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index d0a83a66dfba..cfd64c47718c 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -1248,7 +1248,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mService.publishLocalService(); IInputMethodManager.Stub service; if (Flags.useZeroJankProxy()) { - service = new ZeroJankProxy(mService.mHandler::post, mService); + service = + new ZeroJankProxy( + mService.mHandler::post, + mService, + () -> { + synchronized (ImfLock.class) { + return mService.isInputShown(); + } + }); } else { service = mService; } diff --git a/services/core/java/com/android/server/inputmethod/ZeroJankProxy.java b/services/core/java/com/android/server/inputmethod/ZeroJankProxy.java index 396192e085e7..136ab42cd0e8 100644 --- a/services/core/java/com/android/server/inputmethod/ZeroJankProxy.java +++ b/services/core/java/com/android/server/inputmethod/ZeroJankProxy.java @@ -46,7 +46,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ShellCallback; -import android.util.ExceptionUtils; import android.util.Slog; import android.view.WindowManager; import android.view.inputmethod.CursorAnchorInfo; @@ -77,6 +76,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; +import java.util.function.BooleanSupplier; /** * A proxy that processes all {@link IInputMethodManager} calls asynchronously. @@ -86,10 +86,12 @@ public class ZeroJankProxy extends IInputMethodManager.Stub { private final IInputMethodManager mInner; private final Executor mExecutor; + private final BooleanSupplier mIsInputShown; - ZeroJankProxy(Executor executor, IInputMethodManager inner) { + ZeroJankProxy(Executor executor, IInputMethodManager inner, BooleanSupplier isInputShown) { mInner = inner; mExecutor = executor; + mIsInputShown = isInputShown; } private void offload(ThrowingRunnable r) { @@ -163,8 +165,19 @@ public class ZeroJankProxy extends IInputMethodManager.Stub { int lastClickTooType, ResultReceiver resultReceiver, @SoftInputShowHideReason int reason) throws RemoteException { - offload(() -> mInner.showSoftInput(client, windowToken, statsToken, flags, lastClickTooType, - resultReceiver, reason)); + offload( + () -> { + if (!mInner.showSoftInput( + client, + windowToken, + statsToken, + flags, + lastClickTooType, + resultReceiver, + reason)) { + sendResultReceiverFailure(resultReceiver); + } + }); return true; } @@ -173,11 +186,24 @@ public class ZeroJankProxy extends IInputMethodManager.Stub { @Nullable ImeTracker.Token statsToken, @InputMethodManager.HideFlags int flags, ResultReceiver resultReceiver, @SoftInputShowHideReason int reason) throws RemoteException { - offload(() -> mInner.hideSoftInput(client, windowToken, statsToken, flags, resultReceiver, - reason)); + offload( + () -> { + if (!mInner.hideSoftInput( + client, windowToken, statsToken, flags, resultReceiver, reason)) { + sendResultReceiverFailure(resultReceiver); + } + }); return true; } + private void sendResultReceiverFailure(ResultReceiver resultReceiver) { + resultReceiver.send( + mIsInputShown.getAsBoolean() + ? InputMethodManager.RESULT_UNCHANGED_SHOWN + : InputMethodManager.RESULT_UNCHANGED_HIDDEN, + null); + } + @Override @EnforcePermission(Manifest.permission.TEST_INPUT_METHOD) public void hideSoftInputFromServerForTest() throws RemoteException { diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index a9a82725223d..5b3934ea9b13 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -687,27 +687,20 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde private static String toVolumeControlTypeString( @VolumeProvider.ControlType int volumeControlType) { - switch (volumeControlType) { - case VOLUME_CONTROL_FIXED: - return "FIXED"; - case VOLUME_CONTROL_RELATIVE: - return "RELATIVE"; - case VOLUME_CONTROL_ABSOLUTE: - return "ABSOLUTE"; - default: - return TextUtils.formatSimple("unknown(%d)", volumeControlType); - } + return switch (volumeControlType) { + case VOLUME_CONTROL_FIXED -> "FIXED"; + case VOLUME_CONTROL_RELATIVE -> "RELATIVE"; + case VOLUME_CONTROL_ABSOLUTE -> "ABSOLUTE"; + default -> TextUtils.formatSimple("unknown(%d)", volumeControlType); + }; } private static String toVolumeTypeString(@PlaybackInfo.PlaybackType int volumeType) { - switch (volumeType) { - case PLAYBACK_TYPE_LOCAL: - return "LOCAL"; - case PLAYBACK_TYPE_REMOTE: - return "REMOTE"; - default: - return TextUtils.formatSimple("unknown(%d)", volumeType); - } + return switch (volumeType) { + case PLAYBACK_TYPE_LOCAL -> "LOCAL"; + case PLAYBACK_TYPE_REMOTE -> "REMOTE"; + default -> TextUtils.formatSimple("unknown(%d)", volumeType); + }; } @Override diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 18b495bfce5d..25095edda5d8 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -4328,7 +4328,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @GuardedBy("mUidRulesFirstLock") private boolean updateUidStateUL(int uid, int procState, long procStateSeq, @ProcessCapability int capability) { - Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateUidStateUL"); + Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateUidStateUL: " + uid + "/" + + ActivityManager.procStateToString(procState) + "/" + procStateSeq + "/" + + ActivityManager.getCapabilitiesSummary(capability)); try { final UidState oldUidState = mUidState.get(uid); if (oldUidState != null && procStateSeq < oldUidState.procStateSeq) { diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java index 4f3cdbc52259..50ca984dcf57 100644 --- a/services/core/java/com/android/server/notification/PreferencesHelper.java +++ b/services/core/java/com/android/server/notification/PreferencesHelper.java @@ -310,6 +310,7 @@ public class PreferencesHelper implements RankingConfig { parser.getAttributeInt(null, ATT_VISIBILITY, DEFAULT_VISIBILITY), parser.getAttributeBoolean(null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE), bubblePref); + r.bubblePreference = bubblePref; r.priority = parser.getAttributeInt(null, ATT_PRIORITY, DEFAULT_PRIORITY); r.visibility = parser.getAttributeInt(null, ATT_VISIBILITY, DEFAULT_VISIBILITY); r.showBadge = parser.getAttributeBoolean(null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE); @@ -676,7 +677,7 @@ public class PreferencesHelper implements RankingConfig { * @param bubblePreference whether bubbles are allowed. */ public void setBubblesAllowed(String pkg, int uid, int bubblePreference) { - boolean changed = false; + boolean changed; synchronized (mPackagePreferences) { PackagePreferences p = getOrCreatePackagePreferencesLocked(pkg, uid); changed = p.bubblePreference != bubblePreference; diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java index 28682e3d916f..953300ac43a6 100644 --- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java +++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java @@ -37,8 +37,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import android.os.Binder; import android.content.res.Resources; +import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -163,7 +163,7 @@ public class OnDeviceIntelligenceManagerService extends SystemService { } @Override - public void getVersion(RemoteCallback remoteCallback) throws RemoteException { + public void getVersion(RemoteCallback remoteCallback) { Slog.i(TAG, "OnDeviceIntelligenceManagerInternal getVersion"); Objects.requireNonNull(remoteCallback); mContext.enforceCallingOrSelfPermission( @@ -244,7 +244,7 @@ public class OnDeviceIntelligenceManagerService extends SystemService { @Override public void requestFeatureDownload(Feature feature, - ICancellationSignal cancellationSignal, + AndroidFuture cancellationSignalFuture, IDownloadCallback downloadCallback) throws RemoteException { Slog.i(TAG, "OnDeviceIntelligenceManagerInternal requestFeatureDownload"); Objects.requireNonNull(feature); @@ -261,16 +261,17 @@ public class OnDeviceIntelligenceManagerService extends SystemService { ensureRemoteIntelligenceServiceInitialized(); mRemoteOnDeviceIntelligenceService.run( service -> service.requestFeatureDownload(Binder.getCallingUid(), feature, - cancellationSignal, + cancellationSignalFuture, downloadCallback)); } @Override public void requestTokenInfo(Feature feature, - Bundle request, ICancellationSignal cancellationSignal, + Bundle request, + AndroidFuture cancellationSignalFuture, ITokenInfoCallback tokenInfoCallback) throws RemoteException { - Slog.i(TAG, "OnDeviceIntelligenceManagerInternal prepareFeatureProcessing"); + Slog.i(TAG, "OnDeviceIntelligenceManagerInternal requestTokenInfo"); Objects.requireNonNull(feature); Objects.requireNonNull(request); Objects.requireNonNull(tokenInfoCallback); @@ -285,10 +286,11 @@ public class OnDeviceIntelligenceManagerService extends SystemService { PersistableBundle.EMPTY); } ensureRemoteInferenceServiceInitialized(); + mRemoteInferenceService.run( service -> service.requestTokenInfo(Binder.getCallingUid(), feature, request, - cancellationSignal, + cancellationSignalFuture, tokenInfoCallback)); } @@ -296,8 +298,8 @@ public class OnDeviceIntelligenceManagerService extends SystemService { public void processRequest(Feature feature, Bundle request, int requestType, - ICancellationSignal cancellationSignal, - IProcessingSignal processingSignal, + AndroidFuture cancellationSignalFuture, + AndroidFuture processingSignalFuture, IResponseCallback responseCallback) throws RemoteException { Slog.i(TAG, "OnDeviceIntelligenceManagerInternal processRequest"); @@ -316,7 +318,7 @@ public class OnDeviceIntelligenceManagerService extends SystemService { mRemoteInferenceService.run( service -> service.processRequest(Binder.getCallingUid(), feature, request, requestType, - cancellationSignal, processingSignal, + cancellationSignalFuture, processingSignalFuture, responseCallback)); } @@ -324,8 +326,8 @@ public class OnDeviceIntelligenceManagerService extends SystemService { public void processRequestStreaming(Feature feature, Bundle request, int requestType, - ICancellationSignal cancellationSignal, - IProcessingSignal processingSignal, + AndroidFuture cancellationSignalFuture, + AndroidFuture processingSignalFuture, IStreamingResponseCallback streamingCallback) throws RemoteException { Slog.i(TAG, "OnDeviceIntelligenceManagerInternal processRequestStreaming"); Objects.requireNonNull(feature); @@ -343,7 +345,7 @@ public class OnDeviceIntelligenceManagerService extends SystemService { mRemoteInferenceService.run( service -> service.processRequestStreaming(Binder.getCallingUid(), feature, request, requestType, - cancellationSignal, processingSignal, + cancellationSignalFuture, processingSignalFuture, streamingCallback)); } @@ -356,11 +358,11 @@ public class OnDeviceIntelligenceManagerService extends SystemService { }; } - private void ensureRemoteIntelligenceServiceInitialized() throws RemoteException { + private void ensureRemoteIntelligenceServiceInitialized() { synchronized (mLock) { if (mRemoteOnDeviceIntelligenceService == null) { String serviceName = getServiceNames()[0]; - validateService(serviceName, false); + Binder.withCleanCallingIdentity(() -> validateServiceElevated(serviceName, false)); mRemoteOnDeviceIntelligenceService = new RemoteOnDeviceIntelligenceService(mContext, ComponentName.unflattenFromString(serviceName), UserHandle.SYSTEM.getIdentifier()); @@ -388,29 +390,19 @@ public class OnDeviceIntelligenceManagerService extends SystemService { public void updateProcessingState( Bundle processingState, IProcessingUpdateStatusCallback callback) { - try { - ensureRemoteInferenceServiceInitialized(); - mRemoteInferenceService.run( - service -> service.updateProcessingState( - processingState, callback)); - } catch (RemoteException unused) { - try { - callback.onFailure( - OnDeviceIntelligenceException.PROCESSING_UPDATE_STATUS_CONNECTION_FAILED, - "Received failure invoking the remote processing service."); - } catch (RemoteException ex) { - Slog.w(TAG, "Failed to send failure status.", ex); - } - } + ensureRemoteInferenceServiceInitialized(); + mRemoteInferenceService.run( + service -> service.updateProcessingState( + processingState, callback)); } }; } - private void ensureRemoteInferenceServiceInitialized() throws RemoteException { + private void ensureRemoteInferenceServiceInitialized() { synchronized (mLock) { if (mRemoteInferenceService == null) { String serviceName = getServiceNames()[1]; - validateService(serviceName, true); + Binder.withCleanCallingIdentity(() -> validateServiceElevated(serviceName, true)); mRemoteInferenceService = new RemoteOnDeviceSandboxedInferenceService(mContext, ComponentName.unflattenFromString(serviceName), UserHandle.SYSTEM.getIdentifier()); @@ -457,35 +449,38 @@ public class OnDeviceIntelligenceManagerService extends SystemService { }; } - @GuardedBy("mLock") - private void validateService(String serviceName, boolean checkIsolated) - throws RemoteException { - if (TextUtils.isEmpty(serviceName)) { - throw new RuntimeException(""); - } - ComponentName serviceComponent = ComponentName.unflattenFromString( - serviceName); - ServiceInfo serviceInfo = AppGlobals.getPackageManager().getServiceInfo( - serviceComponent, - PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, 0); - if (serviceInfo != null) { - if (!checkIsolated) { - checkServiceRequiresPermission(serviceInfo, - Manifest.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE); - return; + private void validateServiceElevated(String serviceName, boolean checkIsolated) { + try { + if (TextUtils.isEmpty(serviceName)) { + throw new IllegalStateException( + "Remote service is not configured to complete the request"); } + ComponentName serviceComponent = ComponentName.unflattenFromString( + serviceName); + ServiceInfo serviceInfo = AppGlobals.getPackageManager().getServiceInfo( + serviceComponent, + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, 0); + if (serviceInfo != null) { + if (!checkIsolated) { + checkServiceRequiresPermission(serviceInfo, + Manifest.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE); + return; + } - checkServiceRequiresPermission(serviceInfo, - Manifest.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE); - if (!isIsolatedService(serviceInfo)) { - throw new SecurityException( - "Call required an isolated service, but the configured service: " - + serviceName + ", is not isolated"); + checkServiceRequiresPermission(serviceInfo, + Manifest.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE); + if (!isIsolatedService(serviceInfo)) { + throw new SecurityException( + "Call required an isolated service, but the configured service: " + + serviceName + ", is not isolated"); + } + } else { + throw new IllegalStateException( + "Remote service is not configured to complete the request."); } - } else { - throw new RuntimeException( - "Could not find service info for serviceName: " + serviceName); + } catch (RemoteException e) { + throw new IllegalStateException("Could not fetch service info for remote services", e); } } @@ -501,8 +496,7 @@ public class OnDeviceIntelligenceManagerService extends SystemService { } } - @GuardedBy("mLock") - private boolean isIsolatedService(@NonNull ServiceInfo serviceInfo) { + private static boolean isIsolatedService(@NonNull ServiceInfo serviceInfo) { return (serviceInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0 && (serviceInfo.flags & ServiceInfo.FLAG_EXTERNAL_SERVICE) == 0; } @@ -544,7 +538,8 @@ public class OnDeviceIntelligenceManagerService extends SystemService { Manifest.permission.USE_ON_DEVICE_INTELLIGENCE, TAG); synchronized (mLock) { mTemporaryServiceNames = componentNames; - + mRemoteOnDeviceIntelligenceService = null; + mRemoteInferenceService = null; if (mTemporaryHandler == null) { mTemporaryHandler = new Handler(Looper.getMainLooper(), null, true) { @Override diff --git a/services/core/java/com/android/server/pm/AppDataHelper.java b/services/core/java/com/android/server/pm/AppDataHelper.java index 18ba2cf1405e..9ba88aa18ce6 100644 --- a/services/core/java/com/android/server/pm/AppDataHelper.java +++ b/services/core/java/com/android/server/pm/AppDataHelper.java @@ -45,7 +45,6 @@ import android.util.TimingsTraceLog; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; import com.android.server.SystemServerInitThreadPool; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.dex.ArtManagerService; import com.android.server.pm.parsing.pkg.AndroidPackageUtils; import com.android.server.pm.pkg.AndroidPackage; @@ -256,41 +255,6 @@ public class AppDataHelper { } } - if (!DexOptHelper.useArtService()) { // ART Service handles this on demand instead. - // Prepare the application profiles only for upgrades and - // first boot (so that we don't repeat the same operation at - // each boot). - // - // We only have to cover the upgrade and first boot here - // because for app installs we prepare the profiles before - // invoking dexopt (in installPackageLI). - // - // We also have to cover non system users because we do not - // call the usual install package methods for them. - // - // NOTE: in order to speed up first boot time we only create - // the current profile and do not update the content of the - // reference profile. A system image should already be - // configured with the right profile keys and the profiles - // for the speed-profile prebuilds should already be copied. - // That's done in #performDexOptUpgrade. - // - // TODO(calin, mathieuc): We should use .dm files for - // prebuilds profiles instead of manually copying them in - // #performDexOptUpgrade. When we do that we should have a - // more granular check here and only update the existing - // profiles. - if (pkg != null && (mPm.isDeviceUpgrading() || mPm.isFirstBoot() - || (userId != UserHandle.USER_SYSTEM))) { - try { - mArtManagerService.prepareAppProfiles(pkg, userId, - /* updateReferenceProfileContent= */ false); - } catch (LegacyDexoptDisabledException e2) { - throw new RuntimeException(e2); - } - } - } - final long ceDataInode = createAppDataResult.ceDataInode; final long deDataInode = createAppDataResult.deDataInode; @@ -615,15 +579,7 @@ public class AppDataHelper { Slog.wtf(TAG, "Package was null!", new Throwable()); return; } - if (DexOptHelper.useArtService()) { - destroyAppProfilesWithArtService(pkg.getPackageName()); - } else { - try { - mArtManagerService.clearAppProfiles(pkg); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } + destroyAppProfilesLIF(pkg.getPackageName()); } public void destroyAppDataLIF(AndroidPackage pkg, int userId, int flags) { @@ -657,20 +613,6 @@ public class AppDataHelper { * Destroy ART app profiles for the package. */ void destroyAppProfilesLIF(String packageName) { - if (DexOptHelper.useArtService()) { - destroyAppProfilesWithArtService(packageName); - } else { - try { - mInstaller.destroyAppProfiles(packageName); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } catch (Installer.InstallerException e) { - Slog.w(TAG, String.valueOf(e)); - } - } - } - - private void destroyAppProfilesWithArtService(String packageName) { if (!DexOptHelper.artManagerLocalIsInitialized()) { // This function may get called while PackageManagerService is constructed (via e.g. // InitAppsHelper.initSystemApps), and ART Service hasn't yet been started then (it diff --git a/services/core/java/com/android/server/pm/BackgroundDexOptJobService.java b/services/core/java/com/android/server/pm/BackgroundDexOptJobService.java deleted file mode 100644 index d9452742f99c..000000000000 --- a/services/core/java/com/android/server/pm/BackgroundDexOptJobService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2021 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.server.pm; - -import android.app.job.JobParameters; -import android.app.job.JobService; - -/** - * JobService to run background dex optimization. This is a thin wrapper and most logic exits in - * {@link BackgroundDexOptService}. - */ -public final class BackgroundDexOptJobService extends JobService { - - @Override - public boolean onStartJob(JobParameters params) { - return BackgroundDexOptService.getService().onStartJob(this, params); - } - - @Override - public boolean onStopJob(JobParameters params) { - return BackgroundDexOptService.getService().onStopJob(this, params); - } -} diff --git a/services/core/java/com/android/server/pm/BackgroundDexOptService.java b/services/core/java/com/android/server/pm/BackgroundDexOptService.java deleted file mode 100644 index 36677df07ca3..000000000000 --- a/services/core/java/com/android/server/pm/BackgroundDexOptService.java +++ /dev/null @@ -1,1152 +0,0 @@ -/* - * Copyright (C) 2014 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.server.pm; - -import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; -import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason; -import static com.android.server.pm.dex.ArtStatsLogUtils.BackgroundDexoptJobStatsLogger; - -import static dalvik.system.DexFile.isProfileGuidedCompilerFilter; - -import android.annotation.IntDef; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.app.job.JobInfo; -import android.app.job.JobParameters; -import android.app.job.JobScheduler; -import android.content.BroadcastReceiver; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.PackageInfo; -import android.os.BatteryManagerInternal; -import android.os.Binder; -import android.os.Environment; -import android.os.IThermalService; -import android.os.PowerManager; -import android.os.Process; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.os.SystemClock; -import android.os.SystemProperties; -import android.os.Trace; -import android.os.UserHandle; -import android.os.storage.StorageManager; -import android.util.ArraySet; -import android.util.Log; -import android.util.Slog; - -import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.FrameworkStatsLog; -import com.android.internal.util.FunctionalUtils.ThrowingCheckedSupplier; -import com.android.internal.util.IndentingPrintWriter; -import com.android.server.LocalServices; -import com.android.server.PinnerService; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; -import com.android.server.pm.PackageDexOptimizer.DexOptResult; -import com.android.server.pm.dex.DexManager; -import com.android.server.pm.dex.DexoptOptions; -import com.android.server.utils.TimingsTraceAndSlog; - -import java.io.File; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * Controls background dex optimization run as idle job or command line. - */ -public final class BackgroundDexOptService { - private static final String TAG = "BackgroundDexOptService"; - - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - @VisibleForTesting static final int JOB_IDLE_OPTIMIZE = 800; - @VisibleForTesting static final int JOB_POST_BOOT_UPDATE = 801; - - private static final long IDLE_OPTIMIZATION_PERIOD = TimeUnit.DAYS.toMillis(1); - - private static final long CANCELLATION_WAIT_CHECK_INTERVAL_MS = 200; - - private static final ComponentName sDexoptServiceName = - new ComponentName("android", BackgroundDexOptJobService.class.getName()); - - // Possible return codes of individual optimization steps. - /** Initial value. */ - public static final int STATUS_UNSPECIFIED = -1; - /** Ok status: Optimizations finished, All packages were processed, can continue */ - public static final int STATUS_OK = 0; - /** Optimizations should be aborted. Job scheduler requested it. */ - public static final int STATUS_ABORT_BY_CANCELLATION = 1; - /** Optimizations should be aborted. No space left on device. */ - public static final int STATUS_ABORT_NO_SPACE_LEFT = 2; - /** Optimizations should be aborted. Thermal throttling level too high. */ - public static final int STATUS_ABORT_THERMAL = 3; - /** Battery level too low */ - public static final int STATUS_ABORT_BATTERY = 4; - /** - * {@link PackageDexOptimizer#DEX_OPT_FAILED} case. This state means some packages have failed - * compilation during the job. Note that the failure will not be permanent as the next dexopt - * job will exclude those failed packages. - */ - public static final int STATUS_DEX_OPT_FAILED = 5; - /** Encountered fatal error, such as a runtime exception. */ - public static final int STATUS_FATAL_ERROR = 6; - - @IntDef(prefix = {"STATUS_"}, - value = - { - STATUS_UNSPECIFIED, - STATUS_OK, - STATUS_ABORT_BY_CANCELLATION, - STATUS_ABORT_NO_SPACE_LEFT, - STATUS_ABORT_THERMAL, - STATUS_ABORT_BATTERY, - STATUS_DEX_OPT_FAILED, - STATUS_FATAL_ERROR, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface Status {} - - // Used for calculating space threshold for downgrading unused apps. - private static final int LOW_THRESHOLD_MULTIPLIER_FOR_DOWNGRADE = 2; - - // Thermal cutoff value used if one isn't defined by a system property. - private static final int THERMAL_CUTOFF_DEFAULT = PowerManager.THERMAL_STATUS_MODERATE; - - private final Injector mInjector; - - private final DexOptHelper mDexOptHelper; - - private final BackgroundDexoptJobStatsLogger mStatsLogger = - new BackgroundDexoptJobStatsLogger(); - - private final Object mLock = new Object(); - - // Thread currently running dexopt. This will be null if dexopt is not running. - // The thread running dexopt make sure to set this into null when the pending dexopt is - // completed. - @GuardedBy("mLock") @Nullable private Thread mDexOptThread; - - // Thread currently cancelling dexopt. This thread is in blocked wait state until - // cancellation is done. Only this thread can change states for control. The other threads, if - // need to wait for cancellation, should just wait without doing any control. - @GuardedBy("mLock") @Nullable private Thread mDexOptCancellingThread; - - // Tells whether post boot update is completed or not. - @GuardedBy("mLock") private boolean mFinishedPostBootUpdate; - - // True if JobScheduler invocations of dexopt have been disabled. - @GuardedBy("mLock") private boolean mDisableJobSchedulerJobs; - - @GuardedBy("mLock") @Status private int mLastExecutionStatus = STATUS_UNSPECIFIED; - - @GuardedBy("mLock") private long mLastExecutionStartUptimeMs; - @GuardedBy("mLock") private long mLastExecutionDurationMs; - - // Keeps packages cancelled from PDO for last session. This is for debugging. - @GuardedBy("mLock") - private final ArraySet<String> mLastCancelledPackages = new ArraySet<String>(); - - /** - * Set of failed packages remembered across job runs. - */ - @GuardedBy("mLock") - private final ArraySet<String> mFailedPackageNamesPrimary = new ArraySet<String>(); - @GuardedBy("mLock") - private final ArraySet<String> mFailedPackageNamesSecondary = new ArraySet<String>(); - - private final long mDowngradeUnusedAppsThresholdInMillis; - - private final List<PackagesUpdatedListener> mPackagesUpdatedListeners = new ArrayList<>(); - - private int mThermalStatusCutoff = THERMAL_CUTOFF_DEFAULT; - - /** Listener for monitoring package change due to dexopt. */ - public interface PackagesUpdatedListener { - /** Called when the packages are updated through dexopt */ - void onPackagesUpdated(ArraySet<String> updatedPackages); - } - - public BackgroundDexOptService(Context context, DexManager dexManager, PackageManagerService pm) - throws LegacyDexoptDisabledException { - this(new Injector(context, dexManager, pm)); - } - - @VisibleForTesting - public BackgroundDexOptService(Injector injector) throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - mInjector = injector; - mDexOptHelper = mInjector.getDexOptHelper(); - LocalServices.addService(BackgroundDexOptService.class, this); - mDowngradeUnusedAppsThresholdInMillis = mInjector.getDowngradeUnusedAppsThresholdInMillis(); - } - - /** Start scheduling job after boot completion */ - public void systemReady() throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - if (mInjector.isBackgroundDexOptDisabled()) { - return; - } - - mInjector.getContext().registerReceiver(new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - mInjector.getContext().unregisterReceiver(this); - // queue both job. JOB_IDLE_OPTIMIZE will not start until JOB_POST_BOOT_UPDATE is - // completed. - scheduleAJob(JOB_POST_BOOT_UPDATE); - scheduleAJob(JOB_IDLE_OPTIMIZE); - if (DEBUG) { - Slog.d(TAG, "BootBgDexopt scheduled"); - } - } - }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); - } - - /** Dump the current state */ - public void dump(IndentingPrintWriter writer) { - boolean disabled = mInjector.isBackgroundDexOptDisabled(); - writer.print("enabled:"); - writer.println(!disabled); - if (disabled) { - return; - } - synchronized (mLock) { - writer.print("mDexOptThread:"); - writer.println(mDexOptThread); - writer.print("mDexOptCancellingThread:"); - writer.println(mDexOptCancellingThread); - writer.print("mFinishedPostBootUpdate:"); - writer.println(mFinishedPostBootUpdate); - writer.print("mDisableJobSchedulerJobs:"); - writer.println(mDisableJobSchedulerJobs); - writer.print("mLastExecutionStatus:"); - writer.println(mLastExecutionStatus); - writer.print("mLastExecutionStartUptimeMs:"); - writer.println(mLastExecutionStartUptimeMs); - writer.print("mLastExecutionDurationMs:"); - writer.println(mLastExecutionDurationMs); - writer.print("now:"); - writer.println(SystemClock.elapsedRealtime()); - writer.print("mLastCancelledPackages:"); - writer.println(String.join(",", mLastCancelledPackages)); - writer.print("mFailedPackageNamesPrimary:"); - writer.println(String.join(",", mFailedPackageNamesPrimary)); - writer.print("mFailedPackageNamesSecondary:"); - writer.println(String.join(",", mFailedPackageNamesSecondary)); - } - } - - /** Gets the instance of the service */ - public static BackgroundDexOptService getService() { - return LocalServices.getService(BackgroundDexOptService.class); - } - - /** - * Executes the background dexopt job immediately for selected packages or all packages. - * - * <p>This is only for shell command and only root or shell user can use this. - * - * @param packageNames dex optimize the passed packages in the given order, or all packages in - * the default order if null - * - * @return true if dex optimization is complete. false if the task is cancelled or if there was - * an error. - */ - public boolean runBackgroundDexoptJob(@Nullable List<String> packageNames) - throws LegacyDexoptDisabledException { - enforceRootOrShell(); - long identity = Binder.clearCallingIdentity(); - try { - synchronized (mLock) { - // Do not cancel and wait for completion if there is pending task. - waitForDexOptThreadToFinishLocked(); - resetStatesForNewDexOptRunLocked(Thread.currentThread()); - } - PackageManagerService pm = mInjector.getPackageManagerService(); - List<String> packagesToOptimize; - if (packageNames == null) { - packagesToOptimize = mDexOptHelper.getOptimizablePackages(pm.snapshotComputer()); - } else { - packagesToOptimize = packageNames; - } - return runIdleOptimization(pm, packagesToOptimize, /* isPostBootUpdate= */ false); - } finally { - Binder.restoreCallingIdentity(identity); - markDexOptCompleted(); - } - } - - /** - * Cancels currently running any idle optimization tasks started from JobScheduler - * or runIdleOptimization call. - * - * <p>This is only for shell command and only root or shell user can use this. - */ - public void cancelBackgroundDexoptJob() throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - enforceRootOrShell(); - Binder.withCleanCallingIdentity(() -> cancelDexOptAndWaitForCompletion()); - } - - /** - * Sets a flag that disables jobs from being started from JobScheduler. - * - * This state is not persistent and is only retained in this service instance. - * - * This is intended for shell command use and only root or shell users can call it. - * - * @param disable True if JobScheduler invocations should be disabled, false otherwise. - */ - public void setDisableJobSchedulerJobs(boolean disable) throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - enforceRootOrShell(); - synchronized (mLock) { - mDisableJobSchedulerJobs = disable; - } - } - - /** Adds listener for package update */ - public void addPackagesUpdatedListener(PackagesUpdatedListener listener) - throws LegacyDexoptDisabledException { - // TODO(b/251903639): Evaluate whether this needs to support ART Service or not. - Installer.checkLegacyDexoptDisabled(); - synchronized (mLock) { - mPackagesUpdatedListeners.add(listener); - } - } - - /** Removes package update listener */ - public void removePackagesUpdatedListener(PackagesUpdatedListener listener) - throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - synchronized (mLock) { - mPackagesUpdatedListeners.remove(listener); - } - } - - /** - * Notifies package change and removes the package from the failed package list so that - * the package can run dexopt again. - */ - public void notifyPackageChanged(String packageName) throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - // The idle maintenance job skips packages which previously failed to - // compile. The given package has changed and may successfully compile - // now. Remove it from the list of known failing packages. - synchronized (mLock) { - mFailedPackageNamesPrimary.remove(packageName); - mFailedPackageNamesSecondary.remove(packageName); - } - } - - /** For BackgroundDexOptJobService to dispatch onStartJob event */ - /* package */ boolean onStartJob(BackgroundDexOptJobService job, JobParameters params) { - Slog.i(TAG, "onStartJob:" + params.getJobId()); - - boolean isPostBootUpdateJob = params.getJobId() == JOB_POST_BOOT_UPDATE; - // NOTE: PackageManagerService.isStorageLow uses a different set of criteria from - // the checks above. This check is not "live" - the value is determined by a background - // restart with a period of ~1 minute. - PackageManagerService pm = mInjector.getPackageManagerService(); - if (pm.isStorageLow()) { - Slog.w(TAG, "Low storage, skipping this run"); - markPostBootUpdateCompleted(params); - return false; - } - - List<String> pkgs = mDexOptHelper.getOptimizablePackages(pm.snapshotComputer()); - if (pkgs.isEmpty()) { - Slog.i(TAG, "No packages to optimize"); - markPostBootUpdateCompleted(params); - return false; - } - - mThermalStatusCutoff = mInjector.getDexOptThermalCutoff(); - - synchronized (mLock) { - if (mDisableJobSchedulerJobs) { - Slog.i(TAG, "JobScheduler invocations disabled"); - return false; - } - if (mDexOptThread != null && mDexOptThread.isAlive()) { - // Other task is already running. - return false; - } - if (!isPostBootUpdateJob && !mFinishedPostBootUpdate) { - // Post boot job not finished yet. Run post boot job first. - return false; - } - try { - resetStatesForNewDexOptRunLocked(mInjector.createAndStartThread( - "BackgroundDexOptService_" + (isPostBootUpdateJob ? "PostBoot" : "Idle"), - () -> { - TimingsTraceAndSlog tr = - new TimingsTraceAndSlog(TAG, Trace.TRACE_TAG_DALVIK); - tr.traceBegin("jobExecution"); - boolean completed = false; - boolean fatalError = false; - try { - completed = runIdleOptimization( - pm, pkgs, params.getJobId() == JOB_POST_BOOT_UPDATE); - } catch (LegacyDexoptDisabledException e) { - Slog.wtf(TAG, e); - } catch (RuntimeException e) { - fatalError = true; - throw e; - } finally { // Those cleanup should be done always. - tr.traceEnd(); - Slog.i(TAG, - "dexopt finishing. jobid:" + params.getJobId() - + " completed:" + completed); - - writeStatsLog(params); - - if (params.getJobId() == JOB_POST_BOOT_UPDATE) { - if (completed) { - markPostBootUpdateCompleted(params); - } - } - // Reschedule when cancelled. No need to reschedule when failed with - // fatal error because it's likely to fail again. - job.jobFinished(params, !completed && !fatalError); - markDexOptCompleted(); - } - })); - } catch (LegacyDexoptDisabledException e) { - Slog.wtf(TAG, e); - } - } - return true; - } - - /** For BackgroundDexOptJobService to dispatch onStopJob event */ - /* package */ boolean onStopJob(BackgroundDexOptJobService job, JobParameters params) { - Slog.i(TAG, "onStopJob:" + params.getJobId()); - // This cannot block as it is in main thread, thus dispatch to a newly created thread - // and cancel it from there. As this event does not happen often, creating a new thread - // is justified rather than having one thread kept permanently. - mInjector.createAndStartThread("DexOptCancel", () -> { - try { - cancelDexOptAndWaitForCompletion(); - } catch (LegacyDexoptDisabledException e) { - Slog.wtf(TAG, e); - } - }); - // Always reschedule for cancellation. - return true; - } - - /** - * Cancels pending dexopt and wait for completion of the cancellation. This can block the caller - * until cancellation is done. - */ - private void cancelDexOptAndWaitForCompletion() throws LegacyDexoptDisabledException { - synchronized (mLock) { - if (mDexOptThread == null) { - return; - } - if (mDexOptCancellingThread != null && mDexOptCancellingThread.isAlive()) { - // No control, just wait - waitForDexOptThreadToFinishLocked(); - // Do not wait for other cancellation's complete. That will be handled by the next - // start flow. - return; - } - mDexOptCancellingThread = Thread.currentThread(); - // Take additional caution to make sure that we do not leave this call - // with controlDexOptBlockingLocked(true) state. - try { - controlDexOptBlockingLocked(true); - waitForDexOptThreadToFinishLocked(); - } finally { - // Reset to default states regardless of previous states - mDexOptCancellingThread = null; - mDexOptThread = null; - controlDexOptBlockingLocked(false); - mLock.notifyAll(); - } - } - } - - @GuardedBy("mLock") - private void waitForDexOptThreadToFinishLocked() { - TimingsTraceAndSlog tr = new TimingsTraceAndSlog(TAG, Trace.TRACE_TAG_PACKAGE_MANAGER); - // This tracing section doesn't have any correspondence in ART Service - it never waits for - // cancellation to finish. - tr.traceBegin("waitForDexOptThreadToFinishLocked"); - try { - // Wait but check in regular internal to see if the thread is still alive. - while (mDexOptThread != null && mDexOptThread.isAlive()) { - mLock.wait(CANCELLATION_WAIT_CHECK_INTERVAL_MS); - } - } catch (InterruptedException e) { - Slog.w(TAG, "Interrupted while waiting for dexopt thread"); - Thread.currentThread().interrupt(); - } - tr.traceEnd(); - } - - private void markDexOptCompleted() { - synchronized (mLock) { - if (mDexOptThread != Thread.currentThread()) { - throw new IllegalStateException( - "Only mDexOptThread can mark completion, mDexOptThread:" + mDexOptThread - + " current:" + Thread.currentThread()); - } - mDexOptThread = null; - // Other threads may be waiting for completion. - mLock.notifyAll(); - } - } - - @GuardedBy("mLock") - private void resetStatesForNewDexOptRunLocked(Thread thread) - throws LegacyDexoptDisabledException { - mDexOptThread = thread; - mLastCancelledPackages.clear(); - controlDexOptBlockingLocked(false); - } - - private void enforceRootOrShell() { - int uid = mInjector.getCallingUid(); - if (uid != Process.ROOT_UID && uid != Process.SHELL_UID) { - throw new SecurityException("Should be shell or root user"); - } - } - - @GuardedBy("mLock") - private void controlDexOptBlockingLocked(boolean block) throws LegacyDexoptDisabledException { - PackageManagerService pm = mInjector.getPackageManagerService(); - mDexOptHelper.controlDexOptBlocking(block); - } - - private void scheduleAJob(int jobId) { - JobScheduler js = mInjector.getJobScheduler(); - JobInfo.Builder builder = - new JobInfo.Builder(jobId, sDexoptServiceName).setRequiresDeviceIdle(true); - if (jobId == JOB_IDLE_OPTIMIZE) { - builder.setRequiresCharging(true).setPeriodic(IDLE_OPTIMIZATION_PERIOD); - } - js.schedule(builder.build()); - } - - private long getLowStorageThreshold() { - long lowThreshold = mInjector.getDataDirStorageLowBytes(); - if (lowThreshold == 0) { - Slog.e(TAG, "Invalid low storage threshold"); - } - - return lowThreshold; - } - - private void logStatus(int status) { - switch (status) { - case STATUS_OK: - Slog.i(TAG, "Idle optimizations completed."); - break; - case STATUS_ABORT_NO_SPACE_LEFT: - Slog.w(TAG, "Idle optimizations aborted because of space constraints."); - break; - case STATUS_ABORT_BY_CANCELLATION: - Slog.w(TAG, "Idle optimizations aborted by cancellation."); - break; - case STATUS_ABORT_THERMAL: - Slog.w(TAG, "Idle optimizations aborted by thermal throttling."); - break; - case STATUS_ABORT_BATTERY: - Slog.w(TAG, "Idle optimizations aborted by low battery."); - break; - case STATUS_DEX_OPT_FAILED: - Slog.w(TAG, "Idle optimizations failed from dexopt."); - break; - default: - Slog.w(TAG, "Idle optimizations ended with unexpected code: " + status); - break; - } - } - - /** - * Returns whether we've successfully run the job. Note that it will return true even if some - * packages may have failed compiling. - */ - private boolean runIdleOptimization(PackageManagerService pm, List<String> pkgs, - boolean isPostBootUpdate) throws LegacyDexoptDisabledException { - synchronized (mLock) { - mLastExecutionStatus = STATUS_UNSPECIFIED; - mLastExecutionStartUptimeMs = SystemClock.uptimeMillis(); - mLastExecutionDurationMs = -1; - } - - int status = STATUS_UNSPECIFIED; - try { - long lowStorageThreshold = getLowStorageThreshold(); - status = idleOptimizePackages(pm, pkgs, lowStorageThreshold, isPostBootUpdate); - logStatus(status); - return status == STATUS_OK || status == STATUS_DEX_OPT_FAILED; - } catch (RuntimeException e) { - status = STATUS_FATAL_ERROR; - throw e; - } finally { - synchronized (mLock) { - mLastExecutionStatus = status; - mLastExecutionDurationMs = SystemClock.uptimeMillis() - mLastExecutionStartUptimeMs; - } - } - } - - /** Gets the size of the directory. It uses recursion to go over all files. */ - private long getDirectorySize(File f) { - long size = 0; - if (f.isDirectory()) { - for (File file : f.listFiles()) { - size += getDirectorySize(file); - } - } else { - size = f.length(); - } - return size; - } - - /** Gets the size of a package. */ - private long getPackageSize(@NonNull Computer snapshot, String pkg) { - // TODO(b/251903639): Make this in line with the calculation in - // `DexOptHelper.DexoptDoneHandler`. - PackageInfo info = snapshot.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM); - long size = 0; - if (info != null && info.applicationInfo != null) { - File path = Paths.get(info.applicationInfo.sourceDir).toFile(); - if (path.isFile()) { - path = path.getParentFile(); - } - size += getDirectorySize(path); - if (!ArrayUtils.isEmpty(info.applicationInfo.splitSourceDirs)) { - for (String splitSourceDir : info.applicationInfo.splitSourceDirs) { - File pathSplitSourceDir = Paths.get(splitSourceDir).toFile(); - if (pathSplitSourceDir.isFile()) { - pathSplitSourceDir = pathSplitSourceDir.getParentFile(); - } - if (path.getAbsolutePath().equals(pathSplitSourceDir.getAbsolutePath())) { - continue; - } - size += getDirectorySize(pathSplitSourceDir); - } - } - return size; - } - return 0; - } - - @Status - private int idleOptimizePackages(PackageManagerService pm, List<String> pkgs, - long lowStorageThreshold, boolean isPostBootUpdate) - throws LegacyDexoptDisabledException { - ArraySet<String> updatedPackages = new ArraySet<>(); - - try { - boolean supportSecondaryDex = mInjector.supportSecondaryDex(); - - if (supportSecondaryDex) { - @Status int result = reconcileSecondaryDexFiles(); - if (result != STATUS_OK) { - return result; - } - } - - // Only downgrade apps when space is low on device. - // Threshold is selected above the lowStorageThreshold so that we can pro-actively clean - // up disk before user hits the actual lowStorageThreshold. - long lowStorageThresholdForDowngrade = - LOW_THRESHOLD_MULTIPLIER_FOR_DOWNGRADE * lowStorageThreshold; - boolean shouldDowngrade = shouldDowngrade(lowStorageThresholdForDowngrade); - if (DEBUG) { - Slog.d(TAG, "Should Downgrade " + shouldDowngrade); - } - if (shouldDowngrade) { - final Computer snapshot = pm.snapshotComputer(); - Set<String> unusedPackages = - snapshot.getUnusedPackages(mDowngradeUnusedAppsThresholdInMillis); - if (DEBUG) { - Slog.d(TAG, "Unsused Packages " + String.join(",", unusedPackages)); - } - - if (!unusedPackages.isEmpty()) { - for (String pkg : unusedPackages) { - @Status int abortCode = abortIdleOptimizations(/*lowStorageThreshold*/ -1); - if (abortCode != STATUS_OK) { - // Should be aborted by the scheduler. - return abortCode; - } - @DexOptResult - int downgradeResult = downgradePackage(snapshot, pm, pkg, - /* isForPrimaryDex= */ true, isPostBootUpdate); - if (downgradeResult == PackageDexOptimizer.DEX_OPT_PERFORMED) { - updatedPackages.add(pkg); - } - @Status - int status = convertPackageDexOptimizerStatusToInternal(downgradeResult); - if (status != STATUS_OK) { - return status; - } - if (supportSecondaryDex) { - downgradeResult = downgradePackage(snapshot, pm, pkg, - /* isForPrimaryDex= */ false, isPostBootUpdate); - status = convertPackageDexOptimizerStatusToInternal(downgradeResult); - if (status != STATUS_OK) { - return status; - } - } - } - - pkgs = new ArrayList<>(pkgs); - pkgs.removeAll(unusedPackages); - } - } - - return optimizePackages(pkgs, lowStorageThreshold, updatedPackages, isPostBootUpdate); - } finally { - // Always let the pinner service know about changes. - // TODO(b/251903639): ART Service does this for all dexopts, while the code below only - // runs for background jobs. We should try to make them behave the same. - notifyPinService(updatedPackages); - // Only notify IORap the primary dex opt, because we don't want to - // invalidate traces unnecessary due to b/161633001 and that it's - // better to have a trace than no trace at all. - notifyPackagesUpdated(updatedPackages); - } - } - - @Status - private int optimizePackages(List<String> pkgs, long lowStorageThreshold, - ArraySet<String> updatedPackages, boolean isPostBootUpdate) - throws LegacyDexoptDisabledException { - boolean supportSecondaryDex = mInjector.supportSecondaryDex(); - - // Keep the error if there is any error from any package. - @Status int status = STATUS_OK; - - // Other than cancellation, all packages will be processed even if an error happens - // in a package. - for (String pkg : pkgs) { - int abortCode = abortIdleOptimizations(lowStorageThreshold); - if (abortCode != STATUS_OK) { - // Either aborted by the scheduler or no space left. - return abortCode; - } - - @DexOptResult - int primaryResult = optimizePackage(pkg, true /* isForPrimaryDex */, isPostBootUpdate); - if (primaryResult == PackageDexOptimizer.DEX_OPT_CANCELLED) { - return STATUS_ABORT_BY_CANCELLATION; - } - if (primaryResult == PackageDexOptimizer.DEX_OPT_PERFORMED) { - updatedPackages.add(pkg); - } else if (primaryResult == PackageDexOptimizer.DEX_OPT_FAILED) { - status = convertPackageDexOptimizerStatusToInternal(primaryResult); - } - - if (!supportSecondaryDex) { - continue; - } - - @DexOptResult - int secondaryResult = - optimizePackage(pkg, false /* isForPrimaryDex */, isPostBootUpdate); - if (secondaryResult == PackageDexOptimizer.DEX_OPT_CANCELLED) { - return STATUS_ABORT_BY_CANCELLATION; - } - if (secondaryResult == PackageDexOptimizer.DEX_OPT_FAILED) { - status = convertPackageDexOptimizerStatusToInternal(secondaryResult); - } - } - return status; - } - - /** - * Try to downgrade the package to a smaller compilation filter. - * eg. if the package is in speed-profile the package will be downgraded to verify. - * @param pm PackageManagerService - * @param pkg The package to be downgraded. - * @param isForPrimaryDex Apps can have several dex file, primary and secondary. - * @return PackageDexOptimizer.DEX_* - */ - @DexOptResult - private int downgradePackage(@NonNull Computer snapshot, PackageManagerService pm, String pkg, - boolean isForPrimaryDex, boolean isPostBootUpdate) - throws LegacyDexoptDisabledException { - if (DEBUG) { - Slog.d(TAG, "Downgrading " + pkg); - } - if (isCancelling()) { - return PackageDexOptimizer.DEX_OPT_CANCELLED; - } - int reason = PackageManagerService.REASON_INACTIVE_PACKAGE_DOWNGRADE; - String filter = getCompilerFilterForReason(reason); - int dexoptFlags = DexoptOptions.DEXOPT_BOOT_COMPLETE | DexoptOptions.DEXOPT_DOWNGRADE; - - if (isProfileGuidedCompilerFilter(filter)) { - // We don't expect updates in current profiles to be significant here, but - // DEXOPT_CHECK_FOR_PROFILES_UPDATES is set to replicate behaviour that will be - // unconditionally enabled for profile guided filters when ART Service is called instead - // of the legacy PackageDexOptimizer implementation. - dexoptFlags |= DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES; - } - - if (!isPostBootUpdate) { - dexoptFlags |= DexoptOptions.DEXOPT_IDLE_BACKGROUND_JOB; - } - - long package_size_before = getPackageSize(snapshot, pkg); - int result = PackageDexOptimizer.DEX_OPT_SKIPPED; - if (isForPrimaryDex || PLATFORM_PACKAGE_NAME.equals(pkg)) { - // This applies for system apps or if packages location is not a directory, i.e. - // monolithic install. - if (!pm.canHaveOatDir(snapshot, pkg)) { - // For apps that don't have the oat directory, instead of downgrading, - // remove their compiler artifacts from dalvik cache. - pm.deleteOatArtifactsOfPackage(snapshot, pkg); - } else { - result = performDexOptPrimary(pkg, reason, filter, dexoptFlags); - } - } else { - result = performDexOptSecondary(pkg, reason, filter, dexoptFlags); - } - - if (result == PackageDexOptimizer.DEX_OPT_PERFORMED) { - final Computer newSnapshot = pm.snapshotComputer(); - FrameworkStatsLog.write(FrameworkStatsLog.APP_DOWNGRADED, pkg, package_size_before, - getPackageSize(newSnapshot, pkg), /*aggressive=*/false); - } - return result; - } - - @Status - private int reconcileSecondaryDexFiles() throws LegacyDexoptDisabledException { - // TODO(calin): should we denylist packages for which we fail to reconcile? - for (String p : mInjector.getDexManager().getAllPackagesWithSecondaryDexFiles()) { - if (isCancelling()) { - return STATUS_ABORT_BY_CANCELLATION; - } - mInjector.getDexManager().reconcileSecondaryDexFiles(p); - } - return STATUS_OK; - } - - /** - * - * Optimize package if needed. Note that there can be no race between - * concurrent jobs because PackageDexOptimizer.performDexOpt is synchronized. - * @param pkg The package to be downgraded. - * @param isForPrimaryDex Apps can have several dex file, primary and secondary. - * @param isPostBootUpdate is post boot update or not. - * @return PackageDexOptimizer#DEX_OPT_* - */ - @DexOptResult - private int optimizePackage(String pkg, boolean isForPrimaryDex, boolean isPostBootUpdate) - throws LegacyDexoptDisabledException { - int reason = isPostBootUpdate ? PackageManagerService.REASON_POST_BOOT - : PackageManagerService.REASON_BACKGROUND_DEXOPT; - String filter = getCompilerFilterForReason(reason); - - int dexoptFlags = DexoptOptions.DEXOPT_BOOT_COMPLETE; - if (!isPostBootUpdate) { - dexoptFlags |= DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES - | DexoptOptions.DEXOPT_IDLE_BACKGROUND_JOB; - } - - if (isProfileGuidedCompilerFilter(filter)) { - // Ensure DEXOPT_CHECK_FOR_PROFILES_UPDATES is enabled if the filter is profile guided, - // to replicate behaviour that will be unconditionally enabled when ART Service is - // called instead of the legacy PackageDexOptimizer implementation. - dexoptFlags |= DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES; - } - - // System server share the same code path as primary dex files. - // PackageManagerService will select the right optimization path for it. - if (isForPrimaryDex || PLATFORM_PACKAGE_NAME.equals(pkg)) { - return performDexOptPrimary(pkg, reason, filter, dexoptFlags); - } else { - return performDexOptSecondary(pkg, reason, filter, dexoptFlags); - } - } - - @DexOptResult - private int performDexOptPrimary(String pkg, int reason, String filter, int dexoptFlags) - throws LegacyDexoptDisabledException { - DexoptOptions dexoptOptions = - new DexoptOptions(pkg, reason, filter, /*splitName=*/null, dexoptFlags); - return trackPerformDexOpt(pkg, /*isForPrimaryDex=*/true, - () -> mDexOptHelper.performDexOptWithStatus(dexoptOptions)); - } - - @DexOptResult - private int performDexOptSecondary(String pkg, int reason, String filter, int dexoptFlags) - throws LegacyDexoptDisabledException { - DexoptOptions dexoptOptions = new DexoptOptions(pkg, reason, filter, /*splitName=*/null, - dexoptFlags | DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX); - return trackPerformDexOpt(pkg, /*isForPrimaryDex=*/false, - () - -> mDexOptHelper.performDexOpt(dexoptOptions) - ? PackageDexOptimizer.DEX_OPT_PERFORMED - : PackageDexOptimizer.DEX_OPT_FAILED); - } - - /** - * Execute the dexopt wrapper and make sure that if performDexOpt wrapper fails - * the package is added to the list of failed packages. - * Return one of following result: - * {@link PackageDexOptimizer#DEX_OPT_SKIPPED} - * {@link PackageDexOptimizer#DEX_OPT_CANCELLED} - * {@link PackageDexOptimizer#DEX_OPT_PERFORMED} - * {@link PackageDexOptimizer#DEX_OPT_FAILED} - */ - @DexOptResult - private int trackPerformDexOpt(String pkg, boolean isForPrimaryDex, - ThrowingCheckedSupplier<Integer, LegacyDexoptDisabledException> performDexOptWrapper) - throws LegacyDexoptDisabledException { - ArraySet<String> failedPackageNames; - synchronized (mLock) { - failedPackageNames = - isForPrimaryDex ? mFailedPackageNamesPrimary : mFailedPackageNamesSecondary; - if (failedPackageNames.contains(pkg)) { - // Skip previously failing package - return PackageDexOptimizer.DEX_OPT_SKIPPED; - } - } - int result = performDexOptWrapper.get(); - if (result == PackageDexOptimizer.DEX_OPT_FAILED) { - synchronized (mLock) { - failedPackageNames.add(pkg); - } - } else if (result == PackageDexOptimizer.DEX_OPT_CANCELLED) { - synchronized (mLock) { - mLastCancelledPackages.add(pkg); - } - } - return result; - } - - @Status - private int convertPackageDexOptimizerStatusToInternal(@DexOptResult int pdoStatus) { - switch (pdoStatus) { - case PackageDexOptimizer.DEX_OPT_CANCELLED: - return STATUS_ABORT_BY_CANCELLATION; - case PackageDexOptimizer.DEX_OPT_FAILED: - return STATUS_DEX_OPT_FAILED; - case PackageDexOptimizer.DEX_OPT_PERFORMED: - case PackageDexOptimizer.DEX_OPT_SKIPPED: - return STATUS_OK; - default: - Slog.e(TAG, "Unkknown error code from PackageDexOptimizer:" + pdoStatus, - new RuntimeException()); - return STATUS_DEX_OPT_FAILED; - } - } - - /** Evaluate whether or not idle optimizations should continue. */ - @Status - private int abortIdleOptimizations(long lowStorageThreshold) { - if (isCancelling()) { - // JobScheduler requested an early abort. - return STATUS_ABORT_BY_CANCELLATION; - } - - // Abort background dexopt if the device is in a moderate or stronger thermal throttling - // state. - int thermalStatus = mInjector.getCurrentThermalStatus(); - if (DEBUG) { - Log.d(TAG, "Thermal throttling status during bgdexopt: " + thermalStatus); - } - if (thermalStatus >= mThermalStatusCutoff) { - return STATUS_ABORT_THERMAL; - } - - if (mInjector.isBatteryLevelLow()) { - return STATUS_ABORT_BATTERY; - } - - long usableSpace = mInjector.getDataDirUsableSpace(); - if (usableSpace < lowStorageThreshold) { - // Rather bail than completely fill up the disk. - Slog.w(TAG, "Aborting background dex opt job due to low storage: " + usableSpace); - return STATUS_ABORT_NO_SPACE_LEFT; - } - - return STATUS_OK; - } - - // Evaluate whether apps should be downgraded. - private boolean shouldDowngrade(long lowStorageThresholdForDowngrade) { - if (mInjector.getDataDirUsableSpace() < lowStorageThresholdForDowngrade) { - return true; - } - - return false; - } - - private boolean isCancelling() { - synchronized (mLock) { - return mDexOptCancellingThread != null; - } - } - - private void markPostBootUpdateCompleted(JobParameters params) { - if (params.getJobId() != JOB_POST_BOOT_UPDATE) { - return; - } - synchronized (mLock) { - if (!mFinishedPostBootUpdate) { - mFinishedPostBootUpdate = true; - } - } - // Safe to do this outside lock. - mInjector.getJobScheduler().cancel(JOB_POST_BOOT_UPDATE); - } - - private void notifyPinService(ArraySet<String> updatedPackages) { - PinnerService pinnerService = mInjector.getPinnerService(); - if (pinnerService != null) { - Slog.i(TAG, "Pinning optimized code " + updatedPackages); - pinnerService.update(updatedPackages, false /* force */); - } - } - - /** Notify all listeners (#addPackagesUpdatedListener) that packages have been updated. */ - private void notifyPackagesUpdated(ArraySet<String> updatedPackages) { - synchronized (mLock) { - for (PackagesUpdatedListener listener : mPackagesUpdatedListeners) { - listener.onPackagesUpdated(updatedPackages); - } - } - } - - private void writeStatsLog(JobParameters params) { - @Status int status; - long durationMs; - long durationIncludingSleepMs; - synchronized (mLock) { - status = mLastExecutionStatus; - durationMs = mLastExecutionDurationMs; - } - - mStatsLogger.write(status, params.getStopReason(), durationMs); - } - - /** Injector pattern for testing purpose */ - @VisibleForTesting - static final class Injector { - private final Context mContext; - private final DexManager mDexManager; - private final PackageManagerService mPackageManagerService; - private final File mDataDir = Environment.getDataDirectory(); - - Injector(Context context, DexManager dexManager, PackageManagerService pm) { - mContext = context; - mDexManager = dexManager; - mPackageManagerService = pm; - } - - int getCallingUid() { - return Binder.getCallingUid(); - } - - Context getContext() { - return mContext; - } - - PackageManagerService getPackageManagerService() { - return mPackageManagerService; - } - - DexOptHelper getDexOptHelper() { - return new DexOptHelper(getPackageManagerService()); - } - - JobScheduler getJobScheduler() { - return mContext.getSystemService(JobScheduler.class); - } - - DexManager getDexManager() { - return mDexManager; - } - - PinnerService getPinnerService() { - return LocalServices.getService(PinnerService.class); - } - - boolean isBackgroundDexOptDisabled() { - return SystemProperties.getBoolean( - "pm.dexopt.disable_bg_dexopt" /* key */, false /* default */); - } - - boolean isBatteryLevelLow() { - return LocalServices.getService(BatteryManagerInternal.class).getBatteryLevelLow(); - } - - long getDowngradeUnusedAppsThresholdInMillis() { - String sysPropKey = "pm.dexopt.downgrade_after_inactive_days"; - String sysPropValue = SystemProperties.get(sysPropKey); - if (sysPropValue == null || sysPropValue.isEmpty()) { - Slog.w(TAG, "SysProp " + sysPropKey + " not set"); - return Long.MAX_VALUE; - } - return TimeUnit.DAYS.toMillis(Long.parseLong(sysPropValue)); - } - - boolean supportSecondaryDex() { - return (SystemProperties.getBoolean("dalvik.vm.dexopt.secondary", false)); - } - - long getDataDirUsableSpace() { - return mDataDir.getUsableSpace(); - } - - long getDataDirStorageLowBytes() { - return mContext.getSystemService(StorageManager.class).getStorageLowBytes(mDataDir); - } - - int getCurrentThermalStatus() { - IThermalService thermalService = IThermalService.Stub.asInterface( - ServiceManager.getService(Context.THERMAL_SERVICE)); - try { - return thermalService.getCurrentThermalStatus(); - } catch (RemoteException e) { - return STATUS_ABORT_THERMAL; - } - } - - int getDexOptThermalCutoff() { - return SystemProperties.getInt( - "dalvik.vm.dexopt.thermal-cutoff", THERMAL_CUTOFF_DEFAULT); - } - - Thread createAndStartThread(String name, Runnable target) { - Thread thread = new Thread(target, name); - Slog.i(TAG, "Starting thread:" + name); - thread.start(); - return thread; - } - } -} diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index b5476fdd3050..2005b17e82a6 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -137,7 +137,7 @@ import com.android.internal.util.CollectionUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.modules.utils.TypedXmlSerializer; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; +import com.android.server.ondeviceintelligence.OnDeviceIntelligenceManagerInternal; import com.android.server.pm.dex.DexManager; import com.android.server.pm.dex.PackageDexUsage; import com.android.server.pm.parsing.PackageInfoUtils; @@ -419,7 +419,6 @@ public class ComputerEngine implements Computer { private final PackageDexOptimizer mPackageDexOptimizer; private final DexManager mDexManager; private final CompilerStats mCompilerStats; - private final BackgroundDexOptService mBackgroundDexOptService; private final PackageManagerInternal.ExternalSourcesPolicy mExternalSourcesPolicy; private final CrossProfileIntentResolverEngine mCrossProfileIntentResolverEngine; @@ -472,7 +471,6 @@ public class ComputerEngine implements Computer { mPackageDexOptimizer = args.service.mPackageDexOptimizer; mDexManager = args.service.getDexManager(); mCompilerStats = args.service.mCompilerStats; - mBackgroundDexOptService = args.service.mBackgroundDexOptService; mExternalSourcesPolicy = args.service.mExternalSourcesPolicy; mCrossProfileIntentResolverEngine = new CrossProfileIntentResolverEngine( mUserManager, mDomainVerificationManager, mDefaultAppProvider, mContext); @@ -3093,40 +3091,7 @@ public class ComputerEngine implements Computer { } ipw.println("Dexopt state:"); ipw.increaseIndent(); - if (DexOptHelper.useArtService()) { - DexOptHelper.dumpDexoptState(ipw, packageName); - } else { - Collection<? extends PackageStateInternal> pkgSettings; - if (setting != null) { - pkgSettings = Collections.singletonList(setting); - } else { - pkgSettings = mSettings.getPackages().values(); - } - - for (PackageStateInternal pkgSetting : pkgSettings) { - final AndroidPackage pkg = pkgSetting.getPkg(); - if (pkg == null || pkg.isApex()) { - // Skip APEX which is not dex-optimized - continue; - } - final String pkgName = pkg.getPackageName(); - ipw.println("[" + pkgName + "]"); - ipw.increaseIndent(); - - // TODO(b/251903639): Call into ART Service. - try { - mPackageDexOptimizer.dumpDexoptState(ipw, pkg, pkgSetting, - mDexManager.getPackageUseInfoOrDefault(pkgName)); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - ipw.decreaseIndent(); - } - ipw.println("BgDexopt state:"); - ipw.increaseIndent(); - mBackgroundDexOptService.dump(ipw); - ipw.decreaseIndent(); - } + DexOptHelper.dumpDexoptState(ipw, packageName); ipw.decreaseIndent(); break; } @@ -4389,9 +4354,8 @@ public class ComputerEngine implements Computer { if (Process.isSdkSandboxUid(uid)) { uid = getBaseSdkSandboxUid(); } - if (Process.isIsolatedUid(uid) - && mPermissionManager.getHotwordDetectionServiceProvider() != null - && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) { + final int callingUserId = UserHandle.getUserId(callingUid); + if (isKnownIsolatedComputeApp(uid, callingUserId)) { try { uid = getIsolatedOwner(uid); } catch (IllegalStateException e) { @@ -4399,7 +4363,6 @@ public class ComputerEngine implements Computer { Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e); } } - final int callingUserId = UserHandle.getUserId(callingUid); final int appId = UserHandle.getAppId(uid); final Object obj = mSettings.getSettingBase(appId); if (obj instanceof SharedUserSetting) { @@ -4435,9 +4398,7 @@ public class ComputerEngine implements Computer { if (Process.isSdkSandboxUid(uid)) { uid = getBaseSdkSandboxUid(); } - if (Process.isIsolatedUid(uid) - && mPermissionManager.getHotwordDetectionServiceProvider() != null - && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) { + if (isKnownIsolatedComputeApp(uid, callingUserId)) { try { uid = getIsolatedOwner(uid); } catch (IllegalStateException e) { @@ -5838,6 +5799,43 @@ public class ComputerEngine implements Computer { return getPackage(mService.getSdkSandboxPackageName()).getUid(); } + + private boolean isKnownIsolatedComputeApp(int uid, int callingUserId) { + if (!Process.isIsolatedUid(uid)) { + return false; + } + final boolean isHotword = + mPermissionManager.getHotwordDetectionServiceProvider() != null + && uid + == mPermissionManager.getHotwordDetectionServiceProvider().getUid(); + if (isHotword) { + return true; + } + OnDeviceIntelligenceManagerInternal onDeviceIntelligenceManagerInternal = + mInjector.getLocalService(OnDeviceIntelligenceManagerInternal.class); + if (onDeviceIntelligenceManagerInternal == null) { + return false; + } + + String onDeviceIntelligencePackage = + onDeviceIntelligenceManagerInternal.getRemoteServicePackageName(); + if (onDeviceIntelligencePackage == null) { + return false; + } + + try { + if (getIsolatedOwner(uid) == getPackageUid(onDeviceIntelligencePackage, 0, + callingUserId)) { + return true; + } + } catch (IllegalStateException e) { + // If the owner uid doesn't exist, just use the current uid + Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e); + } + + return false; + } + @Nullable @Override public SharedUserApi getSharedUser(int sharedUserAppId) { diff --git a/services/core/java/com/android/server/pm/DexOptHelper.java b/services/core/java/com/android/server/pm/DexOptHelper.java index ecfc768a874e..51793f65f7a1 100644 --- a/services/core/java/com/android/server/pm/DexOptHelper.java +++ b/services/core/java/com/android/server/pm/DexOptHelper.java @@ -23,7 +23,6 @@ import static android.os.incremental.IncrementalManager.isIncrementalPath; import static com.android.server.LocalManagerRegistry.ManagerNotFoundException; import static com.android.server.pm.ApexManager.ActiveApexInfo; -import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.PackageManagerService.DEBUG_DEXOPT; import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; import static com.android.server.pm.PackageManagerService.REASON_BOOT_AFTER_MAINLINE_UPDATE; @@ -32,10 +31,7 @@ import static com.android.server.pm.PackageManagerService.REASON_CMDLINE; import static com.android.server.pm.PackageManagerService.REASON_FIRST_BOOT; import static com.android.server.pm.PackageManagerService.SCAN_AS_APEX; import static com.android.server.pm.PackageManagerService.SCAN_AS_INSTANT_APP; -import static com.android.server.pm.PackageManagerService.STUB_SUFFIX; import static com.android.server.pm.PackageManagerService.TAG; -import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason; -import static com.android.server.pm.PackageManagerServiceCompilerMapping.getDefaultCompilerFilter; import static com.android.server.pm.PackageManagerServiceUtils.REMOVE_IF_APEX_PKG; import static com.android.server.pm.PackageManagerServiceUtils.REMOVE_IF_NULL_PKG; import static com.android.server.pm.PackageManagerServiceUtils.getPackageManagerLocal; @@ -45,7 +41,6 @@ import static dalvik.system.DexFile.isProfileGuidedCompilerFilter; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AppGlobals; -import android.app.role.RoleManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -56,8 +51,6 @@ import android.content.pm.IPackageManagerNative; import android.content.pm.IStagedApexObserver; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.pm.SharedLibraryInfo; -import android.content.pm.dex.ArtManager; import android.os.Binder; import android.os.RemoteException; import android.os.ServiceManager; @@ -83,8 +76,6 @@ import com.android.server.art.ReasonMapping; import com.android.server.art.model.ArtFlags; import com.android.server.art.model.DexoptParams; import com.android.server.art.model.DexoptResult; -import com.android.server.pm.Installer.InstallerException; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.PackageDexOptimizer.DexOptResult; import com.android.server.pm.dex.DexManager; import com.android.server.pm.dex.DexoptOptions; @@ -131,228 +122,6 @@ public final class DexOptHelper { } /** - * Performs dexopt on the set of packages in {@code packages} and returns an int array - * containing statistics about the invocation. The array consists of three elements, - * which are (in order) {@code numberOfPackagesOptimized}, {@code numberOfPackagesSkipped} - * and {@code numberOfPackagesFailed}. - */ - public int[] performDexOptUpgrade(List<PackageStateInternal> packageStates, - final int compilationReason, boolean bootComplete) - throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - int numberOfPackagesVisited = 0; - int numberOfPackagesOptimized = 0; - int numberOfPackagesSkipped = 0; - int numberOfPackagesFailed = 0; - final int numberOfPackagesToDexopt = packageStates.size(); - - for (var packageState : packageStates) { - var pkg = packageState.getAndroidPackage(); - numberOfPackagesVisited++; - - boolean useProfileForDexopt = false; - - if ((mPm.isFirstBoot() || mPm.isDeviceUpgrading()) && packageState.isSystem()) { - // Copy over initial preopt profiles since we won't get any JIT samples for methods - // that are already compiled. - File profileFile = new File(getPrebuildProfilePath(pkg)); - // Copy profile if it exists. - if (profileFile.exists()) { - try { - // We could also do this lazily before calling dexopt in - // PackageDexOptimizer to prevent this happening on first boot. The issue - // is that we don't have a good way to say "do this only once". - if (!mPm.mInstaller.copySystemProfile(profileFile.getAbsolutePath(), - pkg.getUid(), pkg.getPackageName(), - ArtManager.getProfileName(null))) { - Log.e(TAG, "Installer failed to copy system profile!"); - } else { - // Disabled as this causes speed-profile compilation during first boot - // even if things are already compiled. - // useProfileForDexopt = true; - } - } catch (InstallerException | RuntimeException e) { - Log.e(TAG, "Failed to copy profile " + profileFile.getAbsolutePath() + " ", - e); - } - } else { - PackageSetting disabledPs = mPm.mSettings.getDisabledSystemPkgLPr( - pkg.getPackageName()); - // Handle compressed APKs in this path. Only do this for stubs with profiles to - // minimize the number off apps being speed-profile compiled during first boot. - // The other paths will not change the filter. - if (disabledPs != null && disabledPs.getPkg().isStub()) { - // The package is the stub one, remove the stub suffix to get the normal - // package and APK names. - String systemProfilePath = getPrebuildProfilePath(disabledPs.getPkg()) - .replace(STUB_SUFFIX, ""); - profileFile = new File(systemProfilePath); - // If we have a profile for a compressed APK, copy it to the reference - // location. - // Note that copying the profile here will cause it to override the - // reference profile every OTA even though the existing reference profile - // may have more data. We can't copy during decompression since the - // directories are not set up at that point. - if (profileFile.exists()) { - try { - // We could also do this lazily before calling dexopt in - // PackageDexOptimizer to prevent this happening on first boot. The - // issue is that we don't have a good way to say "do this only - // once". - if (!mPm.mInstaller.copySystemProfile(profileFile.getAbsolutePath(), - pkg.getUid(), pkg.getPackageName(), - ArtManager.getProfileName(null))) { - Log.e(TAG, "Failed to copy system profile for stub package!"); - } else { - useProfileForDexopt = true; - } - } catch (InstallerException | RuntimeException e) { - Log.e(TAG, "Failed to copy profile " - + profileFile.getAbsolutePath() + " ", e); - } - } - } - } - } - - if (!mPm.mPackageDexOptimizer.canOptimizePackage(pkg)) { - if (DEBUG_DEXOPT) { - Log.i(TAG, "Skipping update of non-optimizable app " + pkg.getPackageName()); - } - numberOfPackagesSkipped++; - continue; - } - - if (DEBUG_DEXOPT) { - Log.i(TAG, "Updating app " + numberOfPackagesVisited + " of " - + numberOfPackagesToDexopt + ": " + pkg.getPackageName()); - } - - int pkgCompilationReason = compilationReason; - if (useProfileForDexopt) { - // Use background dexopt mode to try and use the profile. Note that this does not - // guarantee usage of the profile. - pkgCompilationReason = PackageManagerService.REASON_BACKGROUND_DEXOPT; - } - - int dexoptFlags = bootComplete ? DexoptOptions.DEXOPT_BOOT_COMPLETE : 0; - - String filter = getCompilerFilterForReason(pkgCompilationReason); - if (isProfileGuidedCompilerFilter(filter)) { - // DEXOPT_CHECK_FOR_PROFILES_UPDATES used to be false to avoid merging profiles - // during boot which might interfere with background compilation (b/28612421). - // However those problems were related to the verify-profile compiler filter which - // doesn't exist any more, so enable it again. - dexoptFlags |= DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES; - } - - if (compilationReason == REASON_FIRST_BOOT) { - // TODO: This doesn't cover the upgrade case, we should check for this too. - dexoptFlags |= DexoptOptions.DEXOPT_INSTALL_WITH_DEX_METADATA_FILE; - } - int primaryDexOptStatus = performDexOptTraced( - new DexoptOptions(pkg.getPackageName(), pkgCompilationReason, filter, - /*splitName*/ null, dexoptFlags)); - - switch (primaryDexOptStatus) { - case PackageDexOptimizer.DEX_OPT_PERFORMED: - numberOfPackagesOptimized++; - break; - case PackageDexOptimizer.DEX_OPT_SKIPPED: - numberOfPackagesSkipped++; - break; - case PackageDexOptimizer.DEX_OPT_CANCELLED: - // ignore this case - break; - case PackageDexOptimizer.DEX_OPT_FAILED: - numberOfPackagesFailed++; - break; - default: - Log.e(TAG, "Unexpected dexopt return code " + primaryDexOptStatus); - break; - } - } - - return new int[]{numberOfPackagesOptimized, numberOfPackagesSkipped, - numberOfPackagesFailed}; - } - - /** - * Checks if system UI package (typically "com.android.systemui") needs to be re-compiled, and - * compiles it if needed. - */ - private void checkAndDexOptSystemUi(int reason) throws LegacyDexoptDisabledException { - Computer snapshot = mPm.snapshotComputer(); - String sysUiPackageName = - mPm.mContext.getString(com.android.internal.R.string.config_systemUi); - AndroidPackage pkg = snapshot.getPackage(sysUiPackageName); - if (pkg == null) { - Log.w(TAG, "System UI package " + sysUiPackageName + " is not found for dexopting"); - return; - } - - String defaultCompilerFilter = getCompilerFilterForReason(reason); - String targetCompilerFilter = - SystemProperties.get("dalvik.vm.systemuicompilerfilter", defaultCompilerFilter); - String compilerFilter; - - if (isProfileGuidedCompilerFilter(targetCompilerFilter)) { - compilerFilter = "verify"; - File profileFile = new File(getPrebuildProfilePath(pkg)); - - // Copy the profile to the reference profile path if it exists. Installd can only use a - // profile at the reference profile path for dexopt. - if (profileFile.exists()) { - try { - synchronized (mPm.mInstallLock) { - if (mPm.mInstaller.copySystemProfile(profileFile.getAbsolutePath(), - pkg.getUid(), pkg.getPackageName(), - ArtManager.getProfileName(null))) { - compilerFilter = targetCompilerFilter; - } else { - Log.e(TAG, "Failed to copy profile " + profileFile.getAbsolutePath()); - } - } - } catch (InstallerException | RuntimeException e) { - Log.e(TAG, "Failed to copy profile " + profileFile.getAbsolutePath(), e); - } - } - } else { - compilerFilter = targetCompilerFilter; - } - - performDexoptPackage(sysUiPackageName, reason, compilerFilter); - } - - private void dexoptLauncher(int reason) throws LegacyDexoptDisabledException { - Computer snapshot = mPm.snapshotComputer(); - RoleManager roleManager = mPm.mContext.getSystemService(RoleManager.class); - for (var packageName : roleManager.getRoleHolders(RoleManager.ROLE_HOME)) { - AndroidPackage pkg = snapshot.getPackage(packageName); - if (pkg == null) { - Log.w(TAG, "Launcher package " + packageName + " is not found for dexopting"); - } else { - performDexoptPackage(packageName, reason, "speed-profile"); - } - } - } - - private void performDexoptPackage(@NonNull String packageName, int reason, - @NonNull String compilerFilter) throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - - // DEXOPT_CHECK_FOR_PROFILES_UPDATES is set to replicate behaviour that will be - // unconditionally enabled for profile guided filters when ART Service is called instead of - // the legacy PackageDexOptimizer implementation. - int dexoptFlags = isProfileGuidedCompilerFilter(compilerFilter) - ? DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES - : 0; - - performDexOptTraced(new DexoptOptions( - packageName, reason, compilerFilter, null /* splitName */, dexoptFlags)); - } - - /** * Called during startup to do any boot time dexopting. This can occasionally be time consuming * (30+ seconds) and the function will block until it is complete. */ @@ -377,35 +146,9 @@ public final class DexOptHelper { final long startTime = System.nanoTime(); - if (useArtService()) { - mBootDexoptStartTime = startTime; - getArtManagerLocal().onBoot(DexoptOptions.convertToArtServiceDexoptReason(reason), - null /* progressCallbackExecutor */, null /* progressCallback */); - } else { - try { - // System UI and the launcher are important to user experience, so we check them - // after a mainline update or OTA. They may need to be re-compiled in these cases. - checkAndDexOptSystemUi(reason); - dexoptLauncher(reason); - - if (reason != REASON_BOOT_AFTER_OTA && reason != REASON_FIRST_BOOT) { - return; - } - - final Computer snapshot = mPm.snapshotComputer(); - - // TODO(b/251903639): Align this with how ART Service selects packages for boot - // compilation. - List<PackageStateInternal> pkgSettings = - getPackagesForDexopt(snapshot.getPackageStates().values(), mPm); - - final int[] stats = - performDexOptUpgrade(pkgSettings, reason, false /* bootComplete */); - reportBootDexopt(startTime, stats[0], stats[1], stats[2]); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } + mBootDexoptStartTime = startTime; + getArtManagerLocal().onBoot(DexoptOptions.convertToArtServiceDexoptReason(reason), + null /* progressCallbackExecutor */, null /* progressCallback */); } private void reportBootDexopt(long startTime, int numDexopted, int numSkipped, int numFailed) { @@ -450,15 +193,7 @@ public final class DexOptHelper { @DexOptResult int dexoptStatus; if (options.isDexoptOnlySecondaryDex()) { - if (useArtService()) { - dexoptStatus = performDexOptWithArtService(options, 0 /* extraFlags */); - } else { - try { - return mPm.getDexManager().dexoptSecondaryDex(options); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } + dexoptStatus = performDexOptWithArtService(options, 0 /* extraFlags */); } else { dexoptStatus = performDexOptWithStatus(options); } @@ -491,39 +226,11 @@ public final class DexOptHelper { // if the package can now be considered up to date for the given filter. @DexOptResult private int performDexOptInternal(DexoptOptions options) { - if (useArtService()) { - return performDexOptWithArtService(options, ArtFlags.FLAG_SHOULD_INCLUDE_DEPENDENCIES); - } - - AndroidPackage p; - PackageSetting pkgSetting; - synchronized (mPm.mLock) { - p = mPm.mPackages.get(options.getPackageName()); - pkgSetting = mPm.mSettings.getPackageLPr(options.getPackageName()); - if (p == null || pkgSetting == null) { - // Package could not be found. Report failure. - return PackageDexOptimizer.DEX_OPT_FAILED; - } - if (p.isApex()) { - // APEX needs no dexopt - return PackageDexOptimizer.DEX_OPT_SKIPPED; - } - mPm.getPackageUsage().maybeWriteAsync(mPm.mSettings.getPackagesLocked()); - mPm.mCompilerStats.maybeWriteAsync(); - } - final long callingId = Binder.clearCallingIdentity(); - try { - return performDexOptInternalWithDependenciesLI(p, pkgSetting, options); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } finally { - Binder.restoreCallingIdentity(callingId); - } + return performDexOptWithArtService(options, ArtFlags.FLAG_SHOULD_INCLUDE_DEPENDENCIES); } /** - * Performs dexopt on the given package using ART Service. May only be called when ART Service - * is enabled, i.e. when {@link useArtService} returns true. + * Performs dexopt on the given package using ART Service. */ @DexOptResult private int performDexOptWithArtService(DexoptOptions options, @@ -545,91 +252,6 @@ public final class DexOptHelper { } } - @DexOptResult - private int performDexOptInternalWithDependenciesLI( - AndroidPackage p, @NonNull PackageStateInternal pkgSetting, DexoptOptions options) - throws LegacyDexoptDisabledException { - if (PLATFORM_PACKAGE_NAME.equals(p.getPackageName())) { - // This needs to be done in odrefresh in early boot, for security reasons. - throw new IllegalArgumentException("Cannot dexopt the system server"); - } - - // Select the dex optimizer based on the force parameter. - // Note: The force option is rarely used (cmdline input for testing, mostly), so it's OK to - // allocate an object here. - PackageDexOptimizer pdo = options.isForce() - ? new PackageDexOptimizer.ForcedUpdatePackageDexOptimizer(mPm.mPackageDexOptimizer) - : mPm.mPackageDexOptimizer; - - // Dexopt all dependencies first. Note: we ignore the return value and march on - // on errors. - // Note that we are going to call performDexOpt on those libraries as many times as - // they are referenced in packages. When we do a batch of performDexOpt (for example - // at boot, or background job), the passed 'targetCompilerFilter' stays the same, - // and the first package that uses the library will dexopt it. The - // others will see that the compiled code for the library is up to date. - Collection<SharedLibraryInfo> deps = SharedLibraryUtils.findSharedLibraries(pkgSetting); - final String[] instructionSets = getAppDexInstructionSets( - pkgSetting.getPrimaryCpuAbi(), - pkgSetting.getSecondaryCpuAbi()); - if (!deps.isEmpty()) { - DexoptOptions libraryOptions = new DexoptOptions(options.getPackageName(), - options.getCompilationReason(), options.getCompilerFilter(), - options.getSplitName(), - options.getFlags() | DexoptOptions.DEXOPT_AS_SHARED_LIBRARY); - for (SharedLibraryInfo info : deps) { - Computer snapshot = mPm.snapshotComputer(); - AndroidPackage depPackage = snapshot.getPackage(info.getPackageName()); - PackageStateInternal depPackageStateInternal = - snapshot.getPackageStateInternal(info.getPackageName()); - if (depPackage != null && depPackageStateInternal != null) { - // TODO: Analyze and investigate if we (should) profile libraries. - pdo.performDexOpt(depPackage, depPackageStateInternal, instructionSets, - mPm.getOrCreateCompilerPackageStats(depPackage), - mPm.getDexManager().getPackageUseInfoOrDefault( - depPackage.getPackageName()), libraryOptions); - } else { - // TODO(ngeoffray): Support dexopting system shared libraries. - } - } - } - - return pdo.performDexOpt(p, pkgSetting, instructionSets, - mPm.getOrCreateCompilerPackageStats(p), - mPm.getDexManager().getPackageUseInfoOrDefault(p.getPackageName()), options); - } - - /** @deprecated For legacy shell command only. */ - @Deprecated - public void forceDexOpt(@NonNull Computer snapshot, String packageName) - throws LegacyDexoptDisabledException { - PackageManagerServiceUtils.enforceSystemOrRoot("forceDexOpt"); - - final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); - final AndroidPackage pkg = packageState == null ? null : packageState.getPkg(); - if (packageState == null || pkg == null) { - throw new IllegalArgumentException("Unknown package: " + packageName); - } - if (pkg.isApex()) { - throw new IllegalArgumentException("Can't dexopt APEX package: " + packageName); - } - - Trace.traceBegin(TRACE_TAG_DALVIK, "dexopt"); - - // Whoever is calling forceDexOpt wants a compiled package. - // Don't use profiles since that may cause compilation to be skipped. - DexoptOptions options = new DexoptOptions(packageName, REASON_CMDLINE, - getDefaultCompilerFilter(), null /* splitName */, - DexoptOptions.DEXOPT_FORCE | DexoptOptions.DEXOPT_BOOT_COMPLETE); - - @DexOptResult int res = performDexOptInternalWithDependenciesLI(pkg, packageState, options); - - Trace.traceEnd(TRACE_TAG_DALVIK); - if (res != PackageDexOptimizer.DEX_OPT_PERFORMED) { - throw new IllegalStateException("Failed to dexopt: " + res); - } - } - public boolean performDexOptMode(@NonNull Computer snapshot, String packageName, String targetCompilerFilter, boolean force, boolean bootComplete, String splitName) { if (!PackageManagerServiceUtils.isSystemOrRootOrShell() @@ -872,10 +494,6 @@ public final class DexOptHelper { } } - /*package*/ void controlDexOptBlocking(boolean block) throws LegacyDexoptDisabledException { - mPm.mPackageDexOptimizer.controlDexOptBlocking(block); - } - /** * Dumps the dexopt state for the given package, or all packages if it is null. */ @@ -935,19 +553,9 @@ public final class DexOptHelper { } /** - * Returns true if ART Service should be used for package optimization. - */ - public static boolean useArtService() { - return SystemProperties.getBoolean("dalvik.vm.useartservice", false); - } - - /** * Returns {@link DexUseManagerLocal} if ART Service should be used for package optimization. */ public static @Nullable DexUseManagerLocal getDexUseManagerLocal() { - if (!useArtService()) { - return null; - } try { return LocalManagerRegistry.getManagerOrThrow(DexUseManagerLocal.class); } catch (ManagerNotFoundException e) { @@ -1039,10 +647,6 @@ public final class DexOptHelper { */ public static void initializeArtManagerLocal( @NonNull Context systemContext, @NonNull PackageManagerService pm) { - if (!useArtService()) { - return; - } - ArtManagerLocal artManager = new ArtManagerLocal(systemContext); artManager.addDexoptDoneCallback(false /* onlyIncludeUpdates */, Runnable::run, pm.getDexOptHelper().new DexoptDoneHandler()); diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index ae68018c90b3..c559892327df 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -46,10 +46,7 @@ import static android.os.storage.StorageManager.FLAG_STORAGE_DE; import static android.os.storage.StorageManager.FLAG_STORAGE_EXTERNAL; import static com.android.internal.pm.pkg.parsing.ParsingPackageUtils.APP_METADATA_FILE_NAME; -import static com.android.server.pm.DexOptHelper.useArtService; import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; -import static com.android.server.pm.InstructionSets.getDexCodeInstructionSet; -import static com.android.server.pm.InstructionSets.getPreferredInstructionSet; import static com.android.server.pm.PackageManagerService.DEBUG_COMPRESSION; import static com.android.server.pm.PackageManagerService.DEBUG_INSTALL; import static com.android.server.pm.PackageManagerService.DEBUG_PACKAGE_SCANNING; @@ -173,7 +170,6 @@ import com.android.server.EventLogTags; import com.android.server.SystemConfig; import com.android.server.art.model.DexoptResult; import com.android.server.criticalevents.CriticalEventLog; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.dex.ArtManagerService; import com.android.server.pm.dex.DexManager; import com.android.server.pm.dex.DexoptOptions; @@ -272,8 +268,6 @@ final class InstallPackageHelper { final PackageSetting oldPkgSetting = request.getScanRequestOldPackageSetting(); final PackageSetting originalPkgSetting = request.getScanRequestOriginalPackageSetting(); final String realPkgName = request.getRealPackageName(); - final List<String> changedAbiCodePath = - useArtService() ? null : request.getChangedAbiCodePath(); final PackageSetting pkgSetting; if (request.getScanRequestPackageSetting() != null) { SharedUserSetting requestSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr( @@ -449,23 +443,6 @@ final class InstallPackageHelper { } pkgSetting.setSigningDetails(reconciledPkg.mSigningDetails); - // The conditional on useArtService() for changedAbiCodePath above means this is skipped - // when ART Service is in use, since it has its own dex file GC. - if (changedAbiCodePath != null && changedAbiCodePath.size() > 0) { - for (int i = changedAbiCodePath.size() - 1; i >= 0; --i) { - final String codePathString = changedAbiCodePath.get(i); - try { - synchronized (mPm.mInstallLock) { - mPm.mInstaller.rmdex(codePathString, - getDexCodeInstructionSet(getPreferredInstructionSet())); - } - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } catch (Installer.InstallerException ignored) { - } - } - } - final int userId = request.getUserId(); // Modify state for the given package setting commitPackageSettings(pkg, pkgSetting, oldPkgSetting, reconciledPkg); @@ -2538,20 +2515,6 @@ final class InstallPackageHelper { pkg.getBaseApkPath(), pkg.getSplitCodePaths()); } - // ART Service handles this on demand instead. - if (!useArtService() && pkg != null) { - // Prepare the application profiles for the new code paths. - // This needs to be done before invoking dexopt so that any install-time profile - // can be used for optimizations. - try { - mArtManagerService.prepareAppProfiles(pkg, - mPm.resolveUserIds(installRequest.getUserId()), - /* updateReferenceProfileContent= */ true); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } - // Construct the DexoptOptions early to see if we should skip running dexopt. // // Do not run PackageDexOptimizer through the local performDexOpt @@ -2602,36 +2565,11 @@ final class InstallPackageHelper { realPkgSetting.getPkgState().setUpdatedSystemApp(isUpdatedSystemApp); - if (useArtService()) { - DexoptResult dexOptResult = DexOptHelper.dexoptPackageUsingArtService( - installRequest, dexoptOptions); - installRequest.onDexoptFinished(dexOptResult); - } else { - try { - mPackageDexOptimizer.performDexOpt(pkg, realPkgSetting, - null /* instructionSets */, - mPm.getOrCreateCompilerPackageStats(pkg), - mDexManager.getPackageUseInfoOrDefault(packageName), dexoptOptions); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } + DexoptResult dexOptResult = + DexOptHelper.dexoptPackageUsingArtService(installRequest, dexoptOptions); + installRequest.onDexoptFinished(dexOptResult); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } - - if (!useArtService()) { - // Notify BackgroundDexOptService that the package has been changed. - // If this is an update of a package which used to fail to compile, - // BackgroundDexOptService will remove it from its denylist. - // ART Service currently doesn't support this and will retry packages in every - // background dexopt. - // TODO: Layering violation - try { - BackgroundDexOptService.getService().notifyPackageChanged(packageName); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } } PackageManagerServiceUtils.waitForNativeBinariesExtractionForIncremental( incrementalStorages); diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 34903d1ed47d..8038c9a8cb30 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -16,8 +16,6 @@ package com.android.server.pm; -import static com.android.server.pm.DexOptHelper.useArtService; - import android.annotation.AppIdInt; import android.annotation.NonNull; import android.annotation.Nullable; @@ -97,15 +95,6 @@ public class Installer extends SystemService { */ public static final int PROFILE_ANALYSIS_DONT_OPTIMIZE_EMPTY_PROFILES = 3; - /** - * The results of {@code getOdexVisibility}. See - * {@link #getOdexVisibility(String, String, String)} for details. - */ - public static final int ODEX_NOT_FOUND = 0; - public static final int ODEX_IS_PUBLIC = 1; - public static final int ODEX_IS_PRIVATE = 2; - - public static final int FLAG_STORAGE_DE = IInstalld.FLAG_STORAGE_DE; public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE; public static final int FLAG_STORAGE_EXTERNAL = IInstalld.FLAG_STORAGE_EXTERNAL; @@ -611,37 +600,7 @@ public class Installer extends SystemService { } /** - * Runs dex optimization. - * - * @param apkPath Path of target APK - * @param uid UID of the package - * @param pkgName Name of the package - * @param instructionSet Target instruction set to run dex optimization. - * @param dexoptNeeded Necessary dex optimization for this request. Check - * {@link dalvik.system.DexFile#NO_DEXOPT_NEEDED}, - * {@link dalvik.system.DexFile#DEX2OAT_FROM_SCRATCH}, - * {@link dalvik.system.DexFile#DEX2OAT_FOR_BOOT_IMAGE}, and - * {@link dalvik.system.DexFile#DEX2OAT_FOR_FILTER}. - * @param outputPath Output path of generated dex optimization. - * @param dexFlags Check {@code DEXOPT_*} for allowed flags. - * @param compilerFilter Compiler filter like "verify", "speed-profile". Check - * {@code art/libartbase/base/compiler_filter.cc} for full list. - * @param volumeUuid UUID of the volume where the package data is stored. {@code null} - * represents internal storage. - * @param classLoaderContext This encodes the class loader chain (class loader type + class - * path) in a format compatible to dex2oat. Check - * {@code DexoptUtils.processContextForDexLoad} for further details. - * @param seInfo Selinux context to set for generated outputs. - * @param downgrade If set, allows downgrading {@code compilerFilter}. If downgrading is not - * allowed and requested {@code compilerFilter} is considered as downgrade, - * the request will be ignored. - * @param targetSdkVersion Target SDK version of the package. - * @param profileName Name of reference profile file. - * @param dexMetadataPath Specifies the location of dex metadata file. - * @param compilationReason Specifies the reason for the compilation like "install". - * @return {@code true} if {@code dexopt} is completed. {@code false} if it was cancelled. - * - * @throws InstallerException if {@code dexopt} fails. + * This function only remains to allow overriding in OtaDexoptService. */ public boolean dexopt(String apkPath, int uid, String pkgName, String instructionSet, int dexoptNeeded, @Nullable String outputPath, int dexFlags, String compilerFilter, @@ -650,98 +609,7 @@ public class Installer extends SystemService { @Nullable String profileName, @Nullable String dexMetadataPath, @Nullable String compilationReason) throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - assertValidInstructionSet(instructionSet); - BlockGuard.getVmPolicy().onPathAccess(apkPath); - BlockGuard.getVmPolicy().onPathAccess(outputPath); - BlockGuard.getVmPolicy().onPathAccess(dexMetadataPath); - if (!checkBeforeRemote()) return false; - try { - return mInstalld.dexopt(apkPath, uid, pkgName, instructionSet, dexoptNeeded, outputPath, - dexFlags, compilerFilter, volumeUuid, classLoaderContext, seInfo, downgrade, - targetSdkVersion, profileName, dexMetadataPath, compilationReason); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - /** - * Enables or disables dex optimization blocking. - * - * <p> Enabling blocking will also involve cancelling pending dexopt call and killing child - * processes forked from installd to run dexopt. The pending dexopt call will return false - * when it is cancelled. - * - * @param block set to true to enable blocking / false to disable blocking. - */ - public void controlDexOptBlocking(boolean block) throws LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - try { - mInstalld.controlDexOptBlocking(block); - } catch (Exception e) { - Slog.w(TAG, "blockDexOpt failed", e); - } - } - - /** - * Analyzes the ART profiles of the given package, possibly merging the information - * into the reference profile. Returns whether or not we should optimize the package - * based on how much information is in the profile. - * - * @return one of {@link #PROFILE_ANALYSIS_OPTIMIZE}, - * {@link #PROFILE_ANALYSIS_DONT_OPTIMIZE_SMALL_DELTA}, - * {@link #PROFILE_ANALYSIS_DONT_OPTIMIZE_EMPTY_PROFILES} - */ - public int mergeProfiles(int uid, String packageName, String profileName) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return PROFILE_ANALYSIS_DONT_OPTIMIZE_SMALL_DELTA; - try { - return mInstalld.mergeProfiles(uid, packageName, profileName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - /** - * Dumps profiles associated with a package in a human readable format. - */ - public boolean dumpProfiles(int uid, String packageName, String profileName, String codePath, - boolean dumpClassesAndMethods) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return false; - BlockGuard.getVmPolicy().onPathAccess(codePath); - try { - return mInstalld.dumpProfiles(uid, packageName, profileName, codePath, - dumpClassesAndMethods); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - public boolean copySystemProfile(String systemProfile, int uid, String packageName, - String profileName) throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return false; - try { - return mInstalld.copySystemProfile(systemProfile, uid, packageName, profileName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - public void rmdex(String codePath, String instructionSet) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - assertValidInstructionSet(instructionSet); - if (!checkBeforeRemote()) return; - BlockGuard.getVmPolicy().onPathAccess(codePath); - try { - mInstalld.rmdex(codePath, instructionSet); - } catch (Exception e) { - throw InstallerException.from(e); - } + throw new LegacyDexoptDisabledException(); } /** @@ -757,43 +625,6 @@ public class Installer extends SystemService { } } - public void clearAppProfiles(String packageName, String profileName) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return; - try { - mInstalld.clearAppProfiles(packageName, profileName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - public void destroyAppProfiles(String packageName) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return; - try { - mInstalld.destroyAppProfiles(packageName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - /** - * Deletes the reference profile with the given name of the given package. - * @throws InstallerException if the deletion fails. - */ - public void deleteReferenceProfile(String packageName, String profileName) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return; - try { - mInstalld.deleteReferenceProfile(packageName, profileName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - public void createUserData(String uuid, int userId, int userSerial, int flags) throws InstallerException { if (!checkBeforeRemote()) return; @@ -889,40 +720,6 @@ public class Installer extends SystemService { } } - /** - * Deletes the optimized artifacts generated by ART and returns the number - * of freed bytes. - */ - public long deleteOdex(String packageName, String apkPath, String instructionSet, - String outputPath) throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return -1; - BlockGuard.getVmPolicy().onPathAccess(apkPath); - BlockGuard.getVmPolicy().onPathAccess(outputPath); - try { - return mInstalld.deleteOdex(packageName, apkPath, instructionSet, outputPath); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - public boolean reconcileSecondaryDexFile(String apkPath, String packageName, int uid, - String[] isas, @Nullable String volumeUuid, int flags) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - for (int i = 0; i < isas.length; i++) { - assertValidInstructionSet(isas[i]); - } - if (!checkBeforeRemote()) return false; - BlockGuard.getVmPolicy().onPathAccess(apkPath); - try { - return mInstalld.reconcileSecondaryDexFile(apkPath, packageName, uid, isas, - volumeUuid, flags); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - public byte[] hashSecondaryDexFile(String dexPath, String packageName, int uid, @Nullable String volumeUuid, int flags) throws InstallerException { if (!checkBeforeRemote()) return new byte[0]; @@ -934,28 +731,6 @@ public class Installer extends SystemService { } } - public boolean createProfileSnapshot(int appId, String packageName, String profileName, - String classpath) throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return false; - try { - return mInstalld.createProfileSnapshot(appId, packageName, profileName, classpath); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - public void destroyProfileSnapshot(String packageName, String profileName) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return; - try { - mInstalld.destroyProfileSnapshot(packageName, profileName); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - public void invalidateMounts() throws InstallerException { if (!checkBeforeRemote()) return; try { @@ -999,30 +774,6 @@ public class Installer extends SystemService { } /** - * Prepares the app profile for the package at the given path: - * <ul> - * <li>Creates the current profile for the given user ID, unless the user ID is - * {@code UserHandle.USER_NULL}.</li> - * <li>Merges the profile from the dex metadata file (if present) into the reference - * profile.</li> - * </ul> - */ - public boolean prepareAppProfile(String pkg, @UserIdInt int userId, @AppIdInt int appId, - String profileName, String codePath, String dexMetadataPath) - throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return false; - BlockGuard.getVmPolicy().onPathAccess(codePath); - BlockGuard.getVmPolicy().onPathAccess(dexMetadataPath); - try { - return mInstalld.prepareAppProfile(pkg, userId, appId, profileName, codePath, - dexMetadataPath); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - /** * Snapshots user data of the given package. * * @param pkg name of the package to snapshot user data for. @@ -1152,34 +903,6 @@ public class Installer extends SystemService { } /** - * Returns the visibility of the optimized artifacts. - * - * @param packageName name of the package. - * @param apkPath path to the APK. - * @param instructionSet instruction set of the optimized artifacts. - * @param outputPath path to the directory that contains the optimized artifacts (i.e., the - * directory that {@link #dexopt} outputs to). - * - * @return {@link #ODEX_NOT_FOUND} if the optimized artifacts are not found, or - * {@link #ODEX_IS_PUBLIC} if the optimized artifacts are accessible by all apps, or - * {@link #ODEX_IS_PRIVATE} if the optimized artifacts are only accessible by this app. - * - * @throws InstallerException if failed to get the visibility of the optimized artifacts. - */ - public int getOdexVisibility(String packageName, String apkPath, String instructionSet, - String outputPath) throws InstallerException, LegacyDexoptDisabledException { - checkLegacyDexoptDisabled(); - if (!checkBeforeRemote()) return -1; - BlockGuard.getVmPolicy().onPathAccess(apkPath); - BlockGuard.getVmPolicy().onPathAccess(outputPath); - try { - return mInstalld.getOdexVisibility(packageName, apkPath, instructionSet, outputPath); - } catch (Exception e) { - throw InstallerException.from(e); - } - } - - /** * Returns an auth token for the provided writable FD. * * @param authFd a file descriptor to proof that the caller can write to the file. @@ -1247,14 +970,4 @@ public class Installer extends SystemService { super("Invalid call to legacy dexopt method while ART Service is in use."); } } - - /** - * Throws LegacyDexoptDisabledException if ART Service should be used instead of the - * {@link android.os.IInstalld} method that follows this method call. - */ - public static void checkLegacyDexoptDisabled() throws LegacyDexoptDisabledException { - if (useArtService()) { - throw new LegacyDexoptDisabledException(); - } - } } diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index c6bb99eed7ee..20b669b96609 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -18,12 +18,12 @@ package com.android.server.pm; import static android.Manifest.permission.READ_FRAME_BUFFER; import static android.app.ActivityOptions.KEY_SPLASH_SCREEN_THEME; +import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED; +import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; import static android.app.AppOpsManager.MODE_ALLOWED; import static android.app.AppOpsManager.MODE_IGNORED; import static android.app.AppOpsManager.OP_ARCHIVE_ICON_OVERLAY; import static android.app.AppOpsManager.OP_UNARCHIVAL_CONFIRMATION; -import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED; -import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; import static android.app.PendingIntent.FLAG_IMMUTABLE; import static android.app.PendingIntent.FLAG_MUTABLE; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; @@ -555,12 +555,6 @@ public class LauncherAppsService extends SystemService { return false; } - if (!mRoleManager - .getRoleHoldersAsUser( - RoleManager.ROLE_HOME, UserHandle.getUserHandleForUid(callingUid)) - .contains(callingPackage.getPackageName())) { - return false; - } if (mContext.checkPermission( Manifest.permission.ACCESS_HIDDEN_PROFILES_FULL, callingPid, @@ -569,6 +563,13 @@ public class LauncherAppsService extends SystemService { return true; } + if (!mRoleManager + .getRoleHoldersAsUser( + RoleManager.ROLE_HOME, UserHandle.getUserHandleForUid(callingUid)) + .contains(callingPackage.getPackageName())) { + return false; + } + // TODO(b/321988638): add option to disable with a flag return mContext.checkPermission( android.Manifest.permission.ACCESS_HIDDEN_PROFILES, diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS index c8bc56ce7dcd..85aee8606bc2 100644 --- a/services/core/java/com/android/server/pm/OWNERS +++ b/services/core/java/com/android/server/pm/OWNERS @@ -11,7 +11,6 @@ per-file StagingManager.java = dariofreni@google.com, ioffe@google.com, olilan@g # dex per-file AbstractStatsBase.java = file:dex/OWNERS -per-file BackgroundDexOptService.java = file:dex/OWNERS per-file CompilerStats.java = file:dex/OWNERS per-file DexOptHelper.java = file:dex/OWNERS per-file DynamicCodeLoggingService.java = file:dex/OWNERS diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index ea082cf77987..5b326fd297cb 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -16,7 +16,6 @@ package com.android.server.pm; -import static com.android.server.pm.DexOptHelper.useArtService; import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; @@ -305,13 +304,10 @@ public class OtaDexoptService extends IOtaDexopt.Stub { throws InstallerException { final StringBuilder builder = new StringBuilder(); - if (useArtService()) { - if ((dexFlags & DEXOPT_SECONDARY_DEX) != 0) { - // installd may change the reference profile in place for secondary dex - // files, which isn't safe with the lock free approach in ART Service. - throw new IllegalArgumentException( - "Invalid OTA dexopt call for secondary dex"); - } + if ((dexFlags & DEXOPT_SECONDARY_DEX) != 0) { + // installd may change the reference profile in place for secondary dex + // files, which isn't safe with the lock free approach in ART Service. + throw new IllegalArgumentException("Invalid OTA dexopt call for secondary dex"); } // The current version. For v10, see b/115993344. diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 8a4080ff029d..396fa22393e4 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -18,7 +18,6 @@ package com.android.server.pm; import static android.content.pm.ApplicationInfo.HIDDEN_API_ENFORCEMENT_DISABLED; -import static com.android.server.pm.DexOptHelper.useArtService; import static com.android.server.pm.Installer.DEXOPT_BOOTCOMPLETE; import static com.android.server.pm.Installer.DEXOPT_DEBUGGABLE; import static com.android.server.pm.Installer.DEXOPT_ENABLE_HIDDEN_API_CHECKS; @@ -53,7 +52,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.SharedLibraryInfo; import android.content.pm.dex.ArtManager; import android.content.pm.dex.DexMetadataHelper; -import android.os.FileUtils; import android.os.PowerManager; import android.os.SystemClock; import android.os.SystemProperties; @@ -67,7 +65,6 @@ import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.content.F2fsUtils; -import com.android.internal.util.IndentingPrintWriter; import com.android.server.LocalServices; import com.android.server.apphibernation.AppHibernationManagerInternal; import com.android.server.pm.Installer.InstallerException; @@ -92,7 +89,6 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Random; /** @@ -130,9 +126,8 @@ public class PackageDexOptimizer { private final Object mInstallLock; /** - * This should be accessed only through {@link #getInstallerLI()} with {@link #mInstallLock} - * or {@link #getInstallerWithoutLock()} without the lock. Check both methods for further - * details on when to use each of them. + * This should be accessed only through {@link #getInstallerLI()} with + * {@link #mInstallLock}. */ private final Installer mInstaller; @@ -248,15 +243,6 @@ public class PackageDexOptimizer { } /** - * Cancels currently running dex optimization. - */ - void controlDexOptBlocking(boolean block) throws LegacyDexoptDisabledException { - // This method should not hold mInstallLock as cancelling should be possible while - // the lock is held by other thread running performDexOpt. - getInstallerWithoutLock().controlDexOptBlocking(block); - } - - /** * Performs dexopt on all code paths of the given package. * It assumes the install lock is held. */ @@ -334,7 +320,7 @@ public class PackageDexOptimizer { final boolean isUsedByOtherApps; if (options.isDexoptAsSharedLibrary()) { isUsedByOtherApps = true; - } else if (useArtService()) { + } else { // We get here when collecting dexopt commands in OTA preopt, even when ART Service // is in use. packageUseInfo isn't useful in that case since the legacy dex use // database hasn't been updated. So we'd have to query ART Service instead, but it @@ -342,8 +328,6 @@ public class PackageDexOptimizer { // That means such apps will get preopted wrong, and we'll leave it to a later // background dexopt after reboot instead. isUsedByOtherApps = false; - } else { - isUsedByOtherApps = packageUseInfo.isUsedByOtherApps(path); } String compilerFilter = getRealCompilerFilter(pkg, options.getCompilerFilter()); @@ -439,12 +423,10 @@ public class PackageDexOptimizer { } } } finally { + // ART Service is always enabled, so we should only arrive here + // during OTA preopt, and there should be no cloud profile. if (cloudProfileName != null) { - try { - mInstaller.deleteReferenceProfile(pkg.getPackageName(), cloudProfileName); - } catch (InstallerException e) { - Slog.w(TAG, "Failed to cleanup cloud profile", e); - } + throw new LegacyDexoptDisabledException(); } } } @@ -457,30 +439,15 @@ public class PackageDexOptimizer { * * @return true on success, or false otherwise. */ - @GuardedBy("mInstallLock") private boolean prepareCloudProfile(AndroidPackage pkg, String profileName, String path, @Nullable String dexMetadataPath) throws LegacyDexoptDisabledException { if (dexMetadataPath != null) { - if (mInstaller.isIsolated()) { - // If the installer is isolated, the two calls to it below will return immediately, - // so this only short-circuits that a bit. We need to do it to avoid the - // LegacyDexoptDisabledException getting thrown first, when we get here during OTA - // preopt and ART Service is enabled. - return true; - } - - try { - // Make sure we don't keep any existing contents. - mInstaller.deleteReferenceProfile(pkg.getPackageName(), profileName); - - final int appId = UserHandle.getAppId(pkg.getUid()); - mInstaller.prepareAppProfile(pkg.getPackageName(), UserHandle.USER_NULL, appId, - profileName, path, dexMetadataPath); - return true; - } catch (InstallerException e) { - Slog.w(TAG, "Failed to prepare cloud profile", e); - return false; + // ART Service is always enabled, so we should only arrive here + // during OTA preopt, i.e. when the installer is isolated. + if (!mInstaller.isIsolated()) { + throw new LegacyDexoptDisabledException(); } + return true; } else { return false; } @@ -554,37 +521,6 @@ public class PackageDexOptimizer { return getReasonName(compilationReason) + annotation; } - /** - * Performs dexopt on the secondary dex {@code path} belonging to the app {@code info}. - * - * @return - * DEX_OPT_FAILED if there was any exception during dexopt - * DEX_OPT_PERFORMED if dexopt was performed successfully on the given path. - * NOTE that DEX_OPT_PERFORMED for secondary dex files includes the case when the dex file - * didn't need an update. That's because at the moment we don't get more than success/failure - * from installd. - * - * TODO(calin): Consider adding return codes to installd dexopt invocation (rather than - * throwing exceptions). Or maybe make a separate call to installd to get DexOptNeeded, though - * that seems wasteful. - */ - @DexOptResult - public int dexOptSecondaryDexPath(ApplicationInfo info, String path, - PackageDexUsage.DexUseInfo dexUseInfo, DexoptOptions options) - throws LegacyDexoptDisabledException { - if (info.uid == -1) { - throw new IllegalArgumentException("Dexopt for path " + path + " has invalid uid."); - } - synchronized (mInstallLock) { - final long acquireTime = acquireWakeLockLI(info.uid); - try { - return dexOptSecondaryDexPathLI(info, path, dexUseInfo, options); - } finally { - releaseWakeLockLI(acquireTime); - } - } - } - @GuardedBy("mInstallLock") private long acquireWakeLockLI(final int uid) { // During boot the system doesn't need to instantiate and obtain a wake lock. @@ -618,69 +554,6 @@ public class PackageDexOptimizer { } } - @GuardedBy("mInstallLock") - @DexOptResult - private int dexOptSecondaryDexPathLI(ApplicationInfo info, String path, - PackageDexUsage.DexUseInfo dexUseInfo, DexoptOptions options) - throws LegacyDexoptDisabledException { - String compilerFilter = getRealCompilerFilter(info, options.getCompilerFilter(), - dexUseInfo.isUsedByOtherApps()); - // Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags. - // Secondary dex files are currently not compiled at boot. - int dexoptFlags = getDexFlags(info, compilerFilter, options) | DEXOPT_SECONDARY_DEX; - // Check the app storage and add the appropriate flags. - if (info.deviceProtectedDataDir != null && - FileUtils.contains(info.deviceProtectedDataDir, path)) { - dexoptFlags |= DEXOPT_STORAGE_DE; - } else if (info.credentialProtectedDataDir != null && - FileUtils.contains(info.credentialProtectedDataDir, path)) { - dexoptFlags |= DEXOPT_STORAGE_CE; - } else { - Slog.e(TAG, "Could not infer CE/DE storage for package " + info.packageName); - return DEX_OPT_FAILED; - } - String classLoaderContext = null; - if (dexUseInfo.isUnsupportedClassLoaderContext() - || dexUseInfo.isVariableClassLoaderContext()) { - // If we have an unknown (not yet set), or a variable class loader chain. Just verify - // the dex file. - compilerFilter = "verify"; - } else { - classLoaderContext = dexUseInfo.getClassLoaderContext(); - } - - int reason = options.getCompilationReason(); - Log.d(TAG, "Running dexopt on: " + path - + " pkg=" + info.packageName + " isa=" + dexUseInfo.getLoaderIsas() - + " reason=" + getReasonName(reason) - + " dexoptFlags=" + printDexoptFlags(dexoptFlags) - + " target-filter=" + compilerFilter - + " class-loader-context=" + classLoaderContext); - - try { - for (String isa : dexUseInfo.getLoaderIsas()) { - // Reuse the same dexopt path as for the primary apks. We don't need all the - // arguments as some (dexopNeeded and oatDir) will be computed by installd because - // system server cannot read untrusted app content. - // TODO(calin): maybe add a separate call. - boolean completed = getInstallerLI().dexopt(path, info.uid, info.packageName, - isa, /* dexoptNeeded= */ 0, - /* outputPath= */ null, dexoptFlags, - compilerFilter, info.volumeUuid, classLoaderContext, info.seInfo, - options.isDowngrade(), info.targetSdkVersion, /* profileName= */ null, - /* dexMetadataPath= */ null, getReasonName(reason)); - if (!completed) { - return DEX_OPT_CANCELLED; - } - } - - return DEX_OPT_PERFORMED; - } catch (InstallerException e) { - Slog.w(TAG, "Failed to dexopt", e); - return DEX_OPT_FAILED; - } - } - /** * Adjust the given dexopt-needed value. Can be overridden to influence the decision to * optimize or not (and in what way). @@ -697,59 +570,6 @@ public class PackageDexOptimizer { } /** - * Dumps the dexopt state of the given package {@code pkg} to the given {@code PrintWriter}. - */ - void dumpDexoptState(IndentingPrintWriter pw, AndroidPackage pkg, - PackageStateInternal pkgSetting, PackageDexUsage.PackageUseInfo useInfo) - throws LegacyDexoptDisabledException { - final String[] instructionSets = getAppDexInstructionSets(pkgSetting.getPrimaryCpuAbi(), - pkgSetting.getSecondaryCpuAbi()); - final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); - - final List<String> paths = AndroidPackageUtils.getAllCodePathsExcludingResourceOnly(pkg); - - for (String path : paths) { - pw.println("path: " + path); - pw.increaseIndent(); - - for (String isa : dexCodeInstructionSets) { - try { - DexFile.OptimizationInfo info = DexFile.getDexFileOptimizationInfo(path, isa); - pw.println(isa + ": [status=" + info.getStatus() - +"] [reason=" + info.getReason() + "]"); - } catch (IOException ioe) { - pw.println(isa + ": [Exception]: " + ioe.getMessage()); - } - } - - if (useInfo.isUsedByOtherApps(path)) { - pw.println("used by other apps: " + useInfo.getLoadingPackages(path)); - } - - Map<String, PackageDexUsage.DexUseInfo> dexUseInfoMap = useInfo.getDexUseInfoMap(); - - if (!dexUseInfoMap.isEmpty()) { - pw.println("known secondary dex files:"); - pw.increaseIndent(); - for (Map.Entry<String, PackageDexUsage.DexUseInfo> e : dexUseInfoMap.entrySet()) { - String dex = e.getKey(); - PackageDexUsage.DexUseInfo dexUseInfo = e.getValue(); - pw.println(dex); - pw.increaseIndent(); - // TODO(calin): get the status of the oat file (needs installd call) - pw.println("class loader context: " + dexUseInfo.getClassLoaderContext()); - if (dexUseInfo.isUsedByOtherApps()) { - pw.println("used by other apps: " + dexUseInfo.getLoadingPackages()); - } - pw.decreaseIndent(); - } - pw.decreaseIndent(); - } - pw.decreaseIndent(); - } - } - - /** * Returns the compiler filter that should be used to optimize the secondary dex. * The target filter will be updated if the package code is used by other apps * or if it has the safe mode flag set. @@ -898,14 +718,13 @@ public class PackageDexOptimizer { * Assesses if there's a need to perform dexopt on {@code path} for the given * configuration (isa, compiler filter, profile). */ - @GuardedBy("mInstallLock") private int getDexoptNeeded(String packageName, String path, String isa, String compilerFilter, String classLoaderContext, int profileAnalysisResult, boolean downgrade, int dexoptFlags, String oatDir) throws LegacyDexoptDisabledException { // Allow calls from OtaDexoptService even when ART Service is in use. The installer is // isolated in that case so later calls to it won't call into installd anyway. if (!mInstaller.isIsolated()) { - Installer.checkLegacyDexoptDisabled(); + throw new LegacyDexoptDisabledException(); } final boolean shouldBePublic = (dexoptFlags & DEXOPT_PUBLIC) != 0; @@ -953,16 +772,9 @@ public class PackageDexOptimizer { } /** Returns true if the current artifacts of the app are private to the app itself. */ - @GuardedBy("mInstallLock") private boolean isOdexPrivate(String packageName, String path, String isa, String oatDir) throws LegacyDexoptDisabledException { - try { - return mInstaller.getOdexVisibility(packageName, path, isa, oatDir) - == Installer.ODEX_IS_PRIVATE; - } catch (InstallerException e) { - Slog.w(TAG, "Failed to get odex visibility for " + path, e); - return false; - } + throw new LegacyDexoptDisabledException(); } /** @@ -976,22 +788,7 @@ public class PackageDexOptimizer { */ private int analyseProfiles(AndroidPackage pkg, int uid, String profileName, String compilerFilter) throws LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - - // Check if we are allowed to merge and if the compiler filter is profile guided. - if (!isProfileGuidedCompilerFilter(compilerFilter)) { - return PROFILE_ANALYSIS_DONT_OPTIMIZE_SMALL_DELTA; - } - // Merge profiles. It returns whether or not there was an updated in the profile info. - try { - synchronized (mInstallLock) { - return getInstallerLI().mergeProfiles(uid, pkg.getPackageName(), profileName); - } - } catch (InstallerException e) { - Slog.w(TAG, "Failed to merge profiles", e); - // We don't need to optimize if we failed to merge. - return PROFILE_ANALYSIS_DONT_OPTIMIZE_SMALL_DELTA; - } + throw new LegacyDexoptDisabledException(); } /** @@ -1101,7 +898,7 @@ public class PackageDexOptimizer { /** * Returns {@link #mInstaller} with {@link #mInstallLock}. This should be used for all - * {@link #mInstaller} access unless {@link #getInstallerWithoutLock()} is allowed. + * {@link #mInstaller} access. */ @GuardedBy("mInstallLock") private Installer getInstallerLI() { @@ -1109,14 +906,6 @@ public class PackageDexOptimizer { } /** - * Returns {@link #mInstaller} without lock. This should be used only inside - * {@link #controlDexOptBlocking(boolean)}. - */ - private Installer getInstallerWithoutLock() { - return mInstaller; - } - - /** * Injector for {@link PackageDexOptimizer} dependencies */ interface Injector { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 35cb5b000219..d215822d1b1c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -41,9 +41,6 @@ import static android.provider.DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE; import static com.android.internal.annotations.VisibleForTesting.Visibility; import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_INIT_TIME; -import static com.android.server.pm.DexOptHelper.useArtService; -import static com.android.server.pm.InstructionSets.getDexCodeInstructionSet; -import static com.android.server.pm.InstructionSets.getPreferredInstructionSet; import static com.android.server.pm.PackageManagerServiceUtils.compareSignatures; import static com.android.server.pm.PackageManagerServiceUtils.isInstalledByAdb; import static com.android.server.pm.PackageManagerServiceUtils.logCriticalInfo; @@ -216,10 +213,8 @@ import com.android.server.art.model.DeleteResult; import com.android.server.compat.CompatChange; import com.android.server.compat.PlatformCompat; import com.android.server.pm.Installer.InstallerException; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.Settings.VersionInfo; import com.android.server.pm.dex.ArtManagerService; -import com.android.server.pm.dex.ArtUtils; import com.android.server.pm.dex.DexManager; import com.android.server.pm.dex.DynamicCodeLogger; import com.android.server.pm.local.PackageManagerLocalImpl; @@ -820,8 +815,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService // TODO(b/260124949): Remove these. final PackageDexOptimizer mPackageDexOptimizer; - @Nullable - final BackgroundDexOptService mBackgroundDexOptService; // null when ART Service is in use. // DexManager handles the usage of dex files (e.g. secondary files, whether or not a package // is used by other apps). private final DexManager mDexManager; @@ -1763,16 +1756,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService new DefaultSystemWrapper(), LocalServices::getService, context::getSystemService, - (i, pm) -> { - if (useArtService()) { - return null; - } - try { - return new BackgroundDexOptService(i.getContext(), i.getDexManager(), pm); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - }, (i, pm) -> IBackupManager.Stub.asInterface(ServiceManager.getService( Context.BACKUP_SERVICE)), (i, pm) -> new SharedLibrariesImpl(pm, i), @@ -1916,7 +1899,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mApexManager = testParams.apexManager; mArtManagerService = testParams.artManagerService; mAvailableFeatures = testParams.availableFeatures; - mBackgroundDexOptService = testParams.backgroundDexOptService; mDefParseFlags = testParams.defParseFlags; mDefaultAppProvider = testParams.defaultAppProvider; mLegacyPermissionManager = testParams.legacyPermissionManagerInternal; @@ -2113,7 +2095,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mPackageDexOptimizer = injector.getPackageDexOptimizer(); mDexManager = injector.getDexManager(); mDynamicCodeLogger = injector.getDynamicCodeLogger(); - mBackgroundDexOptService = injector.getBackgroundDexOptService(); mArtManagerService = injector.getArtManagerService(); mMoveCallbacks = new MovePackageHelper.MoveCallbacks(FgThread.get().getLooper()); mSharedLibraries = mInjector.getSharedLibrariesImpl(); @@ -2369,19 +2350,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService null /*scannedPackage*/, mInjector.getAbiHelper().getAdjustedAbiForSharedUser( setting.getPackageStates(), null /*scannedPackage*/)); - if (!useArtService() && // Skip for ART Service since it has its own dex file GC. - changedAbiCodePath != null && changedAbiCodePath.size() > 0) { - for (int i = changedAbiCodePath.size() - 1; i >= 0; --i) { - final String codePathString = changedAbiCodePath.get(i); - try { - mInstaller.rmdex(codePathString, - getDexCodeInstructionSet(getPreferredInstructionSet())); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } catch (InstallerException ignored) { - } - } - } // Adjust seInfo to ensure apps which share a sharedUserId are placed in the same // SELinux domain. setting.fixSeInfoLocked(); @@ -4309,16 +4277,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } }); - if (!useArtService()) { - // The background dexopt job is scheduled in DexOptHelper.initializeArtManagerLocal when - // ART Service is in use. - try { - mBackgroundDexOptService.systemReady(); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } - // Prune unused static shared libraries which have been cached a period of time schedulePruneUnusedStaticSharedLibraries(false /* delay */); @@ -6903,46 +6861,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - /** @deprecated For legacy shell command only. */ - @Override - @Deprecated - public void legacyDumpProfiles(String packageName, boolean dumpClassesAndMethods) - throws LegacyDexoptDisabledException { - final Computer snapshot = snapshotComputer(); - AndroidPackage pkg = snapshot.getPackage(packageName); - if (pkg == null) { - throw new IllegalArgumentException("Unknown package: " + packageName); - } - - synchronized (mInstallLock) { - Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "dump profiles"); - mArtManagerService.dumpProfiles(pkg, dumpClassesAndMethods); - Trace.traceEnd(Trace.TRACE_TAG_DALVIK); - } - } - - /** @deprecated For legacy shell command only. */ - @Override - @Deprecated - public void legacyForceDexOpt(String packageName) throws LegacyDexoptDisabledException { - mDexOptHelper.forceDexOpt(snapshotComputer(), packageName); - } - - /** @deprecated For legacy shell command only. */ - @Override - @Deprecated - public void legacyReconcileSecondaryDexFiles(String packageName) - throws LegacyDexoptDisabledException { - final Computer snapshot = snapshotComputer(); - if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { - return; - } else if (snapshot.isInstantAppInternal( - packageName, UserHandle.getCallingUserId(), Process.SYSTEM_UID)) { - return; - } - mDexManager.reconcileSecondaryDexFiles(packageName); - } - @Override @SuppressWarnings("GuardedBy") public void updateRuntimePermissionsFingerprint(@UserIdInt int userId) { @@ -7512,33 +7430,20 @@ public class PackageManagerService implements PackageSender, TestUtilityService PackageManagerServiceUtils.enforceSystemOrRootOrShell( "Only the system or shell can delete oat artifacts"); - if (DexOptHelper.useArtService()) { - // TODO(chiuwinson): Retrieve filtered snapshot from Computer instance instead. - try (PackageManagerLocal.FilteredSnapshot filteredSnapshot = - PackageManagerServiceUtils.getPackageManagerLocal() - .withFilteredSnapshot()) { - try { - DeleteResult res = DexOptHelper.getArtManagerLocal().deleteDexoptArtifacts( - filteredSnapshot, packageName); - return res.getFreedBytes(); - } catch (IllegalArgumentException e) { - Log.e(TAG, e.toString()); - return -1; - } catch (IllegalStateException e) { - Slog.wtfStack(TAG, e.toString()); - return -1; - } - } - } else { - PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); - if (packageState == null || packageState.getPkg() == null) { - return -1; // error code of deleteOptimizedFiles - } + // TODO(chiuwinson): Retrieve filtered snapshot from Computer instance instead. + try (PackageManagerLocal.FilteredSnapshot filteredSnapshot = + PackageManagerServiceUtils.getPackageManagerLocal() + .withFilteredSnapshot()) { try { - return mDexManager.deleteOptimizedFiles( - ArtUtils.createArtPackageInfo(packageState.getPkg(), packageState)); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); + DeleteResult res = DexOptHelper.getArtManagerLocal().deleteDexoptArtifacts( + filteredSnapshot, packageName); + return res.getFreedBytes(); + } catch (IllegalArgumentException e) { + Log.e(TAG, e.toString()); + return -1; + } catch (IllegalStateException e) { + Slog.wtfStack(TAG, e.toString()); + return -1; } } } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceInjector.java b/services/core/java/com/android/server/pm/PackageManagerServiceInjector.java index 049737d42f51..83f3b16b31d1 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceInjector.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceInjector.java @@ -16,7 +16,6 @@ package com.android.server.pm; -import android.annotation.Nullable; import android.app.ActivityManagerInternal; import android.app.backup.IBackupManager; import android.content.ComponentName; @@ -138,8 +137,6 @@ public class PackageManagerServiceInjector { private final Singleton<DomainVerificationManagerInternal> mDomainVerificationManagerInternalProducer; private final Singleton<Handler> mHandlerProducer; - private final Singleton<BackgroundDexOptService> - mBackgroundDexOptService; // TODO(b/260124949): Remove this. private final Singleton<IBackupManager> mIBackupManager; private final Singleton<SharedLibrariesImpl> mSharedLibrariesProducer; private final Singleton<CrossProfileIntentFilterHelper> mCrossProfileIntentFilterHelperProducer; @@ -180,7 +177,6 @@ public class PackageManagerServiceInjector { SystemWrapper systemWrapper, ServiceProducer getLocalServiceProducer, ServiceProducer getSystemServiceProducer, - Producer<BackgroundDexOptService> backgroundDexOptService, Producer<IBackupManager> iBackupManager, Producer<SharedLibrariesImpl> sharedLibrariesProducer, Producer<CrossProfileIntentFilterHelper> crossProfileIntentFilterHelperProducer, @@ -234,7 +230,6 @@ public class PackageManagerServiceInjector { new Singleton<>( domainVerificationManagerInternalProducer); mHandlerProducer = new Singleton<>(handlerProducer); - mBackgroundDexOptService = new Singleton<>(backgroundDexOptService); mIBackupManager = new Singleton<>(iBackupManager); mSharedLibrariesProducer = new Singleton<>(sharedLibrariesProducer); mCrossProfileIntentFilterHelperProducer = new Singleton<>( @@ -409,11 +404,6 @@ public class PackageManagerServiceInjector { return getLocalService(ActivityManagerInternal.class); } - @Nullable - public BackgroundDexOptService getBackgroundDexOptService() { - return mBackgroundDexOptService.get(this, mPackageManager); - } - public IBackupManager getIBackupManager() { return mIBackupManager.get(this, mPackageManager); } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java index 2d797187b7f1..289373ee1456 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java @@ -105,7 +105,6 @@ public final class PackageManagerServiceTestParams { public boolean isEngBuild; public boolean isUserDebugBuild; public int sdkInt = Build.VERSION.SDK_INT; - public @Nullable BackgroundDexOptService backgroundDexOptService; public final String incrementalVersion = Build.VERSION.INCREMENTAL; public BroadcastHelper broadcastHelper; public AppDataHelper appDataHelper; diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 4fb9b56a5f5f..a9e1725ea9a0 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -29,7 +29,6 @@ import static android.content.pm.PackageManager.RESTRICTION_NONE; import static com.android.server.LocalManagerRegistry.ManagerNotFoundException; import static com.android.server.pm.PackageManagerService.DEFAULT_FILE_ACCESS_MODE; -import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; import android.accounts.IAccountManager; import android.annotation.NonNull; @@ -67,7 +66,6 @@ import android.content.pm.SharedLibraryInfo; import android.content.pm.SuspendDialogInfo; import android.content.pm.UserInfo; import android.content.pm.VersionedPackage; -import android.content.pm.dex.ArtManager; import android.content.pm.dex.DexMetadataHelper; import android.content.pm.dex.ISnapshotRuntimeProfileCallback; import android.content.pm.parsing.ApkLite; @@ -102,8 +100,6 @@ import android.os.UserManager; import android.os.incremental.V4Signature; import android.os.storage.StorageManager; import android.permission.PermissionManager; -import android.system.ErrnoException; -import android.system.Os; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.ArrayMap; @@ -123,25 +119,20 @@ import com.android.server.LocalManagerRegistry; import com.android.server.LocalServices; import com.android.server.SystemConfig; import com.android.server.art.ArtManagerLocal; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.PackageManagerShellCommandDataLoader.Metadata; import com.android.server.pm.permission.LegacyPermissionManagerInternal; import com.android.server.pm.permission.PermissionAllowlist; import com.android.server.pm.verify.domain.DomainVerificationShell; -import dalvik.system.DexFile; - import libcore.io.IoUtils; import libcore.io.Streams; import libcore.util.HexEncoding; import java.io.BufferedReader; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.PrintWriter; import java.net.URISyntaxException; import java.security.SecureRandom; @@ -154,7 +145,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.CompletableFuture; @@ -400,15 +390,7 @@ class PackageManagerShellCommand extends ShellCommand { return runGetDomainVerificationAgent(); default: { if (ART_SERVICE_COMMANDS.contains(cmd)) { - if (DexOptHelper.useArtService()) { - return runArtServiceCommand(); - } else { - try { - return runLegacyDexoptCommand(cmd); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } + return runArtServiceCommand(); } Boolean domainVerificationResult = @@ -438,40 +420,6 @@ class PackageManagerShellCommand extends ShellCommand { return -1; } - private int runLegacyDexoptCommand(@NonNull String cmd) - throws RemoteException, LegacyDexoptDisabledException { - Installer.checkLegacyDexoptDisabled(); - - if (!PackageManagerServiceUtils.isRootOrShell(Binder.getCallingUid())) { - throw new SecurityException("Dexopt shell commands need root or shell access"); - } - - switch (cmd) { - case "compile": - return runCompile(); - case "reconcile-secondary-dex-files": - return runreconcileSecondaryDexFiles(); - case "force-dex-opt": - return runForceDexOpt(); - case "bg-dexopt-job": - return runBgDexOpt(); - case "cancel-bg-dexopt-job": - return cancelBgDexOptJob(); - case "delete-dexopt": - return runDeleteDexOpt(); - case "dump-profiles": - return runDumpProfiles(); - case "snapshot-profile": - return runSnapshotProfile(); - case "art": - getOutPrintWriter().println("ART Service not enabled"); - return -1; - default: - // Can't happen. - throw new IllegalArgumentException(); - } - } - /** * Shows module info * @@ -2067,340 +2015,6 @@ class PackageManagerShellCommand extends ShellCommand { } } - private int runCompile() throws RemoteException { - final PrintWriter pw = getOutPrintWriter(); - boolean forceCompilation = false; - boolean allPackages = false; - boolean clearProfileData = false; - String compilerFilter = null; - String compilationReason = null; - boolean secondaryDex = false; - String split = null; - - String opt; - while ((opt = getNextOption()) != null) { - switch (opt) { - case "-a": - allPackages = true; - break; - case "-c": - clearProfileData = true; - break; - case "-f": - forceCompilation = true; - break; - case "-m": - compilerFilter = getNextArgRequired(); - break; - case "-r": - compilationReason = getNextArgRequired(); - break; - case "--check-prof": - getNextArgRequired(); - pw.println("Warning: Ignoring obsolete flag --check-prof " - + "- it is unconditionally enabled now"); - break; - case "--reset": - forceCompilation = true; - clearProfileData = true; - compilationReason = "install"; - break; - case "--secondary-dex": - secondaryDex = true; - break; - case "--split": - split = getNextArgRequired(); - break; - default: - pw.println("Error: Unknown option: " + opt); - return 1; - } - } - - final boolean compilerFilterGiven = compilerFilter != null; - final boolean compilationReasonGiven = compilationReason != null; - // Make sure exactly one of -m, or -r is given. - if (compilerFilterGiven && compilationReasonGiven) { - pw.println("Cannot use compilation filter (\"-m\") and compilation reason (\"-r\") " - + "at the same time"); - return 1; - } - if (!compilerFilterGiven && !compilationReasonGiven) { - pw.println("Cannot run without any of compilation filter (\"-m\") and compilation " - + "reason (\"-r\")"); - return 1; - } - - if (allPackages && split != null) { - pw.println("-a cannot be specified together with --split"); - return 1; - } - - if (secondaryDex && split != null) { - pw.println("--secondary-dex cannot be specified together with --split"); - return 1; - } - - String targetCompilerFilter = null; - if (compilerFilterGiven) { - if (!DexFile.isValidCompilerFilter(compilerFilter)) { - pw.println("Error: \"" + compilerFilter + - "\" is not a valid compilation filter."); - return 1; - } - targetCompilerFilter = compilerFilter; - } - if (compilationReasonGiven) { - int reason = -1; - for (int i = 0; i < PackageManagerServiceCompilerMapping.REASON_STRINGS.length; i++) { - if (PackageManagerServiceCompilerMapping.REASON_STRINGS[i].equals( - compilationReason)) { - reason = i; - break; - } - } - if (reason == -1) { - pw.println("Error: Unknown compilation reason: " + compilationReason); - return 1; - } - targetCompilerFilter = - PackageManagerServiceCompilerMapping.getCompilerFilterForReason(reason); - } - - - List<String> packageNames = null; - if (allPackages) { - packageNames = mInterface.getAllPackages(); - // Compiling the system server is only supported from odrefresh, so skip it. - packageNames.removeIf(packageName -> PLATFORM_PACKAGE_NAME.equals(packageName)); - } else { - String packageName = getNextArg(); - if (packageName == null) { - pw.println("Error: package name not specified"); - return 1; - } - packageNames = Collections.singletonList(packageName); - } - - List<String> failedPackages = new ArrayList<>(); - int index = 0; - for (String packageName : packageNames) { - if (clearProfileData) { - mInterface.clearApplicationProfileData(packageName); - } - - if (allPackages) { - pw.println(++index + "/" + packageNames.size() + ": " + packageName); - pw.flush(); - } - - final boolean result = secondaryDex - ? mInterface.performDexOptSecondary( - packageName, targetCompilerFilter, forceCompilation) - : mInterface.performDexOptMode(packageName, true /* checkProfiles */, - targetCompilerFilter, forceCompilation, true /* bootComplete */, split); - if (!result) { - failedPackages.add(packageName); - } - } - - if (failedPackages.isEmpty()) { - pw.println("Success"); - return 0; - } else if (failedPackages.size() == 1) { - pw.println("Failure: package " + failedPackages.get(0) + " could not be compiled"); - return 1; - } else { - pw.print("Failure: the following packages could not be compiled: "); - boolean is_first = true; - for (String packageName : failedPackages) { - if (is_first) { - is_first = false; - } else { - pw.print(", "); - } - pw.print(packageName); - } - pw.println(); - return 1; - } - } - - private int runreconcileSecondaryDexFiles() - throws RemoteException, LegacyDexoptDisabledException { - String packageName = getNextArg(); - mPm.legacyReconcileSecondaryDexFiles(packageName); - return 0; - } - - public int runForceDexOpt() throws RemoteException, LegacyDexoptDisabledException { - mPm.legacyForceDexOpt(getNextArgRequired()); - return 0; - } - - private int runBgDexOpt() throws RemoteException, LegacyDexoptDisabledException { - String opt = getNextOption(); - - if (opt == null) { - List<String> packageNames = new ArrayList<>(); - String arg; - while ((arg = getNextArg()) != null) { - packageNames.add(arg); - } - if (!BackgroundDexOptService.getService().runBackgroundDexoptJob( - packageNames.isEmpty() ? null : packageNames)) { - getOutPrintWriter().println("Failure"); - return -1; - } - } else { - String extraArg = getNextArg(); - if (extraArg != null) { - getErrPrintWriter().println("Invalid argument: " + extraArg); - return -1; - } - - switch (opt) { - case "--cancel": - return cancelBgDexOptJob(); - - case "--disable": - BackgroundDexOptService.getService().setDisableJobSchedulerJobs(true); - break; - - case "--enable": - BackgroundDexOptService.getService().setDisableJobSchedulerJobs(false); - break; - - default: - getErrPrintWriter().println("Unknown option: " + opt); - return -1; - } - } - - getOutPrintWriter().println("Success"); - return 0; - } - - private int cancelBgDexOptJob() throws RemoteException, LegacyDexoptDisabledException { - BackgroundDexOptService.getService().cancelBackgroundDexoptJob(); - getOutPrintWriter().println("Success"); - return 0; - } - - private int runDeleteDexOpt() throws RemoteException { - PrintWriter pw = getOutPrintWriter(); - String packageName = getNextArg(); - if (TextUtils.isEmpty(packageName)) { - pw.println("Error: no package name"); - return 1; - } - long freedBytes = mPm.deleteOatArtifactsOfPackage(packageName); - if (freedBytes < 0) { - pw.println("Error: delete failed"); - return 1; - } - pw.println("Success: freed " + freedBytes + " bytes"); - Slog.i(TAG, "delete-dexopt " + packageName + " ,freed " + freedBytes + " bytes"); - return 0; - } - - private int runDumpProfiles() throws RemoteException, LegacyDexoptDisabledException { - final PrintWriter pw = getOutPrintWriter(); - boolean dumpClassesAndMethods = false; - - String opt; - while ((opt = getNextOption()) != null) { - switch (opt) { - case "--dump-classes-and-methods": - dumpClassesAndMethods = true; - break; - default: - pw.println("Error: Unknown option: " + opt); - return 1; - } - } - - String packageName = getNextArg(); - mPm.legacyDumpProfiles(packageName, dumpClassesAndMethods); - return 0; - } - - private int runSnapshotProfile() throws RemoteException { - PrintWriter pw = getOutPrintWriter(); - - // Parse the arguments - final String packageName = getNextArg(); - final boolean isBootImage = "android".equals(packageName); - - String codePath = null; - String opt; - while ((opt = getNextArg()) != null) { - switch (opt) { - case "--code-path": - if (isBootImage) { - pw.write("--code-path cannot be used for the boot image."); - return -1; - } - codePath = getNextArg(); - break; - default: - pw.write("Unknown arg: " + opt); - return -1; - } - } - - // If no code path was explicitly requested, select the base code path. - String baseCodePath = null; - if (!isBootImage) { - PackageInfo packageInfo = mInterface.getPackageInfo(packageName, /* flags */ 0, - /* userId */0); - if (packageInfo == null) { - pw.write("Package not found " + packageName); - return -1; - } - baseCodePath = packageInfo.applicationInfo.getBaseCodePath(); - if (codePath == null) { - codePath = baseCodePath; - } - } - - // Create the profile snapshot. - final SnapshotRuntimeProfileCallback callback = new SnapshotRuntimeProfileCallback(); - // The calling package is needed to debug permission access. - final String callingPackage = (Binder.getCallingUid() == Process.ROOT_UID) - ? "root" : "com.android.shell"; - final int profileType = isBootImage - ? ArtManager.PROFILE_BOOT_IMAGE : ArtManager.PROFILE_APPS; - if (!mInterface.getArtManager().isRuntimeProfilingEnabled(profileType, callingPackage)) { - pw.println("Error: Runtime profiling is not enabled"); - return -1; - } - mInterface.getArtManager().snapshotRuntimeProfile(profileType, packageName, - codePath, callback, callingPackage); - if (!callback.waitTillDone()) { - pw.println("Error: callback not called"); - return callback.mErrCode; - } - - // Copy the snapshot profile to the output profile file. - try (InputStream inStream = new AutoCloseInputStream(callback.mProfileReadFd)) { - final String outputFileSuffix = isBootImage || Objects.equals(baseCodePath, codePath) - ? "" : ("-" + new File(codePath).getName()); - final String outputProfilePath = - ART_PROFILE_SNAPSHOT_DEBUG_LOCATION + packageName + outputFileSuffix + ".prof"; - try (OutputStream outStream = new FileOutputStream(outputProfilePath)) { - Streams.copy(inStream, outStream); - } - // Give read permissions to the other group. - Os.chmod(outputProfilePath, /*mode*/ DEFAULT_FILE_ACCESS_MODE); - } catch (IOException | ErrnoException e) { - pw.println("Error when reading the profile fd: " + e.getMessage()); - e.printStackTrace(pw); - return -1; - } - return 0; - } - private ArrayList<String> getRemainingArgs() { ArrayList<String> args = new ArrayList<>(); String arg; @@ -5212,11 +4826,7 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" get-domain-verification-agent"); pw.println(" Displays the component name of the domain verification agent on device."); pw.println(""); - if (DexOptHelper.useArtService()) { - printArtServiceHelp(); - } else { - printLegacyDexoptHelp(); - } + printArtServiceHelp(); pw.println(""); mDomainVerificationShell.printHelp(pw); pw.println(""); @@ -5235,75 +4845,6 @@ class PackageManagerShellCommand extends ShellCommand { ipw.decreaseIndent(); } - private void printLegacyDexoptHelp() { - final PrintWriter pw = getOutPrintWriter(); - pw.println(" compile [-m MODE | -r REASON] [-f] [-c] [--split SPLIT_NAME]"); - pw.println(" [--reset] [--check-prof (true | false)] (-a | TARGET-PACKAGE)"); - pw.println(" Trigger compilation of TARGET-PACKAGE or all packages if \"-a\". Options are:"); - pw.println(" -a: compile all packages"); - pw.println(" -c: clear profile data before compiling"); - pw.println(" -f: force compilation even if not needed"); - pw.println(" -m: select compilation mode"); - pw.println(" MODE is one of the dex2oat compiler filters:"); - pw.println(" verify"); - pw.println(" speed-profile"); - pw.println(" speed"); - pw.println(" -r: select compilation reason"); - pw.println(" REASON is one of:"); - for (int i = 0; i < PackageManagerServiceCompilerMapping.REASON_STRINGS.length; i++) { - pw.println(" " + PackageManagerServiceCompilerMapping.REASON_STRINGS[i]); - } - pw.println(" --reset: restore package to its post-install state"); - pw.println(" --check-prof (true | false): ignored - this is always true"); - pw.println(" --secondary-dex: compile app secondary dex files"); - pw.println(" --split SPLIT: compile only the given split name"); - pw.println(""); - pw.println(" force-dex-opt PACKAGE"); - pw.println(" Force immediate execution of dex opt for the given PACKAGE."); - pw.println(""); - pw.println(" delete-dexopt PACKAGE"); - pw.println(" Delete dex optimization results for the given PACKAGE."); - pw.println(""); - pw.println(" bg-dexopt-job [PACKAGE... | --cancel | --disable | --enable]"); - pw.println(" Controls the background job that optimizes dex files:"); - pw.println(" Without flags, run background optimization immediately on the given"); - pw.println(" PACKAGEs, or all packages if none is specified, and wait until the job"); - pw.println(" finishes. Note that the command only runs the background optimizer logic."); - pw.println(" It will run even if the device is not in the idle maintenance mode. If a"); - pw.println(" job is already running (including one started automatically by the"); - pw.println(" system) it will wait for it to finish before starting. A background job"); - pw.println(" will not be started automatically while one started this way is running."); - pw.println(" --cancel: Cancels any currently running background optimization job"); - pw.println(" immediately. This cancels jobs started either automatically by the"); - pw.println(" system or through this command. Note that cancelling a currently"); - pw.println(" running bg-dexopt-job command requires running this command from a"); - pw.println(" separate adb shell."); - pw.println(" --disable: Disables background jobs from being started by the job"); - pw.println(" scheduler. Does not affect bg-dexopt-job invocations from the shell."); - pw.println(" Does not imply --cancel. This state will be lost when the"); - pw.println(" system_server process exits."); - pw.println(" --enable: Enables background jobs to be started by the job scheduler"); - pw.println(" again, if previously disabled by --disable."); - pw.println(" cancel-bg-dexopt-job"); - pw.println(" Same as bg-dexopt-job --cancel."); - pw.println(""); - pw.println(" reconcile-secondary-dex-files TARGET-PACKAGE"); - pw.println(" Reconciles the package secondary dex files with the generated oat files."); - pw.println(""); - pw.println(" dump-profiles [--dump-classes-and-methods] TARGET-PACKAGE"); - pw.println(" Dumps method/class profile files to"); - pw.println(" " + ART_PROFILE_SNAPSHOT_DEBUG_LOCATION - + "TARGET-PACKAGE-primary.prof.txt."); - pw.println(" --dump-classes-and-methods: passed along to the profman binary to"); - pw.println(" switch to the format used by 'profman --create-profile-from'."); - pw.println(""); - pw.println(" snapshot-profile TARGET-PACKAGE [--code-path path]"); - pw.println(" Take a snapshot of the package profiles to"); - pw.println(" " + ART_PROFILE_SNAPSHOT_DEBUG_LOCATION - + "TARGET-PACKAGE[-code-path].prof"); - pw.println(" If TARGET-PACKAGE=android it will take a snapshot of the boot image"); - } - private static class LocalIntentReceiver { private final LinkedBlockingQueue<Intent> mResult = new LinkedBlockingQueue<>(); diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java index 70352be01096..3a0f7fb4b432 100644 --- a/services/core/java/com/android/server/pm/RemovePackageHelper.java +++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java @@ -23,7 +23,6 @@ import static android.os.storage.StorageManager.FLAG_STORAGE_CE; import static android.os.storage.StorageManager.FLAG_STORAGE_DE; import static android.os.storage.StorageManager.FLAG_STORAGE_EXTERNAL; -import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; import static com.android.server.pm.PackageManagerService.DEBUG_INSTALL; import static com.android.server.pm.PackageManagerService.DEBUG_REMOVE; import static com.android.server.pm.PackageManagerService.RANDOM_DIR_PREFIX; @@ -49,7 +48,6 @@ import com.android.internal.pm.parsing.pkg.AndroidPackageLegacyUtils; import com.android.internal.pm.parsing.pkg.PackageImpl; import com.android.internal.pm.pkg.component.ParsedInstrumentation; import com.android.internal.util.ArrayUtils; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.parsing.PackageCacher; import com.android.server.pm.permission.PermissionManagerServiceInternal; import com.android.server.pm.pkg.AndroidPackage; @@ -263,11 +261,6 @@ final class RemovePackageHelper { // Step 1: always destroy app profiles. mAppDataHelper.destroyAppProfilesLIF(packageName); - // Everything else is preserved if the DELETE_KEEP_DATA flag is on - if ((flags & PackageManager.DELETE_KEEP_DATA) != 0) { - return; - } - final AndroidPackage pkg; final SharedUserSetting sus; synchronized (mPm.mLock) { @@ -284,9 +277,20 @@ final class RemovePackageHelper { resolvedPkg = PackageImpl.buildFakeForDeletion(packageName, ps.getVolumeUuid()); } + int appDataDeletionFlags = FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL; + // Personal data is preserved if the DELETE_KEEP_DATA flag is on + if ((flags & PackageManager.DELETE_KEEP_DATA) != 0) { + if ((flags & PackageManager.DELETE_ARCHIVE) != 0) { + mAppDataHelper.clearAppDataLIF(resolvedPkg, userId, + appDataDeletionFlags | Installer.FLAG_CLEAR_CACHE_ONLY); + mAppDataHelper.clearAppDataLIF(resolvedPkg, userId, + appDataDeletionFlags | Installer.FLAG_CLEAR_CODE_CACHE_ONLY); + } + return; + } + // Step 2: destroy app data. - mAppDataHelper.destroyAppDataLIF(resolvedPkg, userId, - FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL); + mAppDataHelper.destroyAppDataLIF(resolvedPkg, userId, appDataDeletionFlags); if (userId != UserHandle.USER_ALL) { ps.setCeDataInode(-1, userId); ps.setDeDataInode(-1, userId); @@ -511,32 +515,9 @@ final class RemovePackageHelper { } removeCodePathLI(codeFile); - removeDexFilesLI(allCodePaths, instructionSets); - } - @GuardedBy("mPm.mInstallLock") - private void removeDexFilesLI(@NonNull List<String> allCodePaths, - @Nullable String[] instructionSets) { - if (!allCodePaths.isEmpty()) { - if (instructionSets == null) { - throw new IllegalStateException("instructionSet == null"); - } - // TODO(b/265813358): ART Service currently doesn't support deleting optimized artifacts - // relative to an arbitrary APK path. Skip this and rely on its file GC instead. - if (!DexOptHelper.useArtService()) { - String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); - for (String codePath : allCodePaths) { - for (String dexCodeInstructionSet : dexCodeInstructionSets) { - try { - mPm.mInstaller.rmdex(codePath, dexCodeInstructionSet); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } catch (Installer.InstallerException ignored) { - } - } - } - } - } + // TODO(b/265813358): ART Service currently doesn't support deleting optimized artifacts + // relative to an arbitrary APK path. Skip this and rely on its file GC instead. } void cleanUpForMoveInstall(String volumeUuid, String packageName, String fromCodePath) { diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index ae47aa823245..e49dc8250bc7 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -18,7 +18,6 @@ package com.android.server.pm.dex; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -28,7 +27,6 @@ import android.content.pm.PackageManager; import android.content.pm.dex.ArtManager; import android.content.pm.dex.ArtManager.ProfileType; import android.content.pm.dex.ArtManagerInternal; -import android.content.pm.dex.DexMetadataHelper; import android.content.pm.dex.ISnapshotRuntimeProfileCallback; import android.content.pm.dex.PackageOptimizationInfo; import android.os.Binder; @@ -39,8 +37,6 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; -import android.os.UserHandle; -import android.system.Os; import android.util.ArrayMap; import android.util.Log; import android.util.Slog; @@ -53,22 +49,17 @@ import com.android.server.LocalServices; import com.android.server.art.ArtManagerLocal; import com.android.server.pm.DexOptHelper; import com.android.server.pm.Installer; -import com.android.server.pm.Installer.InstallerException; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.PackageManagerLocal; import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerServiceCompilerMapping; import com.android.server.pm.PackageManagerServiceUtils; -import com.android.server.pm.parsing.PackageInfoUtils; import com.android.server.pm.pkg.AndroidPackage; -import com.android.server.pm.pkg.PackageStateInternal; import dalvik.system.DexFile; import dalvik.system.VMRuntime; import libcore.io.IoUtils; -import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; @@ -259,91 +250,27 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { } // All good, create the profile snapshot. - if (DexOptHelper.useArtService()) { - ParcelFileDescriptor fd; - - try (PackageManagerLocal.FilteredSnapshot snapshot = - PackageManagerServiceUtils.getPackageManagerLocal() - .withFilteredSnapshot()) { - fd = DexOptHelper.getArtManagerLocal().snapshotAppProfile( - snapshot, packageName, splitName); - } catch (IllegalArgumentException e) { - // ArtManagerLocal.snapshotAppProfile couldn't find the package or split. Since - // we've checked them above this can only happen due to race, i.e. the package got - // removed. So let's report it as SNAPSHOT_FAILED_PACKAGE_NOT_FOUND even if it was - // for the split. - // TODO(mast): Reuse the same snapshot to avoid this race. - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_PACKAGE_NOT_FOUND); - return; - } catch (IllegalStateException | ArtManagerLocal.SnapshotProfileException e) { - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - return; - } - - postSuccess(packageName, fd, callback); - } else { - int appId = UserHandle.getAppId(info.applicationInfo.uid); - if (appId < 0) { - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - Slog.wtf(TAG, "AppId is -1 for package: " + packageName); - return; - } - - try { - createProfileSnapshot(packageName, ArtManager.getProfileName(splitName), codePath, - appId, callback); - // Destroy the snapshot, we no longer need it. - destroyProfileSnapshot(packageName, ArtManager.getProfileName(splitName)); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } - } - } - - private void createProfileSnapshot(String packageName, String profileName, String classpath, - int appId, ISnapshotRuntimeProfileCallback callback) - throws LegacyDexoptDisabledException { - // Ask the installer to snapshot the profile. - try { - if (!mInstaller.createProfileSnapshot(appId, packageName, profileName, classpath)) { - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - return; - } - } catch (InstallerException e) { - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); + ParcelFileDescriptor fd; + + try (PackageManagerLocal.FilteredSnapshot snapshot = + PackageManagerServiceUtils.getPackageManagerLocal() + .withFilteredSnapshot()) { + fd = DexOptHelper.getArtManagerLocal().snapshotAppProfile( + snapshot, packageName, splitName); + } catch (IllegalArgumentException e) { + // ArtManagerLocal.snapshotAppProfile couldn't find the package or split. Since + // we've checked them above this can only happen due to race, i.e. the package got + // removed. So let's report it as SNAPSHOT_FAILED_PACKAGE_NOT_FOUND even if it was + // for the split. + // TODO(mast): Reuse the same snapshot to avoid this race. + postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_PACKAGE_NOT_FOUND); return; - } - - // Open the snapshot and invoke the callback. - File snapshotProfile = ArtManager.getProfileSnapshotFileForName(packageName, profileName); - - ParcelFileDescriptor fd = null; - try { - fd = ParcelFileDescriptor.open(snapshotProfile, ParcelFileDescriptor.MODE_READ_ONLY); - if (fd == null || !fd.getFileDescriptor().valid()) { - postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - } else { - postSuccess(packageName, fd, callback); - } - } catch (FileNotFoundException e) { - Slog.w(TAG, "Could not open snapshot profile for " + packageName + ":" - + snapshotProfile, e); + } catch (IllegalStateException | ArtManagerLocal.SnapshotProfileException e) { postError(callback, packageName, ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - } - } - - private void destroyProfileSnapshot(String packageName, String profileName) - throws LegacyDexoptDisabledException { - if (DEBUG) { - Slog.d(TAG, "Destroying profile snapshot for" + packageName + ":" + profileName); + return; } - try { - mInstaller.destroyProfileSnapshot(packageName, profileName); - } catch (InstallerException e) { - Slog.e(TAG, "Failed to destroy profile snapshot for " + packageName + ":" + profileName, - e); - } + postSuccess(packageName, fd, callback); } @Override @@ -368,42 +295,19 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { } private void snapshotBootImageProfile(ISnapshotRuntimeProfileCallback callback) { - if (DexOptHelper.useArtService()) { - ParcelFileDescriptor fd; - - try (PackageManagerLocal.FilteredSnapshot snapshot = - PackageManagerServiceUtils.getPackageManagerLocal() - .withFilteredSnapshot()) { - fd = DexOptHelper.getArtManagerLocal().snapshotBootImageProfile(snapshot); - } catch (IllegalStateException | ArtManagerLocal.SnapshotProfileException e) { - postError(callback, BOOT_IMAGE_ANDROID_PACKAGE, - ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); - return; - } - - postSuccess(BOOT_IMAGE_ANDROID_PACKAGE, fd, callback); - } else { - // Combine the profiles for boot classpath and system server classpath. - // This avoids having yet another type of profiles and simplifies the processing. - String classpath = String.join( - ":", Os.getenv("BOOTCLASSPATH"), Os.getenv("SYSTEMSERVERCLASSPATH")); - - final String standaloneSystemServerJars = Os.getenv("STANDALONE_SYSTEMSERVER_JARS"); - if (standaloneSystemServerJars != null) { - classpath = String.join(":", classpath, standaloneSystemServerJars); - } - - try { - // Create the snapshot. - createProfileSnapshot(BOOT_IMAGE_ANDROID_PACKAGE, BOOT_IMAGE_PROFILE_NAME, - classpath, - /*appId*/ -1, callback); - // Destroy the snapshot, we no longer need it. - destroyProfileSnapshot(BOOT_IMAGE_ANDROID_PACKAGE, BOOT_IMAGE_PROFILE_NAME); - } catch (LegacyDexoptDisabledException e) { - throw new RuntimeException(e); - } + ParcelFileDescriptor fd; + + try (PackageManagerLocal.FilteredSnapshot snapshot = + PackageManagerServiceUtils.getPackageManagerLocal() + .withFilteredSnapshot()) { + fd = DexOptHelper.getArtManagerLocal().snapshotBootImageProfile(snapshot); + } catch (IllegalStateException | ArtManagerLocal.SnapshotProfileException e) { + postError(callback, BOOT_IMAGE_ANDROID_PACKAGE, + ArtManager.SNAPSHOT_FAILED_INTERNAL_ERROR); + return; } + + postSuccess(BOOT_IMAGE_ANDROID_PACKAGE, fd, callback); } /** @@ -451,117 +355,6 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { }); } - /** - * Prepare the application profiles. - * For all code paths: - * - create the current primary profile to save time at app startup time. - * - copy the profiles from the associated dex metadata file to the reference profile. - */ - public void prepareAppProfiles(AndroidPackage pkg, @UserIdInt int user, - boolean updateReferenceProfileContent) throws LegacyDexoptDisabledException { - final int appId = UserHandle.getAppId(pkg.getUid()); - if (user < 0) { - Slog.wtf(TAG, "Invalid user id: " + user); - return; - } - if (appId < 0) { - Slog.wtf(TAG, "Invalid app id: " + appId); - return; - } - try { - ArrayMap<String, String> codePathsProfileNames = getPackageProfileNames(pkg); - for (int i = codePathsProfileNames.size() - 1; i >= 0; i--) { - String codePath = codePathsProfileNames.keyAt(i); - String profileName = codePathsProfileNames.valueAt(i); - String dexMetadataPath = null; - // Passing the dex metadata file to the prepare method will update the reference - // profile content. As such, we look for the dex metadata file only if we need to - // perform an update. - if (updateReferenceProfileContent) { - File dexMetadata = DexMetadataHelper.findDexMetadataForFile(new File(codePath)); - dexMetadataPath = dexMetadata == null ? null : dexMetadata.getAbsolutePath(); - } - synchronized (mInstaller) { - boolean result = mInstaller.prepareAppProfile(pkg.getPackageName(), user, appId, - profileName, codePath, dexMetadataPath); - if (!result) { - Slog.e(TAG, "Failed to prepare profile for " + - pkg.getPackageName() + ":" + codePath); - } - } - } - } catch (InstallerException e) { - Slog.e(TAG, "Failed to prepare profile for " + pkg.getPackageName(), e); - } - } - - /** - * Prepares the app profiles for a set of users. {@see ArtManagerService#prepareAppProfiles}. - */ - public void prepareAppProfiles(AndroidPackage pkg, int[] user, - boolean updateReferenceProfileContent) throws LegacyDexoptDisabledException { - for (int i = 0; i < user.length; i++) { - prepareAppProfiles(pkg, user[i], updateReferenceProfileContent); - } - } - - /** - * Clear the profiles for the given package. - */ - public void clearAppProfiles(AndroidPackage pkg) throws LegacyDexoptDisabledException { - try { - ArrayMap<String, String> packageProfileNames = getPackageProfileNames(pkg); - for (int i = packageProfileNames.size() - 1; i >= 0; i--) { - String profileName = packageProfileNames.valueAt(i); - mInstaller.clearAppProfiles(pkg.getPackageName(), profileName); - } - } catch (InstallerException e) { - Slog.w(TAG, String.valueOf(e)); - } - } - - /** - * Dumps the profiles for the given package. - */ - public void dumpProfiles(AndroidPackage pkg, boolean dumpClassesAndMethods) - throws LegacyDexoptDisabledException { - final int sharedGid = UserHandle.getSharedAppGid(pkg.getUid()); - try { - ArrayMap<String, String> packageProfileNames = getPackageProfileNames(pkg); - for (int i = packageProfileNames.size() - 1; i >= 0; i--) { - String codePath = packageProfileNames.keyAt(i); - String profileName = packageProfileNames.valueAt(i); - mInstaller.dumpProfiles(sharedGid, pkg.getPackageName(), profileName, codePath, - dumpClassesAndMethods); - } - } catch (InstallerException e) { - Slog.w(TAG, "Failed to dump profiles", e); - } - } - - /** - * Build the profiles names for all the package code paths (excluding resource only paths). - * Return the map [code path -> profile name]. - */ - private ArrayMap<String, String> getPackageProfileNames(AndroidPackage pkg) { - ArrayMap<String, String> result = new ArrayMap<>(); - if (pkg.isDeclaredHavingCode()) { - result.put(pkg.getBaseApkPath(), ArtManager.getProfileName(null)); - } - - String[] splitCodePaths = pkg.getSplitCodePaths(); - int[] splitFlags = pkg.getSplitFlags(); - String[] splitNames = pkg.getSplitNames(); - if (!ArrayUtils.isEmpty(splitCodePaths)) { - for (int i = 0; i < splitCodePaths.length; i++) { - if ((splitFlags[i] & ApplicationInfo.FLAG_HAS_CODE) != 0) { - result.put(splitCodePaths[i], ArtManager.getProfileName(splitNames[i])); - } - } - } - return result; - } - // Constants used for logging compilation filter to TRON. // DO NOT CHANGE existing values. // @@ -792,6 +585,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { String packageName, String activityName, long version) { // For example: /data/misc/iorapd/com.google.android.GoogleCamera/ // 60092239/com.android.camera.CameraLauncher/compiled_traces/compiled_trace.pb + // TODO(b/258223472): Clean up iorap code. Path tracePath = Paths.get(IORAP_DIR, packageName, Long.toString(version), diff --git a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java index 57f4a5ddb2bd..a24a2318d423 100644 --- a/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java +++ b/services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java @@ -22,13 +22,11 @@ import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILATI import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILE_FILTER__ART_COMPILATION_FILTER_FAKE_RUN_FROM_APK_FALLBACK; import static com.android.internal.art.ArtStatsLog.ART_DATUM_REPORTED__COMPILE_FILTER__ART_COMPILATION_FILTER_FAKE_RUN_FROM_VDEX_FALLBACK; -import android.app.job.JobParameters; import android.os.SystemClock; import android.util.Slog; import android.util.jar.StrictJarFile; import com.android.internal.art.ArtStatsLog; -import com.android.server.pm.BackgroundDexOptService; import com.android.server.pm.PackageManagerService; import java.io.IOException; @@ -303,42 +301,4 @@ public class ArtStatsLogUtils { ArtStatsLog.ART_DATUM_REPORTED__UFFD_SUPPORT__ART_UFFD_SUPPORT_UNKNOWN); } } - - private static final Map<Integer, Integer> STATUS_MAP = - Map.of(BackgroundDexOptService.STATUS_UNSPECIFIED, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_UNKNOWN, - BackgroundDexOptService.STATUS_OK, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_JOB_FINISHED, - BackgroundDexOptService.STATUS_ABORT_BY_CANCELLATION, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_ABORT_BY_CANCELLATION, - BackgroundDexOptService.STATUS_ABORT_NO_SPACE_LEFT, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_ABORT_NO_SPACE_LEFT, - BackgroundDexOptService.STATUS_ABORT_THERMAL, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_ABORT_THERMAL, - BackgroundDexOptService.STATUS_ABORT_BATTERY, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_ABORT_BATTERY, - BackgroundDexOptService.STATUS_DEX_OPT_FAILED, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_JOB_FINISHED, - BackgroundDexOptService.STATUS_FATAL_ERROR, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_FATAL_ERROR); - - /** Helper class to write background dexopt job stats to statsd. */ - public static class BackgroundDexoptJobStatsLogger { - /** Writes background dexopt job stats to statsd. */ - public void write(@BackgroundDexOptService.Status int status, - @JobParameters.StopReason int cancellationReason, - long durationMs) { - ArtStatsLog.write( - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED, - STATUS_MAP.getOrDefault(status, - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_UNKNOWN), - cancellationReason, - durationMs, - 0, // deprecated, used to be durationIncludingSleepMs - 0, // optimizedPackagesCount - 0, // packagesDependingOnBootClasspathCount - 0, // totalPackagesCount - ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__PASS__PASS_UNKNOWN); - } - } } diff --git a/services/core/java/com/android/server/pm/dex/DexManager.java b/services/core/java/com/android/server/pm/dex/DexManager.java index 78c13f854fe4..e93d3206a4f1 100644 --- a/services/core/java/com/android/server/pm/dex/DexManager.java +++ b/services/core/java/com/android/server/pm/dex/DexManager.java @@ -17,7 +17,6 @@ package com.android.server.pm.dex; import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; -import static com.android.server.pm.dex.PackageDexUsage.DexUseInfo; import static com.android.server.pm.dex.PackageDexUsage.PackageUseInfo; import static java.util.function.Function.identity; @@ -31,12 +30,9 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackagePartitions; import android.os.BatteryManager; -import android.os.FileUtils; import android.os.PowerManager; -import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.os.storage.StorageManager; import android.util.Log; import android.util.Slog; import android.util.jar.StrictJarFile; @@ -44,8 +40,6 @@ import android.util.jar.StrictJarFile; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.server.pm.Installer; -import com.android.server.pm.Installer.InstallerException; -import com.android.server.pm.Installer.LegacyDexoptDisabledException; import com.android.server.pm.PackageDexOptimizer; import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerServiceUtils; @@ -54,8 +48,6 @@ import dalvik.system.VMRuntime; import java.io.File; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -496,60 +488,6 @@ public class DexManager { } /** - * Perform dexopt on with the given {@code options} on the secondary dex files. - * @return true if all secondary dex files were processed successfully (compiled or skipped - * because they don't need to be compiled).. - */ - public boolean dexoptSecondaryDex(DexoptOptions options) throws LegacyDexoptDisabledException { - if (isPlatformPackage(options.getPackageName())) { - // We could easily redirect to #dexoptSystemServer in this case. But there should be - // no-one calling this method directly for system server. - // As such we prefer to abort in this case. - Slog.wtf(TAG, "System server jars should be optimized with dexoptSystemServer"); - return false; - } - - PackageDexOptimizer pdo = getPackageDexOptimizer(options); - String packageName = options.getPackageName(); - PackageUseInfo useInfo = getPackageUseInfoOrDefault(packageName); - if (useInfo.getDexUseInfoMap().isEmpty()) { - if (DEBUG) { - Slog.d(TAG, "No secondary dex use for package:" + packageName); - } - // Nothing to compile, return true. - return true; - } - boolean success = true; - for (Map.Entry<String, DexUseInfo> entry : useInfo.getDexUseInfoMap().entrySet()) { - String dexPath = entry.getKey(); - DexUseInfo dexUseInfo = entry.getValue(); - - PackageInfo pkg; - try { - pkg = getPackageManager().getPackageInfo(packageName, /*flags*/0, - dexUseInfo.getOwnerUserId()); - } catch (RemoteException e) { - throw new AssertionError(e); - } - // It may be that the package gets uninstalled while we try to compile its - // secondary dex files. If that's the case, just ignore. - // Note that we don't break the entire loop because the package might still be - // installed for other users. - if (pkg == null) { - Slog.d(TAG, "Could not find package when compiling secondary dex " + packageName - + " for user " + dexUseInfo.getOwnerUserId()); - mPackageDexUsage.removeUserPackage(packageName, dexUseInfo.getOwnerUserId()); - continue; - } - - int result = pdo.dexOptSecondaryDexPath(pkg.applicationInfo, dexPath, - dexUseInfo, options); - success = success && (result != PackageDexOptimizer.DEX_OPT_FAILED); - } - return success; - } - - /** * Select the dex optimizer based on the force parameter. * Forced compilation is done through ForcedUpdatePackageDexOptimizer which will adjust * the necessary dexopt flags to make sure that compilation is not skipped. This avoid @@ -564,101 +502,6 @@ public class DexManager { } /** - * Reconcile the information we have about the secondary dex files belonging to - * {@code packagName} and the actual dex files. For all dex files that were - * deleted, update the internal records and delete any generated oat files. - */ - public void reconcileSecondaryDexFiles(String packageName) - throws LegacyDexoptDisabledException { - PackageUseInfo useInfo = getPackageUseInfoOrDefault(packageName); - if (useInfo.getDexUseInfoMap().isEmpty()) { - if (DEBUG) { - Slog.d(TAG, "No secondary dex use for package:" + packageName); - } - // Nothing to reconcile. - return; - } - - boolean updated = false; - for (Map.Entry<String, DexUseInfo> entry : useInfo.getDexUseInfoMap().entrySet()) { - String dexPath = entry.getKey(); - DexUseInfo dexUseInfo = entry.getValue(); - PackageInfo pkg = null; - try { - // Note that we look for the package in the PackageManager just to be able - // to get back the real app uid and its storage kind. These are only used - // to perform extra validation in installd. - // TODO(calin): maybe a bit overkill. - pkg = getPackageManager().getPackageInfo(packageName, /*flags*/0, - dexUseInfo.getOwnerUserId()); - } catch (RemoteException ignore) { - // Can't happen, DexManager is local. - } - if (pkg == null) { - // It may be that the package was uninstalled while we process the secondary - // dex files. - Slog.d(TAG, "Could not find package when compiling secondary dex " + packageName - + " for user " + dexUseInfo.getOwnerUserId()); - // Update the usage and continue, another user might still have the package. - updated = mPackageDexUsage.removeUserPackage( - packageName, dexUseInfo.getOwnerUserId()) || updated; - continue; - } - - // Special handle system server files. - // We don't need an installd call because we have permissions to check if the file - // exists. - if (isPlatformPackage(packageName)) { - if (!Files.exists(Paths.get(dexPath))) { - if (DEBUG) { - Slog.w(TAG, "A dex file previously loaded by System Server does not exist " - + " anymore: " + dexPath); - } - updated = mPackageDexUsage.removeUserPackage( - packageName, dexUseInfo.getOwnerUserId()) || updated; - } - continue; - } - - // This is a regular application. - ApplicationInfo info = pkg.applicationInfo; - int flags = 0; - if (info.deviceProtectedDataDir != null && - FileUtils.contains(info.deviceProtectedDataDir, dexPath)) { - flags |= StorageManager.FLAG_STORAGE_DE; - } else if (info.credentialProtectedDataDir!= null && - FileUtils.contains(info.credentialProtectedDataDir, dexPath)) { - flags |= StorageManager.FLAG_STORAGE_CE; - } else { - Slog.e(TAG, "Could not infer CE/DE storage for path " + dexPath); - updated = mPackageDexUsage.removeDexFile( - packageName, dexPath, dexUseInfo.getOwnerUserId()) || updated; - continue; - } - - boolean dexStillExists = true; - synchronized(mInstallLock) { - try { - String[] isas = dexUseInfo.getLoaderIsas().toArray(new String[0]); - dexStillExists = mInstaller.reconcileSecondaryDexFile(dexPath, packageName, - info.uid, isas, info.volumeUuid, flags); - } catch (InstallerException e) { - Slog.e(TAG, "Got InstallerException when reconciling dex " + dexPath + - " : " + e.getMessage()); - } - } - if (!dexStillExists) { - updated = mPackageDexUsage.removeDexFile( - packageName, dexPath, dexUseInfo.getOwnerUserId()) || updated; - } - - } - if (updated) { - mPackageDexUsage.maybeWriteAsync(); - } - } - - /** * Return all packages that contain records of secondary dex files. */ public Set<String> getAllPackagesWithSecondaryDexFiles() { @@ -852,33 +695,6 @@ public class DexManager { return isBtmCritical; } - /** - * Deletes all the optimizations files generated by ART. - * This is best effort, and the method will log but not throw errors - * for individual deletes - * - * @param packageInfo the package information. - * @return the number of freed bytes or -1 if there was an error in the process. - */ - public long deleteOptimizedFiles(ArtPackageInfo packageInfo) - throws LegacyDexoptDisabledException { - long freedBytes = 0; - boolean hadErrors = false; - final String packageName = packageInfo.getPackageName(); - for (String codePath : packageInfo.getCodePaths()) { - for (String isa : packageInfo.getInstructionSets()) { - try { - freedBytes += mInstaller.deleteOdex(packageName, codePath, isa, - packageInfo.getOatDir()); - } catch (InstallerException e) { - Log.e(TAG, "Failed deleting oat files for " + codePath, e); - hadErrors = true; - } - } - } - return hadErrors ? -1 : freedBytes; - } - public static class RegisterDexModuleResult { public RegisterDexModuleResult() { this(false, null); diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 9e31748385c5..f655455c5a6b 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -530,6 +530,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { // TODO(b/178103325): Track sleep/requested sleep for every display. volatile boolean mRequestedOrSleepingDefaultDisplay; + /** + * This is used to check whether to invoke {@link #updateScreenOffSleepToken} when screen is + * turned off. E.g. if it is false when screen is turned off and the display is swapping, it + * is expected that the screen will be on in a short time. Then it is unnecessary to acquire + * screen-off-sleep-token, so it can avoid intermediate visibility or lifecycle changes. + */ + volatile boolean mIsGoingToSleepDefaultDisplay; + volatile boolean mRecentsVisible; volatile boolean mNavBarVirtualKeyHapticFeedbackEnabled = true; volatile boolean mPictureInPictureVisible; @@ -1905,6 +1913,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { accessibilityManager.performSystemAction( AccessibilityService.GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS); } + dismissKeyboardShortcutsMenu(); } private void toggleNotificationPanel() { @@ -3478,13 +3487,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { return true; } break; - case KeyEvent.KEYCODE_T: - if (firstDown && event.isMetaPressed()) { - toggleTaskbar(); - logKeyboardSystemsEvent(event, KeyboardLogEvent.TOGGLE_TASKBAR); - return true; - } - break; case KeyEvent.KEYCODE_DEL: case KeyEvent.KEYCODE_ESCAPE: if (firstDown && event.isMetaPressed()) { @@ -4735,7 +4737,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (down) { // There may have other embedded activities on the same Task. Try to move the // focus before processing the back event. - mWindowManagerInternal.moveFocusToTopEmbeddedWindowIfNeeded(); + mWindowManagerInternal.moveFocusToAdjacentEmbeddedActivityIfNeeded(); mBackKeyHandled = false; } else { if (!hasLongPressOnBackBehavior()) { @@ -5476,6 +5478,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { } mRequestedOrSleepingDefaultDisplay = true; + mIsGoingToSleepDefaultDisplay = true; + + // In case startedGoingToSleep is called after screenTurnedOff (the source caller is in + // order but the methods run on different threads) and updateScreenOffSleepToken was + // skipped. Then acquire sleep token if screen was off. + if (!mDefaultDisplayPolicy.isScreenOnFully() && !mDefaultDisplayPolicy.isScreenOnEarly() + && com.android.window.flags.Flags.skipSleepingWhenSwitchingDisplay()) { + updateScreenOffSleepToken(true /* acquire */, false /* isSwappingDisplay */); + } if (mKeyguardDelegate != null) { mKeyguardDelegate.onStartedGoingToSleep(pmSleepReason); @@ -5499,6 +5510,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { MetricsLogger.histogram(mContext, "screen_timeout", mLockScreenTimeout / 1000); mRequestedOrSleepingDefaultDisplay = false; + mIsGoingToSleepDefaultDisplay = false; mDefaultDisplayPolicy.setAwake(false); // We must get this work done here because the power manager will drop @@ -5534,7 +5546,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } EventLogTags.writeScreenToggled(1); - + mIsGoingToSleepDefaultDisplay = false; mDefaultDisplayPolicy.setAwake(true); // Since goToSleep performs these functions synchronously, we must @@ -5636,7 +5648,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (DEBUG_WAKEUP) Slog.i(TAG, "Display" + displayId + " turned off..."); if (displayId == DEFAULT_DISPLAY) { - updateScreenOffSleepToken(true, isSwappingDisplay); + if (!isSwappingDisplay || mIsGoingToSleepDefaultDisplay + || !com.android.window.flags.Flags.skipSleepingWhenSwitchingDisplay()) { + updateScreenOffSleepToken(true /* acquire */, isSwappingDisplay); + } mRequestedOrSleepingDefaultDisplay = false; mDefaultDisplayPolicy.screenTurnedOff(); synchronized (mLock) { diff --git a/services/core/java/com/android/server/power/hint/Android.bp b/services/core/java/com/android/server/power/hint/Android.bp new file mode 100644 index 000000000000..8a98de673c3d --- /dev/null +++ b/services/core/java/com/android/server/power/hint/Android.bp @@ -0,0 +1,12 @@ +aconfig_declarations { + name: "power_hint_flags", + package: "com.android.server.power.hint", + srcs: [ + "flags.aconfig", + ], +} + +java_aconfig_library { + name: "power_hint_flags_lib", + aconfig_declarations: "power_hint_flags", +} diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index aa1a41eee220..3f1b1c1e99df 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -17,6 +17,7 @@ package com.android.server.power.hint; import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; +import static com.android.server.power.hint.Flags.powerhintThreadCleanup; import android.annotation.NonNull; import android.app.ActivityManager; @@ -26,9 +27,12 @@ import android.app.UidObserver; import android.content.Context; import android.hardware.power.WorkDuration; import android.os.Binder; +import android.os.Handler; import android.os.IBinder; import android.os.IHintManager; import android.os.IHintSession; +import android.os.Looper; +import android.os.Message; import android.os.PerformanceHintManager; import android.os.Process; import android.os.RemoteException; @@ -36,6 +40,8 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.IntArray; +import android.util.Slog; import android.util.SparseIntArray; import android.util.StatsEvent; @@ -46,20 +52,31 @@ import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.Preconditions; import com.android.server.FgThread; import com.android.server.LocalServices; +import com.android.server.ServiceThread; import com.android.server.SystemService; import com.android.server.utils.Slogf; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.NoSuchElementException; import java.util.Objects; +import java.util.Set; +import java.util.concurrent.TimeUnit; /** An hint service implementation that runs in System Server process. */ public final class HintManagerService extends SystemService { private static final String TAG = "HintManagerService"; private static final boolean DEBUG = false; + + private static final int EVENT_CLEAN_UP_UID = 3; + @VisibleForTesting static final int CLEAN_UP_UID_DELAY_MILLIS = 1000; + + @VisibleForTesting final long mHintSessionPreferredRate; // Multi-level map storing all active AppHintSessions. @@ -73,9 +90,15 @@ public final class HintManagerService extends SystemService { /** Lock to protect HAL handles and listen list. */ private final Object mLock = new Object(); + @GuardedBy("mNonIsolatedTidsLock") + private final Map<Integer, Set<Long>> mNonIsolatedTids; + + private final Object mNonIsolatedTidsLock = new Object(); + @VisibleForTesting final MyUidObserver mUidObserver; private final NativeWrapper mNativeWrapper; + private final CleanUpHandler mCleanUpHandler; private final ActivityManagerInternal mAmInternal; @@ -94,6 +117,13 @@ public final class HintManagerService extends SystemService { HintManagerService(Context context, Injector injector) { super(context); mContext = context; + if (powerhintThreadCleanup()) { + mCleanUpHandler = new CleanUpHandler(createCleanUpThread().getLooper()); + mNonIsolatedTids = new HashMap<>(); + } else { + mCleanUpHandler = null; + mNonIsolatedTids = null; + } mActiveSessions = new ArrayMap<>(); mNativeWrapper = injector.createNativeWrapper(); mNativeWrapper.halInit(); @@ -103,6 +133,13 @@ public final class HintManagerService extends SystemService { LocalServices.getService(ActivityManagerInternal.class)); } + private ServiceThread createCleanUpThread() { + final ServiceThread handlerThread = new ServiceThread(TAG, + Process.THREAD_PRIORITY_LOWEST, true /*allowIo*/); + handlerThread.start(); + return handlerThread; + } + @VisibleForTesting static class Injector { NativeWrapper createNativeWrapper() { @@ -306,7 +343,18 @@ public final class HintManagerService extends SystemService { public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) { FgThread.getHandler().post(() -> { synchronized (mCacheLock) { - mProcStatesCache.put(uid, procState); + if (powerhintThreadCleanup()) { + final boolean before = isUidForeground(uid); + mProcStatesCache.put(uid, procState); + final boolean after = isUidForeground(uid); + if (before != after) { + final Message msg = mCleanUpHandler.obtainMessage(EVENT_CLEAN_UP_UID, + uid); + mCleanUpHandler.sendMessageDelayed(msg, CLEAN_UP_UID_DELAY_MILLIS); + } + } else { + mProcStatesCache.put(uid, procState); + } } boolean shouldAllowUpdate = isUidForeground(uid); synchronized (mLock) { @@ -314,9 +362,10 @@ public final class HintManagerService extends SystemService { if (tokenMap == null) { return; } - for (ArraySet<AppHintSession> sessionSet : tokenMap.values()) { - for (AppHintSession s : sessionSet) { - s.onProcStateChanged(shouldAllowUpdate); + for (int i = tokenMap.size() - 1; i >= 0; i--) { + final ArraySet<AppHintSession> sessionSet = tokenMap.valueAt(i); + for (int j = sessionSet.size() - 1; j >= 0; j--) { + sessionSet.valueAt(j).onProcStateChanged(shouldAllowUpdate); } } } @@ -324,52 +373,237 @@ public final class HintManagerService extends SystemService { } } + final class CleanUpHandler extends Handler { + // status of processed tid used for caching + private static final int TID_NOT_CHECKED = 0; + private static final int TID_PASSED_CHECK = 1; + private static final int TID_EXITED = 2; + + CleanUpHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message msg) { + if (msg.what == EVENT_CLEAN_UP_UID) { + if (hasEqualMessages(msg.what, msg.obj)) { + removeEqualMessages(msg.what, msg.obj); + final Message newMsg = obtainMessage(msg.what, msg.obj); + sendMessageDelayed(newMsg, CLEAN_UP_UID_DELAY_MILLIS); + return; + } + final int uid = (int) msg.obj; + boolean isForeground = mUidObserver.isUidForeground(uid); + // store all sessions in a list and release the global lock + // we don't need to worry about stale data or racing as the session is synchronized + // itself and will perform its own closed status check in setThreads call + final List<AppHintSession> sessions; + synchronized (mLock) { + final ArrayMap<IBinder, ArraySet<AppHintSession>> tokenMap = + mActiveSessions.get(uid); + if (tokenMap == null || tokenMap.isEmpty()) { + return; + } + sessions = new ArrayList<>(tokenMap.size()); + for (int i = tokenMap.size() - 1; i >= 0; i--) { + final ArraySet<AppHintSession> set = tokenMap.valueAt(i); + for (int j = set.size() - 1; j >= 0; j--) { + sessions.add(set.valueAt(j)); + } + } + } + final long[] durationList = new long[sessions.size()]; + final int[] invalidTidCntList = new int[sessions.size()]; + final SparseIntArray checkedTids = new SparseIntArray(); + int[] totalTidCnt = new int[1]; + for (int i = sessions.size() - 1; i >= 0; i--) { + final AppHintSession session = sessions.get(i); + final long start = System.nanoTime(); + try { + final int invalidCnt = cleanUpSession(session, checkedTids, totalTidCnt); + final long elapsed = System.nanoTime() - start; + invalidTidCntList[i] = invalidCnt; + durationList[i] = elapsed; + } catch (Exception e) { + Slog.e(TAG, "Failed to clean up session " + session.mHalSessionPtr + + " for UID " + session.mUid); + } + } + logCleanUpMetrics(uid, invalidTidCntList, durationList, sessions.size(), + totalTidCnt[0], isForeground); + } + } + + private void logCleanUpMetrics(int uid, int[] count, long[] durationNsList, int sessionCnt, + int totalTidCnt, boolean isForeground) { + int maxInvalidTidCnt = Integer.MIN_VALUE; + int totalInvalidTidCnt = 0; + for (int i = 0; i < count.length; i++) { + totalInvalidTidCnt += count[i]; + maxInvalidTidCnt = Math.max(maxInvalidTidCnt, count[i]); + } + if (DEBUG || totalInvalidTidCnt > 0) { + Arrays.sort(durationNsList); + long totalDurationNs = 0; + for (int i = 0; i < durationNsList.length; i++) { + totalDurationNs += durationNsList[i]; + } + int totalDurationUs = (int) TimeUnit.NANOSECONDS.toMicros(totalDurationNs); + int maxDurationUs = (int) TimeUnit.NANOSECONDS.toMicros( + durationNsList[durationNsList.length - 1]); + int minDurationUs = (int) TimeUnit.NANOSECONDS.toMicros(durationNsList[0]); + int avgDurationUs = (int) TimeUnit.NANOSECONDS.toMicros( + totalDurationNs / durationNsList.length); + int th90DurationUs = (int) TimeUnit.NANOSECONDS.toMicros( + durationNsList[(int) (durationNsList.length * 0.9)]); + Slog.d(TAG, + "Invalid tid found for UID" + uid + " in " + totalDurationUs + "us:\n\t" + + "count(" + + " session: " + sessionCnt + + " totalTid: " + totalTidCnt + + " maxInvalidTid: " + maxInvalidTidCnt + + " totalInvalidTid: " + totalInvalidTidCnt + ")\n\t" + + "time per session(" + + " min: " + minDurationUs + "us" + + " max: " + maxDurationUs + "us" + + " avg: " + avgDurationUs + "us" + + " 90%: " + th90DurationUs + "us" + ")\n\t" + + "isForeground: " + isForeground); + } + } + + // This will check if each TID currently linked to the session still exists. If it's + // previously registered as not an isolated process, then it will run tkill(pid, tid, 0) to + // verify that it's still running under the same pid. Otherwise, it will run + // kill(tid, 0) to only check if it exists. The result will be cached in checkedTids + // map with tid as the key and checked status as value. + public int cleanUpSession(AppHintSession session, SparseIntArray checkedTids, int[] total) { + if (session.isClosed()) { + return 0; + } + final int pid = session.mPid; + final int[] tids = session.getTidsInternal(); + if (total != null && total.length == 1) { + total[0] += tids.length; + } + final IntArray filtered = new IntArray(tids.length); + for (int i = 0; i < tids.length; i++) { + int tid = tids[i]; + if (checkedTids.get(tid, 0) != TID_NOT_CHECKED) { + if (checkedTids.get(tid) == TID_PASSED_CHECK) { + filtered.add(tid); + } + continue; + } + // if it was registered as a non-isolated then we perform more restricted check + final boolean isNotIsolated; + synchronized (mNonIsolatedTidsLock) { + isNotIsolated = mNonIsolatedTids.containsKey(tid); + } + try { + if (isNotIsolated) { + Process.checkTid(pid, tid); + } else { + Process.checkPid(tid); + } + checkedTids.put(tid, TID_PASSED_CHECK); + filtered.add(tid); + } catch (NoSuchElementException e) { + checkedTids.put(tid, TID_EXITED); + } catch (Exception e) { + Slog.w(TAG, "Unexpected exception when checking TID " + tid + " under PID " + + pid + "(isolated: " + !isNotIsolated + ")", e); + // if anything unexpected happens then we keep it, but don't store it as checked + filtered.add(tid); + } + } + final int diff = tids.length - filtered.size(); + if (diff > 0) { + synchronized (session) { + // in case thread list is updated during the cleanup then we skip updating + // the session but just return the number for reporting purpose + final int[] newTids = session.getTidsInternal(); + if (newTids.length != tids.length) { + Slog.d(TAG, "Skipped cleaning up the session as new tids are added"); + return diff; + } + Arrays.sort(newTids); + Arrays.sort(tids); + if (!Arrays.equals(newTids, tids)) { + Slog.d(TAG, "Skipped cleaning up the session as new tids are updated"); + return diff; + } + Slog.d(TAG, "Cleaned up " + diff + " invalid tids for session " + + session.mHalSessionPtr + " with UID " + session.mUid + "\n\t" + + "before: " + Arrays.toString(tids) + "\n\t" + + "after: " + filtered); + final int[] filteredTids = filtered.toArray(); + if (filteredTids.length == 0) { + session.mShouldForcePause = true; + if (session.mUpdateAllowed) { + session.pause(); + } + } else { + session.setThreadsInternal(filteredTids, false); + } + } + } + return diff; + } + } + @VisibleForTesting IHintManager.Stub getBinderServiceInstance() { return mService; } // returns the first invalid tid or null if not found - private Integer checkTidValid(int uid, int tgid, int [] tids) { + private Integer checkTidValid(int uid, int tgid, int [] tids, IntArray nonIsolated) { // Make sure all tids belongs to the same UID (including isolated UID), // tids can belong to different application processes. List<Integer> isolatedPids = null; - for (int threadId : tids) { + for (int i = 0; i < tids.length; i++) { + int tid = tids[i]; final String[] procStatusKeys = new String[] { "Uid:", "Tgid:" }; long[] output = new long[procStatusKeys.length]; - Process.readProcLines("/proc/" + threadId + "/status", procStatusKeys, output); + Process.readProcLines("/proc/" + tid + "/status", procStatusKeys, output); int uidOfThreadId = (int) output[0]; int pidOfThreadId = (int) output[1]; - // use PID check for isolated processes, use UID check for non-isolated processes. - if (pidOfThreadId == tgid || uidOfThreadId == uid) { + // use PID check for non-isolated processes + if (nonIsolated != null && pidOfThreadId == tgid) { + nonIsolated.add(tid); + continue; + } + // use UID check for isolated processes. + if (uidOfThreadId == uid) { continue; } // Only call into AM if the tid is either isolated or invalid if (isolatedPids == null) { // To avoid deadlock, do not call into AMS if the call is from system. if (uid == Process.SYSTEM_UID) { - return threadId; + return tid; } isolatedPids = mAmInternal.getIsolatedProcesses(uid); if (isolatedPids == null) { - return threadId; + return tid; } } if (isolatedPids.contains(pidOfThreadId)) { continue; } - return threadId; + return tid; } return null; } private String formatTidCheckErrMsg(int callingUid, int[] tids, Integer invalidTid) { return "Tid" + invalidTid + " from list " + Arrays.toString(tids) - + " doesn't belong to the calling application" + callingUid; + + " doesn't belong to the calling application " + callingUid; } @VisibleForTesting @@ -387,7 +621,10 @@ public final class HintManagerService extends SystemService { final int callingTgid = Process.getThreadGroupLeader(Binder.getCallingPid()); final long identity = Binder.clearCallingIdentity(); try { - final Integer invalidTid = checkTidValid(callingUid, callingTgid, tids); + final IntArray nonIsolated = powerhintThreadCleanup() ? new IntArray(tids.length) + : null; + final Integer invalidTid = checkTidValid(callingUid, callingTgid, tids, + nonIsolated); if (invalidTid != null) { final String errMsg = formatTidCheckErrMsg(callingUid, tids, invalidTid); Slogf.w(TAG, errMsg); @@ -396,6 +633,14 @@ public final class HintManagerService extends SystemService { long halSessionPtr = mNativeWrapper.halCreateHintSession(callingTgid, callingUid, tids, durationNanos); + if (powerhintThreadCleanup()) { + synchronized (mNonIsolatedTidsLock) { + for (int i = nonIsolated.size() - 1; i >= 0; i--) { + mNonIsolatedTids.putIfAbsent(nonIsolated.get(i), new ArraySet<>()); + mNonIsolatedTids.get(nonIsolated.get(i)).add(halSessionPtr); + } + } + } if (halSessionPtr == 0) { return null; } @@ -482,6 +727,7 @@ public final class HintManagerService extends SystemService { protected boolean mUpdateAllowed; protected int[] mNewThreadIds; protected boolean mPowerEfficient; + protected boolean mShouldForcePause; private enum SessionModes { POWER_EFFICIENCY, @@ -498,6 +744,7 @@ public final class HintManagerService extends SystemService { mTargetDurationNanos = durationNanos; mUpdateAllowed = true; mPowerEfficient = false; + mShouldForcePause = false; final boolean allowed = mUidObserver.isUidForeground(mUid); updateHintAllowed(allowed); try { @@ -511,7 +758,7 @@ public final class HintManagerService extends SystemService { @VisibleForTesting boolean updateHintAllowed(boolean allowed) { synchronized (this) { - if (allowed && !mUpdateAllowed) resume(); + if (allowed && !mUpdateAllowed && !mShouldForcePause) resume(); if (!allowed && mUpdateAllowed) pause(); mUpdateAllowed = allowed; return mUpdateAllowed; @@ -521,7 +768,7 @@ public final class HintManagerService extends SystemService { @Override public void updateTargetWorkDuration(long targetDurationNanos) { synchronized (this) { - if (mHalSessionPtr == 0 || !mUpdateAllowed) { + if (mHalSessionPtr == 0 || !mUpdateAllowed || mShouldForcePause) { return; } Preconditions.checkArgument(targetDurationNanos > 0, "Expected" @@ -534,7 +781,7 @@ public final class HintManagerService extends SystemService { @Override public void reportActualWorkDuration(long[] actualDurationNanos, long[] timeStampNanos) { synchronized (this) { - if (mHalSessionPtr == 0 || !mUpdateAllowed) { + if (mHalSessionPtr == 0 || !mUpdateAllowed || mShouldForcePause) { return; } Preconditions.checkArgument(actualDurationNanos.length != 0, "the count" @@ -581,12 +828,25 @@ public final class HintManagerService extends SystemService { if (sessionSet.isEmpty()) tokenMap.remove(mToken); if (tokenMap.isEmpty()) mActiveSessions.remove(mUid); } + if (powerhintThreadCleanup()) { + synchronized (mNonIsolatedTidsLock) { + final int[] tids = getTidsInternal(); + for (int tid : tids) { + if (mNonIsolatedTids.containsKey(tid)) { + mNonIsolatedTids.get(tid).remove(mHalSessionPtr); + if (mNonIsolatedTids.get(tid).isEmpty()) { + mNonIsolatedTids.remove(tid); + } + } + } + } + } } @Override public void sendHint(@PerformanceHintManager.Session.Hint int hint) { synchronized (this) { - if (mHalSessionPtr == 0 || !mUpdateAllowed) { + if (mHalSessionPtr == 0 || !mUpdateAllowed || mShouldForcePause) { return; } Preconditions.checkArgument(hint >= 0, "the hint ID value should be" @@ -596,33 +856,60 @@ public final class HintManagerService extends SystemService { } public void setThreads(@NonNull int[] tids) { + setThreadsInternal(tids, true); + } + + private void setThreadsInternal(int[] tids, boolean checkTid) { + if (tids.length == 0) { + throw new IllegalArgumentException("Thread id list can't be empty."); + } + synchronized (this) { if (mHalSessionPtr == 0) { return; } - if (tids.length == 0) { - throw new IllegalArgumentException("Thread id list can't be empty."); - } - final int callingUid = Binder.getCallingUid(); - final int callingTgid = Process.getThreadGroupLeader(Binder.getCallingPid()); - final long identity = Binder.clearCallingIdentity(); - try { - final Integer invalidTid = checkTidValid(callingUid, callingTgid, tids); - if (invalidTid != null) { - final String errMsg = formatTidCheckErrMsg(callingUid, tids, invalidTid); - Slogf.w(TAG, errMsg); - throw new SecurityException(errMsg); - } - } finally { - Binder.restoreCallingIdentity(identity); - } if (!mUpdateAllowed) { Slogf.v(TAG, "update hint not allowed, storing tids."); mNewThreadIds = tids; + mShouldForcePause = false; return; } + if (checkTid) { + final int callingUid = Binder.getCallingUid(); + final int callingTgid = Process.getThreadGroupLeader(Binder.getCallingPid()); + final IntArray nonIsolated = powerhintThreadCleanup() ? new IntArray() : null; + final long identity = Binder.clearCallingIdentity(); + try { + final Integer invalidTid = checkTidValid(callingUid, callingTgid, tids, + nonIsolated); + if (invalidTid != null) { + final String errMsg = formatTidCheckErrMsg(callingUid, tids, + invalidTid); + Slogf.w(TAG, errMsg); + throw new SecurityException(errMsg); + } + if (powerhintThreadCleanup()) { + synchronized (mNonIsolatedTidsLock) { + for (int i = nonIsolated.size() - 1; i >= 0; i--) { + mNonIsolatedTids.putIfAbsent(nonIsolated.get(i), + new ArraySet<>()); + mNonIsolatedTids.get(nonIsolated.get(i)).add(mHalSessionPtr); + } + } + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } mNativeWrapper.halSetThreads(mHalSessionPtr, tids); mThreadIds = tids; + mNewThreadIds = null; + // if the update is allowed but the session is force paused by tid clean up, then + // it's waiting for this tid update to resume + if (mShouldForcePause) { + resume(); + mShouldForcePause = false; + } } } @@ -632,10 +919,24 @@ public final class HintManagerService extends SystemService { } } + @VisibleForTesting + int[] getTidsInternal() { + synchronized (this) { + return mNewThreadIds != null ? Arrays.copyOf(mNewThreadIds, mNewThreadIds.length) + : Arrays.copyOf(mThreadIds, mThreadIds.length); + } + } + + boolean isClosed() { + synchronized (this) { + return mHalSessionPtr == 0; + } + } + @Override public void setMode(int mode, boolean enabled) { synchronized (this) { - if (mHalSessionPtr == 0 || !mUpdateAllowed) { + if (mHalSessionPtr == 0 || !mUpdateAllowed || mShouldForcePause) { return; } Preconditions.checkArgument(mode >= 0, "the mode Id value should be" @@ -650,13 +951,13 @@ public final class HintManagerService extends SystemService { @Override public void reportActualWorkDuration2(WorkDuration[] workDurations) { synchronized (this) { - if (mHalSessionPtr == 0 || !mUpdateAllowed) { + if (mHalSessionPtr == 0 || !mUpdateAllowed || mShouldForcePause) { return; } Preconditions.checkArgument(workDurations.length != 0, "the count" + " of work durations shouldn't be 0."); - for (WorkDuration workDuration : workDurations) { - validateWorkDuration(workDuration); + for (int i = 0; i < workDurations.length; i++) { + validateWorkDuration(workDurations[i]); } mNativeWrapper.halReportActualWorkDuration(mHalSessionPtr, workDurations); } @@ -743,6 +1044,7 @@ public final class HintManagerService extends SystemService { pw.println(prefix + "SessionTIDs: " + Arrays.toString(mThreadIds)); pw.println(prefix + "SessionTargetDurationNanos: " + mTargetDurationNanos); pw.println(prefix + "SessionAllowed: " + mUpdateAllowed); + pw.println(prefix + "SessionForcePaused: " + mShouldForcePause); pw.println(prefix + "PowerEfficient: " + (mPowerEfficient ? "true" : "false")); } } diff --git a/services/core/java/com/android/server/power/hint/flags.aconfig b/services/core/java/com/android/server/power/hint/flags.aconfig new file mode 100644 index 000000000000..f4afcb141b19 --- /dev/null +++ b/services/core/java/com/android/server/power/hint/flags.aconfig @@ -0,0 +1,8 @@ +package: "com.android.server.power.hint" + +flag { + name: "powerhint_thread_cleanup" + namespace: "game" + description: "Feature flag for auto PowerHintSession dead thread cleanup" + bug: "296160319" +} diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 23f9743619e3..17e699668d14 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -11012,6 +11012,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } /** + * Returns the {@link #createTime} if the top window is the `base` window. Note that do not + * use the window creation time because the window could be re-created when the activity + * relaunched if configuration changed. + * <p> + * Otherwise, return the creation time of the top window. + */ + long getLastWindowCreateTime() { + final WindowState window = getWindow(win -> true); + return window != null && window.mAttrs.type != TYPE_BASE_APPLICATION + ? window.getCreateTime() + : createTime; + } + + /** * Adjust the source rect hint in {@link #pictureInPictureArgs} by window bounds since * it is relative to its root view (see also b/235599028). * It is caller's responsibility to make sure this is called exactly once when we update diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 060f1c8cfac0..6af496f4af24 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -5682,29 +5682,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { throw e; } - /** - * Sets the corresponding {@link DisplayArea} information for the process global - * configuration. To be called when we need to show IME on a different {@link DisplayArea} - * or display. - * - * @param pid The process id associated with the IME window. - * @param imeContainer The DisplayArea that contains the IME window. - */ - void onImeWindowSetOnDisplayArea(final int pid, @NonNull final DisplayArea imeContainer) { - if (pid == MY_PID || pid < 0) { - ProtoLog.w(WM_DEBUG_CONFIGURATION, - "Trying to update display configuration for system/invalid process."); - return; - } - final WindowProcessController process = mProcessMap.getProcess(pid); - if (process == null) { - ProtoLog.w(WM_DEBUG_CONFIGURATION, "Trying to update display " - + "configuration for invalid process, pid=%d", pid); - return; - } - process.registerDisplayAreaConfigurationListener(imeContainer); - } - @Override public void setRunningRemoteTransitionDelegate(IApplicationThread delegate) { final TransitionController controller = getTransitionController(); diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index e3ac35ca8f3b..48d78f5e497b 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -165,7 +165,7 @@ class BackNavigationController { } // Move focus to the top embedded window if possible - if (mWindowManagerService.moveFocusToTopEmbeddedWindow(window)) { + if (mWindowManagerService.moveFocusToAdjacentEmbeddedWindow(window)) { window = wmService.getFocusedWindowLocked(); if (window == null) { Slog.e(TAG, "New focused window is null, returning null."); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index eb1f052baac6..46d4ce400053 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -4171,11 +4171,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp */ void setInputMethodWindowLocked(WindowState win) { mInputMethodWindow = win; - // Update display configuration for IME process. - if (mInputMethodWindow != null) { - final int imePid = mInputMethodWindow.mSession.mPid; - mAtmService.onImeWindowSetOnDisplayArea(imePid, mImeWindowsContainer); - } mInsetsStateController.getImeSourceProvider().setWindowContainer(win, mDisplayPolicy.getImeSourceFrameProvider(), null); computeImeTarget(true /* updateImeTarget */); diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 30134d815fa6..e157318543f6 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -283,14 +283,14 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { int lastSyncSeqId, ClientWindowFrames outFrames, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, InsetsSourceControl.Array outActiveControls, - Bundle outSyncSeqIdBundle) { + Bundle outBundle) { if (false) Slog.d(TAG_WM, ">>>>>> ENTERED relayout from " + Binder.getCallingPid()); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, mRelayoutTag); int res = mService.relayoutWindow(this, window, attrs, requestedWidth, requestedHeight, viewFlags, flags, seq, lastSyncSeqId, outFrames, mergedConfiguration, outSurfaceControl, outInsetsState, - outActiveControls, outSyncSeqIdBundle); + outActiveControls, outBundle); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); if (false) Slog.d(TAG_WM, "<<<<<< EXITING relayout to " + Binder.getCallingPid()); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 55dc30cc37d5..18d2718437a6 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1274,7 +1274,8 @@ class Task extends TaskFragment { if (!isLeafTaskFragment()) { final ActivityRecord top = topRunningActivity(); final ActivityRecord resumedActivity = getResumedActivity(); - if (resumedActivity != null && top.getTaskFragment() != this) { + if (resumedActivity != null + && (top.getTaskFragment() != this || !canBeResumed(resuming))) { // Pausing the resumed activity because it is occluded by other task fragment. if (startPausing(false /* uiSleeping*/, resuming, reason)) { someActivityPaused[0]++; @@ -3753,11 +3754,9 @@ class Task extends TaskFragment { // Boost the adjacent TaskFragment for dimmer if needed. final TaskFragment taskFragment = wc.asTaskFragment(); if (taskFragment != null && taskFragment.isEmbedded()) { - taskFragment.mDimmerSurfaceBoosted = false; final TaskFragment adjacentTf = taskFragment.getAdjacentTaskFragment(); if (adjacentTf != null && adjacentTf.shouldBoostDimmer()) { adjacentTf.assignLayer(t, layer++); - adjacentTf.mDimmerSurfaceBoosted = true; } } @@ -6823,8 +6822,8 @@ class Task extends TaskFragment { * A decor surface is requested by a {@link TaskFragmentOrganizer} and is placed below children * windows in the Task except for own Activities and TaskFragments in fully trusted mode. The * decor surface is created and shared with the client app with - * {@link android.window.TaskFragmentOperation#OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE} and - * be removed with + * {@link android.window.TaskFragmentOperation#OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE} + * and be removed with * {@link android.window.TaskFragmentOperation#OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE}. * * When boosted with diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 3cf561c1b62f..dc0e0341ee8b 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -216,9 +216,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { Dimmer mDimmer = Dimmer.DIMMER_REFACTOR ? new SmoothDimmer(this) : new LegacyDimmer(this); - /** {@code true} if the dimmer surface is boosted. {@code false} otherwise. */ - boolean mDimmerSurfaceBoosted; - /** Apply the dim layer on the embedded TaskFragment. */ static final int EMBEDDED_DIM_AREA_TASK_FRAGMENT = 0; diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index acc63305055b..daf8129f1683 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -1068,9 +1068,9 @@ public abstract class WindowManagerInternal { public abstract void clearBlockedApps(); /** - * Moves the current focus to the top activity window if the top activity is embedded. + * Moves the current focus to the adjacent activity if it has the latest created window. */ - public abstract boolean moveFocusToTopEmbeddedWindowIfNeeded(); + public abstract boolean moveFocusToAdjacentEmbeddedActivityIfNeeded(); /** * Returns an instance of {@link ScreenCapture.ScreenshotHardwareBuffer} containing the current diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 207b1bbcea16..60848a787c95 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -304,6 +304,7 @@ import android.view.WindowManagerPolicyConstants.PointerEventListener; import android.view.displayhash.DisplayHash; import android.view.displayhash.VerifiedDisplayHash; import android.view.inputmethod.ImeTracker; +import android.window.ActivityWindowInfo; import android.window.AddToSurfaceSyncGroupResult; import android.window.ClientWindowFrames; import android.window.IGlobalDragListener; @@ -2213,7 +2214,7 @@ public class WindowManagerService extends IWindowManager.Stub int lastSyncSeqId, ClientWindowFrames outFrames, MergedConfiguration outMergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, InsetsSourceControl.Array outActiveControls, - Bundle outSyncIdBundle) { + Bundle outBundle) { if (outActiveControls != null) { outActiveControls.set(null); } @@ -2544,6 +2545,13 @@ public class WindowManagerService extends IWindowManager.Stub if (outFrames != null && outMergedConfiguration != null) { win.fillClientWindowFramesAndConfiguration(outFrames, outMergedConfiguration, false /* useLatestConfig */, shouldRelayout); + if (Flags.activityWindowInfoFlag() && outBundle != null + && win.mActivityRecord != null) { + final ActivityWindowInfo activityWindowInfo = win.mActivityRecord + .getActivityWindowInfo(); + outBundle.putParcelable(IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, + activityWindowInfo); + } // Set resize-handled here because the values are sent back to the client. win.onResizeHandled(); @@ -2573,7 +2581,7 @@ public class WindowManagerService extends IWindowManager.Stub win.isVisible() /* visible */, false /* removed */); } - if (outSyncIdBundle != null) { + if (outBundle != null) { final int maybeSyncSeqId; if (win.syncNextBuffer() && viewVisibility == View.VISIBLE && win.mSyncSeqId > lastSyncSeqId) { @@ -2582,7 +2590,7 @@ public class WindowManagerService extends IWindowManager.Stub } else { maybeSyncSeqId = -1; } - outSyncIdBundle.putInt("seqid", maybeSyncSeqId); + outBundle.putInt(IWindowSession.KEY_RELAYOUT_BUNDLE_SEQID, maybeSyncSeqId); } if (configChanged) { @@ -8700,14 +8708,14 @@ public class WindowManagerService extends IWindowManager.Stub } @Override - public boolean moveFocusToTopEmbeddedWindowIfNeeded() { + public boolean moveFocusToAdjacentEmbeddedActivityIfNeeded() { synchronized (mGlobalLock) { final WindowState focusedWindow = getFocusedWindow(); if (focusedWindow == null) { return false; } - if (moveFocusToTopEmbeddedWindow(focusedWindow)) { + if (moveFocusToAdjacentEmbeddedWindow(focusedWindow)) { // Sync the input transactions to ensure the input focus updates as well. syncInputTransactions(false); return true; @@ -9219,9 +9227,10 @@ public class WindowManagerService extends IWindowManager.Stub } /** - * Move focus to the top embedded window if possible. + * Move focus to the adjacent embedded activity if the adjacent activity is more recently + * created or has a window more recently added. */ - boolean moveFocusToTopEmbeddedWindow(@NonNull WindowState focusedWindow) { + boolean moveFocusToAdjacentEmbeddedWindow(@NonNull WindowState focusedWindow) { final TaskFragment taskFragment = focusedWindow.getTaskFragment(); if (taskFragment == null) { // Skip if not an Activity window. @@ -9233,31 +9242,25 @@ public class WindowManagerService extends IWindowManager.Stub return false; } - if (taskFragment.mDimmerSurfaceBoosted) { - // Skip if the TaskFragment currently has dimmer surface boosted. - return false; - } - - final ActivityRecord topActivity = - taskFragment.getTask().topRunningActivity(true /* focusableOnly */); - if (topActivity == null || topActivity == focusedWindow.mActivityRecord) { - // Skip if the focused activity is already the top-most activity on the Task. + if (!focusedWindow.mActivityRecord.isEmbedded()) { + // Skip if the focused activity is not embedded return false; } - if (!topActivity.isEmbedded()) { - // Skip if the top activity is not embedded + final TaskFragment adjacentTaskFragment = taskFragment.getAdjacentTaskFragment(); + final ActivityRecord adjacentTopActivity = + adjacentTaskFragment != null ? adjacentTaskFragment.topRunningActivity() : null; + if (adjacentTopActivity == null) { return false; } - final TaskFragment topTaskFragment = topActivity.getTaskFragment(); - if (topTaskFragment.isIsolatedNav() - && taskFragment.getAdjacentTaskFragment() == topTaskFragment) { - // Skip if the top TaskFragment is adjacent to current focus and is set to isolated nav. + if (adjacentTopActivity.getLastWindowCreateTime() + < focusedWindow.mActivityRecord.getLastWindowCreateTime()) { + // Skip if the current focus activity has more recently active window. return false; } - moveFocusToActivity(topActivity); + moveFocusToActivity(adjacentTopActivity); return !focusedWindow.isFocused(); } diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index d967cde84cbf..14ec41f072dd 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -23,7 +23,7 @@ import static android.app.WindowConfiguration.WINDOW_CONFIG_BOUNDS; import static android.view.Display.DEFAULT_DISPLAY; import static android.window.TaskFragmentOperation.OP_TYPE_CLEAR_ADJACENT_TASK_FRAGMENTS; import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_TASK_FRAGMENT; -import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE; +import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE; import static android.window.TaskFragmentOperation.OP_TYPE_DELETE_TASK_FRAGMENT; import static android.window.TaskFragmentOperation.OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE; import static android.window.TaskFragmentOperation.OP_TYPE_REORDER_TO_BOTTOM_OF_TASK; @@ -1558,7 +1558,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } break; } - case OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE: { + case OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE: { taskFragment.getTask().moveOrCreateDecorSurfaceFor(taskFragment); break; } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 2b337aed5b87..c0cf97d6d4ae 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -364,6 +364,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP private boolean mDragResizing; private boolean mDragResizingChangeReported = true; private boolean mRedrawForSyncReported = true; + private long mCreateTime = System.currentTimeMillis(); /** * Used to assosciate a given set of state changes sent from MSG_RESIZED @@ -1714,6 +1715,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP : DEFAULT_DISPATCHING_TIMEOUT_MILLIS; } + long getCreateTime() { + return mCreateTime; + } + /** * Returns true if, at any point, the application token associated with this window has actually * displayed any windows. This is most useful with the "starting up" window to determine if any diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 610fcb5962c8..70224db061c7 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -143,6 +143,7 @@ static struct { jmethodID getTouchCalibrationForInputDevice; jmethodID notifyDropWindow; jmethodID getParentSurfaceForPointers; + jmethodID getPackageUid; } gServiceClassInfo; static struct { @@ -362,6 +363,7 @@ public: void notifyDropWindow(const sp<IBinder>& token, float x, float y) override; void notifyDeviceInteraction(int32_t deviceId, nsecs_t timestamp, const std::set<gui::Uid>& uids) override; + gui::Uid getPackageUid(std::string package) override; /* --- PointerControllerPolicyInterface implementation --- */ @@ -1116,6 +1118,21 @@ void NativeInputManager::notifyDeviceInteraction(int32_t deviceId, nsecs_t times mInputManager->getMetricsCollector().notifyDeviceInteraction(deviceId, timestamp, uids); } +gui::Uid NativeInputManager::getPackageUid(std::string package) { + ATRACE_CALL(); + JNIEnv* env = jniEnv(); + ScopedLocalFrame localFrame(env); + + ScopedLocalRef<jstring> javaPackage(env, env->NewStringUTF(package.c_str())); + const jint uid = + env->CallIntMethod(mServiceObj, gServiceClassInfo.getPackageUid, javaPackage.get()); + if (checkAndClearExceptionFromCallback(env, "getPackageUid")) { + LOG(FATAL) << __func__ << ": Failed to get UID for package: " << package; + } + + return gui::Uid{static_cast<uint32_t>(uid)}; +} + void NativeInputManager::notifySensorEvent(int32_t deviceId, InputDeviceSensorType sensorType, InputDeviceSensorAccuracy accuracy, nsecs_t timestamp, const std::vector<float>& values) { @@ -3101,6 +3118,8 @@ int register_android_server_InputManager(JNIEnv* env) { GET_METHOD_ID(gServiceClassInfo.getParentSurfaceForPointers, clazz, "getParentSurfaceForPointers", "(I)J"); + GET_METHOD_ID(gServiceClassInfo.getPackageUid, clazz, "getPackageUid", "(Ljava/lang/String;)I"); + // InputDevice FIND_CLASS(gInputDeviceClassInfo.clazz, "android/view/InputDevice"); 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 d0df2b20721b..1f5451813dae 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -162,6 +162,10 @@ <xs:element type="usiVersion" name="usiVersion"> <xs:annotation name="final"/> </xs:element> + <xs:element type="lowBrightnessMode" name="lowBrightness"> + <xs:attribute name="enabled" type="xs:boolean" use="optional"/> + <xs:annotation name="final"/> + </xs:element> <!-- Maximum screen brightness setting when screen brightness capped in Wear Bedtime mode. This must be a non-negative decimal within the range defined by the first and the last brightness value in screenBrightnessMap. --> @@ -172,6 +176,7 @@ <xs:element type="idleScreenRefreshRateTimeout" name="idleScreenRefreshRateTimeout" minOccurs="0"> <xs:annotation name="final"/> </xs:element> + </xs:sequence> </xs:complexType> </xs:element> @@ -216,6 +221,21 @@ </xs:restriction> </xs:simpleType> + <xs:complexType name="lowBrightnessMode"> + <xs:sequence> + <xs:element name="transitionPoint" type="nonNegativeDecimal" minOccurs="1" + maxOccurs="1"> + </xs:element> + <xs:element name="nits" type="xs:float" maxOccurs="unbounded"> + </xs:element> + <xs:element name="backlight" type="xs:float" maxOccurs="unbounded"> + </xs:element> + <xs:element name="brightness" type="xs:float" maxOccurs="unbounded"> + </xs:element> + </xs:sequence> + <xs:attribute name="enabled" type="xs:boolean" use="optional"/> + </xs:complexType> + <xs:complexType name="highBrightnessMode"> <xs:all> <xs:element name="transitionPoint" type="nonNegativeDecimal" minOccurs="1" diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 00dc90828d90..c39c3d7ee7c6 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -113,6 +113,7 @@ package com.android.server.display.config { method public com.android.server.display.config.HighBrightnessMode getHighBrightnessMode(); method public final com.android.server.display.config.IdleScreenRefreshRateTimeout getIdleScreenRefreshRateTimeout(); method public final com.android.server.display.config.SensorDetails getLightSensor(); + method public final com.android.server.display.config.LowBrightnessMode getLowBrightness(); method public com.android.server.display.config.LuxThrottling getLuxThrottling(); method @Nullable public final String getName(); method public com.android.server.display.config.PowerThrottlingConfig getPowerThrottlingConfig(); @@ -149,6 +150,7 @@ package com.android.server.display.config { method public void setHighBrightnessMode(com.android.server.display.config.HighBrightnessMode); method public final void setIdleScreenRefreshRateTimeout(com.android.server.display.config.IdleScreenRefreshRateTimeout); method public final void setLightSensor(com.android.server.display.config.SensorDetails); + method public final void setLowBrightness(com.android.server.display.config.LowBrightnessMode); method public void setLuxThrottling(com.android.server.display.config.LuxThrottling); method public final void setName(@Nullable String); method public void setPowerThrottlingConfig(com.android.server.display.config.PowerThrottlingConfig); @@ -248,6 +250,17 @@ package com.android.server.display.config { method public java.util.List<java.math.BigInteger> getItem(); } + public class LowBrightnessMode { + ctor public LowBrightnessMode(); + method public java.util.List<java.lang.Float> getBacklight(); + method public java.util.List<java.lang.Float> getBrightness(); + method public boolean getEnabled(); + method public java.util.List<java.lang.Float> getNits(); + method public java.math.BigDecimal getTransitionPoint(); + method public void setEnabled(boolean); + method public void setTransitionPoint(java.math.BigDecimal); + } + public class LuxThrottling { ctor public LuxThrottling(); method @NonNull public final java.util.List<com.android.server.display.config.BrightnessLimitMap> getBrightnessLimitMap(); diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp index 8dfa685bf6ff..da965bb02460 100644 --- a/services/devicepolicy/Android.bp +++ b/services/devicepolicy/Android.bp @@ -24,5 +24,6 @@ java_library_static { "app-compat-annotations", "service-permission.stubs.system_server", "device_policy_aconfig_flags_lib", + "androidx.annotation_annotation", ], } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index cebd6d05e9ac..f955b91136a3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -9523,7 +9523,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (setProfileOwnerOnCurrentUserIfNecessary && mInjector.userManagerIsHeadlessSystemUserMode() - && getHeadlessDeviceOwnerMode() == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED) { + && getHeadlessDeviceOwnerModeForDeviceOwner() + == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED) { int currentForegroundUser; synchronized (getLockObject()) { currentForegroundUser = getCurrentForegroundUserId(); @@ -9539,7 +9540,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return true; } - private int getHeadlessDeviceOwnerMode() { + private int getHeadlessDeviceOwnerModeForDeviceOwner() { synchronized (getLockObject()) { ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked(); if (deviceOwner == null) { @@ -9549,6 +9550,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } + private int getHeadlessDeviceOwnerModeForDeviceAdmin( + @Nullable ComponentName deviceAdmin, int userId) { + synchronized (getLockObject()) { + if (deviceAdmin == null) { + return HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED; + } + DeviceAdminInfo adminInfo = findAdmin( + deviceAdmin, userId, /* throwForMissingPermission= */ false); + if (adminInfo == null) { + return HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED; + } + return adminInfo.getHeadlessDeviceOwnerMode(); + } + } + /** * This API is cached: invalidate with invalidateBinderCaches(). */ @@ -12308,7 +12324,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (Flags.headlessDeviceOwnerSingleUserEnabled()) { // Block this method if the device is in headless main user mode Preconditions.checkCallAuthorization( - getHeadlessDeviceOwnerMode() != HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER, + getHeadlessDeviceOwnerModeForDeviceOwner() + != HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER, "createAndManageUser was called while in headless single user mode"); } @@ -16746,8 +16763,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - private int checkProvisioningPreconditionSkipPermission(String action, - String packageName, int userId) { + + private int checkProvisioningPreconditionSkipPermission( + String action, String packageName, int userId) { + return checkProvisioningPreconditionSkipPermission( + action, packageName, /* componentName = */ null, userId); + } + + private int checkProvisioningPreconditionSkipPermission( + String action, ComponentName componentName, int userId) { + return checkProvisioningPreconditionSkipPermission( + action, componentName.getPackageName(), componentName, userId); + } + + private int checkProvisioningPreconditionSkipPermission( + String action, String packageName, @Nullable ComponentName componentName, int userId) { if (!mHasFeature) { logMissingFeatureAction("Cannot check provisioning for action " + action); return STATUS_DEVICE_ADMIN_NOT_SUPPORTED; @@ -16756,11 +16786,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS; } final int code = checkProvisioningPreConditionSkipPermissionNoLog( - action, packageName, userId); + action, packageName, componentName, userId); if (code != STATUS_OK) { Slogf.d(LOG_TAG, "checkProvisioningPreCondition(" + action + ", " + packageName - + ") failed: " - + computeProvisioningErrorString(code, mInjector.userHandleGetCallingUserId())); + + ") failed: " + computeProvisioningErrorString( + code, mInjector.userHandleGetCallingUserId())); } return code; } @@ -16783,14 +16813,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } private int checkProvisioningPreConditionSkipPermissionNoLog(String action, - String packageName, int userId) { + String packageName, @Nullable ComponentName componentName, int userId) { + if (packageName != null && componentName != null + && !packageName.equals(componentName.getPackageName())) { + throw new IllegalArgumentException("PackageName: " + packageName + " is not the same as" + + " the package provided in componentName: " + componentName); + } if (action != null) { switch (action) { case DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE: return checkManagedProfileProvisioningPreCondition(packageName, userId); case DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE: case DevicePolicyManager.ACTION_PROVISION_FINANCED_DEVICE: - return checkDeviceOwnerProvisioningPreCondition(userId); + return checkDeviceOwnerProvisioningPreCondition(componentName, userId); } } throw new IllegalArgumentException("Unknown provisioning action " + action); @@ -16825,16 +16860,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { int ensureSetUpUser = UserHandle.USER_SYSTEM; if (isHeadlessSystemUserMode) { if (owner != null) { - adminInfo = findAdmin(owner, - deviceOwnerUserId, /* throwForMissingPermission= */ false); + int headlessDeviceOwnerMode = getHeadlessDeviceOwnerModeForDeviceAdmin( + owner, deviceOwnerUserId); isHeadlessModeAffiliated = - adminInfo.getHeadlessDeviceOwnerMode() - == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; + headlessDeviceOwnerMode == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; isHeadlessModeSingleUser = - adminInfo.getHeadlessDeviceOwnerMode() - == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; + headlessDeviceOwnerMode == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; if (!isHeadlessModeAffiliated && !isHeadlessModeSingleUser) { return STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED; @@ -16880,7 +16913,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } return STATUS_OK; } else { - // DO has to be user 0 + // DO has to be user 0 if setting affiliated DO if ((!isHeadlessSystemUserMode || isHeadlessModeAffiliated) && deviceOwnerUserId != UserHandle.USER_SYSTEM) { return STATUS_NOT_SYSTEM_USER; @@ -16904,17 +16937,25 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { .count() > allowedUsers; } - private int checkDeviceOwnerProvisioningPreCondition(@UserIdInt int callingUserId) { + private int checkDeviceOwnerProvisioningPreCondition( + @Nullable ComponentName componentName, @UserIdInt int callingUserId) { synchronized (getLockObject()) { - final int deviceOwnerUserId = mInjector.userManagerIsHeadlessSystemUserMode() - && (!Flags.headlessDeviceOwnerProvisioningFixEnabled() - || getHeadlessDeviceOwnerMode() == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED) - ? UserHandle.USER_SYSTEM - : callingUserId; + int deviceOwnerUserId = -1; + if (Flags.headlessDeviceOwnerProvisioningFixEnabled()) { + deviceOwnerUserId = mInjector.userManagerIsHeadlessSystemUserMode() + && getHeadlessDeviceOwnerModeForDeviceAdmin(componentName, callingUserId) + == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED + ? UserHandle.USER_SYSTEM : callingUserId; + } else { + deviceOwnerUserId = mInjector.userManagerIsHeadlessSystemUserMode() + && getHeadlessDeviceOwnerModeForDeviceOwner() + == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED + ? UserHandle.USER_SYSTEM : callingUserId; + } Slogf.i(LOG_TAG, "Calling user %d, device owner will be set on user %d", callingUserId, deviceOwnerUserId); // hasIncompatibleAccountsOrNonAdb doesn't matter since the caller is not adb. - return checkDeviceOwnerProvisioningPreConditionLocked(/* owner unknown */ null, + return checkDeviceOwnerProvisioningPreConditionLocked(componentName, deviceOwnerUserId, callingUserId, /* isAdb= */ false, /* hasIncompatibleAccountsOrNonAdb=*/ true); } @@ -21082,7 +21123,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final long identity = Binder.clearCallingIdentity(); try { final int result = checkProvisioningPreconditionSkipPermission( - ACTION_PROVISION_MANAGED_PROFILE, admin.getPackageName(), caller.getUserId()); + ACTION_PROVISION_MANAGED_PROFILE, admin, caller.getUserId()); if (result != STATUS_OK) { throw new ServiceSpecificException( ERROR_PRE_CONDITION_FAILED, @@ -21568,8 +21609,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final long identity = Binder.clearCallingIdentity(); try { int result = checkProvisioningPreconditionSkipPermission( - ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin.getPackageName(), - caller.getUserId()); + ACTION_PROVISION_MANAGED_DEVICE, deviceAdmin, caller.getUserId()); if (result != STATUS_OK) { throw new ServiceSpecificException( ERROR_PRE_CONDITION_FAILED, @@ -21581,17 +21621,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime()); setLocale(provisioningParams.getLocale()); - - boolean isSingleUserMode; if (Flags.headlessDeviceOwnerProvisioningFixEnabled()) { - DeviceAdminInfo adminInfo = findAdmin( - deviceAdmin, caller.getUserId(), /* throwForMissingPermission= */ false); - isSingleUserMode = (adminInfo != null && adminInfo.getHeadlessDeviceOwnerMode() - == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER); + int headlessDeviceOwnerMode = getHeadlessDeviceOwnerModeForDeviceAdmin( + deviceAdmin, caller.getUserId()); + isSingleUserMode = + headlessDeviceOwnerMode == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; } else { isSingleUserMode = - (getHeadlessDeviceOwnerMode() == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER); + getHeadlessDeviceOwnerModeForDeviceOwner() + == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; } int deviceOwnerUserId = Flags.headlessDeviceOwnerSingleUserEnabled() && isSingleUserMode @@ -21606,7 +21645,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { "PackageManager failed to remove non required apps."); } - if (!setActiveAdminAndDeviceOwner(deviceOwnerUserId, deviceAdmin)) { throw new ServiceSpecificException( ERROR_SET_DEVICE_OWNER_FAILED, "Failed to set device owner."); @@ -24410,6 +24448,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { enforcePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS, caller.getPackageName(), caller.getUserId()); - return Binder.withCleanCallingIdentity(() -> getHeadlessDeviceOwnerMode()); + return Binder.withCleanCallingIdentity(() -> getHeadlessDeviceOwnerModeForDeviceOwner()); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java index f3b164c6501c..94c137444ede 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OverlayPackagesProvider.java @@ -25,15 +25,16 @@ import static android.app.admin.DevicePolicyManager.REQUIRED_APP_MANAGED_USER; import static android.content.pm.PackageManager.GET_META_DATA; import static com.android.internal.util.Preconditions.checkArgument; -import static com.android.internal.util.Preconditions.checkNotNull; -import static com.android.server.devicepolicy.DevicePolicyManagerService.dumpResources; +import static com.android.server.devicepolicy.DevicePolicyManagerService.dumpApps; import static java.util.Objects.requireNonNull; +import android.annotation.ArrayRes; import android.annotation.NonNull; import android.annotation.UserIdInt; import android.app.admin.DeviceAdminReceiver; import android.app.admin.DevicePolicyManager; +import android.app.admin.flags.Flags; import android.app.role.RoleManager; import android.content.ComponentName; import android.content.Context; @@ -67,13 +68,16 @@ public class OverlayPackagesProvider { protected static final String TAG = "OverlayPackagesProvider"; private static final Map<String, String> sActionToMetadataKeyMap = new HashMap<>(); - { + + static { sActionToMetadataKeyMap.put(ACTION_PROVISION_MANAGED_USER, REQUIRED_APP_MANAGED_USER); sActionToMetadataKeyMap.put(ACTION_PROVISION_MANAGED_PROFILE, REQUIRED_APP_MANAGED_PROFILE); sActionToMetadataKeyMap.put(ACTION_PROVISION_MANAGED_DEVICE, REQUIRED_APP_MANAGED_DEVICE); } + private static final Set<String> sAllowedActions = new HashSet<>(); - { + + static { sAllowedActions.add(ACTION_PROVISION_MANAGED_USER); sAllowedActions.add(ACTION_PROVISION_MANAGED_PROFILE); sAllowedActions.add(ACTION_PROVISION_MANAGED_DEVICE); @@ -83,8 +87,13 @@ public class OverlayPackagesProvider { private final Context mContext; private final Injector mInjector; + private final RecursiveStringArrayResourceResolver mRecursiveStringArrayResourceResolver; + public OverlayPackagesProvider(Context context) { - this(context, new DefaultInjector()); + this( + context, + new DefaultInjector(), + new RecursiveStringArrayResourceResolver(context.getResources())); } @VisibleForTesting @@ -113,8 +122,8 @@ public class OverlayPackagesProvider { public String getDevicePolicyManagementRoleHolderPackageName(Context context) { return Binder.withCleanCallingIdentity(() -> { RoleManager roleManager = context.getSystemService(RoleManager.class); - List<String> roleHolders = - roleManager.getRoleHolders(RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT); + List<String> roleHolders = roleManager.getRoleHolders( + RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT); if (roleHolders.isEmpty()) { return null; } @@ -124,17 +133,20 @@ public class OverlayPackagesProvider { } @VisibleForTesting - OverlayPackagesProvider(Context context, Injector injector) { + OverlayPackagesProvider(Context context, Injector injector, + RecursiveStringArrayResourceResolver recursiveStringArrayResourceResolver) { mContext = context; - mPm = checkNotNull(context.getPackageManager()); - mInjector = checkNotNull(injector); + mPm = requireNonNull(context.getPackageManager()); + mInjector = requireNonNull(injector); + mRecursiveStringArrayResourceResolver = requireNonNull( + recursiveStringArrayResourceResolver); } /** * Computes non-required apps. All the system apps with a launcher that are not in * the required set of packages, and all mainline modules that are not declared as required * via metadata in their manifests, will be considered as non-required apps. - * + * <p> * Note: If an app is mistakenly listed as both required and disallowed, it will be treated as * disallowed. * @@ -176,12 +188,12 @@ public class OverlayPackagesProvider { /** * Returns a subset of {@code packageNames} whose packages are mainline modules declared as * required apps via their app metadata. + * * @see DevicePolicyManager#REQUIRED_APP_MANAGED_USER * @see DevicePolicyManager#REQUIRED_APP_MANAGED_DEVICE * @see DevicePolicyManager#REQUIRED_APP_MANAGED_PROFILE */ - private Set<String> getRequiredAppsMainlineModules( - Set<String> packageNames, + private Set<String> getRequiredAppsMainlineModules(Set<String> packageNames, String provisioningAction) { final Set<String> result = new HashSet<>(); for (String packageName : packageNames) { @@ -225,8 +237,8 @@ public class OverlayPackagesProvider { } private boolean isApkInApexMainlineModule(String packageName) { - final String apexPackageName = - mInjector.getActiveApexPackageNameContainingPackage(packageName); + final String apexPackageName = mInjector.getActiveApexPackageNameContainingPackage( + packageName); return apexPackageName != null; } @@ -274,112 +286,94 @@ public class OverlayPackagesProvider { } private Set<String> getRequiredAppsSet(String provisioningAction) { - final int resId; - switch (provisioningAction) { - case ACTION_PROVISION_MANAGED_USER: - resId = R.array.required_apps_managed_user; - break; - case ACTION_PROVISION_MANAGED_PROFILE: - resId = R.array.required_apps_managed_profile; - break; - case ACTION_PROVISION_MANAGED_DEVICE: - resId = R.array.required_apps_managed_device; - break; - default: - throw new IllegalArgumentException("Provisioning type " - + provisioningAction + " not supported."); - } - return new ArraySet<>(Arrays.asList(mContext.getResources().getStringArray(resId))); + final int resId = switch (provisioningAction) { + case ACTION_PROVISION_MANAGED_USER -> R.array.required_apps_managed_user; + case ACTION_PROVISION_MANAGED_PROFILE -> R.array.required_apps_managed_profile; + case ACTION_PROVISION_MANAGED_DEVICE -> R.array.required_apps_managed_device; + default -> throw new IllegalArgumentException( + "Provisioning type " + provisioningAction + " not supported."); + }; + return resolveStringArray(resId); } private Set<String> getDisallowedAppsSet(String provisioningAction) { - final int resId; - switch (provisioningAction) { - case ACTION_PROVISION_MANAGED_USER: - resId = R.array.disallowed_apps_managed_user; - break; - case ACTION_PROVISION_MANAGED_PROFILE: - resId = R.array.disallowed_apps_managed_profile; - break; - case ACTION_PROVISION_MANAGED_DEVICE: - resId = R.array.disallowed_apps_managed_device; - break; - default: - throw new IllegalArgumentException("Provisioning type " - + provisioningAction + " not supported."); - } - return new ArraySet<>(Arrays.asList(mContext.getResources().getStringArray(resId))); + final int resId = switch (provisioningAction) { + case ACTION_PROVISION_MANAGED_USER -> R.array.disallowed_apps_managed_user; + case ACTION_PROVISION_MANAGED_PROFILE -> R.array.disallowed_apps_managed_profile; + case ACTION_PROVISION_MANAGED_DEVICE -> R.array.disallowed_apps_managed_device; + default -> throw new IllegalArgumentException( + "Provisioning type " + provisioningAction + " not supported."); + }; + return resolveStringArray(resId); } private Set<String> getVendorRequiredAppsSet(String provisioningAction) { - final int resId; - switch (provisioningAction) { - case ACTION_PROVISION_MANAGED_USER: - resId = R.array.vendor_required_apps_managed_user; - break; - case ACTION_PROVISION_MANAGED_PROFILE: - resId = R.array.vendor_required_apps_managed_profile; - break; - case ACTION_PROVISION_MANAGED_DEVICE: - resId = R.array.vendor_required_apps_managed_device; - break; - default: - throw new IllegalArgumentException("Provisioning type " - + provisioningAction + " not supported."); - } - return new ArraySet<>(Arrays.asList(mContext.getResources().getStringArray(resId))); + final int resId = switch (provisioningAction) { + case ACTION_PROVISION_MANAGED_USER -> R.array.vendor_required_apps_managed_user; + case ACTION_PROVISION_MANAGED_PROFILE -> R.array.vendor_required_apps_managed_profile; + case ACTION_PROVISION_MANAGED_DEVICE -> R.array.vendor_required_apps_managed_device; + default -> throw new IllegalArgumentException( + "Provisioning type " + provisioningAction + " not supported."); + }; + return resolveStringArray(resId); } private Set<String> getVendorDisallowedAppsSet(String provisioningAction) { - final int resId; - switch (provisioningAction) { - case ACTION_PROVISION_MANAGED_USER: - resId = R.array.vendor_disallowed_apps_managed_user; - break; - case ACTION_PROVISION_MANAGED_PROFILE: - resId = R.array.vendor_disallowed_apps_managed_profile; - break; - case ACTION_PROVISION_MANAGED_DEVICE: - resId = R.array.vendor_disallowed_apps_managed_device; - break; - default: - throw new IllegalArgumentException("Provisioning type " - + provisioningAction + " not supported."); + final int resId = switch (provisioningAction) { + case ACTION_PROVISION_MANAGED_USER -> R.array.vendor_disallowed_apps_managed_user; + case ACTION_PROVISION_MANAGED_PROFILE -> R.array.vendor_disallowed_apps_managed_profile; + case ACTION_PROVISION_MANAGED_DEVICE -> R.array.vendor_disallowed_apps_managed_device; + default -> throw new IllegalArgumentException( + "Provisioning type " + provisioningAction + " not supported."); + }; + return resolveStringArray(resId); + } + + private Set<String> resolveStringArray(@ArrayRes int resId) { + if (Flags.isRecursiveRequiredAppMergingEnabled()) { + return mRecursiveStringArrayResourceResolver.resolve(mContext.getPackageName(), resId); + } else { + return new ArraySet<>(Arrays.asList(mContext.getResources().getStringArray(resId))); } - return new ArraySet<>(Arrays.asList(mContext.getResources().getStringArray(resId))); } void dump(IndentingPrintWriter pw) { pw.println("OverlayPackagesProvider"); pw.increaseIndent(); - dumpResources(pw, mContext, "required_apps_managed_device", - R.array.required_apps_managed_device); - dumpResources(pw, mContext, "required_apps_managed_user", - R.array.required_apps_managed_user); - dumpResources(pw, mContext, "required_apps_managed_profile", - R.array.required_apps_managed_profile); - - dumpResources(pw, mContext, "disallowed_apps_managed_device", - R.array.disallowed_apps_managed_device); - dumpResources(pw, mContext, "disallowed_apps_managed_user", - R.array.disallowed_apps_managed_user); - dumpResources(pw, mContext, "disallowed_apps_managed_device", - R.array.disallowed_apps_managed_device); - - dumpResources(pw, mContext, "vendor_required_apps_managed_device", - R.array.vendor_required_apps_managed_device); - dumpResources(pw, mContext, "vendor_required_apps_managed_user", - R.array.vendor_required_apps_managed_user); - dumpResources(pw, mContext, "vendor_required_apps_managed_profile", - R.array.vendor_required_apps_managed_profile); - - dumpResources(pw, mContext, "vendor_disallowed_apps_managed_user", - R.array.vendor_disallowed_apps_managed_user); - dumpResources(pw, mContext, "vendor_disallowed_apps_managed_device", - R.array.vendor_disallowed_apps_managed_device); - dumpResources(pw, mContext, "vendor_disallowed_apps_managed_profile", - R.array.vendor_disallowed_apps_managed_profile); + dumpApps(pw, "required_apps_managed_device", + resolveStringArray(R.array.required_apps_managed_device).toArray(String[]::new)); + dumpApps(pw, "required_apps_managed_user", + resolveStringArray(R.array.required_apps_managed_user).toArray(String[]::new)); + dumpApps(pw, "required_apps_managed_profile", + resolveStringArray(R.array.required_apps_managed_profile).toArray(String[]::new)); + + dumpApps(pw, "disallowed_apps_managed_device", + resolveStringArray(R.array.disallowed_apps_managed_device).toArray(String[]::new)); + dumpApps(pw, "disallowed_apps_managed_user", + resolveStringArray(R.array.disallowed_apps_managed_user).toArray(String[]::new)); + dumpApps(pw, "disallowed_apps_managed_device", + resolveStringArray(R.array.disallowed_apps_managed_device).toArray(String[]::new)); + + dumpApps(pw, "vendor_required_apps_managed_device", + resolveStringArray(R.array.vendor_required_apps_managed_device).toArray( + String[]::new)); + dumpApps(pw, "vendor_required_apps_managed_user", + resolveStringArray(R.array.vendor_required_apps_managed_user).toArray( + String[]::new)); + dumpApps(pw, "vendor_required_apps_managed_profile", + resolveStringArray(R.array.vendor_required_apps_managed_profile).toArray( + String[]::new)); + + dumpApps(pw, "vendor_disallowed_apps_managed_user", + resolveStringArray(R.array.vendor_disallowed_apps_managed_user).toArray( + String[]::new)); + dumpApps(pw, "vendor_disallowed_apps_managed_device", + resolveStringArray(R.array.vendor_disallowed_apps_managed_device).toArray( + String[]::new)); + dumpApps(pw, "vendor_disallowed_apps_managed_profile", + resolveStringArray(R.array.vendor_disallowed_apps_managed_profile).toArray( + String[]::new)); pw.decreaseIndent(); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/RecursiveStringArrayResourceResolver.java b/services/devicepolicy/java/com/android/server/devicepolicy/RecursiveStringArrayResourceResolver.java new file mode 100644 index 000000000000..935e051b64ea --- /dev/null +++ b/services/devicepolicy/java/com/android/server/devicepolicy/RecursiveStringArrayResourceResolver.java @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2021 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.server.devicepolicy; + +import android.annotation.SuppressLint; +import android.content.res.Resources; + +import androidx.annotation.ArrayRes; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +/** + * A class encapsulating all the logic for recursive string-array resource resolution. + */ +public class RecursiveStringArrayResourceResolver { + private static final String IMPORT_PREFIX = "#import:"; + private static final String SEPARATOR = "/"; + private static final String PWP = "."; + + private final Resources mResources; + + /** + * @param resources Android resource access object to use when resolving resources + */ + public RecursiveStringArrayResourceResolver(Resources resources) { + this.mResources = resources; + } + + /** + * Resolves a given {@code <string-array/>} resource specified via + * {@param rootId} in {@param pkg}. During resolution all values prefixed with + * {@link #IMPORT_PREFIX} are expanded and injected + * into the final list at the position of the import statement, + * pushing all the following values (and their expansions) down. + * Circular imports are tracked and skipped to avoid infinite resolution loops without losing + * data. + * + * <p> + * The import statements are expected in a form of + * "{@link #IMPORT_PREFIX}{package}{@link #SEPARATOR}{resourceName}" + * If the resource being imported is from the same package, its package can be specified as a + * {@link #PWP} shorthand `.` + * > e.g.: + * > {@code "#import:com.android.internal/disallowed_apps_managed_user"} + * > {@code "#import:./disallowed_apps_managed_user"} + * + * <p> + * Any incorrect or unresolvable import statement + * will cause the entire resolution to fail with an error. + * + * @param pkg the package owning the resource + * @param rootId the id of the {@code <string-array>} resource within {@param pkg} to start the + * resolution from + * @return a flattened list of all the resolved string array values from the root resource + * as well as all the imported arrays + */ + public Set<String> resolve(String pkg, @ArrayRes int rootId) { + return resolve(List.of(), pkg, rootId); + } + + /** + * A version of resolve that tracks already imported resources + * to avoid circular imports and wasted work. + * + * @param cache a list of already resolved packages to be skipped for further resolution + */ + private Set<String> resolve(Collection<String> cache, String pkg, @ArrayRes int rootId) { + final var strings = mResources.getStringArray(rootId); + final var runningCache = new ArrayList<>(cache); + + final var result = new HashSet<String>(); + for (var string : strings) { + final String ref; + if (string.startsWith(IMPORT_PREFIX)) { + ref = string.substring(IMPORT_PREFIX.length()); + } else { + ref = null; + } + + if (ref == null) { + result.add(string); + } else if (!runningCache.contains(ref)) { + final var next = resolveImport(runningCache, pkg, ref); + runningCache.addAll(next); + result.addAll(next); + } + } + return result; + } + + /** + * Resolves an import of the {@code <string-array>} resource + * in the context of {@param importingPackage} by the provided {@param ref}. + * + * @param cache a list of already resolved packages to be passed along into chained + * {@link #resolve} calls + * @param importingPackage the package that owns the resource which defined the import being + * processed. + * It is also used to expand all {@link #PWP} shorthands in + * {@param ref} + * @param ref reference to the resource to be imported in a form of + * "{package}{@link #SEPARATOR}{resourceName}". + * e.g.: {@code com.android.internal/disallowed_apps_managed_user} + */ + private Set<String> resolveImport( + Collection<String> cache, + String importingPackage, + String ref) { + final var chunks = ref.split(SEPARATOR, 2); + final var pkg = chunks[0]; + final var name = chunks[1]; + final String resolvedPkg; + if (Objects.equals(pkg, PWP)) { + resolvedPkg = importingPackage; + } else { + resolvedPkg = pkg; + } + @SuppressLint("DiscouragedApi") final var importId = mResources.getIdentifier( + /* name = */ name, + /* defType = */ "array", + /* defPackage = */ resolvedPkg); + if (importId == 0) { + throw new Resources.NotFoundException( + /* name= */ String.format("%s:array/%s", resolvedPkg, name)); + } + return resolve(cache, resolvedPkg, importId); + } +} diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 3b2a3dd9763a..e202bbf022bc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1230,10 +1230,6 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(ThermalManagerService.class); t.traceEnd(); - t.traceBegin("StartHintManager"); - mSystemServiceManager.startService(HintManagerService.class); - t.traceEnd(); - // Now that the power manager has been started, let the activity manager // initialize power management features. t.traceBegin("InitPowerManagement"); @@ -1614,6 +1610,10 @@ public final class SystemServer implements Dumpable { t.traceEnd(); } + t.traceBegin("StartHintManager"); + mSystemServiceManager.startService(HintManagerService.class); + t.traceEnd(); + // Grants default permissions and defines roles t.traceBegin("StartRoleManagerService"); LocalManagerRegistry.addManager(RoleServicePlatformHelper.class, diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceWindowGainedFocusTest.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceWindowGainedFocusTest.java index cea65b55494d..9f46d0ba7df6 100644 --- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceWindowGainedFocusTest.java +++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceWindowGainedFocusTest.java @@ -198,7 +198,9 @@ public class InputMethodManagerServiceWindowGainedFocusTest @Test public void startInputOrWindowGainedFocus_userNotRunning() throws RemoteException { - when(mMockUserManagerInternal.isUserRunning(anyInt())).thenReturn(false); + // Run blockingly on ServiceThread to avoid that interfering with our stubbing. + mServiceThread.getThreadHandler().runWithScissors( + () -> when(mMockUserManagerInternal.isUserRunning(anyInt())).thenReturn(false), 0); assertThat( startInputOrWindowGainedFocus( diff --git a/services/tests/displayservicetests/src/com/android/server/display/AutomaticBrightnessControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/AutomaticBrightnessControllerTest.java index b0f7bfa33415..54de64e2f3a8 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/AutomaticBrightnessControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/AutomaticBrightnessControllerTest.java @@ -52,6 +52,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.server.display.brightness.clamper.BrightnessClamperController; import com.android.server.testutils.OffsettableClock; import org.junit.After; @@ -96,6 +97,8 @@ public class AutomaticBrightnessControllerTest { @Mock HysteresisLevels mScreenBrightnessThresholdsIdle; @Mock Handler mNoOpHandler; @Mock BrightnessRangeController mBrightnessRangeController; + @Mock + BrightnessClamperController mBrightnessClamperController; @Mock BrightnessThrottler mBrightnessThrottler; @Before @@ -161,7 +164,8 @@ public class AutomaticBrightnessControllerTest { mAmbientBrightnessThresholdsIdle, mScreenBrightnessThresholdsIdle, mContext, mBrightnessRangeController, mBrightnessThrottler, useHorizon ? AMBIENT_LIGHT_HORIZON_SHORT : 1, - useHorizon ? AMBIENT_LIGHT_HORIZON_LONG : 10000, userLux, userNits + useHorizon ? AMBIENT_LIGHT_HORIZON_LONG : 10000, userLux, userNits, + mBrightnessClamperController ); when(mBrightnessRangeController.getCurrentBrightnessMax()).thenReturn( 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 35b69f812ff0..73a2f655da8d 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -44,6 +44,7 @@ import android.content.res.TypedArray; import android.hardware.display.DisplayManagerInternal; import android.os.PowerManager; import android.os.Temperature; +import android.platform.test.annotations.RequiresFlagsEnabled; import android.provider.Settings; import android.util.SparseArray; import android.util.Spline; @@ -57,6 +58,7 @@ import com.android.server.display.config.HdrBrightnessData; import com.android.server.display.config.IdleScreenRefreshRateTimeoutLuxThresholdPoint; import com.android.server.display.config.ThermalStatus; import com.android.server.display.feature.DisplayManagerFlags; +import com.android.server.display.feature.flags.Flags; import org.junit.Before; import org.junit.Test; @@ -380,7 +382,7 @@ public final class DisplayDeviceConfigTest { public void testInvalidLuxThrottling() throws Exception { setupDisplayDeviceConfigFromDisplayConfigFile( getContent(getInvalidLuxThrottling(), getValidProxSensor(), - /* includeIdleMode= */ true)); + /* includeIdleMode= */ true, /* enableEvenDimmer */ false)); Map<DisplayDeviceConfig.BrightnessLimitMapType, Map<Float, Float>> luxThrottlingData = mDisplayDeviceConfig.getLuxThrottlingData(); @@ -588,7 +590,7 @@ public final class DisplayDeviceConfigTest { public void testProximitySensorWithEmptyValuesFromDisplayConfig() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile( getContent(getValidLuxThrottling(), getProxSensorWithEmptyValues(), - /* includeIdleMode= */ true)); + /* includeIdleMode= */ true, /* enableEvenDimmer */ false)); assertNull(mDisplayDeviceConfig.getProximitySensor()); } @@ -596,7 +598,7 @@ public final class DisplayDeviceConfigTest { public void testProximitySensorWithRefreshRatesFromDisplayConfig() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile( getContent(getValidLuxThrottling(), getValidProxSensorWithRefreshRateAndVsyncRate(), - /* includeIdleMode= */ true)); + /* includeIdleMode= */ true, /* enableEvenDimmer */ false)); assertEquals("test_proximity_sensor", mDisplayDeviceConfig.getProximitySensor().type); assertEquals("Test Proximity Sensor", @@ -784,7 +786,7 @@ public final class DisplayDeviceConfigTest { @Test public void testBrightnessRamps_IdleFallsBackToConfigInteractive() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(), - getValidProxSensor(), /* includeIdleMode= */ false)); + getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ false)); assertEquals(mDisplayDeviceConfig.getBrightnessRampDecreaseMaxMillis(), 3000); assertEquals(mDisplayDeviceConfig.getBrightnessRampIncreaseMaxMillis(), 2000); @@ -801,14 +803,14 @@ public final class DisplayDeviceConfigTest { @Test public void testBrightnessCapForWearBedtimeMode() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(), - getValidProxSensor(), /* includeIdleMode= */ false)); + getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ false)); assertEquals(0.1f, mDisplayDeviceConfig.getBrightnessCapForWearBedtimeMode(), ZERO_DELTA); } @Test public void testAutoBrightnessBrighteningLevels() throws IOException { setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(), - getValidProxSensor(), /* includeIdleMode= */ false)); + getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ false)); assertArrayEquals(new float[]{0.0f, 80}, mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux( @@ -871,7 +873,7 @@ public final class DisplayDeviceConfigTest { when(mFlags.areAutoBrightnessModesEnabled()).thenReturn(false); setupDisplayDeviceConfigFromConfigResourceFile(); setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(), - getValidProxSensor(), /* includeIdleMode= */ false)); + getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ false)); assertArrayEquals(new float[]{brightnessIntToFloat(50), brightnessIntToFloat(100), brightnessIntToFloat(150)}, @@ -904,6 +906,18 @@ public final class DisplayDeviceConfigTest { assertFalse(mDisplayDeviceConfig.isAutoBrightnessAvailable()); } + @RequiresFlagsEnabled(Flags.FLAG_EVEN_DIMMER) + @Test + public void testEvenDimmer() throws IOException { + when(mFlags.isEvenDimmerEnabled()).thenReturn(true); + setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(), + getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ true)); + + assertTrue(mDisplayDeviceConfig.getLbmEnabled()); + assertEquals(0.0001f, mDisplayDeviceConfig.getBacklightFromBrightness(0.1f), ZERO_DELTA); + assertEquals(0.2f, mDisplayDeviceConfig.getNitsFromBacklight(0.0f), ZERO_DELTA); + } + private String getValidLuxThrottling() { return "<luxThrottling>\n" + " <brightnessLimitMap>\n" @@ -1229,11 +1243,11 @@ public final class DisplayDeviceConfigTest { private String getContent() { return getContent(getValidLuxThrottling(), getValidProxSensor(), - /* includeIdleMode= */ true); + /* includeIdleMode= */ true, false); } private String getContent(String brightnessCapConfig, String proxSensor, - boolean includeIdleMode) { + boolean includeIdleMode, boolean enableEvenDimmer) { return "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + "<displayConfiguration>\n" + "<name>Example Display</name>\n" @@ -1603,6 +1617,7 @@ public final class DisplayDeviceConfigTest { + "<majorVersion>2</majorVersion>\n" + "<minorVersion>0</minorVersion>\n" + "</usiVersion>\n" + + evenDimmerConfig(enableEvenDimmer) + "<screenBrightnessCapForWearBedtimeMode>" + "0.1" + "</screenBrightnessCapForWearBedtimeMode>" @@ -1621,6 +1636,24 @@ public final class DisplayDeviceConfigTest { + "</displayConfiguration>\n"; } + private String evenDimmerConfig(boolean enabled) { + return (enabled ? "<lowBrightness enabled=\"true\">" : "<lowBrightness enabled=\"false\">") + + " <transitionPoint>0.1</transitionPoint>\n" + + " <nits>0.2</nits>\n" + + " <nits>2.0</nits>\n" + + " <nits>500.0</nits>\n" + + " <nits>1000.0</nits>\n" + + " <backlight>0</backlight>\n" + + " <backlight>0.0001</backlight>\n" + + " <backlight>0.5</backlight>\n" + + " <backlight>1.0</backlight>\n" + + " <brightness>0</brightness>\n" + + " <brightness>0.1</brightness>\n" + + " <brightness>0.5</brightness>\n" + + " <brightness>1.0</brightness>\n" + + "</lowBrightness>"; + } + private void mockDeviceConfigs() { when(mResources.getFloat(com.android.internal.R.dimen .config_screenBrightnessSettingDefaultFloat)).thenReturn(0.5f); diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java index 01598aeba8fe..740ffc90d785 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -1184,7 +1184,8 @@ public final class DisplayPowerControllerTest { /* ambientLightHorizonShort= */ anyInt(), /* ambientLightHorizonLong= */ anyInt(), eq(lux), - eq(nits) + eq(nits), + any(BrightnessClamperController.class) ); } @@ -2121,7 +2122,8 @@ public final class DisplayPowerControllerTest { HysteresisLevels screenBrightnessThresholdsIdle, Context context, BrightnessRangeController brightnessRangeController, BrightnessThrottler brightnessThrottler, int ambientLightHorizonShort, - int ambientLightHorizonLong, float userLux, float userNits) { + int ambientLightHorizonLong, float userLux, float userNits, + BrightnessClamperController brightnessClamperController) { return mAutomaticBrightnessController; } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessLowLuxModifierTest.kt b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessLowLuxModifierTest.kt index ac7d1f5ba452..e4a7d982514f 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessLowLuxModifierTest.kt +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessLowLuxModifierTest.kt @@ -65,7 +65,7 @@ class BrightnessLowLuxModifierTest { Settings.Secure.putIntForUser(context.contentResolver, Settings.Secure.EVEN_DIMMER_ACTIVATED, 1, userId) Settings.Secure.putFloatForUser(context.contentResolver, - Settings.Secure.EVEN_DIMMER_MIN_NITS, 0.7f, userId) + Settings.Secure.EVEN_DIMMER_MIN_NITS, 30.0f, userId) modifier.recalculateLowerBound() testHandler.flush() assertThat(modifier.isActive).isTrue() @@ -81,11 +81,22 @@ class BrightnessLowLuxModifierTest { Settings.Secure.EVEN_DIMMER_ACTIVATED, 1, userId) Settings.Secure.putFloatForUser(context.contentResolver, Settings.Secure.EVEN_DIMMER_MIN_NITS, 0.0f, userId) - modifier.recalculateLowerBound() + modifier.onAmbientLuxChange(3000.0f) testHandler.flush() assertThat(modifier.isActive).isTrue() // Test restriction from lux setting assertThat(modifier.brightnessReason).isEqualTo(BrightnessReason.MODIFIER_MIN_LUX) } + + @Test + fun testSettingOffDisablesModifier() { + Settings.Secure.putIntForUser(context.contentResolver, + Settings.Secure.EVEN_DIMMER_ACTIVATED, 0, userId) + assertThat(modifier.brightnessLowerBound).isEqualTo(PowerManager.BRIGHTNESS_MIN) + modifier.onAmbientLuxChange(3000.0f) + testHandler.flush() + assertThat(modifier.isActive).isFalse() + assertThat(modifier.brightnessLowerBound).isEqualTo(PowerManager.BRIGHTNESS_MIN) + } } diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ServiceBindingOomAdjPolicyTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ServiceBindingOomAdjPolicyTest.java index 97b7af8e43ad..680ab1634cb2 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/ServiceBindingOomAdjPolicyTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/ServiceBindingOomAdjPolicyTest.java @@ -36,7 +36,6 @@ import static com.android.server.am.ProcessList.SERVICE_ADJ; import static org.junit.Assert.assertNotEquals; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -185,8 +184,8 @@ public final class ServiceBindingOomAdjPolicyTest { doReturn(false).when(mAms.mAtmInternal).hasSystemAlertWindowPermission(anyInt(), anyInt(), any()); doReturn(true).when(mAms.mOomAdjuster.mCachedAppOptimizer).useFreezer(); - doNothing().when(mAms.mOomAdjuster.mCachedAppOptimizer).freezeAppAsyncInternalLSP( - any(), anyLong(), anyBoolean(), anyBoolean()); + doNothing().when(mAms.mOomAdjuster.mCachedAppOptimizer).freezeAppAsyncAtEarliestLSP( + any()); doReturn(false).when(mAms.mAppProfiler).updateLowMemStateLSP(anyInt(), anyInt(), anyInt(), anyLong()); @@ -503,7 +502,7 @@ public final class ServiceBindingOomAdjPolicyTest { if (clientApp.isFreezable()) { verify(mAms.mOomAdjuster.mCachedAppOptimizer, times(Flags.serviceBindingOomAdjPolicy() ? 1 : 0)) - .freezeAppAsyncInternalLSP(eq(clientApp), eq(0L), anyBoolean(), anyBoolean()); + .freezeAppAsyncAtEarliestLSP(eq(clientApp)); clearInvocations(mAms.mOomAdjuster.mCachedAppOptimizer); } diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java deleted file mode 100644 index 9a7ee4d7887b..000000000000 --- a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java +++ /dev/null @@ -1,684 +0,0 @@ -/* - * Copyright (C) 2021 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.server.pm; - -import static com.android.server.pm.BackgroundDexOptService.STATUS_DEX_OPT_FAILED; -import static com.android.server.pm.BackgroundDexOptService.STATUS_FATAL_ERROR; -import static com.android.server.pm.BackgroundDexOptService.STATUS_OK; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.timeout; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertThrows; - -import android.annotation.Nullable; -import android.app.job.JobInfo; -import android.app.job.JobParameters; -import android.app.job.JobScheduler; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.HandlerThread; -import android.os.PowerManager; -import android.os.Process; -import android.os.SystemProperties; -import android.util.Log; - -import com.android.internal.util.IndentingPrintWriter; -import com.android.server.LocalServices; -import com.android.server.PinnerService; -import com.android.server.pm.dex.DexManager; -import com.android.server.pm.dex.DexoptOptions; - -import org.junit.After; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.InOrder; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.io.ByteArrayOutputStream; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.stream.Collectors; - -@RunWith(MockitoJUnitRunner.class) -public final class BackgroundDexOptServiceUnitTest { - private static final String TAG = BackgroundDexOptServiceUnitTest.class.getSimpleName(); - - private static final long USABLE_SPACE_NORMAL = 1_000_000_000; - private static final long STORAGE_LOW_BYTES = 1_000_000; - - private static final long TEST_WAIT_TIMEOUT_MS = 10_000; - - private static final String PACKAGE_AAA = "aaa"; - private static final List<String> DEFAULT_PACKAGE_LIST = List.of(PACKAGE_AAA, "bbb"); - private int mDexOptResultForPackageAAA = PackageDexOptimizer.DEX_OPT_PERFORMED; - - // Store expected dexopt sequence for verification. - private ArrayList<DexOptInfo> mDexInfoSequence = new ArrayList<>(); - - @Mock - private Context mContext; - @Mock - private PackageManagerService mPackageManager; - @Mock - private DexOptHelper mDexOptHelper; - @Mock - private DexManager mDexManager; - @Mock - private PinnerService mPinnerService; - @Mock - private JobScheduler mJobScheduler; - @Mock - private BackgroundDexOptService.Injector mInjector; - @Mock - private BackgroundDexOptJobService mJobServiceForPostBoot; - @Mock - private BackgroundDexOptJobService mJobServiceForIdle; - - private final JobParameters mJobParametersForPostBoot = - createJobParameters(BackgroundDexOptService.JOB_POST_BOOT_UPDATE); - private final JobParameters mJobParametersForIdle = - createJobParameters(BackgroundDexOptService.JOB_IDLE_OPTIMIZE); - - private static JobParameters createJobParameters(int jobId) { - JobParameters params = mock(JobParameters.class); - when(params.getJobId()).thenReturn(jobId); - return params; - } - - private BackgroundDexOptService mService; - - private StartAndWaitThread mDexOptThread; - private StartAndWaitThread mCancelThread; - - @Before - public void setUp() throws Exception { - // These tests are only applicable to the legacy BackgroundDexOptService and cannot be run - // when ART Service is enabled. - Assume.assumeFalse(SystemProperties.getBoolean("dalvik.vm.useartservice", false)); - - when(mInjector.getCallingUid()).thenReturn(Process.FIRST_APPLICATION_UID); - when(mInjector.getContext()).thenReturn(mContext); - when(mInjector.getDexOptHelper()).thenReturn(mDexOptHelper); - when(mInjector.getDexManager()).thenReturn(mDexManager); - when(mInjector.getPinnerService()).thenReturn(mPinnerService); - when(mInjector.getJobScheduler()).thenReturn(mJobScheduler); - when(mInjector.getPackageManagerService()).thenReturn(mPackageManager); - - // These mocking can be overwritten in some tests but still keep it here as alternative - // takes too many repetitive codes. - when(mInjector.getDataDirUsableSpace()).thenReturn(USABLE_SPACE_NORMAL); - when(mInjector.getDataDirStorageLowBytes()).thenReturn(STORAGE_LOW_BYTES); - when(mInjector.getDexOptThermalCutoff()).thenReturn(PowerManager.THERMAL_STATUS_CRITICAL); - when(mInjector.getCurrentThermalStatus()).thenReturn(PowerManager.THERMAL_STATUS_NONE); - when(mInjector.supportSecondaryDex()).thenReturn(true); - setupDexOptHelper(); - - mService = new BackgroundDexOptService(mInjector); - } - - private void setupDexOptHelper() { - when(mDexOptHelper.getOptimizablePackages(any())).thenReturn(DEFAULT_PACKAGE_LIST); - when(mDexOptHelper.performDexOptWithStatus(any())).thenAnswer(inv -> { - DexoptOptions opt = inv.getArgument(0); - if (opt.getPackageName().equals(PACKAGE_AAA)) { - return mDexOptResultForPackageAAA; - } - return PackageDexOptimizer.DEX_OPT_PERFORMED; - }); - when(mDexOptHelper.performDexOpt(any())).thenReturn(true); - } - - @After - public void tearDown() throws Exception { - LocalServices.removeServiceForTest(BackgroundDexOptService.class); - } - - @Test - public void testGetService() { - assertThat(BackgroundDexOptService.getService()).isEqualTo(mService); - } - - @Test - public void testBootCompleted() throws Exception { - initUntilBootCompleted(); - } - - @Test - public void testNoExecutionForIdleJobBeforePostBootUpdate() throws Exception { - initUntilBootCompleted(); - - assertThat(mService.onStartJob(mJobServiceForIdle, mJobParametersForIdle)).isFalse(); - } - - @Test - public void testNoExecutionForLowStorage() throws Exception { - initUntilBootCompleted(); - when(mPackageManager.isStorageLow()).thenReturn(true); - - assertThat(mService.onStartJob(mJobServiceForPostBoot, - mJobParametersForPostBoot)).isFalse(); - verify(mDexOptHelper, never()).performDexOpt(any()); - } - - @Test - public void testNoExecutionForNoOptimizablePackages() throws Exception { - initUntilBootCompleted(); - when(mDexOptHelper.getOptimizablePackages(any())).thenReturn(Collections.emptyList()); - - assertThat(mService.onStartJob(mJobServiceForPostBoot, - mJobParametersForPostBoot)).isFalse(); - verify(mDexOptHelper, never()).performDexOpt(any()); - } - - @Test - public void testPostBootUpdateFullRun() throws Exception { - initUntilBootCompleted(); - - runFullJob(mJobServiceForPostBoot, mJobParametersForPostBoot, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null); - } - - @Test - public void testPostBootUpdateFullRunWithPackageFailure() throws Exception { - mDexOptResultForPackageAAA = PackageDexOptimizer.DEX_OPT_FAILED; - - initUntilBootCompleted(); - - runFullJob(mJobServiceForPostBoot, mJobParametersForPostBoot, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_DEX_OPT_FAILED, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ PACKAGE_AAA); - - assertThat(getFailedPackageNamesPrimary()).containsExactly(PACKAGE_AAA); - assertThat(getFailedPackageNamesSecondary()).isEmpty(); - } - - @Test - public void testIdleJobFullRun() throws Exception { - initUntilBootCompleted(); - runFullJob(mJobServiceForPostBoot, mJobParametersForPostBoot, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null); - runFullJob(mJobServiceForIdle, mJobParametersForIdle, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null); - } - - @Test - public void testIdleJobFullRunWithFailureOnceAndSuccessAfterUpdate() throws Exception { - mDexOptResultForPackageAAA = PackageDexOptimizer.DEX_OPT_FAILED; - - initUntilBootCompleted(); - - runFullJob(mJobServiceForPostBoot, mJobParametersForPostBoot, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_DEX_OPT_FAILED, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ PACKAGE_AAA); - - assertThat(getFailedPackageNamesPrimary()).containsExactly(PACKAGE_AAA); - assertThat(getFailedPackageNamesSecondary()).isEmpty(); - - runFullJob(mJobServiceForIdle, mJobParametersForIdle, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ PACKAGE_AAA); - - assertThat(getFailedPackageNamesPrimary()).containsExactly(PACKAGE_AAA); - assertThat(getFailedPackageNamesSecondary()).isEmpty(); - - mService.notifyPackageChanged(PACKAGE_AAA); - - assertThat(getFailedPackageNamesPrimary()).isEmpty(); - assertThat(getFailedPackageNamesSecondary()).isEmpty(); - - // Succeed this time. - mDexOptResultForPackageAAA = PackageDexOptimizer.DEX_OPT_PERFORMED; - - runFullJob(mJobServiceForIdle, mJobParametersForIdle, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 2, /* expectedSkippedPackage= */ null); - - assertThat(getFailedPackageNamesPrimary()).isEmpty(); - assertThat(getFailedPackageNamesSecondary()).isEmpty(); - } - - @Test - public void testIdleJobFullRunWithFatalError() throws Exception { - initUntilBootCompleted(); - runFullJob(mJobServiceForPostBoot, mJobParametersForPostBoot, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null); - - doThrow(RuntimeException.class).when(mDexOptHelper).performDexOptWithStatus(any()); - - runFullJob(mJobServiceForIdle, mJobParametersForIdle, - /* expectedReschedule= */ false, /* expectedStatus= */ STATUS_FATAL_ERROR, - /* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null); - } - - @Test - public void testSystemReadyWhenDisabled() throws Exception { - when(mInjector.isBackgroundDexOptDisabled()).thenReturn(true); - - mService.systemReady(); - - verify(mContext, never()).registerReceiver(any(), any()); - } - - @Test - public void testStopByCancelFlag() throws Exception { - when(mInjector.createAndStartThread(any(), any())).thenReturn(Thread.currentThread()); - initUntilBootCompleted(); - - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - - ArgumentCaptor<Runnable> argDexOptThreadRunnable = ArgumentCaptor.forClass(Runnable.class); - verify(mInjector, atLeastOnce()).createAndStartThread(any(), - argDexOptThreadRunnable.capture()); - - // Stopping requires a separate thread - HandlerThread cancelThread = new HandlerThread("Stopping"); - cancelThread.start(); - when(mInjector.createAndStartThread(any(), any())).thenReturn(cancelThread); - - // Cancel - assertThat(mService.onStopJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - - // Capture Runnable for cancel - ArgumentCaptor<Runnable> argCancelThreadRunnable = ArgumentCaptor.forClass(Runnable.class); - verify(mInjector, atLeastOnce()).createAndStartThread(any(), - argCancelThreadRunnable.capture()); - - // Execute cancelling part - cancelThread.getThreadHandler().post(argCancelThreadRunnable.getValue()); - - verify(mDexOptHelper, timeout(TEST_WAIT_TIMEOUT_MS)).controlDexOptBlocking(true); - - // Dexopt thread run and cancelled - argDexOptThreadRunnable.getValue().run(); - - // Wait until cancellation Runnable is completed. - assertThat(cancelThread.getThreadHandler().runWithScissors( - argCancelThreadRunnable.getValue(), TEST_WAIT_TIMEOUT_MS)).isTrue(); - - // Now cancel completed - verify(mJobServiceForPostBoot).jobFinished(mJobParametersForPostBoot, true); - verifyLastControlDexOptBlockingCall(false); - } - - @Test - public void testPostUpdateCancelFirst() throws Exception { - initUntilBootCompleted(); - when(mInjector.createAndStartThread(any(), any())).thenAnswer( - i -> createAndStartExecutionThread(i.getArgument(0), i.getArgument(1))); - - // Start - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - // Cancel - assertThat(mService.onStopJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - - mCancelThread.runActualRunnable(); - - // Wait until cancel has set the flag. - verify(mDexOptHelper, timeout(TEST_WAIT_TIMEOUT_MS)).controlDexOptBlocking( - true); - - mDexOptThread.runActualRunnable(); - - // All threads should finish. - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - mCancelThread.join(TEST_WAIT_TIMEOUT_MS); - - // Retry later if post boot job was cancelled - verify(mJobServiceForPostBoot).jobFinished(mJobParametersForPostBoot, true); - verifyLastControlDexOptBlockingCall(false); - } - - @Test - public void testPostUpdateCancelLater() throws Exception { - initUntilBootCompleted(); - when(mInjector.createAndStartThread(any(), any())).thenAnswer( - i -> createAndStartExecutionThread(i.getArgument(0), i.getArgument(1))); - - // Start - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - // Cancel - assertThat(mService.onStopJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - - // Dexopt thread runs and finishes - mDexOptThread.runActualRunnable(); - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - - mCancelThread.runActualRunnable(); - mCancelThread.join(TEST_WAIT_TIMEOUT_MS); - - // Already completed before cancel, so no rescheduling. - verify(mJobServiceForPostBoot).jobFinished(mJobParametersForPostBoot, false); - verify(mDexOptHelper, never()).controlDexOptBlocking(true); - } - - @Test - public void testPeriodicJobCancelFirst() throws Exception { - initUntilBootCompleted(); - when(mInjector.createAndStartThread(any(), any())).thenAnswer( - i -> createAndStartExecutionThread(i.getArgument(0), i.getArgument(1))); - - // Start and finish post boot job - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - mDexOptThread.runActualRunnable(); - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - - // Start - assertThat(mService.onStartJob(mJobServiceForIdle, mJobParametersForIdle)).isTrue(); - // Cancel - assertThat(mService.onStopJob(mJobServiceForIdle, mJobParametersForIdle)).isTrue(); - - mCancelThread.runActualRunnable(); - - // Wait until cancel has set the flag. - verify(mDexOptHelper, timeout(TEST_WAIT_TIMEOUT_MS)).controlDexOptBlocking( - true); - - mDexOptThread.runActualRunnable(); - - // All threads should finish. - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - mCancelThread.join(TEST_WAIT_TIMEOUT_MS); - - // The job should be rescheduled. - verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, true /* wantsReschedule */); - verifyLastControlDexOptBlockingCall(false); - } - - @Test - public void testPeriodicJobCancelLater() throws Exception { - initUntilBootCompleted(); - when(mInjector.createAndStartThread(any(), any())).thenAnswer( - i -> createAndStartExecutionThread(i.getArgument(0), i.getArgument(1))); - - // Start and finish post boot job - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - mDexOptThread.runActualRunnable(); - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - - // Start - assertThat(mService.onStartJob(mJobServiceForIdle, mJobParametersForIdle)).isTrue(); - // Cancel - assertThat(mService.onStopJob(mJobServiceForIdle, mJobParametersForIdle)).isTrue(); - - // Dexopt thread finishes first. - mDexOptThread.runActualRunnable(); - mDexOptThread.join(TEST_WAIT_TIMEOUT_MS); - - mCancelThread.runActualRunnable(); - mCancelThread.join(TEST_WAIT_TIMEOUT_MS); - - // Always reschedule for periodic job - verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, false); - verify(mDexOptHelper, never()).controlDexOptBlocking(true); - } - - @Test - public void testStopByThermal() throws Exception { - when(mInjector.createAndStartThread(any(), any())).thenReturn(Thread.currentThread()); - initUntilBootCompleted(); - - assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isTrue(); - - ArgumentCaptor<Runnable> argThreadRunnable = ArgumentCaptor.forClass(Runnable.class); - verify(mInjector, atLeastOnce()).createAndStartThread(any(), argThreadRunnable.capture()); - - // Thermal cancel level - when(mInjector.getCurrentThermalStatus()).thenReturn(PowerManager.THERMAL_STATUS_CRITICAL); - - argThreadRunnable.getValue().run(); - - verify(mJobServiceForPostBoot).jobFinished(mJobParametersForPostBoot, true); - verifyLastControlDexOptBlockingCall(false); - } - - @Test - public void testRunShellCommandWithInvalidUid() { - // Test uid cannot execute the command APIs - assertThrows(SecurityException.class, () -> mService.runBackgroundDexoptJob(null)); - } - - @Test - public void testCancelShellCommandWithInvalidUid() { - // Test uid cannot execute the command APIs - assertThrows(SecurityException.class, () -> mService.cancelBackgroundDexoptJob()); - } - - @Test - public void testDisableJobSchedulerJobs() throws Exception { - when(mInjector.getCallingUid()).thenReturn(Process.SHELL_UID); - mService.setDisableJobSchedulerJobs(true); - assertThat(mService.onStartJob(mJobServiceForIdle, mJobParametersForIdle)).isFalse(); - verify(mDexOptHelper, never()).performDexOpt(any()); - verify(mDexOptHelper, never()).performDexOptWithStatus(any()); - } - - @Test - public void testSetDisableJobSchedulerJobsWithInvalidUid() { - // Test uid cannot execute the command APIs - assertThrows(SecurityException.class, () -> mService.setDisableJobSchedulerJobs(true)); - } - - private void initUntilBootCompleted() throws Exception { - ArgumentCaptor<BroadcastReceiver> argReceiver = ArgumentCaptor.forClass( - BroadcastReceiver.class); - ArgumentCaptor<IntentFilter> argIntentFilter = ArgumentCaptor.forClass(IntentFilter.class); - - mService.systemReady(); - - verify(mContext).registerReceiver(argReceiver.capture(), argIntentFilter.capture()); - assertThat(argIntentFilter.getValue().getAction(0)).isEqualTo(Intent.ACTION_BOOT_COMPLETED); - - argReceiver.getValue().onReceive(mContext, null); - - verify(mContext).unregisterReceiver(argReceiver.getValue()); - ArgumentCaptor<JobInfo> argJobs = ArgumentCaptor.forClass(JobInfo.class); - verify(mJobScheduler, times(2)).schedule(argJobs.capture()); - - List<Integer> expectedJobIds = Arrays.asList(BackgroundDexOptService.JOB_IDLE_OPTIMIZE, - BackgroundDexOptService.JOB_POST_BOOT_UPDATE); - List<Integer> jobIds = argJobs.getAllValues().stream().map(job -> job.getId()).collect( - Collectors.toList()); - assertThat(jobIds).containsExactlyElementsIn(expectedJobIds); - } - - private void verifyLastControlDexOptBlockingCall(boolean expected) throws Exception { - ArgumentCaptor<Boolean> argDexOptBlock = ArgumentCaptor.forClass(Boolean.class); - verify(mDexOptHelper, atLeastOnce()).controlDexOptBlocking(argDexOptBlock.capture()); - assertThat(argDexOptBlock.getValue()).isEqualTo(expected); - } - - private void runFullJob(BackgroundDexOptJobService jobService, JobParameters params, - boolean expectedReschedule, int expectedStatus, int totalJobFinishedWithParams, - @Nullable String expectedSkippedPackage) throws Exception { - when(mInjector.createAndStartThread(any(), any())).thenReturn(Thread.currentThread()); - addFullRunSequence(expectedSkippedPackage); - assertThat(mService.onStartJob(jobService, params)).isTrue(); - - ArgumentCaptor<Runnable> argThreadRunnable = ArgumentCaptor.forClass(Runnable.class); - verify(mInjector, atLeastOnce()).createAndStartThread(any(), argThreadRunnable.capture()); - - try { - argThreadRunnable.getValue().run(); - } catch (RuntimeException e) { - if (expectedStatus != STATUS_FATAL_ERROR) { - throw e; - } - } - - verify(jobService, times(totalJobFinishedWithParams)).jobFinished(params, - expectedReschedule); - // Never block - verify(mDexOptHelper, never()).controlDexOptBlocking(true); - if (expectedStatus != STATUS_FATAL_ERROR) { - verifyPerformDexOpt(); - } - assertThat(getLastExecutionStatus()).isEqualTo(expectedStatus); - } - - private void verifyPerformDexOpt() { - InOrder inOrder = inOrder(mDexOptHelper); - inOrder.verify(mDexOptHelper).getOptimizablePackages(any()); - for (DexOptInfo info : mDexInfoSequence) { - if (info.isPrimary) { - verify(mDexOptHelper).performDexOptWithStatus( - argThat((option) -> option.getPackageName().equals(info.packageName) - && !option.isDexoptOnlySecondaryDex())); - } else { - inOrder.verify(mDexOptHelper).performDexOpt( - argThat((option) -> option.getPackageName().equals(info.packageName) - && option.isDexoptOnlySecondaryDex())); - } - } - - // Even InOrder cannot check the order if the same call is made multiple times. - // To check the order across multiple runs, we reset the mock so that order can be checked - // in each call. - mDexInfoSequence.clear(); - reset(mDexOptHelper); - setupDexOptHelper(); - } - - private String findDumpValueForKey(String key) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(out, true); - IndentingPrintWriter writer = new IndentingPrintWriter(pw, ""); - try { - mService.dump(writer); - writer.flush(); - Log.i(TAG, "dump output:" + out.toString()); - for (String line : out.toString().split(System.lineSeparator())) { - String[] vals = line.split(":"); - if (vals[0].equals(key)) { - if (vals.length == 2) { - return vals[1].strip(); - } else { - break; - } - } - } - return ""; - } finally { - writer.close(); - } - } - - List<String> findStringListFromDump(String key) { - String values = findDumpValueForKey(key); - if (values.isEmpty()) { - return Collections.emptyList(); - } - return Arrays.asList(values.split(",")); - } - - private List<String> getFailedPackageNamesPrimary() { - return findStringListFromDump("mFailedPackageNamesPrimary"); - } - - private List<String> getFailedPackageNamesSecondary() { - return findStringListFromDump("mFailedPackageNamesSecondary"); - } - - private int getLastExecutionStatus() { - return Integer.parseInt(findDumpValueForKey("mLastExecutionStatus")); - } - - private static class DexOptInfo { - public final String packageName; - public final boolean isPrimary; - - private DexOptInfo(String packageName, boolean isPrimary) { - this.packageName = packageName; - this.isPrimary = isPrimary; - } - } - - private void addFullRunSequence(@Nullable String expectedSkippedPackage) { - for (String packageName : DEFAULT_PACKAGE_LIST) { - if (packageName.equals(expectedSkippedPackage)) { - // only fails primary dexopt in mocking but add secodary - mDexInfoSequence.add(new DexOptInfo(packageName, /* isPrimary= */ false)); - } else { - mDexInfoSequence.add(new DexOptInfo(packageName, /* isPrimary= */ true)); - mDexInfoSequence.add(new DexOptInfo(packageName, /* isPrimary= */ false)); - } - } - } - - private static class StartAndWaitThread extends Thread { - private final Runnable mActualRunnable; - private final CountDownLatch mLatch = new CountDownLatch(1); - - private StartAndWaitThread(String name, Runnable runnable) { - super(name); - mActualRunnable = runnable; - } - - private void runActualRunnable() { - mLatch.countDown(); - } - - @Override - public void run() { - // Thread is started but does not run actual code. This is for controlling the execution - // order while still meeting Thread.isAlive() check. - try { - mLatch.await(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - mActualRunnable.run(); - } - } - - private Thread createAndStartExecutionThread(String name, Runnable runnable) { - final boolean isDexOptThread = !name.equals("DexOptCancel"); - StartAndWaitThread thread = new StartAndWaitThread(name, runnable); - if (isDexOptThread) { - mDexOptThread = thread; - } else { - mCancelThread = thread; - } - thread.start(); - return thread; - } -} diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 37967fa86b0f..65986ea063fe 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -62,6 +62,7 @@ android_test { "cts-wm-util", "platform-compat-test-rules", "mockito-target-minus-junit4", + "mockito-kotlin2", "platform-test-annotations", "ShortcutManagerTestUtils", "truth", 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 b2ecea1b0302..53c460c44354 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -50,9 +50,11 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.IAccessibilityServiceClient; import android.app.PendingIntent; import android.app.RemoteAction; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -67,6 +69,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.LocaleList; import android.os.UserHandle; +import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; @@ -74,6 +77,7 @@ import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.testing.TestableContext; import android.testing.TestableLooper; +import android.util.ArrayMap; import android.util.ArraySet; import android.view.Display; import android.view.DisplayAdjustments; @@ -123,6 +127,7 @@ import org.mockito.stubbing.Answer; import java.util.ArrayList; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -1464,6 +1469,52 @@ public class AccessibilityManagerServiceTest { AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME.flattenToString()); } + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT) + public void restoreAccessibilityQsTargets_a11yQsTargetsRestored() { + String daltonizerTile = + AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME.flattenToString(); + String colorInversionTile = + AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME.flattenToString(); + final AccessibilityUserState userState = new AccessibilityUserState( + UserHandle.USER_SYSTEM, mTestableContext, mA11yms); + userState.updateA11yQsTargetLocked(Set.of(daltonizerTile)); + mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + + Intent intent = new Intent(Intent.ACTION_SETTING_RESTORED) + .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY) + .putExtra(Intent.EXTRA_SETTING_NAME, Settings.Secure.ACCESSIBILITY_QS_TARGETS) + .putExtra(Intent.EXTRA_SETTING_NEW_VALUE, colorInversionTile); + sendBroadcastToAccessibilityManagerService(intent); + mTestableLooper.processAllMessages(); + + assertThat(mA11yms.mUserStates.get(UserHandle.USER_SYSTEM).getA11yQsTargets()) + .containsExactlyElementsIn(Set.of(daltonizerTile, colorInversionTile)); + } + + @Test + @RequiresFlagsDisabled(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT) + public void restoreAccessibilityQsTargets_a11yQsTargetsNotRestored() { + String daltonizerTile = + AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME.flattenToString(); + String colorInversionTile = + AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME.flattenToString(); + final AccessibilityUserState userState = new AccessibilityUserState( + UserHandle.USER_SYSTEM, mTestableContext, mA11yms); + userState.updateA11yQsTargetLocked(Set.of(daltonizerTile)); + mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + + Intent intent = new Intent(Intent.ACTION_SETTING_RESTORED) + .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY) + .putExtra(Intent.EXTRA_SETTING_NAME, Settings.Secure.ACCESSIBILITY_QS_TARGETS) + .putExtra(Intent.EXTRA_SETTING_NEW_VALUE, colorInversionTile); + sendBroadcastToAccessibilityManagerService(intent); + mTestableLooper.processAllMessages(); + + assertThat(userState.getA11yQsTargets()) + .containsExactlyElementsIn(Set.of(daltonizerTile)); + } + private static AccessibilityServiceInfo mockAccessibilityServiceInfo( ComponentName componentName) { return mockAccessibilityServiceInfo( @@ -1542,6 +1593,14 @@ public class AccessibilityManagerServiceTest { mA11yms.getCurrentUserState().updateTileServiceMapForAccessibilityServiceLocked(); } + private void sendBroadcastToAccessibilityManagerService(Intent intent) { + if (!mTestableContext.getBroadcastReceivers().containsKey(intent.getAction())) { + return; + } + mTestableContext.getBroadcastReceivers().get(intent.getAction()).forEach( + broadcastReceiver -> broadcastReceiver.onReceive(mTestableContext, intent)); + } + public static class FakeInputFilter extends AccessibilityInputFilter { FakeInputFilter(Context context, AccessibilityManagerService service) { @@ -1552,6 +1611,7 @@ public class AccessibilityManagerServiceTest { private static class A11yTestableContext extends TestableContext { private final Context mMockContext; + private final Map<String, List<BroadcastReceiver>> mBroadcastReceivers = new ArrayMap<>(); A11yTestableContext(Context base) { super(base); @@ -1563,8 +1623,29 @@ public class AccessibilityManagerServiceTest { mMockContext.startActivityAsUser(intent, options, user); } + @Override + public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, + IntentFilter filter, String broadcastPermission, Handler scheduler) { + Iterator<String> actions = filter.actionsIterator(); + if (actions != null) { + while (actions.hasNext()) { + String action = actions.next(); + List<BroadcastReceiver> actionReceivers = + mBroadcastReceivers.getOrDefault(action, new ArrayList<>()); + actionReceivers.add(receiver); + mBroadcastReceivers.put(action, actionReceivers); + } + } + return super.registerReceiverAsUser( + receiver, user, filter, broadcastPermission, scheduler); + } + Context getMockContext() { return mMockContext; } + + Map<String, List<BroadcastReceiver>> getBroadcastReceivers() { + return mBroadcastReceivers; + } } } diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java index 7891661f6338..643dcec27bfd 100644 --- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java @@ -111,6 +111,8 @@ import com.android.server.pm.UserTypeFactory; import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerService; +import com.google.common.collect.Range; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -155,6 +157,7 @@ public class UserControllerTest { private UserController mUserController; private TestInjector mInjector; private final HashMap<Integer, UserState> mUserStates = new HashMap<>(); + private final HashMap<Integer, UserInfo> mUserInfos = new HashMap<>(); private final KeyEvictedCallback mKeyEvictedCallback = (userId) -> { /* ignore */ }; @@ -587,25 +590,25 @@ public class UserControllerTest { setUpUser(TEST_USER_ID1, 0); setUpUser(TEST_USER_ID2, 0); - int numerOfUserSwitches = 1; + int numberOfUserSwitches = 1; addForegroundUserAndContinueUserSwitch(TEST_USER_ID, UserHandle.USER_SYSTEM, - numerOfUserSwitches, false); + numberOfUserSwitches, false); // running: user 0, USER_ID assertTrue(mUserController.canStartMoreUsers()); assertEquals(Arrays.asList(new Integer[] {0, TEST_USER_ID}), mUserController.getRunningUsersLU()); - numerOfUserSwitches++; + numberOfUserSwitches++; addForegroundUserAndContinueUserSwitch(TEST_USER_ID1, TEST_USER_ID, - numerOfUserSwitches, false); + numberOfUserSwitches, false); // running: user 0, USER_ID, USER_ID1 assertFalse(mUserController.canStartMoreUsers()); assertEquals(Arrays.asList(new Integer[] {0, TEST_USER_ID, TEST_USER_ID1}), mUserController.getRunningUsersLU()); - numerOfUserSwitches++; + numberOfUserSwitches++; addForegroundUserAndContinueUserSwitch(TEST_USER_ID2, TEST_USER_ID1, - numerOfUserSwitches, false); + numberOfUserSwitches, false); UserState ussUser2 = mUserStates.get(TEST_USER_ID2); // skip middle step and call this directly. mUserController.finishUserSwitch(ussUser2); @@ -631,20 +634,20 @@ public class UserControllerTest { setUpUser(TEST_USER_ID1, 0); setUpUser(TEST_USER_ID2, 0); - int numerOfUserSwitches = 1; + int numberOfUserSwitches = 1; addForegroundUserAndContinueUserSwitch(TEST_USER_ID, UserHandle.USER_SYSTEM, - numerOfUserSwitches, false); + numberOfUserSwitches, false); // running: user 0, USER_ID assertTrue(mUserController.canStartMoreUsers()); assertEquals(Arrays.asList(new Integer[] {0, TEST_USER_ID}), mUserController.getRunningUsersLU()); - numerOfUserSwitches++; + numberOfUserSwitches++; addForegroundUserAndContinueUserSwitch(TEST_USER_ID1, TEST_USER_ID, - numerOfUserSwitches, true); + numberOfUserSwitches, true); // running: user 0, USER_ID1 // stopped + unlocked: USER_ID - numerOfUserSwitches++; + numberOfUserSwitches++; assertTrue(mUserController.canStartMoreUsers()); assertEquals(Arrays.asList(new Integer[] {0, TEST_USER_ID1}), mUserController.getRunningUsersLU()); @@ -659,7 +662,7 @@ public class UserControllerTest { .lockCeStorage(anyInt()); addForegroundUserAndContinueUserSwitch(TEST_USER_ID2, TEST_USER_ID1, - numerOfUserSwitches, true); + numberOfUserSwitches, true); // running: user 0, USER_ID2 // stopped + unlocked: USER_ID1 // stopped + locked: USER_ID @@ -675,6 +678,105 @@ public class UserControllerTest { } /** + * Test that, in getRunningUsersLU, parents come after their profile, even if the profile was + * started afterwards. + */ + @Test + public void testRunningUsersListOrder_parentAfterProfile() { + mUserController.setInitialConfig(/* userSwitchUiEnabled= */ true, + /* maxRunningUsers= */ 7, /* delayUserDataLocking= */ false); + + final int PARENT_ID = 200; + final int PROFILE1_ID = 201; + final int PROFILE2_ID = 202; + final int FG_USER_ID = 300; + final int BG_USER_ID = 400; + + setUpUser(PARENT_ID, 0).profileGroupId = PARENT_ID; + setUpUser(PROFILE1_ID, UserInfo.FLAG_PROFILE).profileGroupId = PARENT_ID; + setUpUser(PROFILE2_ID, UserInfo.FLAG_PROFILE).profileGroupId = PARENT_ID; + setUpUser(FG_USER_ID, 0).profileGroupId = FG_USER_ID; + setUpUser(BG_USER_ID, 0).profileGroupId = UserInfo.NO_PROFILE_GROUP_ID; + mUserController.onSystemReady(); // To set the profileGroupIds in UserController. + + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID}), + mUserController.getRunningUsersLU()); + + int numberOfUserSwitches = 1; + addForegroundUserAndContinueUserSwitch(PARENT_ID, UserHandle.USER_SYSTEM, + numberOfUserSwitches, false); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, PARENT_ID}), + mUserController.getRunningUsersLU()); + + assertThat(mUserController.startProfile(PROFILE1_ID, true, null)).isTrue(); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, PROFILE1_ID, PARENT_ID}), + mUserController.getRunningUsersLU()); + + numberOfUserSwitches++; + addForegroundUserAndContinueUserSwitch(FG_USER_ID, PARENT_ID, + numberOfUserSwitches, false); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, PROFILE1_ID, PARENT_ID, FG_USER_ID}), + mUserController.getRunningUsersLU()); + + mUserController.startUser(BG_USER_ID, USER_START_MODE_BACKGROUND); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, PROFILE1_ID, PARENT_ID, BG_USER_ID, FG_USER_ID}), + mUserController.getRunningUsersLU()); + + assertThat(mUserController.startProfile(PROFILE2_ID, true, null)).isTrue(); + // Note for the future: + // It is not absolutely essential that PROFILE1 come before PROFILE2, + // nor that PROFILE1 come before BG_USER. We can change that policy later if we'd like. + // The important thing is that PROFILE1 and PROFILE2 precede PARENT, + // and that everything precedes OTHER. + assertEquals(Arrays.asList(new Integer[] { + SYSTEM_USER_ID, PROFILE1_ID, BG_USER_ID, PROFILE2_ID, PARENT_ID, FG_USER_ID}), + mUserController.getRunningUsersLU()); + } + + /** + * Test that, in getRunningUsersLU, the current user is always at the end, even if background + * users were started subsequently. + */ + @Test + public void testRunningUsersListOrder_currentAtEnd() { + mUserController.setInitialConfig(/* userSwitchUiEnabled= */ true, + /* maxRunningUsers= */ 7, /* delayUserDataLocking= */ false); + + final int CURRENT_ID = 200; + final int PROFILE_ID = 201; + final int BG_USER_ID = 400; + + setUpUser(CURRENT_ID, 0).profileGroupId = CURRENT_ID; + setUpUser(PROFILE_ID, UserInfo.FLAG_PROFILE).profileGroupId = CURRENT_ID; + setUpUser(BG_USER_ID, 0).profileGroupId = BG_USER_ID; + mUserController.onSystemReady(); // To set the profileGroupIds in UserController. + + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID}), + mUserController.getRunningUsersLU()); + + addForegroundUserAndContinueUserSwitch(CURRENT_ID, UserHandle.USER_SYSTEM, 1, false); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, CURRENT_ID}), + mUserController.getRunningUsersLU()); + + mUserController.startUser(BG_USER_ID, USER_START_MODE_BACKGROUND); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, BG_USER_ID, CURRENT_ID}), + mUserController.getRunningUsersLU()); + + assertThat(mUserController.startProfile(PROFILE_ID, true, null)).isTrue(); + assertEquals(Arrays.asList( + new Integer[] {SYSTEM_USER_ID, BG_USER_ID, PROFILE_ID, CURRENT_ID}), + mUserController.getRunningUsersLU()); + } + + /** * Test locking user with mDelayUserDataLocking false. */ @Test @@ -785,6 +887,52 @@ public class UserControllerTest { verifyUserUnassignedFromDisplayNeverCalled(TEST_USER_ID); } + /** Test that stopping a profile doesn't also stop its parent, even if it's in background. */ + @Test + public void testStopProfile_doesNotStopItsParent() throws Exception { + mUserController.setInitialConfig(/* userSwitchUiEnabled= */ true, + /* maxRunningUsers= */ 5, /* delayUserDataLocking= */ false); + + final Range<Integer> RUNNING_RANGE = + Range.closed(UserState.STATE_BOOTING, UserState.STATE_RUNNING_UNLOCKED); + + final int PARENT_ID = TEST_USER_ID1; + final int PROFILE_ID = TEST_USER_ID2; + final int OTHER_ID = TEST_USER_ID3; + + setUpUser(PARENT_ID, 0).profileGroupId = PARENT_ID; + setUpUser(PROFILE_ID, UserInfo.FLAG_PROFILE).profileGroupId = PARENT_ID; + setUpUser(OTHER_ID, 0).profileGroupId = OTHER_ID; + mUserController.onSystemReady(); // To set the profileGroupIds in UserController. + + // Start the parent in the background + boolean started = mUserController.startUser(PARENT_ID, USER_START_MODE_BACKGROUND); + assertWithMessage("startUser(%s)", PARENT_ID).that(started).isTrue(); + assertThat(mUserController.getStartedUserState(PARENT_ID).state).isIn(RUNNING_RANGE); + + // Start the profile + started = mUserController.startProfile(PROFILE_ID, true, null); + assertWithMessage("startProfile(%s)", PROFILE_ID).that(started).isTrue(); + assertThat(mUserController.getStartedUserState(PARENT_ID).state).isIn(RUNNING_RANGE); + assertThat(mUserController.getStartedUserState(PROFILE_ID).state).isIn(RUNNING_RANGE); + + // Start an unrelated user + started = mUserController.startUser(OTHER_ID, USER_START_MODE_FOREGROUND); + assertWithMessage("startUser(%s)", OTHER_ID).that(started).isTrue(); + assertThat(mUserController.getStartedUserState(PARENT_ID).state).isIn(RUNNING_RANGE); + assertThat(mUserController.getStartedUserState(PROFILE_ID).state).isIn(RUNNING_RANGE); + assertThat(mUserController.getStartedUserState(OTHER_ID).state).isIn(RUNNING_RANGE); + + // Stop the profile and assert that its (background) parent didn't stop too + boolean stopped = mUserController.stopProfile(PROFILE_ID); + assertWithMessage("stopProfile(%s)", PROFILE_ID).that(stopped).isTrue(); + if (mUserController.getStartedUserState(PROFILE_ID) != null) { + assertThat(mUserController.getStartedUserState(PROFILE_ID).state) + .isNotIn(RUNNING_RANGE); + } + assertThat(mUserController.getStartedUserState(PARENT_ID).state).isIn(RUNNING_RANGE); + } + @Test public void testStartProfile_disabledProfileFails() { setUpUser(TEST_USER_ID1, UserInfo.FLAG_PROFILE | UserInfo.FLAG_DISABLED, /* preCreated= */ @@ -1152,11 +1300,11 @@ public class UserControllerTest { continueUserSwitchAssertions(oldUserId, newUserId, expectOldUserStopping); } - private void setUpUser(@UserIdInt int userId, @UserInfoFlag int flags) { - setUpUser(userId, flags, /* preCreated= */ false, /* userType */ null); + private UserInfo setUpUser(@UserIdInt int userId, @UserInfoFlag int flags) { + return setUpUser(userId, flags, /* preCreated= */ false, /* userType */ null); } - private void setUpUser(@UserIdInt int userId, @UserInfoFlag int flags, boolean preCreated, + private UserInfo setUpUser(@UserIdInt int userId, @UserInfoFlag int flags, boolean preCreated, @Nullable String userType) { if (userType == null) { userType = UserInfo.getDefaultUserType(flags); @@ -1171,6 +1319,12 @@ public class UserControllerTest { assertThat(userTypeDetails).isNotNull(); when(mInjector.mUserManagerInternalMock.getUserProperties(eq(userId))) .thenReturn(userTypeDetails.getDefaultUserPropertiesReference()); + + mUserInfos.put(userId, userInfo); + when(mInjector.mUserManagerMock.getUsers(anyBoolean())) + .thenReturn(mUserInfos.values().stream().toList()); + + return userInfo; } private static List<String> getActions(List<Intent> intents) { diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java index 4f6fc3dc1f93..0a696ef44897 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java @@ -47,7 +47,7 @@ import android.view.inputmethod.InputMethodInfo; import androidx.annotation.NonNull; import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.internal.R; @@ -67,9 +67,7 @@ import java.util.Set; /** * Run this test with: - * * {@code atest FrameworksServicesTests:com.android.server.devicepolicy.OwnersTest} - * */ @RunWith(AndroidJUnit4.class) public class OverlayPackagesProviderTest { @@ -87,8 +85,8 @@ public class OverlayPackagesProviderTest { private FakePackageManager mPackageManager; private String[] mSystemAppsWithLauncher; - private Set<String> mRegularMainlineModules = new HashSet<>(); - private Map<String, String> mMainlineModuleToDeclaredMetadataMap = new HashMap<>(); + private final Set<String> mRegularMainlineModules = new HashSet<>(); + private final Map<String, String> mMainlineModuleToDeclaredMetadataMap = new HashMap<>(); private OverlayPackagesProvider mHelper; @Before @@ -115,7 +113,8 @@ public class OverlayPackagesProviderTest { setVendorDisallowedAppsManagedUser(); mRealResources = InstrumentationRegistry.getTargetContext().getResources(); - mHelper = new OverlayPackagesProvider(mTestContext, mInjector); + mHelper = new OverlayPackagesProvider(mTestContext, mInjector, + new RecursiveStringArrayResourceResolver(mResources)); } @Test @@ -213,7 +212,7 @@ public class OverlayPackagesProviderTest { } /** - * @see {@link #testAllowedAndDisallowedAtTheSameTimeManagedDevice} + * @see #testAllowedAndDisallowedAtTheSameTimeManagedDevice */ @Test public void testAllowedAndDisallowedAtTheSameTimeManagedUser() { @@ -224,7 +223,7 @@ public class OverlayPackagesProviderTest { } /** - * @see {@link #testAllowedAndDisallowedAtTheSameTimeManagedDevice} + * @see #testAllowedAndDisallowedAtTheSameTimeManagedDevice */ @Test public void testAllowedAndDisallowedAtTheSameTimeManagedProfile() { @@ -447,7 +446,7 @@ public class OverlayPackagesProviderTest { } private void setSystemInputMethods(String... packageNames) { - List<InputMethodInfo> inputMethods = new ArrayList<InputMethodInfo>(); + List<InputMethodInfo> inputMethods = new ArrayList<>(); for (String packageName : packageNames) { ApplicationInfo aInfo = new ApplicationInfo(); aInfo.flags = ApplicationInfo.FLAG_SYSTEM; @@ -467,6 +466,7 @@ public class OverlayPackagesProviderTest { mSystemAppsWithLauncher = apps; } + @SafeVarargs private <T> Set<T> setFromArray(T... array) { if (array == null) { return null; @@ -475,6 +475,7 @@ public class OverlayPackagesProviderTest { } class FakePackageManager extends MockPackageManager { + @NonNull @Override public List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent, int flags, int userId) { assertWithMessage("Expected an intent with action ACTION_MAIN") diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/RecursiveStringArrayResourceResolverTest.kt b/services/tests/servicestests/src/com/android/server/devicepolicy/RecursiveStringArrayResourceResolverTest.kt new file mode 100644 index 000000000000..647f6c78f29f --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/RecursiveStringArrayResourceResolverTest.kt @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2024 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.server.devicepolicy + +import android.annotation.ArrayRes +import android.content.res.Resources +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.google.common.truth.Truth.assertWithMessage +import com.google.errorprone.annotations.CanIgnoreReturnValue +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + + +/** + * Run this test with: + * `atest FrameworksServicesTests:com.android.server.devicepolicy.RecursiveStringArrayResourceResolverTest` + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class RecursiveStringArrayResourceResolverTest { + private companion object { + const val PACKAGE = "com.android.test" + const val ROOT_RESOURCE = "my_root_resource" + const val SUB_RESOURCE = "my_sub_resource" + const val EXTERNAL_PACKAGE = "com.external.test" + const val EXTERNAL_RESOURCE = "my_external_resource" + } + + private val mResources = mock<Resources>() + private val mTarget = RecursiveStringArrayResourceResolver(mResources) + + /** + * Mocks [Resources.getIdentifier] and [Resources.getStringArray] to return [values] and reference under a generated ID. + * @receiver mocked [Resources] container to configure + * @param pkg package name to "contain" mocked resource + * @param name mocked resource name + * @param values string-array resource values to return when mock is queried + * @return generated resource ID + */ + @ArrayRes + @CanIgnoreReturnValue + private fun Resources.mockStringArrayResource(pkg: String, name: String, vararg values: String): Int { + val anId = (pkg + name).hashCode() + println("Mocking Resources::getIdentifier(name=\"$name\", defType=\"array\", defPackage=\"$pkg\") -> $anId") + whenever(getIdentifier(eq(name), eq("array"), eq(pkg))).thenReturn(anId) + println("Mocking Resources::getStringArray(id=$anId) -> ${values.asList()}") + whenever(getStringArray(eq(anId))).thenReturn(values) + return anId + } + + @Test + fun testCanResolveTheArrayWithoutImports() { + val values = arrayOf("app.a", "app.b") + val mockId = mResources.mockStringArrayResource(pkg = PACKAGE, name = ROOT_RESOURCE, values = values) + + val actual = mTarget.resolve(/* pkg= */ PACKAGE, /* rootId = */ mockId) + + assertWithMessage("Values are resolved correctly") + .that(actual).containsExactlyElementsIn(values) + } + + @Test + fun testCanResolveTheArrayWithImports() { + val externalValues = arrayOf("ext.a", "ext.b", "#import:$PACKAGE/$SUB_RESOURCE") + mResources.mockStringArrayResource(pkg = EXTERNAL_PACKAGE, name = EXTERNAL_RESOURCE, values = externalValues) + val subValues = arrayOf("sub.a", "sub.b") + mResources.mockStringArrayResource(pkg = PACKAGE, name = SUB_RESOURCE, values = subValues) + val values = arrayOf("app.a", "#import:./$SUB_RESOURCE", "app.b", "#import:$EXTERNAL_PACKAGE/$EXTERNAL_RESOURCE", "app.c") + val mockId = mResources.mockStringArrayResource(pkg = PACKAGE, name = ROOT_RESOURCE, values = values) + + val actual = mTarget.resolve(/* pkg= */ PACKAGE, /* rootId= */ mockId) + + assertWithMessage("Values are resolved correctly") + .that(actual).containsExactlyElementsIn((externalValues + subValues + values) + .filterNot { it.startsWith("#import:") } + .toSet()) + } +} diff --git a/services/tests/servicestests/src/com/android/server/power/hint/HintManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/hint/HintManagerServiceTest.java index 66599e9e9125..510e7c42f12d 100644 --- a/services/tests/servicestests/src/com/android/server/power/hint/HintManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/hint/HintManagerServiceTest.java @@ -17,6 +17,8 @@ package com.android.server.power.hint; +import static com.android.server.power.hint.HintManagerService.CLEAN_UP_UID_DELAY_MILLIS; + import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertArrayEquals; @@ -45,6 +47,9 @@ import android.os.IBinder; import android.os.IHintSession; import android.os.PerformanceHintManager; import android.os.Process; +import android.platform.test.annotations.RequiresFlagsEnabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.util.Log; import com.android.server.FgThread; @@ -54,11 +59,13 @@ import com.android.server.power.hint.HintManagerService.Injector; import com.android.server.power.hint.HintManagerService.NativeWrapper; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -71,7 +78,7 @@ import java.util.concurrent.locks.LockSupport; * Tests for {@link com.android.server.power.hint.HintManagerService}. * * Build/Install/Run: - * atest FrameworksServicesTests:HintManagerServiceTest + * atest FrameworksServicesTests:HintManagerServiceTest */ public class HintManagerServiceTest { private static final String TAG = "HintManagerServiceTest"; @@ -110,9 +117,15 @@ public class HintManagerServiceTest { makeWorkDuration(2L, 13L, 2L, 8L, 0L), }; - @Mock private Context mContext; - @Mock private HintManagerService.NativeWrapper mNativeWrapperMock; - @Mock private ActivityManagerInternal mAmInternalMock; + @Mock + private Context mContext; + @Mock + private HintManagerService.NativeWrapper mNativeWrapperMock; + @Mock + private ActivityManagerInternal mAmInternalMock; + @Rule + public final CheckFlagsRule mCheckFlagsRule = + DeviceFlagsValueProvider.createCheckFlagsRule(); private HintManagerService mService; @@ -122,12 +135,11 @@ public class HintManagerServiceTest { when(mNativeWrapperMock.halGetHintSessionPreferredRate()) .thenReturn(DEFAULT_HINT_PREFERRED_RATE); when(mNativeWrapperMock.halCreateHintSession(eq(TGID), eq(UID), eq(SESSION_TIDS_A), - eq(DEFAULT_TARGET_DURATION))).thenReturn(1L); + eq(DEFAULT_TARGET_DURATION))).thenReturn(1L); when(mNativeWrapperMock.halCreateHintSession(eq(TGID), eq(UID), eq(SESSION_TIDS_B), - eq(DEFAULT_TARGET_DURATION))).thenReturn(2L); + eq(DEFAULT_TARGET_DURATION))).thenReturn(2L); when(mNativeWrapperMock.halCreateHintSession(eq(TGID), eq(UID), eq(SESSION_TIDS_C), - eq(0L))).thenReturn(1L); - when(mAmInternalMock.getIsolatedProcesses(anyInt())).thenReturn(null); + eq(0L))).thenReturn(1L); LocalServices.removeServiceForTest(ActivityManagerInternal.class); LocalServices.addService(ActivityManagerInternal.class, mAmInternalMock); } @@ -434,6 +446,163 @@ public class HintManagerServiceTest { } @Test + @RequiresFlagsEnabled(Flags.FLAG_POWERHINT_THREAD_CLEANUP) + public void testCleanupDeadThreads() throws Exception { + HintManagerService service = createService(); + IBinder token = new Binder(); + CountDownLatch stopLatch1 = new CountDownLatch(1); + int threadCount = 3; + int[] tids1 = createThreads(threadCount, stopLatch1); + long sessionPtr1 = 111; + when(mNativeWrapperMock.halCreateHintSession(eq(TGID), eq(UID), eq(tids1), + eq(DEFAULT_TARGET_DURATION))).thenReturn(sessionPtr1); + AppHintSession session1 = (AppHintSession) service.getBinderServiceInstance() + .createHintSession(token, tids1, DEFAULT_TARGET_DURATION); + assertNotNull(session1); + + // for test only to avoid conflicting with any real thread that exists on device + int isoProc1 = -100; + int isoProc2 = 9999; + when(mAmInternalMock.getIsolatedProcesses(eq(UID))).thenReturn(List.of(0)); + + CountDownLatch stopLatch2 = new CountDownLatch(1); + int[] tids2 = createThreads(threadCount, stopLatch2); + int[] tids2WithIsolated = Arrays.copyOf(tids2, tids2.length + 2); + int[] expectedTids2 = Arrays.copyOf(tids2, tids2.length + 1); + expectedTids2[tids2.length] = isoProc1; + tids2WithIsolated[threadCount] = isoProc1; + tids2WithIsolated[threadCount + 1] = isoProc2; + long sessionPtr2 = 222; + when(mNativeWrapperMock.halCreateHintSession(eq(TGID), eq(UID), eq(tids2WithIsolated), + eq(DEFAULT_TARGET_DURATION))).thenReturn(sessionPtr2); + AppHintSession session2 = (AppHintSession) service.getBinderServiceInstance() + .createHintSession(token, tids2WithIsolated, DEFAULT_TARGET_DURATION); + assertNotNull(session2); + + // trigger clean up through UID state change by making the process background + service.mUidObserver.onUidStateChanged(UID, + ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND, 0, 0); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500) + TimeUnit.MILLISECONDS.toNanos( + CLEAN_UP_UID_DELAY_MILLIS)); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr1), any()); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr2), any()); + // the new TIDs pending list should be updated + assertArrayEquals(session2.getTidsInternal(), expectedTids2); + reset(mNativeWrapperMock); + + // this should resume and update the threads so those never-existed invalid isolated + // processes should be cleaned up + service.mUidObserver.onUidStateChanged(UID, + ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND, 0, 0); + // wait for the async uid state change to trigger resume and setThreads + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500)); + verify(mNativeWrapperMock, times(1)).halSetThreads(eq(sessionPtr2), eq(expectedTids2)); + reset(mNativeWrapperMock); + + // let all session 1 threads to exit and the cleanup should force pause the session + stopLatch1.countDown(); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(100)); + service.mUidObserver.onUidStateChanged(UID, + ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND, 0, 0); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500) + TimeUnit.MILLISECONDS.toNanos( + CLEAN_UP_UID_DELAY_MILLIS)); + verify(mNativeWrapperMock, times(1)).halPauseHintSession(eq(sessionPtr1)); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr1), any()); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr2), any()); + // all hints will have no effect as the session is force paused while proc in foreground + verifyAllHintsEnabled(session1, false); + verifyAllHintsEnabled(session2, true); + reset(mNativeWrapperMock); + + // in foreground, set new tids for session 1 then it should be resumed and all hints allowed + stopLatch1 = new CountDownLatch(1); + tids1 = createThreads(threadCount, stopLatch1); + session1.setThreads(tids1); + verify(mNativeWrapperMock, times(1)).halSetThreads(eq(sessionPtr1), eq(tids1)); + verify(mNativeWrapperMock, times(1)).halResumeHintSession(eq(sessionPtr1)); + verifyAllHintsEnabled(session1, true); + reset(mNativeWrapperMock); + + // let all session 1 and 2 non isolated threads to exit + stopLatch1.countDown(); + stopLatch2.countDown(); + expectedTids2 = new int[]{isoProc1}; + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(100)); + service.mUidObserver.onUidStateChanged(UID, + ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND, 0, 0); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500) + TimeUnit.MILLISECONDS.toNanos( + CLEAN_UP_UID_DELAY_MILLIS)); + verify(mNativeWrapperMock, times(1)).halPauseHintSession(eq(sessionPtr1)); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr1), any()); + verify(mNativeWrapperMock, never()).halSetThreads(eq(sessionPtr2), any()); + // in background, set threads for session 1 then it should not be force paused next time + session1.setThreads(SESSION_TIDS_A); + // the new TIDs pending list should be updated + assertArrayEquals(session1.getTidsInternal(), SESSION_TIDS_A); + assertArrayEquals(session2.getTidsInternal(), expectedTids2); + verifyAllHintsEnabled(session1, false); + verifyAllHintsEnabled(session2, false); + reset(mNativeWrapperMock); + + service.mUidObserver.onUidStateChanged(UID, + ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND, 0, 0); + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500) + TimeUnit.MILLISECONDS.toNanos( + CLEAN_UP_UID_DELAY_MILLIS)); + verify(mNativeWrapperMock, times(1)).halSetThreads(eq(sessionPtr1), + eq(SESSION_TIDS_A)); + verify(mNativeWrapperMock, times(1)).halSetThreads(eq(sessionPtr2), + eq(expectedTids2)); + verifyAllHintsEnabled(session1, true); + verifyAllHintsEnabled(session2, true); + } + + private void verifyAllHintsEnabled(AppHintSession session, boolean verifyEnabled) { + session.reportActualWorkDuration2(new WorkDuration[]{makeWorkDuration(1, 3, 2, 1, 1000)}); + session.reportActualWorkDuration(new long[]{1}, new long[]{2}); + session.updateTargetWorkDuration(3); + session.setMode(0, true); + session.sendHint(1); + if (verifyEnabled) { + verify(mNativeWrapperMock, times(1)).halReportActualWorkDuration( + eq(session.mHalSessionPtr), any()); + verify(mNativeWrapperMock, times(1)).halSetMode(eq(session.mHalSessionPtr), anyInt(), + anyBoolean()); + verify(mNativeWrapperMock, times(1)).halUpdateTargetWorkDuration( + eq(session.mHalSessionPtr), anyLong()); + verify(mNativeWrapperMock, times(1)).halSendHint(eq(session.mHalSessionPtr), anyInt()); + } else { + verify(mNativeWrapperMock, never()).halReportActualWorkDuration( + eq(session.mHalSessionPtr), any()); + verify(mNativeWrapperMock, never()).halSetMode(eq(session.mHalSessionPtr), anyInt(), + anyBoolean()); + verify(mNativeWrapperMock, never()).halUpdateTargetWorkDuration( + eq(session.mHalSessionPtr), anyLong()); + verify(mNativeWrapperMock, never()).halSendHint(eq(session.mHalSessionPtr), anyInt()); + } + } + + private int[] createThreads(int threadCount, CountDownLatch stopLatch) + throws InterruptedException { + int[] tids = new int[threadCount]; + AtomicInteger k = new AtomicInteger(0); + CountDownLatch latch = new CountDownLatch(threadCount); + for (int j = 0; j < threadCount; j++) { + Thread thread = new Thread(() -> { + try { + tids[k.getAndIncrement()] = android.os.Process.myTid(); + latch.countDown(); + stopLatch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + thread.start(); + } + latch.await(); + return tids; + } + + @Test public void testSetMode() throws Exception { HintManagerService service = createService(); IBinder token = new Binder(); @@ -457,7 +626,8 @@ public class HintManagerServiceTest { // Set session to background, then the duration would not be updated. service.mUidObserver.onUidStateChanged( a.mUid, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); - FgThread.getHandler().runWithScissors(() -> { }, 500); + FgThread.getHandler().runWithScissors(() -> { + }, 500); assertFalse(service.mUidObserver.isUidForeground(a.mUid)); a.setMode(0, true); verify(mNativeWrapperMock, never()).halSetMode(anyLong(), anyInt(), anyBoolean()); @@ -519,7 +689,10 @@ public class HintManagerServiceTest { LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500)); service.mUidObserver.onUidStateChanged(UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0); - LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(500)); + // let the cleanup work proceed + LockSupport.parkNanos( + TimeUnit.MILLISECONDS.toNanos(500) + TimeUnit.MILLISECONDS.toNanos( + CLEAN_UP_UID_DELAY_MILLIS)); } Log.d(TAG, "notifier thread min " + min + " max " + max + " avg " + sum / count); service.mUidObserver.onUidGone(UID, true); diff --git a/services/tests/servicestests/src/com/android/server/power/hint/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/power/hint/TEST_MAPPING new file mode 100644 index 000000000000..2d5df077b128 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/power/hint/TEST_MAPPING @@ -0,0 +1,15 @@ +{ + "postsubmit": [ + { + "name": "FrameworksServicesTests", + "options": [ + { + "include-filter": "com.android.server.power.hint" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + } + ] +} diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java index bfc47fdef5cb..cee6cdb06bf5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java @@ -3962,6 +3962,20 @@ public class PreferencesHelperTest extends UiServiceTestCase { } @Test + public void testReadXml_existingPackage_bubblePrefsRestored() throws Exception { + mHelper.setBubblesAllowed(PKG_O, UID_O, BUBBLE_PREFERENCE_ALL); + assertEquals(BUBBLE_PREFERENCE_ALL, mHelper.getBubblePreference(PKG_O, UID_O)); + + mXmlHelper.setBubblesAllowed(PKG_O, UID_O, BUBBLE_PREFERENCE_NONE); + assertEquals(BUBBLE_PREFERENCE_NONE, mXmlHelper.getBubblePreference(PKG_O, UID_O)); + + ByteArrayOutputStream stream = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL); + loadStreamXml(stream, true, UserHandle.USER_ALL); + + assertEquals(BUBBLE_PREFERENCE_ALL, mXmlHelper.getBubblePreference(PKG_O, UID_O)); + } + + @Test public void testUpdateNotificationChannel_fixedPermission() { List<UserInfo> users = ImmutableList.of(new UserInfo(UserHandle.USER_SYSTEM, "user0", 0)); when(mPermissionHelper.isPermissionFixed(PKG_O, 0)).thenReturn(true); diff --git a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java index 8cbcc226ce73..5861d88924e0 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java @@ -500,7 +500,8 @@ public class VibratorManagerServiceTest { InOrder batteryVerifier = inOrder(mBatteryStatsMock); batteryVerifier.verify(mBatteryStatsMock) .noteVibratorOn(UID, oneShotDuration + mVibrationConfig.getRampDownDurationMs()); - batteryVerifier.verify(mBatteryStatsMock).noteVibratorOff(UID); + batteryVerifier + .verify(mBatteryStatsMock, timeout(TEST_TIMEOUT_MILLIS)).noteVibratorOff(UID); } @Test diff --git a/services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java b/services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java index 29467f259ac3..a80e2f8ae28c 100644 --- a/services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java @@ -16,10 +16,14 @@ package com.android.server.policy; +import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManagerGlobal.ADD_OKAY; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; @@ -33,18 +37,27 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; import android.app.ActivityManager; import android.app.AppOpsManager; +import android.content.Context; +import android.os.PowerManager; import android.platform.test.flag.junit.SetFlagsRule; import androidx.test.filters.SmallTest; +import com.android.server.LocalServices; import com.android.server.pm.UserManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; +import com.android.server.wm.DisplayPolicy; +import com.android.server.wm.DisplayRotation; +import com.android.server.wm.WindowManagerInternal; import org.junit.After; import org.junit.Before; @@ -64,16 +77,27 @@ public class PhoneWindowManagerTests { public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); PhoneWindowManager mPhoneWindowManager; + private ActivityTaskManagerInternal mAtmInternal; + private Context mContext; @Before public void setUp() { mPhoneWindowManager = spy(new PhoneWindowManager()); spyOn(ActivityManager.getService()); + mContext = getInstrumentation().getTargetContext(); + spyOn(mContext); + mAtmInternal = mock(ActivityTaskManagerInternal.class); + LocalServices.addService(ActivityTaskManagerInternal.class, mAtmInternal); + mPhoneWindowManager.mActivityTaskManagerInternal = mAtmInternal; + LocalServices.addService(WindowManagerInternal.class, mock(WindowManagerInternal.class)); } @After public void tearDown() { reset(ActivityManager.getService()); + reset(mContext); + LocalServices.removeServiceForTest(ActivityTaskManagerInternal.class); + LocalServices.removeServiceForTest(WindowManagerInternal.class); } @Test @@ -99,6 +123,60 @@ public class PhoneWindowManagerTests { } @Test + public void testScreenTurnedOff() { + mSetFlagsRule.enableFlags(com.android.window.flags.Flags + .FLAG_SKIP_SLEEPING_WHEN_SWITCHING_DISPLAY); + doNothing().when(mPhoneWindowManager).updateSettings(any()); + doNothing().when(mPhoneWindowManager).initializeHdmiState(); + final boolean[] isScreenTurnedOff = { false }; + final DisplayPolicy displayPolicy = mock(DisplayPolicy.class); + doAnswer(invocation -> isScreenTurnedOff[0] = true).when(displayPolicy).screenTurnedOff(); + doAnswer(invocation -> !isScreenTurnedOff[0]).when(displayPolicy).isScreenOnEarly(); + doAnswer(invocation -> !isScreenTurnedOff[0]).when(displayPolicy).isScreenOnFully(); + + mPhoneWindowManager.mDefaultDisplayPolicy = displayPolicy; + mPhoneWindowManager.mDefaultDisplayRotation = mock(DisplayRotation.class); + final ActivityTaskManagerInternal.SleepTokenAcquirer tokenAcquirer = + mock(ActivityTaskManagerInternal.SleepTokenAcquirer.class); + doReturn(tokenAcquirer).when(mAtmInternal).createSleepTokenAcquirer(anyString()); + final PowerManager pm = mock(PowerManager.class); + doReturn(true).when(pm).isInteractive(); + doReturn(pm).when(mContext).getSystemService(eq(Context.POWER_SERVICE)); + + mContext.getMainThreadHandler().runWithScissors(() -> mPhoneWindowManager.init( + new PhoneWindowManager.Injector(mContext, + mock(WindowManagerPolicy.WindowManagerFuncs.class))), 0); + assertThat(isScreenTurnedOff[0]).isFalse(); + assertThat(mPhoneWindowManager.mIsGoingToSleepDefaultDisplay).isFalse(); + + // Skip sleep-token for non-sleep-screen-off. + clearInvocations(tokenAcquirer); + mPhoneWindowManager.screenTurnedOff(DEFAULT_DISPLAY, true /* isSwappingDisplay */); + verify(tokenAcquirer, never()).acquire(anyInt(), anyBoolean()); + assertThat(isScreenTurnedOff[0]).isTrue(); + + // Apply sleep-token for sleep-screen-off. + mPhoneWindowManager.startedGoingToSleep(DEFAULT_DISPLAY, 0 /* reason */); + assertThat(mPhoneWindowManager.mIsGoingToSleepDefaultDisplay).isTrue(); + mPhoneWindowManager.screenTurnedOff(DEFAULT_DISPLAY, true /* isSwappingDisplay */); + verify(tokenAcquirer).acquire(eq(DEFAULT_DISPLAY), eq(true)); + + mPhoneWindowManager.finishedGoingToSleep(DEFAULT_DISPLAY, 0 /* reason */); + assertThat(mPhoneWindowManager.mIsGoingToSleepDefaultDisplay).isFalse(); + + // Simulate unexpected reversed order: screenTurnedOff -> startedGoingToSleep. The sleep + // token can still be acquired. + isScreenTurnedOff[0] = false; + clearInvocations(tokenAcquirer); + mPhoneWindowManager.screenTurnedOff(DEFAULT_DISPLAY, true /* isSwappingDisplay */); + verify(tokenAcquirer, never()).acquire(anyInt(), anyBoolean()); + assertThat(displayPolicy.isScreenOnEarly()).isFalse(); + assertThat(displayPolicy.isScreenOnFully()).isFalse(); + mPhoneWindowManager.startedGoingToSleep(DEFAULT_DISPLAY, 0 /* reason */); + verify(tokenAcquirer).acquire(eq(DEFAULT_DISPLAY), eq(false)); + } + + @Test public void testCheckAddPermission_withoutAccessibilityOverlay_noAccessibilityAppOpLogged() { mSetFlagsRule.enableFlags(android.view.contentprotection.flags.Flags .FLAG_CREATE_ACCESSIBILITY_OVERLAY_APP_OP_ENABLED); @@ -130,11 +208,8 @@ public class PhoneWindowManagerTests { private void mockStartDockOrHome() throws Exception { doNothing().when(ActivityManager.getService()).stopAppSwitches(); - ActivityTaskManagerInternal mMockActivityTaskManagerInternal = - mock(ActivityTaskManagerInternal.class); - when(mMockActivityTaskManagerInternal.startHomeOnDisplay( + when(mAtmInternal.startHomeOnDisplay( anyInt(), anyString(), anyInt(), anyBoolean(), anyBoolean())).thenReturn(false); - mPhoneWindowManager.mActivityTaskManagerInternal = mMockActivityTaskManagerInternal; mPhoneWindowManager.mUserManagerInternal = mock(UserManagerInternal.class); } } diff --git a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java index 0a29dfbd7db7..60716cbbb693 100644 --- a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java @@ -95,8 +95,6 @@ public class ShortcutLoggingTests extends ShortcutKeyTestBase { new int[]{KeyEvent.KEYCODE_NOTIFICATION}, KeyboardLogEvent.TOGGLE_NOTIFICATION_PANEL, KeyEvent.KEYCODE_NOTIFICATION, 0}, - {"Meta + T -> Toggle Taskbar", new int[]{META_KEY, KeyEvent.KEYCODE_T}, - KeyboardLogEvent.TOGGLE_TASKBAR, KeyEvent.KEYCODE_T, META_ON}, {"Meta + Ctrl + S -> Take Screenshot", new int[]{META_KEY, CTRL_KEY, KeyEvent.KEYCODE_S}, KeyboardLogEvent.TAKE_SCREENSHOT, KeyEvent.KEYCODE_S, META_ON | CTRL_ON}, diff --git a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java index c29547f123aa..b9e87dc6efce 100644 --- a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java @@ -633,18 +633,23 @@ public class BackNavigationControllerTests extends WindowTestsBase { @Test public void testAdjacentFocusInActivityEmbedding() { mSetFlagsRule.enableFlags(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG); - Task task = createTask(mDefaultDisplay); - TaskFragment primary = createTaskFragmentWithActivity(task); - TaskFragment secondary = createTaskFragmentWithActivity(task); - primary.setAdjacentTaskFragment(secondary); - secondary.setAdjacentTaskFragment(primary); - - WindowState windowState = mock(WindowState.class); + final Task task = createTask(mDefaultDisplay); + final TaskFragment primaryTf = createTaskFragmentWithActivity(task); + final TaskFragment secondaryTf = createTaskFragmentWithActivity(task); + final ActivityRecord primaryActivity = primaryTf.getTopMostActivity(); + final ActivityRecord secondaryActivity = secondaryTf.getTopMostActivity(); + primaryTf.setAdjacentTaskFragment(secondaryTf); + secondaryTf.setAdjacentTaskFragment(primaryTf); + + final WindowState windowState = mock(WindowState.class); + windowState.mActivityRecord = primaryActivity; doReturn(windowState).when(mWm).getFocusedWindowLocked(); - doReturn(primary).when(windowState).getTaskFragment(); + doReturn(primaryTf).when(windowState).getTaskFragment(); + doReturn(1L).when(primaryActivity).getLastWindowCreateTime(); + doReturn(2L).when(secondaryActivity).getLastWindowCreateTime(); startBackNavigation(); - verify(mWm).moveFocusToActivity(any()); + verify(mWm).moveFocusToActivity(eq(secondaryActivity)); } /** diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 4e360d06ce6a..2c88ed2db2d6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1068,16 +1068,6 @@ public class DisplayContentTests extends WindowTestsBase { mDisplayContent.getImeTarget(IME_TARGET_LAYERING)); } - @SetupWindows(addWindows = W_INPUT_METHOD) - @Test - public void testInputMethodSet_listenOnDisplayAreaConfigurationChanged() { - spyOn(mAtm); - mDisplayContent.setInputMethodWindowLocked(mImeWindow); - - verify(mAtm).onImeWindowSetOnDisplayArea( - mImeWindow.mSession.mPid, mDisplayContent.getImeContainer()); - } - @Test public void testAllowsTopmostFullscreenOrientation() { final DisplayContent dc = createNewDisplay(); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java index 897a3da07473..52485eec8505 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java @@ -25,7 +25,7 @@ import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_NONE; import static android.view.WindowManager.TRANSIT_OPEN; import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_TASK_FRAGMENT; -import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE; +import static android.window.TaskFragmentOperation.OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE; import static android.window.TaskFragmentOperation.OP_TYPE_DELETE_TASK_FRAGMENT; import static android.window.TaskFragmentOperation.OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE; import static android.window.TaskFragmentOperation.OP_TYPE_REORDER_TO_BOTTOM_OF_TASK; @@ -1835,7 +1835,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { final TaskFragment tf = createTaskFragment(task); final TaskFragmentOperation operation = new TaskFragmentOperation.Builder( - OP_TYPE_CREATE_TASK_FRAGMENT_DECOR_SURFACE).build(); + OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE).build(); mTransaction.addTaskFragmentOperation(tf.getFragmentToken(), operation); assertApplyTransactionAllowed(mTransaction); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java index 5360a1033eb4..6b1bf26bfdff 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java @@ -887,20 +887,14 @@ public class TaskFragmentTest extends WindowTestsBase { assertEquals(winLeftTop, mDisplayContent.mCurrentFocus); if (Flags.embeddedActivityBackNavFlag()) { - // Send request to move the focus to top window from the left window. - assertTrue(mWm.moveFocusToTopEmbeddedWindow(winLeftTop)); - // The focus should change. - assertEquals(winRightTop, mDisplayContent.mCurrentFocus); - - // Send request to move the focus to top window from the right window. - assertFalse(mWm.moveFocusToTopEmbeddedWindow(winRightTop)); - // The focus should NOT change. - assertEquals(winRightTop, mDisplayContent.mCurrentFocus); - - // Do not move focus if the dim is boosted. - taskFragmentLeft.mDimmerSurfaceBoosted = true; - assertFalse(mWm.moveFocusToTopEmbeddedWindow(winLeftTop)); - assertEquals(winRightTop, mDisplayContent.mCurrentFocus); + // Move focus if the adjacent activity is more recently active. + doReturn(1L).when(appLeftTop).getLastWindowCreateTime(); + doReturn(2L).when(appRightTop).getLastWindowCreateTime(); + assertTrue(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); + + // Do not move the focus if the adjacent activity is less recently active. + doReturn(3L).when(appLeftTop).getLastWindowCreateTime(); + assertFalse(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index 3bd6496a01dd..a88680a002b9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -1945,6 +1945,21 @@ public class TaskTests extends WindowTestsBase { assertEquals(2, finishCount[0]); } + @Test + public void testPauseActivityWhenHasEmptyLeafTaskFragment() { + // Creating a task that has a RESUMED activity and an empty TaskFragment. + final Task task = new TaskBuilder(mSupervisor).setCreateActivity(true).build(); + final ActivityRecord activity = task.getTopMostActivity(); + new TaskFragmentBuilder(mAtm).setParentTask(task).build(); + activity.setState(ActivityRecord.State.RESUMED, "test"); + + // Ensure the activity is paused if cannot be resumed. + doReturn(false).when(task).canBeResumed(any()); + mSupervisor.mUserLeaving = true; + task.pauseActivityIfNeeded(null /* resuming */, "test"); + verify(task).startPausing(eq(true) /* userLeaving */, anyBoolean(), any(), any()); + } + private Task getTestTask() { return new TaskBuilder(mSupervisor).setCreateActivity(true).build(); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 12f46df451fe..48b12f729e08 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -90,6 +90,7 @@ import android.util.ArraySet; import android.util.MergedConfiguration; import android.view.ContentRecordingSession; import android.view.IWindow; +import android.view.IWindowSession; import android.view.InputChannel; import android.view.InsetsSourceControl; import android.view.InsetsState; @@ -99,6 +100,7 @@ import android.view.View; import android.view.WindowInsets; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; +import android.window.ActivityWindowInfo; import android.window.ClientWindowFrames; import android.window.InputTransferToken; import android.window.ScreenCapture; @@ -1216,6 +1218,35 @@ public class WindowManagerServiceTests extends WindowTestsBase { mWm.reportKeepClearAreasChanged(session, window, new ArrayList<>(), new ArrayList<>()); } + @Test + public void testRelayout_appWindowSendActivityWindowInfo() { + mSetFlagsRule.enableFlags(Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG); + + // Skip unnecessary operations of relayout. + spyOn(mWm.mWindowPlacerLocked); + doNothing().when(mWm.mWindowPlacerLocked).performSurfacePlacement(anyBoolean()); + + final Task task = createTask(mDisplayContent); + final WindowState win = createAppWindow(task, ACTIVITY_TYPE_STANDARD, "appWindow"); + mWm.mWindowMap.put(win.mClient.asBinder(), win); + + final int w = 100; + final int h = 200; + final ClientWindowFrames outFrames = new ClientWindowFrames(); + final MergedConfiguration outConfig = new MergedConfiguration(); + final SurfaceControl outSurfaceControl = new SurfaceControl(); + final InsetsState outInsetsState = new InsetsState(); + final InsetsSourceControl.Array outControls = new InsetsSourceControl.Array(); + final Bundle outBundle = new Bundle(); + + mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.GONE, 0, 0, 0, + outFrames, outConfig, outSurfaceControl, outInsetsState, outControls, outBundle); + + final ActivityWindowInfo activityWindowInfo = outBundle.getParcelable( + IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO, ActivityWindowInfo.class); + assertEquals(win.mActivityRecord.getActivityWindowInfo(), activityWindowInfo); + } + class TestResultReceiver implements IResultReceiver { public android.os.Bundle resultData; private final IBinder mBinder = mock(IBinder.class); diff --git a/telephony/java/android/telephony/satellite/stub/ISatellite.aidl b/telephony/java/android/telephony/satellite/stub/ISatellite.aidl index 9441fb5d02ef..36485c6b6fb5 100644 --- a/telephony/java/android/telephony/satellite/stub/ISatellite.aidl +++ b/telephony/java/android/telephony/satellite/stub/ISatellite.aidl @@ -347,28 +347,6 @@ oneway interface ISatellite { in IIntegerConsumer callback); /** - * Request to get whether satellite communication is allowed for the current location. - * - * @param resultCallback The callback to receive the error code result of the operation. - * This must only be sent when the result is not - * SatelliteResult#SATELLITE_RESULT_SUCCESS. - * @param callback If the result is SatelliteResult#SATELLITE_RESULT_SUCCESS, the callback to - * receive whether satellite communication is allowed for the current location. - * - * Valid result codes returned: - * SatelliteResult:SATELLITE_RESULT_SUCCESS - * SatelliteResult:SATELLITE_RESULT_SERVICE_ERROR - * SatelliteResult:SATELLITE_RESULT_MODEM_ERROR - * SatelliteResult:SATELLITE_RESULT_INVALID_MODEM_STATE - * SatelliteResult:SATELLITE_RESULT_INVALID_ARGUMENTS - * SatelliteResult:SATELLITE_RESULT_RADIO_NOT_AVAILABLE - * SatelliteResult:SATELLITE_RESULT_REQUEST_NOT_SUPPORTED - * SatelliteResult:SATELLITE_RESULT_NO_RESOURCES - */ - void requestIsSatelliteCommunicationAllowedForCurrentLocation( - in IIntegerConsumer resultCallback, in IBooleanConsumer callback); - - /** * Request to get the time after which the satellite will be visible. This is an int * representing the duration in seconds after which the satellite will be visible. * This will return 0 if the satellite is currently visible. diff --git a/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java b/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java index f17ff17497f2..b7dc79ff7283 100644 --- a/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java +++ b/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java @@ -194,17 +194,6 @@ public class SatelliteImplBase extends SatelliteService { } @Override - public void requestIsSatelliteCommunicationAllowedForCurrentLocation( - IIntegerConsumer resultCallback, IBooleanConsumer callback) - throws RemoteException { - executeMethodAsync( - () -> SatelliteImplBase.this - .requestIsSatelliteCommunicationAllowedForCurrentLocation( - resultCallback, callback), - "requestIsCommunicationAllowedForCurrentLocation"); - } - - @Override public void requestTimeForNextSatelliteVisibility(IIntegerConsumer resultCallback, IIntegerConsumer callback) throws RemoteException { executeMethodAsync( @@ -638,30 +627,6 @@ public class SatelliteImplBase extends SatelliteService { } /** - * Request to get whether satellite communication is allowed for the current location. - * - * @param resultCallback The callback to receive the error code result of the operation. - * This must only be sent when the result is not - * SatelliteResult#SATELLITE_RESULT_SUCCESS. - * @param callback If the result is SatelliteResult#SATELLITE_RESULT_SUCCESS, the callback to - * receive whether satellite communication is allowed for the current location. - * - * Valid result codes returned: - * SatelliteResult:SATELLITE_RESULT_SUCCESS - * SatelliteResult:SATELLITE_RESULT_SERVICE_ERROR - * SatelliteResult:SATELLITE_RESULT_MODEM_ERROR - * SatelliteResult:SATELLITE_RESULT_INVALID_MODEM_STATE - * SatelliteResult:SATELLITE_RESULT_INVALID_ARGUMENTS - * SatelliteResult:SATELLITE_RESULT_RADIO_NOT_AVAILABLE - * SatelliteResult:SATELLITE_RESULT_REQUEST_NOT_SUPPORTED - * SatelliteResult:SATELLITE_RESULT_NO_RESOURCES - */ - public void requestIsSatelliteCommunicationAllowedForCurrentLocation( - @NonNull IIntegerConsumer resultCallback, @NonNull IBooleanConsumer callback) { - // stub implementation - } - - /** * Request to get the time after which the satellite will be visible. This is an int * representing the duration in seconds after which the satellite will be visible. * This will return 0 if the satellite is currently visible. diff --git a/test-base/Android.bp b/test-base/Android.bp index 70a95400bd9e..d65a4e44440e 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -14,37 +14,22 @@ // limitations under the License. // +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + // Build the android.test.base library // =================================== // This contains the junit.framework and android.test classes that were in // Android API level 25 excluding those from android.test.runner. // Also contains the com.android.internal.util.Predicate[s] classes. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-CPL-1.0 - default_applicable_licenses: ["frameworks_base_test-base_license"], -} - -license { - name: "frameworks_base_test-base_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-CPL-1.0", - ], - license_text: [ - "src/junit/cpl-v10.html", - ], -} - java_sdk_library { name: "android.test.base", - srcs: [":android-test-base-sources"], + srcs: [ + ":android-test-base-sources", + ":frameworks-base-test-junit-framework", + ], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], @@ -84,7 +69,10 @@ java_library_static { ], installable: false, - srcs: [":android-test-base-sources"], + srcs: [ + ":android-test-base-sources", + ":frameworks-base-test-junit-framework", + ], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], @@ -104,8 +92,7 @@ java_library_static { name: "android.test.base-minus-junit", srcs: [ - "src/android/**/*.java", - "src/com/**/*.java", + "src/**/*.java", ], sdk_version: "current", diff --git a/test-base/hiddenapi/Android.bp b/test-base/hiddenapi/Android.bp index 1466590ef311..4c59b10ba423 100644 --- a/test-base/hiddenapi/Android.bp +++ b/test-base/hiddenapi/Android.bp @@ -15,12 +15,7 @@ // package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } // Provided solely to contribute information about which hidden parts of the android.test.base diff --git a/test-junit/Android.bp b/test-junit/Android.bp new file mode 100644 index 000000000000..8d3d439e034e --- /dev/null +++ b/test-junit/Android.bp @@ -0,0 +1,53 @@ +// +// Copyright (C) 2024 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 { + default_applicable_licenses: ["frameworks-base-test-junit-license"], +} + +license { + name: "frameworks-base-test-junit-license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-CPL-1.0", + ], + license_text: [ + "src/junit/cpl-v10.html", + ], +} + +filegroup { + name: "frameworks-base-test-junit-framework", + srcs: [ + "src/junit/framework/**/*.java", + ], + path: "src", + visibility: [ + "//frameworks/base/test-base", + ], +} + +filegroup { + name: "frameworks-base-test-junit-runner", + srcs: [ + "src/junit/runner/**/*.java", + "src/junit/textui/**/*.java", + ], + path: "src", + visibility: [ + "//frameworks/base/test-runner", + ], +} diff --git a/test-base/src/junit/MODULE_LICENSE_CPL b/test-junit/src/junit/MODULE_LICENSE_CPL index e69de29bb2d1..e69de29bb2d1 100644 --- a/test-base/src/junit/MODULE_LICENSE_CPL +++ b/test-junit/src/junit/MODULE_LICENSE_CPL diff --git a/test-base/src/junit/README.android b/test-junit/src/junit/README.android index 1384a1fedda2..1384a1fedda2 100644 --- a/test-base/src/junit/README.android +++ b/test-junit/src/junit/README.android diff --git a/test-base/src/junit/cpl-v10.html b/test-junit/src/junit/cpl-v10.html index 36aa208d4a29..36aa208d4a29 100644 --- a/test-base/src/junit/cpl-v10.html +++ b/test-junit/src/junit/cpl-v10.html diff --git a/test-base/src/junit/framework/Assert.java b/test-junit/src/junit/framework/Assert.java index 3dcc23d71c19..3dcc23d71c19 100644 --- a/test-base/src/junit/framework/Assert.java +++ b/test-junit/src/junit/framework/Assert.java diff --git a/test-base/src/junit/framework/AssertionFailedError.java b/test-junit/src/junit/framework/AssertionFailedError.java index 0d7802c431c6..0d7802c431c6 100644 --- a/test-base/src/junit/framework/AssertionFailedError.java +++ b/test-junit/src/junit/framework/AssertionFailedError.java diff --git a/test-base/src/junit/framework/ComparisonCompactor.java b/test-junit/src/junit/framework/ComparisonCompactor.java index e540f03b87d3..e540f03b87d3 100644 --- a/test-base/src/junit/framework/ComparisonCompactor.java +++ b/test-junit/src/junit/framework/ComparisonCompactor.java diff --git a/test-base/src/junit/framework/ComparisonFailure.java b/test-junit/src/junit/framework/ComparisonFailure.java index 507799328a44..507799328a44 100644 --- a/test-base/src/junit/framework/ComparisonFailure.java +++ b/test-junit/src/junit/framework/ComparisonFailure.java diff --git a/test-base/src/junit/framework/Protectable.java b/test-junit/src/junit/framework/Protectable.java index e1432370cfaf..e1432370cfaf 100644 --- a/test-base/src/junit/framework/Protectable.java +++ b/test-junit/src/junit/framework/Protectable.java diff --git a/test-base/src/junit/framework/Test.java b/test-junit/src/junit/framework/Test.java index a016ee8308f1..a016ee8308f1 100644 --- a/test-base/src/junit/framework/Test.java +++ b/test-junit/src/junit/framework/Test.java diff --git a/test-base/src/junit/framework/TestCase.java b/test-junit/src/junit/framework/TestCase.java index b047ec9e1afc..b047ec9e1afc 100644 --- a/test-base/src/junit/framework/TestCase.java +++ b/test-junit/src/junit/framework/TestCase.java diff --git a/test-base/src/junit/framework/TestFailure.java b/test-junit/src/junit/framework/TestFailure.java index 6662b1fab1b2..6662b1fab1b2 100644 --- a/test-base/src/junit/framework/TestFailure.java +++ b/test-junit/src/junit/framework/TestFailure.java diff --git a/test-base/src/junit/framework/TestListener.java b/test-junit/src/junit/framework/TestListener.java index 9b6944361b9d..9b6944361b9d 100644 --- a/test-base/src/junit/framework/TestListener.java +++ b/test-junit/src/junit/framework/TestListener.java diff --git a/test-base/src/junit/framework/TestResult.java b/test-junit/src/junit/framework/TestResult.java index 3052e94074fd..3052e94074fd 100644 --- a/test-base/src/junit/framework/TestResult.java +++ b/test-junit/src/junit/framework/TestResult.java diff --git a/test-base/src/junit/framework/TestSuite.java b/test-junit/src/junit/framework/TestSuite.java index 336efd1800d7..336efd1800d7 100644 --- a/test-base/src/junit/framework/TestSuite.java +++ b/test-junit/src/junit/framework/TestSuite.java diff --git a/test-runner/src/junit/runner/BaseTestRunner.java b/test-junit/src/junit/runner/BaseTestRunner.java index b2fa16c91da2..b2fa16c91da2 100644 --- a/test-runner/src/junit/runner/BaseTestRunner.java +++ b/test-junit/src/junit/runner/BaseTestRunner.java diff --git a/test-runner/src/junit/runner/StandardTestSuiteLoader.java b/test-junit/src/junit/runner/StandardTestSuiteLoader.java index 808963a5aea0..808963a5aea0 100644 --- a/test-runner/src/junit/runner/StandardTestSuiteLoader.java +++ b/test-junit/src/junit/runner/StandardTestSuiteLoader.java diff --git a/test-runner/src/junit/runner/TestRunListener.java b/test-junit/src/junit/runner/TestRunListener.java index 0e9581989eee..0e9581989eee 100644 --- a/test-runner/src/junit/runner/TestRunListener.java +++ b/test-junit/src/junit/runner/TestRunListener.java diff --git a/test-runner/src/junit/runner/TestSuiteLoader.java b/test-junit/src/junit/runner/TestSuiteLoader.java index 9cc6d81e125e..9cc6d81e125e 100644 --- a/test-runner/src/junit/runner/TestSuiteLoader.java +++ b/test-junit/src/junit/runner/TestSuiteLoader.java diff --git a/test-runner/src/junit/runner/Version.java b/test-junit/src/junit/runner/Version.java index dd88c03372c8..dd88c03372c8 100644 --- a/test-runner/src/junit/runner/Version.java +++ b/test-junit/src/junit/runner/Version.java diff --git a/test-runner/src/junit/runner/package-info.java b/test-junit/src/junit/runner/package-info.java index 364e3621456e..364e3621456e 100644 --- a/test-runner/src/junit/runner/package-info.java +++ b/test-junit/src/junit/runner/package-info.java diff --git a/test-runner/src/junit/textui/ResultPrinter.java b/test-junit/src/junit/textui/ResultPrinter.java index b4914529bf4f..b4914529bf4f 100644 --- a/test-runner/src/junit/textui/ResultPrinter.java +++ b/test-junit/src/junit/textui/ResultPrinter.java diff --git a/test-runner/src/junit/textui/TestRunner.java b/test-junit/src/junit/textui/TestRunner.java index 046448e5e76a..046448e5e76a 100644 --- a/test-runner/src/junit/textui/TestRunner.java +++ b/test-junit/src/junit/textui/TestRunner.java diff --git a/test-runner/src/junit/textui/package-info.java b/test-junit/src/junit/textui/package-info.java index 28b2ef46b582..28b2ef46b582 100644 --- a/test-runner/src/junit/textui/package-info.java +++ b/test-junit/src/junit/textui/package-info.java diff --git a/test-mock/Android.bp b/test-mock/Android.bp index f37d2d17973e..e29d321e5105 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -17,12 +17,7 @@ // Build the android.test.mock library // =================================== package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } java_sdk_library { diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 21e09d3221ce..6b5be3cba204 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -14,29 +14,19 @@ // limitations under the License. // -// Build the android.test.runner library -// ===================================== package { - // See: http://go/android-license-faq - default_applicable_licenses: ["frameworks_base_test-runner_license"], -} - -license { - name: "frameworks_base_test-runner_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-CPL-1.0", - ], - license_text: [ - "src/junit/cpl-v10.html", - ], + default_applicable_licenses: ["Android-Apache-2.0"], } +// Build the android.test.runner library +// ===================================== java_sdk_library { name: "android.test.runner", - srcs: [":android-test-runner-sources"], + srcs: [ + ":android-test-runner-sources", + ":frameworks-base-test-junit-runner", + ], errorprone: { javacflags: ["-Xep:DepAnn:ERROR"], diff --git a/test-runner/src/junit/MODULE_LICENSE_CPL b/test-runner/src/junit/MODULE_LICENSE_CPL deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/test-runner/src/junit/MODULE_LICENSE_CPL +++ /dev/null diff --git a/test-runner/src/junit/README.android b/test-runner/src/junit/README.android deleted file mode 100644 index 1384a1fedda2..000000000000 --- a/test-runner/src/junit/README.android +++ /dev/null @@ -1,11 +0,0 @@ -URL: https://github.com/junit-team/junit4 -License: Common Public License Version 1.0 -License File: cpl-v10.html - -This is JUnit 4.10 source that was previously part of the Android Public API. -Where necessary it has been patched to be compatible (according to Android API -requirements) with JUnit 3.8. - -These are copied here to ensure that the android.test.runner target remains -compatible with the last version of the Android API (25) that contained these -classes even when external/junit is upgraded to a later version. diff --git a/test-runner/src/junit/cpl-v10.html b/test-runner/src/junit/cpl-v10.html deleted file mode 100644 index 36aa208d4a29..000000000000 --- a/test-runner/src/junit/cpl-v10.html +++ /dev/null @@ -1,125 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> -<HEAD> -<TITLE>Common Public License - v 1.0</TITLE> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</HEAD> - -<BODY BGCOLOR="#FFFFFF" VLINK="#800000"> - - -<P ALIGN="CENTER"><B>Common Public License - v 1.0</B> -<P><B></B><FONT SIZE="3"></FONT> -<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>1. DEFINITIONS</B></FONT> -<P><FONT SIZE="2">"Contribution" means:</FONT> - -<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT"> -b) in the case of each subsequent Contributor:</FONT></UL> - - -<UL><FONT SIZE="2">i) changes to the Program, and</FONT></UL> - - -<UL><FONT SIZE="2">ii) additions to the Program;</FONT></UL> - - -<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. </FONT><FONT SIZE="2">Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. </FONT></UL> - -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. </FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT> -<P><FONT SIZE="2"><B></B></FONT> -<P><FONT SIZE="2"><B>2. GRANT OF RIGHTS</B></FONT> - -<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a) </FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL> - - -<UL><FONT SIZE="2"></FONT></UL> - - -<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. </FONT></UL> - - -<UL><FONT SIZE="2"></FONT></UL> - - -<UL><FONT SIZE="2">c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL> - - -<UL><FONT SIZE="2"></FONT></UL> - - -<UL><FONT SIZE="2">d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL> - - -<UL><FONT SIZE="2"></FONT></UL> - -<P><FONT SIZE="2"><B>3. REQUIREMENTS</B></FONT> -<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT> - -<UL><FONT SIZE="2">a) it complies with the terms and conditions of this Agreement; and</FONT></UL> - - -<UL><FONT SIZE="2">b) its license agreement:</FONT></UL> - - -<UL><FONT SIZE="2">i) effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL> - - -<UL><FONT SIZE="2">ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL> - - -<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2"> states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL> - - -<UL><FONT SIZE="2">iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL> - - -<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL> - -<P><FONT SIZE="2">When the Program is made available in source code form:</FONT> - -<UL><FONT SIZE="2">a) it must be made available under this Agreement; and </FONT></UL> - - -<UL><FONT SIZE="2">b) a copy of this Agreement must be included with each copy of the Program. </FONT></UL> - -<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT> -<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program. </FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. </FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>4. COMMERCIAL DISTRIBUTION</B></FONT> -<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT> -<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5. NO WARRANTY</B></FONT> -<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6. DISCLAIMER OF LIABILITY</B></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>7. GENERAL</B></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version. </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2"> All rights in the Program not expressly granted under this Agreement are reserved.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> - -</BODY> - -</HTML>
\ No newline at end of file diff --git a/test-runner/tests/Android.bp b/test-runner/tests/Android.bp index ac21bcb9d124..aad2bee8cb84 100644 --- a/test-runner/tests/Android.bp +++ b/test-runner/tests/Android.bp @@ -13,12 +13,7 @@ // limitations under the License. package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } android_test { diff --git a/tools/app_metadata_bundles/Android.bp b/tools/app_metadata_bundles/Android.bp new file mode 100644 index 000000000000..be6bea6b7fea --- /dev/null +++ b/tools/app_metadata_bundles/Android.bp @@ -0,0 +1,26 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +java_library_host { + name: "asllib", + srcs: [ + "src/lib/java/**/*.java", + ], +} + +java_binary_host { + name: "aslgen", + manifest: "src/aslgen/aslgen.mf", + srcs: [ + "src/aslgen/java/**/*.java", + ], + static_libs: [ + "asllib", + ], +} diff --git a/tools/app_metadata_bundles/OWNERS b/tools/app_metadata_bundles/OWNERS new file mode 100644 index 000000000000..a2a250b2d5b7 --- /dev/null +++ b/tools/app_metadata_bundles/OWNERS @@ -0,0 +1,2 @@ +wenhaowang@google.com +mloh@google.com diff --git a/tools/app_metadata_bundles/README.md b/tools/app_metadata_bundles/README.md new file mode 100644 index 000000000000..6e8d287b41dd --- /dev/null +++ b/tools/app_metadata_bundles/README.md @@ -0,0 +1,9 @@ +# App metadata bundles + +This project delivers a comprehensive toolchain solution for developers +to efficiently manage app metadata bundles. + +The project consists of two subprojects: + + * A pure Java library, and + * A pure Java command-line tool. diff --git a/tools/app_metadata_bundles/src/aslgen/aslgen.mf b/tools/app_metadata_bundles/src/aslgen/aslgen.mf new file mode 100644 index 000000000000..fc656e2155a7 --- /dev/null +++ b/tools/app_metadata_bundles/src/aslgen/aslgen.mf @@ -0,0 +1 @@ +Main-Class: com.android.aslgen.Main
\ No newline at end of file diff --git a/tools/app_metadata_bundles/src/aslgen/java/com/android/aslgen/Main.java b/tools/app_metadata_bundles/src/aslgen/java/com/android/aslgen/Main.java new file mode 100644 index 000000000000..df003b6aeab2 --- /dev/null +++ b/tools/app_metadata_bundles/src/aslgen/java/com/android/aslgen/Main.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2024 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.aslgen; + +import com.android.asllib.AndroidSafetyLabel; +import com.android.asllib.AndroidSafetyLabel.Format; + +import org.xml.sax.SAXException; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; + +public class Main { + + /** Takes the options to make file conversion. */ + public static void main(String[] args) + throws IOException, ParserConfigurationException, SAXException, TransformerException { + + String inFile = null; + String outFile = null; + Format inFormat = Format.NULL; + Format outFormat = Format.NULL; + + + // Except for "--help", all arguments require a value currently. + // So just make sure we have an even number and + // then process them all two at a time. + if (args.length == 1 && "--help".equals(args[0])) { + showUsage(); + return; + } + if (args.length % 2 != 0) { + throw new IllegalArgumentException("Argument is missing corresponding value"); + } + for (int i = 0; i < args.length - 1; i += 2) { + final String arg = args[i].trim(); + final String argValue = args[i + 1].trim(); + if ("--in-path".equals(arg)) { + inFile = argValue; + } else if ("--out-path".equals(arg)) { + outFile = argValue; + } else if ("--in-format".equals(arg)) { + inFormat = getFormat(argValue); + } else if ("--out-format".equals(arg)) { + outFormat = getFormat(argValue); + } else { + throw new IllegalArgumentException("Unknown argument: " + arg); + } + } + + if (inFile == null) { + throw new IllegalArgumentException("input file is required"); + } + + if (outFile == null) { + throw new IllegalArgumentException("output file is required"); + } + + if (inFormat == Format.NULL) { + throw new IllegalArgumentException("input format is required"); + } + + if (outFormat == Format.NULL) { + throw new IllegalArgumentException("output format is required"); + } + + System.out.println("in path: " + inFile); + System.out.println("out path: " + outFile); + System.out.println("in format: " + inFormat); + System.out.println("out format: " + outFormat); + + var asl = AndroidSafetyLabel.readFromStream(new FileInputStream(inFile), inFormat); + asl.writeToStream(new FileOutputStream(outFile), outFormat); + } + + private static Format getFormat(String argValue) { + if ("hr".equals(argValue)) { + return Format.HUMAN_READABLE; + } else if ("od".equals(argValue)) { + return Format.ON_DEVICE; + } else { + return Format.NULL; + } + } + + private static void showUsage() { + AndroidSafetyLabel.test(); + System.err.println( + "Usage:\n" + ); + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/AndroidSafetyLabel.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/AndroidSafetyLabel.java new file mode 100644 index 000000000000..07e0e7319f4d --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/AndroidSafetyLabel.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2024 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.asllib; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.SAXException; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +public class AndroidSafetyLabel { + + public enum Format { + NULL, HUMAN_READABLE, ON_DEVICE; + } + + private final SafetyLabels mSafetyLabels; + + public SafetyLabels getSafetyLabels() { + return mSafetyLabels; + } + + private AndroidSafetyLabel(SafetyLabels safetyLabels) { + this.mSafetyLabels = safetyLabels; + } + + /** Reads a {@link AndroidSafetyLabel} from an {@link InputStream}. */ + // TODO(b/329902686): Support conversion in both directions, specified by format. + public static AndroidSafetyLabel readFromStream(InputStream in, Format format) + throws IOException, ParserConfigurationException, SAXException { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + Document document = factory.newDocumentBuilder().parse(in); + + Element appMetadataBundles = + XmlUtils.getSingleElement(document, XmlUtils.HR_TAG_APP_METADATA_BUNDLES); + + return AndroidSafetyLabel.createFromHrElement(appMetadataBundles); + } + + /** Write the content of the {@link AndroidSafetyLabel} to a {@link OutputStream}. */ + // TODO(b/329902686): Support conversion in both directions, specified by format. + public void writeToStream(OutputStream out, Format format) + throws IOException, ParserConfigurationException, TransformerException { + var docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + var document = docBuilder.newDocument(); + document.appendChild(this.toOdDomElement(document)); + + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); + transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); + StreamResult streamResult = new StreamResult(out); // out + DOMSource domSource = new DOMSource(document); + transformer.transform(domSource, streamResult); + } + + /** Creates an {@link AndroidSafetyLabel} from human-readable DOM element */ + public static AndroidSafetyLabel createFromHrElement(Element appMetadataBundlesEle) { + Element safetyLabelsEle = + XmlUtils.getSingleElement(appMetadataBundlesEle, XmlUtils.HR_TAG_SAFETY_LABELS); + SafetyLabels safetyLabels = SafetyLabels.createFromHrElement(safetyLabelsEle); + return new AndroidSafetyLabel(safetyLabels); + } + + /** Creates an on-device DOM element from an {@link AndroidSafetyLabel} */ + public Element toOdDomElement(Document doc) { + Element aslEle = doc.createElement(XmlUtils.OD_TAG_BUNDLE); + aslEle.appendChild(mSafetyLabels.toOdDomElement(doc)); + return aslEle; + } + + public static void test() { + // TODO(b/329902686): Add tests. + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategory.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategory.java new file mode 100644 index 000000000000..efdaa4062bdb --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategory.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2024 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.asllib; + +import java.util.Map; + +/** + * Data usage category representation containing one or more {@link DataType}. Valid category keys + * are defined in {@link DataCategoryConstants}, each category has a valid set of types {@link + * DataType}, which are mapped in {@link DataTypeConstants} + */ +public class DataCategory { + private final Map<String, DataType> mDataTypes; + + private DataCategory(Map<String, DataType> dataTypes) { + this.mDataTypes = dataTypes; + } + + /** Return the type {@link Map} of String type key to {@link DataType} */ + + public Map<String, DataType> getDataTypes() { + return mDataTypes; + } + + /** Creates a {@link DataCategory} given map of {@param dataTypes}. */ + public static DataCategory create(Map<String, DataType> dataTypes) { + return new DataCategory(dataTypes); + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategoryConstants.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategoryConstants.java new file mode 100644 index 000000000000..b364c8b37194 --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataCategoryConstants.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2024 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.asllib; + + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * Constants for determining valid {@link String} data types for usage within {@link SafetyLabels}, + * {@link DataCategory}, and {@link DataType} + */ +public class DataCategoryConstants { + + public static final String CATEGORY_PERSONAL = "personal"; + public static final String CATEGORY_FINANCIAL = "financial"; + public static final String CATEGORY_LOCATION = "location"; + public static final String CATEGORY_EMAIL_TEXT_MESSAGE = "email_text_message"; + public static final String CATEGORY_PHOTO_VIDEO = "photo_video"; + public static final String CATEGORY_AUDIO = "audio"; + public static final String CATEGORY_STORAGE = "storage"; + public static final String CATEGORY_HEALTH_FITNESS = "health_fitness"; + public static final String CATEGORY_CONTACTS = "contacts"; + public static final String CATEGORY_CALENDAR = "calendar"; + public static final String CATEGORY_IDENTIFIERS = "identifiers"; + public static final String CATEGORY_APP_PERFORMANCE = "app_performance"; + public static final String CATEGORY_ACTIONS_IN_APP = "actions_in_app"; + public static final String CATEGORY_SEARCH_AND_BROWSING = "search_and_browsing"; + + /** Set of valid categories */ + public static final Set<String> VALID_CATEGORIES = + Collections.unmodifiableSet( + new HashSet<>( + Arrays.asList( + CATEGORY_PERSONAL, + CATEGORY_FINANCIAL, + CATEGORY_LOCATION, + CATEGORY_EMAIL_TEXT_MESSAGE, + CATEGORY_PHOTO_VIDEO, + CATEGORY_AUDIO, + CATEGORY_STORAGE, + CATEGORY_HEALTH_FITNESS, + CATEGORY_CONTACTS, + CATEGORY_CALENDAR, + CATEGORY_IDENTIFIERS, + CATEGORY_APP_PERFORMANCE, + CATEGORY_ACTIONS_IN_APP, + CATEGORY_SEARCH_AND_BROWSING))); + + /** Returns {@link Set} of valid {@link String} category keys */ + public static Set<String> getValidDataCategories() { + return VALID_CATEGORIES; + } + + private DataCategoryConstants() { + /* do nothing - hide constructor */ + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataLabels.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataLabels.java new file mode 100644 index 000000000000..d2c3d75b1d9c --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataLabels.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2024 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.asllib; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.util.HashMap; +import java.util.Map; + +/** + * Data label representation with data shared and data collected maps containing zero or more {@link + * DataCategory} + */ +public class DataLabels { + private final Map<String, DataCategory> mDataAccessed; + private final Map<String, DataCategory> mDataCollected; + private final Map<String, DataCategory> mDataShared; + + public DataLabels( + Map<String, DataCategory> dataAccessed, + Map<String, DataCategory> dataCollected, + Map<String, DataCategory> dataShared) { + mDataAccessed = dataAccessed; + mDataCollected = dataCollected; + mDataShared = dataShared; + } + + /** + * Returns the data accessed {@link Map} of {@link com.android.asllib.DataCategoryConstants} to + * {@link DataCategory} + */ + public Map<String, DataCategory> getDataAccessed() { + return mDataAccessed; + } + + /** + * Returns the data collected {@link Map} of {@link com.android.asllib.DataCategoryConstants} to + * {@link DataCategory} + */ + public Map<String, DataCategory> getDataCollected() { + return mDataCollected; + } + + /** + * Returns the data shared {@link Map} of {@link com.android.asllib.DataCategoryConstants} to + * {@link DataCategory} + */ + public Map<String, DataCategory> getDataShared() { + return mDataShared; + } + + /** Creates a {@link DataLabels} from the human-readable DOM element. */ + public static DataLabels createFromHrElement(Element ele) { + Map<String, DataCategory> dataAccessed = + getDataCategoriesWithTag(ele, XmlUtils.HR_TAG_DATA_ACCESSED); + Map<String, DataCategory> dataCollected = + getDataCategoriesWithTag(ele, XmlUtils.HR_TAG_DATA_COLLECTED); + Map<String, DataCategory> dataShared = + getDataCategoriesWithTag(ele, XmlUtils.HR_TAG_DATA_SHARED); + return new DataLabels(dataAccessed, dataCollected, dataShared); + } + + private static Map<String, DataCategory> getDataCategoriesWithTag( + Element dataLabelsEle, String dataCategoryUsageTypeTag) { + Map<String, Map<String, DataType>> dataTypeMap = + new HashMap<String, Map<String, DataType>>(); + NodeList dataSharedNodeList = dataLabelsEle.getElementsByTagName(dataCategoryUsageTypeTag); + + for (int i = 0; i < dataSharedNodeList.getLength(); i++) { + Element dataSharedEle = (Element) dataSharedNodeList.item(i); + String dataCategoryName = dataSharedEle.getAttribute(XmlUtils.HR_ATTR_DATA_CATEGORY); + String dataTypeName = dataSharedEle.getAttribute(XmlUtils.HR_ATTR_DATA_TYPE); + + if (!dataTypeMap.containsKey((dataCategoryName))) { + dataTypeMap.put(dataCategoryName, new HashMap<String, DataType>()); + } + dataTypeMap + .get(dataCategoryName) + .put(dataTypeName, DataType.createFromHrElement(dataSharedEle)); + } + + Map<String, DataCategory> dataCategoryMap = new HashMap<String, DataCategory>(); + for (String dataCategoryName : dataTypeMap.keySet()) { + Map<String, DataType> dataTypes = dataTypeMap.get(dataCategoryName); + dataCategoryMap.put(dataCategoryName, DataCategory.create(dataTypes)); + } + return dataCategoryMap; + } + + /** Gets the on-device DOM element for the {@link DataLabels}. */ + public Element toOdDomElement(Document doc) { + Element dataLabelsEle = + XmlUtils.createPbundleEleWithName(doc, XmlUtils.OD_NAME_DATA_LABELS); + + maybeAppendDataUsages(doc, dataLabelsEle, mDataCollected, XmlUtils.OD_NAME_DATA_ACCESSED); + maybeAppendDataUsages(doc, dataLabelsEle, mDataCollected, XmlUtils.OD_NAME_DATA_COLLECTED); + maybeAppendDataUsages(doc, dataLabelsEle, mDataShared, XmlUtils.OD_NAME_DATA_SHARED); + + return dataLabelsEle; + } + + private void maybeAppendDataUsages( + Document doc, + Element dataLabelsEle, + Map<String, DataCategory> dataCategoriesMap, + String dataUsageTypeName) { + if (dataCategoriesMap.isEmpty()) { + return; + } + Element dataUsageEle = XmlUtils.createPbundleEleWithName(doc, dataUsageTypeName); + + for (String dataCategoryName : dataCategoriesMap.keySet()) { + Element dataCategoryEle = XmlUtils.createPbundleEleWithName(doc, dataCategoryName); + DataCategory dataCategory = dataCategoriesMap.get(dataCategoryName); + for (String dataTypeName : dataCategory.getDataTypes().keySet()) { + DataType dataType = dataCategory.getDataTypes().get(dataTypeName); + Element dataTypeEle = XmlUtils.createPbundleEleWithName(doc, dataTypeName); + if (!dataType.getPurposeSet().isEmpty()) { + Element purposesEle = doc.createElement(XmlUtils.OD_TAG_INT_ARRAY); + purposesEle.setAttribute(XmlUtils.OD_ATTR_NAME, XmlUtils.OD_NAME_PURPOSES); + purposesEle.setAttribute( + XmlUtils.OD_ATTR_NUM, String.valueOf(dataType.getPurposeSet().size())); + for (DataType.Purpose purpose : dataType.getPurposeSet()) { + Element purposeEle = doc.createElement(XmlUtils.OD_TAG_ITEM); + purposeEle.setAttribute( + XmlUtils.OD_ATTR_VALUE, String.valueOf(purpose.getValue())); + purposesEle.appendChild(purposeEle); + } + dataTypeEle.appendChild(purposesEle); + } + + maybeAddBoolToOdElement( + doc, + dataTypeEle, + dataType.getIsCollectionOptional(), + XmlUtils.OD_NAME_IS_COLLECTION_OPTIONAL); + maybeAddBoolToOdElement( + doc, + dataTypeEle, + dataType.getIsSharingOptional(), + XmlUtils.OD_NAME_IS_SHARING_OPTIONAL); + maybeAddBoolToOdElement( + doc, dataTypeEle, dataType.getEphemeral(), XmlUtils.OD_NAME_EPHEMERAL); + + dataCategoryEle.appendChild(dataTypeEle); + } + dataUsageEle.appendChild(dataCategoryEle); + } + dataLabelsEle.appendChild(dataUsageEle); + } + + private static void maybeAddBoolToOdElement( + Document doc, Element parentEle, Boolean b, String odName) { + if (b == null) { + return; + } + Element ele = XmlUtils.createOdBooleanEle(doc, odName, b); + parentEle.appendChild(ele); + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataType.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataType.java new file mode 100644 index 000000000000..7451c6923113 --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataType.java @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2024 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.asllib; + +import org.w3c.dom.Element; + +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Data usage type representation. Types are specific to a {@link DataCategory} and contains + * metadata related to the data usage purpose. + */ +public class DataType { + public enum Purpose { + PURPOSE_APP_FUNCTIONALITY(1), + PURPOSE_ANALYTICS(2), + PURPOSE_DEVELOPER_COMMUNICATIONS(3), + PURPOSE_FRAUD_PREVENTION_SECURITY(4), + PURPOSE_ADVERTISING(5), + PURPOSE_PERSONALIZATION(6), + PURPOSE_ACCOUNT_MANAGEMENT(7); + + private static final String PURPOSE_PREFIX = "PURPOSE_"; + + private final int mValue; + + Purpose(int value) { + this.mValue = value; + } + + /** Get the int value associated with the Purpose. */ + public int getValue() { + return mValue; + } + + /** Get the Purpose associated with the int value. */ + public static Purpose forValue(int value) { + for (Purpose e : values()) { + if (e.getValue() == value) { + return e; + } + } + throw new IllegalArgumentException("No enum for value: " + value); + } + + /** Get the Purpose associated with the human-readable String. */ + public static Purpose forString(String s) { + for (Purpose e : values()) { + if (e.toString().equals(s)) { + return e; + } + } + throw new IllegalArgumentException("No enum for str: " + s); + } + + /** Human-readable String representation of Purpose. */ + public String toString() { + if (!this.name().startsWith(PURPOSE_PREFIX)) { + return this.name(); + } + return this.name().substring(PURPOSE_PREFIX.length()).toLowerCase(); + } + } + + private final Set<Purpose> mPurposeSet; + private final Boolean mIsCollectionOptional; + private final Boolean mIsSharingOptional; + private final Boolean mEphemeral; + + private DataType( + Set<Purpose> purposeSet, + Boolean isCollectionOptional, + Boolean isSharingOptional, + Boolean ephemeral) { + this.mPurposeSet = purposeSet; + this.mIsCollectionOptional = isCollectionOptional; + this.mIsSharingOptional = isSharingOptional; + this.mEphemeral = ephemeral; + } + + /** + * Returns {@link Set} of valid {@link Integer} purposes for using the associated data category + * and type + */ + public Set<Purpose> getPurposeSet() { + return mPurposeSet; + } + + /** + * For data-collected, returns {@code true} if data usage is user optional and {@code false} if + * data usage is required. Should return {@code null} for data-accessed and data-shared. + */ + public Boolean getIsCollectionOptional() { + return mIsCollectionOptional; + } + + /** + * For data-shared, returns {@code true} if data usage is user optional and {@code false} if + * data usage is required. Should return {@code null} for data-accessed and data-collected. + */ + public Boolean getIsSharingOptional() { + return mIsSharingOptional; + } + + /** + * For data-collected, returns {@code true} if data usage is user optional and {@code false} if + * data usage is processed ephemerally. Should return {@code null} for data-shared. + */ + public Boolean getEphemeral() { + return mEphemeral; + } + + /** Creates a {@link DataType} from the human-readable DOM element. */ + public static DataType createFromHrElement(Element hrDataTypeEle) { + Set<Purpose> purposeSet = + Arrays.stream(hrDataTypeEle.getAttribute(XmlUtils.HR_ATTR_PURPOSES).split("\\|")) + .map(Purpose::forString) + .collect(Collectors.toUnmodifiableSet()); + Boolean isCollectionOptional = + XmlUtils.fromString( + hrDataTypeEle.getAttribute(XmlUtils.HR_ATTR_IS_SHARING_OPTIONAL)); + Boolean isSharingOptional = + XmlUtils.fromString( + hrDataTypeEle.getAttribute(XmlUtils.HR_ATTR_IS_COLLECTION_OPTIONAL)); + Boolean ephemeral = + XmlUtils.fromString(hrDataTypeEle.getAttribute(XmlUtils.HR_ATTR_EPHEMERAL)); + return new DataType(purposeSet, isCollectionOptional, isSharingOptional, ephemeral); + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataTypeConstants.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataTypeConstants.java new file mode 100644 index 000000000000..a0a75377e988 --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/DataTypeConstants.java @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2024 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.asllib; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * Constants for determining valid {@link String} data types for usage within {@link SafetyLabels}, + * {@link DataCategory}, and {@link DataType} + */ +public class DataTypeConstants { + /** Data types for {@link DataCategoryConstants.CATEGORY_PERSONAL} */ + public static final String TYPE_NAME = "name"; + + public static final String TYPE_EMAIL_ADDRESS = "email_address"; + public static final String TYPE_PHONE_NUMBER = "phone_number"; + public static final String TYPE_RACE_ETHNICITY = "race_ethnicity"; + public static final String TYPE_POLITICAL_OR_RELIGIOUS_BELIEFS = + "political_or_religious_beliefs"; + public static final String TYPE_SEXUAL_ORIENTATION_OR_GENDER_IDENTITY = + "sexual_orientation_or_gender_identity"; + public static final String TYPE_PERSONAL_IDENTIFIERS = "personal_identifiers"; + public static final String TYPE_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_FINANCIAL} */ + public static final String TYPE_CARD_BANK_ACCOUNT = "card_bank_account"; + + public static final String TYPE_PURCHASE_HISTORY = "purchase_history"; + public static final String TYPE_CREDIT_SCORE = "credit_score"; + public static final String TYPE_FINANCIAL_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_LOCATION} */ + public static final String TYPE_APPROX_LOCATION = "approx_location"; + + public static final String TYPE_PRECISE_LOCATION = "precise_location"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_EMAIL_TEXT_MESSAGE} */ + public static final String TYPE_EMAILS = "emails"; + + public static final String TYPE_TEXT_MESSAGES = "text_messages"; + public static final String TYPE_EMAIL_TEXT_MESSAGE_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_PHOTO_VIDEO} */ + public static final String TYPE_PHOTOS = "photos"; + + public static final String TYPE_VIDEOS = "videos"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_AUDIO} */ + public static final String TYPE_SOUND_RECORDINGS = "sound_recordings"; + + public static final String TYPE_MUSIC_FILES = "music_files"; + public static final String TYPE_AUDIO_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_STORAGE} */ + public static final String TYPE_FILES_DOCS = "files_docs"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_HEALTH_FITNESS} */ + public static final String TYPE_HEALTH = "health"; + + public static final String TYPE_FITNESS = "fitness"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_CONTACTS} */ + public static final String TYPE_CONTACTS = "contacts"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_CALENDAR} */ + public static final String TYPE_CALENDAR = "calendar"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_IDENTIFIERS} */ + public static final String TYPE_IDENTIFIERS_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_APP_PERFORMANCE} */ + public static final String TYPE_CRASH_LOGS = "crash_logs"; + + public static final String TYPE_PERFORMANCE_DIAGNOSTICS = "performance_diagnostics"; + public static final String TYPE_APP_PERFORMANCE_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_ACTIONS_IN_APP} */ + public static final String TYPE_USER_INTERACTION = "user_interaction"; + + public static final String TYPE_IN_APP_SEARCH_HISTORY = "in_app_search_history"; + public static final String TYPE_INSTALLED_APPS = "installed_apps"; + public static final String TYPE_USER_GENERATED_CONTENT = "user_generated_content"; + public static final String TYPE_ACTIONS_IN_APP_OTHER = "other"; + + /** Data types for {@link DataCategoryConstants.CATEGORY_SEARCH_AND_BROWSING} */ + public static final String TYPE_WEB_BROWSING_HISTORY = "web_browsing_history"; + + /** Set of valid categories */ + public static final Set<String> VALID_TYPES = + Collections.unmodifiableSet( + new HashSet<>( + Arrays.asList( + TYPE_NAME, + TYPE_EMAIL_ADDRESS, + TYPE_PHONE_NUMBER, + TYPE_RACE_ETHNICITY, + TYPE_POLITICAL_OR_RELIGIOUS_BELIEFS, + TYPE_SEXUAL_ORIENTATION_OR_GENDER_IDENTITY, + TYPE_PERSONAL_IDENTIFIERS, + TYPE_OTHER, + TYPE_CARD_BANK_ACCOUNT, + TYPE_PURCHASE_HISTORY, + TYPE_CREDIT_SCORE, + TYPE_FINANCIAL_OTHER, + TYPE_APPROX_LOCATION, + TYPE_PRECISE_LOCATION, + TYPE_EMAILS, + TYPE_TEXT_MESSAGES, + TYPE_EMAIL_TEXT_MESSAGE_OTHER, + TYPE_PHOTOS, + TYPE_VIDEOS, + TYPE_SOUND_RECORDINGS, + TYPE_MUSIC_FILES, + TYPE_AUDIO_OTHER, + TYPE_FILES_DOCS, + TYPE_HEALTH, + TYPE_FITNESS, + TYPE_CONTACTS, + TYPE_CALENDAR, + TYPE_IDENTIFIERS_OTHER, + TYPE_CRASH_LOGS, + TYPE_PERFORMANCE_DIAGNOSTICS, + TYPE_APP_PERFORMANCE_OTHER, + TYPE_USER_INTERACTION, + TYPE_IN_APP_SEARCH_HISTORY, + TYPE_INSTALLED_APPS, + TYPE_USER_GENERATED_CONTENT, + TYPE_ACTIONS_IN_APP_OTHER, + TYPE_WEB_BROWSING_HISTORY))); + + /** Returns {@link Set} of valid {@link String} category keys */ + public static Set<String> getValidDataTypes() { + return VALID_TYPES; + } + + private DataTypeConstants() { + /* do nothing - hide constructor */ + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/SafetyLabels.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/SafetyLabels.java new file mode 100644 index 000000000000..6ba15e1ec4db --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/SafetyLabels.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2024 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.asllib; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +/** Safety Label representation containing zero or more {@link DataCategory} for data shared */ +public class SafetyLabels { + + private final Long mVersion; + private final DataLabels mDataLabels; + + private SafetyLabels(Long version, DataLabels dataLabels) { + this.mVersion = version; + this.mDataLabels = dataLabels; + } + + /** Returns the data label for the safety label */ + public DataLabels getDataLabel() { + return mDataLabels; + } + + /** Gets the version of the {@link SafetyLabels}. */ + public Long getVersion() { + return mVersion; + } + + /** Creates a {@link SafetyLabels} from the human-readable DOM element. */ + public static SafetyLabels createFromHrElement(Element safetyLabelsEle) { + Long version; + try { + version = Long.parseLong(safetyLabelsEle.getAttribute(XmlUtils.HR_ATTR_VERSION)); + } catch (Exception e) { + throw new IllegalArgumentException( + "Malformed or missing required version in safety labels."); + } + Element dataLabelsEle = + XmlUtils.getSingleElement(safetyLabelsEle, XmlUtils.HR_TAG_DATA_LABELS); + DataLabels dataLabels = DataLabels.createFromHrElement(dataLabelsEle); + return new SafetyLabels(version, dataLabels); + } + + /** Creates an on-device DOM element from the {@link SafetyLabels}. */ + public Element toOdDomElement(Document doc) { + Element safetyLabelsEle = + XmlUtils.createPbundleEleWithName(doc, XmlUtils.OD_NAME_SAFETY_LABELS); + safetyLabelsEle.appendChild(mDataLabels.toOdDomElement(doc)); + return safetyLabelsEle; + } +} diff --git a/tools/app_metadata_bundles/src/lib/java/com/android/asllib/XmlUtils.java b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/XmlUtils.java new file mode 100644 index 000000000000..4392c2c220c4 --- /dev/null +++ b/tools/app_metadata_bundles/src/lib/java/com/android/asllib/XmlUtils.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2024 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.asllib; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +public class XmlUtils { + public static final String HR_TAG_APP_METADATA_BUNDLES = "app-metadata-bundles"; + public static final String HR_TAG_SAFETY_LABELS = "safety-labels"; + public static final String HR_TAG_DATA_LABELS = "data-labels"; + public static final String HR_TAG_DATA_ACCESSED = "data-accessed"; + public static final String HR_TAG_DATA_COLLECTED = "data-collected"; + public static final String HR_TAG_DATA_SHARED = "data-shared"; + + public static final String HR_ATTR_DATA_CATEGORY = "dataCategory"; + public static final String HR_ATTR_DATA_TYPE = "dataType"; + public static final String HR_ATTR_IS_COLLECTION_OPTIONAL = "isCollectionOptional"; + public static final String HR_ATTR_IS_SHARING_OPTIONAL = "isSharingOptional"; + public static final String HR_ATTR_EPHEMERAL = "ephemeral"; + public static final String HR_ATTR_PURPOSES = "purposes"; + public static final String HR_ATTR_VERSION = "version"; + + public static final String OD_TAG_BUNDLE = "bundle"; + public static final String OD_TAG_PBUNDLE_AS_MAP = "pbundle_as_map"; + public static final String OD_TAG_BOOLEAN = "boolean"; + public static final String OD_TAG_INT_ARRAY = "int-array"; + public static final String OD_TAG_ITEM = "item"; + public static final String OD_ATTR_NAME = "name"; + public static final String OD_ATTR_VALUE = "value"; + public static final String OD_ATTR_NUM = "num"; + public static final String OD_NAME_SAFETY_LABELS = "safety_labels"; + public static final String OD_NAME_DATA_LABELS = "data_labels"; + public static final String OD_NAME_DATA_ACCESSED = "data_accessed"; + public static final String OD_NAME_DATA_COLLECTED = "data_collected"; + public static final String OD_NAME_DATA_SHARED = "data_shared"; + public static final String OD_NAME_PURPOSES = "purposes"; + public static final String OD_NAME_IS_COLLECTION_OPTIONAL = "is_collection_optional"; + public static final String OD_NAME_IS_SHARING_OPTIONAL = "is_sharing_optional"; + public static final String OD_NAME_EPHEMERAL = "ephemeral"; + + public static final String TRUE_STR = "true"; + public static final String FALSE_STR = "false"; + + /** Gets the single top-level {@link Element} having the {@param tagName}. */ + public static Element getSingleElement(Document doc, String tagName) { + var elements = doc.getElementsByTagName(tagName); + return getSingleElement(elements, tagName); + } + + /** + * Gets the single {@link Element} within {@param parentEle} and having the {@param tagName}. + */ + public static Element getSingleElement(Element parentEle, String tagName) { + var elements = parentEle.getElementsByTagName(tagName); + return getSingleElement(elements, tagName); + } + + /** Gets the single {@link Element} from {@param elements} and having the {@param tagName}. */ + public static Element getSingleElement(NodeList elements, String tagName) { + if (elements.getLength() != 1) { + throw new IllegalArgumentException( + String.format("Expected 1 %s but got %s.", tagName, elements.getLength())); + } + var elementAsNode = elements.item(0); + if (!(elementAsNode instanceof Element)) { + throw new IllegalStateException(String.format("%s was not an element.", tagName)); + } + return ((Element) elementAsNode); + } + + /** Gets the Boolean from the String value. */ + public static Boolean fromString(String s) { + if (s == null) { + return null; + } + if (s.equals(TRUE_STR)) { + return true; + } else if (s.equals(FALSE_STR)) { + return false; + } + return null; + } + + /** Creates an on-device PBundle DOM Element with the given attribute name. */ + public static Element createPbundleEleWithName(Document doc, String name) { + var ele = doc.createElement(XmlUtils.OD_TAG_PBUNDLE_AS_MAP); + ele.setAttribute(XmlUtils.OD_ATTR_NAME, name); + return ele; + } + + /** Create an on-device Boolean DOM Element with the given attribute name. */ + public static Element createOdBooleanEle(Document doc, String name, boolean b) { + var ele = doc.createElement(XmlUtils.OD_TAG_BOOLEAN); + ele.setAttribute(XmlUtils.OD_ATTR_NAME, name); + ele.setAttribute(XmlUtils.OD_ATTR_VALUE, String.valueOf(b)); + return ele; + } + + /** Returns whether the String is null or empty. */ + public static boolean isNullOrEmpty(String s) { + return s == null || s.isEmpty(); + } +} diff --git a/tools/hoststubgen/TEST_MAPPING b/tools/hoststubgen/TEST_MAPPING index b5d5b5fb6d92..eca258c5a74d 100644 --- a/tools/hoststubgen/TEST_MAPPING +++ b/tools/hoststubgen/TEST_MAPPING @@ -1,7 +1,6 @@ { "presubmit": [ - // TODO(b/326897452): Reenable after JDK 21 switch. - // { "name": "tiny-framework-dump-test" }, + { "name": "tiny-framework-dump-test" }, { "name": "hoststubgentest" }, { "name": "hoststubgen-invoke-test" } ], |