diff options
310 files changed, 9463 insertions, 3611 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/tare/PowerSaveModeModifier.java b/apex/jobscheduler/service/java/com/android/server/tare/PowerSaveModeModifier.java index 764a3a8b1ed9..4aaa9f449b4f 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/PowerSaveModeModifier.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/PowerSaveModeModifier.java @@ -17,27 +17,48 @@ package com.android.server.tare; import android.annotation.NonNull; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.os.PowerManager; +import android.os.SystemClock; import android.util.IndentingPrintWriter; +import android.util.Log; +import android.util.Slog; /** Modifier that makes things more expensive in adaptive and full battery saver are active. */ class PowerSaveModeModifier extends Modifier { + private static final String TAG = "TARE-" + PowerSaveModeModifier.class.getSimpleName(); + private static final boolean DEBUG = InternalResourceService.DEBUG + || Log.isLoggable(TAG, Log.DEBUG); + private final InternalResourceService mIrs; - private final PowerManager mPowerManager; + private final PowerSaveModeTracker mPowerSaveModeTracker; PowerSaveModeModifier(@NonNull InternalResourceService irs) { super(); mIrs = irs; - mPowerManager = irs.getContext().getSystemService(PowerManager.class); + mPowerSaveModeTracker = new PowerSaveModeTracker(); + } + + @Override + public void setup() { + mPowerSaveModeTracker.startTracking(mIrs.getContext()); + } + + @Override + public void tearDown() { + mPowerSaveModeTracker.stopTracking(mIrs.getContext()); } @Override long getModifiedCostToProduce(long ctp) { - if (mPowerManager.isPowerSaveMode()) { + if (mPowerSaveModeTracker.mPowerSaveModeEnabled) { return (long) (1.5 * ctp); } // TODO: get adaptive power save mode - if (mPowerManager.isPowerSaveMode()) { + if (mPowerSaveModeTracker.mPowerSaveModeEnabled) { return (long) (1.25 * ctp); } return ctp; @@ -46,6 +67,45 @@ class PowerSaveModeModifier extends Modifier { @Override void dump(IndentingPrintWriter pw) { pw.print("power save="); - pw.println(mPowerManager.isPowerSaveMode()); + pw.println(mPowerSaveModeTracker.mPowerSaveModeEnabled); + } + + // TODO: migrate to relying on PowerSaveState and ServiceType.TARE + private final class PowerSaveModeTracker extends BroadcastReceiver { + private final PowerManager mPowerManager; + private volatile boolean mPowerSaveModeEnabled; + + private PowerSaveModeTracker() { + mPowerManager = mIrs.getContext().getSystemService(PowerManager.class); + } + + public void startTracking(@NonNull Context context) { + final IntentFilter filter = new IntentFilter(); + filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED); + context.registerReceiver(this, filter); + + // Initialise tracker state. + mPowerSaveModeEnabled = mPowerManager.isPowerSaveMode(); + } + + public void stopTracking(@NonNull Context context) { + context.unregisterReceiver(this); + } + + @Override + public void onReceive(Context context, Intent intent) { + final String action = intent.getAction(); + if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)) { + final boolean enabled = mPowerManager.isPowerSaveMode(); + if (DEBUG) { + Slog.d(TAG, "Power save mode changed to " + enabled + + ", fired @ " + SystemClock.elapsedRealtime()); + } + if (mPowerSaveModeEnabled != enabled) { + mPowerSaveModeEnabled = enabled; + mIrs.onDeviceStateChanged(); + } + } + } } } diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index b843dcaaf680..cae6cdcf8f1f 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -25,6 +25,7 @@ import static android.app.usage.UsageStatsManager.REASON_MAIN_TIMEOUT; import static android.app.usage.UsageStatsManager.REASON_MAIN_USAGE; import static android.app.usage.UsageStatsManager.REASON_SUB_DEFAULT_APP_UPDATE; import static android.app.usage.UsageStatsManager.REASON_SUB_FORCED_SYSTEM_FLAG_BUGGY; +import static android.app.usage.UsageStatsManager.REASON_SUB_FORCED_USER_FLAG_INTERACTION; import static android.app.usage.UsageStatsManager.REASON_SUB_MASK; import static android.app.usage.UsageStatsManager.REASON_SUB_PREDICTED_RESTORED; import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_ACTIVE_TIMEOUT; @@ -1581,7 +1582,11 @@ public class AppStandbyController // Only user force can bypass the delay restriction. If the user forced the // app into the RESTRICTED bucket, then a toast confirming the action // shouldn't be surprising. - if (Build.IS_DEBUGGABLE) { + // Exclude REASON_SUB_FORCED_USER_FLAG_INTERACTION since the RESTRICTED bucket + // isn't directly visible in that flow. + if (Build.IS_DEBUGGABLE + && (reason & REASON_SUB_MASK) + != REASON_SUB_FORCED_USER_FLAG_INTERACTION) { Toast.makeText(mContext, // Since AppStandbyController sits low in the lock hierarchy, // make sure not to call out with the lock held. diff --git a/api/Android.bp b/api/Android.bp index bbe26b73c721..8370c1069710 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -93,7 +93,6 @@ metalava_cmd = "$(location metalava)" // Silence reflection warnings. See b/168689341 metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " metalava_cmd += " --quiet --no-banner --format=v2 " -metalava_cmd += " --hide ChangedThrows " genrule { name: "current-api-xml", @@ -187,8 +186,10 @@ genrule { cmd: metalava_cmd + "--check-compatibility:api:released $(location :android.api.module-lib.latest) " + // Note: having "public" be the base of module-lib is not perfect -- it should - // ideally be a merged public+system), but this will help when migrating from - // MODULE_LIBS -> public. + // ideally be a merged public+system (which metalava is not currently able to generate). + // This "base" will help when migrating from MODULE_LIBS -> public, but not when + // migrating from MODULE_LIBS -> system (where it needs to instead be listed as + // an incompatibility). "--check-compatibility:base $(location :frameworks-base-api-current.txt) " + "--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " + "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " + diff --git a/cmds/idmap2/tests/IdmapTests.cpp b/cmds/idmap2/tests/IdmapTests.cpp index 9c6402a6e36e..738b9cf237c9 100644 --- a/cmds/idmap2/tests/IdmapTests.cpp +++ b/cmds/idmap2/tests/IdmapTests.cpp @@ -37,7 +37,6 @@ #include "idmap2/Idmap.h" #include "idmap2/LogInfo.h" -using android::Res_value; using ::testing::NotNull; using PolicyFlags = android::ResTable_overlayable_policy_header::PolicyFlags; diff --git a/cmds/idmap2/tests/ResourceMappingTests.cpp b/cmds/idmap2/tests/ResourceMappingTests.cpp index 5a1d808af06f..32b3d1326d92 100644 --- a/cmds/idmap2/tests/ResourceMappingTests.cpp +++ b/cmds/idmap2/tests/ResourceMappingTests.cpp @@ -29,8 +29,6 @@ #include "idmap2/LogInfo.h" #include "idmap2/ResourceMapping.h" -using android::Res_value; - using PolicyFlags = android::ResTable_overlayable_policy_header::PolicyFlags; namespace android::idmap2 { diff --git a/core/api/current.txt b/core/api/current.txt index 5dd85c0d9ac4..a67bf76f22ef 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2094,7 +2094,7 @@ package android { field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038 field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036 - field public static final int accessibilityActionShowSuggestions; + field public static final int accessibilityActionShowTextSuggestions; field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044 field public static final int accessibilityActionSwipeDown; field public static final int accessibilityActionSwipeLeft; @@ -7704,9 +7704,10 @@ package android.app.admin { field public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE"; field public static final String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID"; field public static final String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE"; - field public static final String EXTRA_RESOURCE_ID = "android.app.extra.RESOURCE_ID"; - field public static final String EXTRA_RESOURCE_TYPE_DRAWABLE = "android.app.extra.RESOURCE_TYPE_DRAWABLE"; - field public static final String EXTRA_RESOURCE_TYPE_STRING = "android.app.extra.RESOURCE_TYPE_STRING"; + field public static final String EXTRA_RESOURCE_IDS = "android.app.extra.RESOURCE_IDS"; + field public static final String EXTRA_RESOURCE_TYPE = "android.app.extra.RESOURCE_TYPE"; + field public static final int EXTRA_RESOURCE_TYPE_DRAWABLE = 1; // 0x1 + field public static final int EXTRA_RESOURCE_TYPE_STRING = 2; // 0x2 field public static final String EXTRA_RESULT_LAUNCH_INTENT = "android.app.extra.RESULT_LAUNCH_INTENT"; field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1 field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2 @@ -17402,7 +17403,7 @@ package android.hardware.camera2 { field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_RAW; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_PARTIAL_RESULT_COUNT; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> REQUEST_PIPELINE_MAX_DEPTH; - field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE; + field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Long> REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES; field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SCALER_AVAILABLE_STREAM_USE_CASES; @@ -18122,22 +18123,23 @@ package android.hardware.camera2.params { } public final class DynamicRangeProfiles { - ctor public DynamicRangeProfiles(@NonNull int[]); - method @NonNull public java.util.Set<java.lang.Integer> getProfileCaptureRequestConstraints(int); - method @NonNull public java.util.Set<java.lang.Integer> getSupportedProfiles(); - field public static final int DOLBY_VISION_10B_HDR_OEM = 64; // 0x40 - field public static final int DOLBY_VISION_10B_HDR_OEM_PO = 128; // 0x80 - field public static final int DOLBY_VISION_10B_HDR_REF = 16; // 0x10 - field public static final int DOLBY_VISION_10B_HDR_REF_PO = 32; // 0x20 - field public static final int DOLBY_VISION_8B_HDR_OEM = 1024; // 0x400 - field public static final int DOLBY_VISION_8B_HDR_OEM_PO = 2048; // 0x800 - field public static final int DOLBY_VISION_8B_HDR_REF = 256; // 0x100 - field public static final int DOLBY_VISION_8B_HDR_REF_PO = 512; // 0x200 - field public static final int HDR10 = 4; // 0x4 - field public static final int HDR10_PLUS = 8; // 0x8 - field public static final int HLG10 = 2; // 0x2 - field public static final int PUBLIC_MAX = 4096; // 0x1000 - field public static final int STANDARD = 1; // 0x1 + ctor public DynamicRangeProfiles(@NonNull long[]); + method @NonNull public java.util.Set<java.lang.Long> getProfileCaptureRequestConstraints(long); + method @NonNull public java.util.Set<java.lang.Long> getSupportedProfiles(); + method public boolean isExtraLatencyPresent(long); + field public static final long DOLBY_VISION_10B_HDR_OEM = 64L; // 0x40L + field public static final long DOLBY_VISION_10B_HDR_OEM_PO = 128L; // 0x80L + field public static final long DOLBY_VISION_10B_HDR_REF = 16L; // 0x10L + field public static final long DOLBY_VISION_10B_HDR_REF_PO = 32L; // 0x20L + field public static final long DOLBY_VISION_8B_HDR_OEM = 1024L; // 0x400L + field public static final long DOLBY_VISION_8B_HDR_OEM_PO = 2048L; // 0x800L + field public static final long DOLBY_VISION_8B_HDR_REF = 256L; // 0x100L + field public static final long DOLBY_VISION_8B_HDR_REF_PO = 512L; // 0x200L + field public static final long HDR10 = 4L; // 0x4L + field public static final long HDR10_PLUS = 8L; // 0x8L + field public static final long HLG10 = 2L; // 0x2L + field public static final long PUBLIC_MAX = 4096L; // 0x1000L + field public static final long STANDARD = 1L; // 0x1L } public final class ExtensionSessionConfiguration { @@ -18244,7 +18246,7 @@ package android.hardware.camera2.params { method @NonNull public static java.util.Collection<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull android.hardware.camera2.MultiResolutionImageReader); method public int describeContents(); method public void enableSurfaceSharing(); - method public int getDynamicRangeProfile(); + method public long getDynamicRangeProfile(); method public int getMaxSharedSurfaceCount(); method public int getMirrorMode(); method public int getStreamUseCase(); @@ -18254,7 +18256,7 @@ package android.hardware.camera2.params { method public int getTimestampBase(); method public void removeSensorPixelModeUsed(int); method public void removeSurface(@NonNull android.view.Surface); - method public void setDynamicRangeProfile(int); + method public void setDynamicRangeProfile(long); method public void setMirrorMode(int); method public void setPhysicalCameraId(@Nullable String); method public void setStreamUseCase(int); @@ -31802,7 +31804,7 @@ package android.os { method public android.os.PowerManager.WakeLock newWakeLock(int, String); method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String); method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener); - field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000 + field @Deprecated public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000 field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED"; field public static final String ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED"; field public static final String ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED = "android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED"; @@ -35453,8 +35455,8 @@ package android.provider { field public static final String EXTRA_WIFI_NETWORK_RESULT_LIST = "android.provider.extra.WIFI_NETWORK_RESULT_LIST"; field public static final String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG"; field public static final String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON"; - field public static final String SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = "supervisor_restricted_biometrics_controller"; - field public static final String SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = ""; + field public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1; // 0x1 + field public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0; // 0x0 } public static final class Settings.Global extends android.provider.Settings.NameValueTable { @@ -49303,7 +49305,7 @@ package android.view { method @NonNull public android.view.SurfaceControl.Transaction setDataSpace(@NonNull android.view.SurfaceControl, int); method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int); method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int, int); - method @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int); + method @Deprecated @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int); method @NonNull public android.view.SurfaceControl.Transaction setLayer(@NonNull android.view.SurfaceControl, @IntRange(from=java.lang.Integer.MIN_VALUE, to=java.lang.Integer.MAX_VALUE) int); method @NonNull public android.view.SurfaceControl.Transaction setOpaque(@NonNull android.view.SurfaceControl, boolean); method @NonNull public android.view.SurfaceControl.Transaction setPosition(@NonNull android.view.SurfaceControl, float, float); @@ -51949,7 +51951,7 @@ package android.view.accessibility { field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_ON_SCREEN; - field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_SUGGESTIONS; + field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TOOLTIP; field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_DOWN; field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_LEFT; @@ -53123,7 +53125,7 @@ package android.view.inputmethod { field public static final int RESULT_SHOWN = 2; // 0x2 field public static final int RESULT_UNCHANGED_HIDDEN = 1; // 0x1 field public static final int RESULT_UNCHANGED_SHOWN = 0; // 0x0 - field public static final int SHOW_FORCED = 2; // 0x2 + field @Deprecated public static final int SHOW_FORCED = 2; // 0x2 field public static final int SHOW_IMPLICIT = 1; // 0x1 } diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 594f46b6694b..7ec239d681d0 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -413,6 +413,7 @@ package android.os.storage { public class StorageManager { method public long computeStorageCacheBytes(@NonNull java.io.File); + method @Nullable public String getCloudMediaProvider(); method public void notifyAppIoBlocked(@NonNull java.util.UUID, int, int, int); method public void notifyAppIoResumed(@NonNull java.util.UUID, int, int, int); method public void setCloudMediaProvider(@Nullable String); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ea004c02e2ab..71178ccee670 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1045,7 +1045,7 @@ package android.app { public class WallpaperManager { method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void clearWallpaper(int, int); - method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public float getWallpaperDimAmount(); + method @FloatRange(from=0.0f, to=1.0f) @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public float getWallpaperDimAmount(); method public void setDisplayOffset(android.os.IBinder, int, int); method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName); method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public void setWallpaperDimAmount(@FloatRange(from=0.0f, to=1.0f) float); @@ -2634,18 +2634,18 @@ package android.app.wallpapereffectsgeneration { method public int describeContents(); method @NonNull public float[] getAnchorPointInOutputUvSpace(); method @NonNull public float[] getAnchorPointInWorldSpace(); - method public float getCameraOrbitPitchDegrees(); - method public float getCameraOrbitYawDegrees(); + method @FloatRange(from=-90.0F, to=90.0f) public float getCameraOrbitPitchDegrees(); + method @FloatRange(from=-180.0F, to=180.0f) public float getCameraOrbitYawDegrees(); method public float getDollyDistanceInWorldSpace(); - method public float getFrustumFarInWorldSpace(); - method public float getFrustumNearInWorldSpace(); - method public float getVerticalFovDegrees(); + method @FloatRange(from=0.0f) public float getFrustumFarInWorldSpace(); + method @FloatRange(from=0.0f) public float getFrustumNearInWorldSpace(); + method @FloatRange(from=0.0f, to=180.0f, fromInclusive=false) public float getVerticalFovDegrees(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.CameraAttributes> CREATOR; } public static final class CameraAttributes.Builder { - ctor public CameraAttributes.Builder(@NonNull float[], @NonNull float[]); + ctor public CameraAttributes.Builder(@NonNull @Size(3) float[], @NonNull @Size(2) float[]); method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes build(); method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setCameraOrbitPitchDegrees(@FloatRange(from=-90.0F, to=90.0f) float); method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setCameraOrbitYawDegrees(@FloatRange(from=-180.0F, to=180.0f) float); @@ -2673,12 +2673,11 @@ package android.app.wallpapereffectsgeneration { method @NonNull public String getTaskId(); method @NonNull public java.util.List<android.app.wallpapereffectsgeneration.TexturedMesh> getTexturedMeshes(); method public void writeToParcel(@NonNull android.os.Parcel, int); - field public static final int CINEMATIC_EFFECT_STATUS_ERROR = 2; // 0x2 - field public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 3; // 0x3 + field public static final int CINEMATIC_EFFECT_STATUS_ERROR = 0; // 0x0 + field public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 2; // 0x2 field public static final int CINEMATIC_EFFECT_STATUS_OK = 1; // 0x1 - field public static final int CINEMATIC_EFFECT_STATUS_PENDING = 4; // 0x4 - field public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 5; // 0x5 - field public static final int CINEMATIC_EFFECT_STATUS_UNKNOWN = 0; // 0x0 + field public static final int CINEMATIC_EFFECT_STATUS_PENDING = 3; // 0x3 + field public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 4; // 0x4 field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.CinematicEffectResponse> CREATOR; field public static final int IMAGE_CONTENT_TYPE_LANDSCAPE = 2; // 0x2 field public static final int IMAGE_CONTENT_TYPE_OTHER = 3; // 0x3 @@ -11994,8 +11993,9 @@ package android.service.wallpapereffectsgeneration { public abstract class WallpaperEffectsGenerationService extends android.app.Service { ctor public WallpaperEffectsGenerationService(); method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent); - method public abstract void onGenerateCinematicEffect(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectRequest); + method @MainThread public abstract void onGenerateCinematicEffect(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectRequest); method public final void returnCinematicEffectResponse(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectResponse); + field public static final String SERVICE_INTERFACE = "android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService"; } } diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt index 1b45e88584fe..db375d42f0b1 100644 --- a/core/api/system-lint-baseline.txt +++ b/core/api/system-lint-baseline.txt @@ -99,15 +99,6 @@ ProtectedMember: android.service.notification.NotificationAssistantService#attac -RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimAmount(): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimmingAmount(): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimAmount(float): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimmingAmount(float): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) - SamShouldBeLast: android.accounts.AccountManager#addAccount(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 6ebf18820b0c..da7f0847d957 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2348,6 +2348,8 @@ package android.service.dreams { public abstract class DreamOverlayService extends android.app.Service { ctor public DreamOverlayService(); + method @Nullable public final CharSequence getDreamLabel(); + method public final boolean isPreviewMode(); method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); method public abstract void onStartDream(@NonNull android.view.WindowManager.LayoutParams); method public final void requestExit(); @@ -3083,6 +3085,7 @@ package android.view.inputmethod { method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodListAsUser(int); method public boolean hasActiveInputConnection(@Nullable android.view.View); method public boolean isInputMethodPickerShown(); + field public static final long CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING = 214016041L; // 0xcc1a029L } } diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index e31a56690408..8b3c9fa73798 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -523,6 +523,8 @@ public class BroadcastOptions extends ComponentOptions { * Sets whether events (such as posting a notification) originating from an app after it * receives the broadcast while in background should be recorded as responses to the broadcast. * + * <p> Note that this will only be considered when sending explicit broadcast intents. + * * @param id ID to be used for the response events corresponding to this broadcast. If the * value is {@code 0} (default), then response events will not be recorded. Otherwise, * they will be recorded with the ID provided. diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index 28c273ec50a6..167de463ad17 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -211,6 +211,7 @@ interface IWallpaperManager { * * @hide */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT)") oneway void setWallpaperDimAmount(float dimAmount); /** @@ -219,6 +220,7 @@ interface IWallpaperManager { * * @hide */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT)") float getWallpaperDimAmount(); /** diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 77c7c6f80f0e..99a523a0e18a 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -1377,18 +1377,16 @@ public final class LoadedApk { Slog.wtf(TAG, "App instance already created for package=" + mPackageName + " instance=" + cached); } - // TODO Return the cached one, unless it's for the wrong user? + // TODO Return the cached one, unles it's for the wrong user? // For now, we just add WTF checks. } } Application app = null; - // Temporarily disable per-process app class to investigate b/185177290 -// final String myProcessName = Process.myProcessName(); -// String appClass = mApplicationInfo.getCustomApplicationClassNameForProcess( -// myProcessName); - String appClass = mApplicationInfo.className; + final String myProcessName = Process.myProcessName(); + String appClass = mApplicationInfo.getCustomApplicationClassNameForProcess( + myProcessName); if (forceDefaultAppClass || (appClass == null)) { appClass = "android.app.Application"; } diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 0a18588e0131..ea80369983a5 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -2023,7 +2023,7 @@ public class WallpaperManager { */ @SystemApi @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) - public float getWallpaperDimAmount() { + public @FloatRange (from = 0f, to = 1f) float getWallpaperDimAmount() { if (sGlobals.mService == null) { Log.w(TAG, "WallpaperService not running"); throw new RuntimeException(new DeadSystemException()); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 55816e44005b..47203183c2fc 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3611,42 +3611,45 @@ public class DevicePolicyManager { /** * Broadcast action: notify system apps (e.g. settings, SysUI, etc) that the device management - * resources with IDs {@link #EXTRA_RESOURCE_ID} has been updated, the updated resources can be + * resources with IDs {@link #EXTRA_RESOURCE_IDS} has been updated, the updated resources can be * retrieved using {@link #getDrawable} and {@code #getString}. * * <p>This broadcast is sent to registered receivers only. * - * <p> The following extras will be included to identify the type of resource being updated: - * <ul> - * <li>{@link #EXTRA_RESOURCE_TYPE_DRAWABLE} for drawable resources</li> - * <li>{@link #EXTRA_RESOURCE_TYPE_STRING} for string resources</li> - * </ul> + * <p> {@link #EXTRA_RESOURCE_TYPE} will be included to identify the type of resource being + * updated. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_DEVICE_POLICY_RESOURCE_UPDATED = "android.app.action.DEVICE_POLICY_RESOURCE_UPDATED"; /** - * A boolean extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate that a - * resource of type {@link Drawable} is being updated. + * An {@code int} extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate the type + * of the resource being updated, the type can be {@link #EXTRA_RESOURCE_TYPE_DRAWABLE} or + * {@link #EXTRA_RESOURCE_TYPE_STRING} + */ + public static final String EXTRA_RESOURCE_TYPE = + "android.app.extra.RESOURCE_TYPE"; + + /** + * A {@code int} value for {@link #EXTRA_RESOURCE_TYPE} to indicate that a resource of type + * {@link Drawable} is being updated. */ - public static final String EXTRA_RESOURCE_TYPE_DRAWABLE = - "android.app.extra.RESOURCE_TYPE_DRAWABLE"; + public static final int EXTRA_RESOURCE_TYPE_DRAWABLE = 1; /** - * A boolean extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate that a - * resource of type {@link String} is being updated. + * A {@code int} value for {@link #EXTRA_RESOURCE_TYPE} to indicate that a resource of type + * {@link String} is being updated. */ - public static final String EXTRA_RESOURCE_TYPE_STRING = - "android.app.extra.RESOURCE_TYPE_STRING"; + public static final int EXTRA_RESOURCE_TYPE_STRING = 2; /** * An integer array extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate which - * resource IDs (see {@link DevicePolicyResources.UpdatableDrawableId} and - * {@link DevicePolicyResources.UpdatableStringId}) have been updated. + * resource IDs (see {@link DevicePolicyResources.Drawables} and + * {@link DevicePolicyResources.Strings}) have been updated. */ - public static final String EXTRA_RESOURCE_ID = - "android.app.extra.RESOURCE_ID"; + public static final String EXTRA_RESOURCE_IDS = + "android.app.extra.RESOURCE_IDS"; /** @hide */ @NonNull @@ -7913,6 +7916,10 @@ public class DevicePolicyManager { /** * Returns the current runtime nearby notification streaming policy set by the device or profile * owner. + * <p> + * The caller must be the target user's device owner/profile owner or hold the + * {@link android.Manifest.permission#READ_NEARBY_STREAMING_POLICY READ_NEARBY_STREAMING_POLICY} + * permission. */ @RequiresPermission( value = android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, @@ -7956,6 +7963,10 @@ public class DevicePolicyManager { /** * Returns the current runtime nearby app streaming policy set by the device or profile owner. + * <p> + * The caller must be the target user's device owner/profile owner or hold the + * {@link android.Manifest.permission#READ_NEARBY_STREAMING_POLICY READ_NEARBY_STREAMING_POLICY} + * permission. */ @RequiresPermission( value = android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, diff --git a/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java b/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java index dfbc7a4c3276..c91ce24dfd8d 100644 --- a/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java +++ b/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java @@ -18,6 +18,7 @@ package android.app.wallpapereffectsgeneration; import android.annotation.FloatRange; import android.annotation.NonNull; +import android.annotation.Size; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -117,6 +118,7 @@ public final class CameraAttributes implements Parcelable { /** * Get the camera yaw orbit rotation. */ + @FloatRange(from = -180.0f, to = 180.0f) public float getCameraOrbitYawDegrees() { return mCameraOrbitYawDegrees; } @@ -124,6 +126,7 @@ public final class CameraAttributes implements Parcelable { /** * Get the camera pitch orbit rotation. */ + @FloatRange(from = -90.0f, to = 90.0f) public float getCameraOrbitPitchDegrees() { return mCameraOrbitPitchDegrees; } @@ -138,6 +141,7 @@ public final class CameraAttributes implements Parcelable { /** * Get the camera vertical fov degrees. */ + @FloatRange(from = 0.0f, to = 180.0f, fromInclusive = false) public float getVerticalFovDegrees() { return mVerticalFovDegrees; } @@ -145,6 +149,7 @@ public final class CameraAttributes implements Parcelable { /** * Get the frustum in near plane. */ + @FloatRange(from = 0.0f) public float getFrustumNearInWorldSpace() { return mFrustumNearInWorldSpace; } @@ -152,6 +157,7 @@ public final class CameraAttributes implements Parcelable { /** * Get the frustum in far plane. */ + @FloatRange(from = 0.0f) public float getFrustumFarInWorldSpace() { return mFrustumFarInWorldSpace; } @@ -217,8 +223,8 @@ public final class CameraAttributes implements Parcelable { * @hide */ @SystemApi - public Builder(@NonNull float[] anchorPointInWorldSpace, - @NonNull float[] anchorPointInOutputUvSpace) { + public Builder(@NonNull @Size(3) float[] anchorPointInWorldSpace, + @NonNull @Size(2) float[] anchorPointInOutputUvSpace) { mAnchorPointInWorldSpace = anchorPointInWorldSpace; mAnchorPointInOutputUvSpace = anchorPointInOutputUvSpace; } diff --git a/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java index 1254794964dd..b1d2b384a80b 100644 --- a/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java +++ b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java @@ -39,27 +39,31 @@ import java.util.Objects; public final class CinematicEffectResponse implements Parcelable { /** @hide */ @IntDef(prefix = {"CINEMATIC_EFFECT_STATUS_"}, - value = {CINEMATIC_EFFECT_STATUS_UNKNOWN, + value = {CINEMATIC_EFFECT_STATUS_ERROR, CINEMATIC_EFFECT_STATUS_OK, - CINEMATIC_EFFECT_STATUS_ERROR, CINEMATIC_EFFECT_STATUS_NOT_READY, CINEMATIC_EFFECT_STATUS_PENDING, - CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS}) + CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS + }) @Retention(RetentionPolicy.SOURCE) public @interface CinematicEffectStatusCode {} - /** Cinematic effect generation unknown status. */ - public static final int CINEMATIC_EFFECT_STATUS_UNKNOWN = 0; + /** Cinematic effect generation failure with internal error. */ + public static final int CINEMATIC_EFFECT_STATUS_ERROR = 0; + /** Cinematic effect generation success. */ public static final int CINEMATIC_EFFECT_STATUS_OK = 1; - /** Cinematic effect generation failure. */ - public static final int CINEMATIC_EFFECT_STATUS_ERROR = 2; + /** Service not ready for cinematic effect generation. */ - public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 3; - /** Cienmatic effect generation process is pending. */ - public static final int CINEMATIC_EFFECT_STATUS_PENDING = 4; - /** Too manay requests for server to handle. */ - public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 5; + public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 2; + /** + * There is already a task being processed for the same task id. + * Client should wait for the response and not send the same request + * again. + */ + public static final int CINEMATIC_EFFECT_STATUS_PENDING = 3; + /** Too many requests for server to handle. */ + public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 4; /** @hide */ @IntDef(prefix = {"IMAGE_CONTENT_TYPE_"}, @@ -71,13 +75,13 @@ public final class CinematicEffectResponse implements Parcelable { @Retention(RetentionPolicy.SOURCE) public @interface ImageContentType {} - /** Image content unknown. */ + /** Unable to determine image type. */ public static final int IMAGE_CONTENT_TYPE_UNKNOWN = 0; /** Image content is people portrait. */ public static final int IMAGE_CONTENT_TYPE_PEOPLE_PORTRAIT = 1; /** Image content is landscape. */ public static final int IMAGE_CONTENT_TYPE_LANDSCAPE = 2; - /** Image content is doesn't belong to other types. */ + /** Image content is not people portrait or landscape. */ public static final int IMAGE_CONTENT_TYPE_OTHER = 3; diff --git a/core/java/android/companion/SystemDataTransferRequest.java b/core/java/android/companion/SystemDataTransferRequest.java index e3b0369e203d..461b4f5f27e6 100644 --- a/core/java/android/companion/SystemDataTransferRequest.java +++ b/core/java/android/companion/SystemDataTransferRequest.java @@ -17,7 +17,7 @@ package android.companion; import android.annotation.NonNull; -import android.annotation.Nullable; +import android.annotation.UserIdInt; import android.os.Parcel; import android.os.Parcelable; import android.provider.OneTimeUseBuilder; @@ -38,10 +38,25 @@ public final class SystemDataTransferRequest implements Parcelable { private final List<String> mPermissionSyncPackages; /** + * User Id that the request belongs to. + * Populated by the system. + * + * @hide + */ + @UserIdInt + private int mUserId; + + /** + * Whether the request is consented by the user. + * Populated by the system. + * * @hide */ + private boolean mUserConsented = false; + + /* @hide */ public SystemDataTransferRequest(int associationId, boolean syncAllPackages, - @Nullable List<String> permissionSyncPackages) { + @NonNull List<String> permissionSyncPackages) { mAssociationId = associationId; mPermissionSyncAllPackages = syncAllPackages; mPermissionSyncPackages = permissionSyncPackages; @@ -61,6 +76,37 @@ public final class SystemDataTransferRequest implements Parcelable { return mPermissionSyncPackages; } + /* @hide */ + public int getUserId() { + return mUserId; + } + + /* @hide */ + public boolean isUserConsented() { + return mUserConsented; + } + + /* @hide */ + public void setUserId(@UserIdInt int userId) { + mUserId = userId; + } + + /* @hide */ + public void setUserConsented(boolean isUserConsented) { + mUserConsented = isUserConsented; + } + + /* @hide */ + @Override + public String toString() { + return "SystemDataTransferRequest(" + + "associationId=" + mAssociationId + + ", isPermissionSyncAllPackages=" + mPermissionSyncAllPackages + + ", permissionSyncPackages=[" + String.join(",", mPermissionSyncPackages) + "]" + + ", isUserConsented=" + mUserConsented + + ")"; + } + /** * A builder for {@link SystemDataTransferRequest}. * @@ -90,9 +136,8 @@ public final class SystemDataTransferRequest implements Parcelable { * <p>If a system or policy granted or revoked permission is granted or revoked by the user * later, the permission will be ignored.</p> * - * @see #setPermissionSyncPackages(List) - * * @return the builder + * @see #setPermissionSyncPackages(List) */ @NonNull public Builder setPermissionSyncAllPackages() { @@ -104,10 +149,9 @@ public final class SystemDataTransferRequest implements Parcelable { * Set a list of packages to sync permissions. You can optionally call * {@link #setPermissionSyncAllPackages()} to sync permissions for all the packages. * - * @see #setPermissionSyncAllPackages() - * * @param permissionSyncPackages packages to sync permissions * @return builder + * @see #setPermissionSyncAllPackages() */ @NonNull public Builder setPermissionSyncPackages(@NonNull List<String> permissionSyncPackages) { @@ -127,6 +171,8 @@ public final class SystemDataTransferRequest implements Parcelable { mAssociationId = in.readInt(); mPermissionSyncAllPackages = in.readBoolean(); mPermissionSyncPackages = Arrays.asList(in.createString8Array()); + mUserId = in.readInt(); + mUserConsented = in.readBoolean(); } @Override @@ -134,6 +180,8 @@ public final class SystemDataTransferRequest implements Parcelable { dest.writeInt(mAssociationId); dest.writeBoolean(mPermissionSyncAllPackages); dest.writeString8Array(mPermissionSyncPackages.toArray(new String[0])); + dest.writeInt(mUserId); + dest.writeBoolean(mUserConsented); } @Override @@ -141,6 +189,18 @@ public final class SystemDataTransferRequest implements Parcelable { return 0; } + /** + * Check if two requests have the same data type. + */ + public boolean hasSameDataType(SystemDataTransferRequest request) { + // Check if they are permission sync requests. + if (this.isPermissionSyncAllPackages() || !this.getPermissionSyncPackages().isEmpty()) { + return request.isPermissionSyncAllPackages() || !request.getPermissionSyncPackages() + .isEmpty(); + } + return false; + } + @NonNull public static final Creator<SystemDataTransferRequest> CREATOR = new Creator<SystemDataTransferRequest>() { diff --git a/core/java/android/hardware/CameraStreamStats.java b/core/java/android/hardware/CameraStreamStats.java index 85890c1912c5..823d454ee16b 100644 --- a/core/java/android/hardware/CameraStreamStats.java +++ b/core/java/android/hardware/CameraStreamStats.java @@ -47,7 +47,7 @@ public class CameraStreamStats implements Parcelable { private int mHistogramType; private float[] mHistogramBins; private long[] mHistogramCounts; - private int mDynamicRangeProfile; + private long mDynamicRangeProfile; private int mStreamUseCase; private static final String TAG = "CameraStreamStats"; @@ -70,7 +70,7 @@ public class CameraStreamStats implements Parcelable { public CameraStreamStats(int width, int height, int format, int dataSpace, long usage, long requestCount, long errorCount, - int startLatencyMs, int maxHalBuffers, int maxAppBuffers, int dynamicRangeProfile, + int startLatencyMs, int maxHalBuffers, int maxAppBuffers, long dynamicRangeProfile, int streamUseCase) { mWidth = width; mHeight = height; @@ -130,7 +130,7 @@ public class CameraStreamStats implements Parcelable { dest.writeInt(mHistogramType); dest.writeFloatArray(mHistogramBins); dest.writeLongArray(mHistogramCounts); - dest.writeInt(mDynamicRangeProfile); + dest.writeLong(mDynamicRangeProfile); dest.writeInt(mStreamUseCase); } @@ -148,7 +148,7 @@ public class CameraStreamStats implements Parcelable { mHistogramType = in.readInt(); mHistogramBins = in.createFloatArray(); mHistogramCounts = in.createLongArray(); - mDynamicRangeProfile = in.readInt(); + mDynamicRangeProfile = in.readLong(); mStreamUseCase = in.readInt(); } @@ -204,7 +204,7 @@ public class CameraStreamStats implements Parcelable { return mHistogramCounts; } - public int getDynamicRangeProfile() { + public long getDynamicRangeProfile() { return mDynamicRangeProfile; } diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 524fe795cb75..7bebe1ff14c3 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2448,8 +2448,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see #REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_MAX * @hide */ - public static final Key<int[]> REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP = - new Key<int[]>("android.request.availableDynamicRangeProfilesMap", int[].class); + public static final Key<long[]> REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP = + new Key<long[]>("android.request.availableDynamicRangeProfilesMap", long[].class); /** * <p>Recommended 10-bit dynamic range profile.</p> @@ -2464,8 +2464,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri */ @PublicKey @NonNull - public static final Key<Integer> REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE = - new Key<Integer>("android.request.recommendedTenBitDynamicRangeProfile", int.class); + public static final Key<Long> REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE = + new Key<Long>("android.request.recommendedTenBitDynamicRangeProfile", long.class); /** * <p>The list of image formats that are supported by this diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 8f42b1f6f355..73735edbb2ba 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -990,7 +990,7 @@ public abstract class CameraDevice implements AutoCloseable { * <p>Reprocessing with 10-bit output targets on 10-bit capable * {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT} devices is * not supported. Trying to initialize a repreocessable capture session with one ore more - * output configurations set {@link OutputConfiguration#setDynamicRangeProfile(int)} to use + * output configurations set {@link OutputConfiguration#setDynamicRangeProfile} to use * a 10-bit dynamic range profile {@link android.hardware.camera2.params.DynamicRangeProfiles} * will trigger {@link IllegalArgumentException}.</p> * @@ -1179,7 +1179,7 @@ public abstract class CameraDevice implements AutoCloseable { * @see #createCaptureSessionByOutputConfigurations * @see #createReprocessableCaptureSession * @see #createConstrainedHighSpeedCaptureSession - * @see OutputConfiguration#setDynamicRangeProfile(int) + * @see OutputConfiguration#setDynamicRangeProfile * @see android.hardware.camera2.params.DynamicRangeProfiles */ public void createCaptureSession( diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 4fb496d66fbd..468e6041eb73 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -1058,7 +1058,7 @@ public class CameraMetadataNative implements Parcelable { } private DynamicRangeProfiles getDynamicRangeProfiles() { - int[] profileArray = getBase( + long[] profileArray = getBase( CameraCharacteristics.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP); if (profileArray == null) { diff --git a/core/java/android/hardware/camera2/params/DynamicRangeProfiles.java b/core/java/android/hardware/camera2/params/DynamicRangeProfiles.java index 5c1a4aa120ea..cbd84e77e72a 100644 --- a/core/java/android/hardware/camera2/params/DynamicRangeProfiles.java +++ b/core/java/android/hardware/camera2/params/DynamicRangeProfiles.java @@ -16,7 +16,7 @@ package android.hardware.camera2.params; -import android.annotation.IntDef; +import android.annotation.LongDef; import android.annotation.NonNull; import android.hardware.camera2.CameraMetadata; @@ -27,7 +27,6 @@ import java.lang.annotation.RetentionPolicy; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Objects; import java.util.Set; /** @@ -44,20 +43,20 @@ import java.util.Set; * * <p>Some devices may not be able to support 8-bit and/or 10-bit output with different dynamic * range profiles within the same capture request. Such device specific constraints can be queried - * by calling {@link #getProfileCaptureRequestConstraints(int)}. Do note that unsupported + * by calling {@link #getProfileCaptureRequestConstraints}. Do note that unsupported * combinations will result in {@link IllegalArgumentException} when trying to submit a capture * request. Capture requests that only reference outputs configured using the same dynamic range * profile value will never fail due to such constraints.</p> * - * @see OutputConfiguration#setDynamicRangeProfile(int) + * @see OutputConfiguration#setDynamicRangeProfile */ public final class DynamicRangeProfiles { /** * This the default 8-bit standard profile that will be used in case where camera clients do not * explicitly configure a supported dynamic range profile by calling - * {@link OutputConfiguration#setDynamicRangeProfile(int)}. + * {@link OutputConfiguration#setDynamicRangeProfile}. */ - public static final int STANDARD = + public static final long STANDARD = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD; /** @@ -65,7 +64,7 @@ public final class DynamicRangeProfiles { * * <p>All 10-bit output capable devices are required to support this profile.</p> */ - public static final int HLG10 = + public static final long HLG10 = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HLG10; /** @@ -74,7 +73,7 @@ public final class DynamicRangeProfiles { * <p>This profile utilizes internal static metadata to increase the quality * of the capture.</p> */ - public static final int HDR10 = + public static final long HDR10 = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10; /** @@ -83,7 +82,7 @@ public final class DynamicRangeProfiles { * <p>In contrast to HDR10, this profile uses internal per-frame metadata * to further enhance the quality of the capture.</p> */ - public static final int HDR10_PLUS = + public static final long HDR10_PLUS = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10_PLUS; /** @@ -91,13 +90,13 @@ public final class DynamicRangeProfiles { * accurate capture. This would typically differ from what a specific device * might want to tune for a consumer optimized Dolby Vision general capture.</p> */ - public static final int DOLBY_VISION_10B_HDR_REF = + public static final long DOLBY_VISION_10B_HDR_REF = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF; /** * <p>This is the power optimized mode for 10-bit Dolby Vision HDR Reference Mode.</p> */ - public static final int DOLBY_VISION_10B_HDR_REF_PO = + public static final long DOLBY_VISION_10B_HDR_REF_PO = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF_PO; /** @@ -107,52 +106,52 @@ public final class DynamicRangeProfiles { * that each specific device would have a different look for their default * Dolby Vision capture.</p> */ - public static final int DOLBY_VISION_10B_HDR_OEM = + public static final long DOLBY_VISION_10B_HDR_OEM = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM; /** * <p>This is the power optimized mode for 10-bit Dolby Vision HDR device specific capture * Mode.</p> */ - public static final int DOLBY_VISION_10B_HDR_OEM_PO = + public static final long DOLBY_VISION_10B_HDR_OEM_PO = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM_PO; /** * <p>This is the 8-bit version of the Dolby Vision reference capture mode optimized * for scene accuracy.</p> */ - public static final int DOLBY_VISION_8B_HDR_REF = + public static final long DOLBY_VISION_8B_HDR_REF = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF; /** * <p>This is the power optimized mode for 8-bit Dolby Vision HDR Reference Mode.</p> */ - public static final int DOLBY_VISION_8B_HDR_REF_PO = + public static final long DOLBY_VISION_8B_HDR_REF_PO = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF_PO; /** * <p>This is the 8-bit version of device specific tuned and optimized Dolby Vision * capture mode.</p> */ - public static final int DOLBY_VISION_8B_HDR_OEM = + public static final long DOLBY_VISION_8B_HDR_OEM = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM; /** * <p>This is the power optimized mode for 8-bit Dolby Vision HDR device specific * capture Mode.</p> */ - public static final int DOLBY_VISION_8B_HDR_OEM_PO = + public static final long DOLBY_VISION_8B_HDR_OEM_PO = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM_PO; /* * @hide */ - public static final int PUBLIC_MAX = + public static final long PUBLIC_MAX = CameraMetadata.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_MAX; /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(prefix = {"PROFILE_"}, value = + @LongDef(prefix = {"PROFILE_"}, value = {STANDARD, HLG10, HDR10, @@ -168,7 +167,8 @@ public final class DynamicRangeProfiles { public @interface Profile { } - private final HashMap<Integer, Set<Integer>> mProfileMap = new HashMap<>(); + private final HashMap<Long, Set<Long>> mProfileMap = new HashMap<>(); + private final HashMap<Long, Boolean> mLookahedLatencyMap = new HashMap<>(); /** * Create a new immutable DynamicRangeProfiles instance. @@ -193,23 +193,23 @@ public final class DynamicRangeProfiles { * if {@code elements} is {@code null} * */ - public DynamicRangeProfiles(@NonNull final int[] elements) { - if ((elements.length % 2) != 0) { + public DynamicRangeProfiles(@NonNull final long[] elements) { + if ((elements.length % 3) != 0) { throw new IllegalArgumentException("Dynamic range profile map length " + elements.length + " is not even!"); } - for (int i = 0; i < elements.length; i += 2) { + for (int i = 0; i < elements.length; i += 3) { checkProfileValue(elements[i]); // STANDARD is not expected to be included if (elements[i] == STANDARD) { throw new IllegalArgumentException("Dynamic range profile map must not include a" + " STANDARD profile entry!"); } - HashSet<Integer> profiles = new HashSet<>(); + HashSet<Long> profiles = new HashSet<>(); if (elements[i+1] != 0) { - for (int profile = STANDARD; profile < PUBLIC_MAX; profile <<= 1) { + for (long profile = STANDARD; profile < PUBLIC_MAX; profile <<= 1) { if ((elements[i+1] & profile) != 0) { profiles.add(profile); } @@ -217,12 +217,13 @@ public final class DynamicRangeProfiles { } mProfileMap.put(elements[i], profiles); + mLookahedLatencyMap.put(elements[i], elements[i+2] != 0L); } // Build the STANDARD constraints depending on the advertised 10-bit limitations - HashSet<Integer> standardConstraints = new HashSet<>(); + HashSet<Long> standardConstraints = new HashSet<>(); standardConstraints.add(STANDARD); - for(Integer profile : mProfileMap.keySet()) { + for(Long profile : mProfileMap.keySet()) { if (mProfileMap.get(profile).isEmpty() || mProfileMap.get(profile).contains(STANDARD)) { standardConstraints.add(profile); } @@ -235,24 +236,15 @@ public final class DynamicRangeProfiles { /** * @hide */ - public static void checkProfileValue(int profile) { - switch (profile) { - case STANDARD: - case HLG10: - case HDR10: - case HDR10_PLUS: - case DOLBY_VISION_10B_HDR_REF: - case DOLBY_VISION_10B_HDR_REF_PO: - case DOLBY_VISION_10B_HDR_OEM: - case DOLBY_VISION_10B_HDR_OEM_PO: - case DOLBY_VISION_8B_HDR_REF: - case DOLBY_VISION_8B_HDR_REF_PO: - case DOLBY_VISION_8B_HDR_OEM: - case DOLBY_VISION_8B_HDR_OEM_PO: - //No-op - break; - default: - throw new IllegalArgumentException("Unknown profile " + profile); + public static void checkProfileValue(long profile) { + if (profile == STANDARD || profile == HLG10 || profile == HDR10 || profile == HDR10_PLUS + || profile == DOLBY_VISION_10B_HDR_REF || profile == DOLBY_VISION_10B_HDR_REF_PO + || profile == DOLBY_VISION_10B_HDR_OEM || profile == DOLBY_VISION_10B_HDR_OEM_PO + || profile == DOLBY_VISION_8B_HDR_REF || profile == DOLBY_VISION_8B_HDR_REF_PO + || profile == DOLBY_VISION_8B_HDR_OEM + || profile == DOLBY_VISION_8B_HDR_OEM_PO) {//No-op + } else { + throw new IllegalArgumentException("Unknown profile " + profile); } } @@ -261,7 +253,7 @@ public final class DynamicRangeProfiles { * * @return non-modifiable set of dynamic range profiles */ - public @NonNull Set<Integer> getSupportedProfiles() { + public @NonNull Set<Long> getSupportedProfiles() { return Collections.unmodifiableSet(mProfileMap.keySet()); } @@ -272,7 +264,7 @@ public final class DynamicRangeProfiles { * * <p>For example if assume that a particular 10-bit output capable device * returns ({@link #STANDARD}, {@link #HLG10}, {@link #HDR10}) as result from calling - * {@link #getSupportedProfiles()} and {@link #getProfileCaptureRequestConstraints(int)} + * {@link #getSupportedProfiles()} and {@link #getProfileCaptureRequestConstraints} * returns ({@link #STANDARD}, {@link #HLG10}) when given an argument of {@link #STANDARD}. * This means that the corresponding camera device will only accept and process capture requests * that reference outputs configured using {@link #HDR10} dynamic profile or alternatively @@ -288,14 +280,40 @@ public final class DynamicRangeProfiles { * within the list returned by * getSupportedProfiles() * - * @see OutputConfiguration#setDynamicRangeProfile(int) + * @see OutputConfiguration#setDynamicRangeProfile */ - public @NonNull Set<Integer> getProfileCaptureRequestConstraints(@Profile int profile) { - Set<Integer> ret = mProfileMap.get(profile); + public @NonNull Set<Long> getProfileCaptureRequestConstraints(@Profile long profile) { + Set<Long> ret = mProfileMap.get(profile); if (ret == null) { throw new IllegalArgumentException("Unsupported profile!"); } return Collections.unmodifiableSet(ret); } + + /** + * Check whether a given dynamic range profile is suitable for latency sensitive use cases. + * + * <p>Due to internal lookahead logic, camera outputs configured with some dynamic range + * profiles may experience additional latency greater than 3 buffers. Using camera outputs + * with such profiles for latency sensitive use cases such as camera preview is not + * recommended. Profiles that have such extra streaming delay are typically utilized for + * scenarios such as offscreen video recording.</p> + * + * @return true if the given profile is not suitable for latency sensitive use cases, false + * otherwise + * @throws IllegalArgumentException - If the profile argument is not + * within the list returned by + * getSupportedProfiles() + * + * @see OutputConfiguration#setDynamicRangeProfile + */ + public boolean isExtraLatencyPresent(@Profile long profile) { + Boolean ret = mLookahedLatencyMap.get(profile); + if (ret == null) { + throw new IllegalArgumentException("Unsupported profile!"); + } + + return ret; + } } diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java index 8c0dcfcf0693..465abfb55540 100644 --- a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java +++ b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java @@ -246,7 +246,7 @@ public final class MandatoryStreamCombination { * @return true if stream is able to output 10-bit pixels * * @see android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT - * @see OutputConfiguration#setDynamicRangeProfile(int) + * @see OutputConfiguration#setDynamicRangeProfile */ public boolean is10BitCapable() { return mIs10BitCapable; diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java index 80937640e094..2350b7c7a481 100644 --- a/core/java/android/hardware/camera2/params/OutputConfiguration.java +++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java @@ -421,7 +421,7 @@ public final class OutputConfiguration implements Parcelable { * {@link android.media.MediaCodec} etc.) * or {@link ImageFormat#YCBCR_P010}.</p> */ - public void setDynamicRangeProfile(@Profile int profile) { + public void setDynamicRangeProfile(@Profile long profile) { mDynamicRangeProfile = profile; } @@ -430,7 +430,7 @@ public final class OutputConfiguration implements Parcelable { * * @return the currently set dynamic range profile */ - public @Profile int getDynamicRangeProfile() { + public @Profile long getDynamicRangeProfile() { return mDynamicRangeProfile; } @@ -1070,7 +1070,7 @@ public final class OutputConfiguration implements Parcelable { int streamUseCase = source.readInt(); checkArgumentInRange(rotation, ROTATION_0, ROTATION_270, "Rotation constant"); - int dynamicRangeProfile = source.readInt(); + long dynamicRangeProfile = source.readLong(); DynamicRangeProfiles.checkProfileValue(dynamicRangeProfile); int timestampBase = source.readInt(); @@ -1217,7 +1217,7 @@ public final class OutputConfiguration implements Parcelable { dest.writeInt(mIsMultiResolution ? 1 : 0); // writeList doesn't seem to work well with Integer list. dest.writeIntArray(convertIntegerToIntList(mSensorPixelModesUsed)); - dest.writeInt(mDynamicRangeProfile); + dest.writeLong(mDynamicRangeProfile); dest.writeInt(mStreamUseCase); dest.writeInt(mTimestampBase); dest.writeInt(mMirrorMode); @@ -1335,7 +1335,7 @@ public final class OutputConfiguration implements Parcelable { // The sensor pixel modes that this OutputConfiguration will use private ArrayList<Integer> mSensorPixelModesUsed; // Dynamic range profile - private int mDynamicRangeProfile; + private long mDynamicRangeProfile; // Stream use case private int mStreamUseCase; // Timestamp base diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index de1dc8091b2a..cc58885f95bd 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -2700,6 +2700,46 @@ public abstract class BatteryStats implements Parcelable { @ServiceState.FrequencyRange int frequencyRange, int signalStrength, long elapsedRealtimeMs); + /** + * Returns the time in microseconds that the mobile radio has been actively transmitting data on + * a given Radio Access Technology (RAT), at a given frequency (NR RAT only), for a given + * transmission power level. + * + * @param rat Radio Access Technology {@see RadioAccessTechnology} + * @param frequencyRange frequency range {@see ServiceState.FrequencyRange}, only needed for + * RADIO_ACCESS_TECHNOLOGY_NR. Use + * {@link ServiceState.FREQUENCY_RANGE_UNKNOWN} for other Radio Access + * Technologies. + * @param signalStrength the cellular signal strength. {@see CellSignalStrength#getLevel()} + * @param elapsedRealtimeMs current elapsed realtime + * @return time (in milliseconds) the mobile radio spent actively transmitting data in the + * specified state, while on battery. Returns {@link DURATION_UNAVAILABLE} if + * data unavailable. + * @hide + */ + public abstract long getActiveTxRadioDurationMs(@RadioAccessTechnology int rat, + @ServiceState.FrequencyRange int frequencyRange, int signalStrength, + long elapsedRealtimeMs); + + /** + * Returns the time in microseconds that the mobile radio has been actively receiving data on a + * given Radio Access Technology (RAT), at a given frequency (NR RAT only), for a given + * transmission power level. + * + * @param rat Radio Access Technology {@see RadioAccessTechnology} + * @param frequencyRange frequency range {@see ServiceState.FrequencyRange}, only needed for + * RADIO_ACCESS_TECHNOLOGY_NR. Use + * {@link ServiceState.FREQUENCY_RANGE_UNKNOWN} for other Radio Access + * Technologies. + * @param elapsedRealtimeMs current elapsed realtime + * @return time (in milliseconds) the mobile radio spent actively receiving data in the + * specified state, while on battery. Returns {@link DURATION_UNAVAILABLE} if + * data unavailable. + * @hide + */ + public abstract long getActiveRxRadioDurationMs(@RadioAccessTechnology int rat, + @ServiceState.FrequencyRange int frequencyRange, long elapsedRealtimeMs); + static final String[] WIFI_SUPPL_STATE_NAMES = { "invalid", "disconn", "disabled", "inactive", "scanning", "authenticating", "associating", "associated", "4-way-handshake", @@ -2720,6 +2760,13 @@ public abstract class BatteryStats implements Parcelable { public static final long POWER_DATA_UNAVAILABLE = -1L; /** + * Returned value if duration data is unavailable. + * + * {@hide} + */ + public static final long DURATION_UNAVAILABLE = -1L; + + /** * Returns the battery consumption (in microcoulombs) of bluetooth, derived from on * device power measurement data. * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable. @@ -4093,6 +4140,10 @@ public abstract class BatteryStats implements Parcelable { " Mmwave frequency (greater than 6GHz):\n"}; final String signalStrengthHeader = " Signal Strength Time:\n"; + final String txHeader = + " Tx Time:\n"; + final String rxHeader = + " Rx Time: "; final String[] signalStrengthDescription = new String[]{ " unknown: ", " poor: ", @@ -4144,6 +4195,29 @@ public abstract class BatteryStats implements Parcelable { sb.append(")\n"); } + sb.append(prefix); + sb.append(txHeader); + for (int strength = 0; strength < numSignalStrength; strength++) { + final long timeMs = getActiveTxRadioDurationMs(rat, freqLvl, strength, + rawRealtimeMs); + if (timeMs <= 0) continue; + hasFreqData = true; + sb.append(prefix); + sb.append(signalStrengthDescription[strength]); + formatTimeMs(sb, timeMs); + sb.append("("); + sb.append(formatRatioLocked(timeMs, totalActiveTimesMs)); + sb.append(")\n"); + } + + sb.append(prefix); + sb.append(rxHeader); + final long rxTimeMs = getActiveRxRadioDurationMs(rat, freqLvl, rawRealtimeMs); + formatTimeMs(sb, rxTimeMs); + sb.append("("); + sb.append(formatRatioLocked(rxTimeMs, totalActiveTimesMs)); + sb.append(")\n"); + if (hasFreqData) { hasData = true; pw.print(sb); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 315eef78724e..e3be4d32a014 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -183,25 +183,29 @@ public final class PowerManager { /** * Wake lock flag: Turn the screen on when the wake lock is acquired. * <p> - * Normally wake locks don't actually wake the device, they just cause - * the screen to remain on once it's already on. Think of the video player - * application as the normal behavior. Notifications that pop up and want - * the device to be on are the exception; use this flag to be like them. + * Normally wake locks don't actually wake the device, they just cause the screen to remain on + * once it's already on. This flag will cause the device to wake up when the wake lock is + * acquired. * </p><p> * Android TV playback devices attempt to turn on the HDMI-connected TV via HDMI-CEC on any * wake-up, including wake-ups triggered by wake locks. * </p><p> * Cannot be used with {@link #PARTIAL_WAKE_LOCK}. * </p> + * + * @deprecated Most applications should use {@link android.R.attr#turnScreenOn} or + * {@link android.app.Activity#setTurnScreenOn(boolean)} instead, as this prevents the previous + * foreground app from being resumed first when the screen turns on. Note that this flag may + * require a permission in the future. */ + @Deprecated public static final int ACQUIRE_CAUSES_WAKEUP = 0x10000000; /** * Wake lock flag: When this wake lock is released, poke the user activity timer * so the screen stays on for a little longer. * <p> - * Will not turn the screen on if it is not already on. - * See {@link #ACQUIRE_CAUSES_WAKEUP} if you want that. + * This will not turn the screen on if it is not already on. * </p><p> * Cannot be used with {@link #PARTIAL_WAKE_LOCK}. * </p> diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index cc9833997102..48e2827f19e1 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -3022,9 +3022,17 @@ public class StorageManager { } } - /** @hide */ - @TestApi + /** + * Returns the authority of the current cloud media provider that was set by the + * {@link android.service.storage.ExternalStorageService} holding the + * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE} permission via + * {@link #setCloudMediaProvider(String)}. + * + * @hide + */ @Nullable + @TestApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public String getCloudMediaProvider() { try { return mStorageManager.getCloudMediaProvider(); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 23e02e9d9968..11b5d44de3b3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -24,7 +24,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; -import android.annotation.StringDef; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; @@ -2128,7 +2127,7 @@ public final class Settings { /** * Intent extra: The id of a setting restricted by supervisors. * <p> - * Type: String with a value from the SupervisorVerificationSetting annotation below. + * Type: Integer with a value from the SupervisorVerificationSetting annotation below. * <ul> * <li>{@link #SUPERVISOR_VERIFICATION_SETTING_UNKNOWN} * <li>{@link #SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS} @@ -2141,20 +2140,19 @@ public final class Settings { /** * Unknown setting. */ - public static final String SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = ""; + public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0; /** * Biometric settings for supervisors. */ - public static final String SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = - "supervisor_restricted_biometrics_controller"; + public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1; /** * Keys for {@link #EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY}. * @hide */ @Retention(RetentionPolicy.SOURCE) - @StringDef(prefix = { "SUPERVISOR_VERIFICATION_SETTING_" }, value = { + @IntDef(prefix = { "SUPERVISOR_VERIFICATION_SETTING_" }, value = { SUPERVISOR_VERIFICATION_SETTING_UNKNOWN, SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS, }) @@ -9950,6 +9948,14 @@ public final class Settings { public static final String LOCKSCREEN_SHOW_CONTROLS = "lockscreen_show_controls"; /** + * Whether trivial home controls can be used without authentication + * + * @hide + */ + public static final String LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS = + "lockscreen_allow_trivial_controls"; + + /** * Whether wallet should be accessible from the lockscreen * * @hide diff --git a/core/java/android/service/dreams/DreamOverlayService.java b/core/java/android/service/dreams/DreamOverlayService.java index 163d6ed4b18b..bfc3b8b39385 100644 --- a/core/java/android/service/dreams/DreamOverlayService.java +++ b/core/java/android/service/dreams/DreamOverlayService.java @@ -36,6 +36,9 @@ public abstract class DreamOverlayService extends Service { private static final String TAG = "DreamOverlayService"; private static final boolean DEBUG = false; private boolean mShowComplications; + private boolean mIsPreviewMode; + @Nullable + private CharSequence mDreamLabel; private IDreamOverlay mDreamOverlay = new IDreamOverlay.Stub() { @Override @@ -56,6 +59,8 @@ public abstract class DreamOverlayService extends Service { public final IBinder onBind(@NonNull Intent intent) { mShowComplications = intent.getBooleanExtra(DreamService.EXTRA_SHOW_COMPLICATIONS, DreamService.DEFAULT_SHOW_COMPLICATIONS); + mIsPreviewMode = intent.getBooleanExtra(DreamService.EXTRA_IS_PREVIEW, false); + mDreamLabel = intent.getCharSequenceExtra(DreamService.EXTRA_DREAM_LABEL); return mDreamOverlay.asBinder(); } @@ -84,4 +89,19 @@ public abstract class DreamOverlayService extends Service { public final boolean shouldShowComplications() { return mShowComplications; } + + /** + * Returns whether the dream is running in preview mode. + */ + public final boolean isPreviewMode() { + return mIsPreviewMode; + } + + /** + * Returns the user-facing label of the currently running dream. + */ + @Nullable + public final CharSequence getDreamLabel() { + return mDreamLabel; + } } diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 345917220b6b..db622d39b785 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -216,6 +216,18 @@ public class DreamService extends Service implements Window.Callback { "android.service.dreams.SHOW_COMPLICATIONS"; /** + * Extra containing a boolean for whether we are showing this dream in preview mode. + * @hide + */ + public static final String EXTRA_IS_PREVIEW = "android.service.dreams.IS_PREVIEW"; + + /** + * The user-facing label of the current dream service. + * @hide + */ + public static final String EXTRA_DREAM_LABEL = "android.service.dreams.DREAM_LABEL"; + + /** * The default value for whether to show complications on the overlay. * @hide */ @@ -258,15 +270,19 @@ public class DreamService extends Service implements Window.Callback { } public void bind(Context context, @Nullable ComponentName overlayService, - ComponentName dreamService) { + ComponentName dreamService, boolean isPreviewMode) { if (overlayService == null) { return; } + final ServiceInfo serviceInfo = fetchServiceInfo(context, dreamService); + final Intent overlayIntent = new Intent(); overlayIntent.setComponent(overlayService); overlayIntent.putExtra(EXTRA_SHOW_COMPLICATIONS, - fetchShouldShowComplications(context, dreamService)); + fetchShouldShowComplications(context, serviceInfo)); + overlayIntent.putExtra(EXTRA_DREAM_LABEL, fetchDreamLabel(context, serviceInfo)); + overlayIntent.putExtra(EXTRA_IS_PREVIEW, isPreviewMode); context.bindService(overlayIntent, this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE); @@ -988,8 +1004,11 @@ public class DreamService extends Service implements Window.Callback { // Connect to the overlay service if present. if (!mWindowless) { - mOverlayConnection.bind(this, intent.getParcelableExtra(EXTRA_DREAM_OVERLAY_COMPONENT), - new ComponentName(this, getClass())); + mOverlayConnection.bind( + /* context= */ this, + intent.getParcelableExtra(EXTRA_DREAM_OVERLAY_COMPONENT), + new ComponentName(this, getClass()), + intent.getBooleanExtra(EXTRA_IS_PREVIEW, /* defaultValue= */ false)); } return mDreamServiceWrapper; @@ -1111,7 +1130,10 @@ public class DreamService extends Service implements Window.Callback { * @hide */ @Nullable - public static DreamMetadata getDreamMetadata(Context context, ServiceInfo serviceInfo) { + public static DreamMetadata getDreamMetadata(Context context, + @Nullable ServiceInfo serviceInfo) { + if (serviceInfo == null) return null; + final PackageManager pm = context.getPackageManager(); final TypedArray rawMetadata = readMetadata(pm, serviceInfo); @@ -1350,22 +1372,33 @@ public class DreamService extends Service implements Window.Callback { * {@link DreamService#DEFAULT_SHOW_COMPLICATIONS}. */ private static boolean fetchShouldShowComplications(Context context, - ComponentName componentName) { + @Nullable ServiceInfo serviceInfo) { + final DreamMetadata metadata = getDreamMetadata(context, serviceInfo); + if (metadata != null) { + return metadata.showComplications; + } + return DEFAULT_SHOW_COMPLICATIONS; + } + + @Nullable + private static CharSequence fetchDreamLabel(Context context, + @Nullable ServiceInfo serviceInfo) { + if (serviceInfo == null) return null; + final PackageManager pm = context.getPackageManager(); + return serviceInfo.loadLabel(pm); + } + + @Nullable + private static ServiceInfo fetchServiceInfo(Context context, ComponentName componentName) { final PackageManager pm = context.getPackageManager(); try { - final ServiceInfo si = pm.getServiceInfo(componentName, + return pm.getServiceInfo(componentName, PackageManager.ComponentInfoFlags.of(PackageManager.GET_META_DATA)); - final DreamMetadata metadata = getDreamMetadata(context, si); - - if (metadata != null) { - return metadata.showComplications; - } } catch (PackageManager.NameNotFoundException e) { if (DEBUG) Log.w(TAG, "cannot find component " + componentName.flattenToShortString()); } - - return DEFAULT_SHOW_COMPLICATIONS; + return null; } @Override diff --git a/core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java b/core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java index 8fe6f71b598d..adc9251d89be 100644 --- a/core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java +++ b/core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java @@ -40,7 +40,7 @@ public class FloatingToolbarRoot extends LinearLayout { private final IBinder mTargetInputToken; private final SelectionToolbarRenderService.TransferTouchListener mTransferTouchListener; - private Rect mContentRect; + private final Rect mContentRect = new Rect(); private int mLastDownX = -1; private int mLastDownY = -1; @@ -57,7 +57,7 @@ public class FloatingToolbarRoot extends LinearLayout { * Sets the Rect that shows the selection toolbar content. */ public void setContentRect(Rect contentRect) { - mContentRect = contentRect; + mContentRect.set(contentRect); } @Override diff --git a/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java b/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java index 18b654ec8f04..2898149036c1 100644 --- a/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java +++ b/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java @@ -19,6 +19,7 @@ package android.service.wallpapereffectsgeneration; import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; import android.annotation.CallSuper; +import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.SystemApi; import android.app.Service; @@ -69,7 +70,6 @@ public abstract class WallpaperEffectsGenerationService extends Service { * {@link android.permission#MANAGE_WALLPAPER_EFFECTS_GENERATION} * permission. * - * @hide */ public static final String SERVICE_INTERFACE = "android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService"; @@ -97,6 +97,7 @@ public abstract class WallpaperEffectsGenerationService extends Service { * * @param request the cinematic effect request passed from the client. */ + @MainThread public abstract void onGenerateCinematicEffect(@NonNull CinematicEffectRequest request); /** diff --git a/core/java/android/util/DumpableContainer.java b/core/java/android/util/DumpableContainer.java index e7b2acd5b500..fef5acd42e4e 100644 --- a/core/java/android/util/DumpableContainer.java +++ b/core/java/android/util/DumpableContainer.java @@ -18,8 +18,7 @@ package android.util; import android.annotation.NonNull; /** - * Objects that contains a list of {@link Dumpable}, which will be dumped when the object itself - * is dumped. + * Represents a container that manages {@link Dumpable dumpables}. */ public interface DumpableContainer { diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 98cef95885bd..632af2315bcd 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -3094,6 +3094,10 @@ public final class SurfaceControl implements Parcelable { * @param destFrame The destination rectangle in parent space. Or null for the source frame. * @param orientation The buffer rotation * @return This transaction object. + * @deprecated Use {@link #setCrop(SurfaceControl, Rect)}, + * {@link #setBufferTransform(SurfaceControl, int)}, + * {@link #setPosition(SurfaceControl, float, float)} and + * {@link #setScale(SurfaceControl, float, float)} instead. */ @NonNull public Transaction setGeometry(@NonNull SurfaceControl sc, @Nullable Rect sourceCrop, diff --git a/core/java/android/view/SurfaceControlViewHost.java b/core/java/android/view/SurfaceControlViewHost.java index 2edfda5d065c..a13579d0acad 100644 --- a/core/java/android/view/SurfaceControlViewHost.java +++ b/core/java/android/view/SurfaceControlViewHost.java @@ -328,7 +328,8 @@ public class SurfaceControlViewHost { */ public @Nullable SurfacePackage getSurfacePackage() { if (mSurfaceControl != null && mAccessibilityEmbeddedConnection != null) { - return new SurfacePackage(mSurfaceControl, mAccessibilityEmbeddedConnection, + return new SurfacePackage(new SurfaceControl(mSurfaceControl, "getSurfacePackage"), + mAccessibilityEmbeddedConnection, mWm.getFocusGrantToken(), mRemoteInterface); } else { return null; diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 286b502791c8..34a13868f4d7 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -14173,7 +14173,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, && isAccessibilityPane()) { // If the pane isn't visible, content changed events are sufficient unless we're // reporting that the view just disappeared - if ((getVisibility() == VISIBLE) + if ((isAggregatedVisible()) || (changeType == AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_DISAPPEARED)) { final AccessibilityEvent event = AccessibilityEvent.obtain(); onInitializeAccessibilityEvent(event); diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 844403298cc9..03f05f2468ae 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -76,6 +76,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONT import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CONTROLLED; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG; @@ -217,6 +218,7 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.ref.WeakReference; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -2460,8 +2462,9 @@ public final class ViewRootImpl implements ViewParent, if (DEBUG_DIALOG) Log.v(mTag, "Window " + mView + ": baseSize=" + baseSize + ", desiredWindowWidth=" + desiredWindowWidth); if (baseSize != 0 && desiredWindowWidth > baseSize) { - childWidthMeasureSpec = getRootMeasureSpec(baseSize, lp.width); - childHeightMeasureSpec = getRootMeasureSpec(desiredWindowHeight, lp.height); + childWidthMeasureSpec = getRootMeasureSpec(baseSize, lp.width, lp.privateFlags); + childHeightMeasureSpec = getRootMeasureSpec(desiredWindowHeight, lp.height, + lp.privateFlags); performMeasure(childWidthMeasureSpec, childHeightMeasureSpec); if (DEBUG_DIALOG) Log.v(mTag, "Window " + mView + ": measured (" + host.getMeasuredWidth() + "," + host.getMeasuredHeight() @@ -2474,7 +2477,7 @@ public final class ViewRootImpl implements ViewParent, baseSize = (baseSize+desiredWindowWidth)/2; if (DEBUG_DIALOG) Log.v(mTag, "Window " + mView + ": next baseSize=" + baseSize); - childWidthMeasureSpec = getRootMeasureSpec(baseSize, lp.width); + childWidthMeasureSpec = getRootMeasureSpec(baseSize, lp.width, lp.privateFlags); performMeasure(childWidthMeasureSpec, childHeightMeasureSpec); if (DEBUG_DIALOG) Log.v(mTag, "Window " + mView + ": measured (" + host.getMeasuredWidth() + "," + host.getMeasuredHeight() + ")"); @@ -2487,8 +2490,10 @@ public final class ViewRootImpl implements ViewParent, } if (!goodMeasure) { - childWidthMeasureSpec = getRootMeasureSpec(desiredWindowWidth, lp.width); - childHeightMeasureSpec = getRootMeasureSpec(desiredWindowHeight, lp.height); + childWidthMeasureSpec = getRootMeasureSpec(desiredWindowWidth, lp.width, + lp.privateFlags); + childHeightMeasureSpec = getRootMeasureSpec(desiredWindowHeight, lp.height, + lp.privateFlags); performMeasure(childWidthMeasureSpec, childHeightMeasureSpec); if (mWidth != host.getMeasuredWidth() || mHeight != host.getMeasuredHeight()) { windowSizeMayChange = true; @@ -2721,6 +2726,10 @@ public final class ViewRootImpl implements ViewParent, // Execute enqueued actions on every traversal in case a detached view enqueued an action getRunQueue().executeActions(mAttachInfo.mHandler); + if (mApplyInsetsRequested && !(mWillMove || mWillResize)) { + dispatchApplyInsets(host); + } + boolean layoutRequested = mLayoutRequested && (!mStopped || mReportNextDraw); if (layoutRequested) { @@ -2785,18 +2794,6 @@ public final class ViewRootImpl implements ViewParent, } } - if (mApplyInsetsRequested && !(mWillMove || mWillResize)) { - dispatchApplyInsets(host); - if (mLayoutRequested) { - // Short-circuit catching a new layout request here, so - // we don't need to go through two layout passes when things - // change due to fitting system windows, which can happen a lot. - windowSizeMayChange |= measureHierarchy(host, lp, - mView.getContext().getResources(), - desiredWindowWidth, desiredWindowHeight); - } - } - if (layoutRequested) { // Clear this now, so that if anything requests a layout in the // rest of this function we will catch it and re-run a full @@ -3156,8 +3153,10 @@ public final class ViewRootImpl implements ViewParent, if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth() || mHeight != host.getMeasuredHeight() || dispatchApplyInsets || updatedConfiguration) { - int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width); - int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height); + int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width, + lp.privateFlags); + int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height, + lp.privateFlags); if (DEBUG_LAYOUT) Log.v(mTag, "Ooops, something changed! mWidth=" + mWidth + " measuredWidth=" + host.getMeasuredWidth() @@ -3693,7 +3692,7 @@ public final class ViewRootImpl implements ViewParent, return current; } - final Queue<AccessibilityNodeInfo> fringe = new LinkedList<>(); + final Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>(); fringe.offer(current); while (!fringe.isEmpty()) { @@ -3957,31 +3956,28 @@ public final class ViewRootImpl implements ViewParent, * Figures out the measure spec for the root view in a window based on it's * layout params. * - * @param windowSize - * The available width or height of the window - * - * @param rootDimension - * The layout params for one dimension (width or height) of the - * window. - * + * @param windowSize The available width or height of the window. + * @param measurement The layout width or height requested in the layout params. + * @param privateFlags The private flags in the layout params of the window. * @return The measure spec to use to measure the root view. */ - private static int getRootMeasureSpec(int windowSize, int rootDimension) { + private static int getRootMeasureSpec(int windowSize, int measurement, int privateFlags) { int measureSpec; + final int rootDimension = (privateFlags & PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT) != 0 + ? MATCH_PARENT : measurement; switch (rootDimension) { - - case ViewGroup.LayoutParams.MATCH_PARENT: - // Window can't resize. Force root view to be windowSize. - measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.EXACTLY); - break; - case ViewGroup.LayoutParams.WRAP_CONTENT: - // Window can resize. Set max size for root view. - measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.AT_MOST); - break; - default: - // Window wants to be an exact size. Force root view to be that size. - measureSpec = MeasureSpec.makeMeasureSpec(rootDimension, MeasureSpec.EXACTLY); - break; + case ViewGroup.LayoutParams.MATCH_PARENT: + // Window can't resize. Force root view to be windowSize. + measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.EXACTLY); + break; + case ViewGroup.LayoutParams.WRAP_CONTENT: + // Window can resize. Set max size for root view. + measureSpec = MeasureSpec.makeMeasureSpec(windowSize, MeasureSpec.AT_MOST); + break; + default: + // Window wants to be an exact size. Force root view to be that size. + measureSpec = MeasureSpec.makeMeasureSpec(rootDimension, MeasureSpec.EXACTLY); + break; } return measureSpec; } diff --git a/core/java/android/view/WindowLayout.java b/core/java/android/view/WindowLayout.java index 27f89ec4ac79..ad9f21b4fa70 100644 --- a/core/java/android/view/WindowLayout.java +++ b/core/java/android/view/WindowLayout.java @@ -16,6 +16,8 @@ package android.view; +import static android.view.Gravity.DISPLAY_CLIP_HORIZONTAL; +import static android.view.Gravity.DISPLAY_CLIP_VERTICAL; import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; @@ -29,6 +31,7 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR; @@ -250,11 +253,39 @@ public class WindowLayout { Gravity.apply(attrs.gravity, w, h, outParentFrame, (int) (x + attrs.horizontalMargin * pw), (int) (y + attrs.verticalMargin * ph), outFrame); + // Now make sure the window fits in the overall display frame. if (fitToDisplay) { Gravity.applyDisplay(attrs.gravity, outDisplayFrame, outFrame); } + if ((attrs.privateFlags & PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT) != 0 + && !cutout.isEmpty()) { + // If the actual frame covering a display cutout, and the window is requesting to extend + // it's requested frame, re-do the frame calculation after getting the new requested + // size. + mTempRect.set(outFrame); + // Do nothing if the display cutout and window don't overlap entirely. This may happen + // when the cutout is not on the same side with the window. + boolean shouldExpand = false; + final Rect [] cutoutBounds = cutout.getBoundingRectsAll(); + for (Rect cutoutBound : cutoutBounds) { + if (cutoutBound.isEmpty()) continue; + if (mTempRect.contains(cutoutBound) || cutoutBound.contains(mTempRect)) { + shouldExpand = true; + break; + } + } + if (shouldExpand) { + // Try to fit move the bar to avoid the display cutout first. Make sure the clip + // flags are not set to make the window move. + final int clipFlags = DISPLAY_CLIP_VERTICAL | DISPLAY_CLIP_HORIZONTAL; + Gravity.applyDisplay(attrs.gravity & ~clipFlags, displayCutoutSafe, + mTempRect); + outFrame.union(mTempRect); + } + } + if (DEBUG) Log.d(TAG, "computeWindowFrames " + attrs.getTitle() + " outFrame=" + outFrame.toShortString() + " outParentFrame=" + outParentFrame.toShortString() diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 8ee3e432cbbb..dbfae46a6e72 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -2385,6 +2385,16 @@ public interface WindowManager extends ViewManager { public static final int PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR = 0x00001000; /** + * Flag to indicate that the window frame should be the requested frame adding the display + * cutout frame. This will only be applied if a specific size smaller than the parent frame + * is given, and the window is covering the display cutout. The extended frame will not be + * larger than the parent frame. + * + * {@hide} + */ + public static final int PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT = 0x00002000; + + /** * Flag that will make window ignore app visibility and instead depend purely on the decor * view visibility for determining window visibility. This is used by recents to keep * drawing after it launches an app. diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index 07b7a18b6795..68532781f08b 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -46,11 +46,11 @@ import android.view.ViewConfiguration; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.concurrent.atomic.AtomicInteger; @@ -1166,7 +1166,7 @@ public final class AccessibilityInteractionClient + connectionIdWaitingForPrefetchResultCopy + ";Result: " + infos, Binder.getCallingUid(), Arrays.asList(Thread.currentThread().getStackTrace()), - new HashSet<String>(Arrays.asList("getStackTrace")), + new HashSet<>(Collections.singletonList("getStackTrace")), FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK); } } else if (DEBUG) { @@ -1348,7 +1348,7 @@ public final class AccessibilityInteractionClient } // Check for duplicates. HashSet<AccessibilityNodeInfo> seen = new HashSet<>(); - Queue<AccessibilityNodeInfo> fringe = new LinkedList<>(); + Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>(); fringe.add(root); while (!fringe.isEmpty()) { AccessibilityNodeInfo current = fringe.poll(); diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index aeef76c3d048..eadec03048dc 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -4487,8 +4487,8 @@ public class AccessibilityNodeInfo implements Parcelable { case R.id.accessibilityActionDragDrop: return "ACTION_DROP"; default: { - if (action == R.id.accessibilityActionShowSuggestions) { - return "ACTION_SHOW_SUGGESTIONS"; + if (action == R.id.accessibilityActionShowTextSuggestions) { + return "ACTION_SHOW_TEXT_SUGGESTIONS"; } return "ACTION_UNKNOWN"; } @@ -5215,8 +5215,8 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Action to show suggestions for editable text. */ - @NonNull public static final AccessibilityAction ACTION_SHOW_SUGGESTIONS = - new AccessibilityAction(R.id.accessibilityActionShowSuggestions); + @NonNull public static final AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS = + new AccessibilityAction(R.id.accessibilityActionShowTextSuggestions); private final int mActionId; private final CharSequence mLabel; diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 27174630bfa3..017b8aa3cf6c 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -46,6 +46,8 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.annotation.UserIdInt; import android.app.ActivityThread; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledSince; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.ContentResolver; @@ -356,6 +358,21 @@ public final class InputMethodManager { /** @hide */ public static final int SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES = 2; + /** + * Clear {@link #SHOW_FORCED} flag when the next IME focused application changed. + * + * <p> + * Note that when this flag enabled in server side, {@link #SHOW_FORCED} will no longer + * affect the next focused application to keep showing IME, in case of unexpected IME visible + * when the next focused app isn't be the IME requester. </p> + * + * @hide + */ + @TestApi + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.TIRAMISU) + public static final long CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING = 214016041L; // This is a bug id. + @UnsupportedAppUsage final IInputMethodManager mService; final Looper mMainLooper; @@ -1646,7 +1663,14 @@ public final class InputMethodManager { * Flag for {@link #showSoftInput} to indicate that the user has forced * the input method open (such as by long-pressing menu) so it should * not be closed until they explicitly do so. + * + * @deprecated Use {@link #showSoftInput} without this flag instead. Using this flag can lead + * to the soft input remaining visible even when the calling application is closed. The + * use of this flag can make the soft input remains visible globally. Starting in + * {@link Build.VERSION_CODES#TIRAMISU Android T}, this flag only has an effect while the + * caller is currently focused. */ + @Deprecated public static final int SHOW_FORCED = 0x0002; /** diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index 6cfb9381f130..5d9f4f630fc0 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -39,7 +39,7 @@ import com.android.internal.textservice.ITextServicesSessionListener; import dalvik.system.CloseGuard; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Locale; import java.util.Queue; import java.util.concurrent.Executor; @@ -245,7 +245,7 @@ public class SpellCheckerSession { } } - private final Queue<SpellCheckerParams> mPendingTasks = new LinkedList<>(); + private final Queue<SpellCheckerParams> mPendingTasks = new ArrayDeque<>(); @GuardedBy("SpellCheckerSessionListenerImpl.this") private SpellCheckerSession mSpellCheckerSession; diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index dbaf0aaccb1a..3c8fcb978fbd 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -12335,7 +12335,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener info.addAction(AccessibilityNodeInfo.ACTION_CUT); } if (canReplace()) { - info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_SUGGESTIONS); + info.addAction( + AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_TEXT_SUGGESTIONS); } if (canShare()) { info.addAction(new AccessibilityNodeInfo.AccessibilityAction( @@ -12656,7 +12657,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener default: { // New ids have static blocks to assign values, so they can't be used in a case // block. - if (action == R.id.accessibilityActionShowSuggestions) { + if (action == R.id.accessibilityActionShowTextSuggestions) { return isFocused() && canReplace() && onTextContextMenuItem(ID_REPLACE); } return super.performAccessibilityActionInternal(action, arguments); @@ -12796,7 +12797,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener /** * Called when a context menu option for the text view is selected. Currently * this will be one of {@link android.R.id#selectAll}, {@link android.R.id#cut}, - * {@link android.R.id#copy}, {@link android.R.id#paste} or {@link android.R.id#shareText}. + * {@link android.R.id#copy}, {@link android.R.id#paste}, + * {@link android.R.id#pasteAsPlainText} (starting at API level 23) or + * {@link android.R.id#shareText}. * * @return true if the context menu item action was performed. */ @@ -12987,6 +12990,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * method. The default actions can also be removed from the menu using * {@link android.view.Menu#removeItem(int)} and passing {@link android.R.id#selectAll}, * {@link android.R.id#cut}, {@link android.R.id#copy}, {@link android.R.id#paste}, + * {@link android.R.id#pasteAsPlainText} (starting at API level 23), * {@link android.R.id#replaceText} or {@link android.R.id#shareText} ids as parameters. * * <p>Returning false from @@ -13025,7 +13029,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * {@link android.view.ActionMode.Callback#onPrepareActionMode(android.view.ActionMode, * android.view.Menu)} method. The default actions can also be removed from the menu using * {@link android.view.Menu#removeItem(int)} and passing {@link android.R.id#selectAll}, - * {@link android.R.id#paste} or {@link android.R.id#replaceText} ids as parameters.</p> + * {@link android.R.id#paste}, {@link android.R.id#pasteAsPlainText} (starting at API + * level 23) or {@link android.R.id#replaceText} ids as parameters.</p> * * <p>Returning false from * {@link android.view.ActionMode.Callback#onCreateActionMode(android.view.ActionMode, diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index cdb69e546b8f..e336e96d577e 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -33,7 +33,6 @@ import android.annotation.StringRes; import android.annotation.UiThread; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityTaskManager; import android.app.ActivityThread; import android.app.VoiceInteractor.PickOptionRequest; import android.app.VoiceInteractor.PickOptionRequest.Option; @@ -54,13 +53,11 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.content.res.Configuration; -import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Insets; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.IBinder; import android.os.PatternMatcher; import android.os.RemoteException; import android.os.StrictMode; @@ -1464,36 +1461,9 @@ public class ResolverActivity extends Activity implements public boolean startAsCallerImpl(Intent intent, Bundle options, boolean ignoreTargetSecurity, int userId) { - // Pass intent to delegate chooser activity with permission token. - // TODO: This should move to a trampoline Activity in the system when the ChooserActivity - // moves into systemui - try { - // TODO: Once this is a small springboard activity, it can move off the UI process - // and we can move the request method to ActivityManagerInternal. - final Intent chooserIntent = new Intent(); - final ComponentName delegateActivity = ComponentName.unflattenFromString( - Resources.getSystem().getString(R.string.config_chooserActivity)); - IBinder permissionToken = ActivityTaskManager.getService() - .requestStartActivityPermissionToken(delegateActivity); - chooserIntent.setClassName(delegateActivity.getPackageName(), - delegateActivity.getClassName()); - chooserIntent.putExtra(ActivityTaskManager.EXTRA_PERMISSION_TOKEN, permissionToken); - - // TODO: These extras will change as chooser activity moves into systemui - chooserIntent.putExtra(Intent.EXTRA_INTENT, intent); - chooserIntent.putExtra(ActivityTaskManager.EXTRA_OPTIONS, options); - chooserIntent.putExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY, - ignoreTargetSecurity); - chooserIntent.putExtra(Intent.EXTRA_USER_ID, userId); - chooserIntent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP); - - // Don't close until the delegate finishes, or the token will be invalidated. - mAwaitingDelegateResponse = true; - - startActivityForResult(chooserIntent, REQUEST_CODE_RETURN_FROM_DELEGATE_CHOOSER); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } + // Note: this method will be overridden in the delegate implementation to use the passed-in + // permission token. + startActivityAsCaller(intent, options, null, false, userId); return true; } diff --git a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java b/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java index 301de2d3529e..dc53e77466ad 100644 --- a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java +++ b/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java @@ -30,11 +30,9 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; -import android.provider.DeviceConfig; import com.android.internal.app.ResolverActivity; import com.android.internal.app.ResolverListAdapter.ResolveInfoPresentationGetter; -import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import java.util.ArrayList; import java.util.Arrays; @@ -45,11 +43,6 @@ import java.util.List; * resolve it to an activity. */ public class DisplayResolveInfo implements TargetInfo, Parcelable { - private final boolean mEnableChooserDelegate = - DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, - SystemUiDeviceConfigFlags.USE_DELEGATE_CHOOSER, - false); - private final ResolveInfo mResolveInfo; private CharSequence mDisplayLabel; private Drawable mDisplayIcon; @@ -180,12 +173,9 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { @Override public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) { - if (mEnableChooserDelegate) { - return activity.startAsCallerImpl(mResolvedIntent, options, false, userId); - } else { - activity.startActivityAsCaller(mResolvedIntent, options, null, false, userId); - return true; - } + // TODO: if the start-as-caller API no longer requires a permission token, this can go back + // to inlining the real activity-start call, and we can remove startAsCallerImpl. + return activity.startAsCallerImpl(mResolvedIntent, options, false, userId); } @Override diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java index a60b31078a86..73a4f1c4a154 100644 --- a/core/java/com/android/internal/content/FileSystemProvider.java +++ b/core/java/com/android/internal/content/FileSystemProvider.java @@ -62,7 +62,9 @@ import java.nio.file.FileVisitor; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Deque; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -232,9 +234,9 @@ public abstract class FileSystemProvider extends DocumentsProvider { throw new FileNotFoundException(doc + " is not found under " + parent); } - LinkedList<String> path = new LinkedList<>(); + List<String> path = new ArrayList<>(); while (doc != null && FileUtils.contains(parent, doc)) { - path.addFirst(getDocIdForFile(doc)); + path.add(0, getDocIdForFile(doc)); doc = doc.getParentFile(); } @@ -448,10 +450,10 @@ public abstract class FileSystemProvider extends DocumentsProvider { File folder, String[] projection, Set<String> exclusion, Bundle queryArgs) throws FileNotFoundException { final MatrixCursor result = new MatrixCursor(resolveProjection(projection)); - final LinkedList<File> pending = new LinkedList<>(); + final List<File> pending = new ArrayList<>(); pending.add(folder); while (!pending.isEmpty() && result.getCount() < 24) { - final File file = pending.removeFirst(); + final File file = pending.remove(0); if (shouldHide(file)) continue; if (file.isDirectory()) { diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 55c2f4c46d52..692bca6cd9b7 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -166,7 +166,7 @@ public class BatteryStatsImpl extends BatteryStats { private static final int MAGIC = 0xBA757475; // 'BATSTATS' // Current on-disk Parcel version - static final int VERSION = 206; + static final int VERSION = 207; // The maximum number of names wakelocks we will keep track of // per uid; once the limit is reached, we batch the remaining wakelocks @@ -964,6 +964,16 @@ public class BatteryStatsImpl extends BatteryStats { * Timers for each combination of frequency range and signal strength. */ public final StopwatchTimer[][] perStateTimers; + /** + * Counters tracking the time (in milliseconds) spent transmitting data in a given state. + */ + @Nullable + private LongSamplingCounter[][] mPerStateTxDurationMs = null; + /** + * Counters tracking the time (in milliseconds) spent receiving data in at given frequency. + */ + @Nullable + private LongSamplingCounter[] mPerFrequencyRxDurationMs = null; RadioAccessTechnologyBatteryStats(int freqCount, Clock clock, TimeBase timeBase) { perStateTimers = @@ -1024,15 +1034,198 @@ public class BatteryStatsImpl extends BatteryStats { } /** - * Reset display timers. + * Returns the duration in milliseconds spent in a given state since the last mark. + */ + public long getTimeSinceMark(@ServiceState.FrequencyRange int frequencyRange, + int signalStrength, long elapsedRealtimeMs) { + return perStateTimers[frequencyRange][signalStrength].getTimeSinceMarkLocked( + elapsedRealtimeMs * 1000) / 1000; + } + + /** + * Set mark for all timers. + */ + public void setMark(long elapsedRealtimeMs) { + final int size = perStateTimers.length; + for (int i = 0; i < size; i++) { + for (int j = 0; j < CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS; j++) { + perStateTimers[i][j].setMark(elapsedRealtimeMs); + } + } + } + + /** + * Returns numbers of frequencies tracked for this RAT. + */ + public int getFrequencyRangeCount() { + return perStateTimers.length; + } + + /** + * Add TX time for a given state. + */ + public void incrementTxDuration(@ServiceState.FrequencyRange int frequencyRange, + int signalStrength, long durationMs) { + getTxDurationCounter(frequencyRange, signalStrength, true).addCountLocked(durationMs); + } + + /** + * Add TX time for a given frequency. + */ + public void incrementRxDuration(@ServiceState.FrequencyRange int frequencyRange, + long durationMs) { + getRxDurationCounter(frequencyRange, true).addCountLocked(durationMs); + } + + /** + * Reset radio access technology timers and counts. */ public void reset(long elapsedRealtimeUs) { final int size = perStateTimers.length; for (int i = 0; i < size; i++) { for (int j = 0; j < CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS; j++) { perStateTimers[i][j].reset(false, elapsedRealtimeUs); + if (mPerStateTxDurationMs == null) continue; + mPerStateTxDurationMs[i][j].reset(false, elapsedRealtimeUs); + } + if (mPerFrequencyRxDurationMs == null) continue; + mPerFrequencyRxDurationMs[i].reset(false, elapsedRealtimeUs); + } + } + + /** + * Write data to summary parcel + */ + public void writeSummaryToParcel(Parcel out, long elapsedRealtimeUs) { + final int freqCount = perStateTimers.length; + out.writeInt(freqCount); + out.writeInt(CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS); + for (int i = 0; i < freqCount; i++) { + for (int j = 0; j < CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS; j++) { + perStateTimers[i][j].writeSummaryFromParcelLocked(out, elapsedRealtimeUs); + } + } + + if (mPerStateTxDurationMs == null) { + out.writeInt(0); + } else { + out.writeInt(1); + for (int i = 0; i < freqCount; i++) { + for (int j = 0; j < CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS; j++) { + mPerStateTxDurationMs[i][j].writeSummaryFromParcelLocked(out); + } + } + } + + if (mPerFrequencyRxDurationMs == null) { + out.writeInt(0); + } else { + out.writeInt(1); + for (int i = 0; i < freqCount; i++) { + mPerFrequencyRxDurationMs[i].writeSummaryFromParcelLocked(out); + } + } + } + + /** + * Read data from summary parcel + */ + public void readSummaryFromParcel(Parcel in) { + final int oldFreqCount = in.readInt(); + final int oldSignalStrengthCount = in.readInt(); + final int currFreqCount = perStateTimers.length; + final int currSignalStrengthCount = CellSignalStrength.NUM_SIGNAL_STRENGTH_BINS; + + for (int freq = 0; freq < oldFreqCount; freq++) { + for (int strength = 0; strength < oldSignalStrengthCount; strength++) { + if (freq >= currFreqCount || strength >= currSignalStrengthCount) { + // Mismatch with the summary parcel. Consume the data but don't use it. + final StopwatchTimer temp = new StopwatchTimer(null, null, -1, null, + new TimeBase()); + // Consume perStateTimers data. + temp.readSummaryFromParcelLocked(in); + } else { + perStateTimers[freq][strength].readSummaryFromParcelLocked(in); + } + } + } + + if (in.readInt() == 1) { + for (int freq = 0; freq < oldFreqCount; freq++) { + for (int strength = 0; strength < oldSignalStrengthCount; strength++) { + if (freq >= currFreqCount || strength >= currSignalStrengthCount) { + // Mismatch with the summary parcel. Consume the data but don't use it. + final StopwatchTimer temp = new StopwatchTimer(null, null, -1, null, + new TimeBase()); + // Consume mPerStateTxDurationMs data. + temp.readSummaryFromParcelLocked(in); + } + getTxDurationCounter(freq, strength, true).readSummaryFromParcelLocked(in); + } + } + } + + if (in.readInt() == 1) { + for (int freq = 0; freq < oldFreqCount; freq++) { + if (freq >= currFreqCount) { + // Mismatch with the summary parcel. Consume the data but don't use it. + final StopwatchTimer + temp = new StopwatchTimer(null, null, -1, null, new TimeBase()); + // Consume mPerFrequencyRxDurationMs data. + temp.readSummaryFromParcelLocked(in); + continue; + } + getRxDurationCounter(freq, true).readSummaryFromParcelLocked(in); + } + } + } + + private LongSamplingCounter getTxDurationCounter( + @ServiceState.FrequencyRange int frequencyRange, int signalStrength, boolean make) { + if (mPerStateTxDurationMs == null) { + if (!make) return null; + + final int freqCount = getFrequencyRangeCount(); + final int signalStrengthCount = perStateTimers[0].length; + final TimeBase timeBase = perStateTimers[0][0].mTimeBase; + mPerStateTxDurationMs = new LongSamplingCounter[freqCount][signalStrengthCount]; + for (int freq = 0; freq < freqCount; freq++) { + for (int strength = 0; strength < signalStrengthCount; strength++) { + mPerStateTxDurationMs[freq][strength] = new LongSamplingCounter(timeBase); + } + } + } + if (frequencyRange < 0 || frequencyRange >= getFrequencyRangeCount()) { + Slog.w(TAG, "Unexpected frequency range (" + frequencyRange + + ") requested in getTxDurationCounter"); + return null; + } + if (signalStrength < 0 || signalStrength >= perStateTimers[0].length) { + Slog.w(TAG, "Unexpected signal strength (" + signalStrength + + ") requested in getTxDurationCounter"); + return null; + } + return mPerStateTxDurationMs[frequencyRange][signalStrength]; + } + + private LongSamplingCounter getRxDurationCounter( + @ServiceState.FrequencyRange int frequencyRange, boolean make) { + if (mPerFrequencyRxDurationMs == null) { + if (!make) return null; + + final int freqCount = getFrequencyRangeCount(); + final TimeBase timeBase = perStateTimers[0][0].mTimeBase; + mPerFrequencyRxDurationMs = new LongSamplingCounter[freqCount]; + for (int freq = 0; freq < freqCount; freq++) { + mPerFrequencyRxDurationMs[freq] = new LongSamplingCounter(timeBase); } } + if (frequencyRange < 0 || frequencyRange >= getFrequencyRangeCount()) { + Slog.w(TAG, "Unexpected frequency range (" + frequencyRange + + ") requested in getRxDurationCounter"); + return null; + } + return mPerFrequencyRxDurationMs[frequencyRange]; } } @@ -8004,6 +8197,32 @@ public class BatteryStatsImpl extends BatteryStats { elapsedRealtimeMs * 1000, STATS_SINCE_CHARGED) / 1000; } + @Override + public long getActiveTxRadioDurationMs(@RadioAccessTechnology int rat, + @ServiceState.FrequencyRange int frequencyRange, int signalStrength, + long elapsedRealtimeMs) { + final RadioAccessTechnologyBatteryStats stats = mPerRatBatteryStats[rat]; + if (stats == null) return DURATION_UNAVAILABLE; + + final LongSamplingCounter counter = stats.getTxDurationCounter(frequencyRange, + signalStrength, false); + if (counter == null) return DURATION_UNAVAILABLE; + + return counter.getCountLocked(STATS_SINCE_CHARGED); + } + + @Override + public long getActiveRxRadioDurationMs(@RadioAccessTechnology int rat, + @ServiceState.FrequencyRange int frequencyRange, long elapsedRealtimeMs) { + final RadioAccessTechnologyBatteryStats stats = mPerRatBatteryStats[rat]; + if (stats == null) return DURATION_UNAVAILABLE; + + final LongSamplingCounter counter = stats.getRxDurationCounter(frequencyRange, false); + if (counter == null) return DURATION_UNAVAILABLE; + + return counter.getCountLocked(STATS_SINCE_CHARGED); + } + @UnsupportedAppUsage @Override public long getMobileRadioActiveTime(long elapsedRealtimeUs, int which) { return mMobileRadioActiveTimer.getTotalTimeLocked(elapsedRealtimeUs, which); @@ -13486,6 +13705,67 @@ public class BatteryStatsImpl extends BatteryStats { addHistoryRecordLocked(elapsedRealtimeMs, uptimeMs); mTmpRailStats.resetCellularTotalEnergyUsed(); } + + // Proportionally smear Rx and Tx times across each RAt + final int levelCount = CellSignalStrength.getNumSignalStrengthLevels(); + long[] perSignalStrengthActiveTimeMs = new long[levelCount]; + long totalActiveTimeMs = 0; + + for (int rat = 0; rat < RADIO_ACCESS_TECHNOLOGY_COUNT; rat++) { + final RadioAccessTechnologyBatteryStats ratStats = mPerRatBatteryStats[rat]; + if (ratStats == null) continue; + + final int freqCount = ratStats.getFrequencyRangeCount(); + for (int freq = 0; freq < freqCount; freq++) { + for (int level = 0; level < levelCount; level++) { + final long durationMs = ratStats.getTimeSinceMark(freq, level, + elapsedRealtimeMs); + perSignalStrengthActiveTimeMs[level] += durationMs; + totalActiveTimeMs += durationMs; + } + } + } + + if (totalActiveTimeMs != 0) { + // Smear the provided Tx/Rx durations across each RAT, frequency, and signal + // strength. + for (int rat = 0; rat < RADIO_ACCESS_TECHNOLOGY_COUNT; rat++) { + final RadioAccessTechnologyBatteryStats ratStats = mPerRatBatteryStats[rat]; + if (ratStats == null) continue; + + final int freqCount = ratStats.getFrequencyRangeCount(); + for (int freq = 0; freq < freqCount; freq++) { + long frequencyDurationMs = 0; + for (int level = 0; level < levelCount; level++) { + final long durationMs = ratStats.getTimeSinceMark(freq, level, + elapsedRealtimeMs); + final long totalLvlDurationMs = + perSignalStrengthActiveTimeMs[level]; + if (totalLvlDurationMs == 0) continue; + final long totalTxLvlDurations = + deltaInfo.getTransmitDurationMillisAtPowerLevel(level); + // Smear HAL provided Tx power level duration based on active modem + // duration in a given state. (Add totalLvlDurationMs / 2 before + // the integer division with totalLvlDurationMs for rounding.) + final long proportionalTxDurationMs = + (durationMs * totalTxLvlDurations + + (totalLvlDurationMs / 2)) / totalLvlDurationMs; + ratStats.incrementTxDuration(freq, level, proportionalTxDurationMs); + frequencyDurationMs += durationMs; + } + final long totalRxDuration = deltaInfo.getReceiveTimeMillis(); + // Smear HAL provided Rx power duration based on active modem + // duration in a given state. (Add totalActiveTimeMs / 2 before the + // integer division with totalActiveTimeMs for rounding.) + final long proportionalRxDurationMs = + (frequencyDurationMs * totalRxDuration + (totalActiveTimeMs + / 2)) / totalActiveTimeMs; + ratStats.incrementRxDuration(freq, proportionalRxDurationMs); + } + + ratStats.setMark(elapsedRealtimeMs); + } + } } long totalAppRadioTimeUs = mMobileRadioActivePerAppTimer.getTimeSinceMarkLocked( elapsedRealtimeMs * 1000); @@ -16927,6 +17207,13 @@ public class BatteryStatsImpl extends BatteryStats { mNetworkByteActivityCounters[i].readSummaryFromParcelLocked(in); mNetworkPacketActivityCounters[i].readSummaryFromParcelLocked(in); } + + final int numRat = in.readInt(); + for (int i = 0; i < numRat; i++) { + if (in.readInt() == 0) continue; + getRatBatteryStatsLocked(i).readSummaryFromParcel(in); + } + mMobileRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW; mMobileRadioActiveTimer.readSummaryFromParcelLocked(in); mMobileRadioActivePerAppTimer.readSummaryFromParcelLocked(in); @@ -17432,6 +17719,17 @@ public class BatteryStatsImpl extends BatteryStats { mNetworkByteActivityCounters[i].writeSummaryFromParcelLocked(out); mNetworkPacketActivityCounters[i].writeSummaryFromParcelLocked(out); } + final int numRat = mPerRatBatteryStats.length; + out.writeInt(numRat); + for (int i = 0; i < numRat; i++) { + final RadioAccessTechnologyBatteryStats ratStat = mPerRatBatteryStats[i]; + if (ratStat == null) { + out.writeInt(0); + continue; + } + out.writeInt(1); + ratStat.writeSummaryToParcel(out, nowRealtime); + } mMobileRadioActiveTimer.writeSummaryFromParcelLocked(out, nowRealtime); mMobileRadioActivePerAppTimer.writeSummaryFromParcelLocked(out, nowRealtime); mMobileRadioActiveAdjustedTime.writeSummaryFromParcelLocked(out); diff --git a/core/java/com/android/internal/os/SystemServerClassLoaderFactory.java b/core/java/com/android/internal/os/SystemServerClassLoaderFactory.java index 615e4b793752..a03bac45d14f 100644 --- a/core/java/com/android/internal/os/SystemServerClassLoaderFactory.java +++ b/core/java/com/android/internal/os/SystemServerClassLoaderFactory.java @@ -29,22 +29,66 @@ public final class SystemServerClassLoaderFactory { private static final ArrayMap<String, PathClassLoader> sLoadedPaths = new ArrayMap<>(); /** - * Creates and caches a ClassLoader for the jar at the given path, or returns a cached - * ClassLoader if it exists. + * Creates and caches a ClassLoader for the jar at the given path. + * + * This method should only be called by ZygoteInit to prefetch jars. For other users, use + * {@link getOrCreateClassLoader} instead. * * The parent class loader should always be the system server class loader. Changing it has * implications that require discussion with the mainline team. * * @hide for internal use only */ - public static PathClassLoader getOrCreateClassLoader(String path, ClassLoader parent) { - PathClassLoader pathClassLoader = sLoadedPaths.get(path); - if (pathClassLoader == null) { - pathClassLoader = (PathClassLoader) ClassLoaderFactory.createClassLoader( - path, /*librarySearchPath=*/null, /*libraryPermittedPath=*/null, parent, - Build.VERSION.SDK_INT, /*isNamespaceShared=*/true , /*classLoaderName=*/null); - sLoadedPaths.put(path, pathClassLoader); + /* package */ static PathClassLoader createClassLoader(String path, ClassLoader parent) { + if (sLoadedPaths.containsKey(path)) { + throw new IllegalStateException("A ClassLoader for " + path + " already exists"); } + PathClassLoader pathClassLoader = (PathClassLoader) ClassLoaderFactory.createClassLoader( + path, /*librarySearchPath=*/null, /*libraryPermittedPath=*/null, parent, + Build.VERSION.SDK_INT, /*isNamespaceShared=*/true , /*classLoaderName=*/null); + sLoadedPaths.put(path, pathClassLoader); return pathClassLoader; } + + /** + * Returns a cached ClassLoader to be used at runtime for the jar at the given path. Or, creates + * one if it is not prefetched and is allowed to be created at runtime. + * + * The parent class loader should always be the system server class loader. Changing it has + * implications that require discussion with the mainline team. + * + * @hide for internal use only + */ + public static PathClassLoader getOrCreateClassLoader( + String path, ClassLoader parent, boolean isTestOnly) { + PathClassLoader pathClassLoader = sLoadedPaths.get(path); + if (pathClassLoader != null) { + return pathClassLoader; + } + if (!allowClassLoaderCreation(path, isTestOnly)) { + throw new RuntimeException("Creating a ClassLoader from " + path + " is not allowed. " + + "Please make sure that the jar is listed in " + + "`PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS` in the Makefile and added as a " + + "`standalone_contents` of a `systemserverclasspath_fragment` in " + + "`Android.bp`."); + } + return createClassLoader(path, parent); + } + + /** + * Returns whether a class loader for the jar is allowed to be created at runtime. + */ + private static boolean allowClassLoaderCreation(String path, boolean isTestOnly) { + // Currently, we only enforce prefetching for APEX jars. + if (!path.startsWith("/apex/")) { + return true; + } + // APEXes for testing only are okay to ignore. + if (isTestOnly) { + return true; + } + return false; + } + + } diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 3d24aa2db247..ca1ae194cb12 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -586,7 +586,7 @@ public class ZygoteInit { } for (String jar : envStr.split(":")) { try { - SystemServerClassLoaderFactory.getOrCreateClassLoader( + SystemServerClassLoaderFactory.createClassLoader( jar, getOrCreateSystemServerClassLoader()); } catch (Error e) { // We don't want the process to crash for this error because prefetching is just an diff --git a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java index bf3e8d56b6bc..a0f7905771a2 100644 --- a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java +++ b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java @@ -1,11 +1,5 @@ package com.android.internal.view.menu; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - import android.annotation.AttrRes; import android.annotation.IntDef; import android.annotation.NonNull; @@ -22,16 +16,16 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; -import android.view.ViewTreeObserver; import android.view.View.OnAttachStateChangeListener; import android.view.View.OnKeyListener; +import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.widget.AbsListView; import android.widget.FrameLayout; import android.widget.HeaderViewListAdapter; import android.widget.ListAdapter; -import android.widget.MenuItemHoverListener; import android.widget.ListView; +import android.widget.MenuItemHoverListener; import android.widget.MenuPopupWindow; import android.widget.PopupWindow; import android.widget.PopupWindow.OnDismissListener; @@ -40,6 +34,11 @@ import android.widget.TextView; import com.android.internal.R; import com.android.internal.util.Preconditions; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; + /** * A popup for a menu which will allow multiple submenus to appear in a cascading fashion, side by * side. @@ -70,7 +69,7 @@ final class CascadingMenuPopup extends MenuPopup implements MenuPresenter, OnKey private final Handler mSubMenuHoverHandler; /** List of menus that were added before this popup was shown. */ - private final List<MenuBuilder> mPendingMenus = new LinkedList<>(); + private final List<MenuBuilder> mPendingMenus = new ArrayList<>(); /** * List of open menus. The first item is the root menu and each diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index fb5b5ffaac48..e13ac320ef69 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -62,6 +62,7 @@ namespace android { +using gui::CaptureArgs; using gui::FocusRequest; static void doThrowNPE(JNIEnv* env) { diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index c33b7c921740..e8f7b9343746 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -382,6 +382,7 @@ message ActivityRecordProto { optional bool in_size_compat_mode = 32; optional float min_aspect_ratio = 33; optional bool provides_max_bounds = 34; + optional bool enable_recents_screenshot = 35; } /* represents WindowToken */ diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 181a26fe87e6..5c6eb6993237 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -545,7 +545,7 @@ <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Laat die program toe om op Bluetooth-toestelle in die omtrek te adverteer"</string> <string name="permlab_uwb_ranging" msgid="8141915781475770665">"bepaal relatiewe posisie tussen ultrabreëbandtoestelle in die omtrek"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Laat die program toe om relatiewe posisie tussen ultrabreëbandtoestelle in die omtrek te bepaal"</string> - <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"interaksie met wi‑fi-toestelle in die omtrek te hê"</string> + <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"om interaksie met wi‑fi-toestelle in die omtrek te hê"</string> <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Laat die program toe om op toestelle in die omtrek te adverteer, aan hulle te koppel en hul relatiewe posisie te bepaal"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Voorkeur-NFC-betalingdiensinligting"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Laat die program toe om voorkeur-NFC-betalingdiensinligting soos geregistreerde hulpmiddels en roetebestemming te kry."</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 94a02a63deb0..4c5cbbcc5083 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -550,7 +550,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"تحديد الموضع النسبي بين الأجهزة المجاورة التي تستخدم النطاق الواسع جدًا"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"يسمح هذا الإذن للتطبيق بتحديد الموضع النسبي بين الأجهزة المجاورة التي تستخدم النطاق الواسع جدًا."</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"التفاعل مع أجهزة Wi‑Fi المجاورة"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"للسماح للتطبيق بالإعلان والربط وتحديد الموقع النسبي لأجهزة Wi-Fi المجاورة."</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"للسماح للتطبيق بعرض الإعلانات والاتصال بالأجهزة الأخرى وتحديد الموقع النسبي لأجهزة Wi-Fi المجاورة."</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"معلومات الخدمات المدفوعة باستخدام الاتصال قصير المدى NFC المفضّل"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"يسمح هذا الإذن للتطبيق بالحصول على معلومات الخدمات المدفوعة باستخدام الاتصال قصير المدى NFC المفضّل، مثلاً المساعدات المسجّلة ووجهة المسار."</string> <string name="permlab_nfc" msgid="1904455246837674977">"التحكم في اتصال الحقل القريب"</string> @@ -1451,7 +1451,7 @@ <string name="permdesc_requestDeletePackages" msgid="6133633516423860381">"للسماح لتطبيق ما بطلب حذف الحِزم."</string> <string name="permlab_requestIgnoreBatteryOptimizations" msgid="7646611326036631439">"طلب تجاهل تحسينات البطارية"</string> <string name="permdesc_requestIgnoreBatteryOptimizations" msgid="634260656917874356">"للسماح للتطبيق بطلب الإذن لتجاهل تحسينات البطارية في هذا التطبيق."</string> - <string name="permlab_queryAllPackages" msgid="2928450604653281650">"طلب البحث في كل الحِزم"</string> + <string name="permlab_queryAllPackages" msgid="2928450604653281650">"البحث في كل الحِزم"</string> <string name="permdesc_queryAllPackages" msgid="5339069855520996010">"يسمح هذا الإذن للتطبيق بعرض كل الحِزم المثبّتة."</string> <string name="permlab_accessSupplementalApi" msgid="3544659160536960275">"الوصول إلى SupplementalApis"</string> <string name="permdesc_accessSupplementalApi" msgid="8974758769370951074">"السماح لأحد التطبيقات بالوصول إلى SupplementalApis"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index bb5c10223c4a..3efa4b3502f0 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"আশেপাশের Ultra-Wideband ডিভাইসগুলির আপেক্ষিক অবস্থান নির্ণয় করুন"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"অ্যাপকে আশেপাশের Ultra-Wideband ডিভাইসগুলির আপেক্ষিক অবস্থান নির্ণয় করার অনুমতি দিন"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"আশপাশের ওয়াই-ফাই ডিভাইসের সাথে ইন্টার্যাক্ট করুন"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"এটির ফলে অ্যাপ আশপাশের ওয়াই-ফাই ডিভাইসের তথ্য দেখাতে, তাদের সাথে কানেক্ট করতে এবং ত দূরত্বে আছে সেটি জানতে পারবে"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"এটির ফলে অ্যাপ আশপাশের ওয়াই-ফাই ডিভাইসের তথ্য দেখতে, তাদের সাথে কানেক্ট করতে এবং তা কত দূরত্বে আছে সেটি জানতে পারবে"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"পছন্দের NFC পেমেন্ট পরিষেবার তথ্য"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"অ্যাপের মাধ্যমে পছন্দসই এনএফসি পেমেন্ট পরিষেবার তথ্য, যেমন রেজিস্ট্রার করার সহায়তা এবং রুট ডেস্টিনেশন সম্পর্কিত তথ্য অ্যাক্সেস করার অনুমতি দেয়।"</string> <string name="permlab_nfc" msgid="1904455246837674977">"নিয়ার ফিল্ড কমিউনিকেশন নিয়ন্ত্রণ করে"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index a07d941b077d..4cc027e1afbf 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1952,7 +1952,7 @@ <string name="demo_restarting_message" msgid="1160053183701746766">"Palautetaan asetuksia…"</string> <string name="suspended_widget_accessibility" msgid="6331451091851326101">"<xliff:g id="LABEL">%1$s</xliff:g> ei ole käytössä."</string> <string name="conference_call" msgid="5731633152336490471">"Puhelinneuvottelu"</string> - <string name="tooltip_popup_title" msgid="7863719020269945722">"Työkaluvinkki"</string> + <string name="tooltip_popup_title" msgid="7863719020269945722">"Vihjeteksti"</string> <string name="app_category_game" msgid="4534216074910244790">"Pelit"</string> <string name="app_category_audio" msgid="8296029904794676222">"Musiikki ja ääni"</string> <string name="app_category_video" msgid="2590183854839565814">"Elokuvat ja videot"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 6e55c1dc58e2..284c757b06e3 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"déterminer position relative entre appareils ultra-wideband à proximité"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Autoriser l\'appli à déterminer la position relative entre des appareils ultra-wideband à proximité"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"interagir avec les appareils Wi-Fi à proximité"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Permet à l\'appli de déterminer la position relative des appareils Wi‑Fi à proximité, vous en informer et s\'y connecter"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Permet à l\'appli de déterminer la position approximative des appareils Wi‑Fi à proximité, de les afficher et de s\'y connecter"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Informations sur le service de paiement NFC préféré"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Permet à l\'application d\'obtenir des informations sur le service de paiement NFC préféré, y compris les ID d\'applications et les destinations de routage enregistrés."</string> <string name="permlab_nfc" msgid="1904455246837674977">"contrôler la communication en champ proche"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 76ca7a964f66..861d0bc6872d 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -541,11 +541,11 @@ <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Թույլ է տալիս հավելվածին հայտնաբերել և զուգակցել մոտակա Bluetooth սարքերը"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"միանալ զուգակցված Bluetooth սարքերի"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Թույլ է տալիս հավելվածին միանալ զուգակցված Bluetooth սարքերի"</string> - <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"Գովազդ մոտակա Bluetooth սարքերում"</string> + <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"գովազդել մոտակա Bluetooth սարքերին"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Թույլատրում է հավելվածին գովազդ փոխանցել մոտակա Bluetooth սարքերին"</string> <string name="permlab_uwb_ranging" msgid="8141915781475770665">"որոշել մոտակա UWB սարքերի միջև հարաբերական դիրքավորումը"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Թույլատրել հավելվածին որոշել գերլայնաշերտ կապի տեխնոլոգիան աջակցող մոտակա սարքերի միջև հարաբերական դիրքավորումը"</string> - <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"Փոխազդում մոտակա Wi‑Fi սարքերի հետ"</string> + <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"փոխներգործել մոտակա Wi‑Fi սարքերի հետ"</string> <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Թույլ է տալիս հավելվածին տվյալներ փոխանցել մոտակա Wi‑Fi սարքերին, միանալ դրանց և որոշել դրանց մոտավոր դիրքը։"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Տեղեկություններ NFC վճարային ծառայության մասին"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Թույլ է տալիս հավելվածին ստանալ նախընտրելի NFC վճարային ծառայության մասին տեղեկություններ (օր․՝ գրանցված լրացուցիչ սարքերի և երթուղու նպատակակետի մասին տվյալներ)։"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 0a41b20844c2..cc299bde0536 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -541,7 +541,7 @@ <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"საშუალებას აძლევს აპს, აღმოაჩინოს ახლომახლო Bluetooth მოწყობილობები დასაწყვილებლად"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"დაწყვილებულ Bluetooth მოწყობილობებთან დაკავშირება"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"საშუალებას აძლევს აპს, დაუკავშირდეს დაწყვილებულ Bluetooth მოწყობილობებს"</string> - <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"ახლ. Bluetooth მოწყობილობებზე რეკლამის განთავსება"</string> + <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"ახლ. Bluetooth მოწყობილობებზე მონაცემების მაუწყებლობა"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"საშუალებას აძლევს აპს, რეკლამა განათავსოს ახლომახლო Bluetooth მოწყობილობებზე"</string> <string name="permlab_uwb_ranging" msgid="8141915781475770665">"შედარებითი პოზიციის დადგენა ახლომახლო ულტრაფართო სიხშირის მოწყობილობების შესახებ"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"ნებას რთავს აპს, დაადგინოს შედარებითი პოზიცია ახლომახლო ულტრაფართო სიხშირის მოწყობილობების შესახებ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 6b3311c48358..0b08c30f7dda 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -539,9 +539,9 @@ <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Leidžiama programai peržiūrėti „Bluetooth“ konfigūraciją planšetiniame kompiuteryje ir užmegzti bei priimti ryšius iš susietų įrenginių."</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Programai leidžiama peržiūrėti „Bluetooth“ konfigūraciją „Android TV“ įrenginyje ir užmegzti bei priimti ryšius iš susietų įrenginių."</string> <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Leidžiama programai peržiūrėti „Bluetooth“ konfigūraciją telefone ir užmegzti bei priimti ryšius iš susietų įrenginių."</string> - <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"„Bluetooth“ įr. netoliese aptikimas ir susiejimas"</string> + <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"aptikti „Bluetooth“ įr. netoliese ir susieti"</string> <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Leidžiama programai aptikti ir susieti „Bluetooth“ įrenginius netoliese"</string> - <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"prisijungimas prie susietų „Bluetooth“ įrenginių"</string> + <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"prisijungti prie susietų „Bluetooth“ įrenginių"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Leidžiama programai prisijungti prie susietų „Bluetooth“ įrenginių"</string> <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"reklamuoti netoliese es. „Bluetooth“ įrenginiuose"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Programai leidžiama reklamuoti netoliese esančiuose „Bluetooth“ įrenginiuose"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 518b4e3ac281..2b78d73fd2e0 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"да ја одреди релативната положба помеѓу уредите со ултраширок појас во близина"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Дозволува апликацијата да ја одреди релативната положба помеѓу уредите со ултраширок појас во близина"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"да има интеракција со уредите со Wi‑Fi во близина"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Дозволува апликацијата да рекламира, да се поврзува и да ја одредува релативната положба уредите со Wi‑Fi во близина"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Дозволува апликацијата да рекламира, да се поврзува и да ја одредува релативната положба на уреди со Wi‑Fi во близина"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Информации за претпочитаната услуга за плаќање преку NFC"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Дозволува апликацијата да добие информации за претпочитаната услуга за плаќање преку NFC, како регистрирани помагала и дестинација на маршрутата."</string> <string name="permlab_nfc" msgid="1904455246837674977">"контролирај комуникација на блиско поле"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 543b8beb6e69..ff7919a17f84 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"tentukan kedudukan relatif antara peranti Ultrajalur Lebar berdekatan"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Benarkan apl menentukan kedudukan relatif antara peranti Ultrajalur Lebar berdekatan"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"berinteraksi dengan peranti Wi-Fi berdekatan"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Membenarkan apl mengiklankan, menyambung dan menentukan penempatan relatif peranti Wi-Fi berdekatan"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Membenarkan apl mengiklankan, menyambung dan menentukan kedudukan relatif peranti Wi-Fi berdekatan"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Maklumat Perkhidmatan Pembayaran NFC Pilihan"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Membenarkan apl mendapatkan maklumat perkhidmatan pembayaran nfc pilihan seperti bantuan berdaftar dan destinasi laluan."</string> <string name="permlab_nfc" msgid="1904455246837674977">"mengawal Komunikasi Medan Dekat"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index ea11ae9aa5a2..75f38c09f5d7 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -541,12 +541,12 @@ <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Hiermee kan de app bluetooth-apparaten in de buurt vinden en koppelen"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"verbinding maken met gekoppelde bluetooth-apparaten"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Hiermee kan de app verbinding maken met gekoppelde bluetooth-apparaten"</string> - <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"adverteren op bluetooth-apparaten in de buurt"</string> - <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Hiermee kan de app adverteren op bluetooth-apparaten in de buurt"</string> + <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"uitzenden naar bluetooth-apparaten in de buurt"</string> + <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Hiermee kan de app uitzenden naar bluetooth-apparaten in de buurt"</string> <string name="permlab_uwb_ranging" msgid="8141915781475770665">"relatieve positie tussen ultrabreedbandapparaten in de buurt bepalen"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"De app toestaan om de relatieve positie tussen ultrabreedbandapparaten in de buurt te bepalen"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"interactie met wifi-apparaten in de buurt"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Hiermee kan de app adverteren op, verbinding maken met en de relatieve positie bepalen van wifi-apparaten in de buurt"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Hiermee kan de app uitzenden, verbindingen maken en de relatieve positie bepalen van wifi-apparaten in de buurt"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Informatie over voorkeursservice voor NFC-betaling"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Hiermee kun je zorgen dat de app informatie krijgt over de voorkeursservice voor NFC-betaling, zoals geregistreerde hulpmiddelen en routebestemmingen."</string> <string name="permlab_nfc" msgid="1904455246837674977">"Near Field Communication regelen"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index d9c7e3a4caff..c70bebcd1ad7 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -542,12 +542,12 @@ <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Permite aplicației să descopere și să asocieze dispozitive Bluetooth din apropiere"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"să se conecteze la dispozitive Bluetooth asociate"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Permite aplicației să se conecteze la dispozitive Bluetooth asociate"</string> - <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"să difuzeze anunțuri pe dispozitive Bluetooth din apropiere"</string> + <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"să transmită anunțuri pe dispozitive Bluetooth din apropiere"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Permite aplicației să difuzeze anunțuri pe dispozitive Bluetooth din apropiere"</string> <string name="permlab_uwb_ranging" msgid="8141915781475770665">"să stabilească poziția relativă dintre dispozitivele Ultra-Wideband din apropiere"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Permiteți-i aplicației să stabilească poziția relativă dintre dispozitivele Ultra-Wideband din apropiere"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"să interacționeze cu dispozitive Wi‑Fi din apropiere"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Permite aplicației să se conecteze la, să afișeze date și să stabilească poziția relativă pentru dispozitive Wi-Fi din apropiere"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Permite aplicației să se conecteze la dispozitive Wi-Fi din apropiere, să transmită anunțuri și să stabilească poziția relativă a acestora"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Informații despre serviciul de plăți NFC preferat"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Permite aplicației să obțină informații despre serviciul de plăți NFC preferat, de exemplu, identificatorii de aplicație înregistrați și destinația traseului."</string> <string name="permlab_nfc" msgid="1904455246837674977">"controlare schimb de date prin Near Field Communication"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index b84a85fc2720..8d2c534ff5e2 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -537,13 +537,13 @@ <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Huruhusu programu kuona usanidi wa Bluetooth kwenye kompyuta kibao, na kutuma na kukubali miunganisho kwa vifaa vilivyooanishwa."</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Huruhusu programu iangalie mipangilio iliyowekwa ya Bluetooth kwenye kifaa chako cha Android TV na kufanya na kukubali miunganisho na vifaa vilivyooanishwa."</string> <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Huruhusu programu kuona usanidi wa Bluetooth kwenye simu, na kutuma na kukubali miunganisho kwa vifaa vilivyooanishwa."</string> - <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"kutambua na kuoanisha vifaa vyenye Bluetooth vilivyo karibu"</string> + <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"tambua na oanishe vifaa vyenye Bluetooth vilivyo karibu"</string> <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Huruhusu programu itambue na kuoanisha kwenye vifaa vyenye Bluetooth vilivyo karibu"</string> - <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"kuunganisha kwenye vifaa vyenye Bluetooth vilivyooanishwa"</string> + <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"unganisha kwenye vifaa vyenye Bluetooth vilivyooanishwa"</string> <string name="permdesc_bluetooth_connect" product="default" msgid="4546016548795544617">"Huruhusu programu iunganishe kwenye vifaa vyenye Bluetooth vilivyooanishwa"</string> - <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"kutangaza kwenye vifaa vyenye Bluetooth vilivyo karibu"</string> + <string name="permlab_bluetooth_advertise" msgid="2781147747928853177">"tangaza kwenye vifaa vyenye Bluetooth vilivyo karibu"</string> <string name="permdesc_bluetooth_advertise" product="default" msgid="6085174451034210183">"Huruhusu programu itangaze kwenye vifaa vyenye Bluetooth vilivyo karibu"</string> - <string name="permlab_uwb_ranging" msgid="8141915781475770665">"kubainisha nafasi kati ya vifaa vyenye Bendi Pana Zaidi vilivyo karibu"</string> + <string name="permlab_uwb_ranging" msgid="8141915781475770665">"bainisha nafasi kati ya vifaa vyenye Bendi Pana Zaidi vilivyo karibu"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Ruhusu programu ibainishe nafasi kati ya vifaa vyenye Bendi Pana Zaidi vilivyo karibu"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"tumia vifaa vya Wi‑Fi vilivyo karibu"</string> <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Huruhusu programu kutangaza, kuunganisha na kubaini mahali palipokadiriwa vilipo vifaa vya Wi-Fi vilivyo karibu"</string> diff --git a/core/res/res/values-television/config.xml b/core/res/res/values-television/config.xml index 0db08fb751d8..88bf18cb8857 100644 --- a/core/res/res/values-television/config.xml +++ b/core/res/res/values-television/config.xml @@ -24,19 +24,6 @@ <!-- Flags enabling default window features. See Window.java --> <bool name="config_defaultWindowFeatureOptionsPanel">false</bool> - <!-- The percentage of the screen width to use for the default width or height of - picture-in-picture windows. Regardless of the percent set here, calculated size will never - be smaller than @dimen/default_minimal_size_pip_resizable_task. --> - <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.2</item> - - <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows. - These values are in DPs and will be converted to pixel sizes internally. --> - <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">24x24</string> - - <!-- The default gravity for the picture-in-picture window. - Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT --> - <integer name="config_defaultPictureInPictureGravity">0x55</integer> - <!-- The maximum height of the expanded horizontal picture-in-picture window --> <item name="config_pictureInPictureExpandedHorizontalHeight" format="dimension" type="dimen">110dp</item> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index e4556890ac25..2044e491d2b8 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"tukuyin ang relatibong posisyon sa pagitan ng mga kalapit na Ultra-Wideband device"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Payagan ang app na tukuyin ang relatibong posisyon sa pagitan ng mga kalapit na Ultra-Wideband device"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"makipag-ugnayan sa mga kalapit na Wi‑Fi device"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Nagbibigay-daan sa app na i-advertise, kumonekta sa, at tukuyin ang nauugnay na posisyon ng mga kalapit na Wi‑Fi device"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Nagbibigay-daan sa app na i-advertise ang, kumonekta sa, at tukuyin ang nauugnay na posisyon ng mga kalapit na Wi‑Fi device"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Impormasyon sa Gustong NFC na Serbisyo sa Pagbabayad"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Pinapayagan ang app na makakuha ng impormasyon sa gustong nfc na serbisyo sa pagbabayad tulad ng mga nakarehistrong application ID at destinasyon ng ruta."</string> <string name="permlab_nfc" msgid="1904455246837674977">"kontrolin ang Near Field Communication"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 07a98c9db814..cf1b14c65aad 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -546,7 +546,7 @@ <string name="permlab_uwb_ranging" msgid="8141915781475770665">"xác định khoảng cách tương đối giữa các thiết bị ở gần dùng Băng tần siêu rộng"</string> <string name="permdesc_uwb_ranging" msgid="2519723069604307055">"Cho phép ứng dụng xác định khoảng cách tương đối giữa các thiết bị ở gần dùng Băng tần siêu rộng"</string> <string name="permlab_nearby_wifi_devices" msgid="392774237063608500">"tương tác với các thiết bị Wi‑Fi lân cận"</string> - <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Cho phép ứng dụng thông báo, kết nối và xác định vị trí tương đối của các thiết bị Wi‑Fi lân cận"</string> + <string name="permdesc_nearby_wifi_devices" msgid="3054307728646332906">"Cho phép ứng dụng này thông báo, kết nối và xác định vị trí tương đối của các thiết bị Wi‑Fi lân cận"</string> <string name="permlab_preferredPaymentInfo" msgid="5274423844767445054">"Thông tin về dịch vụ thanh toán qua công nghệ giao tiếp tầm gần (NFC) được ưu tiên"</string> <string name="permdesc_preferredPaymentInfo" msgid="8583552469807294967">"Cho phép ứng dụng nhận thông tin về dịch vụ thanh toán qua công nghệ giao tiếp tầm gần mà bạn ưu tiên, chẳng hạn như các hình thức hỗ trợ đã đăng ký và điểm đến trong hành trình."</string> <string name="permlab_nfc" msgid="1904455246837674977">"kiểm soát Liên lạc trường gần"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 05894d55358e..5ac30de631c5 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3704,26 +3704,6 @@ snapped to any position between the first target and the last target. --> <bool name="config_dockedStackDividerFreeSnapMode">false</bool> - <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows. - These values are in DPs and will be converted to pixel sizes internally. --> - <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">16x16</string> - - <!-- The percentage of the screen width to use for the default width or height of - picture-in-picture windows. Regardless of the percent set here, calculated size will never - be smaller than @dimen/default_minimal_size_pip_resizable_task. --> - <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.23</item> - - <!-- The default aspect ratio for picture-in-picture windows. --> - <item name="config_pictureInPictureDefaultAspectRatio" format="float" type="dimen">1.777778</item> - - <!-- This is the limit for the max and min aspect ratio (1 / this value) at which the min size - will be used instead of an adaptive size based loosely on area. --> - <item name="config_pictureInPictureAspectRatioLimitForMinSize" format="float" type="dimen">1.777778</item> - - <!-- The default gravity for the picture-in-picture window. - Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT --> - <integer name="config_defaultPictureInPictureGravity">0x55</integer> - <!-- The minimum aspect ratio (width/height) that is supported for picture-in-picture. Any ratio smaller than this is considered too tall and thin to be usable. Currently, this is the inverse of the max landscape aspect ratio (1:2.39), but this is an extremely diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index adf8f8e99d35..032d0b954ef1 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -717,16 +717,6 @@ <!-- The default minimal size of a resizable task, in both dimensions. --> <dimen name="default_minimal_size_resizable_task">220dp</dimen> - <!-- The default minimal size of a PiP task, in both dimensions. --> - <dimen name="default_minimal_size_pip_resizable_task">108dp</dimen> - - <!-- - The overridable minimal size of a PiP task, in both dimensions. - Different from default_minimal_size_pip_resizable_task, this is to limit the dimension - when the pinned stack size is overridden by app via minWidth/minHeight. - --> - <dimen name="overridable_minimal_size_pip_resizable_task">48dp</dimen> - <!-- Height of a task when in minimized mode from the top when launcher is resizable. --> <dimen name="task_height_of_minimized_mode">80dp</dimen> diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index bccd2b6529ac..d80645ecfe40 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -281,8 +281,8 @@ <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SWIPE_DOWN}. --> <item type="id" name="accessibilityActionSwipeDown" /> - <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_SUGGESTIONS}. --> - <item type="id" name="accessibilityActionShowSuggestions" /> + <!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_TEXT_SUGGESTIONS}. --> + <item type="id" name="accessibilityActionShowTextSuggestions" /> <!-- View tag for remote views to store the index of the next child when adding nested remote views dynamically. --> <item type="id" name="remote_views_next_child" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 3beb4b2f7ee3..46a77f9b4f52 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3288,7 +3288,7 @@ <public name="accessibilityActionSwipeRight" /> <public name="accessibilityActionSwipeUp" /> <public name="accessibilityActionSwipeDown" /> - <public name="accessibilityActionShowSuggestions" /> + <public name="accessibilityActionShowTextSuggestions" /> <public name="inputExtractAction" /> <public name="inputExtractAccessories" /> </staging-public-group> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 558e3c3a0222..60a3398c93e6 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -408,11 +408,6 @@ <java-symbol type="array" name="config_localPrivateDisplayPorts" /> <java-symbol type="integer" name="config_defaultDisplayDefaultColorMode" /> <java-symbol type="bool" name="config_enableAppWidgetService" /> - <java-symbol type="string" name="config_defaultPictureInPictureScreenEdgeInsets" /> - <java-symbol type="dimen" name="config_pictureInPictureDefaultSizePercent" /> - <java-symbol type="dimen" name="config_pictureInPictureDefaultAspectRatio" /> - <java-symbol type="dimen" name="config_pictureInPictureAspectRatioLimitForMinSize" /> - <java-symbol type="integer" name="config_defaultPictureInPictureGravity" /> <java-symbol type="dimen" name="config_pictureInPictureMinAspectRatio" /> <java-symbol type="dimen" name="config_pictureInPictureMaxAspectRatio" /> <java-symbol type="integer" name="config_pictureInPictureMaxNumberOfActions" /> @@ -1295,6 +1290,7 @@ <java-symbol type="array" name="vendor_required_apps_managed_user" /> <java-symbol type="array" name="vendor_required_apps_managed_profile" /> <java-symbol type="array" name="vendor_required_apps_managed_device" /> + <java-symbol type="array" name="vendor_required_attestation_certificates" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_user" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_profile" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_device" /> @@ -2016,8 +2012,6 @@ <java-symbol type="id" name="replace_message" /> <java-symbol type="fraction" name="config_dimBehindFadeDuration" /> <java-symbol type="dimen" name="default_minimal_size_resizable_task" /> - <java-symbol type="dimen" name="default_minimal_size_pip_resizable_task" /> - <java-symbol type="dimen" name="overridable_minimal_size_pip_resizable_task" /> <java-symbol type="dimen" name="task_height_of_minimized_mode" /> <java-symbol type="fraction" name="config_screenAutoBrightnessDozeScaleFactor" /> <java-symbol type="bool" name="config_allowPriorityVibrationsInLowPowerMode" /> diff --git a/core/res/res/values/vendor_required_attestation_certificates.xml b/core/res/res/values/vendor_required_attestation_certificates.xml new file mode 100644 index 000000000000..ce5660f433ff --- /dev/null +++ b/core/res/res/values/vendor_required_attestation_certificates.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * 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. + */ +--> +<resources> + <!-- The PEM-encoded certificates added here are used for verifying attestations. + The trustworthiness of the attestation depends on the root certificate of the chain. + + Certificates that can be used can be retrieved from: + https://developer.android.com/training/articles/security-key-attestation#root_certificate. + + If not already present in resource overlay, please add + vendor_required_attestation_certificates.xml (matching this file) in vendor overlay + with <item></item> of the PEM-encoded root certificates. + --> + <string-array translatable="false" name="vendor_required_attestation_certificates"> + </string-array> +</resources> diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java index 68d4cd4a97e7..1bc46a79f1c0 100644 --- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java @@ -20,7 +20,6 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -37,7 +36,6 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ -@Presubmit @LargeTest public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override diff --git a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java index de4c5725c190..dbe027800e3f 100644 --- a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java @@ -18,7 +18,6 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; -import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -35,7 +34,6 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ -@Presubmit @LargeTest public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java index e79f1e30f8bb..dbe1e8132e1d 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java @@ -17,6 +17,8 @@ package com.android.internal.os; import static android.os.BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; +import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE; +import static android.os.BatteryStats.RADIO_ACCESS_TECHNOLOGY_COUNT; import static android.os.BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR; import static android.os.BatteryStats.STATS_SINCE_CHARGED; import static android.os.BatteryStats.WAKE_TYPE_PARTIAL; @@ -26,7 +28,10 @@ import static com.android.internal.os.BatteryStatsImpl.ExternalStatsSync.UPDATE_ import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; + import android.app.ActivityManager; +import android.app.usage.NetworkStatsManager; import android.os.BatteryStats; import android.os.BatteryStats.HistoryItem; import android.os.BatteryStats.Uid.Sensor; @@ -36,6 +41,7 @@ import android.os.WorkSource; import android.telephony.Annotation; import android.telephony.CellSignalStrength; import android.telephony.DataConnectionRealTimeInfo; +import android.telephony.ModemActivityInfo; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.util.SparseIntArray; @@ -50,6 +56,8 @@ import com.android.internal.power.MeasuredEnergyStats; import junit.framework.TestCase; +import org.mockito.Mock; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -74,6 +82,13 @@ public class BatteryStatsNoteTest extends TestCase { private static final int ISOLATED_UID = UserHandle.getUid(0, ISOLATED_APP_ID); private static final WorkSource WS = new WorkSource(UID); + enum ModemState { + SLEEP, IDLE, RECEIVING, TRANSMITTING + } + + @Mock + NetworkStatsManager mNetworkStatsManager; + /** * Test BatteryStatsImpl.Uid.noteBluetoothScanResultLocked. */ @@ -1285,69 +1300,29 @@ public class BatteryStatsNoteTest extends TestCase { } @SmallTest - public void testGetPerStateActiveRadioDurationMs() { + public void testGetPerStateActiveRadioDurationMs_noModemActivity() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); - final int ratCount = BatteryStats.RADIO_ACCESS_TECHNOLOGY_COUNT; + final int ratCount = RADIO_ACCESS_TECHNOLOGY_COUNT; final int frequencyCount = ServiceState.FREQUENCY_RANGE_MMWAVE + 1; final int txLevelCount = CellSignalStrength.getNumSignalStrengthLevels(); final long[][][] expectedDurationsMs = new long[ratCount][frequencyCount][txLevelCount]; + final long[][] expectedRxDurationsMs = new long[ratCount][frequencyCount]; + final long[][][] expectedTxDurationsMs = new long[ratCount][frequencyCount][txLevelCount]; for (int rat = 0; rat < ratCount; rat++) { for (int freq = 0; freq < frequencyCount; freq++) { + // Should have no RX data without Modem Activity Info + expectedRxDurationsMs[rat][freq] = POWER_DATA_UNAVAILABLE; for (int txLvl = 0; txLvl < txLevelCount; txLvl++) { expectedDurationsMs[rat][freq][txLvl] = 0; + // Should have no TX data without Modem Activity Info + expectedTxDurationsMs[rat][freq][txLvl] = POWER_DATA_UNAVAILABLE; } } } - class ModemAndBatteryState { - public long currentTimeMs = 100; - public boolean onBattery = false; - public boolean modemActive = false; - @Annotation.NetworkType - public int currentNetworkDataType = TelephonyManager.NETWORK_TYPE_UNKNOWN; - @BatteryStats.RadioAccessTechnology - public int currentRat = BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER; - @ServiceState.FrequencyRange - public int currentFrequencyRange = ServiceState.FREQUENCY_RANGE_UNKNOWN; - public SparseIntArray currentSignalStrengths = new SparseIntArray(); - - void setOnBattery(boolean onBattery) { - this.onBattery = onBattery; - bi.updateTimeBasesLocked(onBattery, Display.STATE_OFF, currentTimeMs * 1000, - currentTimeMs * 1000); - } - - void setModemActive(boolean active) { - modemActive = active; - final int state = active ? DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH - : DataConnectionRealTimeInfo.DC_POWER_STATE_LOW; - bi.noteMobileRadioPowerStateLocked(state, currentTimeMs * 1000_000L, UID); - } - - void setRatType(@Annotation.NetworkType int dataType, - @BatteryStats.RadioAccessTechnology int rat) { - currentNetworkDataType = dataType; - currentRat = rat; - bi.notePhoneDataConnectionStateLocked(dataType, true, ServiceState.STATE_IN_SERVICE, - currentFrequencyRange); - } - - void setFrequencyRange(@ServiceState.FrequencyRange int frequency) { - currentFrequencyRange = frequency; - bi.notePhoneDataConnectionStateLocked(currentNetworkDataType, true, - ServiceState.STATE_IN_SERVICE, frequency); - } - - void setSignalStrength(@BatteryStats.RadioAccessTechnology int rat, int strength) { - currentSignalStrengths.put(rat, strength); - final int size = currentSignalStrengths.size(); - final int newestGenSignalStrength = currentSignalStrengths.valueAt(size - 1); - bi.notePhoneSignalStrengthLocked(newestGenSignalStrength, currentSignalStrengths); - } - } - final ModemAndBatteryState state = new ModemAndBatteryState(); + final ModemAndBatteryState state = new ModemAndBatteryState(bi, null); IntConsumer incrementTime = inc -> { state.currentTimeMs += inc; @@ -1365,6 +1340,7 @@ public class BatteryStatsNoteTest extends TestCase { expectedDurationsMs[currentRat][currentFrequencyRange][currentSignalStrength] += inc; }; + state.setOnBattery(false); state.setModemActive(false); state.setRatType(TelephonyManager.NETWORK_TYPE_UNKNOWN, @@ -1372,95 +1348,367 @@ public class BatteryStatsNoteTest extends TestCase { state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_UNKNOWN); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER, CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // While not on battery, the timers should not increase. state.setModemActive(true); incrementTime.accept(100); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setRatType(TelephonyManager.NETWORK_TYPE_NR, BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR); incrementTime.accept(200); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR, CellSignalStrength.SIGNAL_STRENGTH_GOOD); incrementTime.accept(500); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_MMWAVE); incrementTime.accept(300); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setRatType(TelephonyManager.NETWORK_TYPE_LTE, BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE); incrementTime.accept(400); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, CellSignalStrength.SIGNAL_STRENGTH_MODERATE); incrementTime.accept(500); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // When set on battery, currently active state (RAT:LTE, Signal Strength:Moderate) should // start counting up. state.setOnBattery(true); incrementTime.accept(600); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); - + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Changing LTE signal strength should be tracked. state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, CellSignalStrength.SIGNAL_STRENGTH_POOR); incrementTime.accept(700); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN); incrementTime.accept(800); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, CellSignalStrength.SIGNAL_STRENGTH_GOOD); incrementTime.accept(900); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, CellSignalStrength.SIGNAL_STRENGTH_GREAT); incrementTime.accept(1000); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Change in the signal strength of nonactive RAT should not affect anything. state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER, CellSignalStrength.SIGNAL_STRENGTH_POOR); incrementTime.accept(1100); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Changing to OTHER Rat should start tracking the poor signal strength. state.setRatType(TelephonyManager.NETWORK_TYPE_CDMA, BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER); incrementTime.accept(1200); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Noting frequency change should not affect non NR Rat. state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_HIGH); incrementTime.accept(1300); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Now the NR Rat, HIGH frequency range, good signal strength should start counting. state.setRatType(TelephonyManager.NETWORK_TYPE_NR, BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR); incrementTime.accept(1400); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Noting frequency change should not affect non NR Rat. state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_LOW); incrementTime.accept(1500); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); // Modem no longer active, should not be tracking any more. state.setModemActive(false); incrementTime.accept(1500); - checkPerStateActiveRadioDurations(expectedDurationsMs, bi, state.currentTimeMs); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + } + + @SmallTest + public void testGetPerStateActiveRadioDurationMs_withModemActivity() { + final MockClock clock = new MockClock(); // holds realtime and uptime in ms + final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); + bi.setPowerProfile(mock(PowerProfile.class)); + final int ratCount = RADIO_ACCESS_TECHNOLOGY_COUNT; + final int frequencyCount = ServiceState.FREQUENCY_RANGE_MMWAVE + 1; + final int txLevelCount = CellSignalStrength.getNumSignalStrengthLevels(); + + final long[][][] expectedDurationsMs = new long[ratCount][frequencyCount][txLevelCount]; + final long[][] expectedRxDurationsMs = new long[ratCount][frequencyCount]; + final long[][][] expectedTxDurationsMs = new long[ratCount][frequencyCount][txLevelCount]; + for (int rat = 0; rat < ratCount; rat++) { + for (int freq = 0; freq < frequencyCount; freq++) { + if (rat != RADIO_ACCESS_TECHNOLOGY_NR + && freq != ServiceState.FREQUENCY_RANGE_UNKNOWN) { + // Only the NR RAT should have per frequency data. + expectedRxDurationsMs[rat][freq] = POWER_DATA_UNAVAILABLE; + } else { + expectedRxDurationsMs[rat][freq] = 0; + } + expectedRxDurationsMs[rat][freq] = POWER_DATA_UNAVAILABLE; + + for (int txLvl = 0; txLvl < txLevelCount; txLvl++) { + expectedDurationsMs[rat][freq][txLvl] = 0; + + if (rat != RADIO_ACCESS_TECHNOLOGY_NR + && freq != ServiceState.FREQUENCY_RANGE_UNKNOWN) { + // Only the NR RAT should have per frequency data. + expectedTxDurationsMs[rat][freq][txLvl] = POWER_DATA_UNAVAILABLE; + } else { + expectedTxDurationsMs[rat][freq][txLvl] = 0; + } + expectedTxDurationsMs[rat][freq][txLvl] = POWER_DATA_UNAVAILABLE; + } + } + } + + final ModemActivityInfo mai = new ModemActivityInfo(0L, 0L, 0L, new int[txLevelCount], 0L); + final ModemAndBatteryState state = new ModemAndBatteryState(bi, mai); + + IntConsumer incrementTime = inc -> { + state.currentTimeMs += inc; + clock.realtime = clock.uptime = state.currentTimeMs; + + // If the device is not on battery, no timers should increment. + if (!state.onBattery) return; + // If the modem is not active, no timers should increment. + if (!state.modemActive) return; + + final int currRat = state.currentRat; + final int currFreqRange = + currRat == RADIO_ACCESS_TECHNOLOGY_NR ? state.currentFrequencyRange : 0; + int currSignalStrength = state.currentSignalStrengths.get(currRat); + + expectedDurationsMs[currRat][currFreqRange][currSignalStrength] += inc; + + // Evaluate the HAL provided time in states. + switch (state.modemState) { + case SLEEP: + long sleepMs = state.modemActivityInfo.getSleepTimeMillis(); + state.modemActivityInfo.setSleepTimeMillis(sleepMs + inc); + break; + case IDLE: + long idleMs = state.modemActivityInfo.getIdleTimeMillis(); + state.modemActivityInfo.setIdleTimeMillis(idleMs + inc); + break; + case RECEIVING: + long rxMs = state.modemActivityInfo.getReceiveTimeMillis(); + state.modemActivityInfo.setReceiveTimeMillis(rxMs + inc); + expectedRxDurationsMs[currRat][currFreqRange] += inc; + break; + case TRANSMITTING: + int[] txMs = state.modemActivityInfo.getTransmitTimeMillis(); + txMs[currSignalStrength] += inc; + state.modemActivityInfo.setTransmitTimeMillis(txMs); + expectedTxDurationsMs[currRat][currFreqRange][currSignalStrength] += inc; + break; + } + }; + + state.setOnBattery(false); + state.setModemActive(false); + state.setRatType(TelephonyManager.NETWORK_TYPE_UNKNOWN, + BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER); + state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_UNKNOWN); + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER, + CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // While not on battery, the timers should not increase. + state.setModemActive(true); + incrementTime.accept(100); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setRatType(TelephonyManager.NETWORK_TYPE_NR, BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR); + incrementTime.accept(200); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR, + CellSignalStrength.SIGNAL_STRENGTH_GOOD); + incrementTime.accept(500); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_MMWAVE); + incrementTime.accept(300); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setRatType(TelephonyManager.NETWORK_TYPE_LTE, + BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE); + incrementTime.accept(400); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, + CellSignalStrength.SIGNAL_STRENGTH_MODERATE); + incrementTime.accept(500); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Data will now be available. + for (int rat = 0; rat < ratCount; rat++) { + for (int freq = 0; freq < frequencyCount; freq++) { + if (rat == RADIO_ACCESS_TECHNOLOGY_NR + || freq == ServiceState.FREQUENCY_RANGE_UNKNOWN) { + // Only the NR RAT should have per frequency data. + expectedRxDurationsMs[rat][freq] = 0; + } + for (int txLvl = 0; txLvl < txLevelCount; txLvl++) { + if (rat == RADIO_ACCESS_TECHNOLOGY_NR + || freq == ServiceState.FREQUENCY_RANGE_UNKNOWN) { + // Only the NR RAT should have per frequency data. + expectedTxDurationsMs[rat][freq][txLvl] = 0; + } + } + } + } + + // When set on battery, currently active state (RAT:LTE, Signal Strength:Moderate) should + // start counting up. + state.setOnBattery(true); + incrementTime.accept(300); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(500); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(600); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + // Changing LTE signal strength should be tracked. + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, + CellSignalStrength.SIGNAL_STRENGTH_POOR); + incrementTime.accept(300); + state.setModemState(ModemState.SLEEP); + incrementTime.accept(1000); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(700); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, + CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN); + incrementTime.accept(800); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(222); + state.setModemState(ModemState.IDLE); + incrementTime.accept(111); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(7777); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, + CellSignalStrength.SIGNAL_STRENGTH_GOOD); + incrementTime.accept(88); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(900); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_LTE, + CellSignalStrength.SIGNAL_STRENGTH_GREAT); + incrementTime.accept(123); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(333); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(1000); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(555); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Change in the signal strength of nonactive RAT should not affect anything. + state.setSignalStrength(BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER, + CellSignalStrength.SIGNAL_STRENGTH_POOR); + incrementTime.accept(631); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(321); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(99); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Changing to OTHER Rat should start tracking the poor signal strength. + state.setRatType(TelephonyManager.NETWORK_TYPE_CDMA, + BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER); + incrementTime.accept(1200); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Noting frequency change should not affect non NR Rat. + state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_HIGH); + incrementTime.accept(444); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(1300); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Now the NR Rat, HIGH frequency range, good signal strength should start counting. + state.setRatType(TelephonyManager.NETWORK_TYPE_NR, BatteryStats.RADIO_ACCESS_TECHNOLOGY_NR); + incrementTime.accept(1400); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + + // Frequency changed to low. + state.setFrequencyRange(ServiceState.FREQUENCY_RANGE_LOW); + incrementTime.accept(852); + state.setModemState(ModemState.RECEIVING); + incrementTime.accept(157); + state.setModemState(ModemState.TRANSMITTING); + incrementTime.accept(1500); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); + // Modem no longer active, should not be tracking any more. + state.setModemActive(false); + incrementTime.accept(1500); + state.noteModemControllerActivity(); + checkPerStateActiveRadioDurations(expectedDurationsMs, expectedRxDurationsMs, + expectedTxDurationsMs, bi, state.currentTimeMs); } private void setFgState(int uid, boolean fgOn, MockBatteryStatsImpl bi) { @@ -1538,28 +1786,124 @@ public class BatteryStatsNoteTest extends TestCase { } private void checkPerStateActiveRadioDurations(long[][][] expectedDurationsMs, + long[][] expectedRxDurationsMs, long[][][] expectedTxDurationsMs, BatteryStatsImpl bi, long currentTimeMs) { for (int rat = 0; rat < expectedDurationsMs.length; rat++) { final long[][] expectedRatDurationsMs = expectedDurationsMs[rat]; for (int freq = 0; freq < expectedRatDurationsMs.length; freq++) { + final long expectedRxDurationMs = expectedRxDurationsMs[rat][freq]; + + // Build a verbose fail message, just in case. + final StringBuilder rxFailSb = new StringBuilder(); + rxFailSb.append("Wrong time in Rx state for RAT:"); + rxFailSb.append(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NAMES[rat]); + rxFailSb.append(", frequency:"); + rxFailSb.append(ServiceState.frequencyRangeToString(freq)); + assertEquals(rxFailSb.toString(), expectedRxDurationMs, + bi.getActiveRxRadioDurationMs(rat, freq, currentTimeMs)); + final long[] expectedFreqDurationsMs = expectedRatDurationsMs[freq]; for (int strength = 0; strength < expectedFreqDurationsMs.length; strength++) { final long expectedSignalStrengthDurationMs = expectedFreqDurationsMs[strength]; + final long expectedTxDurationMs = expectedTxDurationsMs[rat][freq][strength]; final long actualDurationMs = bi.getActiveRadioDurationMs(rat, freq, strength, currentTimeMs); - // Build a verbose fail message, just in case. - final StringBuilder sb = new StringBuilder(); - sb.append("Wrong time in state for RAT:"); - sb.append(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NAMES[rat]); - sb.append(", frequency:"); - sb.append(ServiceState.frequencyRangeToString(freq)); - sb.append(", strength:"); - sb.append(strength); - - assertEquals(sb.toString(), expectedSignalStrengthDurationMs, actualDurationMs); + final StringBuilder failSb = new StringBuilder(); + failSb.append("Wrong time in state for RAT:"); + failSb.append(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NAMES[rat]); + failSb.append(", frequency:"); + failSb.append(ServiceState.frequencyRangeToString(freq)); + failSb.append(", strength:"); + failSb.append(strength); + assertEquals(failSb.toString(), expectedSignalStrengthDurationMs, + actualDurationMs); + + final StringBuilder txFailSb = new StringBuilder(); + txFailSb.append("Wrong time in Tx state for RAT:"); + txFailSb.append(BatteryStats.RADIO_ACCESS_TECHNOLOGY_NAMES[rat]); + txFailSb.append(", frequency:"); + txFailSb.append(ServiceState.frequencyRangeToString(freq)); + txFailSb.append(", strength:"); + txFailSb.append(strength); + assertEquals(txFailSb.toString(), expectedTxDurationMs, + bi.getActiveTxRadioDurationMs(rat, freq, strength, currentTimeMs)); } } } } + + private class ModemAndBatteryState { + public long currentTimeMs = 100; + public boolean onBattery = false; + public boolean modemActive = false; + @Annotation.NetworkType + public int currentNetworkDataType = TelephonyManager.NETWORK_TYPE_UNKNOWN; + @BatteryStats.RadioAccessTechnology + public int currentRat = BatteryStats.RADIO_ACCESS_TECHNOLOGY_OTHER; + @ServiceState.FrequencyRange + public int currentFrequencyRange = ServiceState.FREQUENCY_RANGE_UNKNOWN; + public SparseIntArray currentSignalStrengths = new SparseIntArray(); + public ModemState modemState = ModemState.SLEEP; + public ModemActivityInfo modemActivityInfo; + + private final MockBatteryStatsImpl mBsi; + + ModemAndBatteryState(MockBatteryStatsImpl bsi, ModemActivityInfo mai) { + mBsi = bsi; + modemActivityInfo = mai; + } + + void setOnBattery(boolean onBattery) { + this.onBattery = onBattery; + mBsi.updateTimeBasesLocked(onBattery, Display.STATE_OFF, currentTimeMs * 1000, + currentTimeMs * 1000); + mBsi.setOnBatteryInternal(onBattery); + noteModemControllerActivity(); + } + + void setModemActive(boolean active) { + modemActive = active; + final int state = active ? DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH + : DataConnectionRealTimeInfo.DC_POWER_STATE_LOW; + mBsi.noteMobileRadioPowerStateLocked(state, currentTimeMs * 1000_000L, UID); + noteModemControllerActivity(); + } + + void setRatType(@Annotation.NetworkType int dataType, + @BatteryStats.RadioAccessTechnology int rat) { + currentNetworkDataType = dataType; + currentRat = rat; + mBsi.notePhoneDataConnectionStateLocked(dataType, true, ServiceState.STATE_IN_SERVICE, + currentFrequencyRange); + } + + void setFrequencyRange(@ServiceState.FrequencyRange int frequency) { + currentFrequencyRange = frequency; + mBsi.notePhoneDataConnectionStateLocked(currentNetworkDataType, true, + ServiceState.STATE_IN_SERVICE, frequency); + } + + void setSignalStrength(@BatteryStats.RadioAccessTechnology int rat, int strength) { + currentSignalStrengths.put(rat, strength); + final int size = currentSignalStrengths.size(); + final int newestGenSignalStrength = currentSignalStrengths.valueAt(size - 1); + mBsi.notePhoneSignalStrengthLocked(newestGenSignalStrength, currentSignalStrengths); + } + + void setModemState(ModemState state) { + modemState = state; + } + + void noteModemControllerActivity() { + if (modemActivityInfo == null) return; + modemActivityInfo.setTimestamp(currentTimeMs); + ModemActivityInfo copy = new ModemActivityInfo(modemActivityInfo.getTimestampMillis(), + modemActivityInfo.getSleepTimeMillis(), modemActivityInfo.getIdleTimeMillis(), + modemActivityInfo.getTransmitTimeMillis().clone(), + modemActivityInfo.getReceiveTimeMillis()); + mBsi.noteModemControllerActivity(copy, POWER_DATA_UNAVAILABLE, + currentTimeMs, currentTimeMs, mNetworkStatsManager); + } + } } diff --git a/identity/java/android/security/identity/CredstoreIdentityCredential.java b/identity/java/android/security/identity/CredstoreIdentityCredential.java index 8e011053d2a7..c591c879059c 100644 --- a/identity/java/android/security/identity/CredstoreIdentityCredential.java +++ b/identity/java/android/security/identity/CredstoreIdentityCredential.java @@ -38,8 +38,9 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.time.Instant; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.crypto.BadPaddingException; @@ -227,7 +228,7 @@ class CredstoreIdentityCredential extends IdentityCredential { throw new RuntimeException("Error decoding certificates", e); } - LinkedList<X509Certificate> x509Certs = new LinkedList<>(); + ArrayList<X509Certificate> x509Certs = new ArrayList<>(); for (Certificate cert : certs) { x509Certs.add((X509Certificate) cert); } @@ -384,7 +385,7 @@ class CredstoreIdentityCredential extends IdentityCredential { public @NonNull Collection<X509Certificate> getAuthKeysNeedingCertification() { try { AuthKeyParcel[] authKeyParcels = mBinder.getAuthKeysNeedingCertification(); - LinkedList<X509Certificate> x509Certs = new LinkedList<>(); + ArrayList<X509Certificate> x509Certs = new ArrayList<>(); CertificateFactory factory = CertificateFactory.getInstance("X.509"); for (AuthKeyParcel authKeyParcel : authKeyParcels) { Collection<? extends Certificate> certs = null; diff --git a/identity/java/android/security/identity/CredstoreWritableIdentityCredential.java b/identity/java/android/security/identity/CredstoreWritableIdentityCredential.java index d2e7984ce19f..1ad70edb7c6f 100644 --- a/identity/java/android/security/identity/CredstoreWritableIdentityCredential.java +++ b/identity/java/android/security/identity/CredstoreWritableIdentityCredential.java @@ -25,8 +25,9 @@ import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; +import java.util.List; class CredstoreWritableIdentityCredential extends WritableIdentityCredential { @@ -61,7 +62,7 @@ class CredstoreWritableIdentityCredential extends WritableIdentityCredential { throw new RuntimeException("Error decoding certificates", e); } - LinkedList<X509Certificate> x509Certs = new LinkedList<>(); + ArrayList<X509Certificate> x509Certs = new ArrayList<>(); for (Certificate cert : certs) { x509Certs.add((X509Certificate) cert); } diff --git a/identity/java/android/security/identity/PersonalizationData.java b/identity/java/android/security/identity/PersonalizationData.java index b34f2505a6a6..bdb00fdfb341 100644 --- a/identity/java/android/security/identity/PersonalizationData.java +++ b/identity/java/android/security/identity/PersonalizationData.java @@ -18,10 +18,11 @@ package android.security.identity; import android.annotation.NonNull; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; -import java.util.LinkedList; +import java.util.List; /** * An object that holds personalization data. @@ -38,7 +39,7 @@ public class PersonalizationData { private PersonalizationData() { } - private LinkedList<AccessControlProfile> mProfiles = new LinkedList<>(); + private ArrayList<AccessControlProfile> mProfiles = new ArrayList<>(); private LinkedHashMap<String, NamespaceData> mNamespaces = new LinkedHashMap<>(); diff --git a/libs/WindowManager/Shell/res/values-television/config.xml b/libs/WindowManager/Shell/res/values-television/config.xml new file mode 100644 index 000000000000..552048e8be9a --- /dev/null +++ b/libs/WindowManager/Shell/res/values-television/config.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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. + --> + +<!-- These resources are around just to allow their values to be customized + for TV products. Do not translate. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- The percentage of the screen width to use for the default width or height of + picture-in-picture windows. Regardless of the percent set here, calculated size will never + be smaller than @dimen/default_minimal_size_pip_resizable_task. --> + <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.2</item> + + <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows. + These values are in DPs and will be converted to pixel sizes internally. --> + <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets"> + 24x24 + </string> + + <!-- The default gravity for the picture-in-picture window. + Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT --> + <integer name="config_defaultPictureInPictureGravity">0x55</integer> +</resources> diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml index 1b8032b7077b..d416c060c86c 100644 --- a/libs/WindowManager/Shell/res/values/config.xml +++ b/libs/WindowManager/Shell/res/values/config.xml @@ -70,4 +70,30 @@ <!-- Animation duration when exit starting window: reveal app --> <integer name="starting_window_app_reveal_anim_duration">266</integer> + + <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows. + These values are in DPs and will be converted to pixel sizes internally. --> + <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets"> + 16x16 + </string> + + <!-- The percentage of the screen width to use for the default width or height of + picture-in-picture windows. Regardless of the percent set here, calculated size will never + be smaller than @dimen/default_minimal_size_pip_resizable_task. --> + <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.23</item> + + <!-- The default aspect ratio for picture-in-picture windows. --> + <item name="config_pictureInPictureDefaultAspectRatio" format="float" type="dimen"> + 1.777778 + </item> + + <!-- This is the limit for the max and min aspect ratio (1 / this value) at which the min size + will be used instead of an adaptive size based loosely on area. --> + <item name="config_pictureInPictureAspectRatioLimitForMinSize" format="float" type="dimen"> + 1.777778 + </item> + + <!-- The default gravity for the picture-in-picture window. + Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT --> + <integer name="config_defaultPictureInPictureGravity">0x55</integer> </resources> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 8a8231d00195..2c96786bb521 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -18,8 +18,8 @@ <dimen name="dismiss_circle_size">96dp</dimen> <dimen name="dismiss_circle_small">60dp</dimen> - <!-- The height of the gradient indicating the dismiss edge when moving a PIP. --> - <dimen name="floating_dismiss_gradient_height">250dp</dimen> + <!-- The height of the gradient indicating the dismiss edge when moving a PIP or bubble. --> + <dimen name="floating_dismiss_gradient_height">548dp</dimen> <!-- The padding around a PiP actions. --> <dimen name="pip_action_padding">16dp</dimen> @@ -129,6 +129,9 @@ <dimen name="bubble_dismiss_encircle_size">52dp</dimen> <!-- Padding around the view displayed when the bubble is expanded --> <dimen name="bubble_expanded_view_padding">16dp</dimen> + <!-- Padding for the edge of the expanded view that is closest to the edge of the screen used + when displaying in landscape on a large screen. --> + <dimen name="bubble_expanded_view_largescreen_landscape_padding">128dp</dimen> <!-- This should be at least the size of bubble_expanded_view_padding; it is used to include a slight touch slop around the expanded view. --> <dimen name="bubble_expanded_view_slop">8dp</dimen> @@ -251,4 +254,14 @@ <!-- The distance of the shift icon when early exit starting window. --> <dimen name="starting_surface_early_exit_icon_distance">32dp</dimen> + + <!-- The default minimal size of a PiP task, in both dimensions. --> + <dimen name="default_minimal_size_pip_resizable_task">108dp</dimen> + + <!-- + The overridable minimal size of a PiP task, in both dimensions. + Different from default_minimal_size_pip_resizable_task, this is to limit the dimension + when the pinned stack size is overridden by app via minWidth/minHeight. + --> + <dimen name="overridable_minimal_size_pip_resizable_task">48dp</dimen> </resources> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 241f1a7d4d1c..d0138a488295 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -47,7 +47,10 @@ import android.app.ActivityManager; import android.app.Notification; import android.app.NotificationChannel; import android.app.PendingIntent; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.LauncherApps; import android.content.pm.PackageManager; @@ -131,6 +134,10 @@ public class BubbleController { public static final String RIGHT_POSITION = "Right"; public static final String BOTTOM_POSITION = "Bottom"; + // Should match with PhoneWindowManager + private static final String SYSTEM_DIALOG_REASON_KEY = "reason"; + private static final String SYSTEM_DIALOG_REASON_GESTURE_NAV = "gestureNav"; + private final Context mContext; private final BubblesImpl mImpl = new BubblesImpl(); private Bubbles.BubbleExpandListener mExpandListener; @@ -675,6 +682,7 @@ public class BubbleController { try { mAddedToWindowManager = true; + registerBroadcastReceiver(); mBubbleData.getOverflow().initialize(this); mWindowManager.addView(mStackView, mWmLayoutParams); mStackView.setOnApplyWindowInsetsListener((view, windowInsets) -> { @@ -717,6 +725,7 @@ public class BubbleController { try { mAddedToWindowManager = false; + mContext.unregisterReceiver(mBroadcastReceiver); if (mStackView != null) { mWindowManager.removeView(mStackView); mBubbleData.getOverflow().cleanUpExpandedState(); @@ -730,11 +739,34 @@ public class BubbleController { } } + private void registerBroadcastReceiver() { + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + filter.addAction(Intent.ACTION_SCREEN_OFF); + mContext.registerReceiver(mBroadcastReceiver, filter); + } + + private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (!isStackExpanded()) return; // Nothing to do + + String action = intent.getAction(); + String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY); + if ((Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action) + && SYSTEM_DIALOG_REASON_GESTURE_NAV.equals(reason)) + || Intent.ACTION_SCREEN_OFF.equals(action)) { + mMainExecutor.execute(() -> collapseStack()); + } + } + }; + /** * Called by the BubbleStackView and whenever all bubbles have animated out, and none have been * added in the meantime. */ - void onAllBubblesAnimatedOut() { + @VisibleForTesting + public void onAllBubblesAnimatedOut() { if (mStackView != null) { mStackView.setVisibility(INVISIBLE); removeFromWindowManagerMaybe(); 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 75b19fb03e73..bc0db3635e35 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 @@ -67,7 +67,11 @@ public class BubblePositioner { /** The max percent of screen width to use for the flyout on phone. */ public static final float FLYOUT_MAX_WIDTH_PERCENT = 0.6f; /** The percent of screen width that should be used for the expanded view on a large screen. **/ - public static final float EXPANDED_VIEW_LARGE_SCREEN_WIDTH_PERCENT = 0.72f; + private static final float EXPANDED_VIEW_LARGE_SCREEN_LANDSCAPE_WIDTH_PERCENT = 0.48f; + /** The percent of screen width that should be used for the expanded view on a large screen. **/ + private static final float EXPANDED_VIEW_LARGE_SCREEN_PORTRAIT_WIDTH_PERCENT = 0.70f; + /** The percent of screen width that should be used for the expanded view on a small tablet. **/ + private static final float EXPANDED_VIEW_SMALL_TABLET_WIDTH_PERCENT = 0.72f; private Context mContext; private WindowManager mWindowManager; @@ -77,6 +81,7 @@ public class BubblePositioner { private boolean mImeVisible; private int mImeHeight; private boolean mIsLargeScreen; + private boolean mIsSmallTablet; private Rect mPositionRect; private int mDefaultMaxBubbles; @@ -86,7 +91,8 @@ public class BubblePositioner { private int mExpandedViewMinHeight; private int mExpandedViewLargeScreenWidth; - private int mExpandedViewLargeScreenInset; + private int mExpandedViewLargeScreenInsetClosestEdge; + private int mExpandedViewLargeScreenInsetFurthestEdge; private int mOverflowWidth; private int mExpandedViewPadding; @@ -127,17 +133,26 @@ public class BubblePositioner { | WindowInsets.Type.statusBars() | WindowInsets.Type.displayCutout()); - mIsLargeScreen = mContext.getResources().getConfiguration().smallestScreenWidthDp >= 600; + final Rect bounds = windowMetrics.getBounds(); + Configuration config = mContext.getResources().getConfiguration(); + mIsLargeScreen = config.smallestScreenWidthDp >= 600; + if (mIsLargeScreen) { + float largestEdgeDp = Math.max(config.screenWidthDp, config.screenHeightDp); + mIsSmallTablet = largestEdgeDp < 960; + } else { + mIsSmallTablet = false; + } if (BubbleDebugConfig.DEBUG_POSITIONER) { Log.w(TAG, "update positioner:" + " rotation: " + mRotation + " insets: " + insets + " isLargeScreen: " + mIsLargeScreen - + " bounds: " + windowMetrics.getBounds() + + " isSmallTablet: " + mIsSmallTablet + + " bounds: " + bounds + " showingInTaskbar: " + mShowingInTaskbar); } - updateInternal(mRotation, insets, windowMetrics.getBounds()); + updateInternal(mRotation, insets, bounds); } /** @@ -172,11 +187,31 @@ public class BubblePositioner { mSpacingBetweenBubbles = res.getDimensionPixelSize(R.dimen.bubble_spacing); mDefaultMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered); mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding); - mExpandedViewLargeScreenWidth = (int) (bounds.width() - * EXPANDED_VIEW_LARGE_SCREEN_WIDTH_PERCENT); - mExpandedViewLargeScreenInset = mIsLargeScreen - ? (bounds.width() - mExpandedViewLargeScreenWidth) / 2 - : mExpandedViewPadding; + if (mIsSmallTablet) { + mExpandedViewLargeScreenWidth = (int) (bounds.width() + * EXPANDED_VIEW_SMALL_TABLET_WIDTH_PERCENT); + } else { + mExpandedViewLargeScreenWidth = isLandscape() + ? (int) (bounds.width() * EXPANDED_VIEW_LARGE_SCREEN_LANDSCAPE_WIDTH_PERCENT) + : (int) (bounds.width() * EXPANDED_VIEW_LARGE_SCREEN_PORTRAIT_WIDTH_PERCENT); + } + if (mIsLargeScreen) { + if (isLandscape() && !mIsSmallTablet) { + mExpandedViewLargeScreenInsetClosestEdge = res.getDimensionPixelSize( + R.dimen.bubble_expanded_view_largescreen_landscape_padding); + mExpandedViewLargeScreenInsetFurthestEdge = bounds.width() + - mExpandedViewLargeScreenInsetClosestEdge + - mExpandedViewLargeScreenWidth; + } else { + final int centeredInset = (bounds.width() - mExpandedViewLargeScreenWidth) / 2; + mExpandedViewLargeScreenInsetClosestEdge = centeredInset; + mExpandedViewLargeScreenInsetFurthestEdge = centeredInset; + } + } else { + mExpandedViewLargeScreenInsetClosestEdge = mExpandedViewPadding; + mExpandedViewLargeScreenInsetFurthestEdge = mExpandedViewPadding; + } + mOverflowWidth = mIsLargeScreen ? mExpandedViewLargeScreenWidth : res.getDimensionPixelSize( @@ -328,15 +363,18 @@ public class BubblePositioner { public int[] getExpandedViewContainerPadding(boolean onLeft, boolean isOverflow) { final int pointerTotalHeight = mPointerHeight - mPointerOverlap; if (mIsLargeScreen) { + // Note: + // If we're in portrait OR if we're a small tablet, then the two insets values will + // be equal. If we're landscape and a large tablet, the two values will be different. // [left, top, right, bottom] mPaddings[0] = onLeft - ? mExpandedViewLargeScreenInset - pointerTotalHeight - : mExpandedViewLargeScreenInset; + ? mExpandedViewLargeScreenInsetClosestEdge - pointerTotalHeight + : mExpandedViewLargeScreenInsetFurthestEdge; mPaddings[1] = 0; mPaddings[2] = onLeft - ? mExpandedViewLargeScreenInset - : mExpandedViewLargeScreenInset - pointerTotalHeight; - // Overflow doesn't show manage button / get padding from it so add padding here for it + ? mExpandedViewLargeScreenInsetFurthestEdge + : mExpandedViewLargeScreenInsetClosestEdge - pointerTotalHeight; + // Overflow doesn't show manage button / get padding from it so add padding here mPaddings[3] = isOverflow ? mExpandedViewPadding : 0; return mPaddings; } else { @@ -494,12 +532,13 @@ public class BubblePositioner { float x; float y; if (showBubblesVertically()) { + int inset = mExpandedViewLargeScreenInsetClosestEdge; y = rowStart + positionInRow; int left = mIsLargeScreen - ? mExpandedViewLargeScreenInset - mExpandedViewPadding - mBubbleSize + ? inset - mExpandedViewPadding - mBubbleSize : mPositionRect.left; int right = mIsLargeScreen - ? mPositionRect.right - mExpandedViewLargeScreenInset + mExpandedViewPadding + ? mPositionRect.right - inset + mExpandedViewPadding : mPositionRect.right - mBubbleSize; x = state.onLeft ? left diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissView.kt index 74672a336161..063dac3d4109 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissView.kt @@ -16,11 +16,16 @@ package com.android.wm.shell.bubbles +import android.animation.ObjectAnimator import android.content.Context -import android.graphics.drawable.TransitionDrawable +import android.graphics.Color +import android.graphics.drawable.GradientDrawable +import android.util.IntProperty import android.view.Gravity import android.view.View import android.view.ViewGroup +import android.view.WindowManager +import android.view.WindowInsets import android.widget.FrameLayout import androidx.dynamicanimation.animation.DynamicAnimation import androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_LOW_BOUNCY @@ -28,8 +33,6 @@ import androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW import com.android.wm.shell.R import com.android.wm.shell.animation.PhysicsAnimator import com.android.wm.shell.common.DismissCircleView -import android.view.WindowInsets -import android.view.WindowManager /* * View that handles interactions between DismissCircleView and BubbleStackView. @@ -41,9 +44,21 @@ class DismissView(context: Context) : FrameLayout(context) { private val animator = PhysicsAnimator.getInstance(circle) private val spring = PhysicsAnimator.SpringConfig(STIFFNESS_LOW, DAMPING_RATIO_LOW_BOUNCY) - private val DISMISS_SCRIM_FADE_MS = 200 + private val DISMISS_SCRIM_FADE_MS = 200L private var wm: WindowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager + private var gradientDrawable = createGradient() + + private val GRADIENT_ALPHA: IntProperty<GradientDrawable> = + object : IntProperty<GradientDrawable>("alpha") { + override fun setValue(d: GradientDrawable, percent: Int) { + d.alpha = percent + } + override fun get(d: GradientDrawable): Int { + return d.alpha + } + } + init { setLayoutParams(LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, @@ -53,8 +68,7 @@ class DismissView(context: Context) : FrameLayout(context) { setClipToPadding(false) setClipChildren(false) setVisibility(View.INVISIBLE) - setBackgroundResource( - R.drawable.floating_dismiss_gradient_transition) + setBackgroundDrawable(gradientDrawable) val targetSize: Int = resources.getDimensionPixelSize(R.dimen.dismiss_circle_size) addView(circle, LayoutParams(targetSize, targetSize, @@ -71,7 +85,11 @@ class DismissView(context: Context) : FrameLayout(context) { if (isShowing) return isShowing = true setVisibility(View.VISIBLE) - (getBackground() as TransitionDrawable).startTransition(DISMISS_SCRIM_FADE_MS) + val alphaAnim = ObjectAnimator.ofInt(gradientDrawable, GRADIENT_ALPHA, + gradientDrawable.alpha, 255) + alphaAnim.setDuration(DISMISS_SCRIM_FADE_MS) + alphaAnim.start() + animator.cancel() animator .spring(DynamicAnimation.TRANSLATION_Y, 0f, spring) @@ -85,7 +103,10 @@ class DismissView(context: Context) : FrameLayout(context) { fun hide() { if (!isShowing) return isShowing = false - (getBackground() as TransitionDrawable).reverseTransition(DISMISS_SCRIM_FADE_MS) + val alphaAnim = ObjectAnimator.ofInt(gradientDrawable, GRADIENT_ALPHA, + gradientDrawable.alpha, 0) + alphaAnim.setDuration(DISMISS_SCRIM_FADE_MS) + alphaAnim.start() animator .spring(DynamicAnimation.TRANSLATION_Y, height.toFloat(), spring) @@ -93,6 +114,13 @@ class DismissView(context: Context) : FrameLayout(context) { .start() } + /** + * Cancels the animator for the dismiss target. + */ + fun cancelAnimators() { + animator.cancel() + } + fun updateResources() { updatePadding() layoutParams.height = resources.getDimensionPixelSize( @@ -104,6 +132,20 @@ class DismissView(context: Context) : FrameLayout(context) { circle.requestLayout() } + private fun createGradient(): GradientDrawable { + val gradientColor = context.resources.getColor(android.R.color.system_neutral1_900) + val alpha = 0.7f * 255 + val gradientColorWithAlpha = Color.argb(alpha.toInt(), + Color.red(gradientColor), + Color.green(gradientColor), + Color.blue(gradientColor)) + val gd = GradientDrawable( + GradientDrawable.Orientation.BOTTOM_TOP, + intArrayOf(gradientColorWithAlpha, Color.TRANSPARENT)) + gd.setAlpha(0) + return gd + } + private fun updatePadding() { val insets: WindowInsets = wm.getCurrentWindowMetrics().getWindowInsets() val navInset = insets.getInsetsIgnoringVisibility( diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java index f7c92fed5522..8a482fbfa1c4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java @@ -144,21 +144,42 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange return Math.max(dividerInset, radius); } - /** Gets bounds of the primary split. */ + /** Gets bounds of the primary split with screen based coordinate. */ public Rect getBounds1() { return new Rect(mBounds1); } - /** Gets bounds of the secondary split. */ + /** Gets bounds of the primary split with parent based coordinate. */ + public Rect getRefBounds1() { + Rect outBounds = getBounds1(); + outBounds.offset(-mRootBounds.left, -mRootBounds.top); + return outBounds; + } + + /** Gets bounds of the secondary split with screen based coordinate. */ public Rect getBounds2() { return new Rect(mBounds2); } - /** Gets bounds of divider window. */ + /** Gets bounds of the secondary split with parent based coordinate. */ + public Rect getRefBounds2() { + final Rect outBounds = getBounds2(); + outBounds.offset(-mRootBounds.left, -mRootBounds.top); + return outBounds; + } + + /** Gets bounds of divider window with screen based coordinate. */ public Rect getDividerBounds() { return new Rect(mDividerBounds); } + /** Gets bounds of divider window with parent based coordinate. */ + public Rect getRefDividerBounds() { + final Rect outBounds = getDividerBounds(); + outBounds.offset(-mRootBounds.left, -mRootBounds.top); + return outBounds; + } + /** Returns leash of the current divider bar. */ @Nullable public SurfaceControl getDividerLeash() { @@ -452,14 +473,17 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange SurfaceControl leash2, SurfaceControl dimLayer1, SurfaceControl dimLayer2) { final SurfaceControl dividerLeash = getDividerLeash(); if (dividerLeash != null) { - t.setPosition(dividerLeash, mDividerBounds.left, mDividerBounds.top); + mTempRect.set(getRefDividerBounds()); + t.setPosition(dividerLeash, mTempRect.left, mTempRect.top); // Resets layer of divider bar to make sure it is always on top. t.setLayer(dividerLeash, SPLIT_DIVIDER_LAYER); } - t.setPosition(leash1, mBounds1.left, mBounds1.top) - .setWindowCrop(leash1, mBounds1.width(), mBounds1.height()); - t.setPosition(leash2, mBounds2.left, mBounds2.top) - .setWindowCrop(leash2, mBounds2.width(), mBounds2.height()); + mTempRect.set(getRefBounds1()); + t.setPosition(leash1, mTempRect.left, mTempRect.top) + .setWindowCrop(leash1, mTempRect.width(), mTempRect.height()); + mTempRect.set(getRefBounds2()); + t.setPosition(leash2, mTempRect.left, mTempRect.top) + .setWindowCrop(leash2, mTempRect.width(), mTempRect.height()); if (mImePositionProcessor.adjustSurfaceLayoutForIme( t, dividerLeash, leash1, leash2, dimLayer1, dimLayer2)) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java index e29dde2726e3..797df413d262 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java @@ -32,6 +32,7 @@ import android.util.Size; import android.util.TypedValue; import android.view.Gravity; +import com.android.wm.shell.R; import com.android.wm.shell.common.DisplayLayout; import java.io.PrintWriter; @@ -76,15 +77,15 @@ public class PipBoundsAlgorithm { protected void reloadResources(Context context) { final Resources res = context.getResources(); mDefaultAspectRatio = res.getFloat( - com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio); + R.dimen.config_pictureInPictureDefaultAspectRatio); mDefaultStackGravity = res.getInteger( - com.android.internal.R.integer.config_defaultPictureInPictureGravity); + R.integer.config_defaultPictureInPictureGravity); mDefaultMinSize = res.getDimensionPixelSize( - com.android.internal.R.dimen.default_minimal_size_pip_resizable_task); + R.dimen.default_minimal_size_pip_resizable_task); mOverridableMinSize = res.getDimensionPixelSize( - com.android.internal.R.dimen.overridable_minimal_size_pip_resizable_task); + R.dimen.overridable_minimal_size_pip_resizable_task); final String screenEdgeInsetsDpString = res.getString( - com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets); + R.string.config_defaultPictureInPictureScreenEdgeInsets); final Size screenEdgeInsetsDp = !screenEdgeInsetsDpString.isEmpty() ? Size.parseSize(screenEdgeInsetsDpString) : null; @@ -96,9 +97,9 @@ public class PipBoundsAlgorithm { mMaxAspectRatio = res.getFloat( com.android.internal.R.dimen.config_pictureInPictureMaxAspectRatio); mDefaultSizePercent = res.getFloat( - com.android.internal.R.dimen.config_pictureInPictureDefaultSizePercent); + R.dimen.config_pictureInPictureDefaultSizePercent); mMaxAspectRatioForMinSize = res.getFloat( - com.android.internal.R.dimen.config_pictureInPictureAspectRatioLimitForMinSize); + R.dimen.config_pictureInPictureAspectRatioLimitForMinSize); mMinAspectRatioForMinSize = 1f / mMaxAspectRatioForMinSize; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java index 180e3fb48c9d..d7322ce7beda 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java @@ -138,8 +138,8 @@ public class PipSurfaceTransactionHelper { // destination are different. final float scale = srcW <= srcH ? (float) destW / srcW : (float) destH / srcH; final Rect crop = mTmpDestinationRect; - crop.set(0, 0, Transitions.ENABLE_SHELL_TRANSITIONS ? destH - : destW, Transitions.ENABLE_SHELL_TRANSITIONS ? destW : destH); + crop.set(0, 0, Transitions.SHELL_TRANSITIONS_ROTATION ? destH + : destW, Transitions.SHELL_TRANSITIONS_ROTATION ? destW : destH); // Inverse scale for crop to fit in screen coordinates. crop.scale(1 / scale); crop.offset(insets.left, insets.top); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java index 60aac6806623..91615fe05417 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java @@ -97,7 +97,7 @@ public class PipTransition extends PipTransitionController { * meaningful if {@link #mInFixedRotation} is true. */ @Surface.Rotation - private int mFixedRotation; + private int mEndFixedRotation; /** Whether the PIP window has fade out for fixed rotation. */ private boolean mHasFadeOut; @@ -153,7 +153,7 @@ public class PipTransition extends PipTransitionController { final TransitionInfo.Change currentPipChange = findCurrentPipChange(info); final TransitionInfo.Change fixedRotationChange = findFixedRotationChange(info); mInFixedRotation = fixedRotationChange != null; - mFixedRotation = mInFixedRotation + mEndFixedRotation = mInFixedRotation ? fixedRotationChange.getEndFixedRotation() : ROTATION_UNDEFINED; @@ -257,7 +257,7 @@ public class PipTransition extends PipTransitionController { final ActivityManager.RunningTaskInfo taskInfo = mPipOrganizer.getTaskInfo(); if (taskInfo != null) { startExpandAnimation(taskInfo, mPipOrganizer.getSurfaceControl(), - new Rect(mExitDestinationBounds)); + new Rect(mExitDestinationBounds), Surface.ROTATION_0); } mExitDestinationBounds.setEmpty(); mCurrentPipTaskToken = null; @@ -332,30 +332,31 @@ public class PipTransition extends PipTransitionController { @NonNull SurfaceControl.Transaction finishTransaction, @NonNull Transitions.TransitionFinishCallback finishCallback, @NonNull TransitionInfo.Change pipChange) { - TransitionInfo.Change displayRotationChange = null; - for (int i = info.getChanges().size() - 1; i >= 0; --i) { - final TransitionInfo.Change change = info.getChanges().get(i); - if (change.getMode() == TRANSIT_CHANGE - && (change.getFlags() & FLAG_IS_DISPLAY) != 0 - && change.getStartRotation() != change.getEndRotation()) { - displayRotationChange = change; - break; - } - } - - if (displayRotationChange != null) { - // Exiting PIP to fullscreen with orientation change. - startExpandAndRotationAnimation(info, startTransaction, finishTransaction, - finishCallback, displayRotationChange, pipChange); - return; - } - - // When there is no rotation, we can simply expand the PIP window. mFinishCallback = (wct, wctCB) -> { mPipOrganizer.onExitPipFinished(pipChange.getTaskInfo()); finishCallback.onTransitionFinished(wct, wctCB); }; + // Check if it is Shell rotation. + if (Transitions.SHELL_TRANSITIONS_ROTATION) { + TransitionInfo.Change displayRotationChange = null; + for (int i = info.getChanges().size() - 1; i >= 0; --i) { + final TransitionInfo.Change change = info.getChanges().get(i); + if (change.getMode() == TRANSIT_CHANGE + && (change.getFlags() & FLAG_IS_DISPLAY) != 0 + && change.getStartRotation() != change.getEndRotation()) { + displayRotationChange = change; + break; + } + } + if (displayRotationChange != null) { + // Exiting PIP to fullscreen with orientation change. + startExpandAndRotationAnimation(info, startTransaction, finishTransaction, + displayRotationChange, pipChange); + return; + } + } + // Set the initial frame as scaling the end to the start. final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds()); final Point offset = pipChange.getEndRelOffset(); @@ -364,13 +365,41 @@ public class PipTransition extends PipTransitionController { mSurfaceTransactionHelper.scale(startTransaction, pipChange.getLeash(), destinationBounds, mPipBoundsState.getBounds()); startTransaction.apply(); - startExpandAnimation(pipChange.getTaskInfo(), pipChange.getLeash(), destinationBounds); + + // Check if it is fixed rotation. + final int rotationDelta; + if (mInFixedRotation) { + final int startRotation = pipChange.getStartRotation(); + final int endRotation = mEndFixedRotation; + rotationDelta = deltaRotation(startRotation, endRotation); + final Rect endBounds = new Rect(destinationBounds); + + // Set the end frame since the display won't rotate until fixed rotation is finished + // in the next display change transition. + rotateBounds(endBounds, destinationBounds, rotationDelta); + final int degree, x, y; + if (rotationDelta == ROTATION_90) { + degree = 90; + x = destinationBounds.right; + y = destinationBounds.top; + } else { + degree = -90; + x = destinationBounds.left; + y = destinationBounds.bottom; + } + mSurfaceTransactionHelper.rotateAndScaleWithCrop(finishTransaction, + pipChange.getLeash(), endBounds, endBounds, new Rect(), degree, x, y, + true /* isExpanding */, rotationDelta == ROTATION_270 /* clockwise */); + } else { + rotationDelta = Surface.ROTATION_0; + } + startExpandAnimation(pipChange.getTaskInfo(), pipChange.getLeash(), destinationBounds, + rotationDelta); } private void startExpandAndRotationAnimation(@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction, - @NonNull Transitions.TransitionFinishCallback finishCallback, @NonNull TransitionInfo.Change displayRotationChange, @NonNull TransitionInfo.Change pipChange) { final int rotateDelta = deltaRotation(displayRotationChange.getStartRotation(), @@ -380,11 +409,6 @@ public class PipTransition extends PipTransitionController { final CounterRotatorHelper rotator = new CounterRotatorHelper(); rotator.handleClosingChanges(info, startTransaction, displayRotationChange); - mFinishCallback = (wct, wctCB) -> { - mPipOrganizer.onExitPipFinished(pipChange.getTaskInfo()); - finishCallback.onTransitionFinished(wct, wctCB); - }; - // Get the start bounds in new orientation. final Rect startBounds = new Rect(pipChange.getStartAbsBounds()); rotateBounds(startBounds, displayRotationChange.getStartAbsBounds(), rotateDelta); @@ -425,12 +449,11 @@ public class PipTransition extends PipTransitionController { } private void startExpandAnimation(final TaskInfo taskInfo, final SurfaceControl leash, - final Rect destinationBounds) { - PipAnimationController.PipTransitionAnimator animator = + final Rect destinationBounds, final int rotationDelta) { + final PipAnimationController.PipTransitionAnimator animator = mPipAnimationController.getAnimator(taskInfo, leash, mPipBoundsState.getBounds(), mPipBoundsState.getBounds(), destinationBounds, null, - TRANSITION_DIRECTION_LEAVE_PIP, 0 /* startingAngle */, Surface.ROTATION_0); - + TRANSITION_DIRECTION_LEAVE_PIP, 0 /* startingAngle */, rotationDelta); animator.setTransitionDirection(TRANSITION_DIRECTION_LEAVE_PIP) .setPipAnimationCallback(mPipAnimationCallback) .setDuration(mEnterExitAnimationDuration) @@ -526,7 +549,7 @@ public class PipTransition extends PipTransitionController { mPipTransitionState.setTransitionState(PipTransitionState.ENTERING_PIP); mFinishCallback = finishCallback; - final int endRotation = mInFixedRotation ? mFixedRotation : enterPip.getEndRotation(); + final int endRotation = mInFixedRotation ? mEndFixedRotation : enterPip.getEndRotation(); return startEnterAnimation(enterPip.getTaskInfo(), enterPip.getLeash(), startTransaction, finishTransaction, enterPip.getStartRotation(), endRotation); @@ -545,8 +568,8 @@ public class PipTransition extends PipTransitionController { taskInfo.pictureInPictureParams, currentBounds); if (rotationDelta != Surface.ROTATION_0 && mInFixedRotation) { // Need to get the bounds of new rotation in old rotation for fixed rotation, - sourceHintRect = computeRotatedBounds(rotationDelta, startRotation, endRotation, - taskInfo, TRANSITION_DIRECTION_TO_PIP, destinationBounds, sourceHintRect); + computeEnterPipRotatedBounds(rotationDelta, startRotation, endRotation, taskInfo, + destinationBounds, sourceHintRect); } PipAnimationController.PipTransitionAnimator animator; // Set corner radius for entering pip. @@ -583,8 +606,6 @@ public class PipTransition extends PipTransitionController { startTransaction.setMatrix(leash, tmpTransform, new float[9]); } if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) { - // Reverse the rotation for Shell transition animation. - rotationDelta = deltaRotation(rotationDelta, 0); animator = mPipAnimationController.getAnimator(taskInfo, leash, currentBounds, currentBounds, destinationBounds, sourceHintRect, TRANSITION_DIRECTION_TO_PIP, 0 /* startingAngle */, rotationDelta); @@ -617,33 +638,22 @@ public class PipTransition extends PipTransitionController { return true; } - /** Computes destination bounds in old rotation and returns source hint rect if available. */ - @Nullable - private Rect computeRotatedBounds(int rotationDelta, int startRotation, int endRotation, - TaskInfo taskInfo, int direction, Rect outDestinationBounds, - @Nullable Rect sourceHintRect) { - if (direction == TRANSITION_DIRECTION_TO_PIP) { - mPipBoundsState.getDisplayLayout().rotateTo(mContext.getResources(), endRotation); - final Rect displayBounds = mPipBoundsState.getDisplayBounds(); - outDestinationBounds.set(mPipBoundsAlgorithm.getEntryDestinationBounds()); - // Transform the destination bounds to current display coordinates. - rotateBounds(outDestinationBounds, displayBounds, endRotation, startRotation); - // When entering PiP (from button navigation mode), adjust the source rect hint by - // display cutout if applicable. - if (sourceHintRect != null && taskInfo.displayCutoutInsets != null) { - if (rotationDelta == Surface.ROTATION_270) { - sourceHintRect.offset(taskInfo.displayCutoutInsets.left, - taskInfo.displayCutoutInsets.top); - } + /** Computes destination bounds in old rotation and updates source hint rect if available. */ + private void computeEnterPipRotatedBounds(int rotationDelta, int startRotation, int endRotation, + TaskInfo taskInfo, Rect outDestinationBounds, @Nullable Rect outSourceHintRect) { + mPipBoundsState.getDisplayLayout().rotateTo(mContext.getResources(), endRotation); + final Rect displayBounds = mPipBoundsState.getDisplayBounds(); + outDestinationBounds.set(mPipBoundsAlgorithm.getEntryDestinationBounds()); + // Transform the destination bounds to current display coordinates. + rotateBounds(outDestinationBounds, displayBounds, endRotation, startRotation); + // When entering PiP (from button navigation mode), adjust the source rect hint by + // display cutout if applicable. + if (outSourceHintRect != null && taskInfo.displayCutoutInsets != null) { + if (rotationDelta == Surface.ROTATION_270) { + outSourceHintRect.offset(taskInfo.displayCutoutInsets.left, + taskInfo.displayCutoutInsets.top); } - } else if (direction == TRANSITION_DIRECTION_LEAVE_PIP) { - final Rect rotatedDestinationBounds = new Rect(outDestinationBounds); - rotateBounds(rotatedDestinationBounds, mPipBoundsState.getDisplayBounds(), - rotationDelta); - return PipBoundsAlgorithm.getValidSourceHintRect(taskInfo.pictureInPictureParams, - rotatedDestinationBounds); - } - return sourceHintRect; + } } private void startExitToSplitAnimation(TransitionInfo info, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java index 915c5939c34b..3115f8afde3b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java @@ -20,27 +20,20 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import android.content.Context; import android.content.res.Resources; -import android.graphics.Insets; import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.Rect; -import android.graphics.drawable.TransitionDrawable; -import android.view.Gravity; import android.view.MotionEvent; import android.view.SurfaceControl; import android.view.View; -import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.WindowInsets; import android.view.WindowManager; -import android.widget.FrameLayout; import androidx.annotation.NonNull; -import androidx.dynamicanimation.animation.DynamicAnimation; -import androidx.dynamicanimation.animation.SpringForce; import com.android.wm.shell.R; -import com.android.wm.shell.animation.PhysicsAnimator; +import com.android.wm.shell.bubbles.DismissView; import com.android.wm.shell.common.DismissCircleView; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.magnetictarget.MagnetizedObject; @@ -56,9 +49,6 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen /* The multiplier to apply scale the target size by when applying the magnetic field radius */ private static final float MAGNETIC_FIELD_RADIUS_MULTIPLIER = 1.25f; - /** Duration of the dismiss scrim fading in/out. */ - private static final int DISMISS_TRANSITION_DURATION_MS = 200; - /** * MagnetizedObject wrapper for PIP. This allows the magnetic target library to locate and move * PIP. @@ -69,7 +59,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen * Container for the dismiss circle, so that it can be animated within the container via * translation rather than within the WindowManager via slow layout animations. */ - private ViewGroup mTargetViewContainer; + private DismissView mTargetViewContainer; /** Circle view used to render the dismiss target. */ private DismissCircleView mTargetView; @@ -79,16 +69,6 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen */ private MagnetizedObject.MagneticTarget mMagneticTarget; - /** - * PhysicsAnimator instance for animating the dismiss target in/out. - */ - private PhysicsAnimator<View> mMagneticTargetAnimator; - - /** Default configuration to use for springing the dismiss target in/out. */ - private final PhysicsAnimator.SpringConfig mTargetSpringConfig = - new PhysicsAnimator.SpringConfig( - SpringForce.STIFFNESS_LOW, SpringForce.DAMPING_RATIO_LOW_BOUNCY); - // Allow dragging the PIP to a location to close it private boolean mEnableDismissDragToEdge; @@ -125,12 +105,8 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen cleanUpDismissTarget(); } - mTargetView = new DismissCircleView(mContext); - mTargetViewContainer = new FrameLayout(mContext); - mTargetViewContainer.setBackgroundDrawable( - mContext.getDrawable(R.drawable.floating_dismiss_gradient_transition)); - mTargetViewContainer.setClipChildren(false); - mTargetViewContainer.addView(mTargetView); + mTargetViewContainer = new DismissView(mContext); + mTargetView = mTargetViewContainer.getCircle(); mTargetViewContainer.setOnApplyWindowInsetsListener((view, windowInsets) -> { if (!windowInsets.equals(mWindowInsets)) { mWindowInsets = windowInsets; @@ -187,7 +163,6 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen } }); - mMagneticTargetAnimator = PhysicsAnimator.getInstance(mTargetView); } @Override @@ -213,19 +188,13 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen if (mTargetView == null) { return; } + if (mTargetViewContainer != null) { + mTargetViewContainer.updateResources(); + } final Resources res = mContext.getResources(); mTargetSize = res.getDimensionPixelSize(R.dimen.dismiss_circle_size); mDismissAreaHeight = res.getDimensionPixelSize(R.dimen.floating_dismiss_gradient_height); - final WindowInsets insets = mWindowManager.getCurrentWindowMetrics().getWindowInsets(); - final Insets navInset = insets.getInsetsIgnoringVisibility( - WindowInsets.Type.navigationBars()); - final FrameLayout.LayoutParams newParams = - new FrameLayout.LayoutParams(mTargetSize, mTargetSize); - newParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; - newParams.bottomMargin = navInset.bottom + mContext.getResources().getDimensionPixelSize( - R.dimen.floating_dismiss_bottom_margin); - mTargetView.setLayoutParams(newParams); // Set the magnetic field radius equal to the target size from the center of the target setMagneticFieldRadiusPercent(mMagneticFieldRadiusPercent); @@ -261,7 +230,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen /** Adds the magnetic target view to the WindowManager so it's ready to be animated in. */ public void createOrUpdateDismissTarget() { if (!mTargetViewContainer.isAttachedToWindow()) { - mMagneticTargetAnimator.cancel(); + mTargetViewContainer.cancelAnimators(); mTargetViewContainer.setVisibility(View.INVISIBLE); mTargetViewContainer.getViewTreeObserver().removeOnPreDrawListener(this); @@ -312,18 +281,8 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen createOrUpdateDismissTarget(); if (mTargetViewContainer.getVisibility() != View.VISIBLE) { - mTargetView.setTranslationY(mTargetViewContainer.getHeight()); - mTargetViewContainer.setVisibility(View.VISIBLE); mTargetViewContainer.getViewTreeObserver().addOnPreDrawListener(this); - - // Cancel in case we were in the middle of animating it out. - mMagneticTargetAnimator.cancel(); - mMagneticTargetAnimator - .spring(DynamicAnimation.TRANSLATION_Y, 0f, mTargetSpringConfig) - .start(); - - ((TransitionDrawable) mTargetViewContainer.getBackground()).startTransition( - DISMISS_TRANSITION_DURATION_MS); + mTargetViewContainer.show(); } } @@ -332,16 +291,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen if (!mEnableDismissDragToEdge) { return; } - - mMagneticTargetAnimator - .spring(DynamicAnimation.TRANSLATION_Y, - mTargetViewContainer.getHeight(), - mTargetSpringConfig) - .withEndActions(() -> mTargetViewContainer.setVisibility(View.GONE)) - .start(); - - ((TransitionDrawable) mTargetViewContainer.getBackground()).reverseTransition( - DISMISS_TRANSITION_DURATION_MS); + mTargetViewContainer.hide(); } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java index 69d6c9e0c3bd..32ebe2d6aecf 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java @@ -33,6 +33,7 @@ import android.os.RemoteException; import android.util.Log; import android.view.SurfaceControl; import android.view.SyncRtSurfaceTransactionApplier; +import android.view.WindowManagerGlobal; import androidx.annotation.Nullable; @@ -143,7 +144,6 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis mSystemWindows.addView(mPipMenuView, getPipMenuLayoutParams(MENU_WINDOW_TITLE, 0 /* width */, 0 /* height */), 0, SHELL_ROOT_LAYER_PIP); - mPipMenuView.setFocusGrantToken(mSystemWindows.getFocusGrantToken(mPipMenuView)); } @Override @@ -164,6 +164,7 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis t.setPosition(menuSurfaceControl, menuBounds.left, menuBounds.top); t.apply(); } + grantPipMenuFocus(true); mPipMenuView.show(mInMoveMode, mDelegate.getPipGravity()); } } @@ -194,8 +195,9 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis if (DEBUG) Log.d(TAG, "hideMenu()"); } - mPipMenuView.hide(mInMoveMode); + mPipMenuView.hide(); if (!mInMoveMode) { + grantPipMenuFocus(false); mDelegate.closeMenu(); } } @@ -453,4 +455,15 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis void closePip(); } + + private void grantPipMenuFocus(boolean grantFocus) { + if (DEBUG) Log.d(TAG, "grantWindowFocus(" + grantFocus + ")"); + + try { + WindowManagerGlobal.getWindowSession().grantEmbeddedWindowFocus(null /* window */, + mSystemWindows.getFocusGrantToken(mPipMenuView), grantFocus); + } catch (Exception e) { + Log.e(TAG, "Unable to update focus", e); + } + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java index 773e9bfa8977..3090139f6db9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuView.java @@ -30,7 +30,6 @@ import android.app.RemoteAction; import android.content.Context; import android.graphics.Rect; import android.os.Handler; -import android.os.IBinder; import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; @@ -39,7 +38,6 @@ import android.view.SurfaceControl; import android.view.View; import android.view.ViewGroup; import android.view.ViewRootImpl; -import android.view.WindowManagerGlobal; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -72,7 +70,6 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { private final ImageView mArrowRight; private final ImageView mArrowDown; private final ImageView mArrowLeft; - private IBinder mFocusGrantToken = null; private final ViewGroup mScrollView; private final ViewGroup mHorizontalScrollView; @@ -152,10 +149,6 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { mListener = listener; } - void setFocusGrantToken(IBinder token) { - mFocusGrantToken = token; - } - void setExpandedModeEnabled(boolean enabled) { mExpandButton.setVisibility(enabled ? VISIBLE : GONE); } @@ -170,8 +163,6 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { void show(boolean inMoveMode, int gravity) { if (DEBUG) Log.d(TAG, "show(), inMoveMode: " + inMoveMode); - grantWindowFocus(true); - if (inMoveMode) { showMovementHints(gravity); } else { @@ -180,15 +171,11 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { animateAlphaTo(1, mMenuFrameView); } - void hide(boolean isInMoveMode) { + void hide() { if (DEBUG) Log.d(TAG, "hide()"); animateAlphaTo(0, mActionButtonsContainer); animateAlphaTo(0, mMenuFrameView); hideMovementHints(); - - if (!isInMoveMode) { - grantWindowFocus(false); - } } private void animateAlphaTo(float alpha, View view) { @@ -217,17 +204,6 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { || mArrowLeft.getAlpha() != 0f; } - private void grantWindowFocus(boolean grantFocus) { - if (DEBUG) Log.d(TAG, "grantWindowFocus(" + grantFocus + ")"); - - try { - WindowManagerGlobal.getWindowSession().grantEmbeddedWindowFocus(null /* window */, - mFocusGrantToken, grantFocus); - } catch (Exception e) { - Log.e(TAG, "Unable to update focus", e); - } - } - void setAdditionalActions(List<RemoteAction> actions, Handler mainHandler) { if (DEBUG) Log.d(TAG, "setAdditionalActions()"); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 81dacdb753a7..76641f0e6c21 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -979,7 +979,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, t.setAlpha(dividerLeash, 1); t.setLayer(dividerLeash, SPLIT_DIVIDER_LAYER); t.setPosition(dividerLeash, - mSplitLayout.getDividerBounds().left, mSplitLayout.getDividerBounds().top); + mSplitLayout.getRefDividerBounds().left, + mSplitLayout.getRefDividerBounds().top); } else { t.hide(dividerLeash); } 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 5af15300d10b..4bc5850cd293 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 @@ -26,6 +26,7 @@ import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN; import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_UP; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_DRAWABLE; import static android.app.admin.DevicePolicyResources.Drawables.Source.PROFILE_SWITCH_ANIMATION; import static android.app.admin.DevicePolicyResources.Drawables.Style.OUTLINE; @@ -156,9 +157,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { private BroadcastReceiver mEnterpriseResourceUpdatedReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - boolean isDrawable = intent.getBooleanExtra( - EXTRA_RESOURCE_TYPE_DRAWABLE, /* default= */ false); - if (!isDrawable) { + if (intent.getIntExtra(EXTRA_RESOURCE_TYPE, /* default= */ -1) + != EXTRA_RESOURCE_TYPE_DRAWABLE) { return; } updateEnterpriseThumbnailDrawable(); diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt index 654fa4ec9446..8d542c8ec9e6 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt @@ -56,13 +56,6 @@ abstract class PipTransition(protected val testSpec: FlickerTestParameter) { .sendBroadcast(createIntentWithAction(broadcastAction)) } - fun requestOrientationForPip(orientation: Int) { - instrumentation.context.sendBroadcast( - createIntentWithAction(Components.PipActivity.ACTION_SET_REQUESTED_ORIENTATION) - .putExtra(Components.PipActivity.EXTRA_PIP_ORIENTATION, orientation.toString()) - ) - } - companion object { // Corresponds to ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE @JvmStatic diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index d65388bd8cc5..f7384e742a04 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -25,11 +25,14 @@ import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group4 import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.setRotation +import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE +import com.android.wm.shell.flicker.testapp.Components import com.android.wm.shell.flicker.testapp.Components.FixedActivity.EXTRA_FIXED_ORIENTATION -import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP import org.junit.Assume import org.junit.Before import org.junit.FixMethodOrder @@ -39,7 +42,7 @@ import org.junit.runners.MethodSorters import org.junit.runners.Parameterized /** - * Test Pip with orientation changes. + * Test exiting Pip with orientation changes. * To run this test: `atest WMShellFlickerTests:SetRequestedOrientationWhilePinnedTest` */ @RequiresDevice @@ -61,30 +64,41 @@ open class SetRequestedOrientationWhilePinnedTest( override val transition: FlickerBuilder.() -> Unit get() = { - setupAndTeardown(this) - setup { + test { + removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + } eachRun { - // Launch the PiP activity fixed as landscape + // Launch the PiP activity fixed as landscape. pipApp.launchViaIntent(wmHelper, stringExtras = mapOf( - EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString(), - EXTRA_ENTER_PIP to "true")) + EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString())) + // Enter PiP. + broadcastActionTrigger.doAction(Components.PipActivity.ACTION_ENTER_PIP) + wmHelper.waitPipShown() + wmHelper.waitForRotation(Surface.ROTATION_0) + wmHelper.waitForAppTransitionIdle() + // System bar may fade out during fixed rotation. + wmHelper.waitForNavBarStatusBarVisible() } } teardown { eachRun { pipApp.exit(wmHelper) + setRotation(Surface.ROTATION_0) + } + test { + removeAllTasksButHome() } } transitions { - // Request that the orientation is set to landscape - broadcastActionTrigger.requestOrientationForPip(ORIENTATION_LANDSCAPE) - - // Launch the activity back into fullscreen and - // ensure that it is now in landscape + // Launch the activity back into fullscreen and ensure that it is now in landscape pipApp.launchViaIntent(wmHelper) wmHelper.waitForFullScreenApp(pipApp.component) wmHelper.waitForRotation(Surface.ROTATION_90) + wmHelper.waitForAppTransitionIdle() + // System bar may fade out during fixed rotation. + wmHelper.waitForNavBarStatusBarVisible() } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTestShellTransit.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTestShellTransit.kt index 36e28049864f..8d764a8d0e69 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTestShellTransit.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTestShellTransit.kt @@ -29,6 +29,10 @@ import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized +/** + * Test exiting Pip with orientation changes. + * To run this test: `atest WMShellFlickerTests:SetRequestedOrientationWhilePinnedTestShellTransit` + */ @RequiresDevice @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java index 90f898aa09da..0059846c6055 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java @@ -29,6 +29,7 @@ import android.view.Gravity; import androidx.test.filters.SmallTest; +import com.android.wm.shell.R; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.DisplayLayout; @@ -72,16 +73,16 @@ public class PipBoundsAlgorithmTest extends ShellTestCase { private void initializeMockResources() { final TestableResources res = mContext.getOrCreateTestableResources(); res.addOverride( - com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio, + R.dimen.config_pictureInPictureDefaultAspectRatio, DEFAULT_ASPECT_RATIO); res.addOverride( - com.android.internal.R.integer.config_defaultPictureInPictureGravity, + R.integer.config_defaultPictureInPictureGravity, Gravity.END | Gravity.BOTTOM); res.addOverride( - com.android.internal.R.dimen.default_minimal_size_pip_resizable_task, + R.dimen.default_minimal_size_pip_resizable_task, DEFAULT_MIN_EDGE_SIZE); res.addOverride( - com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets, + R.string.config_defaultPictureInPictureScreenEdgeInsets, "16x16"); res.addOverride( com.android.internal.R.dimen.config_pictureInPictureMinAspectRatio, @@ -107,7 +108,7 @@ public class PipBoundsAlgorithmTest extends ShellTestCase { public void onConfigurationChanged_reloadResources() { final float newDefaultAspectRatio = (DEFAULT_ASPECT_RATIO + MAX_ASPECT_RATIO) / 2; final TestableResources res = mContext.getOrCreateTestableResources(); - res.addOverride(com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio, + res.addOverride(R.dimen.config_pictureInPictureDefaultAspectRatio, newDefaultAspectRatio); mPipBoundsAlgorithm.onConfigurationChanged(mContext); @@ -463,7 +464,7 @@ public class PipBoundsAlgorithmTest extends ShellTestCase { private void overrideDefaultAspectRatio(float aspectRatio) { final TestableResources res = mContext.getOrCreateTestableResources(); res.addOverride( - com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio, + R.dimen.config_pictureInPictureDefaultAspectRatio, aspectRatio); mPipBoundsAlgorithm.onConfigurationChanged(mContext); } @@ -471,7 +472,7 @@ public class PipBoundsAlgorithmTest extends ShellTestCase { private void overrideDefaultStackGravity(int stackGravity) { final TestableResources res = mContext.getOrCreateTestableResources(); res.addOverride( - com.android.internal.R.integer.config_defaultPictureInPictureGravity, + R.integer.config_defaultPictureInPictureGravity, stackGravity); mPipBoundsAlgorithm.onConfigurationChanged(mContext); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java index dda1a8295e51..85527c81ad9e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java @@ -18,6 +18,7 @@ package com.android.wm.shell.splitscreen; import static android.view.Display.DEFAULT_DISPLAY; import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -51,6 +52,7 @@ public class SplitTestUtils { final SurfaceControl leash = createMockSurface(); SplitLayout out = mock(SplitLayout.class); doReturn(dividerBounds).when(out).getDividerBounds(); + doReturn(dividerBounds).when(out).getRefDividerBounds(); doReturn(leash).when(out).getDividerLeash(); return out; } diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java b/packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java new file mode 100644 index 000000000000..8aee576c3d04 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/devicestate/AndroidSecureSettings.java @@ -0,0 +1,54 @@ +/* + * 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.settingslib.devicestate; + +import android.content.ContentResolver; +import android.database.ContentObserver; +import android.provider.Settings; + +/** + * Implementation of {@link SecureSettings} that uses Android's {@link Settings.Secure} + * implementation. + */ +class AndroidSecureSettings implements SecureSettings { + + private final ContentResolver mContentResolver; + + AndroidSecureSettings(ContentResolver contentResolver) { + mContentResolver = contentResolver; + } + + @Override + public void putStringForUser(String name, String value, int userHandle) { + Settings.Secure.putStringForUser(mContentResolver, name, value, userHandle); + } + + @Override + public String getStringForUser(String name, int userHandle) { + return Settings.Secure.getStringForUser(mContentResolver, name, userHandle); + } + + @Override + public void registerContentObserver(String name, boolean notifyForDescendants, + ContentObserver observer, int userHandle) { + mContentResolver.registerContentObserver( + Settings.Secure.getUriFor(name), + notifyForDescendants, + observer, + userHandle); + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java index afd3626ab889..4ed7e19f341d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java @@ -22,8 +22,10 @@ import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_UNLOCK import android.content.ContentResolver; import android.content.Context; +import android.content.res.Resources; import android.database.ContentObserver; import android.os.Handler; +import android.os.Looper; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; @@ -33,7 +35,10 @@ import android.util.SparseIntArray; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -47,32 +52,44 @@ public final class DeviceStateRotationLockSettingsManager { private static DeviceStateRotationLockSettingsManager sSingleton; - private final ContentResolver mContentResolver; - private final String[] mDeviceStateRotationLockDefaults; - private final Handler mMainHandler = Handler.getMain(); + private final Handler mMainHandler = new Handler(Looper.getMainLooper()); private final Set<DeviceStateRotationLockSettingsListener> mListeners = new HashSet<>(); + private final SecureSettings mSecureSettings; + private String[] mDeviceStateRotationLockDefaults; private SparseIntArray mDeviceStateRotationLockSettings; private SparseIntArray mDeviceStateRotationLockFallbackSettings; + private String mLastSettingValue; + private List<SettableDeviceState> mSettableDeviceStates; - private DeviceStateRotationLockSettingsManager(Context context) { - mContentResolver = context.getContentResolver(); + @VisibleForTesting + DeviceStateRotationLockSettingsManager(Context context, SecureSettings secureSettings) { + this.mSecureSettings = secureSettings; mDeviceStateRotationLockDefaults = context.getResources() .getStringArray(R.array.config_perDeviceStateRotationLockDefaults); loadDefaults(); initializeInMemoryMap(); - listenForSettingsChange(context); + listenForSettingsChange(); } /** Returns a singleton instance of this class */ public static synchronized DeviceStateRotationLockSettingsManager getInstance(Context context) { if (sSingleton == null) { + Context applicationContext = context.getApplicationContext(); + ContentResolver contentResolver = applicationContext.getContentResolver(); + SecureSettings secureSettings = new AndroidSecureSettings(contentResolver); sSingleton = - new DeviceStateRotationLockSettingsManager(context.getApplicationContext()); + new DeviceStateRotationLockSettingsManager(applicationContext, secureSettings); } return sSingleton; } + /** Resets the singleton instance of this class. Only used for testing. */ + @VisibleForTesting + public static synchronized void resetInstance() { + sSingleton = null; + } + /** Returns true if device-state based rotation lock settings are enabled. */ public static boolean isDeviceStateRotationLockEnabled(Context context) { return context.getResources() @@ -81,11 +98,11 @@ public final class DeviceStateRotationLockSettingsManager { > 0; } - private void listenForSettingsChange(Context context) { - context.getContentResolver() + private void listenForSettingsChange() { + mSecureSettings .registerContentObserver( - Settings.Secure.getUriFor(Settings.Secure.DEVICE_STATE_ROTATION_LOCK), - /* notifyForDescendents= */ false, //NOTYPO + Settings.Secure.DEVICE_STATE_ROTATION_LOCK, + /* notifyForDescendants= */ false, new ContentObserver(mMainHandler) { @Override public void onChange(boolean selfChange) { @@ -180,10 +197,15 @@ public final class DeviceStateRotationLockSettingsManager { return true; } + /** Returns a list of device states and their respective auto-rotation setting availability. */ + public List<SettableDeviceState> getSettableDeviceStates() { + // Returning a copy to make sure that nothing outside can mutate our internal list. + return new ArrayList<>(mSettableDeviceStates); + } + private void initializeInMemoryMap() { String serializedSetting = - Settings.Secure.getStringForUser( - mContentResolver, + mSecureSettings.getStringForUser( Settings.Secure.DEVICE_STATE_ROTATION_LOCK, UserHandle.USER_CURRENT); if (TextUtils.isEmpty(serializedSetting)) { @@ -215,6 +237,17 @@ public final class DeviceStateRotationLockSettingsManager { } } + /** + * Resets the state of the class and saved settings back to the default values provided by the + * resources config. + */ + @VisibleForTesting + public void resetStateForTesting(Resources resources) { + mDeviceStateRotationLockDefaults = + resources.getStringArray(R.array.config_perDeviceStateRotationLockDefaults); + fallbackOnDefaults(); + } + private void fallbackOnDefaults() { loadDefaults(); persistSettings(); @@ -222,11 +255,7 @@ public final class DeviceStateRotationLockSettingsManager { private void persistSettings() { if (mDeviceStateRotationLockSettings.size() == 0) { - Settings.Secure.putStringForUser( - mContentResolver, - Settings.Secure.DEVICE_STATE_ROTATION_LOCK, - /* value= */ "", - UserHandle.USER_CURRENT); + persistSettingIfChanged(/* newSettingValue= */ ""); return; } @@ -243,14 +272,22 @@ public final class DeviceStateRotationLockSettingsManager { .append(SEPARATOR_REGEX) .append(mDeviceStateRotationLockSettings.valueAt(i)); } - Settings.Secure.putStringForUser( - mContentResolver, + persistSettingIfChanged(stringBuilder.toString()); + } + + private void persistSettingIfChanged(String newSettingValue) { + if (TextUtils.equals(mLastSettingValue, newSettingValue)) { + return; + } + mLastSettingValue = newSettingValue; + mSecureSettings.putStringForUser( Settings.Secure.DEVICE_STATE_ROTATION_LOCK, - stringBuilder.toString(), + /* value= */ newSettingValue, UserHandle.USER_CURRENT); } private void loadDefaults() { + mSettableDeviceStates = new ArrayList<>(mDeviceStateRotationLockDefaults.length); mDeviceStateRotationLockSettings = new SparseIntArray( mDeviceStateRotationLockDefaults.length); mDeviceStateRotationLockFallbackSettings = new SparseIntArray(1); @@ -271,6 +308,8 @@ public final class DeviceStateRotationLockSettingsManager { + values.length); } } + boolean isSettable = rotationLockSetting != DEVICE_STATE_ROTATION_LOCK_IGNORED; + mSettableDeviceStates.add(new SettableDeviceState(deviceState, isSettable)); mDeviceStateRotationLockSettings.put(deviceState, rotationLockSetting); } catch (NumberFormatException e) { Log.wtf(TAG, "Error parsing settings entry. Entry was: " + entry, e); @@ -300,4 +339,38 @@ public final class DeviceStateRotationLockSettingsManager { /** Called whenever the settings have changed. */ void onSettingsChanged(); } + + /** Represents a device state and whether it has an auto-rotation setting. */ + public static class SettableDeviceState { + private final int mDeviceState; + private final boolean mIsSettable; + + SettableDeviceState(int deviceState, boolean isSettable) { + mDeviceState = deviceState; + mIsSettable = isSettable; + } + + /** Returns the device state associated with this object. */ + public int getDeviceState() { + return mDeviceState; + } + + /** Returns whether there is an auto-rotation setting for this device state. */ + public boolean isSettable() { + return mIsSettable; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof SettableDeviceState)) return false; + SettableDeviceState that = (SettableDeviceState) o; + return mDeviceState == that.mDeviceState && mIsSettable == that.mIsSettable; + } + + @Override + public int hashCode() { + return Objects.hash(mDeviceState, mIsSettable); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java b/packages/SettingsLib/src/com/android/settingslib/devicestate/SecureSettings.java index 28a38083218e..10528739b2b0 100644 --- a/packages/SystemUI/src/com/android/systemui/chooser/ChooserActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/devicestate/SecureSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * 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. @@ -14,22 +14,17 @@ * limitations under the License. */ -package com.android.systemui.chooser; +package com.android.settingslib.devicestate; -import android.app.Activity; -import android.os.Bundle; +import android.database.ContentObserver; -/** - * Activity for selecting which application ought to handle an ACTION_SEND intent. - */ -public final class ChooserActivity extends Activity { +/** Minimal wrapper interface around {@link android.provider.Settings.Secure} for easier testing. */ +interface SecureSettings { + + void putStringForUser(String name, String value, int userHandle); - private static final String TAG = "ChooserActivity"; + String getStringForUser(String name, int userHandle); - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - ChooserHelper.onChoose(this); - finish(); - } + void registerContentObserver(String name, boolean notifyForDescendants, + ContentObserver settingsObserver, int userHandle); } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index 7e47f4561e78..9ca431d81211 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -15,13 +15,13 @@ */ package com.android.settingslib.media; +import static android.media.MediaRoute2Info.TYPE_BLE_HEADSET; import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP; import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER; import static android.media.MediaRoute2Info.TYPE_DOCK; import static android.media.MediaRoute2Info.TYPE_GROUP; import static android.media.MediaRoute2Info.TYPE_HDMI; import static android.media.MediaRoute2Info.TYPE_HEARING_AID; -import static android.media.MediaRoute2Info.TYPE_BLE_HEADSET; import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER; import static android.media.MediaRoute2Info.TYPE_REMOTE_TV; import static android.media.MediaRoute2Info.TYPE_UNKNOWN; @@ -163,6 +163,31 @@ public class InfoMediaManager extends MediaManager { return sessionInfos.get(sessionInfos.size() - 1); } + boolean isRoutingSessionAvailableForVolumeControl() { + if (mVolumeAdjustmentForRemoteGroupSessions) { + return true; + } + List<RoutingSessionInfo> sessions = + mRouterManager.getRoutingSessions(mPackageName); + boolean foundNonSystemSession = false; + boolean isGroup = false; + for (RoutingSessionInfo session : sessions) { + if (!session.isSystemSession()) { + foundNonSystemSession = true; + int selectedRouteCount = session.getSelectedRoutes().size(); + if (selectedRouteCount > 1) { + isGroup = true; + break; + } + } + } + if (!foundNonSystemSession) { + Log.d(TAG, "No routing session for " + mPackageName); + return false; + } + return !isGroup; + } + /** * Remove a {@code device} from current media. * diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index 31d5921a8673..5520ea41aef9 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -37,9 +37,9 @@ import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HearingAidProfile; +import com.android.settingslib.bluetooth.LeAudioProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfile; -import com.android.settingslib.bluetooth.LeAudioProfile; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -198,6 +198,14 @@ public class LocalMediaManager implements BluetoothCallback { } /** + * Returns if the media session is available for volume control. + * @return True if this media session is available for colume control, false otherwise. + */ + public boolean isMediaSessionAvailableForVolumeControl() { + return mInfoMediaManager.isRoutingSessionAvailableForVolumeControl(); + } + + /** * Start scan connected MediaDevice */ public void startScan() { diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java new file mode 100644 index 000000000000..81006dd6b011 --- /dev/null +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java @@ -0,0 +1,120 @@ +/* + * 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.settingslib.devicestate; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.res.Resources; +import android.database.ContentObserver; +import android.os.UserHandle; +import android.provider.Settings; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import com.android.internal.R; +import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager.SettableDeviceState; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.List; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class DeviceStateRotationLockSettingsManagerTest { + + @Mock private Context mMockContext; + @Mock private Resources mMockResources; + + private DeviceStateRotationLockSettingsManager mManager; + private int mNumSettingsChanges = 0; + private final ContentObserver mContentObserver = new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + mNumSettingsChanges++; + } + }; + private final FakeSecureSettings mFakeSecureSettings = new FakeSecureSettings(); + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + Context context = InstrumentationRegistry.getTargetContext(); + when(mMockContext.getApplicationContext()).thenReturn(mMockContext); + when(mMockContext.getResources()).thenReturn(mMockResources); + when(mMockContext.getContentResolver()).thenReturn(context.getContentResolver()); + mFakeSecureSettings.registerContentObserver( + Settings.Secure.DEVICE_STATE_ROTATION_LOCK, + /* notifyForDescendents= */ false, //NOTYPO + mContentObserver, + UserHandle.USER_CURRENT); + mManager = new DeviceStateRotationLockSettingsManager(context, mFakeSecureSettings); + } + + @Test + public void initialization_settingsAreChangedOnce() { + assertThat(mNumSettingsChanges).isEqualTo(1); + } + + @Test + public void updateSetting_multipleTimes_sameValue_settingsAreChangedOnlyOnce() { + mNumSettingsChanges = 0; + + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ true); + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ true); + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ true); + + assertThat(mNumSettingsChanges).isEqualTo(1); + } + + @Test + public void updateSetting_multipleTimes_differentValues_settingsAreChangedMultipleTimes() { + mNumSettingsChanges = 0; + + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ true); + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ false); + mManager.updateSetting(/* deviceState= */ 1, /* rotationLocked= */ true); + + assertThat(mNumSettingsChanges).isEqualTo(3); + } + + @Test + public void getSettableDeviceStates_returnsExpectedValuesInOriginalOrder() { + when(mMockResources.getStringArray( + R.array.config_perDeviceStateRotationLockDefaults)).thenReturn( + new String[]{"2:2", "4:0", "1:1", "0:0"}); + + List<SettableDeviceState> settableDeviceStates = + DeviceStateRotationLockSettingsManager.getInstance( + mMockContext).getSettableDeviceStates(); + + assertThat(settableDeviceStates).containsExactly( + new SettableDeviceState(/* deviceState= */ 2, /* isSettable= */ true), + new SettableDeviceState(/* deviceState= */ 4, /* isSettable= */ false), + new SettableDeviceState(/* deviceState= */ 1, /* isSettable= */ true), + new SettableDeviceState(/* deviceState= */ 0, /* isSettable= */ false) + ).inOrder(); + } +} diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/FakeSecureSettings.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/FakeSecureSettings.java new file mode 100644 index 000000000000..91baa68a1c49 --- /dev/null +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/FakeSecureSettings.java @@ -0,0 +1,60 @@ +/* + * 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.settingslib.devicestate; + +import android.database.ContentObserver; +import android.util.Pair; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +import java.util.HashMap; +import java.util.Map; + +/** Fake implementation of {@link SecureSettings} that stores everything in memory. */ +class FakeSecureSettings implements SecureSettings { + + private final Map<SettingsKey, String> mValues = new HashMap<>(); + private final Multimap<SettingsKey, ContentObserver> mContentObservers = HashMultimap.create(); + + @Override + public void putStringForUser(String name, String value, int userHandle) { + SettingsKey settingsKey = new SettingsKey(userHandle, name); + mValues.put(settingsKey, value); + for (ContentObserver observer : mContentObservers.get(settingsKey)) { + observer.onChange(/* selfChange= */ false); + } + } + + @Override + public String getStringForUser(String name, int userHandle) { + return mValues.getOrDefault(new SettingsKey(userHandle, name), ""); + } + + @Override + public void registerContentObserver(String name, boolean notifyForDescendants, + ContentObserver settingsObserver, int userHandle) { + mContentObservers.put(new SettingsKey(userHandle, name), settingsObserver); + } + + private static class SettingsKey extends Pair<Integer, String> { + + SettingsKey(Integer userHandle, String settingName) { + super(userHandle, settingName); + } + } +} diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/OWNERS b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/OWNERS new file mode 100644 index 000000000000..98f41234feb1 --- /dev/null +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/OWNERS @@ -0,0 +1,3 @@ +# Default reviewers for this and subdirectories. +alexflo@google.com +chrisgollner@google.com diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java index 06b6fc8ef73d..b2258e1d4208 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java @@ -80,8 +80,8 @@ public class BiometricActionDisabledByAdminControllerTest { assertEquals(Settings.ACTION_MANAGE_SUPERVISOR_RESTRICTED_SETTING, intentCaptor.getValue().getAction()); assertEquals(Settings.SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS, - intentCaptor.getValue().getStringExtra( - Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY)); + intentCaptor.getValue().getIntExtra( + Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY, -1)); assertEquals(componentName.getPackageName(), intentCaptor.getValue().getPackage()); } } diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 8e35ee96b691..a36a4493133c 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -193,6 +193,7 @@ public class SecureSettings { Settings.Secure.NOTIFICATION_BUBBLES, Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED, Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, + Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS, Settings.Secure.LOCKSCREEN_SHOW_WALLET, Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER, Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 5f549fd05e1a..fc2c2339f022 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -152,6 +152,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.CONTROLS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.POWER_MENU_LOCKED_SHOW_CONTENT, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCKSCREEN_SHOW_CONTROLS, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCKSCREEN_SHOW_WALLET, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, BOOLEAN_VALIDATOR); diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index adac31ebf762..070aa1b95cd9 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -593,6 +593,9 @@ <uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION"/> + <!-- Permission required for CTS test - MediaCodecResourceTest --> + <uses-permission android:name="android.permission.MEDIA_RESOURCE_OVERRIDE_PID" /> + <!-- Permission required for CTS test - ResourceObserverNativeTest --> <uses-permission android:name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" /> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index ad6074a93c96..4b1d00bb18e3 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -311,6 +311,9 @@ <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" /> <uses-permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION" /> + <!-- To change system captions state --> + <uses-permission android:name="android.permission.SET_SYSTEM_AUDIO_CAPTION" /> + <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> @@ -767,22 +770,6 @@ </intent-filter> </activity> - <activity android:name=".chooser.ChooserActivity" - android:theme="@*android:style/Theme.NoDisplay" - android:finishOnCloseSystemDialogs="true" - android:excludeFromRecents="true" - android:documentLaunchMode="never" - android:relinquishTaskIdentity="true" - android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden" - android:process=":ui" - android:visibleToInstantApps="true" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.CHOOSER" /> - <category android:name="android.intent.category.VOICE" /> - </intent-filter> - </activity> - <activity android:name=".clipboardoverlay.EditTextActivity" android:theme="@style/EditTextActivity" android:exported="false" diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt index c3f6a5d18b74..0da60f0b3d66 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt @@ -298,6 +298,9 @@ class ActivityLaunchAnimator( * * Important: The view must be attached to a [ViewGroup] when calling this function and * during the animation. For safety, this method will return null when it is not. + * + * Note: The background of [view] should be a (rounded) rectangle so that it can be + * properly animated. */ @JvmStatic fun fromView(view: View, cujType: Int? = null): Controller? { diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt index a3c5649e3fec..50178f470fd8 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -79,6 +79,9 @@ class DialogLaunchAnimator @JvmOverloads constructor( * If [animateBackgroundBoundsChange] is true, then the background of the dialog will be * animated when the dialog bounds change. * + * Note: The background of [view] should be a (rounded) rectangle so that it can be properly + * animated. + * * Caveats: When calling this function and [dialog] is not a fullscreen dialog, then it will be * made fullscreen and 2 views will be inserted between the dialog DecorView and its children. */ @@ -153,6 +156,9 @@ class DialogLaunchAnimator @JvmOverloads constructor( * activity started, when the dialog to app animation is done (or when it is cancelled). If this * method returns null, then the dialog won't be dismissed. * + * Note: The background of [view] should be a (rounded) rectangle so that it can be properly + * animated. + * * @param view any view inside the dialog to animate. */ @JvmOverloads diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java index 0a0530c056af..3d2f570bde87 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java @@ -60,7 +60,6 @@ public interface VolumeDialogController { boolean areCaptionsEnabled(); void setCaptionsEnabled(boolean isEnabled); - boolean isCaptionStreamOptedOut(); void getCaptionsComponentState(boolean fromTooltip); diff --git a/packages/SystemUI/res-keyguard/layout/fgs_footer.xml b/packages/SystemUI/res-keyguard/layout/fgs_footer.xml index 59f87da79a11..9d801d2a0ecf 100644 --- a/packages/SystemUI/res-keyguard/layout/fgs_footer.xml +++ b/packages/SystemUI/res-keyguard/layout/fgs_footer.xml @@ -28,7 +28,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/new_qs_footer_action_inset" android:background="@drawable/qs_security_footer_background" - android:layout_gravity="center" + android:layout_gravity="end" android:gravity="center" android:paddingHorizontal="@dimen/qs_footer_padding" > diff --git a/packages/SystemUI/res/color/caption_tint_color_selector.xml b/packages/SystemUI/res/color/caption_tint_color_selector.xml index 30843ec70f91..5239d269eb4a 100644 --- a/packages/SystemUI/res/color/caption_tint_color_selector.xml +++ b/packages/SystemUI/res/color/caption_tint_color_selector.xml @@ -16,8 +16,5 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:sysui="http://schemas.android.com/apk/res-auto"> - <item sysui:optedOut="true" - android:color="?android:attr/colorButtonNormal"/> - <item android:color="?android:attr/colorAccent"/> </selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml index d057f5f32dc4..31a8c3bc2397 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_circle.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml @@ -19,13 +19,17 @@ <ripple android:color="?android:attr/colorControlHighlight"> <item android:id="@android:id/mask"> - <shape android:shape="oval"> + <!-- We make this shape a rounded rectangle instead of a oval so that it can animate --> + <!-- properly into an app/dialog. --> + <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> - <shape android:shape="oval"> + <shape android:shape="rectangle"> <solid android:color="?attr/offStateColor"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml index 944061cc8e70..021a85f6a244 100644 --- a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml @@ -19,13 +19,17 @@ <ripple android:color="?android:attr/colorControlHighlight"> <item android:id="@android:id/mask"> - <shape android:shape="oval"> + <!-- We make this shape a rounded rectangle instead of a oval so that it can animate --> + <!-- properly into an app/dialog. --> + <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> <item> - <shape android:shape="oval"> + <shape android:shape="rectangle"> <solid android:color="?android:attr/colorAccent"/> + <corners android:radius="@dimen/qs_footer_action_corner_radius"/> </shape> </item> diff --git a/packages/SystemUI/res/layout-land-television/volume_dialog.xml b/packages/SystemUI/res/layout-land-television/volume_dialog.xml index 6b5629facd41..0fbc519ca8dd 100644 --- a/packages/SystemUI/res/layout-land-television/volume_dialog.xml +++ b/packages/SystemUI/res/layout-land-television/volume_dialog.xml @@ -73,8 +73,7 @@ android:layout_height="match_parent" android:tint="@color/caption_tint_color_selector" android:layout_gravity="center" - android:soundEffectsEnabled="false" - sysui:optedOut="false"/> + android:soundEffectsEnabled="false"/> </FrameLayout> diff --git a/packages/SystemUI/res/layout-land/volume_dialog.xml b/packages/SystemUI/res/layout-land/volume_dialog.xml index f1cda277f045..3b70dc060e84 100644 --- a/packages/SystemUI/res/layout-land/volume_dialog.xml +++ b/packages/SystemUI/res/layout-land/volume_dialog.xml @@ -136,8 +136,7 @@ android:layout_height="match_parent" android:tint="?android:attr/colorAccent" android:layout_gravity="center" - android:soundEffectsEnabled="false" - sysui:optedOut="false"/> + android:soundEffectsEnabled="false" /> </FrameLayout> </LinearLayout> diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_preview.xml b/packages/SystemUI/res/layout/dream_overlay_complication_preview.xml new file mode 100644 index 000000000000..37b8365996fd --- /dev/null +++ b/packages/SystemUI/res/layout/dream_overlay_complication_preview.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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. + --> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/dream_preview_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/dream_overlay_complication_preview_text_size" + android:textColor="@android:color/white" + android:shadowColor="@color/keyguard_shadow_color" + android:shadowRadius="?attr/shadowRadius" + android:gravity="center_vertical" + android:drawableStart="@drawable/ic_arrow_back" + android:drawablePadding="@dimen/dream_overlay_complication_preview_icon_padding" + android:drawableTint="@android:color/white"/> diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 51718d9af054..6a192d4b7e05 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -135,8 +135,7 @@ android:layout_height="match_parent" android:tint="?android:attr/colorAccent" android:layout_gravity="center" - android:soundEffectsEnabled="false" - sysui:optedOut="false"/> + android:soundEffectsEnabled="false"/> </FrameLayout> </LinearLayout> diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index c37c804caaa8..8a4516aaa49f 100644 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml @@ -42,4 +42,8 @@ the shade (in alpha) --> <dimen name="lockscreen_shade_scrim_transition_distance">200dp</dimen> + <!-- Distance that the full shade transition takes in order for media to fully transition to + the shade --> + <dimen name="lockscreen_shade_media_transition_distance">200dp</dimen> + </resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index c5e005c556b2..62903d5a7b35 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -154,10 +154,6 @@ <attr name="showAirplaneMode" format="boolean" /> </declare-styleable> - <declare-styleable name="CaptionsToggleImageButton"> - <attr name="optedOut" format="boolean" /> - </declare-styleable> - <declare-styleable name="IlluminationDrawable"> <attr name="highlight" format="integer" /> <attr name="cornerRadius" format="dimension" /> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index fcf60bf43c62..debf95b86c0c 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1347,6 +1347,8 @@ <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen> <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen> <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen> + <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen> + <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen> <!-- The position of the end guide, which dream overlay complications can align their start with if their end is aligned with the parent end. Represented as the percentage over from the diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt index b611c9659db8..6ad91612f99b 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/Flag.kt @@ -35,6 +35,11 @@ interface ResourceFlag<T> : Flag<T> { val resourceId: Int } +interface SysPropFlag<T> : Flag<T> { + val name: String + val default: T +} + // Consider using the "parcelize" kotlin library. data class BooleanFlag @JvmOverloads constructor( @@ -66,6 +71,12 @@ data class ResourceBooleanFlag constructor( @BoolRes override val resourceId: Int ) : ResourceFlag<Boolean> +data class SysPropBooleanFlag constructor( + override val id: Int, + override val name: String, + override val default: Boolean = false +) : SysPropFlag<Boolean> + data class StringFlag @JvmOverloads constructor( override val id: Int, override val default: String = "" diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt index ec619dd6eea3..149f6e8e7e9e 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt @@ -54,7 +54,7 @@ class FlagManager constructor( * An action called on restart which takes as an argument whether the listeners requested * that the restart be suppressed */ - var restartAction: Consumer<Boolean>? = null + var onSettingsChangedAction: Consumer<Boolean>? = null var clearCacheAction: Consumer<Int>? = null private val listeners: MutableSet<PerFlagListener> = mutableSetOf() private val settingsObserver: ContentObserver = SettingsObserver() @@ -154,11 +154,11 @@ class FlagManager constructor( val idStr = parts[parts.size - 1] val id = try { idStr.toInt() } catch (e: NumberFormatException) { return } clearCacheAction?.accept(id) - dispatchListenersAndMaybeRestart(id) + dispatchListenersAndMaybeRestart(id, onSettingsChangedAction) } } - fun dispatchListenersAndMaybeRestart(id: Int) { + fun dispatchListenersAndMaybeRestart(id: Int, restartAction: Consumer<Boolean>?) { val filteredListeners: List<FlagListenable.Listener> = synchronized(listeners) { listeners.mapNotNull { if (it.id == id) it.listener else null } } diff --git a/packages/SystemUI/src/com/android/systemui/DisplayCutoutBaseView.kt b/packages/SystemUI/src/com/android/systemui/DisplayCutoutBaseView.kt index 6bec8aacd55f..56046d9c057d 100644 --- a/packages/SystemUI/src/com/android/systemui/DisplayCutoutBaseView.kt +++ b/packages/SystemUI/src/com/android/systemui/DisplayCutoutBaseView.kt @@ -49,7 +49,7 @@ open class DisplayCutoutBaseView : View, RegionInterceptableView { private val shouldDrawCutout: Boolean = DisplayCutout.getFillBuiltInDisplayCutout( context.resources, context.display?.uniqueId) private var displayMode: Display.Mode? = null - private val location = IntArray(2) + protected val location = IntArray(2) protected var displayRotation = 0 @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) @@ -65,7 +65,8 @@ open class DisplayCutoutBaseView : View, RegionInterceptableView { @JvmField val protectionPath: Path = Path() private val protectionRectOrig: RectF = RectF() private val protectionPathOrig: Path = Path() - private var cameraProtectionProgress: Float = HIDDEN_CAMERA_PROTECTION_SCALE + @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) + var cameraProtectionProgress: Float = HIDDEN_CAMERA_PROTECTION_SCALE private var cameraProtectionAnimator: ValueAnimator? = null constructor(context: Context) : super(context) @@ -273,4 +274,4 @@ open class DisplayCutoutBaseView : View, RegionInterceptableView { } } } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt b/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt index ee1d9a3aa5de..4b868622ce58 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt @@ -26,11 +26,22 @@ import android.graphics.PixelFormat import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter import android.graphics.PorterDuffXfermode +import android.graphics.Rect +import android.graphics.Region import android.graphics.drawable.Drawable import android.hardware.graphics.common.AlphaInterpretation import android.hardware.graphics.common.DisplayDecorationSupport +import android.view.DisplayCutout.BOUNDS_POSITION_BOTTOM +import android.view.DisplayCutout.BOUNDS_POSITION_LEFT +import android.view.DisplayCutout.BOUNDS_POSITION_LENGTH +import android.view.DisplayCutout.BOUNDS_POSITION_TOP +import android.view.DisplayCutout.BOUNDS_POSITION_RIGHT import android.view.RoundedCorner import android.view.RoundedCorners +import android.view.Surface +import androidx.annotation.VisibleForTesting +import kotlin.math.ceil +import kotlin.math.floor /** * When the HWC of the device supports Composition.DISPLAY_DECORATON, we use this layer to draw @@ -38,13 +49,16 @@ import android.view.RoundedCorners */ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDecorationSupport) : DisplayCutoutBaseView(context) { - public val colorMode: Int + val colorMode: Int private val useInvertedAlphaColor: Boolean private val color: Int private val bgColor: Int private val cornerFilter: ColorFilter private val cornerBgFilter: ColorFilter private val clearPaint: Paint + @JvmField val transparentRect: Rect = Rect() + private val debugTransparentRegionPaint: Paint? + private val tempRect: Rect = Rect() private var roundedCornerTopSize = 0 private var roundedCornerBottomSize = 0 @@ -61,6 +75,10 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec bgColor = Color.TRANSPARENT colorMode = ActivityInfo.COLOR_MODE_DEFAULT useInvertedAlphaColor = false + debugTransparentRegionPaint = Paint().apply { + color = 0x2f00ff00 // semi-transparent green + style = Paint.Style.FILL + } } else { colorMode = ActivityInfo.COLOR_MODE_A8 useInvertedAlphaColor = displayDecorationSupport.alphaInterpretation == @@ -72,6 +90,7 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec color = Color.BLACK bgColor = Color.TRANSPARENT } + debugTransparentRegionPaint = null } cornerFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN) cornerBgFilter = PorterDuffColorFilter(bgColor, PorterDuff.Mode.SRC_OUT) @@ -82,6 +101,9 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec override fun onAttachedToWindow() { super.onAttachedToWindow() + if (!DEBUG_COLOR) { + parent.requestTransparentRegion(this) + } viewRootImpl.setDisplayDecoration(true) if (useInvertedAlphaColor) { @@ -93,12 +115,172 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec } override fun onDraw(canvas: Canvas) { + // If updating onDraw, also update gatherTransparentRegion if (useInvertedAlphaColor) { canvas.drawColor(bgColor) } // Cutouts are drawn in DisplayCutoutBaseView.onDraw() super.onDraw(canvas) drawRoundedCorners(canvas) + + debugTransparentRegionPaint?.let { + calculateTransparentRect() + canvas.drawRect(transparentRect, it) + } + } + + override fun gatherTransparentRegion(region: Region?): Boolean { + region?.let { + calculateTransparentRect() + region.op(transparentRect, Region.Op.INTERSECT) + } + // Always return false - views underneath this should always be visible. + return false + } + + /** + * The transparent rect is calculated by subtracting the regions of cutouts, cutout protect and + * rounded corners from the region with fullscreen display size. + */ + @VisibleForTesting + fun calculateTransparentRect() { + transparentRect.set(0, 0, width, height) + + // Remove cutout region. + removeCutoutFromTransparentRegion() + + // Remove cutout protection region. + removeCutoutProtectionFromTransparentRegion() + + // Remove rounded corner region. + removeRoundedCornersFromTransparentRegion() + } + + private fun removeCutoutFromTransparentRegion() { + displayInfo.displayCutout?.let { + cutout -> + if (!cutout.boundingRectLeft.isEmpty) { + transparentRect.left = + cutout.boundingRectLeft.right.coerceAtLeast(transparentRect.left) + } + if (!cutout.boundingRectTop.isEmpty) { + transparentRect.top = + cutout.boundingRectTop.bottom.coerceAtLeast(transparentRect.top) + } + if (!cutout.boundingRectRight.isEmpty) { + transparentRect.right = + cutout.boundingRectRight.left.coerceAtMost(transparentRect.right) + } + if (!cutout.boundingRectBottom.isEmpty) { + transparentRect.bottom = + cutout.boundingRectBottom.top.coerceAtMost(transparentRect.bottom) + } + } + } + + private fun removeCutoutProtectionFromTransparentRegion() { + if (protectionRect.isEmpty) { + return + } + + val centerX = protectionRect.centerX() + val centerY = protectionRect.centerY() + val scaledDistanceX = (centerX - protectionRect.left) * cameraProtectionProgress + val scaledDistanceY = (centerY - protectionRect.top) * cameraProtectionProgress + tempRect.set( + floor(centerX - scaledDistanceX).toInt(), + floor(centerY - scaledDistanceY).toInt(), + ceil(centerX + scaledDistanceX).toInt(), + ceil(centerY + scaledDistanceY).toInt() + ) + + // Find out which edge the protectionRect belongs and remove that edge from the transparent + // region. + val leftDistance = tempRect.left + val topDistance = tempRect.top + val rightDistance = width - tempRect.right + val bottomDistance = height - tempRect.bottom + val minDistance = minOf(leftDistance, topDistance, rightDistance, bottomDistance) + when (minDistance) { + leftDistance -> { + transparentRect.left = tempRect.right.coerceAtLeast(transparentRect.left) + } + topDistance -> { + transparentRect.top = tempRect.bottom.coerceAtLeast(transparentRect.top) + } + rightDistance -> { + transparentRect.right = tempRect.left.coerceAtMost(transparentRect.right) + } + bottomDistance -> { + transparentRect.bottom = tempRect.top.coerceAtMost(transparentRect.bottom) + } + } + } + + private fun removeRoundedCornersFromTransparentRegion() { + var hasTopOrBottomCutouts = false + var hasLeftOrRightCutouts = false + displayInfo.displayCutout?.let { + cutout -> + hasTopOrBottomCutouts = !cutout.boundingRectTop.isEmpty || + !cutout.boundingRectBottom.isEmpty + hasLeftOrRightCutouts = !cutout.boundingRectLeft.isEmpty || + !cutout.boundingRectRight.isEmpty + } + // The goal is to remove the rounded corner areas as small as possible so that we can have a + // larger transparent region. Therefore, we should always remove from the short edge sides + // if possible. + val isShortEdgeTopBottom = width < height + if (isShortEdgeTopBottom) { + // Short edges on top & bottom. + if (!hasTopOrBottomCutouts && hasLeftOrRightCutouts) { + // If there are cutouts only on left or right edges, remove left and right sides + // for rounded corners. + transparentRect.left = getRoundedCornerSizeByPosition(BOUNDS_POSITION_LEFT) + .coerceAtLeast(transparentRect.left) + transparentRect.right = + (width - getRoundedCornerSizeByPosition(BOUNDS_POSITION_RIGHT)) + .coerceAtMost(transparentRect.right) + } else { + // If there are cutouts on top or bottom edges or no cutout at all, remove top + // and bottom sides for rounded corners. + transparentRect.top = getRoundedCornerSizeByPosition(BOUNDS_POSITION_TOP) + .coerceAtLeast(transparentRect.top) + transparentRect.bottom = + (height - getRoundedCornerSizeByPosition(BOUNDS_POSITION_BOTTOM)) + .coerceAtMost(transparentRect.bottom) + } + } else { + // Short edges on left & right. + if (hasTopOrBottomCutouts && !hasLeftOrRightCutouts) { + // If there are cutouts only on top or bottom edges, remove top and bottom sides + // for rounded corners. + transparentRect.top = getRoundedCornerSizeByPosition(BOUNDS_POSITION_TOP) + .coerceAtLeast(transparentRect.top) + transparentRect.bottom = + (height - getRoundedCornerSizeByPosition(BOUNDS_POSITION_BOTTOM)) + .coerceAtMost(transparentRect.bottom) + } else { + // If there are cutouts on left or right edges or no cutout at all, remove left + // and right sides for rounded corners. + transparentRect.left = getRoundedCornerSizeByPosition(BOUNDS_POSITION_LEFT) + .coerceAtLeast(transparentRect.left) + transparentRect.right = + (width - getRoundedCornerSizeByPosition(BOUNDS_POSITION_RIGHT)) + .coerceAtMost(transparentRect.right) + } + } + } + + private fun getRoundedCornerSizeByPosition(position: Int): Int { + val delta = displayRotation - Surface.ROTATION_0 + return when ((position + delta) % BOUNDS_POSITION_LENGTH) { + BOUNDS_POSITION_LEFT -> roundedCornerTopSize.coerceAtLeast(roundedCornerBottomSize) + BOUNDS_POSITION_TOP -> roundedCornerTopSize + BOUNDS_POSITION_RIGHT -> roundedCornerTopSize.coerceAtLeast(roundedCornerBottomSize) + BOUNDS_POSITION_BOTTOM -> roundedCornerBottomSize + else -> throw IllegalArgumentException("Incorrect position: $position") + } } private fun drawRoundedCorners(canvas: Canvas) { diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index 2ec5f4f894f9..ae41cae10bba 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -847,14 +847,20 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab pw.println(" mIsRoundedCornerMultipleRadius:" + mIsRoundedCornerMultipleRadius); pw.println(" mIsPrivacyDotEnabled:" + isPrivacyDotEnabled()); pw.println(" mPendingRotationChange:" + mPendingRotationChange); - pw.println(" mHwcScreenDecorationSupport:"); - if (mHwcScreenDecorationSupport == null) { - pw.println(" null"); - } else { - pw.println(" format: " + if (mHwcScreenDecorationSupport != null) { + pw.println(" mHwcScreenDecorationSupport:"); + pw.println(" format=" + PixelFormat.formatToString(mHwcScreenDecorationSupport.format)); - pw.println(" alphaInterpretation: " + pw.println(" alphaInterpretation=" + alphaInterpretationToString(mHwcScreenDecorationSupport.alphaInterpretation)); + } else { + pw.println(" mHwcScreenDecorationSupport: null"); + } + if (mScreenDecorHwcLayer != null) { + pw.println(" mScreenDecorHwcLayer:"); + pw.println(" transparentRegion=" + mScreenDecorHwcLayer.transparentRect); + } else { + pw.println(" mScreenDecorHwcLayer: null"); } pw.println(" mRoundedDefault(x,y)=(" + mRoundedDefault.x + "," + mRoundedDefault.y + ")"); pw.println(" mRoundedDefaultTop(x,y)=(" + mRoundedDefaultTop.x + "," + mRoundedDefaultTop.y diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java index 3ece3ccf38fa..24a655c2856d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java @@ -20,6 +20,7 @@ import static com.android.systemui.statusbar.StatusBarState.KEYGUARD; import android.annotation.NonNull; import android.content.res.Configuration; +import android.util.Log; import android.util.MathUtils; import android.view.MotionEvent; @@ -47,6 +48,7 @@ import java.io.PrintWriter; * Class that coordinates non-HBM animations during keyguard authentication. */ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<UdfpsKeyguardView> { + public static final String TAG = "UdfpsKeyguardViewCtrl"; @NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager; @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @NonNull private final LockscreenShadeTransitionController mLockScreenShadeTransitionController; @@ -246,7 +248,12 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud } if (mInputBouncerHiddenAmount < .5f || mIsBouncerVisible) { - return true; + if (!getStatusBarStateController().isDozing()) { + return true; + } else { + Log.e(TAG, "Bouncer state claims visible on doze hiddenAmount=" + + mInputBouncerHiddenAmount + " bouncerVisible=" + mIsBouncerVisible); + } } return false; diff --git a/packages/SystemUI/src/com/android/systemui/chooser/ChooserHelper.java b/packages/SystemUI/src/com/android/systemui/chooser/ChooserHelper.java deleted file mode 100644 index 6c1da4711fec..000000000000 --- a/packages/SystemUI/src/com/android/systemui/chooser/ChooserHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2017 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.chooser; - -import android.app.Activity; -import android.app.ActivityTaskManager; -import android.content.Intent; -import android.os.Bundle; -import android.os.IBinder; -import android.os.StrictMode; - -/** - * When a target is chosen from the SystemUI Chooser activity, unpack its arguments and - * startActivityAsCaller to handle the now-chosen intent. - */ -public class ChooserHelper { - - private static final String TAG = "ChooserHelper"; - - static void onChoose(Activity activity) { - final Intent thisIntent = activity.getIntent(); - final Bundle thisExtras = thisIntent.getExtras(); - final Intent chosenIntent = thisIntent.getParcelableExtra(Intent.EXTRA_INTENT); - final Bundle options = thisIntent.getParcelableExtra(ActivityTaskManager.EXTRA_OPTIONS); - final IBinder permissionToken = - thisExtras.getBinder(ActivityTaskManager.EXTRA_PERMISSION_TOKEN); - final boolean ignoreTargetSecurity = - thisIntent.getBooleanExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY, false); - final int userId = thisIntent.getIntExtra(Intent.EXTRA_USER_ID, -1); - - // We're dispatching intents that might be coming from legacy apps, so - // (as in com.android.internal.app.ResolverActivity) exempt ourselves from death. - StrictMode.disableDeathOnFileUriExposure(); - try { - activity.startActivityAsCaller( - chosenIntent, options, permissionToken, ignoreTargetSecurity, userId); - } finally { - StrictMode.enableDeathOnFileUriExposure(); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java index a17ddc89818d..56e4d7ec1882 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java @@ -166,7 +166,7 @@ public class ClipboardOverlayController { mRemoteCopyChip = requireNonNull(mView.findViewById(R.id.remote_copy_chip)); mDismissButton = requireNonNull(mView.findViewById(R.id.dismiss_button)); - mView.setOnDismissCallback(this::hideImmediate); + mView.setOnDismissEndCallback(this::hideImmediate); mView.setOnInteractionCallback(mTimeoutHandler::resetTimeout); mDismissButton.setOnClickListener(view -> animateOut()); diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java index 8843462413b5..a327809640db 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java @@ -16,6 +16,7 @@ package com.android.systemui.clipboardoverlay; +import android.animation.Animator; import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; @@ -28,13 +29,16 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.android.systemui.R; import com.android.systemui.screenshot.SwipeDismissHandler; +import java.util.function.Consumer; + /** * ConstraintLayout that is draggable when touched in a specific region */ public class DraggableConstraintLayout extends ConstraintLayout { private final SwipeDismissHandler mSwipeDismissHandler; private final GestureDetector mSwipeDetector; - private Runnable mOnDismiss; + private Consumer<Animator> mOnDismissInitiated; + private Runnable mOnDismissComplete; private Runnable mOnInteraction; public DraggableConstraintLayout(Context context) { @@ -58,9 +62,16 @@ public class DraggableConstraintLayout extends ConstraintLayout { } @Override - public void onDismiss() { - if (mOnDismiss != null) { - mOnDismiss.run(); + public void onSwipeDismissInitiated(Animator animator) { + if (mOnDismissInitiated != null) { + mOnDismissInitiated.accept(animator); + } + } + + @Override + public void onDismissComplete() { + if (mOnDismissComplete != null) { + mOnDismissComplete.run(); } } }); @@ -106,10 +117,18 @@ public class DraggableConstraintLayout extends ConstraintLayout { } /** + * Set the callback to be run after view is dismissed (before animation; receives animator as + * input) + */ + public void setOnDismissStartCallback(Consumer<Animator> callback) { + mOnDismissInitiated = callback; + } + + /** * Set the callback to be run after view is dismissed */ - public void setOnDismissCallback(Runnable callback) { - mOnDismiss = callback; + public void setOnDismissEndCallback(Runnable callback) { + mOnDismissComplete = callback; } /** diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt index f87fa96dea65..5c1d8c3929cb 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt @@ -23,7 +23,11 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.content.pm.ResolveInfo +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler import android.os.VibrationEffect +import android.provider.Settings import android.service.controls.Control import android.service.controls.actions.BooleanAction import android.service.controls.actions.CommandAction @@ -38,6 +42,7 @@ import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.concurrency.DelayableExecutor +import com.android.systemui.util.settings.SecureSettings import com.android.wm.shell.TaskViewFactory import java.util.Optional import javax.inject.Inject @@ -51,19 +56,41 @@ class ControlActionCoordinatorImpl @Inject constructor( private val keyguardStateController: KeyguardStateController, private val taskViewFactory: Optional<TaskViewFactory>, private val controlsMetricsLogger: ControlsMetricsLogger, - private val vibrator: VibratorHelper + private val vibrator: VibratorHelper, + private val secureSettings: SecureSettings, + @Main mainHandler: Handler ) : ControlActionCoordinator { private var dialog: Dialog? = null private var pendingAction: Action? = null private var actionsInProgress = mutableSetOf<String>() private val isLocked: Boolean get() = !keyguardStateController.isUnlocked() + private var mAllowTrivialControls: Boolean = secureSettings.getInt( + Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS, 0) != 0 override lateinit var activityContext: Context companion object { private const val RESPONSE_TIMEOUT_IN_MILLIS = 3000L } + init { + val lockScreenShowControlsUri = + secureSettings.getUriFor(Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS) + val controlsContentObserver = object : ContentObserver(mainHandler) { + override fun onChange(selfChange: Boolean, uri: Uri?) { + super.onChange(selfChange, uri) + if (uri == lockScreenShowControlsUri) { + mAllowTrivialControls = secureSettings.getInt( + Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS, 0) != 0 + } + } + } + secureSettings.registerContentObserver( + lockScreenShowControlsUri, + false /* notifyForDescendants */, controlsContentObserver + ) + } + override fun closeDialogs() { dialog?.dismiss() dialog = null @@ -80,7 +107,7 @@ class ControlActionCoordinatorImpl @Inject constructor( }, true /* blockable */ ), - isAuthRequired(cvh) + isAuthRequired(cvh, mAllowTrivialControls) ) } @@ -100,7 +127,7 @@ class ControlActionCoordinatorImpl @Inject constructor( }, blockable ), - isAuthRequired(cvh) + isAuthRequired(cvh, mAllowTrivialControls) ) } @@ -120,7 +147,7 @@ class ControlActionCoordinatorImpl @Inject constructor( { cvh.action(FloatAction(templateId, newValue)) }, false /* blockable */ ), - isAuthRequired(cvh) + isAuthRequired(cvh, mAllowTrivialControls) ) } @@ -139,7 +166,7 @@ class ControlActionCoordinatorImpl @Inject constructor( }, false /* blockable */ ), - isAuthRequired(cvh) + isAuthRequired(cvh, mAllowTrivialControls) ) } @@ -156,7 +183,11 @@ class ControlActionCoordinatorImpl @Inject constructor( actionsInProgress.remove(controlId) } - private fun isAuthRequired(cvh: ControlViewHolder) = cvh.cws.control?.isAuthRequired() ?: true + @VisibleForTesting() + fun isAuthRequired(cvh: ControlViewHolder, allowTrivialControls: Boolean): Boolean { + val isAuthRequired = cvh.cws.control?.isAuthRequired ?: true + return isAuthRequired || !allowTrivialControls + } private fun shouldRunAction(controlId: String) = if (actionsInProgress.add(controlId)) { diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java index bd472a48ab3e..71c538d9324b 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java @@ -71,6 +71,7 @@ import android.view.ViewConfiguration; import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.CaptioningManager; import android.view.inputmethod.InputMethodManager; import com.android.internal.app.IBatteryStats; @@ -120,6 +121,12 @@ public class FrameworkServicesModule { @Provides @Singleton + static CaptioningManager provideCaptioningManager(Context context) { + return context.getSystemService(CaptioningManager.class); + } + + @Provides + @Singleton static ColorDisplayManager provideColorDisplayManager(Context context) { return context.getSystemService(ColorDisplayManager.class); } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java index b8b4092ccf2f..dfb27eff722b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java @@ -89,6 +89,7 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi private boolean mPaused = false; private boolean mScreenOff = false; private int mLastSensorValue = -1; + private DozeMachine.State mState = DozeMachine.State.UNINITIALIZED; /** * Debug value used for emulating various display brightness buckets: @@ -135,6 +136,7 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi @Override public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) { + mState = newState; switch (newState) { case INITIALIZED: resetBrightnessToDefault(); @@ -262,8 +264,9 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi */ private int clampToDimBrightnessForScreenOff(int brightness) { final boolean screenTurningOff = - mDozeParameters.shouldClampToDimBrightness() - || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_GOING_TO_SLEEP; + (mDozeParameters.shouldClampToDimBrightness() + || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_GOING_TO_SLEEP) + && mState == DozeMachine.State.INITIALIZED; if (screenTurningOff && mWakefulnessLifecycle.getLastSleepReason() == GO_TO_SLEEP_REASON_TIMEOUT) { return Math.max( diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index be76e8fcae37..745010372182 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -18,12 +18,9 @@ package com.android.systemui.dreams; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; -import android.graphics.Rect; -import android.graphics.Region; import android.os.Handler; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; @@ -62,43 +59,6 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve // Main thread handler used to schedule periodic tasks (e.g. burn-in protection updates). private final Handler mHandler; - // A hook into the internal inset calculation where we declare the overlays as the only - // touchable regions. - private final ViewTreeObserver.OnComputeInternalInsetsListener - mOnComputeInternalInsetsListener = - new ViewTreeObserver.OnComputeInternalInsetsListener() { - @Override - public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) { - inoutInfo.setTouchableInsets( - ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); - final Region region = new Region(); - final Rect rect = new Rect(); - final int childCount = mDreamOverlayContentView.getChildCount(); - for (int i = 0; i < childCount; i++) { - View child = mDreamOverlayContentView.getChildAt(i); - - if (mComplicationHostViewController.getView() == child) { - region.op(mComplicationHostViewController.getTouchRegions(), - Region.Op.UNION); - continue; - } - - if (child.getGlobalVisibleRect(rect)) { - region.op(rect, Region.Op.UNION); - } - } - - // Add the notifications drag area to the tap region (otherwise the - // notifications shade can't be dragged down). - if (mDreamOverlayContentView.getGlobalVisibleRect(rect)) { - rect.bottom = rect.top + mDreamOverlayNotificationsDragAreaHeight; - region.op(rect, Region.Op.UNION); - } - - inoutInfo.touchableRegion.set(region); - } - }; - @Inject public DreamOverlayContainerViewController( DreamOverlayContainerView containerView, @@ -136,16 +96,12 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve @Override protected void onViewAttached() { - mView.getViewTreeObserver() - .addOnComputeInternalInsetsListener(mOnComputeInternalInsetsListener); mHandler.postDelayed(this::updateBurnInOffsets, mBurnInProtectionUpdateInterval); } @Override protected void onViewDetached() { mHandler.removeCallbacks(this::updateBurnInOffsets); - mView.getViewTreeObserver() - .removeOnComputeInternalInsetsListener(mOnComputeInternalInsetsListener); } View getContainerView() { @@ -162,6 +118,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve // so no translation occurs when the values don't change. mView.setTranslationX(getBurnInOffset(mMaxBurnInOffset * 2, true) - mMaxBurnInOffset); + mView.setTranslationY(getBurnInOffset(mMaxBurnInOffset * 2, false) - mMaxBurnInOffset); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index 338a8b2a2a59..7e1fce298fbd 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -33,6 +33,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.complication.Complication; +import com.android.systemui.dreams.complication.DreamPreviewComplication; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; @@ -57,6 +58,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ // content area). private final DreamOverlayContainerViewController mDreamOverlayContainerViewController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; + private final DreamPreviewComplication mPreviewComplication; // A reference to the {@link Window} used to hold the dream overlay. private Window mWindow; @@ -96,12 +98,14 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ @Main Executor executor, DreamOverlayComponent.Factory dreamOverlayComponentFactory, DreamOverlayStateController stateController, - KeyguardUpdateMonitor keyguardUpdateMonitor) { + KeyguardUpdateMonitor keyguardUpdateMonitor, + DreamPreviewComplication previewComplication) { mContext = context; mExecutor = executor; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardUpdateMonitor.registerCallback(mKeyguardCallback); mStateController = stateController; + mPreviewComplication = previewComplication; final DreamOverlayComponent component = dreamOverlayComponentFactory.create(mViewModelStore, mHost); @@ -125,6 +129,9 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ windowManager.removeView(mWindow.getDecorView()); } mStateController.setOverlayActive(false); + mPreviewComplication.setDreamLabel(null); + mStateController.removeComplication(mPreviewComplication); + mStateController.setPreviewMode(false); super.onDestroy(); } @@ -133,6 +140,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ setCurrentState(Lifecycle.State.STARTED); mExecutor.execute(() -> { mStateController.setShouldShowComplications(shouldShowComplications()); + mStateController.setPreviewMode(isPreviewMode()); + if (isPreviewMode()) { + mPreviewComplication.setDreamLabel(getDreamLabel()); + mStateController.addComplication(mPreviewComplication); + } addOverlayWindowLocked(layoutParams); setCurrentState(Lifecycle.State.RESUMED); mStateController.setOverlayActive(true); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java index fc71e2fb2329..6860998680cb 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java @@ -50,6 +50,7 @@ public class DreamOverlayStateController implements private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); public static final int STATE_DREAM_OVERLAY_ACTIVE = 1 << 0; + public static final int STATE_PREVIEW_MODE = 1 << 1; private static final int OP_CLEAR_STATE = 1; private static final int OP_SET_STATE = 2; @@ -249,4 +250,18 @@ public class DreamOverlayStateController implements mCallbacks.forEach(Callback::onAvailableComplicationTypesChanged); }); } + + /** + * Sets whether the dream is running in preview mode. + */ + public void setPreviewMode(boolean isPreviewMode) { + modifyState(isPreviewMode ? OP_SET_STATE : OP_CLEAR_STATE, STATE_PREVIEW_MODE); + } + + /** + * Returns whether the dream is running in preview mode. + */ + public boolean isPreviewMode() { + return containsState(STATE_PREVIEW_MODE); + } } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java index ed82ab0e308f..32b2309ee83b 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java @@ -24,6 +24,7 @@ import android.net.NetworkCapabilities; import android.net.NetworkRequest; import com.android.systemui.dreams.dagger.DreamOverlayComponent; +import com.android.systemui.touch.TouchInsetManager; import com.android.systemui.util.ViewController; import java.lang.annotation.Retention; @@ -48,6 +49,7 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve private static final int WIFI_STATUS_AVAILABLE = 2; private final ConnectivityManager mConnectivityManager; + private final TouchInsetManager.TouchInsetSession mTouchInsetSession; private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder() .clearCapabilities() @@ -77,9 +79,11 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve @Inject public DreamOverlayStatusBarViewController( DreamOverlayStatusBarView view, - ConnectivityManager connectivityManager) { + ConnectivityManager connectivityManager, + TouchInsetManager.TouchInsetSession touchInsetSession) { super(view); mConnectivityManager = connectivityManager; + mTouchInsetSession = touchInsetSession; } @Override @@ -92,11 +96,13 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve onWifiAvailabilityChanged( capabilities != null && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)); + mTouchInsetSession.addViewToTracking(mView); } @Override protected void onViewDetached() { mConnectivityManager.unregisterNetworkCallback(mNetworkCallback); + mTouchInsetSession.clear(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java index 240389a988ae..a5dcd39264df 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java @@ -59,7 +59,19 @@ public class SmartSpaceComplication implements Complication { @Override public void start() { - if (mSmartSpaceController.isEnabled()) { + addOrRemoveOverlay(); + mDreamOverlayStateController.addCallback(new DreamOverlayStateController.Callback() { + @Override + public void onStateChanged() { + addOrRemoveOverlay(); + } + }); + } + + private void addOrRemoveOverlay() { + if (mDreamOverlayStateController.isPreviewMode()) { + mDreamOverlayStateController.removeComplication(mComplication); + } else if (mSmartSpaceController.isEnabled()) { mDreamOverlayStateController.addComplication(mComplication); } } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java index 0b80d8a87879..437e799106c5 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java @@ -27,6 +27,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Constraints; import com.android.systemui.R; +import com.android.systemui.touch.TouchInsetManager; import java.util.ArrayList; import java.util.Collections; @@ -52,6 +53,7 @@ public class ComplicationLayoutEngine { private static class ViewEntry implements Comparable<ViewEntry> { private final View mView; private final ComplicationLayoutParams mLayoutParams; + private final TouchInsetManager.TouchInsetSession mTouchInsetSession; private final Parent mParent; @Complication.Category private final int mCategory; @@ -61,7 +63,8 @@ public class ComplicationLayoutEngine { * Default constructor. {@link Parent} allows for the {@link ViewEntry}'s surrounding * view hierarchy to be accessed without traversing the entire view tree. */ - ViewEntry(View view, ComplicationLayoutParams layoutParams, int category, Parent parent, + ViewEntry(View view, ComplicationLayoutParams layoutParams, + TouchInsetManager.TouchInsetSession touchSession, int category, Parent parent, int margin) { mView = view; // Views that are generated programmatically do not have a unique id assigned to them @@ -70,9 +73,12 @@ public class ComplicationLayoutEngine { // {@link Complication.ViewHolder} should not reference the root container by id. mView.setId(View.generateViewId()); mLayoutParams = layoutParams; + mTouchInsetSession = touchSession; mCategory = category; mParent = parent; mMargin = margin; + + touchSession.addViewToTracking(mView); } /** @@ -217,6 +223,7 @@ public class ComplicationLayoutEngine { mParent.removeEntry(this); ((ViewGroup) mView.getParent()).removeView(mView); + mTouchInsetSession.removeViewFromTracking(mView); } @Override @@ -242,15 +249,18 @@ public class ComplicationLayoutEngine { */ private static class Builder { private final View mView; + private final TouchInsetManager.TouchInsetSession mTouchSession; private final ComplicationLayoutParams mLayoutParams; private final int mCategory; private Parent mParent; private int mMargin; - Builder(View view, ComplicationLayoutParams lp, @Complication.Category int category) { + Builder(View view, TouchInsetManager.TouchInsetSession touchSession, + ComplicationLayoutParams lp, @Complication.Category int category) { mView = view; mLayoutParams = lp; mCategory = category; + mTouchSession = touchSession; } /** @@ -291,7 +301,8 @@ public class ComplicationLayoutEngine { * Builds and returns the resulting {@link ViewEntry}. */ ViewEntry build() { - return new ViewEntry(mView, mLayoutParams, mCategory, mParent, mMargin); + return new ViewEntry(mView, mLayoutParams, mTouchSession, mCategory, mParent, + mMargin); } } @@ -442,13 +453,16 @@ public class ComplicationLayoutEngine { private final int mMargin; private final HashMap<ComplicationId, ViewEntry> mEntries = new HashMap<>(); private final HashMap<Integer, PositionGroup> mPositions = new HashMap<>(); + private final TouchInsetManager.TouchInsetSession mSession; /** */ @Inject public ComplicationLayoutEngine(@Named(SCOPED_COMPLICATIONS_LAYOUT) ConstraintLayout layout, - @Named(COMPLICATION_MARGIN) int margin) { + @Named(COMPLICATION_MARGIN) int margin, + TouchInsetManager.TouchInsetSession session) { mLayout = layout; mMargin = margin; + mSession = session; } /** @@ -468,7 +482,7 @@ public class ComplicationLayoutEngine { removeComplication(id); } - final ViewEntry.Builder entryBuilder = new ViewEntry.Builder(view, lp, category) + final ViewEntry.Builder entryBuilder = new ViewEntry.Builder(view, mSession, lp, category) .setMargin(mMargin); // Add position group if doesn't already exist diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamPreviewComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamPreviewComplication.java new file mode 100644 index 000000000000..23343b17232f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamPreviewComplication.java @@ -0,0 +1,130 @@ +/* + * 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.systemui.dreams.complication; + +import static com.android.systemui.dreams.complication.dagger.DreamPreviewComplicationComponent.DREAM_LABEL; +import static com.android.systemui.dreams.complication.dagger.DreamPreviewComplicationComponent.DreamPreviewComplicationModule.DREAM_PREVIEW_COMPLICATION_LAYOUT_PARAMS; +import static com.android.systemui.dreams.complication.dagger.DreamPreviewComplicationComponent.DreamPreviewComplicationModule.DREAM_PREVIEW_COMPLICATION_VIEW; + +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.android.systemui.dreams.complication.dagger.DreamPreviewComplicationComponent; +import com.android.systemui.util.ViewController; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * Preview complication shown when user is previewing a dream. + */ +public class DreamPreviewComplication implements Complication { + DreamPreviewComplicationComponent.Factory mComponentFactory; + @Nullable + private CharSequence mDreamLabel; + + /** + * Default constructor for {@link DreamPreviewComplication}. + */ + @Inject + public DreamPreviewComplication( + DreamPreviewComplicationComponent.Factory componentFactory) { + mComponentFactory = componentFactory; + } + + /** + * Create {@link DreamPreviewViewHolder}. + */ + @Override + public ViewHolder createView(ComplicationViewModel model) { + return mComponentFactory.create(model, mDreamLabel).getViewHolder(); + } + + /** + * Sets the user-facing label for the current dream. + */ + public void setDreamLabel(@Nullable CharSequence dreamLabel) { + mDreamLabel = dreamLabel; + } + + /** + * ViewHolder to contain value/logic associated with a Preview Complication View. + */ + public static class DreamPreviewViewHolder implements ViewHolder { + private final TextView mView; + private final ComplicationLayoutParams mLayoutParams; + private final DreamPreviewViewController mViewController; + + @Inject + DreamPreviewViewHolder(@Named(DREAM_PREVIEW_COMPLICATION_VIEW) TextView view, + DreamPreviewViewController controller, + @Named(DREAM_PREVIEW_COMPLICATION_LAYOUT_PARAMS) + ComplicationLayoutParams layoutParams, + @Named(DREAM_LABEL) @Nullable CharSequence dreamLabel) { + mView = view; + mLayoutParams = layoutParams; + mViewController = controller; + mViewController.init(); + + if (!TextUtils.isEmpty(dreamLabel)) { + mView.setText(dreamLabel); + } + } + + @Override + public View getView() { + return mView; + } + + @Override + public ComplicationLayoutParams getLayoutParams() { + return mLayoutParams; + } + + @Override + public int getCategory() { + return CATEGORY_SYSTEM; + } + } + + /** + * ViewController to contain value/logic associated with a Preview Complication View. + */ + static class DreamPreviewViewController extends ViewController<TextView> { + private final ComplicationViewModel mViewModel; + + @Inject + DreamPreviewViewController(@Named(DREAM_PREVIEW_COMPLICATION_VIEW) TextView view, + ComplicationViewModel viewModel) { + super(view); + mViewModel = viewModel; + } + + @Override + protected void onViewAttached() { + mView.setOnClickListener(v -> mViewModel.exitDream()); + } + + @Override + protected void onViewDetached() { + mView.setOnClickListener(null); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamPreviewComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamPreviewComplicationComponent.java new file mode 100644 index 000000000000..502e31ed0c7f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamPreviewComplicationComponent.java @@ -0,0 +1,117 @@ +/* + * 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.systemui.dreams.complication.dagger; + + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.android.internal.util.Preconditions; +import com.android.systemui.R; +import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.dreams.complication.ComplicationViewModel; +import com.android.systemui.dreams.complication.DreamPreviewComplication.DreamPreviewViewHolder; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Named; +import javax.inject.Scope; + +import dagger.BindsInstance; +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + +/** + * {@link DreamPreviewComplicationComponent} is responsible for generating dependencies + * surrounding the + * Preview {@link com.android.systemui.dreams.complication.Complication}, such as the layout + * details. + */ +@Subcomponent(modules = { + DreamPreviewComplicationComponent.DreamPreviewComplicationModule.class, +}) +@DreamPreviewComplicationComponent.DreamPreviewComplicationScope +public interface DreamPreviewComplicationComponent { + String DREAM_LABEL = "dream_label"; + + /** + * Creates {@link DreamPreviewViewHolder}. + */ + DreamPreviewViewHolder getViewHolder(); + + @Documented + @Retention(RUNTIME) + @Scope + @interface DreamPreviewComplicationScope { + } + + /** + * Generates {@link DreamPreviewComplicationComponent}. + */ + @Subcomponent.Factory + interface Factory { + DreamPreviewComplicationComponent create( + @BindsInstance ComplicationViewModel viewModel, + @Named(DREAM_LABEL) @BindsInstance @Nullable CharSequence dreamLabel); + } + + /** + * Scoped values for {@link DreamPreviewComplicationComponent}. + */ + @Module + interface DreamPreviewComplicationModule { + String DREAM_PREVIEW_COMPLICATION_VIEW = "preview_complication_view"; + String DREAM_PREVIEW_COMPLICATION_LAYOUT_PARAMS = "preview_complication_layout_params"; + // Order weight of insert into parent container + int INSERT_ORDER_WEIGHT = 1000; + + /** + * Provides the complication view. + */ + @Provides + @DreamPreviewComplicationScope + @Named(DREAM_PREVIEW_COMPLICATION_VIEW) + static TextView provideComplicationView(LayoutInflater layoutInflater) { + return Preconditions.checkNotNull((TextView) + layoutInflater.inflate(R.layout.dream_overlay_complication_preview, + null, false), + "R.layout.dream_overlay_complication_preview did not properly inflated"); + } + + /** + * Provides the layout parameters for the complication view. + */ + @Provides + @DreamPreviewComplicationScope + @Named(DREAM_PREVIEW_COMPLICATION_LAYOUT_PARAMS) + static ComplicationLayoutParams provideLayoutParams() { + return new ComplicationLayoutParams(0, + ViewGroup.LayoutParams.WRAP_CONTENT, + ComplicationLayoutParams.POSITION_TOP + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_DOWN, + INSERT_ORDER_WEIGHT, /* snapToGuide= */ true); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java index c61f7968c595..65f060b43c08 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java @@ -19,6 +19,7 @@ package com.android.systemui.dreams.dagger; import android.content.Context; import com.android.settingslib.dream.DreamBackend; +import com.android.systemui.dreams.complication.dagger.DreamPreviewComplicationComponent; import com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule; import com.android.systemui.dreams.touch.dagger.DreamTouchModule; @@ -34,6 +35,7 @@ import dagger.Provides; }, subcomponents = { DreamOverlayComponent.class, + DreamPreviewComplicationComponent.class, }) public interface DreamModule { /** @@ -43,4 +45,4 @@ public interface DreamModule { static DreamBackend providesDreamBackend(Context context) { return DreamBackend.getInstance(context); } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java index 839a05e6e78f..63676d629cb9 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java @@ -29,6 +29,9 @@ import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.DreamOverlayContainerView; import com.android.systemui.dreams.DreamOverlayStatusBarView; +import com.android.systemui.touch.TouchInsetManager; + +import java.util.concurrent.Executor; import javax.inject.Named; @@ -65,6 +68,21 @@ public abstract class DreamOverlayModule { /** */ @Provides + public static TouchInsetManager.TouchInsetSession providesTouchInsetSession( + TouchInsetManager manager) { + return manager.createSession(); + } + + /** */ + @Provides + @DreamOverlayComponent.DreamOverlayScope + public static TouchInsetManager providesTouchInsetManager(@Main Executor executor, + DreamOverlayContainerView view) { + return new TouchInsetManager(executor, view); + } + + /** */ + @Provides @DreamOverlayComponent.DreamOverlayScope public static DreamOverlayStatusBarView providesDreamOverlayStatusBarView( DreamOverlayContainerView view) { diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.kt b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.kt index 96a90dfc7fe9..9d6e3c295100 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.kt @@ -28,6 +28,9 @@ interface FeatureFlags : FlagListenable { /** Returns a boolean value for the given flag. */ fun isEnabled(flag: ResourceBooleanFlag): Boolean + /** Returns a boolean value for the given flag. */ + fun isEnabled(flag: SysPropBooleanFlag): Boolean + /** Returns a string value for the given flag. */ fun getString(flag: StringFlag): String diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java index df605990fa81..677990437f3d 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java +++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Map; import java.util.Objects; import java.util.TreeMap; +import java.util.function.Consumer; import java.util.function.Supplier; import javax.inject.Inject; @@ -69,6 +70,7 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { private final FlagManager mFlagManager; private final SecureSettings mSecureSettings; private final Resources mResources; + private final SystemPropertiesHelper mSystemProperties; private final Supplier<Map<Integer, Flag<?>>> mFlagsCollector; private final Map<Integer, Boolean> mBooleanFlagCache = new TreeMap<>(); private final Map<Integer, String> mStringFlagCache = new TreeMap<>(); @@ -79,6 +81,7 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { FlagManager flagManager, Context context, SecureSettings secureSettings, + SystemPropertiesHelper systemProperties, @Main Resources resources, DumpManager dumpManager, @Nullable Supplier<Map<Integer, Flag<?>>> flagsCollector, @@ -86,11 +89,12 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { mFlagManager = flagManager; mSecureSettings = secureSettings; mResources = resources; + mSystemProperties = systemProperties; mFlagsCollector = flagsCollector != null ? flagsCollector : Flags::collectFlags; IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_SET_FLAG); filter.addAction(ACTION_GET_FLAGS); - flagManager.setRestartAction(this::restartSystemUI); + flagManager.setOnSettingsChangedAction(this::restartSystemUI); flagManager.setClearCacheAction(this::removeFromCache); context.registerReceiver(mReceiver, filter, null, null, Context.RECEIVER_EXPORTED_UNAUDITED); @@ -121,6 +125,17 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { return mBooleanFlagCache.get(id); } + @Override + public boolean isEnabled(@NonNull SysPropBooleanFlag flag) { + int id = flag.getId(); + if (!mBooleanFlagCache.containsKey(id)) { + mBooleanFlagCache.put( + id, mSystemProperties.getBoolean(flag.getName(), flag.getDefault())); + } + + return mBooleanFlagCache.get(id); + } + @NonNull @Override public String getString(@NonNull StringFlag flag) { @@ -180,16 +195,28 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { mSecureSettings.putString(mFlagManager.idToSettingsKey(id), data); Log.i(TAG, "Set id " + id + " to " + value); removeFromCache(id); - mFlagManager.dispatchListenersAndMaybeRestart(id); + mFlagManager.dispatchListenersAndMaybeRestart(id, this::restartSystemUI); + } + + private <T> void eraseFlag(Flag<T> flag) { + if (flag instanceof SysPropFlag) { + mSystemProperties.erase(((SysPropFlag<T>) flag).getName()); + dispatchListenersAndMaybeRestart(flag.getId(), this::restartAndroid); + } else { + eraseFlag(flag.getId()); + } } /** Erase a flag's overridden value if there is one. */ - public void eraseFlag(int id) { + private void eraseFlag(int id) { eraseInternal(id); removeFromCache(id); - mFlagManager.dispatchListenersAndMaybeRestart(id); + dispatchListenersAndMaybeRestart(id, this::restartSystemUI); } + private void dispatchListenersAndMaybeRestart(int id, Consumer<Boolean> restartAction) { + mFlagManager.dispatchListenersAndMaybeRestart(id, restartAction); + } /** Works just like {@link #eraseFlag(int)} except that it doesn't restart SystemUI. */ private void eraseInternal(int id) { // We can't actually "erase" things from sysprops, but we can set them to empty! @@ -217,7 +244,11 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { System.exit(0); } - private void restartAndroid() { + private void restartAndroid(boolean requestSuppress) { + if (requestSuppress) { + Log.i(TAG, "Android Restart Suppressed"); + return; + } Log.i(TAG, "Restarting Android"); try { mBarService.restart(); @@ -273,7 +304,7 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { Flag<?> flag = flagMap.get(id); if (!extras.containsKey(EXTRA_VALUE)) { - eraseFlag(id); + eraseFlag(flag); return; } @@ -282,6 +313,10 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { setFlagValue(id, (Boolean) value, BooleanFlagSerializer.INSTANCE); } else if (flag instanceof ResourceBooleanFlag && value instanceof Boolean) { setFlagValue(id, (Boolean) value, BooleanFlagSerializer.INSTANCE); + } else if (flag instanceof SysPropBooleanFlag && value instanceof Boolean) { + // Store SysProp flags in SystemProperties where they can read by outside parties. + mSystemProperties.setBoolean( + ((SysPropBooleanFlag) flag).getName(), (Boolean) value); } else if (flag instanceof StringFlag && value instanceof String) { setFlagValue(id, (String) value, StringFlagSerializer.INSTANCE); } else if (flag instanceof ResourceStringFlag && value instanceof String) { @@ -306,6 +341,9 @@ public class FeatureFlagsDebug implements FeatureFlags, Dumpable { if (f instanceof ResourceBooleanFlag) { return new BooleanFlag(f.getId(), isEnabled((ResourceBooleanFlag) f)); } + if (f instanceof SysPropBooleanFlag) { + return new BooleanFlag(f.getId(), isEnabled((SysPropBooleanFlag) f)); + } // TODO: add support for other flag types. Log.w(TAG, "Unsupported Flag Type. Please file a bug."); diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java index 348a8e20122e..1fb1acfae1cb 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java +++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsRelease.java @@ -43,11 +43,17 @@ import javax.inject.Inject; @SysUISingleton public class FeatureFlagsRelease implements FeatureFlags, Dumpable { private final Resources mResources; + private final SystemPropertiesHelper mSystemProperties; SparseBooleanArray mBooleanCache = new SparseBooleanArray(); SparseArray<String> mStringCache = new SparseArray<>(); + @Inject - public FeatureFlagsRelease(@Main Resources resources, DumpManager dumpManager) { + public FeatureFlagsRelease( + @Main Resources resources, + SystemPropertiesHelper systemProperties, + DumpManager dumpManager) { mResources = resources; + mSystemProperties = systemProperties; dumpManager.registerDumpable("SysUIFlags", this); } @@ -72,6 +78,17 @@ public class FeatureFlagsRelease implements FeatureFlags, Dumpable { return mBooleanCache.valueAt(cacheIndex); } + @Override + public boolean isEnabled(SysPropBooleanFlag flag) { + int cacheIndex = mBooleanCache.indexOfKey(flag.getId()); + if (cacheIndex < 0) { + return isEnabled( + flag.getId(), mSystemProperties.getBoolean(flag.getName(), flag.getDefault())); + } + + return mBooleanCache.valueAt(cacheIndex); + } + private boolean isEnabled(int key, boolean defaultValue) { mBooleanCache.append(key, defaultValue); return defaultValue; diff --git a/packages/SystemUI/src/com/android/systemui/flags/SystemPropertiesHelper.kt b/packages/SystemUI/src/com/android/systemui/flags/SystemPropertiesHelper.kt index 1dc5a9f3adc5..6c160975587b 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/SystemPropertiesHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/SystemPropertiesHelper.kt @@ -34,6 +34,10 @@ open class SystemPropertiesHelper @Inject constructor() { return SystemProperties.getBoolean(name, default) } + fun setBoolean(name: String, value: Boolean) { + SystemProperties.set(name, if (value) "1" else "0") + } + fun set(name: String, value: String) { SystemProperties.set(name, value) } @@ -41,4 +45,8 @@ open class SystemPropertiesHelper @Inject constructor() { fun set(name: String, value: Int) { set(name, value.toString()) } + + fun erase(name: String) { + set(name, "") + } }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index eee39552bcc8..f4b6fbd0324f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -795,6 +795,9 @@ class MediaHierarchyManager @Inject constructor( @TransformationType fun calculateTransformationType(): Int { if (isTransitioningToFullShade) { + if (inSplitShade) { + return TRANSFORMATION_TYPE_TRANSITION + } return TRANSFORMATION_TYPE_FADE } if (previousLocation == LOCATION_LOCKSCREEN && desiredLocation == LOCATION_QS || @@ -961,6 +964,7 @@ class MediaHierarchyManager @Inject constructor( (qsExpansion > 0.0f || inSplitShade) && !onLockscreen -> LOCATION_QS qsExpansion > 0.4f && onLockscreen -> LOCATION_QS !hasActiveMedia -> LOCATION_QS + onLockscreen && isSplitShadeExpanding() -> LOCATION_QS onLockscreen && isTransformingToFullShadeAndInQQS() -> LOCATION_QQS onLockscreen && allowedOnLockscreen -> LOCATION_LOCKSCREEN else -> LOCATION_QQS @@ -986,6 +990,10 @@ class MediaHierarchyManager @Inject constructor( return location } + private fun isSplitShadeExpanding(): Boolean { + return inSplitShade && isTransitioningToFullShade + } + /** * Are we currently transforming to the full shade and already in QQS */ @@ -993,6 +1001,10 @@ class MediaHierarchyManager @Inject constructor( if (!isTransitioningToFullShade) { return false } + if (inSplitShade) { + // Split shade doesn't use QQS. + return false + } return fullShadeTransitionProgress > 0.5f } @@ -1000,6 +1012,10 @@ class MediaHierarchyManager @Inject constructor( * Is the current transformationType fading */ private fun isCurrentlyFading(): Boolean { + if (isSplitShadeExpanding()) { + // Split shade always uses transition instead of fade. + return false + } if (isTransitioningToFullShade) { return true } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java index 1f11d0c62bd7..c96aca37987b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -249,7 +249,7 @@ public abstract class MediaOutputBaseAdapter extends mSeekBar.setMin(0); final int currentVolume = device.getCurrentVolume(); if (mSeekBar.getProgress() != currentVolume) { - mSeekBar.setProgress(currentVolume); + mSeekBar.setProgress(currentVolume, true); } mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @Override @@ -278,7 +278,7 @@ public abstract class MediaOutputBaseAdapter extends mSeekBar.setMin(0); final int currentVolume = mController.getSessionVolume(); if (mSeekBar.getProgress() != currentVolume) { - mSeekBar.setProgress(currentVolume); + mSeekBar.setProgress(currentVolume, true); } mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @Override diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index e929b5e21053..f16ca7dd7361 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -92,7 +92,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { private final DialogLaunchAnimator mDialogLaunchAnimator; private final List<MediaDevice> mGroupMediaDevices = new CopyOnWriteArrayList<>(); private final boolean mAboveStatusbar; - private final boolean mVolumeAdjustmentForRemoteGroupSessions; private final CommonNotifCollection mNotifCollection; @VisibleForTesting final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>(); @@ -131,8 +130,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName); mUiEventLogger = uiEventLogger; mDialogLaunchAnimator = dialogLaunchAnimator; - mVolumeAdjustmentForRemoteGroupSessions = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions); mColorActiveItem = Utils.getColorStateListDefaultColor(mContext, R.color.media_dialog_active_item_main_content); mColorInactiveItem = Utils.getColorStateListDefaultColor(mContext, @@ -621,10 +618,15 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { || features.contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK)); } + private boolean isPlayBackInfoLocal() { + return mMediaController.getPlaybackInfo() != null + && mMediaController.getPlaybackInfo().getPlaybackType() + == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL; + } + boolean isVolumeControlEnabled(@NonNull MediaDevice device) { - // TODO(b/202500642): Also enable volume control for remote non-group sessions. - return !isActiveRemoteDevice(device) - || mVolumeAdjustmentForRemoteGroupSessions; + return isPlayBackInfoLocal() + || mLocalMediaManager.isMediaSessionAvailableForVolumeControl(); } private final MediaController.Callback mCb = new MediaController.Callback() { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index 8b39e5c24ded..38e21f285bdd 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -440,7 +440,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mHomeButtonLongPressDurationMs = Optional.of( properties.getLong(HOME_BUTTON_LONG_PRESS_DURATION_MS, 0) ).filter(duration -> duration != 0); - reconfigureHomeLongClick(); + if (mNavigationBarView != null) { + reconfigureHomeLongClick(); + } } } }; @@ -761,7 +763,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, | WindowManager.LayoutParams.FLAG_SLIPPERY, PixelFormat.TRANSLUCENT); mOrientationParams.setTitle("SecondaryHomeHandle" + mContext.getDisplayId()); - mOrientationParams.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION; + mOrientationParams.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION + | WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; mWindowManager.addView(mOrientationHandle, mOrientationParams); mOrientationHandle.setVisibility(View.GONE); mOrientationParams.setFitInsetsTypes(0 /* types*/); @@ -1588,7 +1591,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, } lp.token = new Binder(); lp.accessibilityTitle = mContext.getString(R.string.nav_bar); - lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC; + lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC + | WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; lp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; lp.windowAnimations = 0; lp.setTitle("NavigationBar" + mContext.getDisplayId()); diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java index 9ea27634df6a..371e4f454a39 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java @@ -936,6 +936,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker public void setBackAnimation(BackAnimation backAnimation) { mBackAnimation = backAnimation; + if (mEdgeBackPlugin != null && mEdgeBackPlugin instanceof NavigationBarEdgePanel) { + ((NavigationBarEdgePanel) mEdgeBackPlugin).setBackAnimation(backAnimation); + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java index a6bad15e0865..a6919e826d4f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java @@ -280,7 +280,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl } }; private BackCallback mBackCallback; - private final BackAnimation mBackAnimation; + private BackAnimation mBackAnimation; public NavigationBarEdgePanel(Context context, BackAnimation backAnimation) { @@ -385,6 +385,10 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl mShowProtection = !isPrimaryDisplay; } + public void setBackAnimation(BackAnimation backAnimation) { + mBackAnimation = backAnimation; + } + @Override public void onDestroy() { cancelFailsafe(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt index a262b8ad2e28..217210a5dafc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt @@ -165,6 +165,7 @@ internal class FooterActionsController @Inject constructor( powerMenuLite.visibility = View.GONE } settingsButton.setOnClickListener(onClickListener) + multiUserSetting.isListening = true if (featureFlags.isEnabled(Flags.NEW_FOOTER)) { val securityFooter = securityFooterController.view as DualHeightHorizontalLinearLayout securityFootersContainer?.addView(securityFooter) @@ -215,6 +216,7 @@ internal class FooterActionsController @Inject constructor( override fun onViewDetached() { setListening(false) + multiUserSetting.isListening = false } fun setListening(listening: Boolean) { @@ -222,7 +224,6 @@ internal class FooterActionsController @Inject constructor( return } this.listening = listening - multiUserSetting.isListening = listening if (this.listening) { userInfoController.addCallback(onUserInfoChangedListener) updateView() diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 3c7933f0d218..3ef72202a591 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -513,7 +513,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca mContainer.setExpansion(expansion); final float translationScaleY = (mInSplitShade ? 1 : QSAnimator.SHORT_PARALLAX_AMOUNT) * (expansion - 1); - boolean onKeyguardAndExpanded = isKeyguardState() && !mShowCollapsedOnKeyguard; + boolean onKeyguard = isKeyguardState(); + boolean onKeyguardAndExpanded = onKeyguard && !mShowCollapsedOnKeyguard; if (!mHeaderAnimating && !headerWillBeAnimating()) { getView().setTranslationY( onKeyguardAndExpanded @@ -547,6 +548,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca mHeader.updateResources(); } } + mQSPanelController.setIsOnKeyguard(onKeyguard); mFooter.setExpansion(onKeyguardAndExpanded ? 1 : expansion); mQSFooterActionController.setExpansion(onKeyguardAndExpanded ? 1 : expansion); mQSPanelController.setRevealExpansion(expansion); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 5126fcb4c34d..b04d75273831 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -110,6 +110,8 @@ public class QSPanel extends LinearLayout implements Tunable { private final ArrayMap<View, Integer> mChildrenLayoutTop = new ArrayMap<>(); private final Rect mClippingRect = new Rect(); private boolean mUseNewFooter = false; + private ViewGroup mMediaHostView; + private boolean mShouldMoveMediaOnExpansion = true; public QSPanel(Context context, AttributeSet attrs) { super(context, attrs); @@ -289,9 +291,15 @@ public class QSPanel extends LinearLayout implements Tunable { for (int i = 0; i < getChildCount(); i++) { View child = getChildAt(i); if (move) { + int topOffset; + if (child == mMediaHostView && !mShouldMoveMediaOnExpansion) { + topOffset = 0; + } else { + topOffset = tileHeightOffset; + } int top = Objects.requireNonNull(mChildrenLayoutTop.get(child)); - child.setLeftTopRightBottom(child.getLeft(), top + tileHeightOffset, - child.getRight(), top + tileHeightOffset + child.getHeight()); + child.setLeftTopRightBottom(child.getLeft(), top + topOffset, + child.getRight(), top + topOffset + child.getHeight()); } if (child == mTileLayout) { move = true; @@ -463,6 +471,7 @@ public class QSPanel extends LinearLayout implements Tunable { if (!mUsingMediaPlayer) { return; } + mMediaHostView = hostView; ViewGroup newParent = horizontal ? mHorizontalLinearLayout : this; ViewGroup currentParent = (ViewGroup) hostView.getParent(); if (currentParent != newParent) { @@ -656,6 +665,19 @@ public class QSPanel extends LinearLayout implements Tunable { updatePadding(); } + /** + * Sets whether the media container should move during the expansion of the QS Panel. + * + * As the QS Panel expands and the QS unsquish, the views below the QS tiles move to adapt to + * the new height of the QS tiles. + * + * In some cases this might not be wanted for media. One example is when there is a transition + * animation of the media container happening on split shade lock screen. + */ + public void setShouldMoveMediaOnExpansion(boolean shouldMoveMediaOnExpansion) { + mShouldMoveMediaOnExpansion = shouldMoveMediaOnExpansion; + } + private class H extends Handler { private static final int ANNOUNCE_FOR_ACCESSIBILITY = 1; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java index 3172aa9592dd..6572daa91269 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java @@ -419,6 +419,16 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr return mView.getBrightnessView(); } + /** Sets whether we are currently on lock screen. */ + public void setIsOnKeyguard(boolean isOnKeyguard) { + boolean isOnSplitShadeLockscreen = mShouldUseSplitNotificationShade && isOnKeyguard; + // When the split shade is expanding on lockscreen, the media container transitions from the + // lockscreen to QS. + // We have to prevent the media container position from moving during the transition to have + // a smooth translation animation without stuttering. + mView.setShouldMoveMediaOnExpansion(!isOnSplitShadeLockscreen); + } + /** */ public static final class TileRecord { public TileRecord(QSTile tile, com.android.systemui.plugins.qs.QSTileView tileView) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java index 131589f33fee..999818ff943f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java @@ -116,7 +116,8 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy private String mTileSpec; @Nullable - private EnforcedAdmin mEnforcedAdmin; + @VisibleForTesting + protected EnforcedAdmin mEnforcedAdmin; private boolean mShowingDetail; private int mIsFullQs; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index c61c18a2a029..f736231bc22b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; +import android.os.UserManager; import android.provider.Settings; import android.service.quicksettings.Tile; import android.text.TextUtils; @@ -114,6 +115,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { @Override protected void handleUpdateState(BooleanState state, Object arg) { + checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_BLUETOOTH); final boolean transientEnabling = arg == ARG_SHOW_TRANSIENT_ENABLING; final boolean enabled = transientEnabling || mController.isBluetoothEnabled(); final boolean connected = mController.isBluetoothConnected(); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index 4a9a1f1f055d..6d729b92e7b8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -403,12 +403,24 @@ public class ScreenshotView extends FrameLayout implements } @Override - public void onDismiss() { + public void onSwipeDismissInitiated(Animator anim) { if (DEBUG_DISMISS) { Log.d(ScreenshotView.TAG, "dismiss triggered via swipe gesture"); } mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SWIPE_DISMISSED, 0, mPackageName); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + super.onAnimationStart(animation); + mBackgroundProtection.animate() + .alpha(0).setDuration(anim.getDuration()).start(); + } + }); + } + + @Override + public void onDismissComplete() { mCallbacks.onDismiss(); } }); @@ -995,6 +1007,7 @@ public class ScreenshotView extends FrameLayout implements mSmartChips.clear(); mQuickShareChip = null; setAlpha(1); + mScreenshotStatic.setAlpha(1); mScreenshotSelectorView.stop(); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java b/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java index 451fb1311ebb..24b1249c3f98 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java @@ -49,9 +49,14 @@ public class SwipeDismissHandler implements View.OnTouchListener { void onInteraction(); /** + * Run when the view is dismissed (the distance threshold is met), pre-dismissal animation + */ + void onSwipeDismissInitiated(Animator animator); + + /** * Run when the view is dismissed (the distance threshold is met), post-dismissal animation */ - void onDismiss(); + void onDismissComplete(); } private final View mView; @@ -89,7 +94,9 @@ public class SwipeDismissHandler implements View.OnTouchListener { return true; } if (isPastDismissThreshold()) { - dismiss(); + ValueAnimator dismissAnimator = createSwipeDismissAnimation(1); + mCallbacks.onSwipeDismissInitiated(dismissAnimator); + dismiss(dismissAnimator); } else { // if we've moved, but not past the threshold, start the return animation if (DEBUG_DISMISS) { @@ -117,7 +124,10 @@ public class SwipeDismissHandler implements View.OnTouchListener { float velocityY) { if (mView.getTranslationX() * velocityX > 0 && (mDismissAnimation == null || !mDismissAnimation.isRunning())) { - dismiss(velocityX / (float) 1000); + ValueAnimator dismissAnimator = + createSwipeDismissAnimation(velocityX / (float) 1000); + mCallbacks.onSwipeDismissInitiated(dismissAnimator); + dismiss(dismissAnimator); return true; } return false; @@ -160,11 +170,11 @@ public class SwipeDismissHandler implements View.OnTouchListener { * Start dismissal animation (will run onDismiss callback when animation complete) */ public void dismiss() { - dismiss(1); + dismiss(createSwipeDismissAnimation(1)); } - private void dismiss(float velocity) { - mDismissAnimation = createSwipeDismissAnimation(velocity); + private void dismiss(ValueAnimator animator) { + mDismissAnimation = animator; mDismissAnimation.addListener(new AnimatorListenerAdapter() { private boolean mCancelled; @@ -178,7 +188,7 @@ public class SwipeDismissHandler implements View.OnTouchListener { public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); if (!mCancelled) { - mCallbacks.onDismiss(); + mCallbacks.onDismissComplete(); } } }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index 8366bddaab9f..8a9d6ddb2e14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -342,9 +342,7 @@ class LockscreenShadeTransitionController @Inject constructor( qS.setTransitionToFullShadeAmount(field, qSDragProgress) notificationPanelController.setTransitionToFullShadeAmount(field, false /* animate */, 0 /* delay */) - // TODO: appear media also in split shade - val mediaAmount = if (useSplitShade) 0f else field - mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount) + mediaHierarchyManager.setTransitionToFullShadeAmount(field) transitionToShadeAmountCommon(field) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java index b141110a2ec2..8b25c2bc20b9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java @@ -16,9 +16,14 @@ package com.android.systemui.statusbar.phone; +import android.content.ContentResolver; +import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import android.database.ContentObserver; import android.hardware.display.AmbientDisplayConfiguration; +import android.net.Uri; +import android.os.Handler; import android.os.PowerManager; import android.os.SystemProperties; import android.os.UserHandle; @@ -34,6 +39,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.doze.AlwaysOnDisplayPolicy; import com.android.systemui.doze.DozeScreenState; @@ -86,6 +92,7 @@ public class DozeParameters implements private boolean mDozeAlwaysOn; private boolean mControlScreenOffAnimation; + private boolean mIsQuickPickupEnabled; private boolean mKeyguardShowing; @VisibleForTesting @@ -101,10 +108,17 @@ public class DozeParameters implements public void onShadeExpandedChanged(boolean expanded) { updateControlScreenOff(); } + + @Override + public void onUserSwitchComplete(int newUserId) { + updateQuickPickupEnabled(); + } }; @Inject protected DozeParameters( + Context context, + @Background Handler handler, @Main Resources resources, AmbientDisplayConfiguration ambientDisplayConfiguration, AlwaysOnDisplayPolicy alwaysOnDisplayPolicy, @@ -146,6 +160,14 @@ public class DozeParameters implements if (mFoldAodAnimationController != null) { mFoldAodAnimationController.addCallback(this); } + + SettingsObserver quickPickupSettingsObserver = new SettingsObserver(context, handler); + quickPickupSettingsObserver.observe(); + } + + private void updateQuickPickupEnabled() { + mIsQuickPickupEnabled = + mAmbientDisplayConfiguration.quickPickupSensorEnabled(UserHandle.USER_CURRENT); } public boolean getDisplayStateSupported() { @@ -239,8 +261,11 @@ public class DozeParameters implements return mDozeAlwaysOn && !mBatteryController.isAodPowerSave(); } + /** + * Whether the quick pickup gesture is supported and enabled for the device. + */ public boolean isQuickPickupEnabled() { - return mAmbientDisplayConfiguration.quickPickupSensorEnabled(UserHandle.USER_CURRENT); + return mIsQuickPickupEnabled; } /** @@ -436,6 +461,7 @@ public class DozeParameters implements pw.print("getPickupVibrationThreshold(): "); pw.println(getPickupVibrationThreshold()); pw.print("getSelectivelyRegisterSensorsUsingProx(): "); pw.println(getSelectivelyRegisterSensorsUsingProx()); + pw.print("isQuickPickupEnabled(): "); pw.println(isQuickPickupEnabled()); } private boolean getPostureSpecificBool( @@ -458,4 +484,44 @@ public class DozeParameters implements */ void onAlwaysOnChange(); } + + private final class SettingsObserver extends ContentObserver { + private final Uri mQuickPickupGesture = + Settings.Secure.getUriFor(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE); + private final Uri mPickupGesture = + Settings.Secure.getUriFor(Settings.Secure.DOZE_PICK_UP_GESTURE); + private final Uri mAlwaysOnEnabled = + Settings.Secure.getUriFor(Settings.Secure.DOZE_ALWAYS_ON); + private final Context mContext; + + SettingsObserver(Context context, Handler handler) { + super(handler); + mContext = context; + } + + void observe() { + ContentResolver resolver = mContext.getContentResolver(); + resolver.registerContentObserver(mQuickPickupGesture, false, this, + UserHandle.USER_ALL); + resolver.registerContentObserver(mPickupGesture, false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(mAlwaysOnEnabled, false, this, UserHandle.USER_ALL); + update(null); + } + + @Override + public void onChange(boolean selfChange, Uri uri) { + update(uri); + } + + public void update(Uri uri) { + if (uri == null + || mQuickPickupGesture.equals(uri) + || mPickupGesture.equals(uri) + || mAlwaysOnEnabled.equals(uri)) { + // the quick pickup gesture is dependent on alwaysOn being disabled and + // the pickup gesture being enabled + updateQuickPickupEnabled(); + } + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java index 9f9e7d9a276e..5caf4f604fcd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java @@ -26,6 +26,7 @@ import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENAB import android.app.IActivityManager; import android.content.Context; import android.content.pm.ActivityInfo; +import android.content.res.Configuration; import android.graphics.PixelFormat; import android.graphics.Region; import android.os.Binder; @@ -117,6 +118,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW * @see #batchApplyWindowLayoutParams(Runnable) */ private int mDeferWindowLayoutParams; + private boolean mLastKeyguardRotationAllowed; @Inject public NotificationShadeWindowControllerImpl(Context context, WindowManager windowManager, @@ -143,7 +145,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW mScreenOffAnimationController = screenOffAnimationController; dumpManager.registerDumpable(getClass().getName(), this); mAuthController = authController; - + mLastKeyguardRotationAllowed = mKeyguardStateController.isKeyguardScreenRotationAllowed(); mLockScreenDisplayTimeout = context.getResources() .getInteger(R.integer.config_lockScreenDisplayTimeout); ((SysuiStatusBarStateController) statusBarStateController) @@ -779,6 +781,17 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW setKeyguardDark(useDarkText); } + @Override + public void onConfigChanged(Configuration newConfig) { + final boolean newScreenRotationAllowed = mKeyguardStateController + .isKeyguardScreenRotationAllowed(); + + if (mLastKeyguardRotationAllowed != newScreenRotationAllowed) { + apply(mCurrentState); + mLastKeyguardRotationAllowed = newScreenRotationAllowed; + } + } + /** * When keyguard will be dismissed but didn't start animation yet. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java index 72237b1ca6c6..53ef97dc317c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java @@ -27,7 +27,6 @@ import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.StatusBarState; -import com.android.wm.shell.bubbles.Bubbles; import java.util.ArrayList; import java.util.Optional; @@ -50,7 +49,6 @@ public class ShadeControllerImpl implements ShadeController { private final int mDisplayId; protected final Lazy<Optional<StatusBar>> mStatusBarOptionalLazy; private final Lazy<AssistManager> mAssistManagerLazy; - private final Optional<Bubbles> mBubblesOptional; private final ArrayList<Runnable> mPostCollapseRunnables = new ArrayList<>(); @@ -62,8 +60,7 @@ public class ShadeControllerImpl implements ShadeController { StatusBarKeyguardViewManager statusBarKeyguardViewManager, WindowManager windowManager, Lazy<Optional<StatusBar>> statusBarOptionalLazy, - Lazy<AssistManager> assistManagerLazy, - Optional<Bubbles> bubblesOptional + Lazy<AssistManager> assistManagerLazy ) { mCommandQueue = commandQueue; mStatusBarStateController = statusBarStateController; @@ -73,7 +70,6 @@ public class ShadeControllerImpl implements ShadeController { // TODO: Remove circular reference to StatusBar when possible. mStatusBarOptionalLazy = statusBarOptionalLazy; mAssistManagerLazy = assistManagerLazy; - mBubblesOptional = bubblesOptional; } @Override @@ -131,8 +127,6 @@ public class ShadeControllerImpl implements ShadeController { getStatusBar().getNotificationShadeWindowViewController().cancelExpandHelper(); getNotificationPanelViewController() .collapsePanel(true /* animate */, delayed, speedUpFactor); - } else if (mBubblesOptional.isPresent()) { - mBubblesOptional.get().collapseStack(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 82e0e6726437..cffdc290c041 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -270,6 +270,7 @@ public class StatusBar extends CoreStartable implements protected static final int MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU = 1027; // Should match the values in PhoneWindowManager + public static final String SYSTEM_DIALOG_REASON_KEY = "reason"; public static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps"; public static final String SYSTEM_DIALOG_REASON_DREAM = "dream"; static public final String SYSTEM_DIALOG_REASON_SCREENSHOT = "screenshot"; @@ -2661,15 +2662,12 @@ public class StatusBar extends CoreStartable implements Trace.beginSection("StatusBar#onReceive"); if (DEBUG) Log.v(TAG, "onReceive: " + intent); String action = intent.getAction(); + String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY); if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) { KeyboardShortcuts.dismiss(); mRemoteInputManager.closeRemoteInputs(); - if (mBubblesOptional.isPresent() && mBubblesOptional.get().isStackExpanded()) { - mBubblesOptional.get().collapseStack(); - } if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) { int flags = CommandQueue.FLAG_EXCLUDE_NONE; - String reason = intent.getStringExtra("reason"); if (reason != null) { if (reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) { flags |= CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL; @@ -2684,19 +2682,13 @@ public class StatusBar extends CoreStartable implements } mShadeController.animateCollapsePanels(flags); } - } - else if (Intent.ACTION_SCREEN_OFF.equals(action)) { + } else if (Intent.ACTION_SCREEN_OFF.equals(action)) { if (mNotificationShadeWindowController != null) { mNotificationShadeWindowController.setNotTouchable(false); } - if (mBubblesOptional.isPresent() && mBubblesOptional.get().isStackExpanded()) { - // Post to main thread, since updating the UI. - mMainExecutor.execute(() -> mBubblesOptional.get().collapseStack()); - } finishBarAnimations(); resetUserExpandedStates(); - } - else if (DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG.equals(action)) { + } else if (DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG.equals(action)) { mQSPanelController.showDeviceMonitoringDialog(); } Trace.endSection(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 11d9c311fb6c..a96ba56be58d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -1077,7 +1077,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb && mBiometricUnlockController.getMode() == MODE_WAKE_AND_UNLOCK_PULSING; boolean keyguardShowing = mShowing && !mOccluded; boolean hideWhileDozing = mDozing && !isWakeAndUnlockPulsing; - boolean keyguardWithGestureNav = (keyguardShowing && !mDozing || mPulsing && !mIsDocked) + boolean keyguardWithGestureNav = (keyguardShowing && !mDozing && !mScreenOffAnimationPlaying + || mPulsing && !mIsDocked) && mGesturalNav; return (!keyguardShowing && !hideWhileDozing && !mScreenOffAnimationPlaying || mBouncer.isShowing() || mRemoteInputActive || keyguardWithGestureNav @@ -1091,7 +1092,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb boolean keyguardShowing = mLastShowing && !mLastOccluded; boolean hideWhileDozing = mLastDozing && mLastBiometricMode != MODE_WAKE_AND_UNLOCK_PULSING; boolean keyguardWithGestureNav = (keyguardShowing && !mLastDozing - || mLastPulsing && !mLastIsDocked) && mLastGesturalNav; + && !mLastScreenOffAnimationPlaying || mLastPulsing && !mLastIsDocked) + && mLastGesturalNav; return (!keyguardShowing && !hideWhileDozing && !mLastScreenOffAnimationPlaying || mLastBouncerShowing || mLastRemoteInputActive || keyguardWithGestureNav || mLastGlobalActionsVisible); diff --git a/packages/SystemUI/src/com/android/systemui/touch/TouchInsetManager.java b/packages/SystemUI/src/com/android/systemui/touch/TouchInsetManager.java new file mode 100644 index 000000000000..de4e1e2f5886 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/touch/TouchInsetManager.java @@ -0,0 +1,181 @@ +/* + * 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.systemui.touch; + +import android.graphics.Rect; +import android.graphics.Region; +import android.view.View; +import android.view.ViewRootImpl; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.concurrent.Executor; + +/** + * {@link TouchInsetManager} handles setting the touchable inset regions for a given View. This + * is useful for passing through touch events for all but select areas. + */ +public class TouchInsetManager { + /** + * {@link TouchInsetSession} provides an individualized session with the + * {@link TouchInsetManager}, linking any action to the client. + */ + public static class TouchInsetSession { + private final TouchInsetManager mManager; + + private final HashSet<View> mTrackedViews; + private final Executor mExecutor; + + private final View.OnLayoutChangeListener mOnLayoutChangeListener = + (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) + -> updateTouchRegion(); + + /** + * Default constructor + * @param manager The parent {@link TouchInsetManager} which will be affected by actions on + * this session. + * @param rootView The parent of views that will be tracked. + * @param executor An executor for marshalling operations. + */ + TouchInsetSession(TouchInsetManager manager, Executor executor) { + mManager = manager; + mTrackedViews = new HashSet<>(); + mExecutor = executor; + } + + /** + * Adds a descendant of the root view to be tracked. + * @param view {@link View} to be tracked. + */ + public void addViewToTracking(View view) { + mExecutor.execute(() -> { + mTrackedViews.add(view); + view.addOnLayoutChangeListener(mOnLayoutChangeListener); + updateTouchRegion(); + }); + } + + /** + * Removes a view from further tracking + * @param view {@link View} to be removed. + */ + public void removeViewFromTracking(View view) { + mExecutor.execute(() -> { + mTrackedViews.remove(view); + view.removeOnLayoutChangeListener(mOnLayoutChangeListener); + updateTouchRegion(); + }); + } + + private void updateTouchRegion() { + final Region cumulativeRegion = Region.obtain(); + + mTrackedViews.stream().forEach(view -> { + final Rect boundaries = new Rect(); + view.getBoundsOnScreen(boundaries); + cumulativeRegion.op(boundaries, Region.Op.UNION); + }); + + mManager.setTouchRegion(this, cumulativeRegion); + + cumulativeRegion.recycle(); + } + + /** + * Removes all tracked views and updates insets accordingly. + */ + public void clear() { + mExecutor.execute(() -> { + mManager.clearRegion(this); + mTrackedViews.clear(); + }); + } + } + + private final HashMap<TouchInsetSession, Region> mDefinedRegions = new HashMap<>(); + private final Executor mExecutor; + private final View mRootView; + + private final View.OnAttachStateChangeListener mAttachListener = + new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) { + updateTouchInset(); + } + + @Override + public void onViewDetachedFromWindow(View v) { + } + }; + + /** + * Default constructor. + * @param executor An {@link Executor} to marshal all operations on. + * @param rootView The root {@link View} for all views in sessions. + */ + public TouchInsetManager(Executor executor, View rootView) { + mExecutor = executor; + mRootView = rootView; + mRootView.addOnAttachStateChangeListener(mAttachListener); + + } + + /** + * Creates a new associated session. + */ + public TouchInsetSession createSession() { + return new TouchInsetSession(this, mExecutor); + } + + private void updateTouchInset() { + final ViewRootImpl viewRootImpl = mRootView.getViewRootImpl(); + + if (viewRootImpl == null) { + return; + } + + final Region aggregateRegion = Region.obtain(); + + for (Region region : mDefinedRegions.values()) { + aggregateRegion.op(region, Region.Op.UNION); + } + + viewRootImpl.setTouchableRegion(aggregateRegion); + + aggregateRegion.recycle(); + } + + protected void setTouchRegion(TouchInsetSession session, Region region) { + final Region introducedRegion = Region.obtain(region); + mExecutor.execute(() -> { + mDefinedRegions.put(session, introducedRegion); + updateTouchInset(); + }); + } + + private void clearRegion(TouchInsetSession session) { + mExecutor.execute(() -> { + final Region storedRegion = mDefinedRegions.remove(session); + + if (storedRegion != null) { + storedRegion.recycle(); + } + + updateTouchInset(); + }); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/CaptionsToggleImageButton.java b/packages/SystemUI/src/com/android/systemui/volume/CaptionsToggleImageButton.java index 1862ed3a4de8..ae23ca64e31e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/CaptionsToggleImageButton.java +++ b/packages/SystemUI/src/com/android/systemui/volume/CaptionsToggleImageButton.java @@ -28,14 +28,11 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.Accessibilit import com.android.keyguard.AlphaOptimizedImageButton; import com.android.systemui.R; -/** Toggle button in Volume Dialog that allows extra state for when streams are opted-out */ +/** Toggle button in Volume Dialog for controlling system captions state */ public class CaptionsToggleImageButton extends AlphaOptimizedImageButton { - private static final int[] OPTED_OUT_STATE = new int[] { R.attr.optedOut }; - private ConfirmedTapListener mConfirmedTapListener; private boolean mCaptionsEnabled = false; - private boolean mOptedOut = false; private GestureDetector mGestureDetector; private GestureDetector.SimpleOnGestureListener mGestureListener = @@ -60,11 +57,7 @@ public class CaptionsToggleImageButton extends AlphaOptimizedImageButton { @Override public int[] onCreateDrawableState(int extraSpace) { - int[] state = super.onCreateDrawableState(extraSpace + 1); - if (mOptedOut) { - mergeDrawableStates(state, OPTED_OUT_STATE); - } - return state; + return super.onCreateDrawableState(extraSpace + 1); } Runnable setCaptionsEnabled(boolean areCaptionsEnabled) { @@ -95,16 +88,6 @@ public class CaptionsToggleImageButton extends AlphaOptimizedImageButton { return this.mCaptionsEnabled; } - /** Sets whether or not the current stream has opted out of captions */ - void setOptedOut(boolean isOptedOut) { - this.mOptedOut = isOptedOut; - refreshDrawableState(); - } - - boolean getOptedOut() { - return this.mOptedOut; - } - void setOnConfirmedTapListener(ConfirmedTapListener listener, Handler handler) { mConfirmedTapListener = listener; diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index 57c7f11b752d..97e03a68205c 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -54,6 +54,7 @@ import android.util.ArrayMap; import android.util.Log; import android.util.Slog; import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.CaptioningManager; import androidx.lifecycle.Observer; @@ -130,6 +131,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa private final Receiver mReceiver = new Receiver(); private final RingerModeObservers mRingerModeObservers; private final MediaSessions mMediaSessions; + private final CaptioningManager mCaptioningManager; protected C mCallbacks = new C(); private final State mState = new State(); protected final MediaSessionsCallbacks mMediaSessionsCallbacksW; @@ -175,7 +177,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa IAudioService iAudioService, AccessibilityManager accessibilityManager, PackageManager packageManager, - WakefulnessLifecycle wakefulnessLifecycle) { + WakefulnessLifecycle wakefulnessLifecycle, + CaptioningManager captioningManager) { mContext = context.getApplicationContext(); mPackageManager = packageManager; mWakefulnessLifecycle = wakefulnessLifecycle; @@ -200,6 +203,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa mVibrator = vibrator; mHasVibrator = mVibrator.hasVibrator(); mAudioService = iAudioService; + mCaptioningManager = captioningManager; boolean accessibilityVolumeStreamActive = accessibilityManager .isAccessibilityVolumeStreamActive(); @@ -307,20 +311,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa } public boolean areCaptionsEnabled() { - int currentValue = Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.ODI_CAPTIONS_ENABLED, 0, UserHandle.USER_CURRENT); - return currentValue == 1; + return mCaptioningManager.isSystemAudioCaptioningEnabled(); } public void setCaptionsEnabled(boolean isEnabled) { - Settings.Secure.putIntForUser(mContext.getContentResolver(), - Settings.Secure.ODI_CAPTIONS_ENABLED, isEnabled ? 1 : 0, UserHandle.USER_CURRENT); - } - - @Override - public boolean isCaptionStreamOptedOut() { - // TODO(b/129768185): Removing secure setting, to be replaced by sound event listener - return false; + mCaptioningManager.setSystemAudioCaptioningEnabled(isEnabled); } public void getCaptionsComponentState(boolean fromTooltip) { @@ -423,6 +418,13 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa } private void onGetCaptionsComponentStateW(boolean fromTooltip) { + if (mCaptioningManager.isSystemAudioCaptioningUiEnabled()) { + mCallbacks.onCaptionComponentStateChanged(true, fromTooltip); + return; + } + + // TODO(b/220968335): Remove this check once system captions component migrates + // to new CaptioningManager APIs. try { String componentNameString = mContext.getString( com.android.internal.R.string.config_defaultSystemCaptionsService); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 58f74a0d2a02..bfdcbd6deb48 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -1180,11 +1180,6 @@ public class VolumeDialogImpl implements VolumeDialog, if (mODICaptionsIcon.getCaptionsEnabled() != captionsEnabled) { mHandler.post(mODICaptionsIcon.setCaptionsEnabled(captionsEnabled)); } - - boolean isOptedOut = mController.isCaptionStreamOptedOut(); - if (mODICaptionsIcon.getOptedOut() != isOptedOut) { - mHandler.post(() -> mODICaptionsIcon.setOptedOut(isOptedOut)); - } } private void onCaptionIconClicked() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorHwcLayerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorHwcLayerTest.kt new file mode 100644 index 000000000000..95aa08dff379 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorHwcLayerTest.kt @@ -0,0 +1,182 @@ +/* + * 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.systemui + +import android.graphics.Insets +import android.graphics.PixelFormat +import android.graphics.Rect +import android.graphics.RectF +import android.hardware.graphics.common.DisplayDecorationSupport +import android.testing.AndroidTestingRunner +import android.view.Display +import android.view.DisplayCutout +import android.view.DisplayInfo +import android.view.View +import androidx.test.filters.SmallTest +import com.android.internal.R +import com.android.systemui.util.mockito.eq +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.MockitoAnnotations +import org.mockito.Mockito.`when` as whenever + +@RunWith(AndroidTestingRunner::class) +@SmallTest +class ScreenDecorHwcLayerTest : SysuiTestCase() { + + @Mock private lateinit var mockDisplay: Display + @Mock private lateinit var mockRootView: View + + private val displayWidth = 100 + private val displayHeight = 200 + private val cutoutSize = 10 + private val roundedSizeTop = 15 + private val roundedSizeBottom = 20 + + private lateinit var decorHwcLayer: ScreenDecorHwcLayer + private val cutoutTop: DisplayCutout = DisplayCutout.Builder() + .setSafeInsets(Insets.of(0, cutoutSize, 0, 0)) + .setBoundingRectTop(Rect(1, 0, 2, cutoutSize)) + .build() + + private val cutoutRight: DisplayCutout = DisplayCutout.Builder() + .setSafeInsets(Insets.of(0, 0, cutoutSize, 0)) + .setBoundingRectRight(Rect(displayWidth - cutoutSize, 50, displayWidth, 52)) + .build() + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + mContext.orCreateTestableResources.addOverride( + R.array.config_displayUniqueIdArray, arrayOf<String>()) + mContext.orCreateTestableResources.addOverride( + R.bool.config_fillMainBuiltInDisplayCutout, true) + + val decorationSupport = DisplayDecorationSupport() + decorationSupport.format = PixelFormat.R_8 + decorHwcLayer = Mockito.spy(ScreenDecorHwcLayer(mContext, decorationSupport)) + whenever(decorHwcLayer.width).thenReturn(displayWidth) + whenever(decorHwcLayer.height).thenReturn(displayHeight) + whenever(decorHwcLayer.display).thenReturn(mockDisplay) + whenever(decorHwcLayer.rootView).thenReturn(mockRootView) + whenever(mockRootView.left).thenReturn(0) + whenever(mockRootView.top).thenReturn(0) + whenever(mockRootView.right).thenReturn(displayWidth) + whenever(mockRootView.bottom).thenReturn(displayHeight) + } + + @Test + fun testTransparentRegion_noCutout_noRoundedCorner_noProtection() { + setupConfigs(null, 0, 0, RectF(), 0f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, 0, decorHwcLayer.width, decorHwcLayer.height)) + } + + @Test + fun testTransparentRegion_onlyShortEdgeCutout() { + setupConfigs(cutoutTop, 0, 0, RectF(), 0f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, cutoutSize, decorHwcLayer.width, decorHwcLayer.height)) + } + + @Test + fun testTransparentRegion_onlyLongEdgeCutout() { + setupConfigs(cutoutRight, 0, 0, RectF(), 0f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, 0, decorHwcLayer.width - cutoutSize, decorHwcLayer.height)) + } + + @Test + fun testTransparentRegion_onlyRoundedCorners() { + setupConfigs(null, roundedSizeTop, roundedSizeBottom, RectF(), 0f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, roundedSizeTop, decorHwcLayer.width, + decorHwcLayer.height - roundedSizeBottom)) + } + + @Test + fun testTransparentRegion_onlyCutoutProtection() { + setupConfigs(null, 0, 0, RectF(48f, 1f, 52f, 5f), 0.5f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, 4, decorHwcLayer.width, decorHwcLayer.height)) + + decorHwcLayer.cameraProtectionProgress = 1f + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, 5, decorHwcLayer.width, decorHwcLayer.height)) + } + + @Test + fun testTransparentRegion_hasShortEdgeCutout_hasRoundedCorner_hasCutoutProtection() { + setupConfigs(cutoutTop, roundedSizeTop, roundedSizeBottom, RectF(48f, 1f, 52f, 5f), 1f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(0, 15, decorHwcLayer.width, decorHwcLayer.height - 20)) + } + + @Test + fun testTransparentRegion_hasLongEdgeCutout_hasRoundedCorner_hasCutoutProtection() { + setupConfigs(cutoutRight, roundedSizeTop, roundedSizeBottom, RectF(48f, 1f, 52f, 5f), 1f) + + decorHwcLayer.calculateTransparentRect() + + assertThat(decorHwcLayer.transparentRect) + .isEqualTo(Rect(20, 5, decorHwcLayer.width - 20, decorHwcLayer.height)) + } + + private fun setupConfigs( + cutout: DisplayCutout?, + roundedTop: Int, + roundedBottom: Int, + protectionRect: RectF, + protectionProgress: Float + ) { + whenever(mockDisplay.getDisplayInfo(eq(decorHwcLayer.displayInfo)) + ).then { + val info = it.getArgument<DisplayInfo>(0) + info.displayCutout = cutout + return@then true + } + decorHwcLayer.updateRoundedCornerSize(roundedTop, roundedBottom) + decorHwcLayer.protectionRect.set(protectionRect) + decorHwcLayer.cameraProtectionProgress = protectionProgress + decorHwcLayer.updateCutout() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/chooser/ChooserHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/chooser/ChooserHelperTest.java deleted file mode 100644 index ecfb9ee4950e..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/chooser/ChooserHelperTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2016 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.chooser; - -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.Activity; -import android.app.ActivityTaskManager; -import android.content.Intent; -import android.os.Binder; -import android.test.suitebuilder.annotation.SmallTest; - -import androidx.test.runner.AndroidJUnit4; - -import com.android.systemui.SysuiTestCase; - -import org.junit.Test; -import org.junit.runner.RunWith; - -@SmallTest -@RunWith(AndroidJUnit4.class) -public class ChooserHelperTest extends SysuiTestCase { - - @Test - public void testOnChoose_CallsStartActivityAsCallerWithToken() { - final Intent intent = new Intent(); - final Binder token = new Binder(); - intent.putExtra(ActivityTaskManager.EXTRA_PERMISSION_TOKEN, token); - - final Activity mockActivity = mock(Activity.class); - when(mockActivity.getIntent()).thenReturn(intent); - - ChooserHelper.onChoose(mockActivity); - verify(mockActivity, times(1)).startActivityAsCaller( - any(), any(), eq(token), anyBoolean(), anyInt()); - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt index 9908d44507cd..da25c6202b21 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/ControlActionCoordinatorImplTest.kt @@ -16,15 +16,22 @@ package com.android.systemui.controls.ui +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.provider.Settings +import android.test.suitebuilder.annotation.SmallTest import android.testing.AndroidTestingRunner -import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.controls.ControlsMetricsLogger import com.android.systemui.plugins.ActivityStarter import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.concurrency.DelayableExecutor +import com.android.systemui.util.mockito.any +import com.android.systemui.util.settings.SecureSettings import com.android.wm.shell.TaskViewFactory +import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -44,7 +51,6 @@ import java.util.Optional @SmallTest @RunWith(AndroidTestingRunner::class) class ControlActionCoordinatorImplTest : SysuiTestCase() { - @Mock private lateinit var vibratorHelper: VibratorHelper @Mock @@ -61,6 +67,10 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { private lateinit var cvh: ControlViewHolder @Mock private lateinit var metricsLogger: ControlsMetricsLogger + @Mock + private lateinit var secureSettings: SecureSettings + @Mock + private lateinit var mainHandler: Handler companion object { fun <T> any(): T = Mockito.any<T>() @@ -75,16 +85,24 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) + `when`(secureSettings.getUriFor(Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS)) + .thenReturn(Settings.Secure + .getUriFor(Settings.Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS)) + coordinator = spy(ControlActionCoordinatorImpl( - mContext, - bgExecutor, - uiExecutor, - activityStarter, - keyguardStateController, - taskViewFactory, - metricsLogger, - vibratorHelper - )) + mContext, + bgExecutor, + uiExecutor, + activityStarter, + keyguardStateController, + taskViewFactory, + metricsLogger, + vibratorHelper, + secureSettings, + mainHandler)) + + verify(secureSettings).registerContentObserver(any(Uri::class.java), + anyBoolean(), any(ContentObserver::class.java)) `when`(cvh.cws.ci.controlId).thenReturn(ID) `when`(cvh.cws.control?.isAuthRequired()).thenReturn(true) @@ -126,10 +144,23 @@ class ControlActionCoordinatorImplTest : SysuiTestCase() { fun testToggleRunsWhenLockedAndAuthNotRequired() { `when`(keyguardStateController.isShowing()).thenReturn(true) `when`(keyguardStateController.isUnlocked()).thenReturn(false) - `when`(cvh.cws.control?.isAuthRequired()).thenReturn(false) + doReturn(false).`when`(coordinator).isAuthRequired( + any(), anyBoolean()) coordinator.toggle(cvh, "", true) + verify(coordinator).bouncerOrRun(action, false /* authRequired */) verify(action).invoke() } + + @Test + fun testIsAuthRequired() { + `when`(cvh.cws.control?.isAuthRequired).thenReturn(true) + assertThat(coordinator.isAuthRequired(cvh, false)).isTrue() + + `when`(cvh.cws.control?.isAuthRequired).thenReturn(false) + assertThat(coordinator.isAuthRequired(cvh, false)).isTrue() + + assertThat(coordinator.isAuthRequired(cvh, true)).isFalse() + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java index badafa4cf5e5..f4b378e6c19c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java @@ -27,6 +27,7 @@ import static com.android.systemui.doze.DozeMachine.State.DOZE_REQUEST_PULSE; import static com.android.systemui.doze.DozeMachine.State.FINISH; import static com.android.systemui.doze.DozeMachine.State.INITIALIZED; import static com.android.systemui.doze.DozeMachine.State.UNINITIALIZED; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotSame; @@ -468,37 +469,39 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { public void transitionToDoze_shouldClampBrightness_afterTimeout_clampsToDim() { when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn( PowerManager.GO_TO_SLEEP_REASON_TIMEOUT); - when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true); when(mDozeParameters.shouldClampToDimBrightness()).thenReturn(true); mScreen.transitionTo(UNINITIALIZED, INITIALIZED); - mScreen.transitionTo(INITIALIZED, DOZE); // If we're dozing after a timeout, and playing the unlocked screen animation, we should // stay at or below dim brightness, because the screen dims just before timeout. assertTrue(mServiceFake.screenBrightness <= DIM_BRIGHTNESS); + + // Once we transition to Doze, use the doze brightness + mScreen.transitionTo(INITIALIZED, DOZE); + assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS); } @Test public void transitionToDoze_shouldClampBrightness_notAfterTimeout_doesNotClampToDim() { when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn( PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON); - when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true); when(mDozeParameters.shouldClampToDimBrightness()).thenReturn(true); mScreen.transitionTo(UNINITIALIZED, INITIALIZED); - mScreen.transitionTo(INITIALIZED, DOZE); // If we're playing the unlocked screen off animation after a power button press, we should // leave the brightness alone. assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS); + + mScreen.transitionTo(INITIALIZED, DOZE); + assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS); } @Test public void transitionToDoze_noClampBrightness_afterTimeout_noScreenOff_doesNotClampToDim() { when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn( PowerManager.GO_TO_SLEEP_REASON_TIMEOUT); - when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false); when(mDozeParameters.shouldClampToDimBrightness()).thenReturn(false); mScreen.transitionTo(UNINITIALIZED, INITIALIZED); @@ -514,11 +517,9 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { PowerManager.GO_TO_SLEEP_REASON_TIMEOUT); when(mWakefulnessLifecycle.getWakefulness()).thenReturn( WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP); - when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false); when(mDozeParameters.shouldClampToDimBrightness()).thenReturn(false); mScreen.transitionTo(UNINITIALIZED, INITIALIZED); - mScreen.transitionTo(INITIALIZED, DOZE); assertTrue(mServiceFake.screenBrightness <= DIM_BRIGHTNESS); } @@ -529,7 +530,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON); when(mWakefulnessLifecycle.getWakefulness()).thenReturn( WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP); - when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false); when(mDozeParameters.shouldClampToDimBrightness()).thenReturn(false); mScreen.transitionTo(UNINITIALIZED, INITIALIZED); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index 7af039b7fa06..8ce10b808f32 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -17,7 +17,6 @@ package com.android.systemui.dreams; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.eq; @@ -118,31 +117,6 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { } @Test - public void testOnViewAttachedRegistersComputeInsetsListener() { - mController.onViewAttached(); - verify(mViewTreeObserver).addOnComputeInternalInsetsListener(any()); - } - - @Test - public void testOnViewDetachedUnregistersComputeInsetsListener() { - mController.onViewDetached(); - verify(mViewTreeObserver).removeOnComputeInternalInsetsListener(any()); - } - - @Test - public void testComputeInsetsListenerReturnsRegion() { - final ArgumentCaptor<ViewTreeObserver.OnComputeInternalInsetsListener> - computeInsetsListenerCapture = - ArgumentCaptor.forClass(ViewTreeObserver.OnComputeInternalInsetsListener.class); - mController.onViewAttached(); - verify(mViewTreeObserver).addOnComputeInternalInsetsListener( - computeInsetsListenerCapture.capture()); - final ViewTreeObserver.InternalInsetsInfo info = new ViewTreeObserver.InternalInsetsInfo(); - computeInsetsListenerCapture.getValue().onComputeInternalInsets(info); - assertNotNull(info.touchableRegion); - } - - @Test public void testBurnInProtectionStartsWhenContentViewAttached() { mController.onViewAttached(); verify(mHandler).postDelayed(any(Runnable.class), eq(BURN_IN_PROTECTION_UPDATE_INTERVAL)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index 58ffbfa76328..21768edd40e9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -38,6 +38,7 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.complication.DreamPreviewComplication; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.util.concurrency.FakeExecutor; @@ -95,6 +96,9 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Mock DreamOverlayStateController mStateController; + @Mock + DreamPreviewComplication mPreviewComplication; + DreamOverlayService mService; @Before @@ -119,7 +123,8 @@ public class DreamOverlayServiceTest extends SysuiTestCase { mService = new DreamOverlayService(mContext, mMainExecutor, mDreamOverlayComponentFactory, mStateController, - mKeyguardUpdateMonitor); + mKeyguardUpdateMonitor, + mPreviewComplication); } @Test @@ -163,6 +168,31 @@ public class DreamOverlayServiceTest extends SysuiTestCase { } @Test + public void testPreviewModeFalseByDefault() { + mService.onBind(new Intent()); + + assertThat(mService.isPreviewMode()).isFalse(); + } + + @Test + public void testPreviewModeSetByIntentExtra() { + final Intent intent = new Intent(); + intent.putExtra(DreamService.EXTRA_IS_PREVIEW, true); + mService.onBind(intent); + + assertThat(mService.isPreviewMode()).isTrue(); + } + + @Test + public void testDreamLabel() { + final Intent intent = new Intent(); + intent.putExtra(DreamService.EXTRA_DREAM_LABEL, "TestDream"); + mService.onBind(intent); + + assertThat(mService.getDreamLabel()).isEqualTo("TestDream"); + } + + @Test public void testDestroy() { mService.onDestroy(); mMainExecutor.runAllReady(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index 515a1ac814a9..49da4bd5a825 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -61,7 +61,7 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { } @Test - public void testStateChange() { + public void testStateChange_overlayActive() { final DreamOverlayStateController stateController = new DreamOverlayStateController( mExecutor); stateController.addCallback(mCallback); @@ -83,6 +83,38 @@ public class DreamOverlayStateControllerTest extends SysuiTestCase { } @Test + public void testStateChange_isPreviewMode() { + final DreamOverlayStateController stateController = new DreamOverlayStateController( + mExecutor); + stateController.addCallback(mCallback); + stateController.setPreviewMode(true); + mExecutor.runAllReady(); + + verify(mCallback).onStateChanged(); + assertThat(stateController.isPreviewMode()).isTrue(); + + Mockito.clearInvocations(mCallback); + stateController.setPreviewMode(true); + mExecutor.runAllReady(); + verify(mCallback, never()).onStateChanged(); + } + + @Test + public void testPreviewModeFalseByDefault() { + final DreamOverlayStateController stateController = new DreamOverlayStateController( + mExecutor); + assertThat(stateController.isPreviewMode()).isFalse(); + } + + @Test + public void testPreviewModeSetToTrue() { + final DreamOverlayStateController stateController = new DreamOverlayStateController( + mExecutor); + stateController.setPreviewMode(true); + assertThat(stateController.isPreviewMode()).isTrue(); + } + + @Test public void testCallback() { final DreamOverlayStateController stateController = new DreamOverlayStateController( mExecutor); diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java index 658702929d7b..ad8d44d62a5c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java @@ -29,6 +29,7 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.touch.TouchInsetManager; import org.junit.Before; import org.junit.Test; @@ -49,13 +50,16 @@ public class DreamOverlayStatusBarViewControllerTest extends SysuiTestCase { NetworkCapabilities mNetworkCapabilities; @Mock Network mNetwork; + @Mock + TouchInsetManager.TouchInsetSession mTouchSession; DreamOverlayStatusBarViewController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); - mController = new DreamOverlayStatusBarViewController(mView, mConnectivityManager); + mController = new DreamOverlayStatusBarViewController(mView, mConnectivityManager, + mTouchSession); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java index 64b267d6e142..51dcf2ec18f4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java @@ -29,6 +29,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.touch.TouchInsetManager; import org.junit.Before; import org.junit.Test; @@ -46,6 +47,9 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { @Mock ConstraintLayout mLayout; + @Mock + TouchInsetManager.TouchInsetSession mTouchSession; + @Before public void setup() { MockitoAnnotations.initMocks(this); @@ -112,7 +116,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { Complication.CATEGORY_STANDARD, mLayout); - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, 0); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, 0, mTouchSession); addComplication(engine, firstViewInfo); // Ensure the view is added to the top end corner @@ -139,7 +144,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { Complication.CATEGORY_STANDARD, mLayout); - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, 0); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, 0, mTouchSession); addComplication(engine, firstViewInfo); // Ensure the view is added to the top end corner @@ -155,7 +161,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { */ @Test public void testDirectionLayout() { - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, 0); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, 0, mTouchSession); final ViewInfo firstViewInfo = new ViewInfo( new ComplicationLayoutParams( @@ -203,7 +210,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { */ @Test public void testPositionLayout() { - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, 0); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, 0, mTouchSession); final ViewInfo firstViewInfo = new ViewInfo( new ComplicationLayoutParams( @@ -290,7 +298,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { @Test public void testMargin() { final int margin = 5; - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, margin); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, margin, mTouchSession); final ViewInfo firstViewInfo = new ViewInfo( new ComplicationLayoutParams( @@ -364,7 +373,8 @@ public class ComplicationLayoutEngineTest extends SysuiTestCase { */ @Test public void testRemoval() { - final ComplicationLayoutEngine engine = new ComplicationLayoutEngine(mLayout, 0); + final ComplicationLayoutEngine engine = + new ComplicationLayoutEngine(mLayout, 0, mTouchSession); final ViewInfo firstViewInfo = new ViewInfo( new ComplicationLayoutParams( diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt index 4cc5673eaf97..23a5b2b2c5b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsDebugTest.kt @@ -20,7 +20,7 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager.NameNotFoundException import android.content.res.Resources -import androidx.test.filters.SmallTest +import android.test.suitebuilder.annotation.SmallTest import com.android.internal.statusbar.IStatusBarService import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager @@ -35,6 +35,8 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.mockito.Mock +import org.mockito.Mockito.anyBoolean +import org.mockito.Mockito.anyString import org.mockito.Mockito.inOrder import org.mockito.Mockito.times import org.mockito.Mockito.verify @@ -57,6 +59,7 @@ class FeatureFlagsDebugTest : SysuiTestCase() { @Mock private lateinit var mFlagManager: FlagManager @Mock private lateinit var mMockContext: Context @Mock private lateinit var mSecureSettings: SecureSettings + @Mock private lateinit var mSystemProperties: SystemPropertiesHelper @Mock private lateinit var mResources: Resources @Mock private lateinit var mDumpManager: DumpManager @Mock private lateinit var mBarService: IStatusBarService @@ -71,12 +74,13 @@ class FeatureFlagsDebugTest : SysuiTestCase() { mFlagManager, mMockContext, mSecureSettings, + mSystemProperties, mResources, mDumpManager, { mFlagMap }, mBarService ) - verify(mFlagManager).restartAction = any() + verify(mFlagManager).onSettingsChangedAction = any() mBroadcastReceiver = withArgCaptor { verify(mMockContext).registerReceiver(capture(), any(), nullable(), nullable(), any()) @@ -123,6 +127,22 @@ class FeatureFlagsDebugTest : SysuiTestCase() { } @Test + fun testReadSysPropBooleanFlag() { + whenever(mSystemProperties.getBoolean(anyString(), anyBoolean())).thenAnswer { + if ("b".equals(it.getArgument<String?>(0))) { + return@thenAnswer true + } + return@thenAnswer it.getArgument(1) + } + + assertThat(mFeatureFlagsDebug.isEnabled(SysPropBooleanFlag(1, "a"))).isFalse() + assertThat(mFeatureFlagsDebug.isEnabled(SysPropBooleanFlag(2, "b"))).isTrue() + assertThat(mFeatureFlagsDebug.isEnabled(SysPropBooleanFlag(3, "c", true))).isTrue() + assertThat(mFeatureFlagsDebug.isEnabled(SysPropBooleanFlag(4, "d", false))).isFalse() + assertThat(mFeatureFlagsDebug.isEnabled(SysPropBooleanFlag(5, "e"))).isFalse() + } + + @Test fun testReadStringFlag() { whenever(mFlagManager.readFlagValue<String>(eq(3), any())).thenReturn("foo") whenever(mFlagManager.readFlagValue<String>(eq(4), any())).thenReturn("bar") @@ -259,7 +279,7 @@ class FeatureFlagsDebugTest : SysuiTestCase() { verify(mFlagManager, times(numReads)).readFlagValue(eq(id), any<FlagSerializer<*>>()) verify(mFlagManager).idToSettingsKey(eq(id)) verify(mSecureSettings).putString(eq("key-$id"), eq(data)) - verify(mFlagManager).dispatchListenersAndMaybeRestart(eq(id)) + verify(mFlagManager).dispatchListenersAndMaybeRestart(eq(id), any()) }.verifyNoMoreInteractions() verifyNoMoreInteractions(mFlagManager, mSecureSettings) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt index b5e6602594eb..ad304c49bd41 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FeatureFlagsReleaseTest.kt @@ -17,7 +17,7 @@ package com.android.systemui.flags import android.content.pm.PackageManager.NameNotFoundException import android.content.res.Resources -import androidx.test.filters.SmallTest +import android.test.suitebuilder.annotation.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager import com.android.systemui.util.mockito.any @@ -44,12 +44,13 @@ class FeatureFlagsReleaseTest : SysuiTestCase() { private lateinit var mFeatureFlagsRelease: FeatureFlagsRelease @Mock private lateinit var mResources: Resources + @Mock private lateinit var mSystemProperties: SystemPropertiesHelper @Mock private lateinit var mDumpManager: DumpManager @Before fun setup() { MockitoAnnotations.initMocks(this) - mFeatureFlagsRelease = FeatureFlagsRelease(mResources, mDumpManager) + mFeatureFlagsRelease = FeatureFlagsRelease(mResources, mSystemProperties, mDumpManager) } @After @@ -87,6 +88,17 @@ class FeatureFlagsReleaseTest : SysuiTestCase() { } @Test + fun testSysPropBooleanFlag() { + val flagId = 213 + val flagName = "sys_prop_flag" + val flagDefault = true + + val flag = SysPropBooleanFlag(flagId, flagName, flagDefault) + whenever(mSystemProperties.getBoolean(flagName, flagDefault)).thenReturn(flagDefault) + assertThat(mFeatureFlagsRelease.isEnabled(flag)).isEqualTo(flagDefault) + } + + @Test fun testDump() { val flag1 = BooleanFlag(1, true) val flag2 = ResourceBooleanFlag(2, 1002) diff --git a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt index 644bd2147611..a2eca81b04ed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/flags/FlagManagerTest.kt @@ -19,7 +19,7 @@ import android.content.Context import android.database.ContentObserver import android.net.Uri import android.os.Handler -import androidx.test.filters.SmallTest +import android.test.suitebuilder.annotation.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq @@ -130,14 +130,14 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(BooleanFlag(1, true), listener1) mFlagManager.addListener(BooleanFlag(10, true), listener10) - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, null) val flagEvent1 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener1).onFlagChanged(capture()) } assertThat(flagEvent1.flagId).isEqualTo(1) verifyNoMoreInteractions(listener1, listener10) - mFlagManager.dispatchListenersAndMaybeRestart(10) + mFlagManager.dispatchListenersAndMaybeRestart(10, null) val flagEvent10 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener10).onFlagChanged(capture()) } @@ -151,14 +151,14 @@ class FlagManagerTest : SysuiTestCase() { mFlagManager.addListener(BooleanFlag(1, true), listener) mFlagManager.addListener(BooleanFlag(10, true), listener) - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, null) val flagEvent1 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener).onFlagChanged(capture()) } assertThat(flagEvent1.flagId).isEqualTo(1) verifyNoMoreInteractions(listener) - mFlagManager.dispatchListenersAndMaybeRestart(10) + mFlagManager.dispatchListenersAndMaybeRestart(10, null) val flagEvent10 = withArgCaptor<FlagListenable.FlagEvent> { verify(listener, times(2)).onFlagChanged(capture()) } @@ -169,8 +169,7 @@ class FlagManagerTest : SysuiTestCase() { @Test fun testRestartWithNoListeners() { val restartAction = mock<Consumer<Boolean>>() - mFlagManager.restartAction = restartAction - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } @@ -178,11 +177,10 @@ class FlagManagerTest : SysuiTestCase() { @Test fun testListenerCanSuppressRestart() { val restartAction = mock<Consumer<Boolean>>() - mFlagManager.restartAction = restartAction mFlagManager.addListener(BooleanFlag(1, true)) { event -> event.requestNoRestart() } - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) verify(restartAction).accept(eq(true)) verifyNoMoreInteractions(restartAction) } @@ -190,11 +188,10 @@ class FlagManagerTest : SysuiTestCase() { @Test fun testListenerOnlySuppressesRestartForOwnFlag() { val restartAction = mock<Consumer<Boolean>>() - mFlagManager.restartAction = restartAction mFlagManager.addListener(BooleanFlag(10, true)) { event -> event.requestNoRestart() } - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } @@ -202,14 +199,13 @@ class FlagManagerTest : SysuiTestCase() { @Test fun testRestartWhenNotAllListenersRequestSuppress() { val restartAction = mock<Consumer<Boolean>>() - mFlagManager.restartAction = restartAction mFlagManager.addListener(BooleanFlag(10, true)) { event -> event.requestNoRestart() } mFlagManager.addListener(BooleanFlag(10, true)) { // do not request } - mFlagManager.dispatchListenersAndMaybeRestart(1) + mFlagManager.dispatchListenersAndMaybeRestart(1, restartAction) verify(restartAction).accept(eq(false)) verifyNoMoreInteractions(restartAction) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt index e606be179cc6..b359ae5317b1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt @@ -33,10 +33,11 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.statusbar.phone.KeyguardBypassController -import com.android.systemui.statusbar.policy.ConfigurationController +import com.android.systemui.statusbar.policy.FakeConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.animation.UniqueObjectHostView -import junit.framework.Assert +import com.android.systemui.util.mockito.any +import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertNotNull import org.junit.Before import org.junit.Rule @@ -44,16 +45,16 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers +import org.mockito.ArgumentMatchers.anyBoolean +import org.mockito.ArgumentMatchers.anyLong import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.`when` -import org.mockito.Mockito.any -import org.mockito.Mockito.anyBoolean -import org.mockito.Mockito.anyLong import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit +import org.mockito.Mockito.`when` as whenever @SmallTest @RunWith(AndroidTestingRunner::class) @@ -83,8 +84,6 @@ class MediaHierarchyManagerTest : SysuiTestCase() { @Mock private lateinit var keyguardViewController: KeyguardViewController @Mock - private lateinit var configurationController: ConfigurationController - @Mock private lateinit var uniqueObjectHostView: UniqueObjectHostView @Mock private lateinit var dreamOverlayStateController: DreamOverlayStateController @@ -97,6 +96,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { val mockito = MockitoJUnit.rule() private lateinit var mediaHiearchyManager: MediaHierarchyManager private lateinit var mediaFrame: ViewGroup + private val configurationController = FakeConfigurationController() @Before fun setup() { @@ -176,12 +176,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { @Test fun testGoingToFullShade() { - // Let's set it onto Lock screen - `when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) - `when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn( - true) - statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD) - clearInvocations(mediaCarouselController) + goToLockscreen() // Let's transition all the way to full shade mediaHiearchyManager.setTransitionToFullShadeAmount(100000f) @@ -204,41 +199,48 @@ class MediaHierarchyManagerTest : SysuiTestCase() { // Let's make sure alpha is set mediaHiearchyManager.setTransitionToFullShadeAmount(2.0f) - Assert.assertTrue("alpha should not be 1.0f when cross fading", mediaFrame.alpha != 1.0f) + assertThat(mediaFrame.alpha).isNotEqualTo(1.0f) } @Test fun testTransformationOnLockScreenIsFading() { - // Let's set it onto Lock screen - `when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) - `when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn( - true) - statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD) - clearInvocations(mediaCarouselController) + goToLockscreen() + expandQS() + + val transformType = mediaHiearchyManager.calculateTransformationType() + assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE) + } + + @Test + fun calculateTransformationType_onLockShade_inSplitShade_goingToFullShade_returnsTransition() { + enableSplitShade() + goToLockscreen() + expandQS() + mediaHiearchyManager.setTransitionToFullShadeAmount(10000f) + + val transformType = mediaHiearchyManager.calculateTransformationType() + assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_TRANSITION) + } + + @Test + fun calculateTransformationType_onLockShade_inSplitShade_notExpanding_returnsFade() { + enableSplitShade() + goToLockscreen() + goToLockedShade() + expandQS() + mediaHiearchyManager.setTransitionToFullShadeAmount(0f) - // Let's transition from lockscreen to qs - mediaHiearchyManager.qsExpansion = 1.0f val transformType = mediaHiearchyManager.calculateTransformationType() - Assert.assertTrue("media isn't transforming to qs with a fade", - transformType == MediaHierarchyManager.TRANSFORMATION_TYPE_FADE) + assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE) } @Test fun testTransformationOnLockScreenToQQSisFading() { - // Let's set it onto Lock screen - `when`(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) - `when`(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn( - true) - statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD) - clearInvocations(mediaCarouselController) + goToLockscreen() + goToLockedShade() - // Let's transition from lockscreen to qs - `when`(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED) - statusBarCallback.value.onStatePreChange(StatusBarState.KEYGUARD, - StatusBarState.SHADE_LOCKED) val transformType = mediaHiearchyManager.calculateTransformationType() - Assert.assertTrue("media isn't transforming to qqswith a fade", - transformType == MediaHierarchyManager.TRANSFORMATION_TYPE_FADE) + assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE) } @Test @@ -254,4 +256,32 @@ class MediaHierarchyManagerTest : SysuiTestCase() { verify(mediaCarouselController).closeGuts() } -}
\ No newline at end of file + + private fun enableSplitShade() { + context.getOrCreateTestableResources().addOverride( + R.bool.config_use_split_notification_shade, true + ) + configurationController.notifyConfigurationChanged() + } + + private fun goToLockscreen() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) + whenever(notificationLockscreenUserManager.shouldShowLockscreenNotifications()).thenReturn( + true + ) + statusBarCallback.value.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD) + clearInvocations(mediaCarouselController) + } + + private fun goToLockedShade() { + whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED) + statusBarCallback.value.onStatePreChange( + StatusBarState.KEYGUARD, + StatusBarState.SHADE_LOCKED + ) + } + + private fun expandQS() { + mediaHiearchyManager.qsExpansion = 1.0f + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt index 8ce50a680e50..f736f26e5c46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt @@ -100,7 +100,9 @@ class FooterActionsControllerTest : LeakCheckedTest() { @After fun tearDown() { - ViewUtils.detachView(view) + if (view.isAttachedToWindow) { + ViewUtils.detachView(view) + } } @Test @@ -139,8 +141,7 @@ class FooterActionsControllerTest : LeakCheckedTest() { @Test fun testMultiUserSwitchUpdatedWhenSettingChanged() { - // When expanded, listening is true - controller.setListening(true) + // Always listening to setting while View is attached testableLooper.processAllMessages() val multiUserSwitch = view.requireViewById<View>(R.id.multi_user_switch) @@ -156,4 +157,24 @@ class FooterActionsControllerTest : LeakCheckedTest() { assertThat(multiUserSwitch.visibility).isEqualTo(View.VISIBLE) } + + @Test + fun testMultiUserSettingNotListenedAfterDetach() { + testableLooper.processAllMessages() + + val multiUserSwitch = view.requireViewById<View>(R.id.multi_user_switch) + assertThat(multiUserSwitch.visibility).isNotEqualTo(View.VISIBLE) + + ViewUtils.detachView(view) + + // The setting is only used as an indicator for whether the view should refresh. The actual + // value of the setting is ignored; isMultiUserEnabled is the source of truth + whenever(multiUserSwitchController.isMultiUserEnabled).thenReturn(true) + + // Changing the value of USER_SWITCHER_ENABLED should cause the view to update + fakeSettings.putIntForUser(Settings.Global.USER_SWITCHER_ENABLED, 1, userTracker.userId) + testableLooper.processAllMessages() + + assertThat(multiUserSwitch.visibility).isNotEqualTo(View.VISIBLE) + } }
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java index ea4d7cc2529c..c5bc68d6bd7b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java @@ -45,6 +45,7 @@ import android.content.Intent; import android.metrics.LogMaker; import android.os.Handler; import android.os.Looper; +import android.provider.Settings; import android.service.quicksettings.Tile; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -58,6 +59,7 @@ import com.android.internal.logging.InstanceId; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.testing.UiEventLoggerFake; +import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.systemui.SysuiTestCase; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.plugins.ActivityStarter; @@ -101,6 +103,7 @@ public class QSTileImplTest extends SysuiTestCase { private StatusBarStateController mStatusBarStateController; @Mock private ActivityStarter mActivityStarter; + private UiEventLoggerFake mUiEventLoggerFake; private InstanceId mInstanceId = InstanceId.fakeInstanceId(5); @@ -113,7 +116,7 @@ public class QSTileImplTest extends SysuiTestCase { mTestableLooper = TestableLooper.get(this); mUiEventLoggerFake = new UiEventLoggerFake(); when(mHost.indexOf(SPEC)).thenReturn(POSITION); - when(mHost.getContext()).thenReturn(mContext.getBaseContext()); + when(mHost.getContext()).thenReturn(mContext); when(mHost.getUiEventLogger()).thenReturn(mUiEventLoggerFake); when(mHost.getNewInstanceId()).thenReturn(mInstanceId); @@ -342,6 +345,22 @@ public class QSTileImplTest extends SysuiTestCase { mTestableLooper.processAllMessages(); } + @Test + public void testClickOnDisabledByPolicyDoesntClickLaunchesIntent() { + String restriction = "RESTRICTION"; + mTile.getState().disabledByPolicy = true; + EnforcedAdmin admin = EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(restriction); + mTile.setEnforcedAdmin(admin); + + mTile.click(null); + mTestableLooper.processAllMessages(); + assertFalse(mTile.mClicked); + + ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class); + verify(mActivityStarter).postStartActivityDismissingKeyguard(captor.capture(), anyInt()); + assertEquals(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS, captor.getValue().getAction()); + } + private void assertEvent(UiEventLogger.UiEventEnum eventType, UiEventLoggerFake.FakeUiEvent fakeEvent) { assertEquals(eventType.getId(), fakeEvent.eventId); @@ -400,6 +419,10 @@ public class QSTileImplTest extends SysuiTestCase { getState().state = Tile.STATE_ACTIVE; } + public void setEnforcedAdmin(EnforcedAdmin admin) { + mEnforcedAdmin = admin; + } + @Override public BooleanState newTileState() { return new BooleanState(); @@ -412,7 +435,6 @@ public class QSTileImplTest extends SysuiTestCase { @Override protected void handleUpdateState(BooleanState state, Object arg) { - } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt new file mode 100644 index 000000000000..cc472481ad8a --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt @@ -0,0 +1,117 @@ +package com.android.systemui.qs.tiles + +import android.content.Context +import android.os.Handler +import android.os.Looper +import android.os.UserManager +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import android.testing.TestableLooper.RunWithLooper +import androidx.test.filters.SmallTest +import com.android.internal.logging.MetricsLogger +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingManagerFake +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.plugins.qs.QSTile +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.qs.QSTileHost +import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.statusbar.policy.BluetoothController +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.MockitoAnnotations + +@RunWith(AndroidTestingRunner::class) +@RunWithLooper(setAsMainLooper = true) +@SmallTest +class BluetoothTileTest : SysuiTestCase() { + + @Mock + private lateinit var mockContext: Context + @Mock + private lateinit var qsLogger: QSLogger + @Mock + private lateinit var qsHost: QSTileHost + @Mock + private lateinit var metricsLogger: MetricsLogger + private val falsingManager = FalsingManagerFake() + @Mock + private lateinit var statusBarStateController: StatusBarStateController + @Mock + private lateinit var activityStarter: ActivityStarter + @Mock + private lateinit var bluetoothController: BluetoothController + + private val uiEventLogger = UiEventLoggerFake() + private lateinit var testableLooper: TestableLooper + private lateinit var tile: FakeBluetoothTile + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + testableLooper = TestableLooper.get(this) + + Mockito.`when`(qsHost.context).thenReturn(mockContext) + Mockito.`when`(qsHost.uiEventLogger).thenReturn(uiEventLogger) + + tile = FakeBluetoothTile( + qsHost, + testableLooper.looper, + Handler(testableLooper.looper), + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + bluetoothController + ) + + tile.initialize() + testableLooper.processAllMessages() + } + + @Test + fun testRestrictionChecked() { + tile.refreshState() + testableLooper.processAllMessages() + + assertThat(tile.restrictionChecked).isEqualTo(UserManager.DISALLOW_BLUETOOTH) + } + + private class FakeBluetoothTile( + qsTileHost: QSTileHost, + backgroundLooper: Looper, + mainHandler: Handler, + falsingManager: FalsingManager, + metricsLogger: MetricsLogger, + statusBarStateController: StatusBarStateController, + activityStarter: ActivityStarter, + qsLogger: QSLogger, + bluetoothController: BluetoothController + ) : BluetoothTile( + qsTileHost, + backgroundLooper, + mainHandler, + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + bluetoothController + ) { + var restrictionChecked: String? = null + + override fun checkIfRestrictionEnforcedByAdminOnly( + state: QSTile.State?, + userRestriction: String? + ) { + restrictionChecked = userRestriction + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt index 9076e1607be5..75ccd8f03a01 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt @@ -23,7 +23,7 @@ import com.android.systemui.statusbar.phone.LSShadeTransitionLogger import com.android.systemui.statusbar.phone.NotificationPanelViewController import com.android.systemui.statusbar.phone.ScrimController import com.android.systemui.statusbar.phone.StatusBar -import com.android.systemui.statusbar.policy.ConfigurationController +import com.android.systemui.statusbar.policy.FakeConfigurationController import org.junit.After import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull @@ -66,7 +66,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { @Mock lateinit var wakefulnessLifecycle: WakefulnessLifecycle @Mock lateinit var mediaHierarchyManager: MediaHierarchyManager @Mock lateinit var scrimController: ScrimController - @Mock lateinit var configurationController: ConfigurationController @Mock lateinit var falsingManager: FalsingManager @Mock lateinit var notificationPanelController: NotificationPanelViewController @Mock lateinit var nsslController: NotificationStackScrollLayoutController @@ -77,6 +76,8 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { @Mock lateinit var qS: QS @JvmField @Rule val mockito = MockitoJUnit.rule() + private val configurationController = FakeConfigurationController() + @Before fun setup() { val helper = NotificationTestHelper( @@ -244,4 +245,27 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { verify(qS).setTransitionToFullShadeAmount(anyFloat(), anyFloat()) verify(depthController).transitionToFullShadeProgress = anyFloat() } + + @Test + fun setDragDownAmount_setsValueOnMediaHierarchyManager() { + transitionController.dragDownAmount = 10f + + verify(mediaHierarchyManager).setTransitionToFullShadeAmount(10f) + } + + @Test + fun setDragDownAmount_inSplitShade_setsValueOnMediaHierarchyManager() { + enableSplitShade() + + transitionController.dragDownAmount = 10f + + verify(mediaHierarchyManager).setTransitionToFullShadeAmount(10f) + } + + private fun enableSplitShade() { + context.getOrCreateTestableResources().addOverride( + R.bool.config_use_split_notification_shade, true + ) + configurationController.notifyConfigurationChanged() + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java index a14ea54fc7e8..5f2bbd341962 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.when; import android.content.res.Resources; import android.hardware.display.AmbientDisplayConfiguration; +import android.os.Handler; import android.os.PowerManager; import android.provider.Settings; import android.test.suitebuilder.annotation.SmallTest; @@ -61,6 +62,7 @@ import java.util.Optional; public class DozeParametersTest extends SysuiTestCase { private DozeParameters mDozeParameters; + @Mock Handler mHandler; @Mock Resources mResources; @Mock private AmbientDisplayConfiguration mAmbientDisplayConfiguration; @Mock private AlwaysOnDisplayPolicy mAlwaysOnDisplayPolicy; @@ -102,6 +104,8 @@ public class DozeParametersTest extends SysuiTestCase { .thenReturn(mFoldAodAnimationController); mDozeParameters = new DozeParameters( + mContext, + mHandler, mResources, mAmbientDisplayConfiguration, mAlwaysOnDisplayPolicy, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java index 671ab597eb2a..c797bc8bdf60 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java @@ -32,6 +32,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.IActivityManager; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.view.View; @@ -228,6 +230,36 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { } @Test + public void rotationBecameAllowed_layoutParamsUpdated() { + mNotificationShadeWindowController.setKeyguardShowing(true); + when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(false); + mNotificationShadeWindowController.onConfigChanged(new Configuration()); + clearInvocations(mWindowManager); + + when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(true); + mNotificationShadeWindowController.onConfigChanged(new Configuration()); + + verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture()); + assertThat(mLayoutParameters.getValue().screenOrientation) + .isEqualTo(ActivityInfo.SCREEN_ORIENTATION_USER); + } + + @Test + public void rotationBecameNotAllowed_layoutParamsUpdated() { + mNotificationShadeWindowController.setKeyguardShowing(true); + when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(true); + mNotificationShadeWindowController.onConfigChanged(new Configuration()); + clearInvocations(mWindowManager); + + when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(false); + mNotificationShadeWindowController.onConfigChanged(new Configuration()); + + verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture()); + assertThat(mLayoutParameters.getValue().screenOrientation) + .isEqualTo(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); + } + + @Test public void batchApplyWindowLayoutParams_doesNotDispatchEvents() { mNotificationShadeWindowController.setForceDozeBrightness(true); verify(mWindowManager).updateViewLayout(any(), any()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index c7db9e43166b..86109367d504 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -381,7 +381,7 @@ public class StatusBarTest extends SysuiTestCase { mShadeController = new ShadeControllerImpl(mCommandQueue, mStatusBarStateController, mNotificationShadeWindowController, mStatusBarKeyguardViewManager, mContext.getSystemService(WindowManager.class), - () -> Optional.of(mStatusBar), () -> mAssistManager, Optional.of(mBubbles)); + () -> Optional.of(mStatusBar), () -> mAssistManager); when(mOperatorNameViewControllerFactory.create(any())) .thenReturn(mOperatorNameViewController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt new file mode 100644 index 000000000000..3a5d9ee16b0a --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt @@ -0,0 +1,31 @@ +package com.android.systemui.statusbar.policy + +import android.content.res.Configuration + +/** Fake implementation of [ConfigurationController] for tests. */ +class FakeConfigurationController : ConfigurationController { + + private var listener: ConfigurationController.ConfigurationListener? = null + + override fun addCallback(listener: ConfigurationController.ConfigurationListener) { + this.listener = listener + } + + override fun removeCallback(listener: ConfigurationController.ConfigurationListener) { + this.listener = null + } + + override fun onConfigurationChanged(newConfiguration: Configuration?) { + listener?.onConfigChanged(newConfiguration) + } + + override fun notifyThemeChanged() { + listener?.onThemeChanged() + } + + fun notifyConfigurationChanged() { + onConfigurationChanged(newConfiguration = null) + } + + override fun isLayoutRtl(): Boolean = false +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/touch/TouchInsetManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/touch/TouchInsetManagerTest.java new file mode 100644 index 000000000000..14b9bfb1393f --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/touch/TouchInsetManagerTest.java @@ -0,0 +1,203 @@ +/* + * 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.systemui.touch; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.graphics.Rect; +import android.graphics.Region; +import android.testing.AndroidTestingRunner; +import android.view.View; +import android.view.ViewRootImpl; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class TouchInsetManagerTest extends SysuiTestCase { + @Mock + private View mRootView; + + @Mock + private ViewRootImpl mRootViewImpl; + + private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mRootView.getViewRootImpl()).thenReturn(mRootViewImpl); + } + + @Test + public void testRootViewOnAttachedHandling() { + // Create inset manager + final TouchInsetManager insetManager = new TouchInsetManager(mFakeExecutor, + mRootView); + + final ArgumentCaptor<View.OnAttachStateChangeListener> listener = + ArgumentCaptor.forClass(View.OnAttachStateChangeListener.class); + + // Ensure manager has registered to listen to attached state of root view. + verify(mRootView).addOnAttachStateChangeListener(listener.capture()); + + // Trigger attachment and verify touchable region is set. + listener.getValue().onViewAttachedToWindow(mRootView); + verify(mRootViewImpl).setTouchableRegion(any()); + } + + @Test + public void testInsetRegionPropagation() { + // Create inset manager + final TouchInsetManager insetManager = new TouchInsetManager(mFakeExecutor, + mRootView); + + // Create session + final TouchInsetManager.TouchInsetSession session = insetManager.createSession(); + + // Add a view to the session. + final Rect rect = new Rect(0, 0, 2, 2); + + session.addViewToTracking(createView(rect)); + mFakeExecutor.runAllReady(); + + // Check to see if view was properly accounted for. + final Region expectedRegion = Region.obtain(); + expectedRegion.op(rect, Region.Op.UNION); + verify(mRootViewImpl).setTouchableRegion(eq(expectedRegion)); + } + + @Test + public void testMultipleRegions() { + // Create inset manager + final TouchInsetManager insetManager = new TouchInsetManager(mFakeExecutor, + mRootView); + + // Create session + final TouchInsetManager.TouchInsetSession session = insetManager.createSession(); + + // Add a view to the session. + final Rect firstBounds = new Rect(0, 0, 2, 2); + session.addViewToTracking(createView(firstBounds)); + + mFakeExecutor.runAllReady(); + clearInvocations(mRootViewImpl); + + // Create second session + final TouchInsetManager.TouchInsetSession secondSession = insetManager.createSession(); + + // Add a view to the second session. + final Rect secondBounds = new Rect(4, 4, 8, 10); + secondSession.addViewToTracking(createView(secondBounds)); + + mFakeExecutor.runAllReady(); + + // Check to see if all views and sessions was properly accounted for. + { + final Region expectedRegion = Region.obtain(); + expectedRegion.op(firstBounds, Region.Op.UNION); + expectedRegion.op(secondBounds, Region.Op.UNION); + verify(mRootViewImpl).setTouchableRegion(eq(expectedRegion)); + } + + + clearInvocations(mRootViewImpl); + + // clear first session, ensure second session is still reflected. + session.clear(); + mFakeExecutor.runAllReady(); + { + final Region expectedRegion = Region.obtain(); + expectedRegion.op(firstBounds, Region.Op.UNION); + verify(mRootViewImpl).setTouchableRegion(eq(expectedRegion)); + } + } + + @Test + public void testMultipleViews() { + // Create inset manager + final TouchInsetManager insetManager = new TouchInsetManager(mFakeExecutor, + mRootView); + + // Create session + final TouchInsetManager.TouchInsetSession session = insetManager.createSession(); + + // Add a view to the session. + final Rect firstViewBounds = new Rect(0, 0, 2, 2); + session.addViewToTracking(createView(firstViewBounds)); + + // only capture second invocation. + mFakeExecutor.runAllReady(); + clearInvocations(mRootViewImpl); + + // Add a second view to the session + final Rect secondViewBounds = new Rect(4, 4, 9, 10); + final View secondView = createView(secondViewBounds); + session.addViewToTracking(secondView); + + mFakeExecutor.runAllReady(); + + // Check to see if all views and sessions was properly accounted for. + { + final Region expectedRegion = Region.obtain(); + expectedRegion.op(firstViewBounds, Region.Op.UNION); + expectedRegion.op(secondViewBounds, Region.Op.UNION); + verify(mRootViewImpl).setTouchableRegion(eq(expectedRegion)); + } + + // Remove second view. + session.removeViewFromTracking(secondView); + + clearInvocations(mRootViewImpl); + mFakeExecutor.runAllReady(); + + // Ensure first view still reflected in touch region. + { + final Region expectedRegion = Region.obtain(); + expectedRegion.op(firstViewBounds, Region.Op.UNION); + verify(mRootViewImpl).setTouchableRegion(eq(expectedRegion)); + } + } + + private View createView(Rect bounds) { + final Rect rect = new Rect(bounds); + final View view = Mockito.mock(View.class); + doAnswer(invocation -> { + ((Rect) invocation.getArgument(0)).set(rect); + return null; + }).when(view).getBoundsOnScreen(any()); + + return view; + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java index b3805533cabd..ec619bb5952a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java @@ -36,6 +36,7 @@ import android.os.Process; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.CaptioningManager; import androidx.test.filters.SmallTest; @@ -88,6 +89,8 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { private PackageManager mPackageManager; @Mock private WakefulnessLifecycle mWakefullnessLifcycle; + @Mock + private CaptioningManager mCaptioningManager; @Before @@ -109,7 +112,7 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { mVolumeController = new TestableVolumeDialogControllerImpl(mContext, mBroadcastDispatcher, mRingerModeTracker, mThreadFactory, mAudioManager, mNotificationManager, mVibrator, mIAudioService, mAccessibilityManager, - mPackageManager, mWakefullnessLifcycle, mCallback); + mPackageManager, mWakefullnessLifcycle, mCaptioningManager, mCallback); mVolumeController.setEnableDialogs(true, true); } @@ -184,10 +187,11 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { AccessibilityManager accessibilityManager, PackageManager packageManager, WakefulnessLifecycle wakefulnessLifecycle, + CaptioningManager captioningManager, C callback) { super(context, broadcastDispatcher, ringerModeTracker, theadFactory, audioManager, notificationManager, optionalVibrator, iAudioService, accessibilityManager, - packageManager, wakefulnessLifecycle); + packageManager, wakefulnessLifecycle, captioningManager); mCallbacks = callback; ArgumentCaptor<WakefulnessLifecycle.Observer> observerCaptor = diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index 4bc4e6ea98f9..593b97e55739 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -50,8 +50,10 @@ import android.app.IActivityManager; import android.app.INotificationManager; import android.app.Notification; import android.app.PendingIntent; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.LauncherApps; import android.content.pm.PackageManager; @@ -197,6 +199,11 @@ public class BubblesTest extends SysuiTestCase { private ArgumentCaptor<NotificationRemoveInterceptor> mRemoveInterceptorCaptor; @Captor private ArgumentCaptor<List<Bubble>> mBubbleListCaptor; + @Captor + private ArgumentCaptor<IntentFilter> mFilterArgumentCaptor; + @Captor + private ArgumentCaptor<BroadcastReceiver> mBroadcastReceiverArgumentCaptor; + private BubblesManager mBubblesManager; // TODO(178618782): Move tests on the controller directly to the shell @@ -1357,6 +1364,66 @@ public class BubblesTest extends SysuiTestCase { assertStackCollapsed(); } + @Test + public void testRegisterUnregisterBroadcastListener() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + assertThat(mFilterArgumentCaptor.getValue().getAction(0)).isEqualTo( + Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + assertThat(mFilterArgumentCaptor.getValue().getAction(1)).isEqualTo( + Intent.ACTION_SCREEN_OFF); + + mBubbleData.dismissBubbleWithKey(mBubbleEntry.getKey(), REASON_APP_CANCEL); + // TODO: not certain why this isn't called normally when tests are run, perhaps because + // it's after an animation in BSV. This calls BubbleController#removeFromWindowManagerMaybe + mBubbleController.onAllBubblesAnimatedOut(); + + verify(mContext).unregisterReceiver(eq(mBroadcastReceiverArgumentCaptor.getValue())); + } + + @Test + public void testBroadcastReceiverCloseDialogs_notGestureNav() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + + assertStackExpanded(); + } + + @Test + public void testBroadcastReceiverCloseDialogs_reasonGestureNav() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + i.putExtra("reason", "gestureNav"); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + assertStackCollapsed(); + } + + @Test + public void testBroadcastReceiver_screenOff() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + + Intent i = new Intent(Intent.ACTION_SCREEN_OFF); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + assertStackCollapsed(); + } + /** Creates a bubble using the userId and package. */ private Bubble createBubble(int userId, String pkg) { final UserHandle userHandle = new UserHandle(userId); diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java index 75d8453cb071..cc848bc34217 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java @@ -46,6 +46,9 @@ import android.app.IActivityManager; import android.app.INotificationManager; import android.app.Notification; import android.app.PendingIntent; +import android.content.BroadcastReceiver; +import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.LauncherApps; import android.hardware.display.AmbientDisplayConfiguration; import android.os.Handler; @@ -179,6 +182,10 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { private ArgumentCaptor<NotifCollectionListener> mNotifListenerCaptor; @Captor private ArgumentCaptor<List<Bubble>> mBubbleListCaptor; + @Captor + private ArgumentCaptor<IntentFilter> mFilterArgumentCaptor; + @Captor + private ArgumentCaptor<BroadcastReceiver> mBroadcastReceiverArgumentCaptor; private BubblesManager mBubblesManager; private TestableBubbleController mBubbleController; @@ -1176,6 +1183,67 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { assertStackCollapsed(); } + + @Test + public void testRegisterUnregisterBroadcastListener() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + assertThat(mFilterArgumentCaptor.getValue().getAction(0)).isEqualTo( + Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + assertThat(mFilterArgumentCaptor.getValue().getAction(1)).isEqualTo( + Intent.ACTION_SCREEN_OFF); + + mBubbleData.dismissBubbleWithKey(mBubbleEntry.getKey(), REASON_APP_CANCEL); + // TODO: not certain why this isn't called normally when tests are run, perhaps because + // it's after an animation in BSV. This calls BubbleController#removeFromWindowManagerMaybe + mBubbleController.onAllBubblesAnimatedOut(); + + verify(mContext).unregisterReceiver(eq(mBroadcastReceiverArgumentCaptor.getValue())); + } + + @Test + public void testBroadcastReceiverCloseDialogs_notGestureNav() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + + assertStackExpanded(); + } + + @Test + public void testBroadcastReceiverCloseDialogs_reasonGestureNav() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + Intent i = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + i.putExtra("reason", "gestureNav"); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + assertStackCollapsed(); + } + + @Test + public void testBroadcastReceiver_screenOff() { + spyOn(mContext); + mBubbleController.updateBubble(mBubbleEntry); + mBubbleData.setExpanded(true); + + verify(mContext).registerReceiver(mBroadcastReceiverArgumentCaptor.capture(), + mFilterArgumentCaptor.capture()); + + Intent i = new Intent(Intent.ACTION_SCREEN_OFF); + mBroadcastReceiverArgumentCaptor.getValue().onReceive(mContext, i); + assertStackCollapsed(); + } + /** * Sets the bubble metadata flags for this entry. These flags are normally set by * NotificationManagerService when the notification is sent, however, these tests do not diff --git a/proto/src/camera.proto b/proto/src/camera.proto index 2d62f32d3941..40821185b61a 100644 --- a/proto/src/camera.proto +++ b/proto/src/camera.proto @@ -64,7 +64,7 @@ message CameraStreamProto { repeated int64 histogram_counts = 13; // The dynamic range profile of the stream - optional int32 dynamic_range_profile = 14; + optional int64 dynamic_range_profile = 14; // The stream use case optional int32 stream_use_case = 15; } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 59c1461e4abc..aba32ec465b5 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -667,6 +667,10 @@ public class AccessibilityWindowManager { return null; } + // Don't need to add the embedded hierarchy windows into the accessibility windows list. + if (mHostEmbeddedMap.size() > 0 && isEmbeddedHierarchyWindowsLocked(windowId)) { + return null; + } final AccessibilityWindowInfo reportedWindow = AccessibilityWindowInfo.obtain(); reportedWindow.setId(windowId); @@ -699,6 +703,21 @@ public class AccessibilityWindowManager { return reportedWindow; } + private boolean isEmbeddedHierarchyWindowsLocked(int windowId) { + final IBinder leashToken = mWindowIdMap.get(windowId); + if (leashToken == null) { + return false; + } + + for (int i = 0; i < mHostEmbeddedMap.size(); i++) { + if (mHostEmbeddedMap.keyAt(i).equals(leashToken)) { + return true; + } + } + + return false; + } + private int getTypeForWindowManagerWindowType(int windowType) { switch (windowType) { case WindowManager.LayoutParams.TYPE_APPLICATION: diff --git a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java index 2b7b97737e0f..8359374e67e5 100644 --- a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java +++ b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java @@ -26,6 +26,7 @@ import static com.android.server.companion.CompanionDeviceManagerService.DEBUG; import static com.android.server.companion.PackageUtils.enforceUsesCompanionDeviceFeature; import static com.android.server.companion.PermissionsUtils.enforcePermissionsForAssociation; import static com.android.server.companion.RolesUtils.isRoleHolder; +import static com.android.server.companion.Utils.prepareForIpc; import static java.util.Objects.requireNonNull; @@ -47,7 +48,6 @@ import android.net.MacAddress; import android.os.Binder; import android.os.Bundle; import android.os.Handler; -import android.os.Parcel; import android.os.RemoteException; import android.os.ResultReceiver; import android.util.PackageUtils; @@ -397,20 +397,4 @@ class AssociationRequestsProcessor { return sameOemPackageCerts; } - - /** - * Convert an instance of a "locally-defined" ResultReceiver to an instance of - * {@link android.os.ResultReceiver} itself, which the receiving process will be able to - * unmarshall. - */ - private static <T extends ResultReceiver> ResultReceiver prepareForIpc(T resultReceiver) { - final Parcel parcel = Parcel.obtain(); - resultReceiver.writeToParcel(parcel, 0); - parcel.setDataPosition(0); - - final ResultReceiver ipcFriendly = ResultReceiver.CREATOR.createFromParcel(parcel); - parcel.recycle(); - - return ipcFriendly; - } } diff --git a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java index cb28254f70db..c0181fe723e1 100644 --- a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java +++ b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java @@ -54,7 +54,7 @@ import java.util.StringJoiner; * should use public {@link AssociationStore} interface. */ @SuppressLint("LongLogTag") -class AssociationStoreImpl implements AssociationStore { +public class AssociationStoreImpl implements AssociationStore { private static final boolean DEBUG = false; private static final String TAG = "CompanionDevice_AssociationStore"; diff --git a/services/companion/java/com/android/server/companion/CompanionApplicationController.java b/services/companion/java/com/android/server/companion/CompanionApplicationController.java index c39b59ae35b3..ec4bfe09e415 100644 --- a/services/companion/java/com/android/server/companion/CompanionApplicationController.java +++ b/services/companion/java/com/android/server/companion/CompanionApplicationController.java @@ -118,13 +118,14 @@ class CompanionApplicationController { serviceConnectors = CollectionUtils.map(companionServices, componentName -> new CompanionDeviceServiceConnector(mContext, userId, componentName)); - mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors); - } - if (serviceConnectors.isEmpty()) { - Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: " - + packageName + ". Please check if they are correctly declared."); - return; + if (serviceConnectors.isEmpty()) { + Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: " + + packageName + ". Please check if they are correctly declared."); + return; + } + + mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors); } // The first connector in the list is always the primary connector: set a listener to it. diff --git a/services/companion/java/com/android/server/companion/DataStoreUtils.java b/services/companion/java/com/android/server/companion/DataStoreUtils.java index 8ac741a44ee5..73e68ec0bf97 100644 --- a/services/companion/java/com/android/server/companion/DataStoreUtils.java +++ b/services/companion/java/com/android/server/companion/DataStoreUtils.java @@ -33,15 +33,24 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.File; import java.io.FileOutputStream; -final class DataStoreUtils { +/** + * Util class for CDM data stores + */ +public final class DataStoreUtils { private static final String TAG = "CompanionDevice_DataStoreUtils"; - static boolean isStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag) + /** + * Check if the parser pointer is at the start of the tag + */ + public static boolean isStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag) throws XmlPullParserException { return parser.getEventType() == START_TAG && tag.equals(parser.getName()); } - static boolean isEndOfTag(@NonNull XmlPullParser parser, @NonNull String tag) + /** + * Check if the parser pointer is at the end of the tag + */ + public static boolean isEndOfTag(@NonNull XmlPullParser parser, @NonNull String tag) throws XmlPullParserException { return parser.getEventType() == END_TAG && tag.equals(parser.getName()); } @@ -57,7 +66,7 @@ final class DataStoreUtils { * @return an AtomicFile for the user */ @NonNull - static AtomicFile createStorageFileForUser(@UserIdInt int userId, String fileName) { + public static AtomicFile createStorageFileForUser(@UserIdInt int userId, String fileName) { return new AtomicFile(getBaseStorageFileForUser(userId, fileName)); } @@ -70,7 +79,7 @@ final class DataStoreUtils { * Writing to file could fail, for example, if the user has been recently removed and so was * their DE (/data/system_de/<user-id>/) directory. */ - static void writeToFileSafely( + public static void writeToFileSafely( @NonNull AtomicFile file, @NonNull ThrowingConsumer<FileOutputStream> consumer) { try { file.write(consumer); diff --git a/services/companion/java/com/android/server/companion/PersistentDataStore.java b/services/companion/java/com/android/server/companion/PersistentDataStore.java index d0cc12286b12..2487befecf52 100644 --- a/services/companion/java/com/android/server/companion/PersistentDataStore.java +++ b/services/companion/java/com/android/server/companion/PersistentDataStore.java @@ -101,7 +101,7 @@ import java.util.concurrent.ConcurrentMap; * Since Android T the data is stored to "companion_device_manager.xml" file in * {@link Environment#getDataSystemDeDirectory(int) /data/system_de/}. * - * See {@link #getBaseStorageFileForUser(int) getBaseStorageFileForUser()} + * See {@link #getStorageFileForUser(int)} * * <p> * Since Android T the data is stored using the v1 schema. diff --git a/services/companion/java/com/android/server/companion/Utils.java b/services/companion/java/com/android/server/companion/Utils.java new file mode 100644 index 000000000000..b9f61ecd8c4f --- /dev/null +++ b/services/companion/java/com/android/server/companion/Utils.java @@ -0,0 +1,47 @@ +/* + * 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.server.companion; + +import android.os.Parcel; +import android.os.ResultReceiver; + +/** + * A miscellaneous util class for CDM + * + * @hide + */ +public final class Utils { + + /** + * Convert an instance of a "locally-defined" ResultReceiver to an instance of + * {@link android.os.ResultReceiver} itself, which the receiving process will be able to + * unmarshall. + * @hide + */ + public static <T extends ResultReceiver> ResultReceiver prepareForIpc(T resultReceiver) { + final Parcel parcel = Parcel.obtain(); + resultReceiver.writeToParcel(parcel, 0); + parcel.setDataPosition(0); + + final ResultReceiver ipcFriendly = ResultReceiver.CREATOR.createFromParcel(parcel); + parcel.recycle(); + + return ipcFriendly; + } + + private Utils() {} +} diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java new file mode 100644 index 000000000000..7e2b60aba76b --- /dev/null +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java @@ -0,0 +1,164 @@ +/* + * 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.server.companion.datatransfer; + +import static android.app.PendingIntent.FLAG_CANCEL_CURRENT; +import static android.app.PendingIntent.FLAG_IMMUTABLE; +import static android.app.PendingIntent.FLAG_ONE_SHOT; +import static android.companion.CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME; +import static android.content.ComponentName.createRelative; + +import static com.android.server.companion.Utils.prepareForIpc; + +import static java.util.Objects.requireNonNull; + +import android.annotation.UserIdInt; +import android.app.PendingIntent; +import android.companion.AssociationInfo; +import android.companion.DeviceNotAssociatedException; +import android.companion.SystemDataTransferRequest; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.Binder; +import android.os.Bundle; +import android.os.Handler; +import android.os.ResultReceiver; +import android.util.Slog; + +import com.android.server.companion.AssociationStoreImpl; +import com.android.server.companion.CompanionDeviceManagerService; + +import java.util.List; + +/** + * This processor builds user consent intent for a given SystemDataTransferRequest and processes the + * request when the system is ready (a secure channel is established between the handhold and the + * companion device). + */ +public class SystemDataTransferProcessor { + + private static final String LOG_TAG = SystemDataTransferProcessor.class.getSimpleName(); + + // Values from UI to SystemDataTransferProcessor via ResultReceiver + private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED = 0; + private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED = 1; + private static final String EXTRA_SYSTEM_DATA_TRANSFER_REQUEST = "system_data_transfer_request"; + private static final String EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER = + "system_data_transfer_result_receiver"; + private static final ComponentName SYSTEM_DATA_TRANSFER_REQUEST_APPROVAL_ACTIVITY = + createRelative(COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME, + ".CompanionDeviceDataTransferActivity"); + + private final Context mContext; + private final AssociationStoreImpl mAssociationStore; + private final SystemDataTransferRequestStore mSystemDataTransferRequestStore; + + SystemDataTransferProcessor(CompanionDeviceManagerService service, + AssociationStoreImpl associationStore, + SystemDataTransferRequestStore systemDataTransferRequestStore) { + mContext = service.getContext(); + mAssociationStore = associationStore; + mSystemDataTransferRequestStore = systemDataTransferRequestStore; + } + + /** + * Build a PendingIntent of user consent dialog + */ + public PendingIntent buildSystemDataTransferConfirmationIntent(@UserIdInt int userId, + SystemDataTransferRequest request) throws DeviceNotAssociatedException { + // The association must exist and either belong to the calling package, + // or the calling package must hold REQUEST_SYSTEM_DATA_TRANSFER permission. + int associationId = request.getAssociationId(); + AssociationInfo association = mAssociationStore.getAssociationById(associationId); + if (association == null) { + throw new DeviceNotAssociatedException( + "Association id: " + associationId + " doesn't exist."); + } else { + // If the package is not the companion app which owns the association, + // it must hold REQUEST_SYSTEM_DATA_TRANSFER permission. + // TODO(b/204593788): uncomment the following with the API changes +// if (!association.getPackageName() +// .equals(mContext.getPackageManager().getNameForUid(Binder.getCallingUid()))) { +// mContext.enforceCallingOrSelfPermission( +// Manifest.permission.REQUEST_COMPANION_DEVICE_SYSTEM_DATA_TRANSFER, +// "requestSystemDataTransfer requires REQUEST_SYSTEM_DATA_TRANSFER " +// + "permission if the package doesn't own the association."); +// } + + // Check if the request's data type has been requested before. + List<SystemDataTransferRequest> storedRequests = + mSystemDataTransferRequestStore.readRequestsByAssociationId(userId, + associationId); + for (SystemDataTransferRequest storedRequest : storedRequests) { + if (request.hasSameDataType(storedRequest)) { + Slog.e(LOG_TAG, "The request has been sent before, you can not send " + + "the same request type again."); + return null; + } + } + } + + Slog.i(LOG_TAG, "Creating PendingIntent for associationId: " + associationId + ", request: " + + request); + + // Create an internal intent to launch the user consent dialog + final Bundle extras = new Bundle(); + request.setUserId(userId); + extras.putParcelable(EXTRA_SYSTEM_DATA_TRANSFER_REQUEST, request); + extras.putParcelable(EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER, + prepareForIpc(mOnSystemDataTransferRequestConfirmationReceiver)); + + final Intent intent = new Intent(); + intent.setComponent(SYSTEM_DATA_TRANSFER_REQUEST_APPROVAL_ACTIVITY); + intent.putExtras(extras); + + // Create a PendingIntent + final long token = Binder.clearCallingIdentity(); + try { + return PendingIntent.getActivity(mContext, /*requestCode */ associationId, intent, + FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + private final ResultReceiver mOnSystemDataTransferRequestConfirmationReceiver = + new ResultReceiver(Handler.getMain()) { + @Override + protected void onReceiveResult(int resultCode, Bundle data) { + Slog.d(LOG_TAG, "onReceiveResult() code=" + resultCode + ", " + + "data=" + data); + + if (resultCode == RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED + || resultCode == RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED) { + final SystemDataTransferRequest request = + data.getParcelable(EXTRA_SYSTEM_DATA_TRANSFER_REQUEST); + requireNonNull(request); + + request.setUserConsented( + resultCode == RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED); + Slog.i(LOG_TAG, "Recording request: " + request); + mSystemDataTransferRequestStore.writeRequest(request.getUserId(), request); + + return; + } + + Slog.e(LOG_TAG, "Unknown result code:" + resultCode); + } + }; +} diff --git a/services/companion/java/com/android/server/companion/SystemDataTransferRequestDataStore.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java index 38e5d16842b9..1e29f56d190e 100644 --- a/services/companion/java/com/android/server/companion/SystemDataTransferRequestDataStore.java +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.companion; +package com.android.server.companion.datatransfer; import static com.android.internal.util.XmlUtils.readBooleanAttribute; import static com.android.internal.util.XmlUtils.readIntAttribute; @@ -33,10 +33,12 @@ import android.annotation.UserIdInt; import android.companion.SystemDataTransferRequest; import android.util.AtomicFile; import android.util.Slog; +import android.util.SparseArray; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; import android.util.Xml; +import com.android.internal.annotations.GuardedBy; import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParserException; @@ -49,15 +51,23 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** * The class is responsible for reading/writing SystemDataTransferRequest records from/to the disk. - * + * <p> * The following snippet is a sample XML file stored in the disk. * <pre>{@code * <requests> * <request * association_id="1" + * user_id="12" + * is_user_consented="true" * is_permission_sync_all_packages="false"> * <list name="permission_sync_packages"> * <string>com.sample.app1</string> @@ -67,9 +77,9 @@ import java.util.concurrent.ConcurrentMap; * </requests> * }</pre> */ -public class SystemDataTransferRequestDataStore { +public class SystemDataTransferRequestStore { - private static final String LOG_TAG = SystemDataTransferRequestDataStore.class.getSimpleName(); + private static final String LOG_TAG = SystemDataTransferRequestStore.class.getSimpleName(); private static final String FILE_NAME = "companion_device_system_data_transfer_requests.xml"; @@ -78,13 +88,78 @@ public class SystemDataTransferRequestDataStore { private static final String XML_TAG_LIST = "list"; private static final String XML_ATTR_ASSOCIATION_ID = "association_id"; + private static final String XML_ATTR_USER_ID = "user_id"; + private static final String XML_ATTR_IS_USER_CONSENTED = "is_user_consented"; private static final String XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES = "is_permission_sync_all_packages"; private static final String XML_ATTR_PERMISSION_SYNC_PACKAGES = "permission_sync_packages"; + private static final int READ_FROM_DISK_TIMEOUT = 5; // in seconds + + private final ExecutorService mExecutor; private final ConcurrentMap<Integer, AtomicFile> mUserIdToStorageFile = new ConcurrentHashMap<>(); + private final Object mLock = new Object(); + + @GuardedBy("mLock") + private final SparseArray<List<SystemDataTransferRequest>> mCachedPerUser = new SparseArray<>(); + + public SystemDataTransferRequestStore() { + mExecutor = Executors.newSingleThreadExecutor(); + } + + @NonNull + List<SystemDataTransferRequest> readRequestsByAssociationId(@UserIdInt int userId, + int associationId) { + List<SystemDataTransferRequest> cachedRequests; + synchronized (mLock) { + cachedRequests = readRequestsFromCache(userId); + } + + List<SystemDataTransferRequest> requestsByAssociationId = new ArrayList<>(); + for (SystemDataTransferRequest request : cachedRequests) { + if (request.getAssociationId() == associationId) { + requestsByAssociationId.add(request); + } + } + return requestsByAssociationId; + } + + void writeRequest(@UserIdInt int userId, SystemDataTransferRequest request) { + List<SystemDataTransferRequest> cachedRequests; + synchronized (mLock) { + // Write to cache + cachedRequests = readRequestsFromCache(userId); + cachedRequests.add(request); + mCachedPerUser.set(userId, cachedRequests); + } + // Write to store + mExecutor.execute(() -> writeRequestsToStore(userId, cachedRequests)); + } + + @GuardedBy("mLock") + private List<SystemDataTransferRequest> readRequestsFromCache(@UserIdInt int userId) { + List<SystemDataTransferRequest> cachedRequests = mCachedPerUser.get(userId); + if (cachedRequests == null) { + Future<List<SystemDataTransferRequest>> future = + mExecutor.submit(() -> readRequestsFromStore(userId)); + try { + cachedRequests = future.get(READ_FROM_DISK_TIMEOUT, TimeUnit.SECONDS); + } catch (InterruptedException e) { + Slog.e(LOG_TAG, "Thread reading SystemDataTransferRequest from disk is " + + "interrupted."); + } catch (ExecutionException e) { + Slog.e(LOG_TAG, "Error occurred while reading SystemDataTransferRequest " + + "from disk."); + } catch (TimeoutException e) { + Slog.e(LOG_TAG, "Reading SystemDataTransferRequest from disk timed out."); + } + mCachedPerUser.set(userId, cachedRequests); + } + return cachedRequests; + } + /** * Reads previously persisted data for the given user * @@ -92,7 +167,7 @@ public class SystemDataTransferRequestDataStore { * @return a list of SystemDataTransferRequest */ @NonNull - List<SystemDataTransferRequest> readRequestsForUser(@UserIdInt int userId) { + private List<SystemDataTransferRequest> readRequestsFromStore(@UserIdInt int userId) { final AtomicFile file = getStorageFileForUser(userId); Slog.i(LOG_TAG, "Reading SystemDataTransferRequests for user " + userId + " from " + "file=" + file.getBaseFile().getPath()); @@ -108,7 +183,7 @@ public class SystemDataTransferRequestDataStore { final TypedXmlPullParser parser = Xml.resolvePullParser(in); XmlUtils.beginDocument(parser, XML_TAG_REQUESTS); - return readRequests(parser); + return readRequestsFromXml(parser); } catch (XmlPullParserException | IOException e) { Slog.e(LOG_TAG, "Error while reading requests file", e); return Collections.emptyList(); @@ -117,7 +192,7 @@ public class SystemDataTransferRequestDataStore { } @NonNull - private List<SystemDataTransferRequest> readRequests(@NonNull TypedXmlPullParser parser) + private List<SystemDataTransferRequest> readRequestsFromXml(@NonNull TypedXmlPullParser parser) throws XmlPullParserException, IOException { if (!isStartOfTag(parser, XML_TAG_REQUESTS)) { throw new XmlPullParserException("The XML doesn't have start tag: " + XML_TAG_REQUESTS); @@ -127,22 +202,26 @@ public class SystemDataTransferRequestDataStore { while (true) { parser.nextTag(); - if (isEndOfTag(parser, XML_TAG_REQUESTS)) break; + if (isEndOfTag(parser, XML_TAG_REQUESTS)) { + break; + } if (isStartOfTag(parser, XML_TAG_REQUEST)) { - requests.add(readRequest(parser)); + requests.add(readRequestFromXml(parser)); } } return requests; } - private SystemDataTransferRequest readRequest(@NonNull TypedXmlPullParser parser) + private SystemDataTransferRequest readRequestFromXml(@NonNull TypedXmlPullParser parser) throws XmlPullParserException, IOException { if (!isStartOfTag(parser, XML_TAG_REQUEST)) { throw new XmlPullParserException("XML doesn't have start tag: " + XML_TAG_REQUEST); } final int associationId = readIntAttribute(parser, XML_ATTR_ASSOCIATION_ID); + final int userId = readIntAttribute(parser, XML_ATTR_USER_ID); + final boolean isUserConsented = readBooleanAttribute(parser, XML_ATTR_IS_USER_CONSENTED); final boolean isPermissionSyncAllPackages = readBooleanAttribute(parser, XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES); parser.nextTag(); @@ -153,8 +232,13 @@ public class SystemDataTransferRequestDataStore { new String[1]); } - return new SystemDataTransferRequest(associationId, isPermissionSyncAllPackages, - permissionSyncPackages); + SystemDataTransferRequest request = + new SystemDataTransferRequest(associationId, isPermissionSyncAllPackages, + permissionSyncPackages); + request.setUserId(userId); + request.setUserConsented(isUserConsented); + + return request; } /** @@ -163,7 +247,7 @@ public class SystemDataTransferRequestDataStore { * @param userId Android UserID * @param requests a list of user's SystemDataTransferRequest. */ - void writeRequestsForUser(@UserIdInt int userId, + void writeRequestsToStore(@UserIdInt int userId, @NonNull List<SystemDataTransferRequest> requests) { final AtomicFile file = getStorageFileForUser(userId); Slog.i(LOG_TAG, "Writing SystemDataTransferRequests for user " + userId + " to file=" @@ -177,28 +261,30 @@ public class SystemDataTransferRequestDataStore { serializer.setFeature( "http://xmlpull.org/v1/doc/features.html#indent-output", true); serializer.startDocument(null, true); - writeRequests(serializer, requests); + writeRequestsToXml(serializer, requests); serializer.endDocument(); }); } } - private void writeRequests(@NonNull TypedXmlSerializer serializer, + private void writeRequestsToXml(@NonNull TypedXmlSerializer serializer, @Nullable Collection<SystemDataTransferRequest> requests) throws IOException { serializer.startTag(null, XML_TAG_REQUESTS); for (SystemDataTransferRequest request : requests) { - writeRequest(serializer, request); + writeRequestToXml(serializer, request); } serializer.endTag(null, XML_TAG_REQUESTS); } - private void writeRequest(@NonNull TypedXmlSerializer serializer, + private void writeRequestToXml(@NonNull TypedXmlSerializer serializer, @NonNull SystemDataTransferRequest request) throws IOException { serializer.startTag(null, XML_TAG_REQUEST); writeIntAttribute(serializer, XML_ATTR_ASSOCIATION_ID, request.getAssociationId()); + writeIntAttribute(serializer, XML_ATTR_USER_ID, request.getUserId()); + writeBooleanAttribute(serializer, XML_ATTR_IS_USER_CONSENTED, request.isUserConsented()); writeBooleanAttribute(serializer, XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES, request.isPermissionSyncAllPackages()); try { @@ -215,11 +301,12 @@ public class SystemDataTransferRequestDataStore { /** * Creates and caches {@link AtomicFile} object that represents the back-up file for the given * user. - * + * <p> * IMPORTANT: the method will ALWAYS return the same {@link AtomicFile} object, which makes it * possible to synchronize reads and writes to the file using the returned object. */ - private @NonNull AtomicFile getStorageFileForUser(@UserIdInt int userId) { + @NonNull + private AtomicFile getStorageFileForUser(@UserIdInt int userId) { return mUserIdToStorageFile.computeIfAbsent(userId, u -> createStorageFileForUser(userId, FILE_NAME)); } diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java index 12e438d1f2a9..78df983c83f7 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -21,6 +21,8 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.ActivityManager; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; import android.content.pm.UserInfo; import android.os.Environment; import android.os.SystemClock; @@ -38,6 +40,7 @@ import com.android.internal.util.Preconditions; import com.android.server.SystemService.TargetUser; import com.android.server.SystemService.UserCompletedEventType; import com.android.server.am.EventLogTags; +import com.android.server.pm.ApexManager; import com.android.server.pm.UserManagerInternal; import com.android.server.utils.TimingsTraceAndSlog; @@ -47,6 +50,8 @@ import java.io.File; import java.io.PrintWriter; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -147,12 +152,31 @@ public final class SystemServiceManager implements Dumpable { * @return The service instance. */ public SystemService startServiceFromJar(String className, String path) { - PathClassLoader pathClassLoader = SystemServerClassLoaderFactory.getOrCreateClassLoader( - path, this.getClass().getClassLoader()); + PathClassLoader pathClassLoader = + SystemServerClassLoaderFactory.getOrCreateClassLoader( + path, this.getClass().getClassLoader(), isJarInTestApex(path)); final Class<SystemService> serviceClass = loadClassFromLoader(className, pathClassLoader); return startService(serviceClass); } + /** + * Returns true if the jar is in a test APEX. + */ + private static boolean isJarInTestApex(String pathStr) { + Path path = Paths.get(pathStr); + if (path.getNameCount() >= 2 && path.getName(0).toString().equals("apex")) { + String apexModuleName = path.getName(1).toString(); + ApexManager apexManager = ApexManager.getInstance(); + String packageName = apexManager.getActivePackageNameForApexModuleName(apexModuleName); + PackageInfo packageInfo = apexManager.getPackageInfo( + packageName, ApexManager.MATCH_ACTIVE_PACKAGE); + if (packageInfo != null) { + return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_TEST_ONLY) != 0; + } + } + return false; + } + /* * Loads and initializes a class from the given classLoader. Returns the class. */ diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 8c04c1e32291..1eb23ea4fe7f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8632,8 +8632,8 @@ public class ActivityManagerService extends IActivityManager.Stub sb.append("Foreground: ") .append(process.isInterestingToUserLocked() ? "Yes" : "No") .append("\n"); - if (process.getStartTime() > 0) { - long runtimeMillis = SystemClock.elapsedRealtime() - process.getStartTime(); + if (process.getStartUptime() > 0) { + long runtimeMillis = SystemClock.uptimeMillis() - process.getStartUptime(); sb.append("Process-Runtime: ").append(runtimeMillis).append("\n"); } } @@ -9176,6 +9176,7 @@ public class ActivityManagerService extends IActivityManager.Stub boolean dumpVisibleStacksOnly = false; boolean dumpFocusedStackOnly = false; String dumpPackage = null; + int dumpUserId = UserHandle.USER_ALL; int opti = 0; while (opti < args.length) { @@ -9207,6 +9208,17 @@ public class ActivityManagerService extends IActivityManager.Stub dumpCheckinFormat = true; } else if ("--normal-priority".equals(opt)) { dumpNormalPriority = true; + } else if ("--user".equals(opt)) { + if (opti < args.length) { + dumpUserId = UserHandle.parseUserArg(args[opti]); + if (dumpUserId == UserHandle.USER_CURRENT) { + dumpUserId = mUserController.getCurrentUserId(); + } + opti++; + } else { + pw.println("Error: --user option requires user id argument"); + return; + } } else if ("-h".equals(opt)) { ActivityManagerShellCommand.dumpHelp(pw, true); return; @@ -9397,29 +9409,17 @@ public class ActivityManagerService extends IActivityManager.Stub } else if ("service".equals(cmd)) { String[] newArgs; String name; - int[] users = null; if (opti >= args.length) { name = null; newArgs = EMPTY_STRING_ARRAY; } else { name = args[opti]; opti++; - if ("--user".equals(name) && opti < args.length) { - int userId = UserHandle.parseUserArg(args[opti]); - opti++; - if (userId != UserHandle.USER_ALL) { - if (userId == UserHandle.USER_CURRENT) { - userId = getCurrentUser().id; - } - users = new int[] { userId }; - } - name = args[opti]; - opti++; - } newArgs = new String[args.length - opti]; if (args.length > 2) System.arraycopy(args, opti, newArgs, 0, args.length - opti); } + int[] users = dumpUserId == UserHandle.USER_ALL ? null : new int[] { dumpUserId }; if (!mServices.dumpService(fd, pw, name, users, newArgs, 0, dumpAll)) { pw.println("No services match: " + name); pw.println("Use -h for help."); @@ -9480,7 +9480,7 @@ public class ActivityManagerService extends IActivityManager.Stub } else { // Dumping a single activity? if (!mAtmInternal.dumpActivity(fd, pw, cmd, args, opti, dumpAll, - dumpVisibleStacksOnly, dumpFocusedStackOnly)) { + dumpVisibleStacksOnly, dumpFocusedStackOnly, dumpUserId)) { ActivityManagerShellCommand shell = new ActivityManagerShellCommand(this, true); int res = shell.exec(this, null, fd, null, args, null, new ResultReceiver(null)); diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 3491cd59ebb7..49a935ebadc9 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -479,6 +479,8 @@ public class BtHelper { } if (profile == BluetoothProfile.A2DP) { mA2dp = (BluetoothA2dp) proxy; + } else if (profile == BluetoothProfile.HEARING_AID) { + mHearingAid = (BluetoothHearingAid) proxy; } else if (profile == BluetoothProfile.LE_AUDIO) { mLeAudio = (BluetoothLeAudio) proxy; } diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 7550d7e25de5..9d92a9e441da 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -2463,7 +2463,7 @@ public final class DisplayManagerService extends SystemService { pw.println(" mMinimumBrightnessCurve=" + mMinimumBrightnessCurve); if (mUserPreferredMode != null) { - pw.println(mUserPreferredMode); + pw.println(" mUserPreferredMode=" + mUserPreferredMode); } pw.println(); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 2e80efb957d4..7a0cf4b592e7 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -884,20 +884,26 @@ final class LocalDisplayAdapter extends DisplayAdapter { public void setUserPreferredDisplayModeLocked(Display.Mode mode) { final int oldModeId = getPreferredModeId(); mUserPreferredMode = mode; - if (mode != null && (mode.isRefreshRateSet() ^ mode.isResolutionSet())) { - mUserPreferredMode = findMode(mode.getPhysicalWidth(), + if (mode != null && (mode.isRefreshRateSet() || mode.isResolutionSet())) { + Display.Mode matchingSupportedMode; + matchingSupportedMode = findMode(mode.getPhysicalWidth(), mode.getPhysicalHeight(), mode.getRefreshRate()); + if (matchingSupportedMode != null) { + mUserPreferredMode = matchingSupportedMode; + } } - mUserPreferredModeId = findUserPreferredModeIdLocked(mode); - if (oldModeId != getPreferredModeId()) { - updateDeviceInfoLocked(); + mUserPreferredModeId = findUserPreferredModeIdLocked(mUserPreferredMode); + + if (oldModeId == getPreferredModeId()) { + return; } + updateDeviceInfoLocked(); if (!mSurfaceControlProxy.getBootDisplayModeSupport()) { return; } - if (mUserPreferredMode == null) { + if (mUserPreferredModeId == INVALID_MODE_ID) { mSurfaceControlProxy.clearBootDisplayMode(getDisplayTokenLocked()); } else { int preferredSfDisplayModeId = findSfDisplayModeIdLocked( diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java index 76754d3e95d5..4a1a950c6a07 100644 --- a/services/core/java/com/android/server/dreams/DreamController.java +++ b/services/core/java/com/android/server/dreams/DreamController.java @@ -104,7 +104,7 @@ final class DreamController { pw.println(" mCurrentDream:"); pw.println(" mToken=" + mCurrentDream.mToken); pw.println(" mName=" + mCurrentDream.mName); - pw.println(" mIsTest=" + mCurrentDream.mIsTest); + pw.println(" mIsPreviewMode=" + mCurrentDream.mIsPreviewMode); pw.println(" mCanDoze=" + mCurrentDream.mCanDoze); pw.println(" mUserId=" + mCurrentDream.mUserId); pw.println(" mBound=" + mCurrentDream.mBound); @@ -117,7 +117,7 @@ final class DreamController { } public void startDream(Binder token, ComponentName name, - boolean isTest, boolean canDoze, int userId, PowerManager.WakeLock wakeLock, + boolean isPreviewMode, boolean canDoze, int userId, PowerManager.WakeLock wakeLock, ComponentName overlayComponentName) { stopDream(true /*immediate*/, "starting new dream"); @@ -127,10 +127,10 @@ final class DreamController { mContext.sendBroadcastAsUser(mCloseNotificationShadeIntent, UserHandle.ALL); Slog.i(TAG, "Starting dream: name=" + name - + ", isTest=" + isTest + ", canDoze=" + canDoze + + ", isPreviewMode=" + isPreviewMode + ", canDoze=" + canDoze + ", userId=" + userId); - mCurrentDream = new DreamRecord(token, name, isTest, canDoze, userId, wakeLock); + mCurrentDream = new DreamRecord(token, name, isPreviewMode, canDoze, userId, wakeLock); mDreamStartTime = SystemClock.elapsedRealtime(); MetricsLogger.visible(mContext, @@ -140,6 +140,7 @@ final class DreamController { intent.setComponent(name); intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); intent.putExtra(DreamService.EXTRA_DREAM_OVERLAY_COMPONENT, overlayComponentName); + intent.putExtra(DreamService.EXTRA_IS_PREVIEW, isPreviewMode); try { if (!mContext.bindServiceAsUser(intent, mCurrentDream, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, @@ -190,7 +191,8 @@ final class DreamController { final DreamRecord oldDream = mCurrentDream; mCurrentDream = null; Slog.i(TAG, "Stopping dream: name=" + oldDream.mName - + ", isTest=" + oldDream.mIsTest + ", canDoze=" + oldDream.mCanDoze + + ", isPreviewMode=" + oldDream.mIsPreviewMode + + ", canDoze=" + oldDream.mCanDoze + ", userId=" + oldDream.mUserId + ", reason='" + reason + "'" + (mSavedStopReason == null ? "" : "(from '" + mSavedStopReason + "')")); @@ -247,7 +249,7 @@ final class DreamController { mCurrentDream.mService = service; - if (!mCurrentDream.mIsTest) { + if (!mCurrentDream.mIsPreviewMode) { mContext.sendBroadcastAsUser(mDreamingStartedIntent, UserHandle.ALL); mCurrentDream.mSentStartBroadcast = true; } @@ -263,7 +265,7 @@ final class DreamController { private final class DreamRecord implements DeathRecipient, ServiceConnection { public final Binder mToken; public final ComponentName mName; - public final boolean mIsTest; + public final boolean mIsPreviewMode; public final boolean mCanDoze; public final int mUserId; @@ -275,11 +277,11 @@ final class DreamController { public boolean mWakingGently; - public DreamRecord(Binder token, ComponentName name, - boolean isTest, boolean canDoze, int userId, PowerManager.WakeLock wakeLock) { + DreamRecord(Binder token, ComponentName name, boolean isPreviewMode, + boolean canDoze, int userId, PowerManager.WakeLock wakeLock) { mToken = token; mName = name; - mIsTest = isTest; + mIsPreviewMode = isPreviewMode; mCanDoze = canDoze; mUserId = userId; mWakeLock = wakeLock; diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index f0a6af3c8834..22d32a665611 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -87,7 +87,7 @@ public final class DreamManagerService extends SystemService { private Binder mCurrentDreamToken; private ComponentName mCurrentDreamName; private int mCurrentDreamUserId; - private boolean mCurrentDreamIsTest; + private boolean mCurrentDreamIsPreview; private boolean mCurrentDreamCanDoze; private boolean mCurrentDreamIsDozing; private boolean mCurrentDreamIsWaking; @@ -169,7 +169,7 @@ public final class DreamManagerService extends SystemService { pw.println("mCurrentDreamToken=" + mCurrentDreamToken); pw.println("mCurrentDreamName=" + mCurrentDreamName); pw.println("mCurrentDreamUserId=" + mCurrentDreamUserId); - pw.println("mCurrentDreamIsTest=" + mCurrentDreamIsTest); + pw.println("mCurrentDreamIsPreview=" + mCurrentDreamIsPreview); pw.println("mCurrentDreamCanDoze=" + mCurrentDreamCanDoze); pw.println("mCurrentDreamIsDozing=" + mCurrentDreamIsDozing); pw.println("mCurrentDreamIsWaking=" + mCurrentDreamIsWaking); @@ -190,7 +190,7 @@ public final class DreamManagerService extends SystemService { private boolean isDreamingInternal() { synchronized (mLock) { - return mCurrentDreamToken != null && !mCurrentDreamIsTest + return mCurrentDreamToken != null && !mCurrentDreamIsPreview && !mCurrentDreamIsWaking; } } @@ -235,7 +235,7 @@ public final class DreamManagerService extends SystemService { private void testDreamInternal(ComponentName dream, int userId) { synchronized (mLock) { - startDreamLocked(dream, true /*isTest*/, false /*canDoze*/, userId); + startDreamLocked(dream, true /*isPreviewMode*/, false /*canDoze*/, userId); } } @@ -244,7 +244,7 @@ public final class DreamManagerService extends SystemService { final ComponentName dream = chooseDreamForUser(doze, userId); if (dream != null) { synchronized (mLock) { - startDreamLocked(dream, false /*isTest*/, doze, userId); + startDreamLocked(dream, false /*isPreviewMode*/, doze, userId); } } } @@ -395,10 +395,10 @@ public final class DreamManagerService extends SystemService { } private void startDreamLocked(final ComponentName name, - final boolean isTest, final boolean canDoze, final int userId) { + final boolean isPreviewMode, final boolean canDoze, final int userId) { if (!mCurrentDreamIsWaking && Objects.equals(mCurrentDreamName, name) - && mCurrentDreamIsTest == isTest + && mCurrentDreamIsPreview == isPreviewMode && mCurrentDreamCanDoze == canDoze && mCurrentDreamUserId == userId) { Slog.i(TAG, "Already in target dream."); @@ -412,7 +412,7 @@ public final class DreamManagerService extends SystemService { final Binder newToken = new Binder(); mCurrentDreamToken = newToken; mCurrentDreamName = name; - mCurrentDreamIsTest = isTest; + mCurrentDreamIsPreview = isPreviewMode; mCurrentDreamCanDoze = canDoze; mCurrentDreamUserId = userId; @@ -424,7 +424,7 @@ public final class DreamManagerService extends SystemService { .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "startDream"); mHandler.post(wakeLock.wrap(() -> { mAtmInternal.notifyDreamStateChanged(true); - mController.startDream(newToken, name, isTest, canDoze, userId, wakeLock, + mController.startDream(newToken, name, isPreviewMode, canDoze, userId, wakeLock, mDreamOverlayServiceName); })); } @@ -457,7 +457,7 @@ public final class DreamManagerService extends SystemService { } mCurrentDreamToken = null; mCurrentDreamName = null; - mCurrentDreamIsTest = false; + mCurrentDreamIsPreview = false; mCurrentDreamCanDoze = false; mCurrentDreamUserId = 0; mCurrentDreamIsWaking = false; diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index c15242a45482..140a28f111e6 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -144,6 +144,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; +import java.util.OptionalInt; /* * Wraps the C++ InputManager and provides its callbacks. @@ -2915,48 +2916,17 @@ public class InputManagerService extends IInputManager.Stub // Native callback @SuppressWarnings("unused") - private void notifyWindowUnresponsive(IBinder token, String reason) { - int gestureMonitorPid = -1; - synchronized (mInputMonitors) { - final GestureMonitorSpyWindow gestureMonitor = mInputMonitors.get(token); - if (gestureMonitor != null) { - gestureMonitorPid = gestureMonitor.mWindowHandle.ownerPid; - } - } - if (gestureMonitorPid != -1) { - mWindowManagerCallbacks.notifyGestureMonitorUnresponsive(gestureMonitorPid, reason); - return; - } - mWindowManagerCallbacks.notifyWindowUnresponsive(token, reason); - } - - // Native callback - @SuppressWarnings("unused") - private void notifyMonitorUnresponsive(int pid, String reason) { - mWindowManagerCallbacks.notifyGestureMonitorUnresponsive(pid, reason); + private void notifyWindowUnresponsive(IBinder token, int pid, boolean isPidValid, + String reason) { + mWindowManagerCallbacks.notifyWindowUnresponsive(token, + isPidValid ? OptionalInt.of(pid) : OptionalInt.empty(), reason); } // Native callback @SuppressWarnings("unused") - private void notifyWindowResponsive(IBinder token) { - int gestureMonitorPid = -1; - synchronized (mInputMonitors) { - final GestureMonitorSpyWindow gestureMonitor = mInputMonitors.get(token); - if (gestureMonitor != null) { - gestureMonitorPid = gestureMonitor.mWindowHandle.ownerPid; - } - } - if (gestureMonitorPid != -1) { - mWindowManagerCallbacks.notifyGestureMonitorResponsive(gestureMonitorPid); - return; - } - mWindowManagerCallbacks.notifyWindowResponsive(token); - } - - // Native callback - @SuppressWarnings("unused") - private void notifyMonitorResponsive(int pid) { - mWindowManagerCallbacks.notifyGestureMonitorResponsive(pid); + private void notifyWindowResponsive(IBinder token, int pid, boolean isPidValid) { + mWindowManagerCallbacks.notifyWindowResponsive(token, + isPidValid ? OptionalInt.of(pid) : OptionalInt.empty()); } // Native callback. @@ -3329,34 +3299,22 @@ public class InputManagerService extends IInputManager.Stub void notifyNoFocusedWindowAnr(InputApplicationHandle applicationHandle); /** - * Notify the window manager about a gesture monitor that is unresponsive. - * - * @param pid the pid of the gesture monitor process - * @param reason the reason why this connection is unresponsive - */ - void notifyGestureMonitorUnresponsive(int pid, @NonNull String reason); - - /** * Notify the window manager about a window that is unresponsive. * * @param token the token that can be used to look up the window + * @param pid the pid of the window owner, if known * @param reason the reason why this connection is unresponsive */ - void notifyWindowUnresponsive(@NonNull IBinder token, @NonNull String reason); - - /** - * Notify the window manager about a gesture monitor that has become responsive. - * - * @param pid the pid of the gesture monitor process - */ - void notifyGestureMonitorResponsive(int pid); + void notifyWindowUnresponsive(@NonNull IBinder token, @NonNull OptionalInt pid, + @NonNull String reason); /** * Notify the window manager about a window that has become responsive. * * @param token the token that can be used to look up the window + * @param pid the pid of the window owner, if known */ - void notifyWindowResponsive(@NonNull IBinder token); + void notifyWindowResponsive(@NonNull IBinder token, @NonNull OptionalInt pid); /** * This callback is invoked when an event first arrives to InputDispatcher and before it is diff --git a/services/core/java/com/android/server/inputmethod/ImePlatformCompatUtils.java b/services/core/java/com/android/server/inputmethod/ImePlatformCompatUtils.java new file mode 100644 index 000000000000..83ca16d72c9b --- /dev/null +++ b/services/core/java/com/android/server/inputmethod/ImePlatformCompatUtils.java @@ -0,0 +1,64 @@ +/* + * 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.server.inputmethod; + +import static android.inputmethodservice.InputMethodService.FINISH_INPUT_NO_FALLBACK_CONNECTION; +import static android.view.inputmethod.InputMethodManager.CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING; + +import android.content.Context; +import android.os.RemoteException; +import android.os.ServiceManager; + +import com.android.internal.compat.IPlatformCompat; + +/** + * A utility class used by {@link InputMethodManagerService} to manage the platform + * compatibility changes on IMF (Input Method Framework) side. + */ +final class ImePlatformCompatUtils { + private final IPlatformCompat mPlatformCompat = IPlatformCompat.Stub.asInterface( + ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); + + /** + * Whether to finish the {@link android.view.inputmethod.InputConnection} when the device + * becomes {@link android.os.PowerManager#isInteractive non-interactive}. + * + * @param imeUid The uid of the IME application + */ + public boolean shouldFinishInputWithReportToIme(int imeUid) { + return isChangeEnabledByUid(FINISH_INPUT_NO_FALLBACK_CONNECTION, imeUid); + } + + /** + * Whether to clear {@link android.view.inputmethod.InputMethodManager#SHOW_FORCED} flag + * when the next IME focused application changed. + * + * @param clientUid The uid of the app + */ + public boolean shouldClearShowForcedFlag(int clientUid) { + return isChangeEnabledByUid(CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING, clientUid); + } + + private boolean isChangeEnabledByUid(long changeFlag, int uid) { + boolean result = false; + try { + result = mPlatformCompat.isChangeEnabledByUid(changeFlag, uid); + } catch (RemoteException e) { + } + return result; + } +} diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 0b7e39136feb..eb1de2a9bf91 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -15,7 +15,6 @@ package com.android.server.inputmethod; -import static android.inputmethodservice.InputMethodService.FINISH_INPUT_NO_FALLBACK_CONNECTION; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; import static android.os.IServiceManager.DUMP_FLAG_PROTO; @@ -148,7 +147,6 @@ import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.annotations.GuardedBy; -import com.android.internal.compat.IPlatformCompat; import com.android.internal.content.PackageMonitor; import com.android.internal.infra.AndroidFuture; import com.android.internal.inputmethod.DirectBootAwareness; @@ -279,6 +277,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub final WindowManagerInternal mWindowManagerInternal; final PackageManagerInternal mPackageManagerInternal; final InputManagerInternal mInputManagerInternal; + final ImePlatformCompatUtils mImePlatformCompatUtils; final boolean mHasFeature; private final ArrayMap<String, List<InputMethodSubtype>> mAdditionalSubtypeMap = new ArrayMap<>(); @@ -691,8 +690,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub */ boolean mIsInteractive = true; - private final IPlatformCompat mPlatformCompat; - int mBackDisposition = InputMethodService.BACK_DISPOSITION_DEFAULT; /** @@ -1627,6 +1624,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class); mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); mInputManagerInternal = LocalServices.getService(InputManagerInternal.class); + mImePlatformCompatUtils = new ImePlatformCompatUtils(); mImeDisplayValidator = mWindowManagerInternal::getDisplayImePolicy; mAppOpsManager = mContext.getSystemService(AppOpsManager.class); mUserManager = mContext.getSystemService(UserManager.class); @@ -1634,8 +1632,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mAccessibilityManager = AccessibilityManager.getInstance(context); mHasFeature = context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_INPUT_METHODS); - mPlatformCompat = IPlatformCompat.Stub.asInterface( - ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); + mSlotIme = mContext.getString(com.android.internal.R.string.status_bar_ime); Bundle extras = new Bundle(); @@ -3620,6 +3617,14 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub return InputBindResult.INVALID_USER; } + final boolean shouldClearFlag = mImePlatformCompatUtils.shouldClearShowForcedFlag(cs.uid); + // In case mShowForced flag affects the next client to keep IME visible, when the current + // client is leaving due to the next focused client, we clear mShowForced flag when the + // next client's targetSdkVersion is T or higher. + if (mCurFocusedWindow != windowToken && mShowForced && shouldClearFlag) { + mShowForced = false; + } + // cross-profile access is always allowed here to allow profile-switching. if (!mSettings.isCurrentProfile(userId)) { Slog.w(TAG, "A background user is requesting window. Hiding IME."); @@ -4728,14 +4733,9 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // Inform the current client of the change in active status if (mCurClient != null && mCurClient.client != null) { - boolean reportToImeController = false; - try { - reportToImeController = mPlatformCompat.isChangeEnabledByUid( - FINISH_INPUT_NO_FALLBACK_CONNECTION, getCurMethodUidLocked()); - } catch (RemoteException e) { - } scheduleSetActiveToClient(mCurClient, mIsInteractive, mInFullscreenMode, - reportToImeController); + mImePlatformCompatUtils.shouldFinishInputWithReportToIme( + getCurMethodUidLocked())); } } } diff --git a/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java b/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java index a290eb3a3e2f..ea3a3d5f1c60 100644 --- a/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java +++ b/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java @@ -168,6 +168,7 @@ public class RuleBinaryParser implements RuleParser { switch (key) { case AtomicFormula.PACKAGE_NAME: case AtomicFormula.APP_CERTIFICATE: + case AtomicFormula.APP_CERTIFICATE_LINEAGE: case AtomicFormula.INSTALLER_NAME: case AtomicFormula.INSTALLER_CERTIFICATE: case AtomicFormula.STAMP_CERTIFICATE_HASH: diff --git a/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java b/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java index 01aee7bc1942..db81393a9ad6 100644 --- a/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java +++ b/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java @@ -34,7 +34,6 @@ import android.content.pm.PackageManagerInternal; import android.os.Binder; import android.os.HandlerThread; import android.os.LocaleList; -import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; import android.text.TextUtils; @@ -45,7 +44,6 @@ import android.util.TypedXmlSerializer; import android.util.Xml; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.content.PackageMonitor; import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; @@ -89,32 +87,24 @@ class LocaleManagerBackupHelper { // SparseArray because it is more memory-efficient than a HashMap. private final SparseArray<StagedData> mStagedData; - private final PackageMonitor mPackageMonitor; private final BroadcastReceiver mUserMonitor; LocaleManagerBackupHelper(LocaleManagerService localeManagerService, - PackageManagerInternal pmInternal) { + PackageManagerInternal pmInternal, HandlerThread broadcastHandlerThread) { this(localeManagerService.mContext, localeManagerService, pmInternal, Clock.systemUTC(), - new SparseArray<>()); + new SparseArray<>(), broadcastHandlerThread); } @VisibleForTesting LocaleManagerBackupHelper(Context context, LocaleManagerService localeManagerService, - PackageManagerInternal pmInternal, Clock clock, SparseArray<StagedData> stagedData) { + PackageManagerInternal pmInternal, Clock clock, SparseArray<StagedData> stagedData, + HandlerThread broadcastHandlerThread) { mContext = context; mLocaleManagerService = localeManagerService; mPackageManagerInternal = pmInternal; mClock = clock; mStagedData = stagedData; - HandlerThread broadcastHandlerThread = new HandlerThread(TAG, - Process.THREAD_PRIORITY_BACKGROUND); - broadcastHandlerThread.start(); - - mPackageMonitor = new PackageMonitorImpl(); - mPackageMonitor.register(context, broadcastHandlerThread.getLooper(), - UserHandle.ALL, - true); mUserMonitor = new UserMonitor(); IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_USER_REMOVED); @@ -127,11 +117,6 @@ class LocaleManagerBackupHelper { return mUserMonitor; } - @VisibleForTesting - PackageMonitor getPackageMonitor() { - return mPackageMonitor; - } - /** * @see LocaleManagerInternal#getBackupPayload(int userId) */ @@ -267,6 +252,53 @@ class LocaleManagerBackupHelper { BackupManager.dataChanged(SYSTEM_BACKUP_PACKAGE_KEY); } + /** + * <p><b>Note:</b> This is invoked by service's common monitor + * {@link LocaleManagerServicePackageMonitor#onPackageAdded} when a new package is + * added on device. + */ + void onPackageAdded(String packageName, int uid) { + try { + synchronized (mStagedDataLock) { + cleanStagedDataForOldEntriesLocked(); + + int userId = UserHandle.getUserId(uid); + if (mStagedData.contains(userId)) { + // Perform lazy restore only if the staged data exists. + doLazyRestoreLocked(packageName, userId); + } + } + } catch (Exception e) { + Slog.e(TAG, "Exception in onPackageAdded.", e); + } + } + + /** + * <p><b>Note:</b> This is invoked by service's common monitor + * {@link LocaleManagerServicePackageMonitor#onPackageDataCleared} when a package's data + * is cleared. + */ + void onPackageDataCleared() { + try { + notifyBackupManager(); + } catch (Exception e) { + Slog.e(TAG, "Exception in onPackageDataCleared.", e); + } + } + + /** + * <p><b>Note:</b> This is invoked by service's common monitor + * {@link LocaleManagerServicePackageMonitor#onPackageRemoved} when a package is removed + * from device. + */ + void onPackageRemoved() { + try { + notifyBackupManager(); + } catch (Exception e) { + Slog.e(TAG, "Exception in onPackageRemoved.", e); + } + } + private boolean isPackageInstalledForUser(String packageName, int userId) { PackageInfo pkgInfo = null; try { @@ -395,48 +427,6 @@ class LocaleManagerBackupHelper { } /** - * Helper to monitor package states. - * - * <p>We're interested in package added, package data cleared and package removed events. - */ - private final class PackageMonitorImpl extends PackageMonitor { - @Override - public void onPackageAdded(String packageName, int uid) { - try { - synchronized (mStagedDataLock) { - cleanStagedDataForOldEntriesLocked(); - - int userId = UserHandle.getUserId(uid); - if (mStagedData.contains(userId)) { - // Perform lazy restore only if the staged data exists. - doLazyRestoreLocked(packageName, userId); - } - } - } catch (Exception e) { - Slog.e(TAG, "Exception in onPackageAdded.", e); - } - } - - @Override - public void onPackageDataCleared(String packageName, int uid) { - try { - notifyBackupManager(); - } catch (Exception e) { - Slog.e(TAG, "Exception in onPackageDataCleared.", e); - } - } - - @Override - public void onPackageRemoved(String packageName, int uid) { - try { - notifyBackupManager(); - } catch (Exception e) { - Slog.e(TAG, "Exception in onPackageRemoved.", e); - } - } - } - - /** * Performs lazy restore from the staged data. * * <p>This is invoked by the package monitor on the package added callback. diff --git a/services/core/java/com/android/server/locales/LocaleManagerService.java b/services/core/java/com/android/server/locales/LocaleManagerService.java index d459f8df99b6..c42770555bab 100644 --- a/services/core/java/com/android/server/locales/LocaleManagerService.java +++ b/services/core/java/com/android/server/locales/LocaleManagerService.java @@ -29,6 +29,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.os.Binder; +import android.os.HandlerThread; import android.os.LocaleList; import android.os.Process; import android.os.RemoteException; @@ -38,14 +39,13 @@ import android.os.UserHandle; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.DumpUtils; +import com.android.internal.content.PackageMonitor; import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.wm.ActivityTaskManagerInternal; import java.io.FileDescriptor; -import java.io.PrintWriter; /** * The implementation of ILocaleManager.aidl. @@ -62,6 +62,8 @@ public class LocaleManagerService extends SystemService { private LocaleManagerBackupHelper mBackupHelper; + private final PackageMonitor mPackageMonitor; + public static final boolean DEBUG = false; public LocaleManagerService(Context context) { @@ -71,15 +73,26 @@ public class LocaleManagerService extends SystemService { mActivityTaskManagerInternal = LocalServices.getService(ActivityTaskManagerInternal.class); mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); + + HandlerThread broadcastHandlerThread = new HandlerThread(TAG, + Process.THREAD_PRIORITY_BACKGROUND); + broadcastHandlerThread.start(); + mBackupHelper = new LocaleManagerBackupHelper(this, - mPackageManagerInternal); + mPackageManagerInternal, broadcastHandlerThread); + + mPackageMonitor = new LocaleManagerServicePackageMonitor(mBackupHelper); + mPackageMonitor.register(context, broadcastHandlerThread.getLooper(), + UserHandle.ALL, + true); } @VisibleForTesting LocaleManagerService(Context context, ActivityTaskManagerInternal activityTaskManagerInternal, ActivityManagerInternal activityManagerInternal, PackageManagerInternal packageManagerInternal, - LocaleManagerBackupHelper localeManagerBackupHelper) { + LocaleManagerBackupHelper localeManagerBackupHelper, + PackageMonitor packageMonitor) { super(context); mContext = context; mBinderService = new LocaleManagerBinderService(); @@ -87,6 +100,7 @@ public class LocaleManagerService extends SystemService { mActivityManagerInternal = activityManagerInternal; mPackageManagerInternal = packageManagerInternal; mBackupHelper = localeManagerBackupHelper; + mPackageMonitor = packageMonitor; } @Override @@ -130,11 +144,6 @@ public class LocaleManagerService extends SystemService { } @Override - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - LocaleManagerService.this.dump(fd, pw, args); - } - - @Override public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, String[] args, ShellCallback callback, ResultReceiver resultReceiver) { @@ -407,14 +416,6 @@ public class LocaleManagerService extends SystemService { return null; } - /** - * Dumps useful info related to service. - */ - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; - // TODO(b/201766221): Implement when there is state. - } - private void logMetric(@NonNull AppLocaleChangedAtomRecord atomRecordForMetrics) { FrameworkStatsLog.write(FrameworkStatsLog.APPLICATION_LOCALES_CHANGED, atomRecordForMetrics.mCallingUid, diff --git a/services/core/java/com/android/server/locales/LocaleManagerServicePackageMonitor.java b/services/core/java/com/android/server/locales/LocaleManagerServicePackageMonitor.java new file mode 100644 index 000000000000..b459be768b9f --- /dev/null +++ b/services/core/java/com/android/server/locales/LocaleManagerServicePackageMonitor.java @@ -0,0 +1,49 @@ +/* + * 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.server.locales; + +import com.android.internal.content.PackageMonitor; + +/** + * Helper to monitor package states inside {@link LocaleManagerService}. + * + * <p> These listeners forward the call to different aspects of locale service that + * handle the business logic. + * <p> We're interested in package added, package data cleared and package removed events. + */ +final class LocaleManagerServicePackageMonitor extends PackageMonitor { + private LocaleManagerBackupHelper mBackupHelper; + + LocaleManagerServicePackageMonitor(LocaleManagerBackupHelper localeManagerBackupHelper) { + mBackupHelper = localeManagerBackupHelper; + } + + @Override + public void onPackageAdded(String packageName, int uid) { + mBackupHelper.onPackageAdded(packageName, uid); + } + + @Override + public void onPackageDataCleared(String packageName, int uid) { + mBackupHelper.onPackageDataCleared(); + } + + @Override + public void onPackageRemoved(String packageName, int uid) { + mBackupHelper.onPackageRemoved(); + } +} diff --git a/services/core/java/com/android/server/location/LocationManagerService.java b/services/core/java/com/android/server/location/LocationManagerService.java index 45d9822205ec..fac510651878 100644 --- a/services/core/java/com/android/server/location/LocationManagerService.java +++ b/services/core/java/com/android/server/location/LocationManagerService.java @@ -1127,7 +1127,7 @@ public class LocationManagerService extends ILocationManager.Stub implements if (provider != null && !provider.equals(manager.getName())) { continue; } - CallerIdentity identity = manager.getIdentity(); + CallerIdentity identity = manager.getProviderIdentity(); if (identity == null) { continue; } @@ -1149,7 +1149,7 @@ public class LocationManagerService extends ILocationManager.Stub implements return Collections.emptyList(); } - CallerIdentity identity = manager.getIdentity(); + CallerIdentity identity = manager.getProviderIdentity(); if (identity == null) { return Collections.emptyList(); } @@ -1536,7 +1536,7 @@ public class LocationManagerService extends ILocationManager.Stub implements if (!enabled) { PackageTagsList.Builder builder = new PackageTagsList.Builder(); for (LocationProviderManager manager : mProviderManagers) { - CallerIdentity identity = manager.getIdentity(); + CallerIdentity identity = manager.getProviderIdentity(); if (identity != null) { builder.add(identity.getPackageName(), identity.getAttributionTag()); } @@ -1624,7 +1624,7 @@ public class LocationManagerService extends ILocationManager.Stub implements if (provider != null && !provider.equals(manager.getName())) { continue; } - if (identity.equals(manager.getIdentity())) { + if (identity.equals(manager.getProviderIdentity())) { return true; } } @@ -1665,7 +1665,7 @@ public class LocationManagerService extends ILocationManager.Stub implements if (listener != null) { ArraySet<Integer> uids = new ArraySet<>(mProviderManagers.size()); for (LocationProviderManager manager : mProviderManagers) { - CallerIdentity identity = manager.getIdentity(); + CallerIdentity identity = manager.getProviderIdentity(); if (identity != null) { uids.add(identity.getUid()); } diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java index 0b8f94c574c6..acbee11f3b72 100644 --- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java @@ -1468,7 +1468,7 @@ public class LocationProviderManager extends return mProvider.getState(); } - public @Nullable CallerIdentity getIdentity() { + public @Nullable CallerIdentity getProviderIdentity() { return mProvider.getState().identity; } @@ -1607,7 +1607,7 @@ public class LocationProviderManager extends public @Nullable Location getLastLocation(LastLocationRequest request, CallerIdentity identity, @PermissionLevel int permissionLevel) { - request = calculateLastLocationRequest(request); + request = calculateLastLocationRequest(request, identity); if (!isActive(request.isBypass(), identity)) { return null; @@ -1636,15 +1636,16 @@ public class LocationProviderManager extends return location; } - private LastLocationRequest calculateLastLocationRequest(LastLocationRequest baseRequest) { + private LastLocationRequest calculateLastLocationRequest(LastLocationRequest baseRequest, + CallerIdentity identity) { LastLocationRequest.Builder builder = new LastLocationRequest.Builder(baseRequest); boolean locationSettingsIgnored = baseRequest.isLocationSettingsIgnored(); if (locationSettingsIgnored) { // if we are not currently allowed use location settings ignored, disable it if (!mSettingsHelper.getIgnoreSettingsAllowlist().contains( - getIdentity().getPackageName(), getIdentity().getAttributionTag()) - && !mLocationManagerInternal.isProvider(null, getIdentity())) { + identity.getPackageName(), identity.getAttributionTag()) + && !mLocationManagerInternal.isProvider(null, identity)) { locationSettingsIgnored = false; } @@ -1658,7 +1659,7 @@ public class LocationProviderManager extends Log.e(TAG, "adas gnss bypass request received in non-gps provider"); adasGnssBypass = false; } else if (!mLocationSettings.getUserSettings( - getIdentity().getUserId()).isAdasGnssLocationEnabled()) { + identity.getUserId()).isAdasGnssLocationEnabled()) { adasGnssBypass = false; } diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 96391ac62530..92703ec86d06 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -61,6 +61,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.NoSuchElementException; /** * This is the system implementation of a Session. Apps will interact with the @@ -647,18 +648,17 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR if (mDestroyed) { return; } - toSend = new ArrayList<>(); - if (mQueue != null) { - toSend.ensureCapacity(mQueue.size()); - toSend.addAll(mQueue); - } + toSend = mQueue == null ? null : new ArrayList<>(mQueue); } Collection<ISessionControllerCallbackHolder> deadCallbackHolders = null; for (ISessionControllerCallbackHolder holder : mControllerCallbackHolders) { - ParceledListSlice<QueueItem> parcelableQueue = new ParceledListSlice<>(toSend); - // Limit the size of initial Parcel to prevent binder buffer overflow - // as onQueueChanged is an async binder call. - parcelableQueue.setInlineCountLimit(1); + ParceledListSlice<QueueItem> parcelableQueue = null; + if (toSend != null) { + parcelableQueue = new ParceledListSlice<>(toSend); + // Limit the size of initial Parcel to prevent binder buffer overflow + // as onQueueChanged is an async binder call. + parcelableQueue.setInlineCountLimit(1); + } try { holder.mCallback.onQueueChanged(parcelableQueue); @@ -793,7 +793,10 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR } for (ISessionControllerCallbackHolder holder : mControllerCallbackHolders) { try { + holder.mCallback.asBinder().unlinkToDeath(holder.mDeathMonitor, 0); holder.mCallback.onSessionDestroyed(); + } catch (NoSuchElementException e) { + logCallbackException("error unlinking to binder death", holder, e); } catch (DeadObjectException e) { logCallbackException("Removing dead callback in pushSessionDestroyed", holder, e); } catch (RemoteException e) { @@ -1376,12 +1379,22 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR return; } if (getControllerHolderIndexForCb(cb) < 0) { - mControllerCallbackHolders.add(new ISessionControllerCallbackHolder(cb, - packageName, Binder.getCallingUid())); + ISessionControllerCallbackHolder holder = new ISessionControllerCallbackHolder( + cb, packageName, Binder.getCallingUid(), () -> unregisterCallback(cb)); + mControllerCallbackHolders.add(holder); if (DEBUG) { Log.d(TAG, "registering controller callback " + cb + " from controller" + packageName); } + // Avoid callback leaks + try { + // cb is not referenced outside of the MediaSessionRecord, so the death + // handler won't prevent MediaSessionRecord to be garbage collected. + cb.asBinder().linkToDeath(holder.mDeathMonitor, 0); + } catch (RemoteException e) { + unregisterCallback(cb); + Log.w(TAG, "registerCallback failed to linkToDeath", e); + } } } } @@ -1391,6 +1404,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR synchronized (mLock) { int index = getControllerHolderIndexForCb(cb); if (index != -1) { + try { + cb.asBinder().unlinkToDeath( + mControllerCallbackHolders.get(index).mDeathMonitor, 0); + } catch (NoSuchElementException e) { + Log.w(TAG, "error unlinking to binder death", e); + } mControllerCallbackHolders.remove(index); } if (DEBUG) { @@ -1601,12 +1620,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR private final ISessionControllerCallback mCallback; private final String mPackageName; private final int mUid; + private final IBinder.DeathRecipient mDeathMonitor; ISessionControllerCallbackHolder(ISessionControllerCallback callback, String packageName, - int uid) { + int uid, IBinder.DeathRecipient deathMonitor) { mCallback = callback; mPackageName = packageName; mUid = uid; + mDeathMonitor = deathMonitor; } } diff --git a/services/core/java/com/android/server/net/NetworkPolicyLogger.java b/services/core/java/com/android/server/net/NetworkPolicyLogger.java index 33ac6cdb269e..c9631549cd76 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyLogger.java +++ b/services/core/java/com/android/server/net/NetworkPolicyLogger.java @@ -77,6 +77,8 @@ public class NetworkPolicyLogger { private static final int EVENT_FIREWALL_CHAIN_ENABLED = 12; private static final int EVENT_UPDATE_METERED_RESTRICTED_PKGS = 13; private static final int EVENT_APP_IDLE_WL_CHANGED = 14; + private static final int EVENT_METERED_ALLOWLIST_CHANGED = 15; + private static final int EVENT_METERED_DENYLIST_CHANGED = 16; private final LogBuffer mNetworkBlockedBuffer = new LogBuffer(MAX_NETWORK_BLOCKED_LOG_SIZE); private final LogBuffer mUidStateChangeBuffer = new LogBuffer(MAX_LOG_SIZE); @@ -89,7 +91,7 @@ public class NetworkPolicyLogger { void networkBlocked(int uid, @Nullable UidBlockedState uidBlockedState) { synchronized (mLock) { if (LOGD || uid == mDebugUid) { - Slog.d(TAG, "Blocked state of uid: " + uidBlockedState.toString()); + Slog.d(TAG, "Blocked state of " + uid + ": " + uidBlockedState.toString()); } if (uidBlockedState == null) { mNetworkBlockedBuffer.networkBlocked(uid, BLOCKED_REASON_NONE, ALLOWED_REASON_NONE, @@ -245,6 +247,24 @@ public class NetworkPolicyLogger { } } + void meteredAllowlistChanged(int uid, boolean added) { + synchronized (mLock) { + if (LOGD || mDebugUid == uid) { + Slog.d(TAG, getMeteredAllowlistChangedLog(uid, added)); + } + mEventsBuffer.meteredAllowlistChanged(uid, added); + } + } + + void meteredDenylistChanged(int uid, boolean added) { + synchronized (mLock) { + if (LOGD || mDebugUid == uid) { + Slog.d(TAG, getMeteredDenylistChangedLog(uid, added)); + } + mEventsBuffer.meteredDenylistChanged(uid, added); + } + } + void setDebugUid(int uid) { mDebugUid = uid; } @@ -320,6 +340,14 @@ public class NetworkPolicyLogger { return "Firewall chain " + getFirewallChainName(chain) + " state: " + enabled; } + private static String getMeteredAllowlistChangedLog(int uid, boolean added) { + return "metered-allowlist for " + uid + " changed to " + added; + } + + private static String getMeteredDenylistChangedLog(int uid, boolean added) { + return "metered-denylist for " + uid + " changed to " + added; + } + private static String getFirewallChainName(int chain) { switch (chain) { case FIREWALL_CHAIN_DOZABLE: @@ -520,6 +548,28 @@ public class NetworkPolicyLogger { data.timeStamp = System.currentTimeMillis(); } + public void meteredAllowlistChanged(int uid, boolean added) { + final Data data = getNextSlot(); + if (data == null) return; + + data.reset(); + data.type = EVENT_METERED_ALLOWLIST_CHANGED; + data.ifield1 = uid; + data.bfield1 = added; + data.timeStamp = System.currentTimeMillis(); + } + + public void meteredDenylistChanged(int uid, boolean added) { + final Data data = getNextSlot(); + if (data == null) return; + + data.reset(); + data.type = EVENT_METERED_DENYLIST_CHANGED; + data.ifield1 = uid; + data.bfield1 = added; + data.timeStamp = System.currentTimeMillis(); + } + public void reverseDump(IndentingPrintWriter pw) { final Data[] allData = toArray(); for (int i = allData.length - 1; i >= 0; --i) { @@ -567,6 +617,10 @@ public class NetworkPolicyLogger { return getUidFirewallRuleChangedLog(data.ifield1, data.ifield2, data.ifield3); case EVENT_FIREWALL_CHAIN_ENABLED: return getFirewallChainEnabledLog(data.ifield1, data.bfield1); + case EVENT_METERED_ALLOWLIST_CHANGED: + return getMeteredAllowlistChangedLog(data.ifield1, data.bfield1); + case EVENT_METERED_DENYLIST_CHANGED: + return getMeteredDenylistChangedLog(data.ifield1, data.bfield1); default: return String.valueOf(data.type); } diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 60962b122fe7..48ad22cb12ff 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -4864,7 +4864,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { + ", isAllowed=" + isAllowed + ", isRestrictedByAdmin=" + isRestrictedByAdmin + ", oldBlockedState=" + previousUidBlockedState.toString() - + ", newBlockedState=" + + ", newBlockedState=" + uidBlockedState.toString() + ", oldBlockedMeteredReasons=" + NetworkPolicyManager.blockedReasonsToString( uidBlockedState.blockedReasons & BLOCKED_METERED_REASON_MASK) + ", oldBlockedMeteredEffectiveReasons=" @@ -5420,6 +5420,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (LOGV) Slog.v(TAG, "setMeteredNetworkDenylist " + uid + ": " + enable); try { mNetworkManager.setUidOnMeteredNetworkDenylist(uid, enable); + mLogger.meteredAllowlistChanged(uid, enable); } catch (IllegalStateException e) { Log.wtf(TAG, "problem setting denylist (" + enable + ") rules for " + uid, e); } catch (RemoteException e) { @@ -5431,6 +5432,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (LOGV) Slog.v(TAG, "setMeteredNetworkAllowlist " + uid + ": " + enable); try { mNetworkManager.setUidOnMeteredNetworkAllowlist(uid, enable); + mLogger.meteredDenylistChanged(uid, enable); } catch (IllegalStateException e) { Log.wtf(TAG, "problem setting allowlist (" + enable + ") rules for " + uid, e); } catch (RemoteException e) { @@ -5563,7 +5565,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { .setFirewallUidRule(FIREWALL_CHAIN_LOW_POWER_STANDBY, uid, FIREWALL_RULE_DEFAULT); mNetworkManager.setUidOnMeteredNetworkAllowlist(uid, false); + mLogger.meteredAllowlistChanged(uid, false); mNetworkManager.setUidOnMeteredNetworkDenylist(uid, false); + mLogger.meteredDenylistChanged(uid, false); } catch (IllegalStateException e) { Log.wtf(TAG, "problem resetting firewall uid rules for " + uid, e); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java index a9b2570a3dda..e09f7b09b4d1 100644 --- a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java +++ b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java @@ -40,11 +40,12 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Iterator; -import java.util.LinkedList; +import java.util.List; import java.util.Set; /** @@ -76,7 +77,7 @@ public class NotificationHistoryDatabase { private final Handler mFileWriteHandler; @VisibleForTesting // List of files holding history information, sorted newest to oldest - final LinkedList<AtomicFile> mHistoryFiles; + final List<AtomicFile> mHistoryFiles; private final File mHistoryDir; private final File mVersionFile; // Current version of the database files schema @@ -94,7 +95,7 @@ public class NotificationHistoryDatabase { mFileWriteHandler = fileWriteHandler; mVersionFile = new File(dir, "version"); mHistoryDir = new File(dir, "history"); - mHistoryFiles = new LinkedList<>(); + mHistoryFiles = new ArrayList<>(); mBuffer = new NotificationHistory(); mWriteBufferRunnable = new WriteBufferRunnable(); @@ -133,7 +134,7 @@ public class NotificationHistoryDatabase { safeParseLong(lhs.getName()))); for (File file : files) { - mHistoryFiles.addLast(new AtomicFile(file)); + mHistoryFiles.add(new AtomicFile(file)); } } @@ -411,7 +412,7 @@ public class NotificationHistoryDatabase { + file.getBaseFile().getAbsolutePath()); try { writeLocked(file, mBuffer); - mHistoryFiles.addFirst(file); + mHistoryFiles.add(0, file); mBuffer = new NotificationHistory(); scheduleDeletion(file.getBaseFile(), time, HISTORY_RETENTION_DAYS); diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 16b5fb1e4d7a..a711b442c450 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -775,7 +775,7 @@ public class NotificationManagerService extends SystemService { ArraySet<String> defaultDnds = mConditionProviders.getDefaultPackages(); for (int i = 0; i < defaultDnds.size(); i++) { - allowDndPackage(defaultDnds.valueAt(i)); + allowDndPackage(userId, defaultDnds.valueAt(i)); } setDefaultAssistantForUser(userId); @@ -875,9 +875,9 @@ public class NotificationManagerService extends SystemService { } } - private void allowDndPackage(String packageName) { + private void allowDndPackage(int userId, String packageName) { try { - getBinderService().setNotificationPolicyAccessGranted(packageName, true); + getBinderService().setNotificationPolicyAccessGrantedForUser(packageName, userId, true); } catch (RemoteException e) { e.printStackTrace(); } diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index 66c7c5080114..bbdea32bed59 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -478,6 +478,7 @@ public final class NotificationRecord { pw.println(prefix + "opPkg=" + getSbn().getOpPkg()); pw.println(prefix + "icon=" + notification.getSmallIcon()); pw.println(prefix + "flags=0x" + Integer.toHexString(notification.flags)); + pw.println(prefix + "originalFlags=0x" + Integer.toHexString(mOriginalFlags)); pw.println(prefix + "pri=" + notification.priority); pw.println(prefix + "key=" + getSbn().getKey()); pw.println(prefix + "seen=" + mStats.hasSeen()); @@ -544,6 +545,7 @@ public final class NotificationRecord { if (notification == null) { pw.println(prefix + "None"); return; + } pw.println(prefix + "fullscreenIntent=" + notification.fullScreenIntent); pw.println(prefix + "contentIntent=" + notification.contentIntent); diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index a5067439db58..76d3d233d49a 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -347,6 +347,13 @@ public abstract class ApexManager { public abstract String getApexModuleNameForPackageName(String apexPackageName); /** + * Returns the package name of the active APEX whose name is {@code apexModuleName}. If not + * found, returns {@code null}. + */ + @Nullable + public abstract String getActivePackageNameForApexModuleName(String apexModuleName); + + /** * Copies the CE apex data directory for the given {@code userId} to a backup location, for use * in case of rollback. * @@ -484,6 +491,12 @@ public abstract class ApexManager { private ArrayMap<String, String> mPackageNameToApexModuleName; /** + * Reverse mapping of {@link #mPackageNameToApexModuleName}, for active packages only. + */ + @GuardedBy("mLock") + private ArrayMap<String, String> mApexModuleNameToActivePackageName; + + /** * Whether an APEX package is active or not. * * @param packageInfo the package to check @@ -551,6 +564,7 @@ public abstract class ApexManager { try { mAllPackagesCache = new ArrayList<>(); mPackageNameToApexModuleName = new ArrayMap<>(); + mApexModuleNameToActivePackageName = new ArrayMap<>(); allPkgs = waitForApexService().getAllPackages(); } catch (RemoteException re) { Slog.e(TAG, "Unable to retrieve packages from apexservice: " + re.toString()); @@ -633,6 +647,13 @@ public abstract class ApexManager { + packageInfo.packageName); } activePackagesSet.add(packageInfo.packageName); + if (mApexModuleNameToActivePackageName.containsKey(ai.moduleName)) { + throw new IllegalStateException( + "Two active packages have the same APEX module name: " + + ai.moduleName); + } + mApexModuleNameToActivePackageName.put( + ai.moduleName, packageInfo.packageName); } if (ai.isFactory) { // Don't throw when the duplicating APEX is VNDK APEX @@ -966,6 +987,16 @@ public abstract class ApexManager { } @Override + @Nullable + public String getActivePackageNameForApexModuleName(String apexModuleName) { + synchronized (mLock) { + Preconditions.checkState(mApexModuleNameToActivePackageName != null, + "APEX packages have not been scanned"); + return mApexModuleNameToActivePackageName.get(apexModuleName); + } + } + + @Override public boolean snapshotCeData(int userId, int rollbackId, String apexPackageName) { String apexModuleName; synchronized (mLock) { @@ -1390,6 +1421,12 @@ public abstract class ApexManager { } @Override + @Nullable + public String getActivePackageNameForApexModuleName(String apexModuleName) { + return null; + } + + @Override public boolean snapshotCeData(int userId, int rollbackId, String apexPackageName) { throw new UnsupportedOperationException(); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 4387249fa39e..cc93d4c1c3ff 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -330,6 +330,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { static public final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey"; static public final String SYSTEM_DIALOG_REASON_ASSIST = "assist"; static public final String SYSTEM_DIALOG_REASON_SCREENSHOT = "screenshot"; + static public final String SYSTEM_DIALOG_REASON_GESTURE_NAV = "gestureNav"; private static final String TALKBACK_LABEL = "TalkBack"; diff --git a/services/core/java/com/android/server/vibrator/StartSequentialEffectStep.java b/services/core/java/com/android/server/vibrator/StartSequentialEffectStep.java index b8885e81dbe2..080a36cb2a6e 100644 --- a/services/core/java/com/android/server/vibrator/StartSequentialEffectStep.java +++ b/services/core/java/com/android/server/vibrator/StartSequentialEffectStep.java @@ -55,13 +55,15 @@ final class StartSequentialEffectStep extends Step { private long mVibratorsOnMaxDuration; + /** Start a sequential effect at the beginning. */ StartSequentialEffectStep(VibrationStepConductor conductor, CombinedVibration.Sequential effect) { this(conductor, SystemClock.uptimeMillis() + effect.getDelays().get(0), effect, /* index= */ 0); } - StartSequentialEffectStep(VibrationStepConductor conductor, long startTime, + /** Continue a SequentialEffect from the specified index. */ + private StartSequentialEffectStep(VibrationStepConductor conductor, long startTime, CombinedVibration.Sequential effect, int index) { super(conductor, startTime); sequentialEffect = effect; @@ -123,8 +125,7 @@ final class StartSequentialEffectStep extends Step { /** * Create the next {@link StartSequentialEffectStep} to play this sequential effect, starting at - * the - * time this method is called, or null if sequence is complete. + * the time this method is called, or null if sequence is complete. */ @Nullable Step nextStep() { diff --git a/services/core/java/com/android/server/vibrator/VibrationStepConductor.java b/services/core/java/com/android/server/vibrator/VibrationStepConductor.java index 51691fbcdf5a..366763110565 100644 --- a/services/core/java/com/android/server/vibrator/VibrationStepConductor.java +++ b/services/core/java/com/android/server/vibrator/VibrationStepConductor.java @@ -16,11 +16,10 @@ package com.android.server.vibrator; -import android.annotation.NonNull; import android.annotation.Nullable; +import android.os.Build; import android.os.CombinedVibration; import android.os.VibrationEffect; -import android.os.WorkSource; import android.os.vibrator.PrebakedSegment; import android.os.vibrator.PrimitiveSegment; import android.os.vibrator.RampSegment; @@ -40,8 +39,15 @@ import java.util.Queue; /** * Creates and manages a queue of steps for performing a VibrationEffect, as well as coordinating * dispatch of callbacks. + * + * <p>In general, methods in this class are intended to be called only by a single instance of + * VibrationThread. The only thread-safe methods for calling from other threads are the "notify" + * methods (which should never be used from the VibrationThread thread). */ final class VibrationStepConductor { + private static final boolean DEBUG = VibrationThread.DEBUG; + private static final String TAG = VibrationThread.TAG; + /** * Extra timeout added to the end of each vibration step to ensure it finishes even when * vibrator callbacks are lost. @@ -51,32 +57,24 @@ final class VibrationStepConductor { static final float RAMP_OFF_AMPLITUDE_MIN = 1e-3f; static final List<Step> EMPTY_STEP_LIST = new ArrayList<>(); - final Object mLock = new Object(); + private final Object mLock = new Object(); // Used within steps. public final VibrationSettings vibrationSettings; public final DeviceVibrationEffectAdapter deviceEffectAdapter; public final VibrationThread.VibratorManagerHooks vibratorManagerHooks; - private final WorkSource mWorkSource; private final Vibration mVibration; private final SparseArray<VibratorController> mVibrators = new SparseArray<>(); - @GuardedBy("mLock") private final PriorityQueue<Step> mNextSteps = new PriorityQueue<>(); - @GuardedBy("mLock") private final Queue<Step> mPendingOnVibratorCompleteSteps = new LinkedList<>(); @GuardedBy("mLock") - private final Queue<Integer> mCompletionNotifiedVibrators = new LinkedList<>(); + private Queue<Integer> mCompletionNotifiedVibrators = new LinkedList<>(); - @GuardedBy("mLock") private int mPendingVibrateSteps; - @GuardedBy("mLock") - private int mConsumedStartVibrateSteps; - @GuardedBy("mLock") + private int mRemainingStartSequentialEffectSteps; private int mSuccessfulVibratorOnSteps; - @GuardedBy("mLock") - private boolean mWaitToProcessVibratorCompleteCallbacks; VibrationStepConductor(Vibration vib, VibrationSettings vibrationSettings, DeviceVibrationEffectAdapter effectAdapter, @@ -86,7 +84,6 @@ final class VibrationStepConductor { this.vibrationSettings = vibrationSettings; this.deviceEffectAdapter = effectAdapter; this.vibratorManagerHooks = vibratorManagerHooks; - this.mWorkSource = new WorkSource(mVibration.uid); CombinedVibration effect = vib.getEffect(); for (int i = 0; i < availableVibrators.size(); i++) { @@ -100,6 +97,9 @@ final class VibrationStepConductor { AbstractVibratorStep nextVibrateStep(long startTime, VibratorController controller, VibrationEffect.Composed effect, int segmentIndex, long previousStepVibratorOffTimeout) { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } if (segmentIndex >= effect.getSegments().size()) { segmentIndex = effect.getRepeatIndex(); } @@ -126,58 +126,102 @@ final class VibrationStepConductor { previousStepVibratorOffTimeout); } - public void initializeForEffect(@NonNull CombinedVibration.Sequential vibration) { - synchronized (mLock) { - mPendingVibrateSteps++; - mNextSteps.offer(new StartSequentialEffectStep(this, vibration)); + /** Called when this conductor is going to be started running by the VibrationThread. */ + public void prepareToStart() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); } + CombinedVibration.Sequential sequentialEffect = toSequential(mVibration.getEffect()); + mPendingVibrateSteps++; + // This count is decremented at the completion of the step, so we don't subtract one. + mRemainingStartSequentialEffectSteps = sequentialEffect.getEffects().size(); + mNextSteps.offer(new StartSequentialEffectStep(this, sequentialEffect)); } public Vibration getVibration() { + // No thread assertion: immutable return mVibration; } - public WorkSource getWorkSource() { - return mWorkSource; - } - SparseArray<VibratorController> getVibrators() { + // No thread assertion: immutable return mVibrators; } public boolean isFinished() { - synchronized (mLock) { - return mPendingOnVibratorCompleteSteps.isEmpty() && mNextSteps.isEmpty(); + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); } + // No need to check for vibration complete callbacks - if there were any, they would + // have no steps to notify anyway. + return mPendingOnVibratorCompleteSteps.isEmpty() && mNextSteps.isEmpty(); } /** * Calculate the {@link Vibration.Status} based on the current queue state and the expected * number of {@link StartSequentialEffectStep} to be played. */ - public Vibration.Status calculateVibrationStatus(int expectedStartVibrateSteps) { - synchronized (mLock) { - if (mPendingVibrateSteps > 0 - || mConsumedStartVibrateSteps < expectedStartVibrateSteps) { - return Vibration.Status.RUNNING; - } - if (mSuccessfulVibratorOnSteps > 0) { - return Vibration.Status.FINISHED; - } - // If no step was able to turn the vibrator ON successfully. - return Vibration.Status.IGNORED_UNSUPPORTED; + public Vibration.Status calculateVibrationStatus() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + + if (mPendingVibrateSteps > 0 + || mRemainingStartSequentialEffectSteps > 0) { + return Vibration.Status.RUNNING; + } + // No pending steps, and something happened. + if (mSuccessfulVibratorOnSteps > 0) { + return Vibration.Status.FINISHED; } + // If no step was able to turn the vibrator ON successfully. + return Vibration.Status.IGNORED_UNSUPPORTED; } - /** Returns the time in millis to wait before calling {@link #runNextStep()}. */ - @GuardedBy("mLock") - public long getWaitMillisBeforeNextStepLocked() { - if (!mPendingOnVibratorCompleteSteps.isEmpty()) { - // Steps resumed by vibrator complete callback should be played right away. - return 0; + /** + * Blocks until the next step is due to run. The wait here may be interrupted by calling + * {@link #notifyWakeUp} or other "notify" methods. + * + * <p>This method returns false if the next step is ready to run now. If the method returns + * true, then some waiting was done, but may have been interrupted by a wakeUp. + * + * @return true if the method waited at all, or false if a step is ready to run now. + */ + public boolean waitUntilNextStepIsDue() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + // It's necessary to re-process callbacks if they come in after acquiring the lock to + // start waiting, but we don't want to hold the lock while processing them. + // The loop goes until there are no pending callbacks to process. + while (true) { + // TODO: cancellation checking could also be integrated here, instead of outside in + // VibrationThread. + processVibratorCompleteCallbacks(); + if (!mPendingOnVibratorCompleteSteps.isEmpty()) { + // Steps resumed by vibrator complete callback should be played right away. + return false; + } + Step nextStep = mNextSteps.peek(); + if (nextStep == null) { + return false; + } + long waitMillis = nextStep.calculateWaitTime(); + if (waitMillis <= 0) { + return false; + } + synchronized (mLock) { + // Double check for missed wake-ups before sleeping. + if (!mCompletionNotifiedVibrators.isEmpty()) { + continue; // Start again: processVibratorCompleteCallbacks will consume it. + } + try { + mLock.wait(waitMillis); + } catch (InterruptedException e) { + } + return true; + } } - Step nextStep = mNextSteps.peek(); - return nextStep == null ? 0 : nextStep.calculateWaitTime(); } /** @@ -185,72 +229,88 @@ final class VibrationStepConductor { * to be played next. */ public void runNextStep() { - // Vibrator callbacks should wait until the polled step is played and the next steps are - // added back to the queue, so they can handle the callback. - markWaitToProcessVibratorCallbacks(); - try { - Step nextStep = pollNext(); - if (nextStep != null) { - // This might turn on the vibrator and have a HAL latency. Execute this outside - // any lock to avoid blocking other interactions with the thread. - List<Step> nextSteps = nextStep.play(); - synchronized (mLock) { - if (nextStep.getVibratorOnDuration() > 0) { - mSuccessfulVibratorOnSteps++; - } - if (nextStep instanceof StartSequentialEffectStep) { - mConsumedStartVibrateSteps++; - } - if (!nextStep.isCleanUp()) { - mPendingVibrateSteps--; - } - for (int i = 0; i < nextSteps.size(); i++) { - mPendingVibrateSteps += nextSteps.get(i).isCleanUp() ? 0 : 1; - } - mNextSteps.addAll(nextSteps); - } + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + // In theory a completion callback could have come in between the wait finishing and + // this method starting, but that only means the step is due now anyway, so it's reasonable + // to run it before processing callbacks as the window is tiny. + Step nextStep = pollNext(); + if (nextStep != null) { + List<Step> nextSteps = nextStep.play(); + if (nextStep.getVibratorOnDuration() > 0) { + mSuccessfulVibratorOnSteps++; } - } finally { - synchronized (mLock) { - processVibratorCompleteCallbacksLocked(); + if (nextStep instanceof StartSequentialEffectStep) { + mRemainingStartSequentialEffectSteps--; } + if (!nextStep.isCleanUp()) { + mPendingVibrateSteps--; + } + for (int i = 0; i < nextSteps.size(); i++) { + mPendingVibrateSteps += nextSteps.get(i).isCleanUp() ? 0 : 1; + } + mNextSteps.addAll(nextSteps); } } /** - * Notify the vibrator completion. + * Wake up the execution thread, which may be waiting until the next step is due. + * The caller is responsible for diverting VibrationThread execution. * - * <p>This is a lightweight method that do not trigger any operation from {@link - * VibratorController}, so it can be called directly from a native callback. + * <p>At the moment this is used after the signal is set that a cancellation needs to be + * processed. The actual cancellation will be invoked from the VibrationThread. */ - @GuardedBy("mLock") - private void notifyVibratorCompleteLocked(int vibratorId) { - mCompletionNotifiedVibrators.offer(vibratorId); - if (!mWaitToProcessVibratorCompleteCallbacks) { - // No step is being played or cancelled now, process the callback right away. - processVibratorCompleteCallbacksLocked(); + public void notifyWakeUp() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(false); + } + + synchronized (mLock) { + mLock.notify(); } } + /** + * Notify the conductor that a vibrator has completed its work. + * + * <p>This is a lightweight method intended to be called directly via native callbacks. + * The state update is recorded for processing on the main execution thread (VibrationThread). + */ public void notifyVibratorComplete(int vibratorId) { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(false); + } + + if (DEBUG) { + Slog.d(TAG, "Vibration complete reported by vibrator " + vibratorId); + } + synchronized (mLock) { - if (VibrationThread.DEBUG) { - Slog.d(VibrationThread.TAG, - "Vibration complete reported by vibrator " + vibratorId); - } - notifyVibratorCompleteLocked(vibratorId); + mCompletionNotifiedVibrators.offer(vibratorId); mLock.notify(); } } + /** + * Notify that a VibratorManager sync operation has completed. + * + * <p>This is a lightweight method intended to be called directly via native callbacks. + * The state update is recorded for processing on the main execution thread + * (VibrationThread). + */ public void notifySyncedVibrationComplete() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(false); + } + + if (DEBUG) { + Slog.d(TAG, "Synced vibration complete reported by vibrator manager"); + } + synchronized (mLock) { - if (VibrationThread.DEBUG) { - Slog.d(VibrationThread.TAG, - "Synced vibration complete reported by vibrator manager"); - } for (int i = 0; i < mVibrators.size(); i++) { - notifyVibratorCompleteLocked(mVibrators.keyAt(i)); + mCompletionNotifiedVibrators.offer(mVibrators.keyAt(i)); } mLock.notify(); } @@ -263,25 +323,20 @@ final class VibrationStepConductor { * {@link Step#cancel()}. */ public void cancel() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + // Vibrator callbacks should wait until all steps from the queue are properly cancelled // and clean up steps are added back to the queue, so they can handle the callback. - markWaitToProcessVibratorCallbacks(); - try { - List<Step> cleanUpSteps = new ArrayList<>(); - Step step; - while ((step = pollNext()) != null) { - cleanUpSteps.addAll(step.cancel()); - } - synchronized (mLock) { - // All steps generated by Step.cancel() should be clean-up steps. - mPendingVibrateSteps = 0; - mNextSteps.addAll(cleanUpSteps); - } - } finally { - synchronized (mLock) { - processVibratorCompleteCallbacksLocked(); - } + List<Step> cleanUpSteps = new ArrayList<>(); + Step step; + while ((step = pollNext()) != null) { + cleanUpSteps.addAll(step.cancel()); } + // All steps generated by Step.cancel() should be clean-up steps. + mPendingVibrateSteps = 0; + mNextSteps.addAll(cleanUpSteps); } /** @@ -290,57 +345,55 @@ final class VibrationStepConductor { * <p>This will remove and trigger {@link Step#cancelImmediately()} in all steps, in order. */ public void cancelImmediately() { - // Vibrator callbacks should wait until all steps from the queue are properly cancelled. - markWaitToProcessVibratorCallbacks(); - try { - Step step; - while ((step = pollNext()) != null) { - // This might turn off the vibrator and have a HAL latency. Execute this outside - // any lock to avoid blocking other interactions with the thread. - step.cancelImmediately(); - } - synchronized (mLock) { - mPendingVibrateSteps = 0; - } - } finally { - synchronized (mLock) { - processVibratorCompleteCallbacksLocked(); - } + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + + Step step; + while ((step = pollNext()) != null) { + step.cancelImmediately(); } + mPendingVibrateSteps = 0; } @Nullable private Step pollNext() { - synchronized (mLock) { - // Prioritize the steps resumed by a vibrator complete callback. - if (!mPendingOnVibratorCompleteSteps.isEmpty()) { - return mPendingOnVibratorCompleteSteps.poll(); - } - return mNextSteps.poll(); + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); } - } - private void markWaitToProcessVibratorCallbacks() { - synchronized (mLock) { - mWaitToProcessVibratorCompleteCallbacks = true; + // Prioritize the steps resumed by a vibrator complete callback, irrespective of their + // "next run time". + if (!mPendingOnVibratorCompleteSteps.isEmpty()) { + return mPendingOnVibratorCompleteSteps.poll(); } + return mNextSteps.poll(); } /** - * Notify the step in this queue that should be resumed by the vibrator completion - * callback and keep it separate to be consumed by {@link #runNextStep()}. - * - * <p>This is a lightweight method that do not trigger any operation from {@link - * VibratorController}, so it can be called directly from a native callback. + * Process any notified vibrator completions. * * <p>This assumes only one of the next steps is waiting on this given vibrator, so the * first step found will be resumed by this method, in no particular order. */ - @GuardedBy("mLock") - private void processVibratorCompleteCallbacksLocked() { - mWaitToProcessVibratorCompleteCallbacks = false; - while (!mCompletionNotifiedVibrators.isEmpty()) { - int vibratorId = mCompletionNotifiedVibrators.poll(); + private void processVibratorCompleteCallbacks() { + if (Build.IS_DEBUGGABLE) { + expectIsVibrationThread(true); + } + + Queue<Integer> vibratorsToProcess; + // Swap out the queue of completions to process. + synchronized (mLock) { + if (mCompletionNotifiedVibrators.isEmpty()) { + return; // Nothing to do. + } + + vibratorsToProcess = mCompletionNotifiedVibrators; + mCompletionNotifiedVibrators = new LinkedList<>(); + } + + while (!vibratorsToProcess.isEmpty()) { + int vibratorId = vibratorsToProcess.poll(); Iterator<Step> it = mNextSteps.iterator(); while (it.hasNext()) { Step step = it.next(); @@ -352,4 +405,27 @@ final class VibrationStepConductor { } } } + + private static CombinedVibration.Sequential toSequential(CombinedVibration effect) { + if (effect instanceof CombinedVibration.Sequential) { + return (CombinedVibration.Sequential) effect; + } + return (CombinedVibration.Sequential) CombinedVibration.startSequential() + .addNext(effect) + .combine(); + } + + /** + * This check is used for debugging and documentation to indicate the thread that's expected + * to invoke a given public method on this class. Most methods are only invoked by + * VibrationThread, which is where all the steps and HAL calls should be made. Other threads + * should only signal to the execution flow being run by VibrationThread. + */ + private static void expectIsVibrationThread(boolean isVibrationThread) { + if ((Thread.currentThread() instanceof VibrationThread) != isVibrationThread) { + Slog.wtfStack("VibrationStepConductor", + "Thread caller assertion failed, expected isVibrationThread=" + + isVibrationThread); + } + } } diff --git a/services/core/java/com/android/server/vibrator/VibrationThread.java b/services/core/java/com/android/server/vibrator/VibrationThread.java index f2cd8c3ec3f8..3fef7f2a747e 100644 --- a/services/core/java/com/android/server/vibrator/VibrationThread.java +++ b/services/core/java/com/android/server/vibrator/VibrationThread.java @@ -16,17 +16,15 @@ package com.android.server.vibrator; -import android.os.CombinedVibration; import android.os.IBinder; import android.os.PowerManager; import android.os.Process; import android.os.RemoteException; import android.os.Trace; +import android.os.WorkSource; import android.util.Slog; import android.util.SparseArray; -import com.android.internal.annotations.VisibleForTesting; - import java.util.NoSuchElementException; /** Plays a {@link Vibration} in dedicated thread. */ @@ -105,11 +103,6 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { return mStepConductor.getVibration(); } - @VisibleForTesting - SparseArray<VibratorController> getVibrators() { - return mStepConductor.getVibrators(); - } - @Override public void binderDied() { if (DEBUG) { @@ -136,12 +129,14 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { /** Runs the VibrationThread ensuring that the wake lock is acquired and released. */ private void runWithWakeLock() { - mWakeLock.setWorkSource(mStepConductor.getWorkSource()); + WorkSource workSource = new WorkSource(mStepConductor.getVibration().uid); + mWakeLock.setWorkSource(workSource); mWakeLock.acquire(); try { runWithWakeLockAndDeathLink(); } finally { mWakeLock.release(); + mWakeLock.setWorkSource(null); } } @@ -178,12 +173,10 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { return; } mStop = true; - synchronized (mStepConductor.mLock) { - if (DEBUG) { - Slog.d(TAG, "Vibration cancelled"); - } - mStepConductor.mLock.notify(); + if (DEBUG) { + Slog.d(TAG, "Vibration cancelled"); } + mStepConductor.notifyWakeUp(); } /** Cancel current vibration and shuts off the vibrators immediately. */ @@ -192,13 +185,11 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { // Already forced the thread to stop, wait for it to finish. return; } - mStop = mForceStop = true; - synchronized (mStepConductor.mLock) { - if (DEBUG) { - Slog.d(TAG, "Vibration cancelled immediately"); - } - mStepConductor.mLock.notify(); + if (DEBUG) { + Slog.d(TAG, "Vibration cancelled immediately"); } + mStop = mForceStop = true; + mStepConductor.notifyWakeUp(); } /** Notify current vibration that a synced step has completed. */ @@ -225,27 +216,14 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { private void playVibration() { Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "playVibration"); try { - CombinedVibration.Sequential sequentialEffect = - toSequential(mStepConductor.getVibration().getEffect()); - final int sequentialEffectSize = sequentialEffect.getEffects().size(); - mStepConductor.initializeForEffect(sequentialEffect); + mStepConductor.prepareToStart(); while (!mStepConductor.isFinished()) { - long waitMillisBeforeNextStep; - synchronized (mStepConductor.mLock) { - waitMillisBeforeNextStep = mStepConductor.getWaitMillisBeforeNextStepLocked(); - if (waitMillisBeforeNextStep > 0) { - try { - mStepConductor.mLock.wait(waitMillisBeforeNextStep); - } catch (InterruptedException e) { - } - } - } - // Only run the next vibration step if we didn't have to wait in this loop. - // If we waited then the queue may have changed or the wait could have been - // interrupted by a cancel call, so loop again to re-evaluate the scheduling of - // the queue top element. - if (waitMillisBeforeNextStep <= 0) { + // Skip wait and next step if mForceStop already happened. + boolean waited = mForceStop || mStepConductor.waitUntilNextStepIsDue(); + // If we waited, don't run the next step, but instead re-evaluate cancellation + // status + if (!waited) { if (DEBUG) { Slog.d(TAG, "Play vibration consuming next step..."); } @@ -253,8 +231,17 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { // blocking the thread. mStepConductor.runNextStep(); } + + if (mForceStop) { + // Cancel every step and stop playing them right away, even clean-up steps. + mStepConductor.cancelImmediately(); + clientVibrationCompleteIfNotAlready(Vibration.Status.CANCELLED); + break; + } + Vibration.Status status = mStop ? Vibration.Status.CANCELLED - : mStepConductor.calculateVibrationStatus(sequentialEffectSize); + : mStepConductor.calculateVibrationStatus(); + // This block can only run once due to mCalledVibrationCompleteCallback. if (status != Vibration.Status.RUNNING && !mCalledVibrationCompleteCallback) { // First time vibration stopped running, start clean-up tasks and notify // callback immediately. @@ -263,25 +250,9 @@ final class VibrationThread extends Thread implements IBinder.DeathRecipient { mStepConductor.cancel(); } } - if (mForceStop) { - // Cancel every step and stop playing them right away, even clean-up steps. - mStepConductor.cancelImmediately(); - clientVibrationCompleteIfNotAlready(Vibration.Status.CANCELLED); - break; - } } } finally { Trace.traceEnd(Trace.TRACE_TAG_VIBRATOR); } } - - private static CombinedVibration.Sequential toSequential(CombinedVibration effect) { - if (effect instanceof CombinedVibration.Sequential) { - return (CombinedVibration.Sequential) effect; - } - return (CombinedVibration.Sequential) CombinedVibration.startSequential() - .addNext(effect) - .combine(); - } - } diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 0396a1101c64..8f703c5c7761 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -45,7 +45,6 @@ import static com.android.server.accessibility.AccessibilityTraceProto.WINDOW_MA import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowTracing.WINSCOPE_EXT; -import static com.android.server.wm.utils.RegionUtils.forEachRect; import android.accessibilityservice.AccessibilityTrace; import android.animation.ObjectAnimator; @@ -101,6 +100,7 @@ import com.android.internal.util.TraceBuffer; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.LocalServices; import com.android.server.policy.WindowManagerPolicy; +import com.android.server.wm.AccessibilityWindowsPopulator.AccessibilityWindow; import com.android.server.wm.WindowManagerInternal.AccessibilityControllerInternal; import com.android.server.wm.WindowManagerInternal.MagnificationCallbacks; import com.android.server.wm.WindowManagerInternal.WindowsForAccessibilityCallback; @@ -133,19 +133,22 @@ final class AccessibilityController { private static final Rect EMPTY_RECT = new Rect(); private static final float[] sTempFloats = new float[9]; - private SparseArray<DisplayMagnifier> mDisplayMagnifiers = new SparseArray<>(); - private SparseArray<WindowsForAccessibilityObserver> mWindowsForAccessibilityObserver = + private final SparseArray<DisplayMagnifier> mDisplayMagnifiers = new SparseArray<>(); + private final SparseArray<WindowsForAccessibilityObserver> mWindowsForAccessibilityObserver = new SparseArray<>(); private SparseArray<IBinder> mFocusedWindow = new SparseArray<>(); private int mFocusedDisplay = -1; private boolean mIsImeVisible = false; // Set to true if initializing window population complete. private boolean mAllObserversInitialized = true; + private final AccessibilityWindowsPopulator mAccessibilityWindowsPopulator; AccessibilityController(WindowManagerService service) { mService = service; mAccessibilityTracing = AccessibilityController.getAccessibilityControllerInternal(service); + + mAccessibilityWindowsPopulator = new AccessibilityWindowsPopulator(mService, this); } boolean setMagnificationCallbacks(int displayId, MagnificationCallbacks callbacks) { @@ -209,7 +212,9 @@ final class AccessibilityController { } mWindowsForAccessibilityObserver.remove(displayId); } - observer = new WindowsForAccessibilityObserver(mService, displayId, callback); + mAccessibilityWindowsPopulator.setWindowsNotification(true); + observer = new WindowsForAccessibilityObserver(mService, displayId, callback, + mAccessibilityWindowsPopulator); mWindowsForAccessibilityObserver.put(displayId, observer); mAllObserversInitialized &= observer.mInitialized; } else { @@ -224,6 +229,10 @@ final class AccessibilityController { } } mWindowsForAccessibilityObserver.remove(displayId); + + if (mWindowsForAccessibilityObserver.size() <= 0) { + mAccessibilityWindowsPopulator.setWindowsNotification(false); + } } } @@ -309,11 +318,6 @@ final class AccessibilityController { if (displayMagnifier != null) { displayMagnifier.onDisplaySizeChanged(displayContent); } - final WindowsForAccessibilityObserver windowsForA11yObserver = - mWindowsForAccessibilityObserver.get(displayId); - if (windowsForA11yObserver != null) { - windowsForA11yObserver.scheduleComputeChangedWindows(); - } } void onAppWindowTransition(int displayId, int transition) { @@ -341,11 +345,6 @@ final class AccessibilityController { if (displayMagnifier != null) { displayMagnifier.onWindowTransition(windowState, transition); } - final WindowsForAccessibilityObserver windowsForA11yObserver = - mWindowsForAccessibilityObserver.get(displayId); - if (windowsForA11yObserver != null) { - windowsForA11yObserver.scheduleComputeChangedWindows(); - } } void onWindowFocusChangedNot(int displayId) { @@ -455,6 +454,19 @@ final class AccessibilityController { return null; } + boolean getMagnificationSpecForDisplay(int displayId, MagnificationSpec outSpec) { + if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { + mAccessibilityTracing.logTrace(TAG + ".getMagnificationSpecForDisplay", + FLAGS_MAGNIFICATION_CALLBACK, "displayId=" + displayId); + } + final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId); + if (displayMagnifier == null) { + return false; + } + + return displayMagnifier.getMagnificationSpec(outSpec); + } + boolean hasCallbacks() { if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) { @@ -756,6 +768,25 @@ final class AccessibilityController { return spec; } + boolean getMagnificationSpec(MagnificationSpec outSpec) { + if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { + mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationSpec", + FLAGS_MAGNIFICATION_CALLBACK); + } + MagnificationSpec spec = mMagnifedViewport.getMagnificationSpec(); + if (spec == null) { + return false; + } + + outSpec.setTo(spec); + if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { + mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationSpec", + FLAGS_MAGNIFICATION_CALLBACK, "outSpec={" + outSpec + "}"); + } + + return true; + } + void getMagnificationRegion(Region outMagnificationRegion) { if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationRegion", @@ -1403,20 +1434,18 @@ final class AccessibilityController { private static final boolean DEBUG = false; - private final SparseArray<WindowState> mTempWindowStates = new SparseArray<>(); + private final List<AccessibilityWindow> mTempA11yWindows = new ArrayList<>(); private final Set<IBinder> mTempBinderSet = new ArraySet<>(); - private final RectF mTempRectF = new RectF(); - - private final Matrix mTempMatrix = new Matrix(); - private final Point mTempPoint = new Point(); private final Region mTempRegion = new Region(); private final Region mTempRegion1 = new Region(); + private final Region mTempRegion2 = new Region(); + private final WindowManagerService mService; private final Handler mHandler; @@ -1431,10 +1460,11 @@ final class AccessibilityController { // Set to true if initializing window population complete. private boolean mInitialized; + private final AccessibilityWindowsPopulator mA11yWindowsPopulator; WindowsForAccessibilityObserver(WindowManagerService windowManagerService, - int displayId, - WindowsForAccessibilityCallback callback) { + int displayId, WindowsForAccessibilityCallback callback, + AccessibilityWindowsPopulator accessibilityWindowsPopulator) { mService = windowManagerService; mCallback = callback; mDisplayId = displayId; @@ -1443,6 +1473,7 @@ final class AccessibilityController { AccessibilityController.getAccessibilityControllerInternal(mService); mRecurringAccessibilityEventsIntervalMillis = ViewConfiguration .getSendRecurringAccessibilityEventsInterval(); + mA11yWindowsPopulator = accessibilityWindowsPopulator; computeChangedWindows(true); } @@ -1466,52 +1497,6 @@ final class AccessibilityController { } } - boolean shellRootIsAbove(WindowState windowState, ShellRoot shellRoot) { - int wsLayer = mService.mPolicy.getWindowLayerLw(windowState); - int shellLayer = mService.mPolicy.getWindowLayerFromTypeLw(shellRoot.getWindowType(), - true); - return shellLayer >= wsLayer; - } - - int addShellRootsIfAbove(WindowState windowState, ArrayList<ShellRoot> shellRoots, - int shellRootIndex, List<WindowInfo> windows, Set<IBinder> addedWindows, - Region unaccountedSpace, boolean focusedWindowAdded) { - while (shellRootIndex < shellRoots.size() - && shellRootIsAbove(windowState, shellRoots.get(shellRootIndex))) { - ShellRoot shellRoot = shellRoots.get(shellRootIndex); - shellRootIndex++; - final WindowInfo info = shellRoot.getWindowInfo(); - if (info == null) { - continue; - } - - info.layer = addedWindows.size(); - windows.add(info); - addedWindows.add(info.token); - unaccountedSpace.op(info.regionInScreen, unaccountedSpace, - Region.Op.REVERSE_DIFFERENCE); - if (unaccountedSpace.isEmpty() && focusedWindowAdded) { - break; - } - } - return shellRootIndex; - } - - private ArrayList<ShellRoot> getSortedShellRoots( - SparseArray<ShellRoot> originalShellRoots) { - ArrayList<ShellRoot> sortedShellRoots = new ArrayList<>(originalShellRoots.size()); - for (int i = originalShellRoots.size() - 1; i >= 0; --i) { - sortedShellRoots.add(originalShellRoots.valueAt(i)); - } - - sortedShellRoots.sort((left, right) -> - mService.mPolicy.getWindowLayerFromTypeLw(right.getWindowType(), true) - - mService.mPolicy.getWindowLayerFromTypeLw(left.getWindowType(), - true)); - - return sortedShellRoots; - } - /** * Check if windows have changed, and send them to the accessibility subsystem if they have. * @@ -1561,44 +1546,29 @@ final class AccessibilityController { Region unaccountedSpace = mTempRegion; unaccountedSpace.set(0, 0, screenWidth, screenHeight); - final SparseArray<WindowState> visibleWindows = mTempWindowStates; - populateVisibleWindowsOnScreen(visibleWindows); + final List<AccessibilityWindow> visibleWindows = mTempA11yWindows; + mA11yWindowsPopulator.populateVisibleWindowsOnScreenLocked( + mDisplayId, visibleWindows); Set<IBinder> addedWindows = mTempBinderSet; addedWindows.clear(); boolean focusedWindowAdded = false; final int visibleWindowCount = visibleWindows.size(); - ArrayList<TaskFragment> skipRemainingWindowsForTaskFragments = new ArrayList<>(); - - ArrayList<ShellRoot> shellRoots = getSortedShellRoots(dc.mShellRoots); // Iterate until we figure out what is touchable for the entire screen. - int shellRootIndex = 0; - for (int i = visibleWindowCount - 1; i >= 0; i--) { - final WindowState windowState = visibleWindows.valueAt(i); - int prevShellRootIndex = shellRootIndex; - shellRootIndex = addShellRootsIfAbove(windowState, shellRoots, shellRootIndex, - windows, addedWindows, unaccountedSpace, focusedWindowAdded); - - // If a Shell Root was added, it could have accounted for all the space already. - if (shellRootIndex > prevShellRootIndex && unaccountedSpace.isEmpty() - && focusedWindowAdded) { - break; - } - - final Region regionInScreen = new Region(); - computeWindowRegionInScreen(windowState, regionInScreen); - if (windowMattersToAccessibility(windowState, - regionInScreen, unaccountedSpace, - skipRemainingWindowsForTaskFragments)) { - addPopulatedWindowInfo(windowState, regionInScreen, windows, addedWindows); - if (windowMattersToUnaccountedSpaceComputation(windowState)) { - updateUnaccountedSpace(windowState, regionInScreen, unaccountedSpace, - skipRemainingWindowsForTaskFragments); + for (int i = 0; i < visibleWindowCount; i++) { + final AccessibilityWindow a11yWindow = visibleWindows.get(i); + final Region regionInWindow = new Region(); + a11yWindow.getTouchableRegionInWindow(regionInWindow); + if (windowMattersToAccessibility(a11yWindow, regionInWindow, + unaccountedSpace)) { + addPopulatedWindowInfo(a11yWindow, regionInWindow, windows, addedWindows); + if (windowMattersToUnaccountedSpaceComputation(a11yWindow)) { + updateUnaccountedSpace(a11yWindow, unaccountedSpace); } - focusedWindowAdded |= windowState.isFocused(); - } else if (isUntouchableNavigationBar(windowState, mTempRegion1)) { + focusedWindowAdded |= a11yWindow.isFocused(); + } else if (a11yWindow.isUntouchableNavigationBar()) { // If this widow is navigation bar without touchable region, accounting the // region of navigation bar inset because all touch events from this region // would be received by launcher, i.e. this region is a un-touchable one @@ -1647,47 +1617,39 @@ final class AccessibilityController { // Some windows should be excluded from unaccounted space computation, though they still // should be reported - private boolean windowMattersToUnaccountedSpaceComputation(WindowState windowState) { + private boolean windowMattersToUnaccountedSpaceComputation(AccessibilityWindow a11yWindow) { // Do not account space of trusted non-touchable windows, except the split-screen // divider. // If it's not trusted, touch events are not sent to the windows behind it. - if (((windowState.mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) != 0) - && (windowState.mAttrs.type != TYPE_DOCK_DIVIDER) - && windowState.isTrustedOverlay()) { + if (((a11yWindow.getFlags() & WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) != 0) + && (a11yWindow.getType() != TYPE_DOCK_DIVIDER) + && a11yWindow.isTrustedOverlay()) { return false; } - if (windowState.mAttrs.type - == WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) { + if (a11yWindow.getType() == WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) { return false; } return true; } - private boolean windowMattersToAccessibility(WindowState windowState, - Region regionInScreen, Region unaccountedSpace, - ArrayList<TaskFragment> skipRemainingWindowsForTaskFragments) { - final RecentsAnimationController controller = mService.getRecentsAnimationController(); - if (controller != null && controller.shouldIgnoreForAccessibility(windowState)) { + private boolean windowMattersToAccessibility(AccessibilityWindow a11yWindow, + Region regionInScreen, Region unaccountedSpace) { + if (a11yWindow.ignoreRecentsAnimationForAccessibility()) { return false; } - if (windowState.isFocused()) { + if (a11yWindow.isFocused()) { return true; } - // If the window is part of a task that we're finished with - ignore. - final TaskFragment taskFragment = windowState.getTaskFragment(); - if (taskFragment != null - && skipRemainingWindowsForTaskFragments.contains(taskFragment)) { - return false; - } - // Ignore non-touchable windows, except the split-screen divider, which is // occasionally non-touchable but still useful for identifying split-screen - // mode. - if (((windowState.mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) != 0) - && (windowState.mAttrs.type != TYPE_DOCK_DIVIDER)) { + // mode and the PIP menu. + if (((a11yWindow.getFlags() + & WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) != 0) + && (a11yWindow.getType() != TYPE_DOCK_DIVIDER + && !a11yWindow.isPIPMenu())) { return false; } @@ -1697,88 +1659,36 @@ final class AccessibilityController { } // Add windows of certain types not covered by modal windows. - if (isReportedWindowType(windowState.mAttrs.type)) { + if (isReportedWindowType(a11yWindow.getType())) { return true; } return false; } - private void updateUnaccountedSpace(WindowState windowState, Region regionInScreen, - Region unaccountedSpace, - ArrayList<TaskFragment> skipRemainingWindowsForTaskFragments) { - // Account for the space this window takes if the window - // is not an accessibility overlay which does not change - // the reported windows. - unaccountedSpace.op(regionInScreen, unaccountedSpace, - Region.Op.REVERSE_DIFFERENCE); - - // If a window is modal it prevents other windows from being touched - if ((windowState.mAttrs.flags & (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)) == 0) { - if (!windowState.hasTapExcludeRegion()) { - // Account for all space in the task, whether the windows in it are - // touchable or not. The modal window blocks all touches from the task's - // area. - unaccountedSpace.op(windowState.getDisplayFrame(), unaccountedSpace, - Region.Op.REVERSE_DIFFERENCE); - } else { - // If a window has tap exclude region, we need to account it. - final Region displayRegion = new Region(windowState.getDisplayFrame()); - final Region tapExcludeRegion = new Region(); - windowState.getTapExcludeRegion(tapExcludeRegion); - displayRegion.op(tapExcludeRegion, displayRegion, - Region.Op.REVERSE_DIFFERENCE); - unaccountedSpace.op(displayRegion, unaccountedSpace, - Region.Op.REVERSE_DIFFERENCE); - } - - final TaskFragment taskFragment = windowState.getTaskFragment(); - if (taskFragment != null) { - // If the window is associated with a particular task, we can skip the - // rest of the windows for that task. - skipRemainingWindowsForTaskFragments.add(taskFragment); - } else if (!windowState.hasTapExcludeRegion()) { - // If the window is not associated with a particular task, then it is - // globally modal. In this case we can skip all remaining windows when - // it doesn't has tap exclude region. - unaccountedSpace.setEmpty(); - } - } - - // Account for the space of letterbox. - if (windowState.areAppWindowBoundsLetterboxed()) { - unaccountedSpace.op(getLetterboxBounds(windowState), unaccountedSpace, + private void updateUnaccountedSpace(AccessibilityWindow a11yWindow, + Region unaccountedSpace) { + if (a11yWindow.getType() + != WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) { + // Account for the space this window takes if the window + // is not an accessibility overlay which does not change + // the reported windows. + final Region touchableRegion = mTempRegion2; + a11yWindow.getTouchableRegionInScreen(touchableRegion); + unaccountedSpace.op(touchableRegion, unaccountedSpace, Region.Op.REVERSE_DIFFERENCE); + // Account for the space of letterbox. + final Region letterboxBounds = mTempRegion1; + if (a11yWindow.setLetterBoxBoundsIfNeeded(letterboxBounds)) { + unaccountedSpace.op(letterboxBounds, + unaccountedSpace, Region.Op.REVERSE_DIFFERENCE); + } } } - private void computeWindowRegionInScreen(WindowState windowState, Region outRegion) { - // Get the touchable frame. - Region touchableRegion = mTempRegion1; - windowState.getTouchableRegion(touchableRegion); - - // Map the frame to get what appears on the screen. - Matrix matrix = mTempMatrix; - populateTransformationMatrix(windowState, matrix); - - forEachRect(touchableRegion, rect -> { - // Move to origin as all transforms are captured by the matrix. - RectF windowFrame = mTempRectF; - windowFrame.set(rect); - windowFrame.offset(-windowState.getFrame().left, -windowState.getFrame().top); - - matrix.mapRect(windowFrame); - - // Union all rects. - outRegion.union(new Rect((int) windowFrame.left, (int) windowFrame.top, - (int) windowFrame.right, (int) windowFrame.bottom)); - }); - } - - private static void addPopulatedWindowInfo(WindowState windowState, Region regionInScreen, - List<WindowInfo> out, Set<IBinder> tokenOut) { - final WindowInfo window = windowState.getWindowInfo(); + private static void addPopulatedWindowInfo(AccessibilityWindow a11yWindow, + Region regionInScreen, List<WindowInfo> out, Set<IBinder> tokenOut) { + final WindowInfo window = a11yWindow.getWindowInfo(); window.regionInScreen.set(regionInScreen); window.layer = tokenOut.size(); out.add(window); @@ -1805,23 +1715,6 @@ final class AccessibilityController { && windowType != WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION); } - private void populateVisibleWindowsOnScreen(SparseArray<WindowState> outWindows) { - final List<WindowState> tempWindowStatesList = new ArrayList<>(); - final DisplayContent dc = mService.mRoot.getDisplayContent(mDisplayId); - if (dc == null) { - return; - } - - dc.forAllWindows(w -> { - if (w.isVisible()) { - tempWindowStatesList.add(w); - } - }, false /* traverseTopToBottom */); - for (int i = 0; i < tempWindowStatesList.size(); i++) { - outWindows.put(i, tempWindowStatesList.get(i)); - } - } - private WindowState getTopFocusWindow() { return mService.mRoot.getTopFocusedDisplayContent().mCurrentFocus; } diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java new file mode 100644 index 000000000000..c0fb83ba294c --- /dev/null +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -0,0 +1,626 @@ +/* + * 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.wm; + +import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; + +import static com.android.server.wm.utils.RegionUtils.forEachRect; + +import android.annotation.NonNull; +import android.graphics.Matrix; +import android.graphics.Rect; +import android.graphics.RectF; +import android.graphics.Region; +import android.os.Handler; +import android.os.IBinder; +import android.os.Looper; +import android.os.Message; +import android.util.Slog; +import android.util.SparseArray; +import android.view.IWindow; +import android.view.InputWindowHandle; +import android.view.MagnificationSpec; +import android.view.WindowInfo; +import android.view.WindowManager; +import android.window.WindowInfosListener; + +import com.android.internal.annotations.GuardedBy; + +import java.util.ArrayList; +import java.util.List; + +/** + * This class is the accessibility windows population adapter. + */ +public final class AccessibilityWindowsPopulator extends WindowInfosListener { + + private static final String TAG = AccessibilityWindowsPopulator.class.getSimpleName(); + // If the surface flinger callback is not coming within in 2 frames time, i.e. about + // 35ms, then assuming the windows become stable. + private static final int SURFACE_FLINGER_CALLBACK_WINDOWS_STABLE_TIMES_MS = 35; + // To avoid the surface flinger callbacks always comes within in 2 frames, then no windows + // are reported to the A11y framework, and the animation duration time is 500ms, so setting + // this value as the max timeout value to force computing changed windows. + private static final int WINDOWS_CHANGED_NOTIFICATION_MAX_DURATION_TIMES_MS = 500; + + private static final float[] sTempFloats = new float[9]; + + private final WindowManagerService mService; + private final AccessibilityController mAccessibilityController; + @GuardedBy("mLock") + private final SparseArray<List<InputWindowHandle>> mInputWindowHandlesOnDisplays = + new SparseArray<>(); + @GuardedBy("mLock") + private final SparseArray<Matrix> mMagnificationSpecInverseMatrix = new SparseArray<>(); + @GuardedBy("mLock") + private final SparseArray<DisplayInfo> mDisplayInfos = new SparseArray<>(); + @GuardedBy("mLock") + private final List<InputWindowHandle> mVisibleWindows = new ArrayList<>(); + @GuardedBy("mLock") + private boolean mWindowsNotificationEnabled = false; + private final Object mLock = new Object(); + private final Handler mHandler; + + AccessibilityWindowsPopulator(WindowManagerService service, + AccessibilityController accessibilityController) { + mService = service; + mAccessibilityController = accessibilityController; + mHandler = new MyHandler(mService.mH.getLooper()); + + register(); + } + + /** + * Gets the visible windows list with the window layer on the specified display. + * + * @param displayId The display. + * @param outWindows The visible windows list. The z-order of each window in the list + * is from the top to bottom. + */ + public void populateVisibleWindowsOnScreenLocked(int displayId, + List<AccessibilityWindow> outWindows) { + List<InputWindowHandle> inputWindowHandles; + final Matrix inverseMatrix = new Matrix(); + final Matrix displayMatrix = new Matrix(); + + synchronized (mLock) { + inputWindowHandles = mInputWindowHandlesOnDisplays.get(displayId); + if (inputWindowHandles == null) { + outWindows.clear(); + + return; + } + inverseMatrix.set(mMagnificationSpecInverseMatrix.get(displayId)); + + final DisplayInfo displayInfo = mDisplayInfos.get(displayId); + if (displayInfo != null) { + displayMatrix.set(displayInfo.mTransform); + } else { + Slog.w(TAG, "The displayInfo of this displayId (" + displayId + ") called " + + "back from the surface fligner is null"); + } + } + + final DisplayContent dc = mService.mRoot.getDisplayContent(displayId); + final ShellRoot shellroot = dc.mShellRoots.get(WindowManager.SHELL_ROOT_LAYER_PIP); + final IBinder pipMenuIBinder = + shellroot != null ? shellroot.getAccessibilityWindowToken() : null; + + for (final InputWindowHandle windowHandle : inputWindowHandles) { + final AccessibilityWindow accessibilityWindow = + AccessibilityWindow.initializeData(mService, windowHandle, inverseMatrix, + pipMenuIBinder, displayMatrix); + + outWindows.add(accessibilityWindow); + } + } + + @Override + public void onWindowInfosChanged(InputWindowHandle[] windowHandles, + DisplayInfo[] displayInfos) { + synchronized (mLock) { + mVisibleWindows.clear(); + for (InputWindowHandle window : windowHandles) { + if (window.visible && window.getWindow() != null) { + mVisibleWindows.add(window); + } + } + + mDisplayInfos.clear(); + for (final DisplayInfo displayInfo : displayInfos) { + mDisplayInfos.put(displayInfo.mDisplayId, displayInfo); + } + + if (mWindowsNotificationEnabled) { + if (!mHandler.hasMessages( + MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_TIMEOUT)) { + mHandler.sendEmptyMessageDelayed( + MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_TIMEOUT, + WINDOWS_CHANGED_NOTIFICATION_MAX_DURATION_TIMES_MS); + } + populateVisibleWindowHandlesAndNotifyWindowsChangeIfNeededLocked(); + } + } + } + + /** + * Sets to notify the accessibilityController to compute changed windows on + * the display after populating the visible windows if the windows reported + * from the surface flinger changes. + * + * @param register {@code true} means starting windows population. + */ + public void setWindowsNotification(boolean register) { + synchronized (mLock) { + if (mWindowsNotificationEnabled == register) { + return; + } + mWindowsNotificationEnabled = register; + if (mWindowsNotificationEnabled) { + populateVisibleWindowHandlesAndNotifyWindowsChangeIfNeededLocked(); + } else { + releaseResources(); + } + } + } + + private void populateVisibleWindowHandlesAndNotifyWindowsChangeIfNeededLocked() { + final SparseArray<List<InputWindowHandle>> tempWindowHandleList = new SparseArray<>(); + + for (final InputWindowHandle windowHandle : mVisibleWindows) { + List<InputWindowHandle> inputWindowHandles = tempWindowHandleList.get( + windowHandle.displayId); + + if (inputWindowHandles == null) { + inputWindowHandles = new ArrayList<>(); + tempWindowHandleList.put(windowHandle.displayId, inputWindowHandles); + generateMagnificationSpecInverseMatrixLocked(windowHandle.displayId); + } + inputWindowHandles.add(windowHandle); + } + + final List<Integer> displayIdsForWindowsChanged = new ArrayList<>(); + + getDisplaysForWindowsChangedLocked(displayIdsForWindowsChanged, tempWindowHandleList, + mInputWindowHandlesOnDisplays); + // Clones all windows from the callback of the surface flinger. + mInputWindowHandlesOnDisplays.clear(); + for (int i = 0; i < tempWindowHandleList.size(); i++) { + final int displayId = tempWindowHandleList.keyAt(i); + mInputWindowHandlesOnDisplays.put(displayId, tempWindowHandleList.get(displayId)); + } + + if (displayIdsForWindowsChanged.size() > 0) { + if (!mHandler.hasMessages(MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED)) { + mHandler.obtainMessage(MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED, + displayIdsForWindowsChanged).sendToTarget(); + } + + return; + } + mHandler.removeMessages(MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_UI_STABLE); + mHandler.sendEmptyMessageDelayed(MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_UI_STABLE, + SURFACE_FLINGER_CALLBACK_WINDOWS_STABLE_TIMES_MS); + } + + private void getDisplaysForWindowsChangedLocked(List<Integer> outDisplayIdsForWindowsChanged, + SparseArray<List<InputWindowHandle>> newWindowsList, + SparseArray<List<InputWindowHandle>> oldWindowsList) { + for (int i = 0; i < newWindowsList.size(); i++) { + final int displayId = newWindowsList.keyAt(i); + final List<InputWindowHandle> newWindows = newWindowsList.get(displayId); + final List<InputWindowHandle> oldWindows = oldWindowsList.get(displayId); + + if (hasWindowsChangedLocked(newWindows, oldWindows)) { + outDisplayIdsForWindowsChanged.add(displayId); + } + } + } + + private boolean hasWindowsChangedLocked(List<InputWindowHandle> newWindows, + List<InputWindowHandle> oldWindows) { + if (oldWindows == null || oldWindows.size() != newWindows.size()) { + return true; + } + + final int windowsCount = newWindows.size(); + // Since we always traverse windows from high to low layer, + // the old and new windows at the same index should be the + // same, otherwise something changed. + for (int i = 0; i < windowsCount; i++) { + final InputWindowHandle newWindow = newWindows.get(i); + final InputWindowHandle oldWindow = oldWindows.get(i); + + if (!newWindow.getWindow().asBinder().equals(oldWindow.getWindow().asBinder())) { + return true; + } + } + + return false; + } + + private void generateMagnificationSpecInverseMatrixLocked(int displayId) { + MagnificationSpec spec = new MagnificationSpec(); + if (!mAccessibilityController.getMagnificationSpecForDisplay(displayId, spec)) { + mMagnificationSpecInverseMatrix.remove(displayId); + return; + } + sTempFloats[Matrix.MSCALE_X] = spec.scale; + sTempFloats[Matrix.MSKEW_Y] = 0; + sTempFloats[Matrix.MSKEW_X] = 0; + sTempFloats[Matrix.MSCALE_Y] = spec.scale; + sTempFloats[Matrix.MTRANS_X] = spec.offsetX; + sTempFloats[Matrix.MTRANS_Y] = spec.offsetY; + sTempFloats[Matrix.MPERSP_0] = 0; + sTempFloats[Matrix.MPERSP_1] = 0; + sTempFloats[Matrix.MPERSP_2] = 1; + + final Matrix tempMatrix = new Matrix(); + tempMatrix.setValues(sTempFloats); + + final Matrix inverseMatrix = new Matrix(); + final boolean result = tempMatrix.invert(inverseMatrix); + + if (!result) { + Slog.e(TAG, "Can't inverse the magnification spec matrix with the " + + "magnification spec = " + spec + " on the displayId = " + displayId); + return; + } + mMagnificationSpecInverseMatrix.set(displayId, inverseMatrix); + } + + private void notifyWindowsChanged(@NonNull List<Integer> displayIdsForWindowsChanged) { + mHandler.removeMessages(MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_TIMEOUT); + + for (int i = 0; i < displayIdsForWindowsChanged.size(); i++) { + mAccessibilityController.performComputeChangedWindowsNot( + displayIdsForWindowsChanged.get(i), false); + } + } + + private void forceUpdateWindows() { + final List<Integer> displayIdsForWindowsChanged = new ArrayList<>(); + + synchronized (mLock) { + for (int i = 0; i < mInputWindowHandlesOnDisplays.size(); i++) { + final int displayId = mInputWindowHandlesOnDisplays.keyAt(i); + displayIdsForWindowsChanged.add(displayId); + } + } + notifyWindowsChanged(displayIdsForWindowsChanged); + } + + @GuardedBy("mLock") + private void releaseResources() { + mInputWindowHandlesOnDisplays.clear(); + mMagnificationSpecInverseMatrix.clear(); + mVisibleWindows.clear(); + mDisplayInfos.clear(); + mWindowsNotificationEnabled = false; + mHandler.removeCallbacksAndMessages(null); + } + + private class MyHandler extends Handler { + public static final int MESSAGE_NOTIFY_WINDOWS_CHANGED = 1; + public static final int MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_UI_STABLE = 2; + public static final int MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_TIMEOUT = 3; + + MyHandler(Looper looper) { + super(looper, null, false); + } + + @Override + public void handleMessage(Message message) { + switch (message.what) { + case MESSAGE_NOTIFY_WINDOWS_CHANGED: { + final List<Integer> displayIdsForWindowsChanged = (List<Integer>) message.obj; + notifyWindowsChanged(displayIdsForWindowsChanged); + } break; + + case MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_UI_STABLE: { + forceUpdateWindows(); + } break; + + case MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_TIMEOUT: { + Slog.w(TAG, "Windows change within in 2 frames continuously over 500 ms " + + "and notify windows changed immediately"); + mHandler.removeMessages( + MyHandler.MESSAGE_NOTIFY_WINDOWS_CHANGED_BY_UI_STABLE); + + forceUpdateWindows(); + } break; + } + } + } + + /** + * This class represents information about a window from the + * surface flinger to the accessibility framework. + */ + public static class AccessibilityWindow { + private static final Region TEMP_REGION = new Region(); + private static final RectF TEMP_RECTF = new RectF(); + // Data + private IWindow mWindow; + private int mDisplayId; + private int mFlags; + private int mType; + private int mPrivateFlags; + private boolean mIsPIPMenu; + private boolean mIsFocused; + private boolean mShouldMagnify; + private boolean mIgnoreDuetoRecentsAnimation; + private boolean mIsTrustedOverlay; + private final Region mTouchableRegionInScreen = new Region(); + private final Region mTouchableRegionInWindow = new Region(); + private final Region mLetterBoxBounds = new Region(); + private WindowInfo mWindowInfo; + + /** + * Returns the instance after initializing the internal data. + * @param service The window manager service. + * @param inputWindowHandle The window from the surface flinger. + * @param inverseMatrix The magnification spec inverse matrix. + */ + public static AccessibilityWindow initializeData(WindowManagerService service, + InputWindowHandle inputWindowHandle, Matrix inverseMatrix, IBinder pipIBinder, + Matrix displayMatrix) { + final IWindow window = inputWindowHandle.getWindow(); + final WindowState windowState = window != null ? service.mWindowMap.get( + window.asBinder()) : null; + + final AccessibilityWindow instance = new AccessibilityWindow(); + + instance.mWindow = inputWindowHandle.getWindow(); + instance.mDisplayId = inputWindowHandle.displayId; + instance.mFlags = inputWindowHandle.layoutParamsFlags; + instance.mType = inputWindowHandle.layoutParamsType; + instance.mIsPIPMenu = inputWindowHandle.getWindow().asBinder().equals(pipIBinder); + + // TODO (b/199357848): gets the private flag of the window from other way. + instance.mPrivateFlags = windowState != null ? windowState.mAttrs.privateFlags : 0; + // TODO (b/199358208) : using new way to implement the focused window. + instance.mIsFocused = windowState != null && windowState.isFocused(); + instance.mShouldMagnify = windowState == null || windowState.shouldMagnify(); + + final RecentsAnimationController controller = service.getRecentsAnimationController(); + instance.mIgnoreDuetoRecentsAnimation = windowState != null && controller != null + && controller.shouldIgnoreForAccessibility(windowState); + instance.mIsTrustedOverlay = inputWindowHandle.trustedOverlay; + + // TODO (b/199358388) : gets the letterbox bounds of the window from other way. + if (windowState != null && windowState.areAppWindowBoundsLetterboxed()) { + getLetterBoxBounds(windowState, instance.mLetterBoxBounds); + } + + final Rect windowFrame = new Rect(inputWindowHandle.frameLeft, + inputWindowHandle.frameTop, inputWindowHandle.frameRight, + inputWindowHandle.frameBottom); + getTouchableRegionInWindow(instance.mShouldMagnify, inputWindowHandle.touchableRegion, + instance.mTouchableRegionInWindow, windowFrame, inverseMatrix, displayMatrix); + getUnMagnifiedTouchableRegion(instance.mShouldMagnify, + inputWindowHandle.touchableRegion, instance.mTouchableRegionInScreen, + inverseMatrix, displayMatrix); + instance.mWindowInfo = windowState != null + ? windowState.getWindowInfo() : getWindowInfoForWindowlessWindows(instance); + + return instance; + } + + /** + * Returns the touchable region in the screen. + * @param outRegion The touchable region. + */ + public void getTouchableRegionInScreen(Region outRegion) { + outRegion.set(mTouchableRegionInScreen); + } + + /** + * Returns the touchable region in the window. + * @param outRegion The touchable region. + */ + public void getTouchableRegionInWindow(Region outRegion) { + outRegion.set(mTouchableRegionInWindow); + } + + /** + * @return the layout parameter flag {@link android.view.WindowManager.LayoutParams#flags}. + */ + public int getFlags() { + return mFlags; + } + + /** + * @return the layout parameter type {@link android.view.WindowManager.LayoutParams#type}. + */ + public int getType() { + return mType; + } + + /** + * @return the layout parameter private flag + * {@link android.view.WindowManager.LayoutParams#privateFlags}. + */ + public int getPrivateFlag() { + return mPrivateFlags; + } + + /** + * @return the windowInfo {@link WindowInfo}. + */ + public WindowInfo getWindowInfo() { + return mWindowInfo; + } + + /** + * Gets the letter box bounds if activity bounds are letterboxed + * or letterboxed for display cutout. + * + * @return {@code true} there's a letter box bounds. + */ + public Boolean setLetterBoxBoundsIfNeeded(Region outBounds) { + if (mLetterBoxBounds.isEmpty()) { + return false; + } + + outBounds.set(mLetterBoxBounds); + return true; + } + + /** + * @return true if this window should be magnified. + */ + public boolean shouldMagnify() { + return mShouldMagnify; + } + + /** + * @return true if this window is focused. + */ + public boolean isFocused() { + return mIsFocused; + } + + /** + * @return true if it's running the recent animation but not the target app. + */ + public boolean ignoreRecentsAnimationForAccessibility() { + return mIgnoreDuetoRecentsAnimation; + } + + /** + * @return true if this window is the trusted overlay. + */ + public boolean isTrustedOverlay() { + return mIsTrustedOverlay; + } + + /** + * @return true if this window is the navigation bar with the gesture mode. + */ + public boolean isUntouchableNavigationBar() { + if (mType != WindowManager.LayoutParams.TYPE_NAVIGATION_BAR) { + return false; + } + + return mTouchableRegionInScreen.isEmpty(); + } + + /** + * @return true if this window is PIP menu. + */ + public boolean isPIPMenu() { + return mIsPIPMenu; + } + + private static void getTouchableRegionInWindow(boolean shouldMagnify, Region inRegion, + Region outRegion, Rect frame, Matrix inverseMatrix, Matrix displayMatrix) { + // Some modal windows, like the activity with Theme.dialog, has the full screen + // as its touchable region, but its window frame is smaller than the touchable + // region. The region we report should be the touchable area in the window frame + // for the consistency and match developers expectation. + // So we need to make the intersection between the frame and touchable region to + // obtain the real touch region in the screen. + Region touchRegion = TEMP_REGION; + touchRegion.set(inRegion); + touchRegion.op(frame, Region.Op.INTERSECT); + + getUnMagnifiedTouchableRegion(shouldMagnify, touchRegion, outRegion, inverseMatrix, + displayMatrix); + } + + /** + * Gets the un-magnified touchable region. If this window can be magnified and magnifying, + * we will transform the input touchable region by applying the inverse matrix of the + * magnification spec to get the un-magnified touchable region. + * @param shouldMagnify The window can be magnified. + * @param inRegion The touchable region of this window. + * @param outRegion The un-magnified touchable region of this window. + * @param inverseMatrix The inverse matrix of the magnification spec. + * @param displayMatrix The display transform matrix which takes display coordinates to + * logical display coordinates. + */ + private static void getUnMagnifiedTouchableRegion(boolean shouldMagnify, Region inRegion, + Region outRegion, Matrix inverseMatrix, Matrix displayMatrix) { + if ((!shouldMagnify || inverseMatrix.isIdentity()) && displayMatrix.isIdentity()) { + outRegion.set(inRegion); + return; + } + + forEachRect(inRegion, rect -> { + // Move to origin as all transforms are captured by the matrix. + RectF windowFrame = TEMP_RECTF; + windowFrame.set(rect); + + inverseMatrix.mapRect(windowFrame); + displayMatrix.mapRect(windowFrame); + // Union all rects. + outRegion.union(new Rect((int) windowFrame.left, (int) windowFrame.top, + (int) windowFrame.right, (int) windowFrame.bottom)); + }); + } + + private static WindowInfo getWindowInfoForWindowlessWindows(AccessibilityWindow window) { + WindowInfo windowInfo = WindowInfo.obtain(); + windowInfo.displayId = window.mDisplayId; + windowInfo.type = window.mType; + windowInfo.token = window.mWindow.asBinder(); + windowInfo.hasFlagWatchOutsideTouch = (window.mFlags + & WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH) != 0; + windowInfo.inPictureInPicture = false; + + // There only are two windowless windows now, one is split window, and the other + // one is PIP. + if (windowInfo.type == TYPE_DOCK_DIVIDER) { + windowInfo.title = "Splitscreen Divider"; + } else if (window.mIsPIPMenu) { + windowInfo.title = "Picture-in-Picture menu"; + } + return windowInfo; + } + + private static void getLetterBoxBounds(WindowState windowState, Region outRegion) { + final Rect letterboxInsets = windowState.mActivityRecord.getLetterboxInsets(); + final Rect nonLetterboxRect = windowState.getBounds(); + + nonLetterboxRect.inset(letterboxInsets); + outRegion.set(windowState.getBounds()); + outRegion.op(nonLetterboxRect, Region.Op.DIFFERENCE); + } + + @Override + public String toString() { + String builder = "A11yWindow=[" + mWindow.asBinder() + + ", displayId=" + mDisplayId + + ", flag=0x" + Integer.toHexString(mFlags) + + ", type=" + mType + + ", privateFlag=0x" + Integer.toHexString(mPrivateFlags) + + ", focused=" + mIsFocused + + ", shouldMagnify=" + mShouldMagnify + + ", ignoreDuetoRecentsAnimation=" + mIgnoreDuetoRecentsAnimation + + ", isTrustedOverlay=" + mIsTrustedOverlay + + ", regionInScreen=" + mTouchableRegionInScreen + + ", touchableRegion=" + mTouchableRegionInWindow + + ", letterBoxBounds=" + mLetterBoxBounds + + ", isPIPMenu=" + mIsPIPMenu + + ", windowInfo=" + mWindowInfo + + "]"; + + return builder; + } + } +} diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index b0efa5b283bb..d7725865f609 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -148,6 +148,7 @@ import static com.android.server.wm.ActivityRecordProto.ALL_DRAWN; import static com.android.server.wm.ActivityRecordProto.APP_STOPPED; import static com.android.server.wm.ActivityRecordProto.CLIENT_VISIBLE; import static com.android.server.wm.ActivityRecordProto.DEFER_HIDING_CLIENT; +import static com.android.server.wm.ActivityRecordProto.ENABLE_RECENTS_SCREENSHOT; import static com.android.server.wm.ActivityRecordProto.FILLS_PARENT; import static com.android.server.wm.ActivityRecordProto.FRONT_OF_TASK; import static com.android.server.wm.ActivityRecordProto.IN_SIZE_COMPAT_MODE; @@ -771,7 +772,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Last visibility state we reported to the app token. boolean reportedVisible; - boolean mEnablePreviewScreenshots = true; + boolean mEnableRecentsScreenshot = true; // Information about an application starting window if displayed. // Note: these are de-referenced before the starting window animates away. @@ -5151,7 +5152,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * See {@link Activity#setRecentsScreenshotEnabled}. */ void setRecentsScreenshotEnabled(boolean enabled) { - mEnablePreviewScreenshots = enabled; + mEnableRecentsScreenshot = enabled; } /** @@ -5163,7 +5164,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * screenshot. */ boolean shouldUseAppThemeSnapshot() { - return !mEnablePreviewScreenshots || forAllWindows(WindowState::isSecureLocked, + return !mEnableRecentsScreenshot || forAllWindows(WindowState::isSecureLocked, true /* topToBottom */); } @@ -9184,6 +9185,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Only record if max bounds sandboxing is applied, if the caller has the necessary // permission to access the device configs. proto.write(PROVIDES_MAX_BOUNDS, providesMaxBounds()); + proto.write(ENABLE_RECENTS_SCREENSHOT, mEnableRecentsScreenshot); } @Override diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index ef0ee1206208..47bec3081dc3 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2196,8 +2196,9 @@ class ActivityStarter { // removed from calling performClearTaskLocked (For example, if it is being brought out // of history or if it is finished immediately), thus disassociating the task. Also note // that mReuseTask is reset as a result of {@link Task#performClearTaskLocked} - // launching another activity. - targetTask.performClearTaskLocked(); + // launching another activity. Keep the task-overlay activity because the targetTask + // will be reused to launch new activity. + targetTask.performClearTaskForReuse(true /* excludingTaskOverlay*/); targetTask.setIntent(mStartActivity); mAddingToTask = true; } else if ((mLaunchFlags & FLAG_ACTIVITY_CLEAR_TOP) != 0 @@ -2207,8 +2208,7 @@ class ActivityStarter { // In this situation we want to remove all activities from the task up to the one // being started. In most cases this means we are resetting the task to its initial // state. - final ActivityRecord top = targetTask.performClearTaskForReuseLocked(mStartActivity, - mLaunchFlags); + final ActivityRecord top = targetTask.performClearTop(mStartActivity, mLaunchFlags); if (top != null) { if (top.isRootOfTask()) { diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index 25c4d200d76b..cecfccd1f836 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -471,7 +471,7 @@ public abstract class ActivityTaskManagerInternal { /** Dump the current activities state. */ public abstract boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args, int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly, - boolean dumpFocusedRootTaskOnly); + boolean dumpFocusedRootTaskOnly, @UserIdInt int userId); /** Dump the current state for inclusion in oom dump. */ public abstract void dumpForOom(PrintWriter pw); diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 049747728ade..fe4eae915422 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -4062,12 +4062,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { */ protected boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args, int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly, - boolean dumpFocusedRootTaskOnly) { + boolean dumpFocusedRootTaskOnly, @UserIdInt int userId) { ArrayList<ActivityRecord> activities; synchronized (mGlobalLock) { activities = mRootWindowContainer.getDumpActivities(name, dumpVisibleRootTasksOnly, - dumpFocusedRootTaskOnly); + dumpFocusedRootTaskOnly, userId); } if (activities.size() <= 0) { @@ -6410,9 +6410,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args, int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly, - boolean dumpFocusedRootTaskOnly) { + boolean dumpFocusedRootTaskOnly, @UserIdInt int userId) { return ActivityTaskManagerService.this.dumpActivity(fd, pw, name, args, opti, dumpAll, - dumpVisibleRootTasksOnly, dumpFocusedRootTaskOnly); + dumpVisibleRootTasksOnly, dumpFocusedRootTaskOnly, userId); } @Override diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index 3d7dead7d4c0..5573f161d1c1 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -1605,7 +1605,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { task.mTransitionController.requestCloseTransitionIfNeeded(task); task.mInRemoveTask = true; try { - task.performClearTask(reason); + task.removeActivities(reason, false /* excludingTaskOverlay */); cleanUpRemovedTaskLocked(task, killProcess, removeFromRecents); mService.getLockTaskController().clearLockedTask(task); mService.getTaskChangeNotificationController().notifyTaskStackChanged(); diff --git a/services/core/java/com/android/server/wm/AnrController.java b/services/core/java/com/android/server/wm/AnrController.java index 3d54b27c819b..6befefda8a12 100644 --- a/services/core/java/com/android/server/wm/AnrController.java +++ b/services/core/java/com/android/server/wm/AnrController.java @@ -21,6 +21,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static com.android.server.wm.ActivityRecord.INVALID_PID; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import android.annotation.NonNull; import android.os.Build; import android.os.IBinder; import android.os.Process; @@ -35,6 +36,7 @@ import com.android.server.criticalevents.CriticalEventLog; import java.io.File; import java.util.ArrayList; +import java.util.OptionalInt; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -75,7 +77,33 @@ class AnrController { activity.inputDispatchingTimedOut(reason, INVALID_PID); } - void notifyWindowUnresponsive(IBinder inputToken, String reason) { + + /** + * Notify a window was unresponsive. + * + * @param token - the input token of the window + * @param pid - the pid of the window, if known + * @param reason - the reason for the window being unresponsive + */ + void notifyWindowUnresponsive(@NonNull IBinder token, @NonNull OptionalInt pid, + @NonNull String reason) { + if (notifyWindowUnresponsive(token, reason)) { + return; + } + if (!pid.isPresent()) { + Slog.w(TAG_WM, "Failed to notify that window token=" + token + " was unresponsive."); + return; + } + notifyWindowUnresponsive(pid.getAsInt(), reason); + } + + /** + * Notify a window identified by its input token was unresponsive. + * + * @return true if the window was identified by the given input token and the request was + * handled, false otherwise. + */ + private boolean notifyWindowUnresponsive(@NonNull IBinder inputToken, String reason) { preDumpIfLockTooSlow(); final int pid; final boolean aboveSystem; @@ -83,10 +111,8 @@ class AnrController { synchronized (mService.mGlobalLock) { InputTarget target = mService.getInputTargetFromToken(inputToken); if (target == null) { - Slog.e(TAG_WM, "Unknown token, dropping notifyConnectionUnresponsive request"); - return; + return false; } - WindowState windowState = target.getWindowState(); pid = target.getPid(); // Blame the activity if the input token belongs to the window. If the target is @@ -102,34 +128,63 @@ class AnrController { } else { mService.mAmInternal.inputDispatchingTimedOut(pid, aboveSystem, reason); } + return true; + } + + /** + * Notify a window owned by the provided pid was unresponsive. + */ + private void notifyWindowUnresponsive(int pid, String reason) { + Slog.i(TAG_WM, "ANR in input window owned by pid=" + pid + ". Reason: " + reason); + dumpAnrStateLocked(null /* activity */, null /* windowState */, reason); + + // We cannot determine the z-order of the window, so place the anr dialog as high + // as possible. + mService.mAmInternal.inputDispatchingTimedOut(pid, true /*aboveSystem*/, reason); + } + + /** + * Notify a window was responsive after previously being unresponsive. + * + * @param token - the input token of the window + * @param pid - the pid of the window, if known + */ + void notifyWindowResponsive(@NonNull IBinder token, @NonNull OptionalInt pid) { + if (notifyWindowResponsive(token)) { + return; + } + if (!pid.isPresent()) { + Slog.w(TAG_WM, "Failed to notify that window token=" + token + " was responsive."); + return; + } + notifyWindowResponsive(pid.getAsInt()); } - void notifyWindowResponsive(IBinder inputToken) { + /** + * Notify a window identified by its input token was responsive after previously being + * unresponsive. + * + * @return true if the window was identified by the given input token and the request was + * handled, false otherwise. + */ + private boolean notifyWindowResponsive(@NonNull IBinder inputToken) { final int pid; synchronized (mService.mGlobalLock) { InputTarget target = mService.getInputTargetFromToken(inputToken); if (target == null) { - Slog.e(TAG_WM, "Unknown token, dropping notifyWindowConnectionResponsive request"); - return; + return false; } pid = target.getPid(); } mService.mAmInternal.inputDispatchingResumed(pid); + return true; } - void notifyGestureMonitorUnresponsive(int gestureMonitorPid, String reason) { - preDumpIfLockTooSlow(); - synchronized (mService.mGlobalLock) { - Slog.i(TAG_WM, "ANR in gesture monitor owned by pid:" + gestureMonitorPid - + ". Reason: " + reason); - dumpAnrStateLocked(null /* activity */, null /* windowState */, reason); - } - mService.mAmInternal.inputDispatchingTimedOut(gestureMonitorPid, /* aboveSystem */ true, - reason); - } - - void notifyGestureMonitorResponsive(int gestureMonitorPid) { - mService.mAmInternal.inputDispatchingResumed(gestureMonitorPid); + /** + * Notify a window owned by the provided pid was responsive after previously being unresponsive. + */ + private void notifyWindowResponsive(int pid) { + mService.mAmInternal.inputDispatchingResumed(pid); } /** @@ -228,12 +283,7 @@ class AnrController { mService.mAtmService.saveANRState(reason); } - private boolean isWindowAboveSystem(WindowState windowState) { - if (windowState == null) { - // If the window state is not available we cannot easily determine its z order. Try to - // place the anr dialog as high as possible. - return true; - } + private boolean isWindowAboveSystem(@NonNull WindowState windowState) { int systemAlertLayer = mService.mPolicy.getWindowLayerFromTypeLw( TYPE_APPLICATION_OVERLAY, windowState.mOwnerCanAddInternalSystemWindow); return windowState.mBaseLayer > systemAlertLayer; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index fd24565798fb..83ff2f07a06f 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -5009,6 +5009,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final boolean canImeTargetSetRelativeLayer = imeTarget.getSurfaceControl() != null && imeTarget.mToken == imeControlTargetToken && !imeTarget.inMultiWindowMode() + // We don't need to set relative layer if the IME target in non-multi-window + // mode is the activity main window since updateImeParent will ensure the IME + // surface be attached on the fullscreen activity. + && imeTarget.mAttrs.type != TYPE_BASE_APPLICATION && imeTarget.mToken.getActivity(app -> app.isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_RECENTS)) == null; if (canImeTargetSetRelativeLayer) { diff --git a/services/core/java/com/android/server/wm/InputManagerCallback.java b/services/core/java/com/android/server/wm/InputManagerCallback.java index 1f0fdcf0a8d2..8d1425d17d47 100644 --- a/services/core/java/com/android/server/wm/InputManagerCallback.java +++ b/services/core/java/com/android/server/wm/InputManagerCallback.java @@ -39,6 +39,7 @@ import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.input.InputManagerService; import java.io.PrintWriter; +import java.util.OptionalInt; final class InputManagerCallback implements InputManagerService.WindowManagerCallbacks { private static final String TAG = TAG_WITH_CLASS_NAME ? "InputManagerCallback" : TAG_WM; @@ -98,23 +99,14 @@ final class InputManagerCallback implements InputManagerService.WindowManagerCal } @Override - public void notifyGestureMonitorUnresponsive(int pid, @NonNull String reason) { - mService.mAnrController.notifyGestureMonitorUnresponsive(pid, reason); + public void notifyWindowUnresponsive(@NonNull IBinder token, @NonNull OptionalInt pid, + @NonNull String reason) { + mService.mAnrController.notifyWindowUnresponsive(token, pid, reason); } @Override - public void notifyWindowUnresponsive(@NonNull IBinder token, String reason) { - mService.mAnrController.notifyWindowUnresponsive(token, reason); - } - - @Override - public void notifyGestureMonitorResponsive(int pid) { - mService.mAnrController.notifyGestureMonitorResponsive(pid); - } - - @Override - public void notifyWindowResponsive(@NonNull IBinder token) { - mService.mAnrController.notifyWindowResponsive(token); + public void notifyWindowResponsive(@NonNull IBinder token, @NonNull OptionalInt pid) { + mService.mAnrController.notifyWindowResponsive(token, pid); } /** Notifies that the input device configuration has changed. */ diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java index 8a2d11636fe3..160fc95f3f7c 100644 --- a/services/core/java/com/android/server/wm/LockTaskController.java +++ b/services/core/java/com/android/server/wm/LockTaskController.java @@ -542,7 +542,7 @@ public class LockTaskController { if (mLockTaskModeTasks.isEmpty()) { return; } - task.performClearTaskLocked(); + task.performClearTaskForReuse(false /* excludingTaskOverlay*/); mSupervisor.mRootWindowContainer.resumeFocusedTasksTopActivities(); } @@ -740,7 +740,7 @@ public class LockTaskController { ProtoLog.d(WM_DEBUG_LOCKTASK, "onLockTaskPackagesUpdated: removing %s" + " mLockTaskAuth()=%s", lockedTask, lockedTask.lockTaskAuthToString()); removeLockedTask(lockedTask); - lockedTask.performClearTaskLocked(); + lockedTask.performClearTaskForReuse(false /* excludingTaskOverlay*/); taskChanged = true; } diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 8ab2ee03a1e3..b9cd657da0e2 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -18,15 +18,9 @@ package com.android.server.wm; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.KeyguardManager.ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE; import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK; @@ -2791,35 +2785,17 @@ class RootWindowContainer extends WindowContainer<DisplayContent> Task rootTask = null; // Next preference for root task goes to the taskDisplayArea candidate. - if (launchParams != null && launchParams.mPreferredTaskDisplayArea != null) { + if (launchParams != null && launchParams.mPreferredTaskDisplayArea != null + && canLaunchOnDisplay(r, launchParams.mPreferredTaskDisplayArea.getDisplayId())) { taskDisplayArea = launchParams.mPreferredTaskDisplayArea; } - - if (taskDisplayArea == null && displayId != INVALID_DISPLAY) { - final DisplayContent displayContent = getDisplayContent(displayId); - if (displayContent != null) { - taskDisplayArea = displayContent.getDefaultTaskDisplayArea(); - } + if (taskDisplayArea == null && displayId != INVALID_DISPLAY + && canLaunchOnDisplay(r, displayId)) { + taskDisplayArea = getDisplayContent(displayId).getDefaultTaskDisplayArea(); } - if (taskDisplayArea != null) { - final int tdaDisplayId = taskDisplayArea.getDisplayId(); - if (canLaunchOnDisplay(r, tdaDisplayId)) { - if (r != null) { - final Task result = getValidLaunchRootTaskInTaskDisplayArea( - taskDisplayArea, r, candidateTask, options, launchParams); - if (result != null) { - return result; - } - } - // Falling back to default task container - taskDisplayArea = taskDisplayArea.mDisplayContent.getDefaultTaskDisplayArea(); - rootTask = taskDisplayArea.getOrCreateRootTask(r, options, candidateTask, - sourceTask, launchParams, launchFlags, activityType, onTop); - if (rootTask != null) { - return rootTask; - } - } + return taskDisplayArea.getOrCreateRootTask(r, options, candidateTask, + sourceTask, launchParams, launchFlags, activityType, onTop); } // Give preference to the root task and display of the input task and activity if they @@ -2869,103 +2845,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return r.canBeLaunchedOnDisplay(displayId); } - /** - * Get a topmost root task on the display area, that is a valid launch root task for - * specified activity. If there is no such root task, new dynamic root task can be created. - * - * @param taskDisplayArea Target display area. - * @param r Activity that should be launched there. - * @param candidateTask The possible task the activity might be put in. - * @return Existing root task if there is a valid one, new dynamic root task if it is valid - * or null. - */ - @VisibleForTesting - Task getValidLaunchRootTaskInTaskDisplayArea(@NonNull TaskDisplayArea taskDisplayArea, - @NonNull ActivityRecord r, @Nullable Task candidateTask, - @Nullable ActivityOptions options, - @Nullable LaunchParamsController.LaunchParams launchParams) { - if (!r.canBeLaunchedOnDisplay(taskDisplayArea.getDisplayId())) { - return null; - } - - // If {@code r} is already in target display area and its task is the same as the candidate - // task, the intention should be getting a launch root task for the reusable activity, so we - // can use the existing root task. - if (candidateTask != null) { - final TaskDisplayArea attachedTaskDisplayArea = candidateTask.getDisplayArea(); - if (attachedTaskDisplayArea == null || attachedTaskDisplayArea == taskDisplayArea) { - return candidateTask.getRootTask(); - } - // Or the candidate task is already a root task that can be reused by reparenting - // it to the target display. - if (candidateTask.isRootTask()) { - final Task rootTask = candidateTask.getRootTask(); - rootTask.reparent(taskDisplayArea, true /* onTop */); - return rootTask; - } - } - - int windowingMode; - if (launchParams != null) { - // When launch params is not null, we always defer to its windowing mode. Sometimes - // it could be unspecified, which indicates it should inherit windowing mode from - // display. - windowingMode = launchParams.mWindowingMode; - } else { - windowingMode = options != null ? options.getLaunchWindowingMode() - : r.getWindowingMode(); - } - windowingMode = taskDisplayArea.validateWindowingMode(windowingMode, r, candidateTask); - - // Return the topmost valid root task on the display. - final int targetWindowingMode = windowingMode; - final Task topmostValidRootTask = taskDisplayArea.getRootTask(rootTask -> - isValidLaunchRootTask(rootTask, r, targetWindowingMode)); - if (topmostValidRootTask != null) { - return topmostValidRootTask; - } - - // If there is no valid root task on the secondary display area - check if new dynamic root - // task will do. - if (taskDisplayArea != getDisplayContent(taskDisplayArea.getDisplayId()) - .getDefaultTaskDisplayArea()) { - final int activityType = - options != null && options.getLaunchActivityType() != ACTIVITY_TYPE_UNDEFINED - ? options.getLaunchActivityType() : r.getActivityType(); - return taskDisplayArea.createRootTask( - windowingMode, activityType, true /*onTop*/, options); - } - - return null; - } - - // TODO: Can probably be consolidated into getLaunchRootTask()... - private boolean isValidLaunchRootTask(Task task, ActivityRecord r, int windowingMode) { - switch (task.getActivityType()) { - case ACTIVITY_TYPE_HOME: - return r.isActivityTypeHome(); - case ACTIVITY_TYPE_RECENTS: - return r.isActivityTypeRecents(); - case ACTIVITY_TYPE_ASSISTANT: - return r.isActivityTypeAssistant(); - case ACTIVITY_TYPE_DREAM: - return r.isActivityTypeDream(); - } - if (task.mCreatedByOrganizer) { - // Don't launch directly into task created by organizer...but why can't we? - return false; - } - // There is a 1-to-1 relationship between root task and task when not in - // primary split-windowing mode. - if (task.getWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY - && r.supportsSplitScreenWindowingModeInDisplayArea(task.getDisplayArea()) - && (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY - || windowingMode == WINDOWING_MODE_UNDEFINED)) { - return true; - } - return false; - } - int resolveActivityType(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task task) { // Preference is given to the activity type for the activity then the task since the type @@ -3434,11 +3313,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * or all visible root tasks if {@param dumpVisibleRootTasksOnly} is true. */ ArrayList<ActivityRecord> getDumpActivities(String name, boolean dumpVisibleRootTasksOnly, - boolean dumpFocusedRootTaskOnly) { + boolean dumpFocusedRootTaskOnly, @UserIdInt int userId) { if (dumpFocusedRootTaskOnly) { final Task topFocusedRootTask = getTopDisplayFocusedRootTask(); if (topFocusedRootTask != null) { - return topFocusedRootTask.getDumpActivitiesLocked(name); + return topFocusedRootTask.getDumpActivitiesLocked(name, userId); } else { return new ArrayList<>(); } @@ -3446,7 +3325,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final ArrayList<ActivityRecord> activities = new ArrayList<>(); forAllRootTasks(rootTask -> { if (!dumpVisibleRootTasksOnly || rootTask.shouldBeVisible(null)) { - activities.addAll(rootTask.getDumpActivitiesLocked(name)); + activities.addAll(rootTask.getDumpActivitiesLocked(name, userId)); } }); return activities; diff --git a/services/core/java/com/android/server/wm/ShellRoot.java b/services/core/java/com/android/server/wm/ShellRoot.java index 2eab3bab0bd3..f9d7b53e4e78 100644 --- a/services/core/java/com/android/server/wm/ShellRoot.java +++ b/services/core/java/com/android/server/wm/ShellRoot.java @@ -25,15 +25,14 @@ import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMAT import static com.android.server.wm.WindowManagerService.MAX_ANIMATION_DURATION; import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.Point; -import android.graphics.Rect; import android.os.IBinder; import android.os.RemoteException; import android.util.Slog; import android.view.DisplayInfo; import android.view.IWindow; import android.view.SurfaceControl; -import android.view.WindowInfo; import android.view.WindowManager; import android.view.animation.Animation; @@ -136,46 +135,12 @@ public class ShellRoot { ANIMATION_TYPE_WINDOW_ANIMATION); } - WindowInfo getWindowInfo() { - if (mShellRootLayer != SHELL_ROOT_LAYER_DIVIDER - && mShellRootLayer != SHELL_ROOT_LAYER_PIP) { - return null; - } - if (mShellRootLayer == SHELL_ROOT_LAYER_DIVIDER) { - return null; - } - if (mShellRootLayer == SHELL_ROOT_LAYER_PIP - && mDisplayContent.getDefaultTaskDisplayArea().getRootPinnedTask() == null) { - return null; - } - if (mAccessibilityWindow == null) { - return null; - } - WindowInfo windowInfo = WindowInfo.obtain(); - windowInfo.displayId = mToken.getDisplayArea().getDisplayContent().mDisplayId; - windowInfo.type = mToken.windowType; - windowInfo.layer = mToken.getWindowLayerFromType(); - windowInfo.token = mAccessibilityWindow.asBinder(); - windowInfo.focused = false; - windowInfo.hasFlagWatchOutsideTouch = false; - final Rect regionRect = new Rect(); - - - // DividerView - if (mShellRootLayer == SHELL_ROOT_LAYER_DIVIDER) { - windowInfo.inPictureInPicture = false; - mDisplayContent.getDockedDividerController().getTouchRegion(regionRect); - windowInfo.regionInScreen.set(regionRect); - windowInfo.title = "Splitscreen Divider"; - } - // PipMenuView - if (mShellRootLayer == SHELL_ROOT_LAYER_PIP) { - windowInfo.inPictureInPicture = true; - mDisplayContent.getDefaultTaskDisplayArea().getRootPinnedTask().getBounds(regionRect); - windowInfo.regionInScreen.set(regionRect); - windowInfo.title = "Picture-in-Picture menu"; + @Nullable + IBinder getAccessibilityWindowToken() { + if (mAccessibilityWindow != null) { + return mAccessibilityWindow.asBinder(); } - return windowInfo; + return null; } void setAccessibilityWindow(IWindow window) { @@ -196,9 +161,5 @@ public class ShellRoot { mAccessibilityWindow = null; } } - if (mDisplayContent.mWmService.mAccessibilityController.hasCallbacks()) { - mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMoved( - mDisplayContent.getDisplayId()); - } } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index ffa1a601d41b..cc03c60aa6d6 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -137,6 +137,7 @@ import static java.lang.Integer.MAX_VALUE; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RecentTaskInfo.PersistedTaskSnapshotData; @@ -1583,19 +1584,23 @@ class Task extends TaskFragment { } /** Completely remove all activities associated with an existing task. */ - void performClearTask(String reason) { + void removeActivities(String reason, boolean excludingTaskOverlay) { clearPinnedTaskIfNeed(); // Broken down into to cases to avoid object create due to capturing mStack. if (getRootTask() == null) { forAllActivities((r) -> { - if (r.finishing) return; + if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) { + return; + } // Task was restored from persistent storage. r.takeFromHistory(); removeChild(r, reason); }); } else { forAllActivities((r) -> { - if (r.finishing) return; + if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) { + return; + } // Prevent the transition from being executed too early if the top activity is // resumed but the mVisibleRequested of any other activity is true, the transition // should wait until next activity resumed. @@ -1612,26 +1617,24 @@ class Task extends TaskFragment { /** * Completely remove all activities associated with an existing task. */ - void performClearTaskLocked() { + void performClearTaskForReuse(boolean excludingTaskOverlay) { mReuseTask = true; mTaskSupervisor.beginDeferResume(); try { - performClearTask("clear-task-all"); + removeActivities("clear-task-all", excludingTaskOverlay); } finally { mTaskSupervisor.endDeferResume(); mReuseTask = false; } } - ActivityRecord performClearTaskForReuseLocked(ActivityRecord newR, int launchFlags) { - mReuseTask = true; + ActivityRecord performClearTop(ActivityRecord newR, int launchFlags) { mTaskSupervisor.beginDeferResume(); final ActivityRecord result; try { - result = performClearTaskLocked(newR, launchFlags); + result = clearTopActivities(newR, launchFlags); } finally { mTaskSupervisor.endDeferResume(); - mReuseTask = false; } return result; } @@ -1647,7 +1650,7 @@ class Task extends TaskFragment { * @return Returns the old activity that should be continued to be used, * or {@code null} if none was found. */ - private ActivityRecord performClearTaskLocked(ActivityRecord newR, int launchFlags) { + private ActivityRecord clearTopActivities(ActivityRecord newR, int launchFlags) { final ActivityRecord r = findActivityInHistory(newR.mActivityComponent); if (r == null) return null; @@ -1674,7 +1677,7 @@ class Task extends TaskFragment { // Stop operation once we reach the boundary activity. if (r == boundaryActivity) return true; - if (!r.finishing) { + if (!r.finishing && !r.isTaskOverlay()) { final ActivityOptions opts = r.getOptions(); if (opts != null) { r.clearOptionsAnimation(); @@ -5149,10 +5152,13 @@ class Task extends TaskFragment { // Ensure that we do not trigger entering PiP an activity on the root pinned task return false; } + final boolean isTransient = opts != null && opts.getTransientLaunch(); final Task targetRootTask = toFrontTask != null ? toFrontTask.getRootTask() : toFrontActivity.getRootTask(); - if (targetRootTask != null && targetRootTask.isActivityTypeAssistant()) { - // Ensure the task/activity being brought forward is not the assistant + if (targetRootTask != null && (targetRootTask.isActivityTypeAssistant() || isTransient)) { + // Ensure the task/activity being brought forward is not the assistant and is not + // transient. In the case of transient-launch, we want to wait until the end of the + // transition and only allow switch if the transient launch was committed. return false; } return true; @@ -5688,7 +5694,7 @@ class Task extends TaskFragment { } } - ArrayList<ActivityRecord> getDumpActivitiesLocked(String name) { + ArrayList<ActivityRecord> getDumpActivitiesLocked(String name, @UserIdInt int userId) { ArrayList<ActivityRecord> activities = new ArrayList<>(); if ("all".equals(name)) { @@ -5708,7 +5714,13 @@ class Task extends TaskFragment { } }); } - + if (userId != UserHandle.USER_ALL) { + for (int i = activities.size() - 1; i >= 0; --i) { + if (activities.get(i).mUserId != userId) { + activities.remove(i); + } + } + } return activities; } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index f0cca18eca99..2f50b14968d5 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -941,36 +941,32 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { Task getOrCreateRootTask(int windowingMode, int activityType, boolean onTop, @Nullable Task candidateTask, @Nullable Task sourceTask, @Nullable ActivityOptions options, int launchFlags) { + final int resolvedWindowingMode = + windowingMode == WINDOWING_MODE_UNDEFINED ? getWindowingMode() : windowingMode; // Need to pass in a determined windowing mode to see if a new root task should be created, // so use its parent's windowing mode if it is undefined. - if (!alwaysCreateRootTask( - windowingMode != WINDOWING_MODE_UNDEFINED ? windowingMode : getWindowingMode(), - activityType)) { - Task rootTask = getRootTask(windowingMode, activityType); + if (!alwaysCreateRootTask(resolvedWindowingMode, activityType)) { + Task rootTask = getRootTask(resolvedWindowingMode, activityType); if (rootTask != null) { return rootTask; } } else if (candidateTask != null) { final int position = onTop ? POSITION_TOP : POSITION_BOTTOM; - final Task launchRootTask = getLaunchRootTask(windowingMode, activityType, options, - sourceTask, launchFlags); + final Task launchRootTask = getLaunchRootTask(resolvedWindowingMode, activityType, + options, sourceTask, launchFlags); if (launchRootTask != null) { if (candidateTask.getParent() == null) { launchRootTask.addChild(candidateTask, position); } else if (candidateTask.getParent() != launchRootTask) { candidateTask.reparent(launchRootTask, position); } - } else if (candidateTask.getDisplayArea() != this || !candidateTask.isRootTask()) { + } else if (candidateTask.getDisplayArea() != this) { if (candidateTask.getParent() == null) { addChild(candidateTask, position); } else { candidateTask.reparent(this, onTop); } } - // Update windowing mode if necessary, e.g. moving a pinned task to fullscreen. - if (candidateTask.getWindowingMode() != windowingMode) { - candidateTask.setWindowingMode(windowingMode); - } return candidateTask.getRootTask(); } return new Task.Builder(mAtmService) diff --git a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java index b8ceb4a4f421..9bb02710a5bc 100644 --- a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java +++ b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java @@ -157,12 +157,26 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { // display. if (launchMode == WINDOWING_MODE_UNDEFINED && canInheritWindowingModeFromSource(display, source)) { - launchMode = source.getWindowingMode(); + // The source's windowing mode may be different from its task, e.g. activity is set + // to fullscreen and its task is pinned windowing mode when the activity is entering + // pip. + launchMode = source.getTask().getWindowingMode(); if (DEBUG) { appendLog("inherit-from-source=" + WindowConfiguration.windowingModeToString(launchMode)); } } + // If the launch windowing mode is still undefined, inherit from the target task if the + // task is already on the right display area (otherwise, the task may be on a different + // display area that has incompatible windowing mode). + if (launchMode == WINDOWING_MODE_UNDEFINED + && task != null && task.getTaskDisplayArea() == suggestedDisplayArea) { + launchMode = task.getWindowingMode(); + if (DEBUG) { + appendLog("inherit-from-task=" + + WindowConfiguration.windowingModeToString(launchMode)); + } + } // hasInitialBounds is set if either activity options or layout has specified bounds. If // that's set we'll skip some adjustments later to avoid overriding the initial bounds. boolean hasInitialBounds = false; diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 220381dcf947..0dfee60f552d 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -460,9 +460,19 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe // activity in a bad state. if (!visibleAtTransitionEnd && !ar.isVisibleRequested()) { boolean commitVisibility = true; - if (ar.getDeferHidingClient() && ar.getTask() != null) { + if (ar.isVisible() && ar.getTask() != null) { if (ar.pictureInPictureArgs != null && ar.pictureInPictureArgs.isAutoEnterEnabled()) { + if (mTransientLaunches != null) { + for (int j = 0; j < mTransientLaunches.size(); ++j) { + if (mTransientLaunches.valueAt(j).isVisibleRequested()) { + // force enable pip-on-task-switch now that we've committed + // to actually launching to the transient activity. + ar.supportsEnterPipOnTaskSwitch = true; + break; + } + } + } mController.mAtm.enterPictureInPictureMode(ar, ar.pictureInPictureArgs); // Avoid commit visibility to false here, or else we will get a sudden // "flash" / surface going invisible for a split second. @@ -1257,7 +1267,11 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe change.setAllowEnterPip(topMostActivity != null && topMostActivity.checkEnterPictureInPictureAppOpsState()); final ActivityRecord topRunningActivity = task.topRunningActivity(); - if (topRunningActivity != null && task.mDisplayContent != null) { + if (topRunningActivity != null && task.mDisplayContent != null + // Display won't be rotated for multi window Task, so the fixed rotation + // won't be applied. This can happen when the windowing mode is changed + // before the previous fixed rotation is applied. + && !task.inMultiWindowMode()) { // If Activity is in fixed rotation, its will be applied with the next rotation, // when the Task is still in the previous rotation. final int taskRotation = task.getWindowConfiguration().getDisplayRotation(); diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java index c267cbacdf24..c13ae95217b5 100644 --- a/services/core/java/com/android/server/wm/TransitionController.java +++ b/services/core/java/com/android/server/wm/TransitionController.java @@ -30,6 +30,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.IApplicationThread; +import android.app.WindowConfiguration; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.RemoteException; @@ -296,6 +297,17 @@ class TransitionController { return ci.mVisible; } + @WindowConfiguration.WindowingMode + int getWindowingModeAtStart(@NonNull WindowContainer wc) { + if (mCollectingTransition == null) return wc.getWindowingMode(); + final Transition.ChangeInfo ci = mCollectingTransition.mChanges.get(wc); + if (ci == null) { + // not part of transition, so use current state. + return wc.getWindowingMode(); + } + return ci.mWindowingMode; + } + @WindowManager.TransitionType int getCollectingTransitionType() { return mCollectingTransition != null ? mCollectingTransition.mType : TRANSIT_NONE; diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 24493e2541e1..14737d44fe22 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -196,8 +196,11 @@ class WallpaperController { "Win " + w + ": token animating, looking behind."); } mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground()); - // Found a target! End search. - return true; + // While the keyguard is going away, both notification shade and a normal activity such + // as a launcher can satisfy criteria for a wallpaper target. In this case, we should + // chose the normal activity, otherwise wallpaper becomes invisible when a new animation + // starts before the keyguard going away animation finishes. + return w.mActivityRecord != null; } return false; }; diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 87ef09ee5982..26acf43cf9ed 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -4992,9 +4992,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (isAnimating()) { return; } - if (mWmService.mAccessibilityController.hasCallbacks()) { - mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(getDisplayId()); - } if (!isSelfOrAncestorWindowAnimatingExit()) { return; diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index ccaa03ae8fd0..a2e8813c998a 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -17,6 +17,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; @@ -645,8 +646,10 @@ class WindowToken extends WindowContainer<WindowState> { final ActivityRecord r = asActivityRecord(); if (r != null) { final Task rootTask = r.getRootTask(); - // Don't transform the activity in PiP because the PiP task organizer will handle it. - if (rootTask != null && rootTask.inPinnedWindowingMode()) { + // Don't transform the activity exiting PiP because the PiP task organizer will handle + // it. + if (rootTask != null && mTransitionController.getWindowingModeAtStart(rootTask) + == WINDOWING_MODE_PINNED) { return; } } diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 3c122b03d0d1..31b557949e36 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -96,8 +96,6 @@ static struct { jmethodID notifyNoFocusedWindowAnr; jmethodID notifyWindowUnresponsive; jmethodID notifyWindowResponsive; - jmethodID notifyMonitorUnresponsive; - jmethodID notifyMonitorResponsive; jmethodID notifyFocusChanged; jmethodID notifySensorEvent; jmethodID notifySensorAccuracy; @@ -308,10 +306,9 @@ public: void notifyConfigurationChanged(nsecs_t when) override; // ANR-related callbacks -- start void notifyNoFocusedWindowAnr(const std::shared_ptr<InputApplicationHandle>& handle) override; - void notifyWindowUnresponsive(const sp<IBinder>& token, const std::string& reason) override; - void notifyWindowResponsive(const sp<IBinder>& token) override; - void notifyMonitorUnresponsive(int32_t pid, const std::string& reason) override; - void notifyMonitorResponsive(int32_t pid) override; + void notifyWindowUnresponsive(const sp<IBinder>& token, std::optional<int32_t> pid, + const std::string& reason) override; + void notifyWindowResponsive(const sp<IBinder>& token, std::optional<int32_t> pid) override; // ANR-related callbacks -- end void notifyInputChannelBroken(const sp<IBinder>& token) override; void notifyFocusChanged(const sp<IBinder>& oldToken, const sp<IBinder>& newToken) override; @@ -838,6 +835,7 @@ void NativeInputManager::notifyNoFocusedWindowAnr( } void NativeInputManager::notifyWindowUnresponsive(const sp<IBinder>& token, + std::optional<int32_t> pid, const std::string& reason) { #if DEBUG_INPUT_DISPATCHER_POLICY ALOGD("notifyWindowUnresponsive"); @@ -851,11 +849,12 @@ void NativeInputManager::notifyWindowUnresponsive(const sp<IBinder>& token, ScopedLocalRef<jstring> reasonObj(env, env->NewStringUTF(reason.c_str())); env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyWindowUnresponsive, tokenObj, - reasonObj.get()); + pid.value_or(0), pid.has_value(), reasonObj.get()); checkAndClearExceptionFromCallback(env, "notifyWindowUnresponsive"); } -void NativeInputManager::notifyWindowResponsive(const sp<IBinder>& token) { +void NativeInputManager::notifyWindowResponsive(const sp<IBinder>& token, + std::optional<int32_t> pid) { #if DEBUG_INPUT_DISPATCHER_POLICY ALOGD("notifyWindowResponsive"); #endif @@ -866,39 +865,11 @@ void NativeInputManager::notifyWindowResponsive(const sp<IBinder>& token) { jobject tokenObj = javaObjectForIBinder(env, token); - env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyWindowResponsive, tokenObj); + env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyWindowResponsive, tokenObj, + pid.value_or(0), pid.has_value()); checkAndClearExceptionFromCallback(env, "notifyWindowResponsive"); } -void NativeInputManager::notifyMonitorUnresponsive(int32_t pid, const std::string& reason) { -#if DEBUG_INPUT_DISPATCHER_POLICY - ALOGD("notifyMonitorUnresponsive"); -#endif - ATRACE_CALL(); - - JNIEnv* env = jniEnv(); - ScopedLocalFrame localFrame(env); - - ScopedLocalRef<jstring> reasonObj(env, env->NewStringUTF(reason.c_str())); - - env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyMonitorUnresponsive, pid, - reasonObj.get()); - checkAndClearExceptionFromCallback(env, "notifyMonitorUnresponsive"); -} - -void NativeInputManager::notifyMonitorResponsive(int32_t pid) { -#if DEBUG_INPUT_DISPATCHER_POLICY - ALOGD("notifyMonitorResponsive"); -#endif - ATRACE_CALL(); - - JNIEnv* env = jniEnv(); - ScopedLocalFrame localFrame(env); - - env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyMonitorResponsive, pid); - checkAndClearExceptionFromCallback(env, "notifyMonitorResponsive"); -} - void NativeInputManager::notifyInputChannelBroken(const sp<IBinder>& token) { #if DEBUG_INPUT_DISPATCHER_POLICY ALOGD("notifyInputChannelBroken"); @@ -2506,16 +2477,10 @@ int register_android_server_InputManager(JNIEnv* env) { "(Landroid/view/InputApplicationHandle;)V"); GET_METHOD_ID(gServiceClassInfo.notifyWindowUnresponsive, clazz, "notifyWindowUnresponsive", - "(Landroid/os/IBinder;Ljava/lang/String;)V"); - - GET_METHOD_ID(gServiceClassInfo.notifyMonitorUnresponsive, clazz, "notifyMonitorUnresponsive", - "(ILjava/lang/String;)V"); + "(Landroid/os/IBinder;IZLjava/lang/String;)V"); GET_METHOD_ID(gServiceClassInfo.notifyWindowResponsive, clazz, "notifyWindowResponsive", - "(Landroid/os/IBinder;)V"); - - GET_METHOD_ID(gServiceClassInfo.notifyMonitorResponsive, clazz, "notifyMonitorResponsive", - "(I)V"); + "(Landroid/os/IBinder;IZ)V"); GET_METHOD_ID(gServiceClassInfo.filterInputEvent, clazz, "filterInputEvent", "(Landroid/view/InputEvent;I)Z"); diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index a9c6b8d67cac..11714dc821af 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -50,6 +50,7 @@ #include "android_runtime/Log.h" #include "gnss/AGnss.h" #include "gnss/AGnssRil.h" +#include "gnss/Gnss.h" #include "gnss/GnssAntennaInfo.h" #include "gnss/GnssAntennaInfoCallback.h" #include "gnss/GnssBatching.h" @@ -68,18 +69,7 @@ static jclass class_gnssPowerStats; -static jmethodID method_reportLocation; -static jmethodID method_reportStatus; -static jmethodID method_reportSvStatus; -static jmethodID method_reportNmea; -static jmethodID method_setTopHalCapabilities; -static jmethodID method_setGnssYearOfHardware; -static jmethodID method_setGnssHardwareModelName; -static jmethodID method_psdsDownloadRequest; static jmethodID method_reportNiNotification; -static jmethodID method_requestLocation; -static jmethodID method_requestUtcTime; -static jmethodID method_reportGnssServiceDied; static jmethodID method_reportGnssPowerStats; static jmethodID method_reportNfwNotification; static jmethodID method_isInEmergencySession; @@ -92,7 +82,6 @@ using android::status_t; using android::String16; using android::wp; using android::binder::Status; -using android::gnss::GnssConfigurationInterface; using android::hardware::Return; using android::hardware::Void; @@ -128,12 +117,8 @@ using android::hardware::gnss::GnssConstellationType; using android::hardware::gnss::GnssPowerStats; using android::hardware::gnss::IGnssPowerIndication; using android::hardware::gnss::IGnssPowerIndicationCallback; -using android::hardware::gnss::PsdsType; -using IAGnssAidl = android::hardware::gnss::IAGnss; -using IAGnssRilAidl = android::hardware::gnss::IAGnssRil; using IGnssAidl = android::hardware::gnss::IGnss; -using IGnssCallbackAidl = android::hardware::gnss::IGnssCallback; using IGnssBatchingAidl = android::hardware::gnss::IGnssBatching; using IGnssDebugAidl = android::hardware::gnss::IGnssDebug; using IGnssPsdsAidl = android::hardware::gnss::IGnssPsds; @@ -142,575 +127,30 @@ using IGnssConfigurationAidl = android::hardware::gnss::IGnssConfiguration; using GnssLocationAidl = android::hardware::gnss::GnssLocation; using IGnssAntennaInfoAidl = android::hardware::gnss::IGnssAntennaInfo; -struct GnssDeathRecipient : virtual public hidl_death_recipient -{ - // hidl_death_recipient interface - virtual void serviceDied(uint64_t cookie, const wp<IBase>& who) override { - ALOGE("IGNSS hidl service failed, trying to recover..."); - - JNIEnv* env = android::AndroidRuntime::getJNIEnv(); - env->CallVoidMethod(android::mCallbacksObj, method_reportGnssServiceDied); - } -}; - -// Must match the value from GnssMeasurement.java -static const uint32_t SVID_FLAGS_HAS_BASEBAND_CN0 = (1<<4); - -sp<GnssDeathRecipient> gnssHalDeathRecipient = nullptr; -sp<IGnss_V1_0> gnssHal = nullptr; -sp<IGnss_V1_1> gnssHal_V1_1 = nullptr; -sp<IGnss_V2_0> gnssHal_V2_0 = nullptr; -sp<IGnss_V2_1> gnssHal_V2_1 = nullptr; -sp<IGnssAidl> gnssHalAidl = nullptr; -sp<IGnssBatchingAidl> gnssBatchingAidlIface = nullptr; -sp<IGnssPsdsAidl> gnssPsdsAidlIface = nullptr; -sp<IGnssXtra> gnssXtraIface = nullptr; sp<IGnssNi> gnssNiIface = nullptr; sp<IGnssPowerIndication> gnssPowerIndicationIface = nullptr; -std::unique_ptr<GnssConfigurationInterface> gnssConfigurationIface = nullptr; +std::unique_ptr<android::gnss::GnssHal> gnssHal = nullptr; +std::unique_ptr<android::gnss::AGnssInterface> agnssIface = nullptr; +std::unique_ptr<android::gnss::AGnssRilInterface> agnssRilIface = nullptr; +std::unique_ptr<android::gnss::GnssAntennaInfoInterface> gnssAntennaInfoIface = nullptr; +std::unique_ptr<android::gnss::GnssConfigurationInterface> gnssConfigurationIface = nullptr; std::unique_ptr<android::gnss::GnssMeasurementInterface> gnssMeasurementIface = nullptr; std::unique_ptr<android::gnss::GnssNavigationMessageInterface> gnssNavigationMessageIface = nullptr; std::unique_ptr<android::gnss::GnssBatchingInterface> gnssBatchingIface = nullptr; -std::unique_ptr<android::gnss::GnssGeofenceInterface> gnssGeofencingIface = nullptr; -std::unique_ptr<android::gnss::AGnssInterface> agnssIface = nullptr; std::unique_ptr<android::gnss::GnssDebugInterface> gnssDebugIface = nullptr; -std::unique_ptr<android::gnss::AGnssRilInterface> agnssRilIface = nullptr; +std::unique_ptr<android::gnss::GnssGeofenceInterface> gnssGeofencingIface = nullptr; +std::unique_ptr<android::gnss::GnssPsdsInterface> gnssPsdsIface = nullptr; std::unique_ptr<android::gnss::GnssVisibilityControlInterface> gnssVisibilityControlIface = nullptr; -std::unique_ptr<android::gnss::GnssAntennaInfoInterface> gnssAntennaInfoIface = nullptr; std::unique_ptr<android::gnss::MeasurementCorrectionsInterface> gnssMeasurementCorrectionsIface = nullptr; -#define WAKE_LOCK_NAME "GPS" - namespace android { namespace { -// Returns true if location has lat/long information. -bool hasLatLong(const GnssLocationAidl& location) { - return (location.gnssLocationFlags & GnssLocationAidl::HAS_LAT_LONG) != 0; -} - -// Returns true if location has lat/long information. -bool hasLatLong(const GnssLocation_V1_0& location) { - return (static_cast<uint32_t>(location.gnssLocationFlags) & - GnssLocationFlags::HAS_LAT_LONG) != 0; -} - -// Returns true if location has lat/long information. -bool hasLatLong(const GnssLocation_V2_0& location) { - return hasLatLong(location.v1_0); -} - -bool isSvStatusRegistered = false; -bool isNmeaRegistered = false; - } // namespace -static inline jboolean boolToJbool(bool value) { - return value ? JNI_TRUE : JNI_FALSE; -} - -static GnssLocationAidl createGnssLocation(jint gnssLocationFlags, jdouble latitudeDegrees, - jdouble longitudeDegrees, jdouble altitudeMeters, - jfloat speedMetersPerSec, jfloat bearingDegrees, - jfloat horizontalAccuracyMeters, - jfloat verticalAccuracyMeters, - jfloat speedAccuracyMetersPerSecond, - jfloat bearingAccuracyDegrees, jlong timestamp, - jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, - jdouble elapsedRealtimeUncertaintyNanos) { - GnssLocationAidl location; - location.gnssLocationFlags = static_cast<int>(gnssLocationFlags); - location.latitudeDegrees = static_cast<double>(latitudeDegrees); - location.longitudeDegrees = static_cast<double>(longitudeDegrees); - location.altitudeMeters = static_cast<double>(altitudeMeters); - location.speedMetersPerSec = static_cast<double>(speedMetersPerSec); - location.bearingDegrees = static_cast<double>(bearingDegrees); - location.horizontalAccuracyMeters = static_cast<double>(horizontalAccuracyMeters); - location.verticalAccuracyMeters = static_cast<double>(verticalAccuracyMeters); - location.speedAccuracyMetersPerSecond = static_cast<double>(speedAccuracyMetersPerSecond); - location.bearingAccuracyDegrees = static_cast<double>(bearingAccuracyDegrees); - location.timestampMillis = static_cast<uint64_t>(timestamp); - - location.elapsedRealtime.flags = static_cast<int>(elapsedRealtimeFlags); - location.elapsedRealtime.timestampNs = static_cast<uint64_t>(elapsedRealtimeNanos); - location.elapsedRealtime.timeUncertaintyNs = - static_cast<double>(elapsedRealtimeUncertaintyNanos); - - return location; -} - -static GnssLocation_V1_0 createGnssLocation_V1_0( - jint gnssLocationFlags, jdouble latitudeDegrees, jdouble longitudeDegrees, - jdouble altitudeMeters, jfloat speedMetersPerSec, jfloat bearingDegrees, - jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, - jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, - jlong timestamp) { - GnssLocation_V1_0 location; - location.gnssLocationFlags = static_cast<uint16_t>(gnssLocationFlags); - location.latitudeDegrees = static_cast<double>(latitudeDegrees); - location.longitudeDegrees = static_cast<double>(longitudeDegrees); - location.altitudeMeters = static_cast<double>(altitudeMeters); - location.speedMetersPerSec = static_cast<float>(speedMetersPerSec); - location.bearingDegrees = static_cast<float>(bearingDegrees); - location.horizontalAccuracyMeters = static_cast<float>(horizontalAccuracyMeters); - location.verticalAccuracyMeters = static_cast<float>(verticalAccuracyMeters); - location.speedAccuracyMetersPerSecond = static_cast<float>(speedAccuracyMetersPerSecond); - location.bearingAccuracyDegrees = static_cast<float>(bearingAccuracyDegrees); - location.timestamp = static_cast<uint64_t>(timestamp); - - return location; -} - -static GnssLocation_V2_0 createGnssLocation_V2_0( - jint gnssLocationFlags, jdouble latitudeDegrees, jdouble longitudeDegrees, - jdouble altitudeMeters, jfloat speedMetersPerSec, jfloat bearingDegrees, - jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, - jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, - jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, - jdouble elapsedRealtimeUncertaintyNanos) { - GnssLocation_V2_0 location; - location.v1_0 = createGnssLocation_V1_0( - gnssLocationFlags, latitudeDegrees, longitudeDegrees, altitudeMeters, - speedMetersPerSec, bearingDegrees, horizontalAccuracyMeters, - verticalAccuracyMeters, speedAccuracyMetersPerSecond, - bearingAccuracyDegrees, timestamp); - - location.elapsedRealtime.flags = static_cast<uint16_t>(elapsedRealtimeFlags); - location.elapsedRealtime.timestampNs = static_cast<uint64_t>(elapsedRealtimeNanos); - location.elapsedRealtime.timeUncertaintyNs = static_cast<uint64_t>(elapsedRealtimeUncertaintyNanos); - - return location; -} - -/* - * GnssCallback class implements the callback methods for IGnss interface. - */ -struct GnssCallback : public IGnssCallback_V2_1 { - Return<void> gnssLocationCb(const GnssLocation_V1_0& location) override; - Return<void> gnssStatusCb(const IGnssCallback_V1_0::GnssStatusValue status) override; - Return<void> gnssSvStatusCb(const IGnssCallback_V1_0::GnssSvStatus& svStatus) override { - return gnssSvStatusCbImpl<IGnssCallback_V1_0::GnssSvStatus, IGnssCallback_V1_0::GnssSvInfo>( - svStatus); - } - Return<void> gnssNmeaCb(int64_t timestamp, const android::hardware::hidl_string& nmea) override; - Return<void> gnssSetCapabilitesCb(uint32_t capabilities) override; - Return<void> gnssAcquireWakelockCb() override; - Return<void> gnssReleaseWakelockCb() override; - Return<void> gnssRequestTimeCb() override; - Return<void> gnssRequestLocationCb(const bool independentFromGnss) override; - - Return<void> gnssSetSystemInfoCb(const IGnssCallback_V1_0::GnssSystemInfo& info) override; - - // New in 1.1 - Return<void> gnssNameCb(const android::hardware::hidl_string& name) override; - - // New in 2.0 - Return<void> gnssRequestLocationCb_2_0(const bool independentFromGnss, const bool isUserEmergency) - override; - Return<void> gnssSetCapabilitiesCb_2_0(uint32_t capabilities) override; - Return<void> gnssLocationCb_2_0(const GnssLocation_V2_0& location) override; - Return<void> gnssSvStatusCb_2_0(const hidl_vec<IGnssCallback_V2_0::GnssSvInfo>& svInfoList) override { - return gnssSvStatusCbImpl<hidl_vec<IGnssCallback_V2_0::GnssSvInfo>, - IGnssCallback_V1_0::GnssSvInfo>(svInfoList); - } - - // New in 2.1 - Return<void> gnssSvStatusCb_2_1(const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList) override { - return gnssSvStatusCbImpl<hidl_vec<IGnssCallback_V2_1::GnssSvInfo>, - IGnssCallback_V1_0::GnssSvInfo>(svInfoList); - } - Return<void> gnssSetCapabilitiesCb_2_1(uint32_t capabilities) override; - - // TODO: Reconsider allocation cost vs threadsafety on these statics - static const char* sNmeaString; - static size_t sNmeaStringLength; - - template <class T> - static Return<void> gnssLocationCbImpl(const T& location); - - template <class T_list, class T_sv_info> - static Return<void> gnssSvStatusCbImpl(const T_list& svStatus); - -private: - template <class T> - static uint32_t getHasBasebandCn0DbHzFlag(const T& svStatus) { - return 0; - } - - template <class T> - static double getBasebandCn0DbHz(const T& svStatus, size_t i) { - return 0.0; - } - - template <class T> - static uint32_t getGnssSvInfoListSize(const T& svInfoList) { - return svInfoList.size(); - } - - static const IGnssCallbackAidl::GnssSvInfo& getGnssSvInfoOfIndex( - const std::vector<IGnssCallbackAidl::GnssSvInfo>& svInfoList, size_t i) { - return svInfoList[i]; - } - - static const IGnssCallback_V1_0::GnssSvInfo& getGnssSvInfoOfIndex( - const IGnssCallback_V1_0::GnssSvStatus& svStatus, size_t i) { - return svStatus.gnssSvList.data()[i]; - } - - static const IGnssCallback_V1_0::GnssSvInfo& getGnssSvInfoOfIndex( - const hidl_vec<IGnssCallback_V2_0::GnssSvInfo>& svInfoList, size_t i) { - return svInfoList[i].v1_0; - } - - static const IGnssCallback_V1_0::GnssSvInfo& getGnssSvInfoOfIndex( - const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList, size_t i) { - return svInfoList[i].v2_0.v1_0; - } - - template <class T> - static uint32_t getConstellationType(const T& svInfoList, size_t i) { - return static_cast<uint32_t>(svInfoList[i].constellation); - } -}; - -Return<void> GnssCallback::gnssNameCb(const android::hardware::hidl_string& name) { - ALOGD("%s: name=%s\n", __func__, name.c_str()); - - JNIEnv* env = getJniEnv(); - jstring jstringName = env->NewStringUTF(name.c_str()); - env->CallVoidMethod(mCallbacksObj, method_setGnssHardwareModelName, jstringName); - if (jstringName) { - env->DeleteLocalRef(jstringName); - } - checkAndClearExceptionFromCallback(env, __FUNCTION__); - - return Void(); -} - -const char* GnssCallback::sNmeaString = nullptr; -size_t GnssCallback::sNmeaStringLength = 0; - -template<class T> -Return<void> GnssCallback::gnssLocationCbImpl(const T& location) { - JNIEnv* env = getJniEnv(); - - jobject jLocation = translateGnssLocation(env, location); - - env->CallVoidMethod(mCallbacksObj, - method_reportLocation, - boolToJbool(hasLatLong(location)), - jLocation); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - env->DeleteLocalRef(jLocation); - return Void(); -} - -Return<void> GnssCallback::gnssLocationCb(const GnssLocation_V1_0& location) { - return gnssLocationCbImpl<GnssLocation_V1_0>(location); -} - -Return<void> -GnssCallback::gnssLocationCb_2_0(const GnssLocation_V2_0& location) { - return gnssLocationCbImpl<GnssLocation_V2_0>(location); -} - -Return<void> GnssCallback::gnssStatusCb(const IGnssCallback_V2_0::GnssStatusValue status) { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_reportStatus, status); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -template<> -uint32_t GnssCallback::getHasBasebandCn0DbHzFlag(const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& - svStatus) { - return SVID_FLAGS_HAS_BASEBAND_CN0; -} - -template <> -uint32_t GnssCallback::getHasBasebandCn0DbHzFlag( - const std::vector<IGnssCallbackAidl::GnssSvInfo>& svStatus) { - return SVID_FLAGS_HAS_BASEBAND_CN0; -} - -template <> -double GnssCallback::getBasebandCn0DbHz( - const std::vector<IGnssCallbackAidl::GnssSvInfo>& svInfoList, size_t i) { - return svInfoList[i].basebandCN0DbHz; -} - -template<> -double GnssCallback::getBasebandCn0DbHz(const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList, - size_t i) { - return svInfoList[i].basebandCN0DbHz; -} - -template <> -uint32_t GnssCallback::getGnssSvInfoListSize(const IGnssCallback_V1_0::GnssSvStatus& svStatus) { - return svStatus.numSvs; -} - -template <> -uint32_t GnssCallback::getConstellationType(const IGnssCallback_V1_0::GnssSvStatus& svStatus, - size_t i) { - return static_cast<uint32_t>(svStatus.gnssSvList.data()[i].constellation); -} - -template <> -uint32_t GnssCallback::getConstellationType( - const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList, size_t i) { - return static_cast<uint32_t>(svInfoList[i].v2_0.constellation); -} - -template <class T_list, class T_sv_info> -Return<void> GnssCallback::gnssSvStatusCbImpl(const T_list& svStatus) { - // In HIDL or AIDL v1, if no listener is registered, do not report svInfoList to the framework. - if (gnssHalAidl == nullptr || gnssHalAidl->getInterfaceVersion() <= 1) { - if (!isSvStatusRegistered) { - return Void(); - } - } - - JNIEnv* env = getJniEnv(); - - uint32_t listSize = getGnssSvInfoListSize(svStatus); - - jintArray svidWithFlagArray = env->NewIntArray(listSize); - jfloatArray cn0Array = env->NewFloatArray(listSize); - jfloatArray elevArray = env->NewFloatArray(listSize); - jfloatArray azimArray = env->NewFloatArray(listSize); - jfloatArray carrierFreqArray = env->NewFloatArray(listSize); - jfloatArray basebandCn0Array = env->NewFloatArray(listSize); - - jint* svidWithFlags = env->GetIntArrayElements(svidWithFlagArray, 0); - jfloat* cn0s = env->GetFloatArrayElements(cn0Array, 0); - jfloat* elev = env->GetFloatArrayElements(elevArray, 0); - jfloat* azim = env->GetFloatArrayElements(azimArray, 0); - jfloat* carrierFreq = env->GetFloatArrayElements(carrierFreqArray, 0); - jfloat* basebandCn0s = env->GetFloatArrayElements(basebandCn0Array, 0); - - /* - * Read GNSS SV info. - */ - for (size_t i = 0; i < listSize; ++i) { - enum ShiftWidth: uint8_t { - SVID_SHIFT_WIDTH = 12, - CONSTELLATION_TYPE_SHIFT_WIDTH = 8 - }; - - const T_sv_info& info = getGnssSvInfoOfIndex(svStatus, i); - svidWithFlags[i] = (info.svid << SVID_SHIFT_WIDTH) | - (getConstellationType(svStatus, i) << CONSTELLATION_TYPE_SHIFT_WIDTH) | - static_cast<uint32_t>(info.svFlag); - cn0s[i] = info.cN0Dbhz; - elev[i] = info.elevationDegrees; - azim[i] = info.azimuthDegrees; - carrierFreq[i] = info.carrierFrequencyHz; - svidWithFlags[i] |= getHasBasebandCn0DbHzFlag(svStatus); - basebandCn0s[i] = getBasebandCn0DbHz(svStatus, i); - } - - env->ReleaseIntArrayElements(svidWithFlagArray, svidWithFlags, 0); - env->ReleaseFloatArrayElements(cn0Array, cn0s, 0); - env->ReleaseFloatArrayElements(elevArray, elev, 0); - env->ReleaseFloatArrayElements(azimArray, azim, 0); - env->ReleaseFloatArrayElements(carrierFreqArray, carrierFreq, 0); - env->ReleaseFloatArrayElements(basebandCn0Array, basebandCn0s, 0); - - env->CallVoidMethod(mCallbacksObj, method_reportSvStatus, - static_cast<jint>(listSize), svidWithFlagArray, cn0Array, elevArray, azimArray, - carrierFreqArray, basebandCn0Array); - - env->DeleteLocalRef(svidWithFlagArray); - env->DeleteLocalRef(cn0Array); - env->DeleteLocalRef(elevArray); - env->DeleteLocalRef(azimArray); - env->DeleteLocalRef(carrierFreqArray); - env->DeleteLocalRef(basebandCn0Array); - - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -Return<void> GnssCallback::gnssNmeaCb(int64_t timestamp, - const ::android::hardware::hidl_string& nmea) { - // In HIDL, if no listener is registered, do not report nmea to the framework. - if (!isNmeaRegistered) { - return Void(); - } - JNIEnv* env = getJniEnv(); - /* - * The Java code will call back to read these values. - * We do this to avoid creating unnecessary String objects. - */ - sNmeaString = nmea.c_str(); - sNmeaStringLength = nmea.size(); - - env->CallVoidMethod(mCallbacksObj, method_reportNmea, timestamp); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -Return<void> GnssCallback::gnssSetCapabilitesCb(uint32_t capabilities) { - ALOGD("%s: %du\n", __func__, capabilities); - - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_setTopHalCapabilities, capabilities); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -Return<void> GnssCallback::gnssSetCapabilitiesCb_2_0(uint32_t capabilities) { - return GnssCallback::gnssSetCapabilitesCb(capabilities); -} - -Return<void> GnssCallback::gnssSetCapabilitiesCb_2_1(uint32_t capabilities) { - return GnssCallback::gnssSetCapabilitesCb(capabilities); -} - -Return<void> GnssCallback::gnssAcquireWakelockCb() { - acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME); - return Void(); -} - -Return<void> GnssCallback::gnssReleaseWakelockCb() { - release_wake_lock(WAKE_LOCK_NAME); - return Void(); -} - -Return<void> GnssCallback::gnssRequestTimeCb() { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_requestUtcTime); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -Return<void> GnssCallback::gnssRequestLocationCb(const bool independentFromGnss) { - return GnssCallback::gnssRequestLocationCb_2_0(independentFromGnss, /* isUserEmergency= */ - false); -} - -Return<void> GnssCallback::gnssRequestLocationCb_2_0(const bool independentFromGnss, const bool - isUserEmergency) { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_requestLocation, boolToJbool(independentFromGnss), - boolToJbool(isUserEmergency)); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -Return<void> GnssCallback::gnssSetSystemInfoCb(const IGnssCallback_V2_0::GnssSystemInfo& info) { - ALOGD("%s: yearOfHw=%d\n", __func__, info.yearOfHw); - - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_setGnssYearOfHardware, - info.yearOfHw); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -class GnssCallbackAidl : public android::hardware::gnss::BnGnssCallback { -public: - Status gnssSetCapabilitiesCb(const int capabilities) override; - Status gnssStatusCb(const GnssStatusValue status) override; - Status gnssSvStatusCb(const std::vector<GnssSvInfo>& svInfoList) override; - Status gnssLocationCb(const GnssLocationAidl& location) override; - Status gnssNmeaCb(const int64_t timestamp, const std::string& nmea) override; - Status gnssAcquireWakelockCb() override; - Status gnssReleaseWakelockCb() override; - Status gnssSetSystemInfoCb(const GnssSystemInfo& info) override; - Status gnssRequestTimeCb() override; - Status gnssRequestLocationCb(const bool independentFromGnss, - const bool isUserEmergency) override; -}; - -Status GnssCallbackAidl::gnssSetCapabilitiesCb(const int capabilities) { - ALOGD("GnssCallbackAidl::%s: %du\n", __func__, capabilities); - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_setTopHalCapabilities, capabilities); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssStatusCb(const GnssStatusValue status) { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_reportStatus, status); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssSvStatusCb(const std::vector<GnssSvInfo>& svInfoList) { - GnssCallback::gnssSvStatusCbImpl<std::vector<GnssSvInfo>, GnssSvInfo>(svInfoList); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssLocationCb(const GnssLocationAidl& location) { - GnssCallback::gnssLocationCbImpl<GnssLocationAidl>(location); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssNmeaCb(const int64_t timestamp, const std::string& nmea) { - // In AIDL v1, if no listener is registered, do not report nmea to the framework. - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() <= 1) { - if (!isNmeaRegistered) { - return Status::ok(); - } - } - JNIEnv* env = getJniEnv(); - /* - * The Java code will call back to read these values. - * We do this to avoid creating unnecessary String objects. - */ - GnssCallback::sNmeaString = nmea.c_str(); - GnssCallback::sNmeaStringLength = nmea.size(); - - env->CallVoidMethod(mCallbacksObj, method_reportNmea, timestamp); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssAcquireWakelockCb() { - acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssReleaseWakelockCb() { - release_wake_lock(WAKE_LOCK_NAME); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssSetSystemInfoCb(const GnssSystemInfo& info) { - ALOGD("%s: yearOfHw=%d, name=%s\n", __func__, info.yearOfHw, info.name.c_str()); - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_setGnssYearOfHardware, info.yearOfHw); - jstring jstringName = env->NewStringUTF(info.name.c_str()); - env->CallVoidMethod(mCallbacksObj, method_setGnssHardwareModelName, jstringName); - if (jstringName) { - env->DeleteLocalRef(jstringName); - } - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssRequestTimeCb() { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_requestUtcTime); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - -Status GnssCallbackAidl::gnssRequestLocationCb(const bool independentFromGnss, - const bool isUserEmergency) { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_requestLocation, boolToJbool(independentFromGnss), - boolToJbool(isUserEmergency)); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); -} - /* * GnssPowerIndicationCallback class implements the callback methods for the IGnssPowerIndication * interface. @@ -756,35 +196,6 @@ Status GnssPowerIndicationCallback::gnssPowerStatsCb(const GnssPowerStats& data) } /* - * GnssPsdsCallback class implements the callback methods for the IGnssPsds - * interface. - */ -struct GnssPsdsCallbackAidl : public android::hardware::gnss::BnGnssPsdsCallback { - Status downloadRequestCb(PsdsType psdsType) override { - ALOGD("%s. psdsType: %d", __func__, static_cast<int32_t>(psdsType)); - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_psdsDownloadRequest, psdsType); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Status::ok(); - } -}; - -/** - * GnssXtraCallback class implements the callback methods for the IGnssXtra - * interface. - */ -class GnssXtraCallback : public IGnssXtraCallback { - Return<void> downloadRequestCb() override; -}; - -Return<void> GnssXtraCallback::downloadRequestCb() { - JNIEnv* env = getJniEnv(); - env->CallVoidMethod(mCallbacksObj, method_psdsDownloadRequest, /* psdsType= */ 1); - checkAndClearExceptionFromCallback(env, __FUNCTION__); - return Void(); -} - -/* * GnssNiCallback implements callback methods required by the IGnssNi interface. */ struct GnssNiCallback : public IGnssNiCallback { @@ -822,41 +233,7 @@ Return<void> GnssNiCallback::niNotifyCb( /* Initializes the GNSS service handle. */ static void android_location_gnss_hal_GnssNative_set_gps_service_handle() { - gnssHalAidl = waitForVintfService<IGnssAidl>(); - if (gnssHalAidl != nullptr) { - ALOGD("Successfully got GNSS AIDL handle. Version=%d.", gnssHalAidl->getInterfaceVersion()); - if (gnssHalAidl->getInterfaceVersion() >= 2) { - return; - } - } - - ALOGD("Trying IGnss_V2_1::getService()"); - gnssHal_V2_1 = IGnss_V2_1::getService(); - if (gnssHal_V2_1 != nullptr) { - gnssHal = gnssHal_V2_1; - gnssHal_V2_0 = gnssHal_V2_1; - gnssHal_V1_1 = gnssHal_V2_1; - gnssHal = gnssHal_V2_1; - return; - } - - ALOGD("gnssHal 2.1 was null, trying 2.0"); - gnssHal_V2_0 = IGnss_V2_0::getService(); - if (gnssHal_V2_0 != nullptr) { - gnssHal = gnssHal_V2_0; - gnssHal_V1_1 = gnssHal_V2_0; - return; - } - - ALOGD("gnssHal 2.0 was null, trying 1.1"); - gnssHal_V1_1 = IGnss_V1_1::getService(); - if (gnssHal_V1_1 != nullptr) { - gnssHal = gnssHal_V1_1; - return; - } - - ALOGD("gnssHal 1.1 was null, trying 1.0"); - gnssHal = IGnss_V1_0::getService(); + gnssHal = std::make_unique<gnss::GnssHal>(); } /* One time initialization at system boot */ @@ -865,21 +242,10 @@ static void android_location_gnss_hal_GnssNative_class_init_once(JNIEnv* env, jc android_location_gnss_hal_GnssNative_set_gps_service_handle(); // Cache methodIDs and class IDs. - method_reportLocation = env->GetMethodID(clazz, "reportLocation", - "(ZLandroid/location/Location;)V"); - method_reportStatus = env->GetMethodID(clazz, "reportStatus", "(I)V"); - method_reportSvStatus = env->GetMethodID(clazz, "reportSvStatus", "(I[I[F[F[F[F[F)V"); - method_reportNmea = env->GetMethodID(clazz, "reportNmea", "(J)V"); - method_setTopHalCapabilities = env->GetMethodID(clazz, "setTopHalCapabilities", "(I)V"); - method_setGnssYearOfHardware = env->GetMethodID(clazz, "setGnssYearOfHardware", "(I)V"); - method_setGnssHardwareModelName = env->GetMethodID(clazz, "setGnssHardwareModelName", - "(Ljava/lang/String;)V"); - method_psdsDownloadRequest = env->GetMethodID(clazz, "psdsDownloadRequest", "(I)V"); + method_reportNiNotification = env->GetMethodID(clazz, "reportNiNotification", "(IIIIILjava/lang/String;Ljava/lang/String;II)V"); - method_requestLocation = env->GetMethodID(clazz, "requestLocation", "(ZZ)V"); - method_requestUtcTime = env->GetMethodID(clazz, "requestUtcTime", "()V"); - method_reportGnssServiceDied = env->GetMethodID(clazz, "reportGnssServiceDied", "()V"); + method_reportNfwNotification = env->GetMethodID(clazz, "reportNfwNotification", "(Ljava/lang/String;BLjava/lang/String;BLjava/lang/String;BZZ)V"); method_reportGnssPowerStats = @@ -894,17 +260,19 @@ static void android_location_gnss_hal_GnssNative_class_init_once(JNIEnv* env, jc class_gnssPowerStats = (jclass)env->NewGlobalRef(gnssPowerStatsClass); method_gnssPowerStatsCtor = env->GetMethodID(class_gnssPowerStats, "<init>", "(IJDDDDDD[D)V"); + gnss::AGnss_class_init_once(env, clazz); + gnss::AGnssRil_class_init_once(env, clazz); + gnss::Gnss_class_init_once(env, clazz); gnss::GnssAntennaInfo_class_init_once(env, clazz); gnss::GnssBatching_class_init_once(env, clazz); gnss::GnssConfiguration_class_init_once(env); gnss::GnssGeofence_class_init_once(env, clazz); gnss::GnssMeasurement_class_init_once(env, clazz); gnss::GnssNavigationMessage_class_init_once(env, clazz); + gnss::GnssPsds_class_init_once(env, clazz); gnss::GnssVisibilityControl_class_init_once(env, clazz); gnss::MeasurementCorrections_class_init_once(env, clazz); gnss::MeasurementCorrectionsCallback_class_init_once(env, clazz); - gnss::AGnss_class_init_once(env, clazz); - gnss::AGnssRil_class_init_once(env, clazz); gnss::Utils_class_init_once(env); } @@ -923,313 +291,26 @@ static void android_location_gnss_hal_GnssNative_init_once(JNIEnv* env, jobject android_location_gnss_hal_GnssNative_set_gps_service_handle(); } - if (gnssHal == nullptr && gnssHalAidl == nullptr) { + if (gnssHal == nullptr || !gnssHal->isSupported()) { ALOGE("Unable to get GPS service\n"); return; } - // TODO: linkToDeath for AIDL HAL - - if (gnssHal != nullptr) { - gnssHalDeathRecipient = new GnssDeathRecipient(); - hardware::Return<bool> linked = gnssHal->linkToDeath(gnssHalDeathRecipient, /*cookie*/ 0); - if (!linked.isOk()) { - ALOGE("Transaction error in linking to GnssHAL death: %s", - linked.description().c_str()); - } else if (!linked) { - ALOGW("Unable to link to GnssHal death notifications"); - } else { - ALOGD("Link to death notification successful"); - } - } - - if (gnssHalAidl != nullptr) { - sp<IGnssPsdsAidl> gnssPsdsAidl; - auto status = gnssHalAidl->getExtensionPsds(&gnssPsdsAidl); - if (status.isOk()) { - gnssPsdsAidlIface = gnssPsdsAidl; - } else { - ALOGD("Unable to get a handle to PSDS AIDL interface."); - } - } else if (gnssHal != nullptr) { - auto gnssXtra = gnssHal->getExtensionXtra(); - if (!gnssXtra.isOk()) { - ALOGD("Unable to get a handle to Xtra"); - } else { - gnssXtraIface = gnssXtra; - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<IAGnssRilAidl> agnssRilAidl; - auto status = gnssHalAidl->getExtensionAGnssRil(&agnssRilAidl); - if (checkAidlStatus(status, "Unable to get a handle to AGnssRil interface.")) { - agnssRilIface = std::make_unique<gnss::AGnssRil>(agnssRilAidl); - } - } else if (gnssHal_V2_0 != nullptr) { - auto agnssRil_V2_0 = gnssHal_V2_0->getExtensionAGnssRil_2_0(); - if (checkHidlReturn(agnssRil_V2_0, "Unable to get a handle to AGnssRil_V2_0")) { - agnssRilIface = std::make_unique<gnss::AGnssRil_V2_0>(agnssRil_V2_0); - } - } else if (gnssHal != nullptr) { - auto agnssRil_V1_0 = gnssHal->getExtensionAGnssRil(); - if (checkHidlReturn(agnssRil_V1_0, "Unable to get a handle to AGnssRil_V1_0")) { - agnssRilIface = std::make_unique<gnss::AGnssRil_V1_0>(agnssRil_V1_0); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<IAGnssAidl> agnssAidl; - auto status = gnssHalAidl->getExtensionAGnss(&agnssAidl); - if (checkAidlStatus(status, "Unable to get a handle to AGnss interface.")) { - agnssIface = std::make_unique<gnss::AGnss>(agnssAidl); - } - } else if (gnssHal_V2_0 != nullptr) { - auto agnss_V2_0 = gnssHal_V2_0->getExtensionAGnss_2_0(); - if (checkHidlReturn(agnss_V2_0, "Unable to get a handle to AGnss_V2_0")) { - agnssIface = std::make_unique<gnss::AGnss_V2_0>(agnss_V2_0); - } - } else if (gnssHal != nullptr) { - auto agnss_V1_0 = gnssHal->getExtensionAGnss(); - if (checkHidlReturn(agnss_V1_0, "Unable to get a handle to AGnss_V1_0")) { - agnssIface = std::make_unique<gnss::AGnss_V1_0>(agnss_V1_0); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<hardware::gnss::IGnssNavigationMessageInterface> gnssNavigationMessage; - auto status = gnssHalAidl->getExtensionGnssNavigationMessage(&gnssNavigationMessage); - if (checkAidlStatus(status, - "Unable to get a handle to GnssNavigationMessage AIDL interface.")) { - gnssNavigationMessageIface = - std::make_unique<gnss::GnssNavigationMessageAidl>(gnssNavigationMessage); - } - } else if (gnssHal != nullptr) { - auto gnssNavigationMessage = gnssHal->getExtensionGnssNavigationMessage(); - if (checkHidlReturn(gnssNavigationMessage, - "Unable to get a handle to GnssNavigationMessage interface.")) { - gnssNavigationMessageIface = - std::make_unique<gnss::GnssNavigationMessageHidl>(gnssNavigationMessage); - } - } - - // Allow all causal combinations between IGnss.hal and IGnssMeasurement.hal. That means, - // 2.1@IGnss can be paired with {1.0, 1,1, 2.0, 2.1}@IGnssMeasurement - // 2.0@IGnss can be paired with {1.0, 1,1, 2.0}@IGnssMeasurement - // 1.1@IGnss can be paired {1.0, 1.1}@IGnssMeasurement - // 1.0@IGnss is paired with 1.0@IGnssMeasurement - gnssMeasurementIface = nullptr; - if (gnssHalAidl != nullptr) { - sp<hardware::gnss::IGnssMeasurementInterface> gnssMeasurement; - auto status = gnssHalAidl->getExtensionGnssMeasurement(&gnssMeasurement); - if (checkAidlStatus(status, "Unable to get a handle to GnssMeasurement AIDL interface.")) { - gnssMeasurementIface = - std::make_unique<android::gnss::GnssMeasurement>(gnssMeasurement); - } - } - if (gnssHal_V2_1 != nullptr && gnssMeasurementIface == nullptr) { - auto gnssMeasurement = gnssHal_V2_1->getExtensionGnssMeasurement_2_1(); - if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V2_1")) { - gnssMeasurementIface = - std::make_unique<android::gnss::GnssMeasurement_V2_1>(gnssMeasurement); - } - } - if (gnssHal_V2_0 != nullptr && gnssMeasurementIface == nullptr) { - auto gnssMeasurement = gnssHal_V2_0->getExtensionGnssMeasurement_2_0(); - if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V2_0")) { - gnssMeasurementIface = - std::make_unique<android::gnss::GnssMeasurement_V2_0>(gnssMeasurement); - } - } - if (gnssHal_V1_1 != nullptr && gnssMeasurementIface == nullptr) { - auto gnssMeasurement = gnssHal_V1_1->getExtensionGnssMeasurement_1_1(); - if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V1_1")) { - gnssMeasurementIface = - std::make_unique<android::gnss::GnssMeasurement_V1_1>(gnssMeasurement); - } - } - if (gnssHal != nullptr && gnssMeasurementIface == nullptr) { - auto gnssMeasurement = gnssHal->getExtensionGnssMeasurement(); - if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V1_0")) { - gnssMeasurementIface = - std::make_unique<android::gnss::GnssMeasurement_V1_0>(gnssMeasurement); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<IGnssAntennaInfoAidl> gnssAntennaInfoAidl; - auto status = gnssHalAidl->getExtensionGnssAntennaInfo(&gnssAntennaInfoAidl); - if (checkAidlStatus(status, "Unable to get a handle to GnssAntennaInfo interface.")) { - gnssAntennaInfoIface = std::make_unique<gnss::GnssAntennaInfoAidl>(gnssAntennaInfoAidl); - } - } else if (gnssHal_V2_1 != nullptr) { - auto gnssAntennaInfo_V2_1 = gnssHal_V2_1->getExtensionGnssAntennaInfo(); - if (checkHidlReturn(gnssAntennaInfo_V2_1, - "Unable to get a handle to GnssAntennaInfo_V2_1")) { - gnssAntennaInfoIface = - std::make_unique<gnss::GnssAntennaInfo_V2_1>(gnssAntennaInfo_V2_1); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<android::hardware::gnss::measurement_corrections::IMeasurementCorrectionsInterface> - gnssMeasurementCorrectionsAidl; - auto status = - gnssHalAidl->getExtensionMeasurementCorrections(&gnssMeasurementCorrectionsAidl); - if (checkAidlStatus(status, - "Unable to get a handle to GnssVisibilityControl AIDL interface.")) { - gnssMeasurementCorrectionsIface = - std::make_unique<gnss::MeasurementCorrectionsIface_Aidl>( - gnssMeasurementCorrectionsAidl); - } - } - if (gnssHal_V2_1 != nullptr && gnssMeasurementCorrectionsIface == nullptr) { - auto gnssCorrections = gnssHal_V2_1->getExtensionMeasurementCorrections_1_1(); - if (checkHidlReturn(gnssCorrections, - "Unable to get a handle to GnssMeasurementCorrections HIDL " - "interface")) { - gnssMeasurementCorrectionsIface = - std::make_unique<gnss::MeasurementCorrectionsIface_V1_1>(gnssCorrections); - } - } - if (gnssHal_V2_0 != nullptr && gnssMeasurementCorrectionsIface == nullptr) { - auto gnssCorrections = gnssHal_V2_0->getExtensionMeasurementCorrections(); - if (checkHidlReturn(gnssCorrections, - "Unable to get a handle to GnssMeasurementCorrections HIDL " - "interface")) { - gnssMeasurementCorrectionsIface = - std::make_unique<gnss::MeasurementCorrectionsIface_V1_0>(gnssCorrections); - } - } - - // Allow all causal combinations between IGnss.hal and IGnssDebug.hal. That means, - // 2.0@IGnss can be paired with {1.0, 2.0}@IGnssDebug - // 1.0@IGnss is paired with 1.0@IGnssDebug - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<IGnssDebugAidl> gnssDebugAidl; - auto status = gnssHalAidl->getExtensionGnssDebug(&gnssDebugAidl); - if (checkAidlStatus(status, "Unable to get a handle to GnssDebug interface.")) { - gnssDebugIface = std::make_unique<gnss::GnssDebug>(gnssDebugAidl); - } - } - if (gnssHal_V2_0 != nullptr && gnssDebugIface == nullptr) { - auto gnssDebug_V2_0 = gnssHal_V2_0->getExtensionGnssDebug_2_0(); - if (checkHidlReturn(gnssDebug_V2_0, "Unable to get a handle to GnssDebug_V2_0.")) { - gnssDebugIface = std::make_unique<gnss::GnssDebug_V2_0>(gnssDebug_V2_0); - } - } - if (gnssHal != nullptr && gnssDebugIface == nullptr) { - auto gnssDebug_V1_0 = gnssHal->getExtensionGnssDebug(); - if (checkHidlReturn(gnssDebug_V1_0, "Unable to get a handle to GnssDebug_V1_0.")) { - gnssDebugIface = std::make_unique<gnss::GnssDebug_V1_0>(gnssDebug_V1_0); - } - } - - if (gnssHal != nullptr) { - auto gnssNi = gnssHal->getExtensionGnssNi(); - if (!gnssNi.isOk()) { - ALOGD("Unable to get a handle to GnssNi"); - } else { - gnssNiIface = gnssNi; - } - } - - if (gnssHalAidl != nullptr) { - sp<IGnssConfigurationAidl> gnssConfigurationAidl; - auto status = gnssHalAidl->getExtensionGnssConfiguration(&gnssConfigurationAidl); - if (checkAidlStatus(status, - "Unable to get a handle to GnssConfiguration AIDL interface.")) { - gnssConfigurationIface = - std::make_unique<android::gnss::GnssConfiguration>(gnssConfigurationAidl); - } - } else if (gnssHal_V2_1 != nullptr) { - auto gnssConfiguration = gnssHal_V2_1->getExtensionGnssConfiguration_2_1(); - if (checkHidlReturn(gnssConfiguration, - "Unable to get a handle to GnssConfiguration_V2_1")) { - gnssConfigurationIface = - std::make_unique<android::gnss::GnssConfiguration_V2_1>(gnssConfiguration); - } - } else if (gnssHal_V2_0 != nullptr) { - auto gnssConfiguration = gnssHal_V2_0->getExtensionGnssConfiguration_2_0(); - if (checkHidlReturn(gnssConfiguration, - "Unable to get a handle to GnssConfiguration_V2_0")) { - gnssConfigurationIface = - std::make_unique<android::gnss::GnssConfiguration_V2_0>(gnssConfiguration); - } - } else if (gnssHal_V1_1 != nullptr) { - auto gnssConfiguration = gnssHal_V1_1->getExtensionGnssConfiguration_1_1(); - if (checkHidlReturn(gnssConfiguration, - "Unable to get a handle to GnssConfiguration_V1_1")) { - gnssConfigurationIface = - std::make_unique<gnss::GnssConfiguration_V1_1>(gnssConfiguration); - } - } else if (gnssHal != nullptr) { - auto gnssConfiguration = gnssHal->getExtensionGnssConfiguration(); - if (checkHidlReturn(gnssConfiguration, - "Unable to get a handle to GnssConfiguration_V1_0")) { - gnssConfigurationIface = - std::make_unique<gnss::GnssConfiguration_V1_0>(gnssConfiguration); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<hardware::gnss::IGnssGeofence> gnssGeofence; - auto status = gnssHalAidl->getExtensionGnssGeofence(&gnssGeofence); - if (checkAidlStatus(status, "Unable to get a handle to GnssGeofence AIDL interface.")) { - gnssGeofencingIface = std::make_unique<gnss::GnssGeofenceAidl>(gnssGeofence); - } - } else if (gnssHal != nullptr) { - auto gnssGeofencing = gnssHal->getExtensionGnssGeofencing(); - if (checkHidlReturn(gnssGeofencing, "Unable to get a handle to GnssGeofencing")) { - gnssGeofencingIface = std::make_unique<gnss::GnssGeofenceHidl>(gnssGeofencing); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<android::hardware::gnss::IGnssBatching> gnssBatchingAidl; - auto status = gnssHalAidl->getExtensionGnssBatching(&gnssBatchingAidl); - if (checkAidlStatus(status, "Unable to get a handle to GnssBatching interface.")) { - gnssBatchingIface = std::make_unique<gnss::GnssBatching>(gnssBatchingAidl); - } - } else if (gnssHal_V2_0 != nullptr) { - auto gnssBatching_V2_0 = gnssHal_V2_0->getExtensionGnssBatching_2_0(); - if (checkHidlReturn(gnssBatching_V2_0, "Unable to get a handle to GnssBatching_V2_0")) { - gnssBatchingIface = std::make_unique<gnss::GnssBatching_V2_0>(gnssBatching_V2_0); - } - } - if (gnssHal != nullptr && gnssBatchingIface == nullptr) { - auto gnssBatching_V1_0 = gnssHal->getExtensionGnssBatching(); - if (checkHidlReturn(gnssBatching_V1_0, "Unable to get a handle to GnssBatching")) { - gnssBatchingIface = std::make_unique<gnss::GnssBatching_V1_0>(gnssBatching_V1_0); - } - } - - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - sp<android::hardware::gnss::visibility_control::IGnssVisibilityControl> - gnssVisibilityControlAidl; - auto status = gnssHalAidl->getExtensionGnssVisibilityControl(&gnssVisibilityControlAidl); - if (checkAidlStatus(status, - "Unable to get a handle to GnssVisibilityControl AIDL interface.")) { - gnssVisibilityControlIface = - std::make_unique<gnss::GnssVisibilityControlAidl>(gnssVisibilityControlAidl); - } - } else if (gnssHal_V2_0 != nullptr) { - auto gnssVisibilityControlHidl = gnssHal_V2_0->getExtensionVisibilityControl(); - if (checkHidlReturn(gnssVisibilityControlHidl, - "Unable to get a handle to GnssVisibilityControl HIDL interface")) { - gnssVisibilityControlIface = - std::make_unique<gnss::GnssVisibilityControlHidl>(gnssVisibilityControlHidl); - } - } - - if (gnssHalAidl != nullptr) { - sp<IGnssPowerIndication> gnssPowerIndication; - auto status = gnssHalAidl->getExtensionGnssPowerIndication(&gnssPowerIndication); - if (checkAidlStatus(status, "Unable to get a handle to GnssPowerIndication interface.")) { - gnssPowerIndicationIface = gnssPowerIndication; - } - } + gnssHal->linkToDeath(); + gnssPsdsIface = gnssHal->getGnssPsdsInterface(); + agnssRilIface = gnssHal->getAGnssRilInterface(); + agnssIface = gnssHal->getAGnssInterface(); + gnssNavigationMessageIface = gnssHal->getGnssNavigationMessageInterface(); + gnssMeasurementIface = gnssHal->getGnssMeasurementInterface(); + gnssAntennaInfoIface = gnssHal->getGnssAntennaInfoInterface(); + gnssMeasurementCorrectionsIface = gnssHal->getMeasurementCorrectionsInterface(); + gnssDebugIface = gnssHal->getGnssDebugInterface(); + gnssNiIface = gnssHal->getGnssNiInterface(); + gnssConfigurationIface = gnssHal->getGnssConfigurationInterface(); + gnssGeofencingIface = gnssHal->getGnssGeofenceInterface(); + gnssBatchingIface = gnssHal->getGnssBatchingInterface(); + gnssVisibilityControlIface = gnssHal->getGnssVisibilityControlInterface(); + gnssPowerIndicationIface = gnssHal->getGnssPowerIndicationInterface(); if (mCallbacksObj) { ALOGE("Callbacks already initialized"); @@ -1239,7 +320,7 @@ static void android_location_gnss_hal_GnssNative_init_once(JNIEnv* env, jobject } static jboolean android_location_gnss_hal_GnssNative_is_supported(JNIEnv* /* env */, jclass) { - return (gnssHalAidl != nullptr || gnssHal != nullptr) ? JNI_TRUE : JNI_FALSE; + return (gnssHal != nullptr && gnssHal->isSupported()) ? JNI_TRUE : JNI_FALSE; } static jboolean android_location_GnssNetworkConnectivityHandler_is_agps_ril_supported( @@ -1268,52 +349,18 @@ static jboolean android_location_gnss_hal_GnssNative_init(JNIEnv* /* env */, jcl /* * Fail if the main interface fails to initialize */ - if (gnssHal == nullptr && gnssHalAidl == nullptr) { + if (!gnssHal->isSupported()) { ALOGE("Unable to initialize GNSS HAL."); return JNI_FALSE; } - // Set top level IGnss.hal callback. - if (gnssHal != nullptr) { - Return<bool> result = false; - sp<IGnssCallback_V2_1> gnssCbIface = new GnssCallback(); - if (gnssHal_V2_1 != nullptr) { - result = gnssHal_V2_1->setCallback_2_1(gnssCbIface); - } else if (gnssHal_V2_0 != nullptr) { - result = gnssHal_V2_0->setCallback_2_0(gnssCbIface); - } else if (gnssHal_V1_1 != nullptr) { - result = gnssHal_V1_1->setCallback_1_1(gnssCbIface); - } else { - result = gnssHal->setCallback(gnssCbIface); - } - if (!checkHidlReturn(result, "IGnss setCallback() failed.")) { - return JNI_FALSE; - } - } - - if (gnssHalAidl != nullptr) { - sp<IGnssCallbackAidl> gnssCbIfaceAidl = new GnssCallbackAidl(); - auto status = gnssHalAidl->setCallback(gnssCbIfaceAidl); - if (!checkAidlStatus(status, "IGnssAidl setCallback() failed.")) { - return JNI_FALSE; - } - } + // Set top level IGnss HAL callback. + gnssHal->setCallback(); - // Set IGnssPsds or IGnssXtra callback. - if (gnssPsdsAidlIface != nullptr) { - sp<IGnssPsdsCallbackAidl> gnssPsdsCallbackAidl = new GnssPsdsCallbackAidl(); - auto status = gnssPsdsAidlIface->setCallback(gnssPsdsCallbackAidl); - if (!checkAidlStatus(status, "IGnssPsdsAidl setCallback() failed.")) { - gnssPsdsAidlIface = nullptr; - } - } else if (gnssXtraIface != nullptr) { - sp<IGnssXtraCallback> gnssXtraCbIface = new GnssXtraCallback(); - auto result = gnssXtraIface->setCallback(gnssXtraCbIface); - if (!checkHidlReturn(result, "IGnssXtra setCallback() failed.")) { - gnssXtraIface = nullptr; - } else { - ALOGI("Unable to initialize IGnssXtra interface."); - } + // Set IGnssPsds callback. + if (gnssPsdsIface == nullptr || + !gnssPsdsIface->setCallback(std::make_unique<gnss::GnssPsdsCallback>())) { + ALOGI("Unable to initialize IGnssPsds interface."); } // Set IAGnss callback. @@ -1373,145 +420,47 @@ static jboolean android_location_gnss_hal_GnssNative_init(JNIEnv* /* env */, jcl } static void android_location_gnss_hal_GnssNative_cleanup(JNIEnv* /* env */, jclass) { - if (gnssHalAidl != nullptr) { - auto status = gnssHalAidl->close(); - checkAidlStatus(status, "IGnssAidl close() failed."); - } - - if (gnssHal != nullptr) { - auto result = gnssHal->cleanup(); - checkHidlReturn(result, "IGnss cleanup() failed."); - } + gnssHal->close(); } static jboolean android_location_gnss_hal_GnssNative_set_position_mode( JNIEnv* /* env */, jclass, jint mode, jint recurrence, jint min_interval, jint preferred_accuracy, jint preferred_time, jboolean low_power_mode) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - IGnssAidl::PositionModeOptions options; - options.mode = static_cast<IGnssAidl::GnssPositionMode>(mode); - options.recurrence = static_cast<IGnssAidl::GnssPositionRecurrence>(recurrence); - options.minIntervalMs = min_interval; - options.preferredAccuracyMeters = preferred_accuracy; - options.preferredTimeMs = preferred_time; - options.lowPowerMode = low_power_mode; - auto status = gnssHalAidl->setPositionMode(options); - return checkAidlStatus(status, "IGnssAidl setPositionMode() failed."); - } - - Return<bool> result = false; - if (gnssHal_V1_1 != nullptr) { - result = gnssHal_V1_1->setPositionMode_1_1(static_cast<IGnss_V1_0::GnssPositionMode>(mode), - static_cast<IGnss_V1_0::GnssPositionRecurrence>(recurrence), - min_interval, - preferred_accuracy, - preferred_time, - low_power_mode); - } else if (gnssHal != nullptr) { - result = gnssHal->setPositionMode(static_cast<IGnss_V1_0::GnssPositionMode>(mode), - static_cast<IGnss_V1_0::GnssPositionRecurrence>(recurrence), - min_interval, - preferred_accuracy, - preferred_time); - } - - return checkHidlReturn(result, "IGnss setPositionMode() failed."); + return gnssHal->setPositionMode(mode, recurrence, min_interval, preferred_accuracy, + preferred_time, low_power_mode); } static jboolean android_location_gnss_hal_GnssNative_start(JNIEnv* /* env */, jclass) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->start(); - return checkAidlStatus(status, "IGnssAidl start() failed."); - } - - if (gnssHal == nullptr) { - return JNI_FALSE; - } - - auto result = gnssHal->start(); - return checkHidlReturn(result, "IGnss start() failed."); + return gnssHal->start(); } static jboolean android_location_gnss_hal_GnssNative_stop(JNIEnv* /* env */, jclass) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->stop(); - return checkAidlStatus(status, "IGnssAidl stop() failed."); - } - - if (gnssHal == nullptr) { - return JNI_FALSE; - } - - auto result = gnssHal->stop(); - return checkHidlReturn(result, "IGnss stop() failed."); + return gnssHal->stop(); } static jboolean android_location_gnss_hal_GnssNative_start_sv_status_collection(JNIEnv* /* env */, jclass) { - isSvStatusRegistered = true; - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->startSvStatus(); - return checkAidlStatus(status, "IGnssAidl startSvStatus() failed."); - } - if (gnssHal == nullptr) { - return JNI_FALSE; - } - return JNI_TRUE; + return gnssHal->startSvStatus(); } static jboolean android_location_gnss_hal_GnssNative_stop_sv_status_collection(JNIEnv* /* env */, jclass) { - isSvStatusRegistered = false; - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->stopSvStatus(); - return checkAidlStatus(status, "IGnssAidl stopSvStatus() failed."); - } - if (gnssHal == nullptr) { - return JNI_FALSE; - } - return JNI_TRUE; + return gnssHal->stopSvStatus(); } static jboolean android_location_gnss_hal_GnssNative_start_nmea_message_collection( JNIEnv* /* env */, jclass) { - isNmeaRegistered = true; - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->startNmea(); - return checkAidlStatus(status, "IGnssAidl startNmea() failed."); - } - if (gnssHal == nullptr) { - return JNI_FALSE; - } - return JNI_TRUE; + return gnssHal->startNmea(); } static jboolean android_location_gnss_hal_GnssNative_stop_nmea_message_collection(JNIEnv* /* env */, jclass) { - isNmeaRegistered = false; - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->stopNmea(); - return checkAidlStatus(status, "IGnssAidl stopNmea() failed."); - } - if (gnssHal == nullptr) { - return JNI_FALSE; - } - return JNI_TRUE; + return gnssHal->stopNmea(); } static void android_location_gnss_hal_GnssNative_delete_aiding_data(JNIEnv* /* env */, jclass, jint flags) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->deleteAidingData(static_cast<IGnssAidl::GnssAidingData>(flags)); - checkAidlStatus(status, "IGnssAidl deleteAidingData() failed."); - return; - } - - if (gnssHal == nullptr) { - return; - } - - auto result = gnssHal->deleteAidingData(static_cast<IGnss_V1_0::GnssAidingData>(flags)); - checkHidlReturn(result, "IGnss deleteAidingData() failed."); + gnssHal->deleteAidingData(flags); } static void android_location_gnss_hal_GnssNative_agps_set_reference_location_cellid( @@ -1535,30 +484,13 @@ static void android_location_gnss_hal_GnssNative_agps_set_id(JNIEnv* env, jclass static jint android_location_gnss_hal_GnssNative_read_nmea(JNIEnv* env, jclass, jbyteArray nmeaArray, jint buffer_size) { - // this should only be called from within a call to reportNmea - jbyte* nmea = reinterpret_cast<jbyte *>(env->GetPrimitiveArrayCritical(nmeaArray, 0)); - int length = GnssCallback::sNmeaStringLength; - if (length > buffer_size) - length = buffer_size; - memcpy(nmea, GnssCallback::sNmeaString, length); - env->ReleasePrimitiveArrayCritical(nmeaArray, nmea, JNI_ABORT); - return (jint) length; + return gnssHal->readNmea(nmeaArray, buffer_size); } static void android_location_gnss_hal_GnssNative_inject_time(JNIEnv* /* env */, jclass, jlong time, jlong timeReference, jint uncertainty) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - auto status = gnssHalAidl->injectTime(time, timeReference, uncertainty); - checkAidlStatus(status, "IGnssAidl injectTime() failed."); - return; - } - - if (gnssHal == nullptr) { - return; - } - auto result = gnssHal->injectTime(time, timeReference, uncertainty); - checkHidlReturn(result, "IGnss injectTime() failed."); + gnssHal->injectTime(time, timeReference, uncertainty); } static void android_location_gnss_hal_GnssNative_inject_best_location( @@ -1568,58 +500,12 @@ static void android_location_gnss_hal_GnssNative_inject_best_location( jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, jdouble elapsedRealtimeUncertaintyNanos) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - GnssLocationAidl location = - createGnssLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, - altitudeMeters, speedMetersPerSec, bearingDegrees, - horizontalAccuracyMeters, verticalAccuracyMeters, - speedAccuracyMetersPerSecond, bearingAccuracyDegrees, timestamp, - elapsedRealtimeFlags, elapsedRealtimeNanos, - elapsedRealtimeUncertaintyNanos); - auto status = gnssHalAidl->injectBestLocation(location); - checkAidlStatus(status, "IGnssAidl injectBestLocation() failed."); - return; - } - - if (gnssHal_V2_0 != nullptr) { - GnssLocation_V2_0 location = createGnssLocation_V2_0( - gnssLocationFlags, - latitudeDegrees, - longitudeDegrees, - altitudeMeters, - speedMetersPerSec, - bearingDegrees, - horizontalAccuracyMeters, - verticalAccuracyMeters, - speedAccuracyMetersPerSecond, - bearingAccuracyDegrees, - timestamp, - elapsedRealtimeFlags, - elapsedRealtimeNanos, - elapsedRealtimeUncertaintyNanos); - auto result = gnssHal_V2_0->injectBestLocation_2_0(location); - checkHidlReturn(result, "IGnss injectBestLocation_2_0() failed."); - return; - } - - if (gnssHal_V1_1 != nullptr) { - GnssLocation_V1_0 location = createGnssLocation_V1_0( - gnssLocationFlags, - latitudeDegrees, - longitudeDegrees, - altitudeMeters, - speedMetersPerSec, - bearingDegrees, - horizontalAccuracyMeters, - verticalAccuracyMeters, - speedAccuracyMetersPerSecond, - bearingAccuracyDegrees, - timestamp); - auto result = gnssHal_V1_1->injectBestLocation(location); - checkHidlReturn(result, "IGnss injectBestLocation() failed."); - } - - ALOGE("IGnss injectBestLocation() is called but gnssHal_V1_1 is not available."); + gnssHal->injectBestLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, timestamp, + elapsedRealtimeFlags, elapsedRealtimeNanos, + elapsedRealtimeUncertaintyNanos); } static void android_location_gnss_hal_GnssNative_inject_location( @@ -1629,51 +515,25 @@ static void android_location_gnss_hal_GnssNative_inject_location( jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, jdouble elapsedRealtimeUncertaintyNanos) { - if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { - GnssLocationAidl location = - createGnssLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, - altitudeMeters, speedMetersPerSec, bearingDegrees, - horizontalAccuracyMeters, verticalAccuracyMeters, - speedAccuracyMetersPerSecond, bearingAccuracyDegrees, timestamp, - elapsedRealtimeFlags, elapsedRealtimeNanos, - elapsedRealtimeUncertaintyNanos); - auto status = gnssHalAidl->injectLocation(location); - checkAidlStatus(status, "IGnssAidl injectLocation() failed."); - return; - } - - if (gnssHal == nullptr) { - return; - } - auto result = - gnssHal->injectLocation(latitudeDegrees, longitudeDegrees, horizontalAccuracyMeters); - checkHidlReturn(result, "IGnss injectLocation() failed."); + gnssHal->injectLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, altitudeMeters, + speedMetersPerSec, bearingDegrees, horizontalAccuracyMeters, + verticalAccuracyMeters, speedAccuracyMetersPerSecond, + bearingAccuracyDegrees, timestamp, elapsedRealtimeFlags, + elapsedRealtimeNanos, elapsedRealtimeUncertaintyNanos); } static jboolean android_location_gnss_hal_GnssNative_supports_psds(JNIEnv* /* env */, jclass) { - return (gnssPsdsAidlIface != nullptr || gnssXtraIface != nullptr) ? JNI_TRUE : JNI_FALSE; + return (gnssPsdsIface != nullptr) ? JNI_TRUE : JNI_FALSE; } static void android_location_gnss_hal_GnssNative_inject_psds_data(JNIEnv* env, jclass, jbyteArray data, jint length, jint psdsType) { - if (gnssPsdsAidlIface == nullptr && gnssXtraIface == nullptr) { - ALOGE("%s: IGnssPsdsAidl or IGnssXtra interface not available.", __func__); + if (gnssPsdsIface == nullptr) { + ALOGE("%s: IGnssPsds or IGnssXtra interface not available.", __func__); return; } - - jbyte* bytes = reinterpret_cast<jbyte *>(env->GetPrimitiveArrayCritical(data, 0)); - if (gnssPsdsAidlIface != nullptr) { - auto status = gnssPsdsAidlIface->injectPsdsData(static_cast<PsdsType>(psdsType), - std::vector<uint8_t>((const uint8_t*)bytes, - (const uint8_t*)bytes + - length)); - checkAidlStatus(status, "IGnssPsdsAidl injectPsdsData() failed."); - } else if (gnssXtraIface != nullptr) { - auto result = gnssXtraIface->injectXtraData(std::string((const char*)bytes, length)); - checkHidlReturn(result, "IGnssXtra injectXtraData() failed."); - } - env->ReleasePrimitiveArrayCritical(data, bytes, JNI_ABORT); + gnssPsdsIface->injectPsdsData(data, length, psdsType); } static void android_location_GnssNetworkConnectivityHandler_agps_data_conn_open( diff --git a/services/core/jni/gnss/Android.bp b/services/core/jni/gnss/Android.bp index e52df15b973a..0531ae2a8ccd 100644 --- a/services/core/jni/gnss/Android.bp +++ b/services/core/jni/gnss/Android.bp @@ -28,6 +28,8 @@ cc_library_shared { "AGnssRil.cpp", "AGnssRilCallback.cpp", "GnssAntennaInfo.cpp", + "Gnss.cpp", + "GnssCallback.cpp", "GnssAntennaInfoCallback.cpp", "GnssBatching.cpp", "GnssBatchingCallback.cpp", @@ -39,6 +41,8 @@ cc_library_shared { "GnssMeasurementCallback.cpp", "GnssNavigationMessage.cpp", "GnssNavigationMessageCallback.cpp", + "GnssPsds.cpp", + "GnssPsdsCallback.cpp", "GnssVisibilityControl.cpp", "GnssVisibilityControlCallback.cpp", "MeasurementCorrections.cpp", @@ -55,6 +59,7 @@ cc_defaults { "libhidlbase", "liblog", "libnativehelper", + "libhardware_legacy", "libutils", "android.hardware.gnss-V2-cpp", "android.hardware.gnss@1.0", diff --git a/services/core/jni/gnss/Gnss.cpp b/services/core/jni/gnss/Gnss.cpp new file mode 100644 index 000000000000..f6459eaa444e --- /dev/null +++ b/services/core/jni/gnss/Gnss.cpp @@ -0,0 +1,759 @@ +/* + * 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. + */ + +// Define LOG_TAG before <log/log.h> to overwrite the default value. +#define LOG_TAG "GnssJni" + +#include "Gnss.h" + +#include <binder/IServiceManager.h> + +#include "Utils.h" + +namespace android::gnss { + +using hardware::Return; + +using GnssLocationAidl = hardware::gnss::GnssLocation; +using GnssLocation_V1_0 = hardware::gnss::V1_0::GnssLocation; +using GnssLocation_V2_0 = hardware::gnss::V2_0::GnssLocation; +using IAGnssAidl = hardware::gnss::IAGnss; +using IAGnssRilAidl = hardware::gnss::IAGnssRil; +using IGnssAidl = hardware::gnss::IGnss; +using IGnss_V1_0 = hardware::gnss::V1_0::IGnss; +using IGnss_V1_1 = hardware::gnss::V1_1::IGnss; +using IGnss_V2_0 = hardware::gnss::V2_0::IGnss; +using IGnss_V2_1 = hardware::gnss::V2_1::IGnss; +using IGnssAntennaInfoAidl = hardware::gnss::IGnssAntennaInfo; +using IGnssCallbackAidl = hardware::gnss::IGnssCallback; +using IGnssCallback_V1_0 = hardware::gnss::V1_0::IGnssCallback; +using IGnssCallback_V2_0 = hardware::gnss::V2_0::IGnssCallback; +using IGnssCallback_V2_1 = hardware::gnss::V2_1::IGnssCallback; +using IGnssConfigurationAidl = android::hardware::gnss::IGnssConfiguration; +using IGnssDebugAidl = hardware::gnss::IGnssDebug; +using android::hardware::gnss::IGnssPsds; + +namespace { + +GnssLocationAidl createGnssLocation(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, + jfloat bearingAccuracyDegrees, jlong timestamp, + jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos) { + GnssLocationAidl location; + location.gnssLocationFlags = static_cast<int>(gnssLocationFlags); + location.latitudeDegrees = static_cast<double>(latitudeDegrees); + location.longitudeDegrees = static_cast<double>(longitudeDegrees); + location.altitudeMeters = static_cast<double>(altitudeMeters); + location.speedMetersPerSec = static_cast<double>(speedMetersPerSec); + location.bearingDegrees = static_cast<double>(bearingDegrees); + location.horizontalAccuracyMeters = static_cast<double>(horizontalAccuracyMeters); + location.verticalAccuracyMeters = static_cast<double>(verticalAccuracyMeters); + location.speedAccuracyMetersPerSecond = static_cast<double>(speedAccuracyMetersPerSecond); + location.bearingAccuracyDegrees = static_cast<double>(bearingAccuracyDegrees); + location.timestampMillis = static_cast<uint64_t>(timestamp); + + location.elapsedRealtime.flags = static_cast<int>(elapsedRealtimeFlags); + location.elapsedRealtime.timestampNs = static_cast<uint64_t>(elapsedRealtimeNanos); + location.elapsedRealtime.timeUncertaintyNs = + static_cast<double>(elapsedRealtimeUncertaintyNanos); + + return location; +} + +GnssLocation_V1_0 createGnssLocation_V1_0(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, + jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, + jfloat bearingAccuracyDegrees, jlong timestamp) { + GnssLocation_V1_0 location; + location.gnssLocationFlags = static_cast<uint16_t>(gnssLocationFlags); + location.latitudeDegrees = static_cast<double>(latitudeDegrees); + location.longitudeDegrees = static_cast<double>(longitudeDegrees); + location.altitudeMeters = static_cast<double>(altitudeMeters); + location.speedMetersPerSec = static_cast<float>(speedMetersPerSec); + location.bearingDegrees = static_cast<float>(bearingDegrees); + location.horizontalAccuracyMeters = static_cast<float>(horizontalAccuracyMeters); + location.verticalAccuracyMeters = static_cast<float>(verticalAccuracyMeters); + location.speedAccuracyMetersPerSecond = static_cast<float>(speedAccuracyMetersPerSecond); + location.bearingAccuracyDegrees = static_cast<float>(bearingAccuracyDegrees); + location.timestamp = static_cast<uint64_t>(timestamp); + + return location; +} + +GnssLocation_V2_0 createGnssLocation_V2_0(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, + jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, + jfloat bearingAccuracyDegrees, jlong timestamp, + jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos) { + GnssLocation_V2_0 location; + location.v1_0 = createGnssLocation_V1_0(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, + timestamp); + + location.elapsedRealtime.flags = static_cast<uint16_t>(elapsedRealtimeFlags); + location.elapsedRealtime.timestampNs = static_cast<uint64_t>(elapsedRealtimeNanos); + location.elapsedRealtime.timeUncertaintyNs = + static_cast<uint64_t>(elapsedRealtimeUncertaintyNanos); + + return location; +} + +} // anonymous namespace + +// Implementation of GnssHal, which unifies all versions of GNSS HALs + +GnssHal::GnssHal() { + gnssHalAidl = waitForVintfService<IGnssAidl>(); + if (gnssHalAidl != nullptr) { + ALOGD("Successfully got GNSS AIDL handle. Version=%d.", gnssHalAidl->getInterfaceVersion()); + if (gnssHalAidl->getInterfaceVersion() >= 2) { + return; + } + } + + ALOGD("Trying IGnss_V2_1::getService()"); + gnssHal_V2_1 = IGnss_V2_1::getService(); + if (gnssHal_V2_1 != nullptr) { + gnssHal_V2_0 = gnssHal_V2_1; + gnssHal_V1_1 = gnssHal_V2_1; + gnssHal = gnssHal_V2_1; + return; + } + + ALOGD("gnssHal 2.1 was null, trying 2.0"); + gnssHal_V2_0 = IGnss_V2_0::getService(); + if (gnssHal_V2_0 != nullptr) { + gnssHal_V1_1 = gnssHal_V2_0; + gnssHal = gnssHal_V2_0; + return; + } + + ALOGD("gnssHal 2.0 was null, trying 1.1"); + gnssHal_V1_1 = IGnss_V1_1::getService(); + if (gnssHal_V1_1 != nullptr) { + gnssHal = gnssHal_V1_1; + return; + } + + ALOGD("gnssHal 1.1 was null, trying 1.0"); + gnssHal = IGnss_V1_0::getService(); +} + +jboolean GnssHal::isSupported() { + return (gnssHalAidl != nullptr || gnssHal != nullptr) ? JNI_TRUE : JNI_FALSE; +} + +void GnssHal::linkToDeath() { + // TODO: linkToDeath for AIDL HAL + + if (gnssHal != nullptr) { + gnssHalDeathRecipient = new GnssDeathRecipient(); + hardware::Return<bool> linked = gnssHal->linkToDeath(gnssHalDeathRecipient, /*cookie*/ 0); + if (!linked.isOk()) { + ALOGE("Transaction error in linking to GnssHAL death: %s", + linked.description().c_str()); + } else if (!linked) { + ALOGW("Unable to link to GnssHal death notifications"); + } else { + ALOGD("Link to death notification successful"); + } + } +} + +jboolean GnssHal::setCallback() { + if (gnssHalAidl != nullptr) { + sp<IGnssCallbackAidl> gnssCbIfaceAidl = new GnssCallbackAidl(); + auto status = gnssHalAidl->setCallback(gnssCbIfaceAidl); + if (!checkAidlStatus(status, "IGnssAidl setCallback() failed.")) { + return JNI_FALSE; + } + } + if (gnssHal != nullptr) { + Return<bool> result = false; + sp<IGnssCallback_V2_1> gnssCbIface = new GnssCallbackHidl(); + if (gnssHal_V2_1 != nullptr) { + result = gnssHal_V2_1->setCallback_2_1(gnssCbIface); + } else if (gnssHal_V2_0 != nullptr) { + result = gnssHal_V2_0->setCallback_2_0(gnssCbIface); + } else if (gnssHal_V1_1 != nullptr) { + result = gnssHal_V1_1->setCallback_1_1(gnssCbIface); + } else { + result = gnssHal->setCallback(gnssCbIface); + } + if (!checkHidlReturn(result, "IGnss setCallback() failed.")) { + return JNI_FALSE; + } + } + return JNI_TRUE; +} + +void GnssHal::close() { + if (gnssHalAidl != nullptr) { + auto status = gnssHalAidl->close(); + checkAidlStatus(status, "IGnssAidl close() failed."); + } + + if (gnssHal != nullptr) { + auto result = gnssHal->cleanup(); + checkHidlReturn(result, "IGnss cleanup() failed."); + } +} + +jboolean GnssHal::start() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->start(); + return checkAidlStatus(status, "IGnssAidl start() failed."); + } + + if (gnssHal == nullptr) { + return JNI_FALSE; + } + + auto result = gnssHal->start(); + return checkHidlReturn(result, "IGnss start() failed."); +} + +jboolean GnssHal::stop() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->stop(); + return checkAidlStatus(status, "IGnssAidl stop() failed."); + } + + if (gnssHal == nullptr) { + return JNI_FALSE; + } + + auto result = gnssHal->stop(); + return checkHidlReturn(result, "IGnss stop() failed."); +} + +jboolean GnssHal::startSvStatus() { + isSvStatusRegistered = true; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->startSvStatus(); + return checkAidlStatus(status, "IGnssAidl startSvStatus() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +jboolean GnssHal::stopSvStatus() { + isSvStatusRegistered = false; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->stopSvStatus(); + return checkAidlStatus(status, "IGnssAidl stopSvStatus() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +jboolean GnssHal::startNmea() { + isNmeaRegistered = true; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->startNmea(); + return checkAidlStatus(status, "IGnssAidl startNmea() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +jboolean GnssHal::stopNmea() { + isNmeaRegistered = false; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->stopNmea(); + return checkAidlStatus(status, "IGnssAidl stopNmea() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +jint GnssHal::readNmea(jbyteArray& nmeaArray, jint& buffer_size) { + // this should only be called from within a call to reportNmea + JNIEnv* env = getJniEnv(); + jbyte* nmea = reinterpret_cast<jbyte*>(env->GetPrimitiveArrayCritical(nmeaArray, 0)); + int length = GnssCallbackHidl::sNmeaStringLength; + if (length > buffer_size) { + length = buffer_size; + } + memcpy(nmea, GnssCallbackHidl::sNmeaString, length); + env->ReleasePrimitiveArrayCritical(nmeaArray, nmea, JNI_ABORT); + return (jint)length; +} + +jboolean GnssHal::setPositionMode(jint mode, jint recurrence, jint min_interval, + jint preferred_accuracy, jint preferred_time, + jboolean low_power_mode) { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + IGnssAidl::PositionModeOptions options; + options.mode = static_cast<IGnssAidl::GnssPositionMode>(mode); + options.recurrence = static_cast<IGnssAidl::GnssPositionRecurrence>(recurrence); + options.minIntervalMs = min_interval; + options.preferredAccuracyMeters = preferred_accuracy; + options.preferredTimeMs = preferred_time; + options.lowPowerMode = low_power_mode; + auto status = gnssHalAidl->setPositionMode(options); + return checkAidlStatus(status, "IGnssAidl setPositionMode() failed."); + } + + Return<bool> result = false; + if (gnssHal_V1_1 != nullptr) { + result = gnssHal_V1_1->setPositionMode_1_1(static_cast<IGnss_V1_0::GnssPositionMode>(mode), + static_cast<IGnss_V1_0::GnssPositionRecurrence>( + recurrence), + min_interval, preferred_accuracy, preferred_time, + low_power_mode); + } else if (gnssHal != nullptr) { + result = gnssHal->setPositionMode(static_cast<IGnss_V1_0::GnssPositionMode>(mode), + static_cast<IGnss_V1_0::GnssPositionRecurrence>( + recurrence), + min_interval, preferred_accuracy, preferred_time); + } + return checkHidlReturn(result, "IGnss setPositionMode() failed."); +} + +void GnssHal::deleteAidingData(jint flags) { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->deleteAidingData(static_cast<IGnssAidl::GnssAidingData>(flags)); + checkAidlStatus(status, "IGnssAidl deleteAidingData() failed."); + return; + } + + if (gnssHal == nullptr) { + return; + } + + auto result = gnssHal->deleteAidingData(static_cast<IGnss_V1_0::GnssAidingData>(flags)); + checkHidlReturn(result, "IGnss deleteAidingData() failed."); +} + +void GnssHal::injectTime(jlong time, jlong timeReference, jint uncertainty) { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->injectTime(time, timeReference, uncertainty); + checkAidlStatus(status, "IGnssAidl injectTime() failed."); + return; + } + + if (gnssHal == nullptr) { + return; + } + auto result = gnssHal->injectTime(time, timeReference, uncertainty); + checkHidlReturn(result, "IGnss injectTime() failed."); +} + +void GnssHal::injectLocation(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, + jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos) { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + GnssLocationAidl location = + createGnssLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, timestamp, + elapsedRealtimeFlags, elapsedRealtimeNanos, + elapsedRealtimeUncertaintyNanos); + auto status = gnssHalAidl->injectLocation(location); + checkAidlStatus(status, "IGnssAidl injectLocation() failed."); + return; + } + + if (gnssHal == nullptr) { + return; + } + auto result = + gnssHal->injectLocation(latitudeDegrees, longitudeDegrees, horizontalAccuracyMeters); + checkHidlReturn(result, "IGnss injectLocation() failed."); +} + +void GnssHal::injectBestLocation(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, + jlong timestamp, jint elapsedRealtimeFlags, + jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos) { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + GnssLocationAidl location = + createGnssLocation(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, timestamp, + elapsedRealtimeFlags, elapsedRealtimeNanos, + elapsedRealtimeUncertaintyNanos); + auto status = gnssHalAidl->injectBestLocation(location); + checkAidlStatus(status, "IGnssAidl injectBestLocation() failed."); + return; + } + + if (gnssHal_V2_0 != nullptr) { + GnssLocation_V2_0 location = + createGnssLocation_V2_0(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, + timestamp, elapsedRealtimeFlags, elapsedRealtimeNanos, + elapsedRealtimeUncertaintyNanos); + auto result = gnssHal_V2_0->injectBestLocation_2_0(location); + checkHidlReturn(result, "IGnss injectBestLocation_2_0() failed."); + return; + } + + if (gnssHal_V1_1 != nullptr) { + GnssLocation_V1_0 location = + createGnssLocation_V1_0(gnssLocationFlags, latitudeDegrees, longitudeDegrees, + altitudeMeters, speedMetersPerSec, bearingDegrees, + horizontalAccuracyMeters, verticalAccuracyMeters, + speedAccuracyMetersPerSecond, bearingAccuracyDegrees, + timestamp); + auto result = gnssHal_V1_1->injectBestLocation(location); + checkHidlReturn(result, "IGnss injectBestLocation() failed."); + return; + } + + ALOGE("IGnss injectBestLocation() is called but gnssHal_V1_1 is not available."); +} + +std::unique_ptr<AGnssInterface> GnssHal::getAGnssInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<IAGnssAidl> agnssAidl; + auto status = gnssHalAidl->getExtensionAGnss(&agnssAidl); + if (checkAidlStatus(status, "Unable to get a handle to AGnss interface.")) { + return std::make_unique<gnss::AGnss>(agnssAidl); + } + } else if (gnssHal_V2_0 != nullptr) { + auto agnss_V2_0 = gnssHal_V2_0->getExtensionAGnss_2_0(); + if (checkHidlReturn(agnss_V2_0, "Unable to get a handle to AGnss_V2_0")) { + return std::make_unique<gnss::AGnss_V2_0>(agnss_V2_0); + } + } else if (gnssHal != nullptr) { + auto agnss_V1_0 = gnssHal->getExtensionAGnss(); + if (checkHidlReturn(agnss_V1_0, "Unable to get a handle to AGnss_V1_0")) { + return std::make_unique<gnss::AGnss_V1_0>(agnss_V1_0); + } + } + return nullptr; +} + +std::unique_ptr<AGnssRilInterface> GnssHal::getAGnssRilInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<IAGnssRilAidl> agnssRilAidl; + auto status = gnssHalAidl->getExtensionAGnssRil(&agnssRilAidl); + if (checkAidlStatus(status, "Unable to get a handle to AGnssRil interface.")) { + return std::make_unique<gnss::AGnssRil>(agnssRilAidl); + } + } else if (gnssHal_V2_0 != nullptr) { + auto agnssRil_V2_0 = gnssHal_V2_0->getExtensionAGnssRil_2_0(); + if (checkHidlReturn(agnssRil_V2_0, "Unable to get a handle to AGnssRil_V2_0")) { + return std::make_unique<gnss::AGnssRil_V2_0>(agnssRil_V2_0); + } + } else if (gnssHal != nullptr) { + auto agnssRil_V1_0 = gnssHal->getExtensionAGnssRil(); + if (checkHidlReturn(agnssRil_V1_0, "Unable to get a handle to AGnssRil_V1_0")) { + return std::make_unique<gnss::AGnssRil_V1_0>(agnssRil_V1_0); + } + } + return nullptr; +} + +std::unique_ptr<GnssNavigationMessageInterface> GnssHal::getGnssNavigationMessageInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<hardware::gnss::IGnssNavigationMessageInterface> gnssNavigationMessage; + auto status = gnssHalAidl->getExtensionGnssNavigationMessage(&gnssNavigationMessage); + if (checkAidlStatus(status, + "Unable to get a handle to GnssNavigationMessage AIDL interface.")) { + return std::make_unique<gnss::GnssNavigationMessageAidl>(gnssNavigationMessage); + } + } else if (gnssHal != nullptr) { + auto gnssNavigationMessage = gnssHal->getExtensionGnssNavigationMessage(); + if (checkHidlReturn(gnssNavigationMessage, + "Unable to get a handle to GnssNavigationMessage interface.")) { + return std::make_unique<gnss::GnssNavigationMessageHidl>(gnssNavigationMessage); + } + } + return nullptr; +} + +std::unique_ptr<GnssMeasurementInterface> GnssHal::getGnssMeasurementInterface() { + // Allow all causal combinations between IGnss.hal and IGnssMeasurement.hal. That means, + // 2.1@IGnss can be paired with {1.0, 1,1, 2.0, 2.1}@IGnssMeasurement + // 2.0@IGnss can be paired with {1.0, 1,1, 2.0}@IGnssMeasurement + // 1.1@IGnss can be paired {1.0, 1.1}@IGnssMeasurement + // 1.0@IGnss is paired with 1.0@IGnssMeasurement + if (gnssHalAidl != nullptr) { + sp<hardware::gnss::IGnssMeasurementInterface> gnssMeasurement; + auto status = gnssHalAidl->getExtensionGnssMeasurement(&gnssMeasurement); + if (checkAidlStatus(status, "Unable to get a handle to GnssMeasurement AIDL interface.")) { + return std::make_unique<android::gnss::GnssMeasurement>(gnssMeasurement); + } + } + if (gnssHal_V2_1 != nullptr) { + auto gnssMeasurement = gnssHal_V2_1->getExtensionGnssMeasurement_2_1(); + if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V2_1")) { + return std::make_unique<android::gnss::GnssMeasurement_V2_1>(gnssMeasurement); + } + } + if (gnssHal_V2_0 != nullptr) { + auto gnssMeasurement = gnssHal_V2_0->getExtensionGnssMeasurement_2_0(); + if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V2_0")) { + return std::make_unique<android::gnss::GnssMeasurement_V2_0>(gnssMeasurement); + } + } + if (gnssHal_V1_1 != nullptr) { + auto gnssMeasurement = gnssHal_V1_1->getExtensionGnssMeasurement_1_1(); + if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V1_1")) { + return std::make_unique<android::gnss::GnssMeasurement_V1_1>(gnssMeasurement); + } + } + if (gnssHal != nullptr) { + auto gnssMeasurement = gnssHal->getExtensionGnssMeasurement(); + if (checkHidlReturn(gnssMeasurement, "Unable to get a handle to GnssMeasurement_V1_0")) { + return std::make_unique<android::gnss::GnssMeasurement_V1_0>(gnssMeasurement); + } + } + return nullptr; +} + +std::unique_ptr<GnssDebugInterface> GnssHal::getGnssDebugInterface() { + // Allow all causal combinations between IGnss.hal and IGnssDebug.hal. That means, + // 2.0@IGnss can be paired with {1.0, 2.0}@IGnssDebug + // 1.0@IGnss is paired with 1.0@IGnssDebug + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<IGnssDebugAidl> gnssDebugAidl; + auto status = gnssHalAidl->getExtensionGnssDebug(&gnssDebugAidl); + if (checkAidlStatus(status, "Unable to get a handle to GnssDebug interface.")) { + return std::make_unique<gnss::GnssDebug>(gnssDebugAidl); + } + } + if (gnssHal_V2_0 != nullptr) { + auto gnssDebug_V2_0 = gnssHal_V2_0->getExtensionGnssDebug_2_0(); + if (checkHidlReturn(gnssDebug_V2_0, "Unable to get a handle to GnssDebug_V2_0.")) { + return std::make_unique<gnss::GnssDebug_V2_0>(gnssDebug_V2_0); + } + } + if (gnssHal != nullptr) { + auto gnssDebug_V1_0 = gnssHal->getExtensionGnssDebug(); + if (checkHidlReturn(gnssDebug_V1_0, "Unable to get a handle to GnssDebug_V1_0.")) { + return std::make_unique<gnss::GnssDebug_V1_0>(gnssDebug_V1_0); + } + } + return nullptr; +} + +std::unique_ptr<GnssConfigurationInterface> GnssHal::getGnssConfigurationInterface() { + if (gnssHalAidl != nullptr) { + sp<IGnssConfigurationAidl> gnssConfigurationAidl; + auto status = gnssHalAidl->getExtensionGnssConfiguration(&gnssConfigurationAidl); + if (checkAidlStatus(status, + "Unable to get a handle to GnssConfiguration AIDL interface.")) { + return std::make_unique<android::gnss::GnssConfiguration>(gnssConfigurationAidl); + } + } else if (gnssHal_V2_1 != nullptr) { + auto gnssConfiguration = gnssHal_V2_1->getExtensionGnssConfiguration_2_1(); + if (checkHidlReturn(gnssConfiguration, + "Unable to get a handle to GnssConfiguration_V2_1")) { + return std::make_unique<android::gnss::GnssConfiguration_V2_1>(gnssConfiguration); + } + } else if (gnssHal_V2_0 != nullptr) { + auto gnssConfiguration = gnssHal_V2_0->getExtensionGnssConfiguration_2_0(); + if (checkHidlReturn(gnssConfiguration, + "Unable to get a handle to GnssConfiguration_V2_0")) { + return std::make_unique<android::gnss::GnssConfiguration_V2_0>(gnssConfiguration); + } + } else if (gnssHal_V1_1 != nullptr) { + auto gnssConfiguration = gnssHal_V1_1->getExtensionGnssConfiguration_1_1(); + if (checkHidlReturn(gnssConfiguration, + "Unable to get a handle to GnssConfiguration_V1_1")) { + return std::make_unique<gnss::GnssConfiguration_V1_1>(gnssConfiguration); + } + } else if (gnssHal != nullptr) { + auto gnssConfiguration = gnssHal->getExtensionGnssConfiguration(); + if (checkHidlReturn(gnssConfiguration, + "Unable to get a handle to GnssConfiguration_V1_0")) { + return std::make_unique<gnss::GnssConfiguration_V1_0>(gnssConfiguration); + } + } + return nullptr; +} + +std::unique_ptr<GnssGeofenceInterface> GnssHal::getGnssGeofenceInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<hardware::gnss::IGnssGeofence> gnssGeofence; + auto status = gnssHalAidl->getExtensionGnssGeofence(&gnssGeofence); + if (checkAidlStatus(status, "Unable to get a handle to GnssGeofence AIDL interface.")) { + return std::make_unique<gnss::GnssGeofenceAidl>(gnssGeofence); + } + } else if (gnssHal != nullptr) { + auto gnssGeofencing = gnssHal->getExtensionGnssGeofencing(); + if (checkHidlReturn(gnssGeofencing, "Unable to get a handle to GnssGeofencing")) { + return std::make_unique<gnss::GnssGeofenceHidl>(gnssGeofencing); + } + } + return nullptr; +} + +std::unique_ptr<GnssBatchingInterface> GnssHal::getGnssBatchingInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<android::hardware::gnss::IGnssBatching> gnssBatchingAidl; + auto status = gnssHalAidl->getExtensionGnssBatching(&gnssBatchingAidl); + if (checkAidlStatus(status, "Unable to get a handle to GnssBatching interface.")) { + return std::make_unique<gnss::GnssBatching>(gnssBatchingAidl); + } + } + if (gnssHal_V2_0 != nullptr) { + auto gnssBatching_V2_0 = gnssHal_V2_0->getExtensionGnssBatching_2_0(); + if (checkHidlReturn(gnssBatching_V2_0, "Unable to get a handle to GnssBatching_V2_0")) { + return std::make_unique<gnss::GnssBatching_V2_0>(gnssBatching_V2_0); + } + } + if (gnssHal != nullptr) { + auto gnssBatching_V1_0 = gnssHal->getExtensionGnssBatching(); + if (checkHidlReturn(gnssBatching_V1_0, "Unable to get a handle to GnssBatching")) { + return std::make_unique<gnss::GnssBatching_V1_0>(gnssBatching_V1_0); + } + } + return nullptr; +} + +std::unique_ptr<MeasurementCorrectionsInterface> GnssHal::getMeasurementCorrectionsInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<android::hardware::gnss::measurement_corrections::IMeasurementCorrectionsInterface> + gnssMeasurementCorrectionsAidl; + auto status = + gnssHalAidl->getExtensionMeasurementCorrections(&gnssMeasurementCorrectionsAidl); + if (checkAidlStatus(status, + "Unable to get a handle to GnssVisibilityControl AIDL interface.")) { + return std::make_unique<gnss::MeasurementCorrectionsIface_Aidl>( + gnssMeasurementCorrectionsAidl); + } + } + if (gnssHal_V2_1 != nullptr) { + auto gnssCorrections = gnssHal_V2_1->getExtensionMeasurementCorrections_1_1(); + if (checkHidlReturn(gnssCorrections, + "Unable to get a handle to GnssMeasurementCorrections HIDL " + "interface")) { + return std::make_unique<gnss::MeasurementCorrectionsIface_V1_1>(gnssCorrections); + } + } + if (gnssHal_V2_0 != nullptr) { + auto gnssCorrections = gnssHal_V2_0->getExtensionMeasurementCorrections(); + if (checkHidlReturn(gnssCorrections, + "Unable to get a handle to GnssMeasurementCorrections HIDL " + "interface")) { + return std::make_unique<gnss::MeasurementCorrectionsIface_V1_0>(gnssCorrections); + } + } + return nullptr; +} + +std::unique_ptr<GnssVisibilityControlInterface> GnssHal::getGnssVisibilityControlInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<android::hardware::gnss::visibility_control::IGnssVisibilityControl> + gnssVisibilityControlAidl; + auto status = gnssHalAidl->getExtensionGnssVisibilityControl(&gnssVisibilityControlAidl); + if (checkAidlStatus(status, + "Unable to get a handle to GnssVisibilityControl AIDL interface.")) { + return std::make_unique<gnss::GnssVisibilityControlAidl>(gnssVisibilityControlAidl); + } + } else if (gnssHal_V2_0 != nullptr) { + auto gnssVisibilityControlHidl = gnssHal_V2_0->getExtensionVisibilityControl(); + if (checkHidlReturn(gnssVisibilityControlHidl, + "Unable to get a handle to GnssVisibilityControl HIDL interface")) { + return std::make_unique<gnss::GnssVisibilityControlHidl>(gnssVisibilityControlHidl); + } + } + return nullptr; +} + +std::unique_ptr<GnssAntennaInfoInterface> GnssHal::getGnssAntennaInfoInterface() { + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + sp<IGnssAntennaInfoAidl> gnssAntennaInfoAidl; + auto status = gnssHalAidl->getExtensionGnssAntennaInfo(&gnssAntennaInfoAidl); + if (checkAidlStatus(status, "Unable to get a handle to GnssAntennaInfo interface.")) { + return std::make_unique<gnss::GnssAntennaInfoAidl>(gnssAntennaInfoAidl); + } + } else if (gnssHal_V2_1 != nullptr) { + auto gnssAntennaInfo_V2_1 = gnssHal_V2_1->getExtensionGnssAntennaInfo(); + if (checkHidlReturn(gnssAntennaInfo_V2_1, + "Unable to get a handle to GnssAntennaInfo_V2_1")) { + return std::make_unique<gnss::GnssAntennaInfo_V2_1>(gnssAntennaInfo_V2_1); + } + } + return nullptr; +} + +std::unique_ptr<GnssPsdsInterface> GnssHal::getGnssPsdsInterface() { + if (gnssHalAidl != nullptr) { + sp<IGnssPsds> gnssPsdsAidl; + auto status = gnssHalAidl->getExtensionPsds(&gnssPsdsAidl); + if (checkAidlStatus(status, "Unable to get a handle to PSDS interface.")) { + return std::make_unique<gnss::GnssPsdsAidl>(gnssPsdsAidl); + } + } else if (gnssHal != nullptr) { + auto gnssXtra = gnssHal->getExtensionXtra(); + if (checkHidlReturn(gnssXtra, "Unable to get a handle to XTRA interface.")) { + return std::make_unique<gnss::GnssPsdsHidl>(gnssXtra); + } + } + return nullptr; +} + +sp<hardware::gnss::IGnssPowerIndication> GnssHal::getGnssPowerIndicationInterface() { + if (gnssHalAidl != nullptr) { + sp<hardware::gnss::IGnssPowerIndication> gnssPowerIndication; + auto status = gnssHalAidl->getExtensionGnssPowerIndication(&gnssPowerIndication); + if (checkAidlStatus(status, "Unable to get a handle to GnssPowerIndication")) { + return gnssPowerIndication; + } + } + return nullptr; +} + +sp<hardware::gnss::V1_0::IGnssNi> GnssHal::getGnssNiInterface() { + if (gnssHal != nullptr) { + auto gnssNi = gnssHal->getExtensionGnssNi(); + if (checkHidlReturn(gnssNi, "Unable to get a handle to GnssNi")) { + return gnssNi; + } + } + return nullptr; +} + +} // namespace android::gnss diff --git a/services/core/jni/gnss/Gnss.h b/services/core/jni/gnss/Gnss.h new file mode 100644 index 000000000000..c6743d62af45 --- /dev/null +++ b/services/core/jni/gnss/Gnss.h @@ -0,0 +1,121 @@ +/* + * 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. + */ + +#ifndef _ANDROID_SERVER_GNSS_GNSS_H +#define _ANDROID_SERVER_GNSS_GNSS_H + +#pragma once + +#ifndef LOG_TAG +#error LOG_TAG must be defined before including this file. +#endif + +#include <android/hardware/gnss/1.0/IGnss.h> +#include <android/hardware/gnss/1.1/IGnss.h> +#include <android/hardware/gnss/2.0/IGnss.h> +#include <android/hardware/gnss/2.1/IGnss.h> +#include <android/hardware/gnss/BnGnss.h> +#include <log/log.h> + +#include "AGnss.h" +#include "AGnssRil.h" +#include "GnssAntennaInfo.h" +#include "GnssBatching.h" +#include "GnssCallback.h" +#include "GnssConfiguration.h" +#include "GnssDebug.h" +#include "GnssGeofence.h" +#include "GnssMeasurement.h" +#include "GnssNavigationMessage.h" +#include "GnssPsds.h" +#include "GnssVisibilityControl.h" +#include "MeasurementCorrections.h" +#include "jni.h" + +namespace android::gnss { + +struct GnssDeathRecipient : virtual public hardware::hidl_death_recipient { + // hidl_death_recipient interface + virtual void serviceDied(uint64_t cookie, const wp<hidl::base::V1_0::IBase>& who) override { + ALOGE("IGNSS hidl service failed, trying to recover..."); + + JNIEnv* env = android::AndroidRuntime::getJNIEnv(); + env->CallVoidMethod(android::mCallbacksObj, method_reportGnssServiceDied); + } +}; + +class GnssHal { +public: + GnssHal(); + ~GnssHal() {} + + jboolean isSupported(); + jboolean setCallback(); + jboolean start(); + jboolean stop(); + jboolean setPositionMode(jint mode, jint recurrence, jint min_interval, jint preferred_accuracy, + jint preferred_time, jboolean low_power_mode); + jboolean startSvStatus(); + jboolean stopSvStatus(); + jboolean startNmea(); + jboolean stopNmea(); + jint readNmea(jbyteArray& nmeaArray, jint& buffer_size); + void linkToDeath(); + void close(); + void deleteAidingData(jint flags); + void injectTime(jlong time, jlong timeReference, jint uncertainty); + void injectLocation(jint gnssLocationFlags, jdouble latitudeDegrees, jdouble longitudeDegrees, + jdouble altitudeMeters, jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, + jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos); + void injectBestLocation(jint gnssLocationFlags, jdouble latitudeDegrees, + jdouble longitudeDegrees, jdouble altitudeMeters, + jfloat speedMetersPerSec, jfloat bearingDegrees, + jfloat horizontalAccuracyMeters, jfloat verticalAccuracyMeters, + jfloat speedAccuracyMetersPerSecond, jfloat bearingAccuracyDegrees, + jlong timestamp, jint elapsedRealtimeFlags, jlong elapsedRealtimeNanos, + jdouble elapsedRealtimeUncertaintyNanos); + + std::unique_ptr<AGnssInterface> getAGnssInterface(); + std::unique_ptr<AGnssRilInterface> getAGnssRilInterface(); + std::unique_ptr<GnssNavigationMessageInterface> getGnssNavigationMessageInterface(); + std::unique_ptr<GnssMeasurementInterface> getGnssMeasurementInterface(); + std::unique_ptr<GnssDebugInterface> getGnssDebugInterface(); + std::unique_ptr<GnssConfigurationInterface> getGnssConfigurationInterface(); + std::unique_ptr<GnssGeofenceInterface> getGnssGeofenceInterface(); + std::unique_ptr<GnssBatchingInterface> getGnssBatchingInterface(); + std::unique_ptr<MeasurementCorrectionsInterface> getMeasurementCorrectionsInterface(); + std::unique_ptr<GnssVisibilityControlInterface> getGnssVisibilityControlInterface(); + std::unique_ptr<GnssAntennaInfoInterface> getGnssAntennaInfoInterface(); + std::unique_ptr<GnssPsdsInterface> getGnssPsdsInterface(); + + sp<hardware::gnss::IGnssPowerIndication> getGnssPowerIndicationInterface(); + sp<hardware::gnss::V1_0::IGnssNi> getGnssNiInterface(); + +private: + sp<GnssDeathRecipient> gnssHalDeathRecipient = nullptr; + sp<hardware::gnss::V1_0::IGnss> gnssHal = nullptr; + sp<hardware::gnss::V1_1::IGnss> gnssHal_V1_1 = nullptr; + sp<hardware::gnss::V2_0::IGnss> gnssHal_V2_0 = nullptr; + sp<hardware::gnss::V2_1::IGnss> gnssHal_V2_1 = nullptr; + sp<hardware::gnss::IGnss> gnssHalAidl = nullptr; +}; + +} // namespace android::gnss + +#endif // _ANDROID_SERVER_GNSS_Gnss_H diff --git a/services/core/jni/gnss/GnssCallback.cpp b/services/core/jni/gnss/GnssCallback.cpp new file mode 100644 index 000000000000..b931e915a753 --- /dev/null +++ b/services/core/jni/gnss/GnssCallback.cpp @@ -0,0 +1,413 @@ +/* + * 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. + */ + +#define LOG_TAG "GnssCallbckJni" + +#include "GnssCallback.h" + +#include <hardware_legacy/power.h> + +#define WAKE_LOCK_NAME "GPS" + +namespace android::gnss { + +using android::hardware::gnss::V1_0::GnssLocationFlags; +using binder::Status; +using hardware::hidl_vec; +using hardware::Return; +using hardware::Void; + +using GnssLocationAidl = android::hardware::gnss::GnssLocation; +using GnssLocation_V1_0 = android::hardware::gnss::V1_0::GnssLocation; +using GnssLocation_V2_0 = android::hardware::gnss::V2_0::GnssLocation; +using IGnssCallbackAidl = android::hardware::gnss::IGnssCallback; +using IGnssCallback_V1_0 = android::hardware::gnss::V1_0::IGnssCallback; +using IGnssCallback_V2_0 = android::hardware::gnss::V2_0::IGnssCallback; +using IGnssCallback_V2_1 = android::hardware::gnss::V2_1::IGnssCallback; + +jmethodID method_reportGnssServiceDied; + +namespace { + +jmethodID method_reportLocation; +jmethodID method_reportStatus; +jmethodID method_reportSvStatus; +jmethodID method_reportNmea; +jmethodID method_setTopHalCapabilities; +jmethodID method_setGnssYearOfHardware; +jmethodID method_setGnssHardwareModelName; +jmethodID method_requestLocation; +jmethodID method_requestUtcTime; + +// Returns true if location has lat/long information. +inline bool hasLatLong(const GnssLocationAidl& location) { + return (location.gnssLocationFlags & hardware::gnss::GnssLocation::HAS_LAT_LONG) != 0; +} + +// Returns true if location has lat/long information. +inline bool hasLatLong(const GnssLocation_V1_0& location) { + return (static_cast<uint32_t>(location.gnssLocationFlags) & GnssLocationFlags::HAS_LAT_LONG) != + 0; +} + +// Returns true if location has lat/long information. +inline bool hasLatLong(const GnssLocation_V2_0& location) { + return hasLatLong(location.v1_0); +} + +inline jboolean boolToJbool(bool value) { + return value ? JNI_TRUE : JNI_FALSE; +} + +// Must match the value from GnssMeasurement.java +const uint32_t SVID_FLAGS_HAS_BASEBAND_CN0 = (1 << 4); + +} // anonymous namespace + +bool isSvStatusRegistered = false; +bool isNmeaRegistered = false; + +void Gnss_class_init_once(JNIEnv* env, jclass& clazz) { + method_reportLocation = + env->GetMethodID(clazz, "reportLocation", "(ZLandroid/location/Location;)V"); + method_reportStatus = env->GetMethodID(clazz, "reportStatus", "(I)V"); + method_reportSvStatus = env->GetMethodID(clazz, "reportSvStatus", "(I[I[F[F[F[F[F)V"); + method_reportNmea = env->GetMethodID(clazz, "reportNmea", "(J)V"); + + method_setTopHalCapabilities = env->GetMethodID(clazz, "setTopHalCapabilities", "(I)V"); + method_setGnssYearOfHardware = env->GetMethodID(clazz, "setGnssYearOfHardware", "(I)V"); + method_setGnssHardwareModelName = + env->GetMethodID(clazz, "setGnssHardwareModelName", "(Ljava/lang/String;)V"); + + method_requestLocation = env->GetMethodID(clazz, "requestLocation", "(ZZ)V"); + method_requestUtcTime = env->GetMethodID(clazz, "requestUtcTime", "()V"); + method_reportGnssServiceDied = env->GetMethodID(clazz, "reportGnssServiceDied", "()V"); +} + +Status GnssCallbackAidl::gnssSetCapabilitiesCb(const int capabilities) { + ALOGD("GnssCallbackAidl::%s: %du\n", __func__, capabilities); + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_setTopHalCapabilities, capabilities); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssStatusCb(const GnssStatusValue status) { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_reportStatus, status); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssSvStatusCb(const std::vector<GnssSvInfo>& svInfoList) { + GnssCallbackHidl::gnssSvStatusCbImpl<std::vector<GnssSvInfo>, GnssSvInfo>(svInfoList); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssLocationCb(const hardware::gnss::GnssLocation& location) { + GnssCallbackHidl::gnssLocationCbImpl<hardware::gnss::GnssLocation>(location); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssNmeaCb(const int64_t timestamp, const std::string& nmea) { + // In AIDL v1, if no listener is registered, do not report nmea to the framework. + if (getInterfaceVersion() <= 1) { + if (!isNmeaRegistered) { + return Status::ok(); + } + } + JNIEnv* env = getJniEnv(); + /* + * The Java code will call back to read these values. + * We do this to avoid creating unnecessary String objects. + */ + GnssCallbackHidl::sNmeaString = nmea.c_str(); + GnssCallbackHidl::sNmeaStringLength = nmea.size(); + + env->CallVoidMethod(mCallbacksObj, method_reportNmea, timestamp); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssAcquireWakelockCb() { + acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssReleaseWakelockCb() { + release_wake_lock(WAKE_LOCK_NAME); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssSetSystemInfoCb(const GnssSystemInfo& info) { + ALOGD("%s: yearOfHw=%d, name=%s\n", __func__, info.yearOfHw, info.name.c_str()); + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_setGnssYearOfHardware, info.yearOfHw); + jstring jstringName = env->NewStringUTF(info.name.c_str()); + env->CallVoidMethod(mCallbacksObj, method_setGnssHardwareModelName, jstringName); + if (jstringName) { + env->DeleteLocalRef(jstringName); + } + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssRequestTimeCb() { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_requestUtcTime); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +Status GnssCallbackAidl::gnssRequestLocationCb(const bool independentFromGnss, + const bool isUserEmergency) { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_requestLocation, boolToJbool(independentFromGnss), + boolToJbool(isUserEmergency)); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +// Implementation of IGnssCallbackHidl + +Return<void> GnssCallbackHidl::gnssNameCb(const android::hardware::hidl_string& name) { + ALOGD("%s: name=%s\n", __func__, name.c_str()); + + JNIEnv* env = getJniEnv(); + jstring jstringName = env->NewStringUTF(name.c_str()); + env->CallVoidMethod(mCallbacksObj, method_setGnssHardwareModelName, jstringName); + if (jstringName) { + env->DeleteLocalRef(jstringName); + } + checkAndClearExceptionFromCallback(env, __FUNCTION__); + + return Void(); +} + +const char* GnssCallbackHidl::sNmeaString = nullptr; +size_t GnssCallbackHidl::sNmeaStringLength = 0; + +template <class T> +Return<void> GnssCallbackHidl::gnssLocationCbImpl(const T& location) { + JNIEnv* env = getJniEnv(); + + jobject jLocation = translateGnssLocation(env, location); + + env->CallVoidMethod(mCallbacksObj, method_reportLocation, boolToJbool(hasLatLong(location)), + jLocation); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + env->DeleteLocalRef(jLocation); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssLocationCb(const GnssLocation_V1_0& location) { + return gnssLocationCbImpl<GnssLocation_V1_0>(location); +} + +Return<void> GnssCallbackHidl::gnssLocationCb_2_0(const GnssLocation_V2_0& location) { + return gnssLocationCbImpl<GnssLocation_V2_0>(location); +} + +Return<void> GnssCallbackHidl::gnssStatusCb(const IGnssCallback_V2_0::GnssStatusValue status) { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_reportStatus, status); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +template <> +uint32_t GnssCallbackHidl::getHasBasebandCn0DbHzFlag( + const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svStatus) { + return SVID_FLAGS_HAS_BASEBAND_CN0; +} + +template <> +uint32_t GnssCallbackHidl::getHasBasebandCn0DbHzFlag( + const std::vector<IGnssCallbackAidl::GnssSvInfo>& svStatus) { + return SVID_FLAGS_HAS_BASEBAND_CN0; +} + +template <> +double GnssCallbackHidl::getBasebandCn0DbHz( + const std::vector<IGnssCallbackAidl::GnssSvInfo>& svInfoList, size_t i) { + return svInfoList[i].basebandCN0DbHz; +} + +template <> +double GnssCallbackHidl::getBasebandCn0DbHz( + const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList, size_t i) { + return svInfoList[i].basebandCN0DbHz; +} + +template <> +uint32_t GnssCallbackHidl::getGnssSvInfoListSize(const IGnssCallback_V1_0::GnssSvStatus& svStatus) { + return svStatus.numSvs; +} + +template <> +uint32_t GnssCallbackHidl::getConstellationType(const IGnssCallback_V1_0::GnssSvStatus& svStatus, + size_t i) { + return static_cast<uint32_t>(svStatus.gnssSvList.data()[i].constellation); +} + +template <> +uint32_t GnssCallbackHidl::getConstellationType( + const hidl_vec<IGnssCallback_V2_1::GnssSvInfo>& svInfoList, size_t i) { + return static_cast<uint32_t>(svInfoList[i].v2_0.constellation); +} + +template <class T_list, class T_sv_info> +Return<void> GnssCallbackHidl::gnssSvStatusCbImpl(const T_list& svStatus) { + // In HIDL or AIDL v1, if no listener is registered, do not report svInfoList to the framework. + if (!isSvStatusRegistered) { + return Void(); + } + + JNIEnv* env = getJniEnv(); + + uint32_t listSize = getGnssSvInfoListSize(svStatus); + + jintArray svidWithFlagArray = env->NewIntArray(listSize); + jfloatArray cn0Array = env->NewFloatArray(listSize); + jfloatArray elevArray = env->NewFloatArray(listSize); + jfloatArray azimArray = env->NewFloatArray(listSize); + jfloatArray carrierFreqArray = env->NewFloatArray(listSize); + jfloatArray basebandCn0Array = env->NewFloatArray(listSize); + + jint* svidWithFlags = env->GetIntArrayElements(svidWithFlagArray, 0); + jfloat* cn0s = env->GetFloatArrayElements(cn0Array, 0); + jfloat* elev = env->GetFloatArrayElements(elevArray, 0); + jfloat* azim = env->GetFloatArrayElements(azimArray, 0); + jfloat* carrierFreq = env->GetFloatArrayElements(carrierFreqArray, 0); + jfloat* basebandCn0s = env->GetFloatArrayElements(basebandCn0Array, 0); + + /* + * Read GNSS SV info. + */ + for (size_t i = 0; i < listSize; ++i) { + enum ShiftWidth : uint8_t { SVID_SHIFT_WIDTH = 12, CONSTELLATION_TYPE_SHIFT_WIDTH = 8 }; + + const T_sv_info& info = getGnssSvInfoOfIndex(svStatus, i); + svidWithFlags[i] = (info.svid << SVID_SHIFT_WIDTH) | + (getConstellationType(svStatus, i) << CONSTELLATION_TYPE_SHIFT_WIDTH) | + static_cast<uint32_t>(info.svFlag); + cn0s[i] = info.cN0Dbhz; + elev[i] = info.elevationDegrees; + azim[i] = info.azimuthDegrees; + carrierFreq[i] = info.carrierFrequencyHz; + svidWithFlags[i] |= getHasBasebandCn0DbHzFlag(svStatus); + basebandCn0s[i] = getBasebandCn0DbHz(svStatus, i); + } + + env->ReleaseIntArrayElements(svidWithFlagArray, svidWithFlags, 0); + env->ReleaseFloatArrayElements(cn0Array, cn0s, 0); + env->ReleaseFloatArrayElements(elevArray, elev, 0); + env->ReleaseFloatArrayElements(azimArray, azim, 0); + env->ReleaseFloatArrayElements(carrierFreqArray, carrierFreq, 0); + env->ReleaseFloatArrayElements(basebandCn0Array, basebandCn0s, 0); + + env->CallVoidMethod(mCallbacksObj, method_reportSvStatus, static_cast<jint>(listSize), + svidWithFlagArray, cn0Array, elevArray, azimArray, carrierFreqArray, + basebandCn0Array); + + env->DeleteLocalRef(svidWithFlagArray); + env->DeleteLocalRef(cn0Array); + env->DeleteLocalRef(elevArray); + env->DeleteLocalRef(azimArray); + env->DeleteLocalRef(carrierFreqArray); + env->DeleteLocalRef(basebandCn0Array); + + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssNmeaCb(int64_t timestamp, + const ::android::hardware::hidl_string& nmea) { + // In HIDL, if no listener is registered, do not report nmea to the framework. + if (!isNmeaRegistered) { + return Void(); + } + JNIEnv* env = getJniEnv(); + /* + * The Java code will call back to read these values. + * We do this to avoid creating unnecessary String objects. + */ + sNmeaString = nmea.c_str(); + sNmeaStringLength = nmea.size(); + + env->CallVoidMethod(mCallbacksObj, method_reportNmea, timestamp); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssSetCapabilitesCb(uint32_t capabilities) { + ALOGD("%s: %du\n", __func__, capabilities); + + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_setTopHalCapabilities, capabilities); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssSetCapabilitiesCb_2_0(uint32_t capabilities) { + return GnssCallbackHidl::gnssSetCapabilitesCb(capabilities); +} + +Return<void> GnssCallbackHidl::gnssSetCapabilitiesCb_2_1(uint32_t capabilities) { + return GnssCallbackHidl::gnssSetCapabilitesCb(capabilities); +} + +Return<void> GnssCallbackHidl::gnssAcquireWakelockCb() { + acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssReleaseWakelockCb() { + release_wake_lock(WAKE_LOCK_NAME); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssRequestTimeCb() { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_requestUtcTime); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssRequestLocationCb(const bool independentFromGnss) { + return GnssCallbackHidl::gnssRequestLocationCb_2_0(independentFromGnss, /* isUserEmergency= */ + false); +} + +Return<void> GnssCallbackHidl::gnssRequestLocationCb_2_0(const bool independentFromGnss, + const bool isUserEmergency) { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_requestLocation, boolToJbool(independentFromGnss), + boolToJbool(isUserEmergency)); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +Return<void> GnssCallbackHidl::gnssSetSystemInfoCb(const IGnssCallback_V2_0::GnssSystemInfo& info) { + ALOGD("%s: yearOfHw=%d\n", __func__, info.yearOfHw); + + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_setGnssYearOfHardware, info.yearOfHw); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +} // namespace android::gnss
\ No newline at end of file diff --git a/services/core/jni/gnss/GnssCallback.h b/services/core/jni/gnss/GnssCallback.h new file mode 100644 index 000000000000..a7f96fb0f5c7 --- /dev/null +++ b/services/core/jni/gnss/GnssCallback.h @@ -0,0 +1,183 @@ +/* + * 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. + */ + +#ifndef _ANDROID_SERVER_GNSS_GNSSCALLBACK_H +#define _ANDROID_SERVER_GNSS_GNSSCALLBACK_H + +#pragma once + +#ifndef LOG_TAG +#error LOG_TAG must be defined before including this file. +#endif + +#include <android/hardware/gnss/2.1/IGnss.h> +#include <android/hardware/gnss/BnGnssCallback.h> +#include <log/log.h> + +#include <vector> + +#include "Utils.h" +#include "jni.h" + +namespace android::gnss { + +namespace { + +extern jmethodID method_reportLocation; +extern jmethodID method_reportStatus; +extern jmethodID method_reportSvStatus; +extern jmethodID method_reportNmea; +extern jmethodID method_setTopHalCapabilities; +extern jmethodID method_setGnssYearOfHardware; +extern jmethodID method_setGnssHardwareModelName; +extern jmethodID method_requestLocation; +extern jmethodID method_requestUtcTime; + +} // anonymous namespace + +extern bool isSvStatusRegistered; +extern bool isNmeaRegistered; + +extern jmethodID method_reportGnssServiceDied; + +void Gnss_class_init_once(JNIEnv* env, jclass& clazz); + +/* + * GnssCallbackAidl class implements the callback methods for AIDL IGnssCallback interface. + */ +class GnssCallbackAidl : public hardware::gnss::BnGnssCallback { +public: + binder::Status gnssSetCapabilitiesCb(const int capabilities) override; + binder::Status gnssStatusCb(const GnssStatusValue status) override; + binder::Status gnssSvStatusCb(const std::vector<GnssSvInfo>& svInfoList) override; + binder::Status gnssLocationCb(const hardware::gnss::GnssLocation& location) override; + binder::Status gnssNmeaCb(const int64_t timestamp, const std::string& nmea) override; + binder::Status gnssAcquireWakelockCb() override; + binder::Status gnssReleaseWakelockCb() override; + binder::Status gnssSetSystemInfoCb(const GnssSystemInfo& info) override; + binder::Status gnssRequestTimeCb() override; + binder::Status gnssRequestLocationCb(const bool independentFromGnss, + const bool isUserEmergency) override; +}; + +/* + * GnssCallbackHidl class implements the callback methods for HIDL IGnssCallback interface. + */ +struct GnssCallbackHidl : public hardware::gnss::V2_1::IGnssCallback { + hardware::Return<void> gnssLocationCb( + const hardware::gnss::V1_0::GnssLocation& location) override; + hardware::Return<void> gnssStatusCb( + const hardware::gnss::V1_0::IGnssCallback::GnssStatusValue status) override; + hardware::Return<void> gnssSvStatusCb( + const hardware::gnss::V1_0::IGnssCallback::GnssSvStatus& svStatus) override { + return gnssSvStatusCbImpl<hardware::gnss::V1_0::IGnssCallback::GnssSvStatus, + hardware::gnss::V1_0::IGnssCallback::GnssSvInfo>(svStatus); + } + hardware::Return<void> gnssNmeaCb(int64_t timestamp, + const hardware::hidl_string& nmea) override; + hardware::Return<void> gnssSetCapabilitesCb(uint32_t capabilities) override; + hardware::Return<void> gnssAcquireWakelockCb() override; + hardware::Return<void> gnssReleaseWakelockCb() override; + hardware::Return<void> gnssRequestTimeCb() override; + hardware::Return<void> gnssRequestLocationCb(const bool independentFromGnss) override; + + hardware::Return<void> gnssSetSystemInfoCb( + const hardware::gnss::V1_0::IGnssCallback::GnssSystemInfo& info) override; + + // New in 1.1 + hardware::Return<void> gnssNameCb(const hardware::hidl_string& name) override; + + // New in 2.0 + hardware::Return<void> gnssRequestLocationCb_2_0(const bool independentFromGnss, + const bool isUserEmergency) override; + hardware::Return<void> gnssSetCapabilitiesCb_2_0(uint32_t capabilities) override; + hardware::Return<void> gnssLocationCb_2_0( + const hardware::gnss::V2_0::GnssLocation& location) override; + hardware::Return<void> gnssSvStatusCb_2_0( + const hardware::hidl_vec<hardware::gnss::V2_0::IGnssCallback::GnssSvInfo>& svInfoList) + override { + return gnssSvStatusCbImpl< + hardware::hidl_vec<hardware::gnss::V2_0::IGnssCallback::GnssSvInfo>, + hardware::gnss::V1_0::IGnssCallback::GnssSvInfo>(svInfoList); + } + + // New in 2.1 + hardware::Return<void> gnssSvStatusCb_2_1( + const hardware::hidl_vec<hardware::gnss::V2_1::IGnssCallback::GnssSvInfo>& svInfoList) + override { + return gnssSvStatusCbImpl< + hardware::hidl_vec<hardware::gnss::V2_1::IGnssCallback::GnssSvInfo>, + hardware::gnss::V1_0::IGnssCallback::GnssSvInfo>(svInfoList); + } + hardware::Return<void> gnssSetCapabilitiesCb_2_1(uint32_t capabilities) override; + + // TODO: Reconsider allocation cost vs threadsafety on these statics + static const char* sNmeaString; + static size_t sNmeaStringLength; + + template <class T> + static hardware::Return<void> gnssLocationCbImpl(const T& location); + + template <class T_list, class T_sv_info> + static hardware::Return<void> gnssSvStatusCbImpl(const T_list& svStatus); + +private: + template <class T> + static uint32_t getHasBasebandCn0DbHzFlag(const T& svStatus) { + return 0; + } + + template <class T> + static double getBasebandCn0DbHz(const T& svStatus, size_t i) { + return 0.0; + } + + template <class T> + static uint32_t getGnssSvInfoListSize(const T& svInfoList) { + return svInfoList.size(); + } + + static const hardware::gnss::IGnssCallback::GnssSvInfo& getGnssSvInfoOfIndex( + const std::vector<hardware::gnss::IGnssCallback::GnssSvInfo>& svInfoList, size_t i) { + return svInfoList[i]; + } + + static const hardware::gnss::V1_0::IGnssCallback::GnssSvInfo& getGnssSvInfoOfIndex( + const hardware::gnss::V1_0::IGnssCallback::GnssSvStatus& svStatus, size_t i) { + return svStatus.gnssSvList.data()[i]; + } + + static const hardware::gnss::V1_0::IGnssCallback::GnssSvInfo& getGnssSvInfoOfIndex( + const hardware::hidl_vec<hardware::gnss::V2_0::IGnssCallback::GnssSvInfo>& svInfoList, + size_t i) { + return svInfoList[i].v1_0; + } + + static const hardware::gnss::V1_0::IGnssCallback::GnssSvInfo& getGnssSvInfoOfIndex( + const hardware::hidl_vec<hardware::gnss::V2_1::IGnssCallback::GnssSvInfo>& svInfoList, + size_t i) { + return svInfoList[i].v2_0.v1_0; + } + + template <class T> + static uint32_t getConstellationType(const T& svInfoList, size_t i) { + return static_cast<uint32_t>(svInfoList[i].constellation); + } +}; + +} // namespace android::gnss + +#endif // _ANDROID_SERVER_GNSS_GNSSCALLBACK_H
\ No newline at end of file diff --git a/services/core/jni/gnss/GnssDebug.cpp b/services/core/jni/gnss/GnssDebug.cpp index da5331760e5c..263a6c635f28 100644 --- a/services/core/jni/gnss/GnssDebug.cpp +++ b/services/core/jni/gnss/GnssDebug.cpp @@ -104,4 +104,10 @@ const android::hardware::gnss::IGnssDebug::SatelliteData& GnssDebugUtil::getSate return satelliteDataArray[i]; } +template <> +int64_t GnssDebugUtil::getTimeEstimateMs( + const android::hardware::gnss::IGnssDebug::DebugData& data) { + return data.time.timeEstimateMs; +} + } // namespace android::gnss diff --git a/services/core/jni/gnss/GnssDebug.h b/services/core/jni/gnss/GnssDebug.h index 1e1a7b4c1abd..e02c2ac838e7 100644 --- a/services/core/jni/gnss/GnssDebug.h +++ b/services/core/jni/gnss/GnssDebug.h @@ -113,12 +113,6 @@ int64_t GnssDebugUtil::getTimeEstimateMs(const T& data) { return data.time.timeEstimate; } -template <> -int64_t GnssDebugUtil::getTimeEstimateMs( - const android::hardware::gnss::IGnssDebug::DebugData& data) { - return data.time.timeEstimateMs; -} - template <class T_DebugData, class T_SatelliteData> jstring GnssDebugUtil::parseDebugData(JNIEnv* env, std::stringstream& internalState, const T_DebugData& data) { diff --git a/services/core/jni/gnss/GnssPsds.cpp b/services/core/jni/gnss/GnssPsds.cpp new file mode 100644 index 000000000000..51a1450c0303 --- /dev/null +++ b/services/core/jni/gnss/GnssPsds.cpp @@ -0,0 +1,73 @@ +/* + * 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. + */ + +// Define LOG_TAG before <log/log.h> to overwrite the default value. +#define LOG_TAG "GnssPsdsJni" + +#include "GnssPsds.h" + +#include "Utils.h" + +using android::hardware::hidl_bitfield; +using android::hardware::gnss::PsdsType; +using IGnssPsdsAidl = android::hardware::gnss::IGnssPsds; +using IGnssPsdsHidl = android::hardware::gnss::V1_0::IGnssXtra; + +namespace android::gnss { + +// Implementation of GnssPsds (AIDL HAL) + +GnssPsdsAidl::GnssPsdsAidl(const sp<IGnssPsdsAidl>& iGnssPsds) : mIGnssPsds(iGnssPsds) { + assert(mIGnssPsds != nullptr); +} + +jboolean GnssPsdsAidl::setCallback(const std::unique_ptr<GnssPsdsCallback>& callback) { + auto status = mIGnssPsds->setCallback(callback->getAidl()); + return checkAidlStatus(status, "IGnssPsdsAidl setCallback() failed."); +} + +void GnssPsdsAidl::injectPsdsData(const jbyteArray& data, const jint& length, + const jint& psdsType) { + JNIEnv* env = getJniEnv(); + jbyte* bytes = reinterpret_cast<jbyte*>(env->GetPrimitiveArrayCritical(data, 0)); + auto status = mIGnssPsds->injectPsdsData(static_cast<PsdsType>(psdsType), + std::vector<uint8_t>((const uint8_t*)bytes, + (const uint8_t*)bytes + length)); + checkAidlStatus(status, "IGnssPsdsAidl injectPsdsData() failed."); + env->ReleasePrimitiveArrayCritical(data, bytes, JNI_ABORT); +} + +// Implementation of GnssPsdsHidl + +GnssPsdsHidl::GnssPsdsHidl(const sp<android::hardware::gnss::V1_0::IGnssXtra>& iGnssXtra) + : mIGnssXtra(iGnssXtra) { + assert(mIGnssXtra != nullptr); +} + +jboolean GnssPsdsHidl::setCallback(const std::unique_ptr<GnssPsdsCallback>& callback) { + auto result = mIGnssXtra->setCallback(callback->getHidl()); + return checkHidlReturn(result, "IGnssPsdsHidl setCallback() failed."); +} + +void GnssPsdsHidl::injectPsdsData(const jbyteArray& data, const jint& length, const jint&) { + JNIEnv* env = getJniEnv(); + jbyte* bytes = reinterpret_cast<jbyte*>(env->GetPrimitiveArrayCritical(data, 0)); + auto result = mIGnssXtra->injectXtraData(std::string((const char*)bytes, length)); + checkHidlReturn(result, "IGnssXtra injectXtraData() failed."); + env->ReleasePrimitiveArrayCritical(data, bytes, JNI_ABORT); +} + +} // namespace android::gnss diff --git a/services/core/jni/gnss/GnssPsds.h b/services/core/jni/gnss/GnssPsds.h new file mode 100644 index 000000000000..6b65ee8614f8 --- /dev/null +++ b/services/core/jni/gnss/GnssPsds.h @@ -0,0 +1,64 @@ +/* + * 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. + */ + +#ifndef _ANDROID_SERVER_GNSS_GNSSPSDS_H +#define _ANDROID_SERVER_GNSS_GNSSPSDS_H + +#pragma once + +#ifndef LOG_TAG +#error LOG_TAG must be defined before including this file. +#endif + +#include <android/hardware/gnss/1.0/IGnssXtra.h> +#include <android/hardware/gnss/BnGnssPsds.h> +#include <log/log.h> + +#include "GnssPsdsCallback.h" +#include "jni.h" + +namespace android::gnss { + +class GnssPsdsInterface { +public: + virtual ~GnssPsdsInterface() {} + virtual jboolean setCallback(const std::unique_ptr<GnssPsdsCallback>& callback); + virtual void injectPsdsData(const jbyteArray& data, const jint& length, const jint& psdsType); +}; + +class GnssPsdsAidl : public GnssPsdsInterface { +public: + GnssPsdsAidl(const sp<android::hardware::gnss::IGnssPsds>& iGnssPsds); + jboolean setCallback(const std::unique_ptr<GnssPsdsCallback>& callback) override; + void injectPsdsData(const jbyteArray& data, const jint& length, const jint& psdsType) override; + +private: + const sp<android::hardware::gnss::IGnssPsds> mIGnssPsds; +}; + +class GnssPsdsHidl : public GnssPsdsInterface { +public: + GnssPsdsHidl(const sp<android::hardware::gnss::V1_0::IGnssXtra>& iGnssXtra); + jboolean setCallback(const std::unique_ptr<GnssPsdsCallback>& callback) override; + void injectPsdsData(const jbyteArray& data, const jint& length, const jint& psdsType) override; + +private: + const sp<android::hardware::gnss::V1_0::IGnssXtra> mIGnssXtra; +}; + +} // namespace android::gnss + +#endif // _ANDROID_SERVER_GNSS_GNSSPSDS_H diff --git a/services/core/jni/gnss/GnssPsdsCallback.cpp b/services/core/jni/gnss/GnssPsdsCallback.cpp new file mode 100644 index 000000000000..1dd7022c66ee --- /dev/null +++ b/services/core/jni/gnss/GnssPsdsCallback.cpp @@ -0,0 +1,59 @@ +/* + * 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. + */ + +#define LOG_TAG "GnssPsdsCbJni" + +#include "GnssPsdsCallback.h" + +#include <vector> + +#include "Utils.h" + +namespace android::gnss { + +namespace { +jmethodID method_psdsDownloadRequest; +} // anonymous namespace + +using binder::Status; +using hardware::Return; +using hardware::Void; +using hardware::gnss::PsdsType; + +void GnssPsds_class_init_once(JNIEnv* env, jclass clazz) { + method_psdsDownloadRequest = env->GetMethodID(clazz, "psdsDownloadRequest", "(I)V"); +} + +// Implementation of android::hardware::gnss::IGnssPsdsCallback + +Status GnssPsdsCallbackAidl::downloadRequestCb(PsdsType psdsType) { + ALOGD("%s. psdsType: %d", __func__, static_cast<int32_t>(psdsType)); + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_psdsDownloadRequest, psdsType); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Status::ok(); +} + +// Implementation of android::hardware::gnss::V1_0::IGnssPsdsCallback + +Return<void> GnssPsdsCallbackHidl::downloadRequestCb() { + JNIEnv* env = getJniEnv(); + env->CallVoidMethod(mCallbacksObj, method_psdsDownloadRequest, /* psdsType= */ 1); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return Void(); +} + +} // namespace android::gnss diff --git a/services/core/jni/gnss/GnssPsdsCallback.h b/services/core/jni/gnss/GnssPsdsCallback.h new file mode 100644 index 000000000000..3ac7473c42a9 --- /dev/null +++ b/services/core/jni/gnss/GnssPsdsCallback.h @@ -0,0 +1,76 @@ +/* + * 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. + */ + +#ifndef _ANDROID_SERVER_GNSS_GNSSPSDSCALLBACK_H +#define _ANDROID_SERVER_GNSS_GNSSPSDSCALLBACK_H + +#pragma once + +#ifndef LOG_TAG +#error LOG_TAG must be defined before including this file. +#endif + +#include <android/hardware/gnss/1.0/IGnssXtraCallback.h> +#include <android/hardware/gnss/BnGnssPsdsCallback.h> +#include <log/log.h> + +#include "jni.h" + +namespace android::gnss { + +namespace { +extern jmethodID method_psdsDownloadRequest; +} // anonymous namespace + +void GnssPsds_class_init_once(JNIEnv* env, jclass clazz); + +class GnssPsdsCallbackAidl : public hardware::gnss::BnGnssPsdsCallback { +public: + GnssPsdsCallbackAidl() {} + binder::Status downloadRequestCb(hardware::gnss::PsdsType psdsType) override; +}; + +class GnssPsdsCallbackHidl : public hardware::gnss::V1_0::IGnssXtraCallback { +public: + GnssPsdsCallbackHidl() {} + hardware::Return<void> downloadRequestCb() override; +}; + +class GnssPsdsCallback { +public: + GnssPsdsCallback() {} + sp<GnssPsdsCallbackAidl> getAidl() { + if (callbackAidl == nullptr) { + callbackAidl = sp<GnssPsdsCallbackAidl>::make(); + } + return callbackAidl; + } + + sp<GnssPsdsCallbackHidl> getHidl() { + if (callbackHidl == nullptr) { + callbackHidl = sp<GnssPsdsCallbackHidl>::make(); + } + return callbackHidl; + } + +private: + sp<GnssPsdsCallbackAidl> callbackAidl; + sp<GnssPsdsCallbackHidl> callbackHidl; +}; + +} // namespace android::gnss + +#endif // _ANDROID_SERVER_GNSS_GNSSPSDSCALLBACK_H
\ No newline at end of file diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index edef6d2d15c0..a70fd6508209 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -45,7 +45,8 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING; import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_DEFAULT; import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED; import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER; -import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_ID; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_IDS; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_DRAWABLE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_STRING; import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO; @@ -18692,10 +18693,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { sendResourceUpdatedBroadcast(EXTRA_RESOURCE_TYPE_STRING, stringIds); } - private void sendResourceUpdatedBroadcast(String resourceType, String[] resourceIds) { + private void sendResourceUpdatedBroadcast(int resourceType, String[] resourceIds) { final Intent intent = new Intent(ACTION_DEVICE_POLICY_RESOURCE_UPDATED); - intent.putExtra(EXTRA_RESOURCE_ID, resourceIds); - intent.putExtra(resourceType, /* value= */ true); + intent.putExtra(EXTRA_RESOURCE_IDS, resourceIds); + intent.putExtra(EXTRA_RESOURCE_TYPE, resourceType); intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index e895d377f607..5098abe4bb55 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -386,8 +386,8 @@ public final class SystemServer implements Dumpable { "com.android.server.DeviceIdleController"; private static final String BLOB_STORE_MANAGER_SERVICE_CLASS = "com.android.server.blob.BlobStoreManagerService"; - private static final String APP_SEARCH_MANAGER_SERVICE_CLASS = - "com.android.server.appsearch.AppSearchManagerService"; + private static final String APPSEARCH_MODULE_LIFECYCLE_CLASS = + "com.android.server.appsearch.AppSearchModule$Lifecycle"; private static final String ISOLATED_COMPILATION_SERVICE_CLASS = "com.android.server.compos.IsolatedCompilationService"; private static final String ROLLBACK_MANAGER_SERVICE_CLASS = @@ -2764,8 +2764,8 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(SAFETY_CENTER_SERVICE_CLASS); t.traceEnd(); - t.traceBegin("AppSearchManagerService"); - mSystemServiceManager.startService(APP_SEARCH_MANAGER_SERVICE_CLASS); + t.traceBegin("AppSearchModule"); + mSystemServiceManager.startService(APPSEARCH_MODULE_LIFECYCLE_CLASS); t.traceEnd(); if (SystemProperties.getBoolean("ro.config.isolated_compilation_enabled", false)) { diff --git a/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java b/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java index 4e4854c6688d..d8f409dfce66 100644 --- a/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java @@ -213,7 +213,7 @@ public class LocationProviderManagerTest { public void testProperties() { assertThat(mManager.getName()).isEqualTo(NAME); assertThat(mManager.getProperties()).isEqualTo(PROPERTIES); - assertThat(mManager.getIdentity()).isEqualTo(IDENTITY); + assertThat(mManager.getProviderIdentity()).isEqualTo(IDENTITY); assertThat(mManager.hasProvider()).isTrue(); ProviderProperties newProperties = new ProviderProperties.Builder() @@ -230,7 +230,7 @@ public class LocationProviderManagerTest { CallerIdentity newIdentity = CallerIdentity.forTest(OTHER_USER, 1, "otherpackage", "otherattribution"); mProvider.setIdentity(newIdentity); - assertThat(mManager.getIdentity()).isEqualTo(newIdentity); + assertThat(mManager.getProviderIdentity()).isEqualTo(newIdentity); mManager.setRealProvider(null); assertThat(mManager.hasProvider()).isFalse(); diff --git a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleBinaryParserTest.java b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleBinaryParserTest.java index ab21ab05ab5f..03363a100841 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleBinaryParserTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleBinaryParserTest.java @@ -71,9 +71,11 @@ public class RuleBinaryParserTest { private static final String PACKAGE_NAME = getBits(AtomicFormula.PACKAGE_NAME, KEY_BITS); private static final String APP_CERTIFICATE = getBits(AtomicFormula.APP_CERTIFICATE, KEY_BITS); + private static final String APP_CERTIFICATE_LINEAGE = + getBits(AtomicFormula.APP_CERTIFICATE_LINEAGE, KEY_BITS); private static final String VERSION_CODE = getBits(AtomicFormula.VERSION_CODE, KEY_BITS); private static final String PRE_INSTALLED = getBits(AtomicFormula.PRE_INSTALLED, KEY_BITS); - private static final int INVALID_KEY_VALUE = 8; + private static final int INVALID_KEY_VALUE = 9; private static final String INVALID_KEY = getBits(INVALID_KEY_VALUE, KEY_BITS); private static final String EQ = getBits(AtomicFormula.EQ, OPERATOR_BITS); @@ -337,6 +339,40 @@ public class RuleBinaryParserTest { } @Test + public void testBinaryString_validAtomicFormulaWithCertificateLineage() throws Exception { + String appCertificate = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; + String ruleBits = + START_BIT + + ATOMIC_FORMULA_START_BITS + + APP_CERTIFICATE_LINEAGE + + EQ + + IS_HASHED + + getBits(appCertificate.length(), VALUE_SIZE_BITS) + + getValueBits(appCertificate) + + DENY + + END_BIT; + byte[] ruleBytes = getBytes(ruleBits); + ByteBuffer rule = + ByteBuffer.allocate(DEFAULT_FORMAT_VERSION_BYTES.length + ruleBytes.length); + rule.put(DEFAULT_FORMAT_VERSION_BYTES); + rule.put(ruleBytes); + + RuleParser binaryParser = new RuleBinaryParser(); + Rule expectedRule = + new Rule( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.APP_CERTIFICATE_LINEAGE, + IntegrityUtils.getHexDigest( + appCertificate.getBytes(StandardCharsets.UTF_8)), + /* isHashedValue= */ true), + Rule.DENY); + + List<Rule> rules = binaryParser.parse(rule.array()); + + assertThat(rules).isEqualTo(Collections.singletonList(expectedRule)); + } + + @Test public void testBinaryString_validAtomicFormula_integerValue_noIndexing() throws Exception { int versionCode = 1; String ruleBits = diff --git a/services/tests/servicestests/src/com/android/server/locales/LocaleManagerBackupRestoreTest.java b/services/tests/servicestests/src/com/android/server/locales/LocaleManagerBackupRestoreTest.java index c77100045118..0287510041be 100644 --- a/services/tests/servicestests/src/com/android/server/locales/LocaleManagerBackupRestoreTest.java +++ b/services/tests/servicestests/src/com/android/server/locales/LocaleManagerBackupRestoreTest.java @@ -41,7 +41,9 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.os.Binder; +import android.os.HandlerThread; import android.os.LocaleList; +import android.os.Process; import android.os.RemoteException; import android.os.SimpleClock; import android.util.SparseArray; @@ -78,6 +80,7 @@ import java.util.Map; */ @RunWith(AndroidJUnit4.class) public class LocaleManagerBackupRestoreTest { + private static final String TAG = "LocaleManagerBackupRestoreTest"; private static final String DEFAULT_PACKAGE_NAME = "com.android.myapp"; private static final String DEFAULT_LOCALE_TAGS = "en-XC,ar-XB"; private static final String TEST_LOCALES_XML_TAG = "locales"; @@ -131,12 +134,17 @@ public class LocaleManagerBackupRestoreTest { doReturn(mMockPackageManager).when(mMockContext).getPackageManager(); + HandlerThread broadcastHandlerThread = new HandlerThread(TAG, + Process.THREAD_PRIORITY_BACKGROUND); + broadcastHandlerThread.start(); + mBackupHelper = spy(new ShadowLocaleManagerBackupHelper(mMockContext, - mMockLocaleManagerService, mMockPackageManagerInternal, mClock, STAGE_DATA)); + mMockLocaleManagerService, mMockPackageManagerInternal, mClock, STAGE_DATA, + broadcastHandlerThread)); doNothing().when(mBackupHelper).notifyBackupManager(); mUserMonitor = mBackupHelper.getUserMonitor(); - mPackageMonitor = mBackupHelper.getPackageMonitor(); + mPackageMonitor = new LocaleManagerServicePackageMonitor(mBackupHelper); setCurrentTimeMillis(DEFAULT_CREATION_TIME_MILLIS); } diff --git a/services/tests/servicestests/src/com/android/server/locales/LocaleManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/locales/LocaleManagerServiceTest.java index ca5b0cb1112f..0b3ef4542cbf 100644 --- a/services/tests/servicestests/src/com/android/server/locales/LocaleManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/locales/LocaleManagerServiceTest.java @@ -46,6 +46,7 @@ import android.os.LocaleList; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.android.internal.content.PackageMonitor; import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal.PackageConfig; @@ -86,6 +87,8 @@ public class LocaleManagerServiceTest { private ActivityTaskManagerInternal mMockActivityTaskManager; @Mock private ActivityManagerInternal mMockActivityManager; + @Mock + PackageMonitor mMockPackageMonitor; @Before public void setUp() throws Exception { @@ -93,6 +96,7 @@ public class LocaleManagerServiceTest { mMockActivityTaskManager = mock(ActivityTaskManagerInternal.class); mMockActivityManager = mock(ActivityManagerInternal.class); mMockPackageManagerInternal = mock(PackageManagerInternal.class); + mMockPackageMonitor = mock(PackageMonitor.class); // For unit tests, set the default installer info PackageManager mockPackageManager = mock(PackageManager.class); @@ -113,7 +117,8 @@ public class LocaleManagerServiceTest { mMockBackupHelper = mock(ShadowLocaleManagerBackupHelper.class); mLocaleManagerService = new LocaleManagerService(mMockContext, mMockActivityTaskManager, - mMockActivityManager, mMockPackageManagerInternal, mMockBackupHelper); + mMockActivityManager, mMockPackageManagerInternal, + mMockBackupHelper, mMockPackageMonitor); } @Test(expected = SecurityException.class) diff --git a/services/tests/servicestests/src/com/android/server/locales/ShadowLocaleManagerBackupHelper.java b/services/tests/servicestests/src/com/android/server/locales/ShadowLocaleManagerBackupHelper.java index b0fc6363b701..ad9be0d5fe8d 100644 --- a/services/tests/servicestests/src/com/android/server/locales/ShadowLocaleManagerBackupHelper.java +++ b/services/tests/servicestests/src/com/android/server/locales/ShadowLocaleManagerBackupHelper.java @@ -18,6 +18,7 @@ package com.android.server.locales; import android.content.Context; import android.content.pm.PackageManagerInternal; +import android.os.HandlerThread; import android.util.SparseArray; import java.time.Clock; @@ -31,7 +32,8 @@ public class ShadowLocaleManagerBackupHelper extends LocaleManagerBackupHelper { ShadowLocaleManagerBackupHelper(Context context, LocaleManagerService localeManagerService, PackageManagerInternal pmInternal, Clock clock, - SparseArray<LocaleManagerBackupHelper.StagedData> stagedData) { - super(context, localeManagerService, pmInternal, clock, stagedData); + SparseArray<LocaleManagerBackupHelper.StagedData> stagedData, + HandlerThread broadcastHandlerThread) { + super(context, localeManagerService, pmInternal, clock, stagedData, broadcastHandlerThread); } } diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java index 5d3da43c5327..c7a903be3bd2 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -489,6 +489,20 @@ public class ApexManagerTest { assertThat(e).hasMessageThat().contains("Failed to collect certificates from "); } + @Test + public void testGetActivePackageNameForApexModuleName() throws Exception { + final String moduleName = "com.android.module_name"; + + ApexInfo[] apexInfo = createApexInfoForTestPkg(true, false); + apexInfo[0].moduleName = moduleName; + when(mApexService.getAllPackages()).thenReturn(apexInfo); + mApexManager.scanApexPackagesTraced(mPackageParser2, + ParallelPackageParser.makeExecutorService()); + + assertThat(mApexManager.getActivePackageNameForApexModuleName(moduleName)) + .isEqualTo(TEST_APEX_PKG); + } + private ApexInfo createApexInfoForTestPkg(boolean isActive, boolean isFactory, int version) { File apexFile = extractResource(TEST_APEX_PKG, TEST_APEX_FILE_NAME); ApexInfo apexInfo = new ApexInfo(); diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java index 01e306e744fb..3d24a814c7cd 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java @@ -113,6 +113,9 @@ public class VibrationThreadTest { private TestLooper mTestLooper; private TestLooperAutoDispatcher mCustomTestLooperDispatcher; + // Setup from the providers when VibrationThread is initialized. + private SparseArray<VibratorController> mControllers; + @Before public void setUp() throws Exception { mTestLooper = new TestLooper(); @@ -178,7 +181,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(10)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -197,7 +200,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(10)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -219,7 +222,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(15)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -243,7 +246,7 @@ public class VibrationThreadTest { thread, TEST_TIMEOUT_MILLIS)); // Vibration still running after 2 cycles. assertTrue(thread.isAlive()); - assertTrue(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertTrue(mControllers.get(VIBRATOR_ID).isVibrating()); thread.cancel(); waitForCompletion(thread); @@ -251,7 +254,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOn(eq(UID), anyLong()); verify(mManagerHooks).noteVibratorOff(eq(UID)); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); List<Float> playedAmplitudes = fakeVibrator.getAmplitudes(); assertFalse(fakeVibrator.getEffectSegments().isEmpty()); @@ -280,7 +283,7 @@ public class VibrationThreadTest { waitForCompletion(thread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(1000)), fakeVibrator.getEffectSegments()); } @@ -302,7 +305,7 @@ public class VibrationThreadTest { waitForCompletion(thread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(5550)), fakeVibrator.getEffectSegments()); } @@ -325,7 +328,7 @@ public class VibrationThreadTest { waitForCompletion(thread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(2, fakeVibrator.getEffectSegments().size()); // First time turn vibrator ON for minimum of 1s. assertEquals(1000L, fakeVibrator.getEffectSegments().get(0).getDuration()); @@ -350,7 +353,7 @@ public class VibrationThreadTest { .compose(); VibrationThread vibrationThread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(VIBRATOR_ID).isVibrating(), vibrationThread, + assertTrue(waitUntil(t -> mControllers.get(VIBRATOR_ID).isVibrating(), vibrationThread, TEST_TIMEOUT_MILLIS)); assertTrue(vibrationThread.isAlive()); @@ -363,7 +366,7 @@ public class VibrationThreadTest { waitForCompletion(cancellingThread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(vibrationThread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); } @Test @@ -375,7 +378,7 @@ public class VibrationThreadTest { VibrationEffect effect = VibrationEffect.createWaveform(new long[]{100}, new int[]{100}, 0); VibrationThread vibrationThread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(VIBRATOR_ID).isVibrating(), vibrationThread, + assertTrue(waitUntil(t -> mControllers.get(VIBRATOR_ID).isVibrating(), vibrationThread, TEST_TIMEOUT_MILLIS)); assertTrue(vibrationThread.isAlive()); @@ -388,7 +391,7 @@ public class VibrationThreadTest { waitForCompletion(cancellingThread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(vibrationThread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); } @Test @@ -404,7 +407,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedPrebaked(VibrationEffect.EFFECT_THUD)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -427,7 +430,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(10)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -466,7 +469,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList( expectedPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 1, 0), expectedPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 0.5f, 0)), @@ -536,7 +539,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks, times(4)).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList( expectedOneShot(10), expectedPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 1, 0), @@ -573,7 +576,7 @@ public class VibrationThreadTest { verify(mManagerHooks).noteVibratorOff(eq(UID)); verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList( expectedRamp(/* amplitude= */ 1, /* frequencyHz= */ 150, /* duration= */ 10), expectedRamp(/* startAmplitude= */ 1, /* endAmplitude= */ 0, @@ -626,11 +629,11 @@ public class VibrationThreadTest { TEST_TIMEOUT_MILLIS)); // Vibration still running after 2 cycles. assertTrue(thread.isAlive()); - assertTrue(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertTrue(mControllers.get(VIBRATOR_ID).isVibrating()); thread.binderDied(); waitForCompletion(thread); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); } @@ -667,7 +670,7 @@ public class VibrationThreadTest { verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId)); verify(mControllerCallbacks, never()).onComplete(eq(2), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); assertEquals(Arrays.asList(expectedPrebaked(VibrationEffect.EFFECT_TICK)), mVibratorProviders.get(VIBRATOR_ID).getEffectSegments()); @@ -692,9 +695,9 @@ public class VibrationThreadTest { verify(mControllerCallbacks).onComplete(eq(2), eq(vibrationId)); verify(mControllerCallbacks).onComplete(eq(3), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(1).isVibrating()); - assertFalse(thread.getVibrators().get(2).isVibrating()); - assertFalse(thread.getVibrators().get(3).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); + assertFalse(mControllers.get(3).isVibrating()); VibrationEffectSegment expected = expectedPrebaked(VibrationEffect.EFFECT_CLICK); assertEquals(Arrays.asList(expected), mVibratorProviders.get(1).getEffectSegments()); @@ -731,10 +734,10 @@ public class VibrationThreadTest { verify(mControllerCallbacks).onComplete(eq(3), eq(vibrationId)); verify(mControllerCallbacks).onComplete(eq(4), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(1).isVibrating()); - assertFalse(thread.getVibrators().get(2).isVibrating()); - assertFalse(thread.getVibrators().get(3).isVibrating()); - assertFalse(thread.getVibrators().get(4).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); + assertFalse(mControllers.get(3).isVibrating()); + assertFalse(mControllers.get(4).isVibrating()); assertEquals(Arrays.asList(expectedPrebaked(VibrationEffect.EFFECT_CLICK)), mVibratorProviders.get(1).getEffectSegments()); @@ -782,9 +785,9 @@ public class VibrationThreadTest { batteryVerifier.verify(mManagerHooks).noteVibratorOff(eq(UID)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(1).isVibrating()); - assertFalse(thread.getVibrators().get(2).isVibrating()); - assertFalse(thread.getVibrators().get(3).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); + assertFalse(mControllers.get(3).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(10)), mVibratorProviders.get(1).getEffectSegments()); @@ -941,9 +944,9 @@ public class VibrationThreadTest { // All vibrators are turned on in parallel. assertTrue(waitUntil( - t -> t.getVibrators().get(1).isVibrating() - && t.getVibrators().get(2).isVibrating() - && t.getVibrators().get(3).isVibrating(), + t -> mControllers.get(1).isVibrating() + && mControllers.get(2).isVibrating() + && mControllers.get(3).isVibrating(), thread, TEST_TIMEOUT_MILLIS)); waitForCompletion(thread); @@ -954,9 +957,9 @@ public class VibrationThreadTest { verify(mControllerCallbacks).onComplete(eq(2), eq(vibrationId)); verify(mControllerCallbacks).onComplete(eq(3), eq(vibrationId)); verifyCallbacksTriggered(vibrationId, Vibration.Status.FINISHED); - assertFalse(thread.getVibrators().get(1).isVibrating()); - assertFalse(thread.getVibrators().get(2).isVibrating()); - assertFalse(thread.getVibrators().get(3).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); + assertFalse(mControllers.get(3).isVibrating()); assertEquals(Arrays.asList(expectedOneShot(25)), mVibratorProviders.get(1).getEffectSegments()); @@ -1031,7 +1034,7 @@ public class VibrationThreadTest { // After the vibrator call ends the vibration is cancelled and the vibrator is turned off. waitForCompletion(vibrationThread, /* timeout= */ latency + TEST_TIMEOUT_MILLIS); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(vibrationThread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); } @Test @@ -1051,7 +1054,7 @@ public class VibrationThreadTest { .combine(); VibrationThread vibrationThread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(2).isVibrating(), vibrationThread, + assertTrue(waitUntil(t -> mControllers.get(2).isVibrating(), vibrationThread, TEST_TIMEOUT_MILLIS)); assertTrue(vibrationThread.isAlive()); @@ -1064,8 +1067,8 @@ public class VibrationThreadTest { waitForCompletion(cancellingThread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(vibrationThread.getVibrators().get(1).isVibrating()); - assertFalse(vibrationThread.getVibrators().get(2).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); } @Test @@ -1082,8 +1085,8 @@ public class VibrationThreadTest { .combine(); VibrationThread vibrationThread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(1).isVibrating() - && t.getVibrators().get(2).isVibrating(), + assertTrue(waitUntil(t -> mControllers.get(1).isVibrating() + && mControllers.get(2).isVibrating(), vibrationThread, TEST_TIMEOUT_MILLIS)); assertTrue(vibrationThread.isAlive()); @@ -1096,8 +1099,8 @@ public class VibrationThreadTest { waitForCompletion(cancellingThread); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); - assertFalse(vibrationThread.getVibrators().get(1).isVibrating()); - assertFalse(vibrationThread.getVibrators().get(2).isVibrating()); + assertFalse(mControllers.get(1).isVibrating()); + assertFalse(mControllers.get(2).isVibrating()); } @Test @@ -1106,7 +1109,7 @@ public class VibrationThreadTest { VibrationEffect effect = VibrationEffect.createWaveform(new long[]{5}, new int[]{100}, 0); VibrationThread thread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(VIBRATOR_ID).isVibrating(), thread, + assertTrue(waitUntil(t -> mControllers.get(VIBRATOR_ID).isVibrating(), thread, TEST_TIMEOUT_MILLIS)); assertTrue(thread.isAlive()); @@ -1117,7 +1120,7 @@ public class VibrationThreadTest { verify(mVibrationToken).unlinkToDeath(same(thread), eq(0)); verifyCallbacksTriggered(vibrationId, Vibration.Status.CANCELLED); assertFalse(mVibratorProviders.get(VIBRATOR_ID).getEffectSegments().isEmpty()); - assertFalse(thread.getVibrators().get(VIBRATOR_ID).isVibrating()); + assertFalse(mControllers.get(VIBRATOR_ID).isVibrating()); } @Test @@ -1188,7 +1191,7 @@ public class VibrationThreadTest { long vibrationId = 1; VibrationEffect effect = VibrationEffect.createOneShot(10_000, 240); VibrationThread thread = startThreadAndDispatcher(vibrationId, effect); - assertTrue(waitUntil(t -> t.getVibrators().get(VIBRATOR_ID).isVibrating(), thread, + assertTrue(waitUntil(t -> mControllers.get(VIBRATOR_ID).isVibrating(), thread, TEST_TIMEOUT_MILLIS)); thread.cancel(); waitForCompletion(thread); @@ -1295,8 +1298,9 @@ public class VibrationThreadTest { } private VibrationThread startThreadAndDispatcher(Vibration vib) { + mControllers = createVibratorControllers(); VibrationThread thread = new VibrationThread(vib, mVibrationSettings, mEffectAdapter, - createVibratorControllers(), mWakeLock, mManagerHooks); + mControllers, mWakeLock, mManagerHooks); doAnswer(answer -> { thread.vibratorComplete(answer.getArgument(0)); return null; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java index bd7186e74354..a7d18eeba058 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java @@ -126,7 +126,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { when(file.getAbsolutePath()).thenReturn(String.valueOf(i)); AtomicFile af = new AtomicFile(file); expectedFiles.add(af); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } cal.add(Calendar.DATE, -1 * retainDays); @@ -136,7 +136,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { when(file.getName()).thenReturn(String.valueOf(cal.getTimeInMillis() - i)); when(file.getAbsolutePath()).thenReturn(String.valueOf(cal.getTimeInMillis() - i)); AtomicFile af = new AtomicFile(file); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } // back to today; trim everything a day + old @@ -162,7 +162,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { when(file.getName()).thenReturn(i + ".bak"); when(file.getAbsolutePath()).thenReturn(i + ".bak"); AtomicFile af = new AtomicFile(file); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } // trim everything a day+ old @@ -224,7 +224,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { public void testReadNotificationHistory_readsAllFiles() throws Exception { for (long i = 10; i >= 5; i--) { AtomicFile af = mock(AtomicFile.class); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } mDataBase.readNotificationHistory(); @@ -248,11 +248,11 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { public void testReadNotificationHistory_withNumFilterDoesNotReadExtraFiles() throws Exception { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); AtomicFile af2 = mock(AtomicFile.class); when(af2.getBaseFile()).thenReturn(new File(mRootDir, "af2")); - mDataBase.mHistoryFiles.addLast(af2); + mDataBase.mHistoryFiles.add(af2); mDataBase.readNotificationHistory(null, null, 0); @@ -269,7 +269,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeNotificationFromWrite("pkg", 123)).thenReturn(true); @@ -292,7 +292,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeNotificationFromWrite("pkg", 123)).thenReturn(false); @@ -315,7 +315,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeConversationsFromWrite("pkg", Set.of("convo", "another"))).thenReturn(true); @@ -338,7 +338,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeConversationsFromWrite("pkg", Set.of("convo"))).thenReturn(false); @@ -361,7 +361,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeChannelFromWrite("pkg", "channel")).thenReturn(true); @@ -384,7 +384,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); when(nh.removeChannelFromWrite("pkg", "channel")).thenReturn(false); @@ -424,7 +424,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { for (int i = 0; i < 5; i++) { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af" + i)); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } // Baseline size of history files assertThat(mDataBase.mHistoryFiles.size()).isEqualTo(5); @@ -440,7 +440,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { for (int i = 0; i < 5; i++) { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af" + i)); - mDataBase.mHistoryFiles.addLast(af); + mDataBase.mHistoryFiles.add(af); } // Baseline size of history files assertThat(mDataBase.mHistoryFiles.size()).isEqualTo(5); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 87abc53bfc5a..16c5bfec76ae 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -925,14 +925,10 @@ public class ActivityStarterTests extends WindowTestsBase { any(), anyBoolean(), anyBoolean(), eq(false)); } - private ActivityRecord createSingleTaskActivityOn(Task stack) { + private ActivityRecord createSingleTaskActivityOn(Task task) { final ComponentName componentName = ComponentName.createRelative( DEFAULT_COMPONENT_PACKAGE_NAME, DEFAULT_COMPONENT_PACKAGE_NAME + ".SingleTaskActivity"); - final Task task = new TaskBuilder(mSupervisor) - .setComponent(componentName) - .setParentTaskFragment(stack) - .build(); return new ActivityBuilder(mAtm) .setComponent(componentName) .setLaunchMode(LAUNCH_SINGLE_TASK) diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java index 0d6794685f09..72521fd06245 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -120,7 +120,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { behind.setState(ActivityRecord.State.STARTED, "test"); behind.mVisibleRequested = true; - task.performClearTask("test"); + task.removeActivities("test", false /* excludingTaskOverlay */); assertFalse(mDisplayContent.mAppTransition.isReady()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java index cc1869e72b34..9fc9489e3c2e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java @@ -557,7 +557,7 @@ public class LockTaskControllerTest { mLockTaskController.updateLockTaskPackages(TEST_USER_ID, allowlist); // THEN the task running that package should be stopped - verify(tr2).performClearTaskLocked(); + verify(tr2).performClearTaskForReuse(false /* excludingTaskOverlay*/); assertFalse(mLockTaskController.isTaskLocked(tr2)); // THEN the other task should remain locked assertEquals(LOCK_TASK_MODE_LOCKED, mLockTaskController.getLockTaskModeState()); @@ -569,7 +569,7 @@ public class LockTaskControllerTest { mLockTaskController.updateLockTaskPackages(TEST_USER_ID, allowlist); // THEN the last task should be cleared, and the system should quit LockTask mode - verify(tr1).performClearTaskLocked(); + verify(tr1).performClearTaskForReuse(false /* excludingTaskOverlay*/); assertFalse(mLockTaskController.isTaskLocked(tr1)); assertEquals(LOCK_TASK_MODE_NONE, mLockTaskController.getLockTaskModeState()); verifyLockTaskStopped(times(1)); diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java index ba6510440747..acceadf8c499 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java @@ -938,7 +938,33 @@ public class RootWindowContainerTests extends WindowTestsBase { } @Test - public void testGetValidLaunchRootTaskOnDisplayWithCandidateRootTask() { + public void testGetLaunchRootTaskOnSecondaryTaskDisplayArea() { + // Adding another TaskDisplayArea to the default display. + final DisplayContent display = mRootWindowContainer.getDefaultDisplay(); + final TaskDisplayArea taskDisplayArea = new TaskDisplayArea(display, + mWm, "TDA", FEATURE_VENDOR_FIRST); + display.addChild(taskDisplayArea, POSITION_BOTTOM); + + // Making sure getting the root task from the preferred TDA + LaunchParamsController.LaunchParams launchParams = + new LaunchParamsController.LaunchParams(); + launchParams.mPreferredTaskDisplayArea = taskDisplayArea; + Task root = mRootWindowContainer.getLaunchRootTask(null /* r */, null /* options */, + null /* candidateTask */, null /* sourceTask */, true /* onTop */, launchParams, + 0 /* launchParams */); + assertEquals(taskDisplayArea, root.getTaskDisplayArea()); + + // Making sure still getting the root task from the preferred TDA when passing in a + // launching activity. + ActivityRecord r = new ActivityBuilder(mAtm).build(); + root = mRootWindowContainer.getLaunchRootTask(r, null /* options */, + null /* candidateTask */, null /* sourceTask */, true /* onTop */, launchParams, + 0 /* launchParams */); + assertEquals(taskDisplayArea, root.getTaskDisplayArea()); + } + + @Test + public void testGetOrCreateRootTaskOnDisplayWithCandidateRootTask() { // Create a root task with an activity on secondary display. final TestDisplayContent secondaryDisplay = new TestDisplayContent.Builder(mAtm, 300, 600).build(); @@ -947,9 +973,9 @@ public class RootWindowContainerTests extends WindowTestsBase { final ActivityRecord activity = new ActivityBuilder(mAtm).setTask(task).build(); // Make sure the root task is valid and can be reused on default display. - final Task rootTask = mRootWindowContainer.getValidLaunchRootTaskInTaskDisplayArea( - mRootWindowContainer.getDefaultTaskDisplayArea(), activity, task, - null /* options */, null /* launchParams */); + final Task rootTask = mRootWindowContainer.getDefaultTaskDisplayArea().getOrCreateRootTask( + activity, null /* options */, task, null /* sourceTask */, null /* launchParams */, + 0 /* launchFlags */, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(task, rootTask); } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java index 168c250a8c93..c0759c110039 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java @@ -575,7 +575,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase { final TestDisplayContent fullscreenDisplay = createNewDisplayContent( WINDOWING_MODE_FULLSCREEN); final ActivityRecord source = createSourceActivity(fullscreenDisplay); - source.setWindowingMode(WINDOWING_MODE_FREEFORM); + source.getTask().setWindowingMode(WINDOWING_MODE_FREEFORM); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setSource(source).calculate()); @@ -951,7 +951,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase { final TestDisplayContent fullscreenDisplay = createNewDisplayContent( WINDOWING_MODE_FULLSCREEN); final ActivityRecord source = createSourceActivity(fullscreenDisplay); - source.setWindowingMode(WINDOWING_MODE_FREEFORM); + source.getTask().setWindowingMode(WINDOWING_MODE_FREEFORM); final ActivityOptions options = ActivityOptions.makeBasic(); final Rect expected = new Rect(0, 0, 150, 150); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowLayoutTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowLayoutTests.java index 338555e4c9fc..7d2e9bf26b01 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowLayoutTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowLayoutTests.java @@ -30,6 +30,7 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; import static org.junit.Assert.assertEquals; @@ -330,6 +331,23 @@ public class WindowLayoutTests { } @Test + public void layoutExtendedToDisplayCutout() { + addDisplayCutout(); + final int height = DISPLAY_HEIGHT / 2; + mRequestedHeight = UNSPECIFIED_LENGTH; + mAttrs.height = height; + mAttrs.gravity = Gravity.TOP; + mAttrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; + mAttrs.setFitInsetsTypes(0); + mAttrs.privateFlags |= PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; + computeFrames(); + + assertRect(0, 0, DISPLAY_WIDTH, DISPLAY_HEIGHT, mDisplayFrame); + assertRect(0, 0, DISPLAY_WIDTH, DISPLAY_HEIGHT, mParentFrame); + assertRect(0, 0, DISPLAY_WIDTH, height + DISPLAY_CUTOUT_HEIGHT, mFrame); + } + + @Test public void layoutInDisplayCutoutModeDefaultWithInvisibleSystemBars() { addDisplayCutout(); mState.getSource(ITYPE_STATUS_BAR).setVisible(false); diff --git a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java index 0f223ca037ee..eea3f844b40f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java @@ -293,7 +293,8 @@ public class ZOrderingTests extends WindowTestsBase { public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() { final WindowState appBelowImeTarget = createWindow("appBelowImeTarget"); final WindowState imeAppTarget = createWindow("imeAppTarget"); - final WindowState appAboveImeTarget = createWindow("appAboveImeTarget"); + final WindowState appAboveImeTarget = createWindow(imeAppTarget, TYPE_APPLICATION, + "appAboveImeTarget"); mDisplayContent.setImeLayeringTarget(imeAppTarget); mDisplayContent.setImeControlTarget(imeAppTarget); diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java index 0d0b3e098750..076059f6b0f2 100644 --- a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java @@ -108,7 +108,7 @@ public class WallpaperEffectsGenerationManagerService extends @Override public void generateCinematicEffect(@NonNull CinematicEffectRequest request, @NonNull ICinematicEffectListener listener) { - if (!runForUserLocked("generateCinematicEffect", (service) -> + if (!runForUser("generateCinematicEffect", true, (service) -> service.onGenerateCinematicEffectLocked(request, listener))) { try { listener.onCinematicEffectGenerated( @@ -126,7 +126,7 @@ public class WallpaperEffectsGenerationManagerService extends @Override public void returnCinematicEffectResponse(@NonNull CinematicEffectResponse response) { - runForUserLocked("returnCinematicResponse", (service) -> + runForUser("returnCinematicResponse", false, (service) -> service.onReturnCinematicEffectResponseLocked(response)); } @@ -140,30 +140,42 @@ public class WallpaperEffectsGenerationManagerService extends } /** - * Execute the operation for the user locked. Return true if - * WallpaperEffectsGenerationPerUserService is found for the user. - * Otherwise return false. + * Execute the operation for the user. + * + * @param func The name of function for logging purpose. + * @param checkManageWallpaperEffectsPermission whether to check if caller has + * MANAGE_WALLPAPER_EFFECTS_GENERATION. + * If false, check the uid of caller matching bind service. + * @param c WallpaperEffectsGenerationPerUserService operation. + * @return whether WallpaperEffectsGenerationPerUserService is found. */ - private boolean runForUserLocked(@NonNull final String func, + private boolean runForUser(@NonNull final String func, + @NonNull final boolean checkManageWallpaperEffectsPermission, @NonNull final Consumer<WallpaperEffectsGenerationPerUserService> c) { ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class); final int userId = am.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), Binder.getCallingUserHandle().getIdentifier(), false, ALLOW_NON_FULL, null, null); if (DEBUG) { - Slog.d(TAG, "runForUserLocked:" + func + " from pid=" + Binder.getCallingPid() + Slog.d(TAG, "runForUser:" + func + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()); } - Context ctx = getContext(); - if (!(ctx.checkCallingPermission(MANAGE_WALLPAPER_EFFECTS_GENERATION) - == PERMISSION_GRANTED - || mServiceNameResolver.isTemporary(userId) - || mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid()))) { - String msg = "Permission Denial: Cannot call " + func + " from pid=" - + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid(); - Slog.w(TAG, msg); - throw new SecurityException(msg); + if (checkManageWallpaperEffectsPermission) { + // MANAGE_WALLPAPER_EFFECTS_GENERATION is required for all functions except for + // "returnCinematicResponse", whose calling permission checked in + // WallpaperEffectsGenerationPerUserService against remote binding. + Context ctx = getContext(); + if (!(ctx.checkCallingPermission(MANAGE_WALLPAPER_EFFECTS_GENERATION) + == PERMISSION_GRANTED + || mServiceNameResolver.isTemporary(userId) + || mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid()))) { + String msg = "Permission Denial: Cannot call " + func + " from pid=" + + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid(); + Slog.w(TAG, msg); + throw new SecurityException(msg); + } } + final int origCallingUid = Binder.getCallingUid(); final long origId = Binder.clearCallingIdentity(); boolean accepted = false; try { @@ -171,6 +183,16 @@ public class WallpaperEffectsGenerationManagerService extends final WallpaperEffectsGenerationPerUserService service = getServiceForUserLocked(userId); if (service != null) { + // Check uid of caller matches bind service implementation if + // MANAGE_WALLPAPER_EFFECTS_GENERATION is skipped. This is useful + // for service implementation to return response. + if (!checkManageWallpaperEffectsPermission + && !service.isCallingUidAllowed(origCallingUid)) { + String msg = "Permission Denial: cannot call " + func + ", uid[" + + origCallingUid + "] doesn't match service implementation"; + Slog.w(TAG, msg); + throw new SecurityException(msg); + } accepted = true; c.accept(service); } diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java index d541051e5ab2..7b5655551faf 100644 --- a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java @@ -141,18 +141,16 @@ public class WallpaperEffectsGenerationPerUserService extends invokeCinematicListenerAndCleanup(cinematicEffectResponse); } + /** + * Checks whether the calling uid matches the bind service uid. + */ + public boolean isCallingUidAllowed(int callingUid) { + return getServiceUidLocked() == callingUid; + } + @GuardedBy("mLock") private void updateRemoteServiceLocked() { - if (mRemoteService != null) { - mRemoteService.destroy(); - mRemoteService = null; - } - // End existing response and clean up listener for next request. - if (mCinematicEffectListenerWrapper != null) { - invokeCinematicListenerAndCleanup( - createErrorCinematicEffectResponse(mCinematicEffectListenerWrapper.mTaskId)); - } - + destroyAndRebindRemoteService(); } void onPackageUpdatedLocked() { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ad049520a1a3..e395bbea4aad 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4189,7 +4189,8 @@ public class TelephonyManager { * {@link UiccSlotMapping} which consist of both physical slot index and port index. * Logical slot is the slot that is seen by modem. Physical slot is the actual physical slot. * Port index is the index (enumerated value) for the associated port available on the SIM. - * Each physical slot can have multiple ports if multi-enabled profile(MEP) is supported. + * Each physical slot can have multiple ports if + * {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP} is supported. * * Example: no. of logical slots 1 and physical slots 2 do not support MEP, each physical slot * has one port: @@ -4285,11 +4286,11 @@ public class TelephonyManager { /** * Get the mapping from logical slots to physical sim slots and port indexes. Initially the * logical slot index was mapped to physical slot index, but with support for multi-enabled - * profile(MEP) logical slot is now mapped to port index. + * profile(MEP){@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP},logical slot is now mapped to + * port index. * * @return a collection of {@link UiccSlotMapping} which indicates the mapping from logical * slots to ports and physical slots. - * * @hide */ @SystemApi diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java index 30ca1627953f..3843a6240b43 100644 --- a/telephony/java/android/telephony/UiccCardInfo.java +++ b/telephony/java/android/telephony/UiccCardInfo.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; @@ -147,9 +148,10 @@ public final class UiccCardInfo implements Parcelable { * Note that this field may be omitted if the caller does not have the correct permissions * (see {@link TelephonyManager#getUiccCardsInfo()}). * - * @deprecated with support for MEP(multiple enabled profile), a SIM card can have more than one - * ICCID active at the same time.Instead use {@link UiccPortInfo#getIccId()} to retrieve ICCID. - * To find {@link UiccPortInfo} use {@link UiccCardInfo#getPorts()} + * @deprecated with support for MEP(multiple enabled profile) + * {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP}, a SIM card can have more than one + * ICCID active at the same time. Instead use {@link UiccPortInfo#getIccId()} to retrieve ICCID. + * To find {@link UiccPortInfo} use {@link UiccCardInfo#getPorts()}. * * @throws UnsupportedOperationException if the calling app's target SDK is T and beyond. */ @@ -192,11 +194,11 @@ public final class UiccCardInfo implements Parcelable { } /* - * Whether the UICC card supports multiple enable profile(MEP) + * Whether the UICC card supports multiple enabled profile(MEP) * UICCs are generally MEP disabled, there can be only one active profile on the physical * sim card. * - * @return {@code true} if the eUICC is supporting multiple enabled profile(MEP). + * @return {@code true} if the UICC is supporting multiple enabled profile(MEP). */ public boolean isMultipleEnabledProfilesSupported() { return mIsMultipleEnabledProfilesSupported; @@ -205,6 +207,9 @@ public final class UiccCardInfo implements Parcelable { /** * Get information regarding port, ICCID and its active status. * + * For device which support {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP}, it should return + * more than one {@link UiccPortInfo} object if the card is eUICC. + * * @return Collection of {@link UiccPortInfo} */ public @NonNull Collection<UiccPortInfo> getPorts() { diff --git a/telephony/java/android/telephony/UiccPortInfo.java b/telephony/java/android/telephony/UiccPortInfo.java index d1838c0b91f4..6fb0470d6225 100644 --- a/telephony/java/android/telephony/UiccPortInfo.java +++ b/telephony/java/android/telephony/UiccPortInfo.java @@ -29,7 +29,9 @@ import java.util.Objects; * Per GSMA SGP.22 V3.0, a port is a logical entity to which an active UICC profile can be bound on * a UICC card. If UICC supports 2 ports, then the port index is numbered 0,1. * Each port index is unique within an UICC, but not necessarily unique across UICC’s. - * For UICC's does not support MEP(Multi-enabled profile), just return the default port index 0. + * For UICC's does not support MEP(Multi-enabled profile) + * {@link android.content.pm.PackageManager#FEATURE_TELEPHONY_EUICC_MEP}, just return the default + * port index 0. */ public final class UiccPortInfo implements Parcelable{ private final String mIccId; diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index 17f34db4e44a..17ce45063d41 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -19,6 +19,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; @@ -225,6 +226,9 @@ public class UiccSlotInfo implements Parcelable { /** * Get Information regarding port, iccid and its active status. * + * For device which support {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP}, it should return + * more than one {@link UiccPortInfo} object if the card is eUICC. + * * @return Collection of {@link UiccPortInfo} */ public @NonNull Collection<UiccPortInfo> getPorts() { diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java index b6ae53017f64..4820d332de0f 100644 --- a/telephony/java/android/telephony/euicc/EuiccManager.java +++ b/telephony/java/android/telephony/euicc/EuiccManager.java @@ -37,6 +37,7 @@ import android.os.RemoteException; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyFrameworkInitializer; import android.telephony.TelephonyManager; +import android.telephony.UiccCardInfo; import android.telephony.euicc.EuiccCardManager.ResetOption; import android.util.Log; @@ -931,6 +932,21 @@ public class EuiccManager { * intent to prompt the user to accept the download. The caller should also be authorized to * manage the subscription to be downloaded. * + * <p>If device support {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP} and + * switchAfterDownload is {@code true}, the subscription will be enabled on an esim port based + * on the following selection rules: + * <ul> + * <li>In SS(Single SIM) mode, if the embedded slot already has an active port, then download + * and enable the subscription on this port. + * <li>In SS mode, if the embedded slot is not active, then try to download and enable the + * subscription on the default port 0 of eUICC. + * <li>In DSDS mode, find first available port to download and enable the subscription. + * (see {@link #isSimPortAvailable(int)}) + *</ul> + * If there is no available port, an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} + * will be returned in the callback intent to prompt the user to disable an already-active + * subscription. + * * @param subscription the subscription to download. * @param switchAfterDownload if true, the profile will be activated upon successful download. * @param callbackIntent a PendingIntent to launch when the operation completes. @@ -1141,14 +1157,25 @@ public class EuiccManager { * intent to prompt the user to accept the download. The caller should also be authorized to * manage the subscription to be enabled. * - * <p> From Android T, devices might support MEP(Multiple Enabled Profiles), the subscription - * can be installed on different port from the eUICC. Calling apps with carrier privilege - * (see {@link TelephonyManager#hasCarrierPrivileges}) over the currently active subscriptions - * can use {@link #switchToSubscription(int, int, PendingIntent)} to specify which port to - * enable the subscription. Otherwise, use this API to enable the subscription on the eUICC - * and the platform will internally resolve a port. If there is no available port, - * an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} might be returned in the callback - * intent to prompt the user to disable an already-active subscription. + * <p> From Android T, devices might support {@link PackageManager#FEATURE_TELEPHONY_EUICC_MEP}, + * the subscription can be installed on different port from the eUICC. Calling apps with + * carrier privilege (see {@link TelephonyManager#hasCarrierPrivileges}) over the currently + * active subscriptions can use {@link #switchToSubscription(int, int, PendingIntent)} to + * specify which port to enable the subscription. Otherwise, use this API to enable the + * subscription on the eUICC and the platform will internally resolve a port based on following + * rules: + * <ul> + * <li>always use the default port 0 is eUICC does not support MEP. + * <li>In SS(Single SIM) mode, if the embedded slot already has an active port, then enable + * the subscription on this port. + * <li>In SS mode, if the embedded slot is not active, then try to enable the subscription on + * the default port 0 of eUICC. + * <li>In DSDS mode, find first available port to enable the subscription. + * (see {@link #isSimPortAvailable(int)}) + *</ul> + * If there is no available port, an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} + * will be returned in the callback intent to prompt the user to disable an already-active + * subscription. * * @param subscriptionId the ID of the subscription to enable. May be * {@link android.telephony.SubscriptionManager#INVALID_SUBSCRIPTION_ID} to deactivate the @@ -1197,7 +1224,15 @@ public class EuiccManager { * * <p> If the caller is passing invalid port index, * an {@link #EMBEDDED_SUBSCRIPTION_RESULT_ERROR} with detailed error code - * {@link #ERROR_INVALID_PORT} will be returned. + * {@link #ERROR_INVALID_PORT} will be returned. The port index is invalid if one of the + * following requirements is met: + * <ul> + * <li>index is beyond the range of {@link UiccCardInfo#getPorts()}. + * <li>In SS(Single SIM) mode, the embedded slot already has an active port with different + * port index. + * <li>In DSDS mode, if the psim slot is active and the embedded slot already has an active + * empty port with different port index. + * </ul> * * <p> Depending on the target port and permission check, * an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} might be returned to the callback @@ -1522,8 +1557,8 @@ public class EuiccManager { /** * Returns whether the passing portIndex is available. - * A port is available if it has no profiles enabled on it or calling app has carrier privilege - * over the profile installed on the selected port. + * A port is available if it is active without enabled profile on it or + * calling app has carrier privilege over the profile installed on the selected port. * Always returns false if the cardId is a physical card. * * @param portIndex is an enumeration of the ports available on the UICC. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt index f21b1d63d477..74526bb97230 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt @@ -23,6 +23,7 @@ import android.platform.test.annotations.RequiresDevice import android.view.Surface import android.view.WindowManagerPolicyConstants import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -66,6 +67,7 @@ import org.junit.runners.Parameterized @Group1 open class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val taplInstrumentation = LauncherInstrumentation() private val testApp1 = SimpleAppHelper(instrumentation) private val testApp2 = NonResizeableAppHelper(instrumentation) @@ -81,6 +83,10 @@ open class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestPa fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { + test { + taplInstrumentation.setExpectedRotation(testSpec.startRotation) + } + eachRun { testApp1.launchViaIntent(wmHelper) wmHelper.waitForFullScreenApp(testApp1.component) @@ -90,20 +96,10 @@ open class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestPa } } transitions { - // Swipe right from bottom to quick switch back - // NOTE: We don't perform an edge-to-edge swipe but instead only swipe in the middle - // as to not accidentally trigger a swipe back or forward action which would result - // in the same behavior but not testing quick swap. - device.swipe( - startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - 2 * startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - if (testSpec.isLandscapeOrSeascapeAtStart) 75 else 30 - ) - + taplInstrumentation.launchedAppState.quickSwitchToPreviousApp() wmHelper.waitForFullScreenApp(testApp1.component) wmHelper.waitForAppTransitionIdle() + wmHelper.waitForNavBarStatusBarVisible() } teardown { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt index ce6a3837ad01..5d172e2c1b14 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt @@ -22,6 +22,7 @@ import android.platform.test.annotations.RequiresDevice import android.view.Surface import android.view.WindowManagerPolicyConstants import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -65,6 +66,7 @@ import org.junit.runners.Parameterized @Group1 open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val taplInstrumentation = LauncherInstrumentation() private val testApp1 = SimpleAppHelper(instrumentation) private val testApp2 = NonResizeableAppHelper(instrumentation) @@ -73,6 +75,10 @@ open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTes fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { + test { + taplInstrumentation.setExpectedRotation(testSpec.startRotation) + } + eachRun { testApp1.launchViaIntent(wmHelper) wmHelper.waitForFullScreenApp(testApp1.component) @@ -85,43 +91,24 @@ open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTes ?.layerStackSpace ?: error("Display not found") - // Swipe right from bottom to quick switch back - // NOTE: We don't perform an edge-to-edge swipe but instead only swipe in the - // middle as to not accidentally trigger a swipe back or forward action which - // would result in the same behavior but not testing quick swap. - device.swipe( - startDisplayBounds.right / 3, - startDisplayBounds.bottom, - 2 * startDisplayBounds.right / 3, - startDisplayBounds.bottom, - if (testSpec.isLandscapeOrSeascapeAtStart) 75 else 30 - ) + taplInstrumentation.launchedAppState.quickSwitchToPreviousApp() wmHelper.waitForFullScreenApp(testApp1.component) wmHelper.waitForAppTransitionIdle() } } transitions { - // Swipe left from bottom to quick switch forward - // NOTE: We don't perform an edge-to-edge swipe but instead only swipe in the middle - // as to not accidentally trigger a swipe back or forward action which would result - // in the same behavior but not testing quick swap. - device.swipe( - 2 * startDisplayBounds.right / 3, - startDisplayBounds.bottom, - startDisplayBounds.right / 3, - startDisplayBounds.bottom, - if (testSpec.isLandscapeOrSeascapeAtStart) 75 else 30 - ) + taplInstrumentation.launchedAppState.quickSwitchToPreviousAppSwipeLeft() wmHelper.waitForFullScreenApp(testApp2.component) wmHelper.waitForAppTransitionIdle() + wmHelper.waitForNavBarStatusBarVisible() } teardown { test { - testApp1.exit() - testApp2.exit() + testApp1.exit(wmHelper) + testApp2.exit(wmHelper) } } } @@ -365,4 +352,4 @@ open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTes ) } } -}
\ No newline at end of file +} diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt index 1a762bfd97c5..e5e240485240 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt @@ -22,6 +22,7 @@ import android.platform.test.annotations.RequiresDevice import android.view.Surface import android.view.WindowManagerPolicyConstants import androidx.test.platform.app.InstrumentationRegistry +import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -62,13 +63,20 @@ import org.junit.runners.Parameterized @Group4 class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val taplInstrumentation = LauncherInstrumentation() + private val testApp = SimpleAppHelper(instrumentation) + private val startDisplayBounds = WindowUtils.getDisplayBounds(testSpec.startRotation) @FlickerBuilderProvider fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { + test { + taplInstrumentation.setExpectedRotation(testSpec.startRotation) + } + eachRun { testApp.launchViaIntent(wmHelper) device.pressHome() @@ -77,20 +85,10 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) { } } transitions { - // Swipe right from bottom to quick switch back - // NOTE: We don't perform an edge-to-edge swipe but instead only swipe in the middle - // as to not accidentally trigger a swipe back or forward action which would result - // in the same behavior but not testing quick swap. - device.swipe( - startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - 2 * startDisplayBounds.bounds.right / 3, - startDisplayBounds.bounds.bottom, - 50 - ) - + taplInstrumentation.workspace.quickSwitchToPreviousApp() wmHelper.waitForFullScreenApp(testApp.component) wmHelper.waitForAppTransitionIdle() + wmHelper.waitForNavBarStatusBarVisible() } teardown { diff --git a/tests/InputMethodStressTest/AndroidTest.xml b/tests/InputMethodStressTest/AndroidTest.xml index b194010a985a..fc54ca645a2e 100644 --- a/tests/InputMethodStressTest/AndroidTest.xml +++ b/tests/InputMethodStressTest/AndroidTest.xml @@ -18,6 +18,11 @@ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="adb shell settings put secure show_ime_with_hard_keyboard 1" /> + <option name="teardown-command" value="adb shell settings delete secure show_ime_with_hard_keyboard" /> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <option name="cleanup-apks" value="true" /> <option name="test-file-name" value="InputMethodStressTest.apk" /> diff --git a/tools/bit/command.cpp b/tools/bit/command.cpp index f95ea117a96e..6c68e0b0ff6b 100644 --- a/tools/bit/command.cpp +++ b/tools/bit/command.cpp @@ -192,10 +192,11 @@ exec_with_path_search(const char* prog, char const* const* argv, char const* con if (strchr(prog, '/') != NULL) { return execve(prog, (char*const*)argv, (char*const*)envp); } else { - char* pathEnv = strdup(getenv("PATH")); - if (pathEnv == NULL) { + const char* pathEnvRaw = getenv("PATH"); + if (pathEnvRaw == NULL) { return 1; } + char* pathEnv = strdup(pathEnvRaw); char* dir = pathEnv; while (dir) { char* next = strchr(dir, ':'); diff --git a/tools/lint/README.md b/tools/lint/README.md index b534b62cb395..c674d36431b7 100644 --- a/tools/lint/README.md +++ b/tools/lint/README.md @@ -78,6 +78,7 @@ adding `cmd.Flag("--nowarn")` and running lint again. ## Documentation - [Android Lint Docs](https://googlesamples.github.io/android-custom-lint-rules/) +- [Lint Check Unit Testing](https://googlesamples.github.io/android-custom-lint-rules/api-guide/unit-testing.md.html) - [Android Lint source files](https://source.corp.google.com/studio-main/tools/base/lint/libs/lint-api/src/main/java/com/android/tools/lint/) - [PSI source files](https://github.com/JetBrains/intellij-community/tree/master/java/java-psi-api/src/com/intellij/psi) - [UAST source files](https://upsource.jetbrains.com/idea-ce/structure/idea-ce-7b9b8cc138bbd90aec26433f82cd2c6838694003/uast/uast-common/src/org/jetbrains/uast) diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt b/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt index a6fd9bba6192..859961a2a079 100644 --- a/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt +++ b/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt @@ -19,6 +19,7 @@ package com.google.android.lint import com.android.tools.lint.client.api.IssueRegistry import com.android.tools.lint.client.api.Vendor import com.android.tools.lint.detector.api.CURRENT_API +import com.google.android.lint.parcel.SaferParcelChecker import com.google.auto.service.AutoService @AutoService(IssueRegistry::class) @@ -33,7 +34,8 @@ class AndroidFrameworkIssueRegistry : IssueRegistry() { CallingIdentityTokenDetector.ISSUE_CLEAR_IDENTITY_CALL_NOT_FOLLOWED_BY_TRY_FINALLY, CallingSettingsNonUserGetterMethodsDetector.ISSUE_NON_USER_GETTER_CALLED, EnforcePermissionDetector.ISSUE_MISSING_ENFORCE_PERMISSION, - EnforcePermissionDetector.ISSUE_MISMATCHING_ENFORCE_PERMISSION + EnforcePermissionDetector.ISSUE_MISMATCHING_ENFORCE_PERMISSION, + SaferParcelChecker.ISSUE_UNSAFE_API_USAGE, ) override val api: Int diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/parcel/CallMigrators.kt b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/CallMigrators.kt new file mode 100644 index 000000000000..cc2ab19c97f1 --- /dev/null +++ b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/CallMigrators.kt @@ -0,0 +1,209 @@ +/* + * 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.google.android.lint.parcel + +import com.android.tools.lint.detector.api.JavaContext +import com.android.tools.lint.detector.api.LintFix +import com.android.tools.lint.detector.api.Location +import com.intellij.psi.PsiCallExpression +import com.intellij.psi.PsiClassType +import com.intellij.psi.PsiIntersectionType +import com.intellij.psi.PsiMethod +import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypeParameter +import com.intellij.psi.PsiWildcardType +import org.jetbrains.kotlin.utils.addToStdlib.cast +import org.jetbrains.uast.UCallExpression +import org.jetbrains.uast.UExpression +import org.jetbrains.uast.UVariable + +/** + * Subclass this class and override {@link #getBoundingClass} to report an unsafe Parcel API issue + * with a fix that migrates towards the new safer API by appending an argument in the form of + * {@code com.package.ItemType.class} coming from the result of the overridden method. + */ +abstract class CallMigrator( + val method: Method, + private val rejects: Set<String> = emptySet(), +) { + open fun report(context: JavaContext, call: UCallExpression, method: PsiMethod) { + val location = context.getLocation(call) + val itemType = getBoundingClass(context, call, method) + val fix = (itemType as? PsiClassType)?.let { type -> + getParcelFix(location, this.method.name, getArgumentSuffix(type)) + } + val message = "Unsafe `Parcel.${this.method.name}()` API usage" + context.report(SaferParcelChecker.ISSUE_UNSAFE_API_USAGE, call, location, message, fix) + } + + protected open fun getArgumentSuffix(type: PsiClassType) = + ", ${type.rawType().canonicalText}.class" + + protected open fun getBoundingClass( + context: JavaContext, + call: UCallExpression, + method: PsiMethod, + ): PsiType? = null + + protected fun getItemType(type: PsiType, container: String): PsiClassType? { + val supers = getParentTypes(type).mapNotNull { it as? PsiClassType } + val containerType = supers.firstOrNull { it.rawType().canonicalText == container } + ?: return null + val itemType = containerType.parameters.getOrNull(0) ?: return null + // TODO: Expand to other types, see PsiTypeVisitor + return when (itemType) { + is PsiClassType -> itemType + is PsiWildcardType -> itemType.bound as PsiClassType + else -> null + } + } + + /** + * Tries to obtain the type expected by the "receiving" end given a certain {@link UExpression}. + * + * This could be an assignment, an argument passed to a method call, to a constructor call, a + * type cast, etc. If no receiving end is found, the type of the UExpression itself is returned. + */ + protected fun getReceivingType(expression: UExpression): PsiType? { + val parent = expression.uastParent + val type = when (parent) { + is UCallExpression -> { + val i = parent.valueArguments.indexOf(expression) + val psiCall = parent.sourcePsi as? PsiCallExpression ?: return null + val typeSubstitutor = psiCall.resolveMethodGenerics().substitutor + val method = psiCall.resolveMethod()!! + method.getSignature(typeSubstitutor).parameterTypes[i] + } + is UVariable -> parent.type + is UExpression -> parent.getExpressionType() + else -> null + } + return filter(type ?: expression.getExpressionType()) + } + + private fun filter(type: PsiType?): PsiType? { + // It's important that PsiIntersectionType case is above the one that check the type in + // rejects, because for intersect types, the canonicalText is one of the terms. + if (type is PsiIntersectionType) { + return type.conjuncts.mapNotNull(this::filter).firstOrNull() + } + if (type == null || type.canonicalText in rejects) { + return null + } + if (type is PsiClassType && type.resolve() is PsiTypeParameter) { + return null + } + return type + } + + private fun getParentTypes(type: PsiType): Set<PsiType> = + type.superTypes.flatMap(::getParentTypes).toSet() + type + + protected fun getParcelFix(location: Location, method: String, arguments: String) = + LintFix + .create() + .name("Migrate to safer Parcel.$method() API") + .replace() + .range(location) + .pattern("$method\\s*\\(((?:.|\\n)*)\\)") + .with("\\k<1>$arguments") + .autoFix() + .build() +} + +/** + * This class derives the type to be appended by inferring the generic type of the {@code container} + * type (eg. "java.util.List") of the {@code argument}-th argument. + */ +class ContainerArgumentMigrator( + method: Method, + private val argument: Int, + private val container: String, + rejects: Set<String> = emptySet(), +) : CallMigrator(method, rejects) { + override fun getBoundingClass( + context: JavaContext, call: UCallExpression, method: PsiMethod + ): PsiType? { + val firstParamType = call.valueArguments[argument].getExpressionType() ?: return null + return getItemType(firstParamType, container)!! + } + + /** + * We need to insert a casting construct in the class parameter. For example: + * (Class<Foo<Bar>>) (Class<?>) Foo.class. + * This is needed for when the arguments of the conflict (eg. when there is List<Foo<Bar>> and + * class type is Class<Foo?). + */ + override fun getArgumentSuffix(type: PsiClassType): String { + if (type.parameters.isNotEmpty()) { + val rawType = type.rawType() + return ", (Class<${type.canonicalText}>) (Class<?>) ${rawType.canonicalText}.class" + } + return super.getArgumentSuffix(type) + } +} + +/** + * This class derives the type to be appended by inferring the generic type of the {@code container} + * type (eg. "java.util.List") of the return type of the method. + */ +class ContainerReturnMigrator( + method: Method, + private val container: String, + rejects: Set<String> = emptySet(), +) : CallMigrator(method, rejects) { + override fun getBoundingClass( + context: JavaContext, call: UCallExpression, method: PsiMethod + ): PsiType? { + val type = getReceivingType(call.uastParent as UExpression) ?: return null + return getItemType(type, container) + } +} + +/** + * This class derives the type to be appended by inferring the expected type for the method result. + */ +class ReturnMigrator( + method: Method, + rejects: Set<String> = emptySet(), +) : CallMigrator(method, rejects) { + override fun getBoundingClass( + context: JavaContext, call: UCallExpression, method: PsiMethod + ): PsiType? { + return getReceivingType(call.uastParent as UExpression) + } +} + +/** + * This class appends the class loader and the class object by deriving the type from the method + * result. + */ +class ReturnMigratorWithClassLoader( + method: Method, + rejects: Set<String> = emptySet(), +) : CallMigrator(method, rejects) { + override fun getBoundingClass( + context: JavaContext, call: UCallExpression, method: PsiMethod + ): PsiType? { + return getReceivingType(call.uastParent as UExpression) + } + + override fun getArgumentSuffix(type: PsiClassType): String = + "${type.rawType().canonicalText}.class.getClassLoader(), " + + "${type.rawType().canonicalText}.class" + +}
\ No newline at end of file diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/parcel/Method.kt b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/Method.kt new file mode 100644 index 000000000000..c032fa29f254 --- /dev/null +++ b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/Method.kt @@ -0,0 +1,38 @@ +/* + * 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.google.android.lint.parcel + +data class Method( + val params: List<String>, + val clazz: String, + val name: String, + val parameters: List<String> +) { + constructor( + clazz: String, + name: String, + parameters: List<String> + ) : this( + listOf(), clazz, name, parameters + ) + + val signature: String + get() { + val prefix = if (params.isEmpty()) "" else "${params.joinToString(", ", "<", ">")} " + return "$prefix$clazz.$name(${parameters.joinToString()})" + } +}
\ No newline at end of file diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt new file mode 100644 index 000000000000..89dbcaeac3a7 --- /dev/null +++ b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt @@ -0,0 +1,107 @@ +/* + * 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.google.android.lint.parcel + +import com.android.tools.lint.detector.api.* +import com.intellij.psi.PsiMethod +import com.intellij.psi.PsiSubstitutor +import com.intellij.psi.PsiType +import com.intellij.psi.PsiTypeParameter +import org.jetbrains.uast.UCallExpression +import java.util.* + +class SaferParcelChecker : Detector(), SourceCodeScanner { + override fun getApplicableMethodNames(): List<String> = + MIGRATORS + .map(CallMigrator::method) + .map(Method::name) + + override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) { + if (!isAtLeastT(context)) return + val signature = getSignature(method) + val migrator = MIGRATORS.firstOrNull { it.method.signature == signature } ?: return + migrator.report(context, node, method) + } + + private fun getSignature(method: PsiMethod): String { + val name = UastLintUtils.getQualifiedName(method) + val signature = method.getSignature(PsiSubstitutor.EMPTY) + val parameters = + signature.parameterTypes.joinToString(transform = PsiType::getCanonicalText) + val types = signature.typeParameters.map(PsiTypeParameter::getName) + val prefix = if (types.isEmpty()) "" else types.joinToString(", ", "<", ">") + " " + return "$prefix$name($parameters)" + } + + /** Taken from androidx-main:core/core/src/main/java/androidx/core/os/BuildCompat.java */ + private fun isAtLeastT(context: Context): Boolean { + val project = if (context.isGlobalAnalysis()) context.mainProject else context.project + return project.isAndroidProject + && project.minSdkVersion.featureLevel >= 32 + && isAtLeastPreReleaseCodename("Tiramisu", project.minSdkVersion.codename) + } + + /** Taken from androidx-main:core/core/src/main/java/androidx/core/os/BuildCompat.java */ + private fun isAtLeastPreReleaseCodename(min: String, actual: String): Boolean { + if (actual == "REL") return false + return actual.uppercase(Locale.ROOT) >= min.uppercase(Locale.ROOT) + } + + companion object { + @JvmField + val ISSUE_UNSAFE_API_USAGE: Issue = Issue.create( + id = "UnsafeParcelApi", + briefDescription = "Use of unsafe Parcel API", + explanation = """ + You are using a deprecated Parcel API that doesn't accept the expected class as\ + a parameter. This means that unexpected classes could be instantiated and\ + unexpected code executed. + + Please migrate to the safer alternative that takes an extra Class<T> parameter. + """, + category = Category.SECURITY, + priority = 8, + severity = Severity.WARNING, + + implementation = Implementation( + SaferParcelChecker::class.java, + Scope.JAVA_FILE_SCOPE + ) + ) + + private val METHOD_READ_SERIALIZABLE = Method("android.os.Parcel", "readSerializable", listOf()) + private val METHOD_READ_ARRAY_LIST = Method("android.os.Parcel", "readArrayList", listOf("java.lang.ClassLoader")) + private val METHOD_READ_LIST = Method("android.os.Parcel", "readList", listOf("java.util.List", "java.lang.ClassLoader")) + private val METHOD_READ_PARCELABLE = Method(listOf("T"), "android.os.Parcel", "readParcelable", listOf("java.lang.ClassLoader")) + private val METHOD_READ_PARCELABLE_LIST = Method(listOf("T"), "android.os.Parcel", "readParcelableList", listOf("java.util.List<T>", "java.lang.ClassLoader")) + private val METHOD_READ_SPARSE_ARRAY = Method(listOf("T"), "android.os.Parcel", "readSparseArray", listOf("java.lang.ClassLoader")) + + // TODO: Write migrators for methods below + private val METHOD_READ_ARRAY = Method("android.os.Parcel", "readArray", listOf("java.lang.ClassLoader")) + private val METHOD_READ_PARCELABLE_ARRAY = Method("android.os.Parcel", "readParcelableArray", listOf("java.lang.ClassLoader")) + private val METHOD_READ_PARCELABLE_CREATOR = Method("android.os.Parcel", "readParcelableCreator", listOf("java.lang.ClassLoader")) + + private val MIGRATORS = listOf( + ReturnMigrator(METHOD_READ_PARCELABLE, setOf("android.os.Parcelable")), + ContainerArgumentMigrator(METHOD_READ_LIST, 0, "java.util.List"), + ContainerReturnMigrator(METHOD_READ_ARRAY_LIST, "java.util.Collection"), + ContainerReturnMigrator(METHOD_READ_SPARSE_ARRAY, "android.util.SparseArray"), + ContainerArgumentMigrator(METHOD_READ_PARCELABLE_LIST, 0, "java.util.List"), + ReturnMigratorWithClassLoader(METHOD_READ_SERIALIZABLE), + ) + } +}
\ No newline at end of file diff --git a/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt b/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt new file mode 100644 index 000000000000..05c7850c44c2 --- /dev/null +++ b/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt @@ -0,0 +1,428 @@ +/* + * 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.google.android.lint.parcel + +import com.android.tools.lint.checks.infrastructure.LintDetectorTest +import com.android.tools.lint.checks.infrastructure.TestLintTask +import com.android.tools.lint.checks.infrastructure.TestMode +import com.android.tools.lint.detector.api.Detector +import com.android.tools.lint.detector.api.Issue + +@Suppress("UnstableApiUsage") +class SaferParcelCheckerTest : LintDetectorTest() { + override fun getDetector(): Detector = SaferParcelChecker() + + override fun getIssues(): List<Issue> = listOf( + SaferParcelChecker.ISSUE_UNSAFE_API_USAGE + ) + + override fun lint(): TestLintTask = + super.lint() + .allowMissingSdk(true) + // We don't do partial analysis in the platform + .skipTestModes(TestMode.PARTIAL) + + fun testDetectUnsafeReadSerializable() { + lint() + .files( + java( + """ + package test.pkg; + import android.os.Parcel; + import java.io.Serializable; + + public class TestClass { + private TestClass(Parcel p) { + Serializable ans = p.readSerializable(); + } + } + """ + ).indented(), + *includes + ) + .expectIdenticalTestModeOutput(false) + .run() + .expect( + """ + src/test/pkg/TestClass.java:7: Warning: Unsafe Parcel.readSerializable() \ + API usage [UnsafeParcelApi] + Serializable ans = p.readSerializable(); + ~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadSerializable() { + lint() + .files( + java( + """ + package test.pkg; + import android.os.Parcel; + import java.io.Serializable; + + public class TestClass { + private TestClass(Parcel p) { + String ans = p.readSerializable(null, String.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + fun testDetectUnsafeReadArrayList() { + lint() + .files( + java( + """ + package test.pkg; + import android.os.Parcel; + + public class TestClass { + private TestClass(Parcel p) { + ArrayList ans = p.readArrayList(null); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect( + """ + src/test/pkg/TestClass.java:6: Warning: Unsafe Parcel.readArrayList() API \ + usage [UnsafeParcelApi] + ArrayList ans = p.readArrayList(null); + ~~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadArrayList() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + + public class TestClass { + private TestClass(Parcel p) { + ArrayList<Intent> ans = p.readArrayList(null, Intent.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + fun testDetectUnsafeReadList() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import java.util.List; + + public class TestClass { + private TestClass(Parcel p) { + List<Intent> list = new ArrayList<Intent>(); + p.readList(list, null); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect( + """ + src/test/pkg/TestClass.java:9: Warning: Unsafe Parcel.readList() API usage \ + [UnsafeParcelApi] + p.readList(list, null); + ~~~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadList() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import java.util.List; + + public class TestClass { + private TestClass(Parcel p) { + List<Intent> list = new ArrayList<Intent>(); + p.readList(list, null, Intent.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + fun testDetectUnsafeReadParcelable() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + + public class TestClass { + private TestClass(Parcel p) { + Intent ans = p.readParcelable(null); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect( + """ + src/test/pkg/TestClass.java:7: Warning: Unsafe Parcel.readParcelable() API \ + usage [UnsafeParcelApi] + Intent ans = p.readParcelable(null); + ~~~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadParcelable() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + + public class TestClass { + private TestClass(Parcel p) { + Intent ans = p.readParcelable(null, Intent.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + fun testDetectUnsafeReadParcelableList() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import java.util.List; + + public class TestClass { + private TestClass(Parcel p) { + List<Intent> list = new ArrayList<Intent>(); + List<Intent> ans = p.readParcelableList(list, null); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect( + """ + src/test/pkg/TestClass.java:9: Warning: Unsafe Parcel.readParcelableList() \ + API usage [UnsafeParcelApi] + List<Intent> ans = p.readParcelableList(list, null); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadParcelableList() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import java.util.List; + + public class TestClass { + private TestClass(Parcel p) { + List<Intent> list = new ArrayList<Intent>(); + List<Intent> ans = + p.readParcelableList(list, null, Intent.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + fun testDetectUnsafeReadSparseArray() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import android.util.SparseArray; + + public class TestClass { + private TestClass(Parcel p) { + SparseArray<Intent> ans = p.readSparseArray(null); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect( + """ + src/test/pkg/TestClass.java:8: Warning: Unsafe Parcel.readSparseArray() API\ + usage [UnsafeParcelApi] + SparseArray<Intent> ans = p.readSparseArray(null); + ~~~~~~~~~~~~~~~~~~~~~~~ + 0 errors, 1 warnings + """.addLineContinuation() + ) + } + + fun testDoesNotDetectSafeReadSparseArray() { + lint() + .files( + java( + """ + package test.pkg; + import android.content.Intent; + import android.os.Parcel; + import android.util.SparseArray; + + public class TestClass { + private TestClass(Parcel p) { + SparseArray<Intent> ans = + p.readSparseArray(null, Intent.class); + } + } + """ + ).indented(), + *includes + ) + .run() + .expect("No warnings.") + } + + /** Stubs for classes used for testing */ + + + private val includes = + arrayOf( + manifest().minSdk("Tiramisu"), + java( + """ + package android.os; + import java.util.ArrayList; + import java.util.List; + import java.util.Map; + import java.util.HashMap; + + public final class Parcel { + // Deprecateds + public Object[] readArray(ClassLoader loader) { return null; } + public ArrayList readArrayList(ClassLoader loader) { return null; } + public HashMap readHashMap(ClassLoader loader) { return null; } + public void readList(List outVal, ClassLoader loader) {} + public void readMap(Map outVal, ClassLoader loader) {} + public <T extends Parcelable> T readParcelable(ClassLoader loader) { return null; } + public Parcelable[] readParcelableArray(ClassLoader loader) { return null; } + public Parcelable.Creator<?> readParcelableCreator(ClassLoader loader) { return null; } + public <T extends Parcelable> List<T> readParcelableList(List<T> list, ClassLoader cl) { return null; } + public Serializable readSerializable() { return null; } + public <T> SparseArray<T> readSparseArray(ClassLoader loader) { return null; } + + // Replacements + public <T> T[] readArray(ClassLoader loader, Class<T> clazz) { return null; } + public <T> ArrayList<T> readArrayList(ClassLoader loader, Class<? extends T> clazz) { return null; } + public <K, V> HashMap<K,V> readHashMap(ClassLoader loader, Class<? extends K> clazzKey, Class<? extends V> clazzValue) { return null; } + public <T> void readList(List<? super T> outVal, ClassLoader loader, Class<T> clazz) {} + public <K, V> void readMap(Map<? super K, ? super V> outVal, ClassLoader loader, Class<K> clazzKey, Class<V> clazzValue) {} + public <T> T readParcelable(ClassLoader loader, Class<T> clazz) { return null; } + public <T> T[] readParcelableArray(ClassLoader loader, Class<T> clazz) { return null; } + public <T> Parcelable.Creator<T> readParcelableCreator(ClassLoader loader, Class<T> clazz) { return null; } + public <T> List<T> readParcelableList(List<T> list, ClassLoader cl, Class<T> clazz) { return null; } + public <T> T readSerializable(ClassLoader loader, Class<T> clazz) { return null; } + public <T> SparseArray<T> readSparseArray(ClassLoader loader, Class<? extends T> clazz) { return null; } + } + """ + ).indented(), + java( + """ + package android.os; + public interface Parcelable {} + """ + ).indented(), + java( + """ + package android.content; + public class Intent implements Parcelable, Cloneable {} + """ + ).indented(), + java( + """ + package android.util; + public class SparseArray<E> implements Cloneable {} + """ + ).indented(), + ) + + // Substitutes "backslash + new line" with an empty string to imitate line continuation + private fun String.addLineContinuation(): String = this.trimIndent().replace("\\\n", "") +} |