diff options
316 files changed, 8420 insertions, 4987 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 963307b110cf..a5a08fb9997c 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -573,6 +573,7 @@ public class JobSchedulerService extends com.android.server.SystemService case Constants.KEY_MIN_LINEAR_BACKOFF_TIME_MS: case Constants.KEY_MIN_EXP_BACKOFF_TIME_MS: case Constants.KEY_SYSTEM_STOP_TO_FAILURE_RATIO: + case Constants.KEY_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF: mConstants.updateBackoffConstantsLocked(); break; case Constants.KEY_CONN_CONGESTION_DELAY_FRAC: @@ -679,6 +680,8 @@ public class JobSchedulerService extends com.android.server.SystemService private static final String KEY_MIN_EXP_BACKOFF_TIME_MS = "min_exp_backoff_time_ms"; private static final String KEY_SYSTEM_STOP_TO_FAILURE_RATIO = "system_stop_to_failure_ratio"; + private static final String KEY_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF = + "abandoned_job_timeouts_before_aggressive_backoff"; private static final String KEY_CONN_CONGESTION_DELAY_FRAC = "conn_congestion_delay_frac"; private static final String KEY_CONN_PREFETCH_RELAX_FRAC = "conn_prefetch_relax_frac"; private static final String KEY_CONN_USE_CELL_SIGNAL_STRENGTH = @@ -750,6 +753,7 @@ public class JobSchedulerService extends com.android.server.SystemService private static final long DEFAULT_MIN_LINEAR_BACKOFF_TIME_MS = JobInfo.MIN_BACKOFF_MILLIS; private static final long DEFAULT_MIN_EXP_BACKOFF_TIME_MS = JobInfo.MIN_BACKOFF_MILLIS; private static final int DEFAULT_SYSTEM_STOP_TO_FAILURE_RATIO = 3; + private static final int DEFAULT_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF = 3; private static final float DEFAULT_CONN_CONGESTION_DELAY_FRAC = 0.5f; private static final float DEFAULT_CONN_PREFETCH_RELAX_FRAC = 0.5f; private static final boolean DEFAULT_CONN_USE_CELL_SIGNAL_STRENGTH = true; @@ -845,7 +849,12 @@ public class JobSchedulerService extends com.android.server.SystemService * incremental failure in the backoff policy calculation. */ int SYSTEM_STOP_TO_FAILURE_RATIO = DEFAULT_SYSTEM_STOP_TO_FAILURE_RATIO; - + /** + * Number of consecutive timeouts by abandoned jobs before we change to aggressive backoff + * policy. + */ + int ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF = + DEFAULT_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF; /** * The fraction of a job's running window that must pass before we * consider running it when the network is congested. @@ -1078,6 +1087,10 @@ public class JobSchedulerService extends com.android.server.SystemService SYSTEM_STOP_TO_FAILURE_RATIO = DeviceConfig.getInt(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_SYSTEM_STOP_TO_FAILURE_RATIO, DEFAULT_SYSTEM_STOP_TO_FAILURE_RATIO); + ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF = DeviceConfig.getInt( + DeviceConfig.NAMESPACE_JOB_SCHEDULER, + KEY_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF, + DEFAULT_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF); } // TODO(141645789): move into ConnectivityController.CcConfig @@ -1287,6 +1300,8 @@ public class JobSchedulerService extends com.android.server.SystemService pw.print(KEY_MIN_LINEAR_BACKOFF_TIME_MS, MIN_LINEAR_BACKOFF_TIME_MS).println(); pw.print(KEY_MIN_EXP_BACKOFF_TIME_MS, MIN_EXP_BACKOFF_TIME_MS).println(); pw.print(KEY_SYSTEM_STOP_TO_FAILURE_RATIO, SYSTEM_STOP_TO_FAILURE_RATIO).println(); + pw.print(KEY_ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF, + ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF).println(); pw.print(KEY_CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC).println(); pw.print(KEY_CONN_PREFETCH_RELAX_FRAC, CONN_PREFETCH_RELAX_FRAC).println(); pw.print(KEY_CONN_USE_CELL_SIGNAL_STRENGTH, CONN_USE_CELL_SIGNAL_STRENGTH).println(); @@ -2997,6 +3012,7 @@ public class JobSchedulerService extends com.android.server.SystemService final long initialBackoffMillis = job.getInitialBackoffMillis(); int numFailures = failureToReschedule.getNumFailures(); + int numAbandonedFailures = failureToReschedule.getNumAbandonedFailures(); int numSystemStops = failureToReschedule.getNumSystemStops(); // We should back off slowly if JobScheduler keeps stopping the job, // but back off immediately if the issue appeared to be the app's fault @@ -3006,9 +3022,19 @@ public class JobSchedulerService extends com.android.server.SystemService || internalStopReason == JobParameters.INTERNAL_STOP_REASON_ANR || stopReason == JobParameters.STOP_REASON_USER) { numFailures++; + } else if (android.app.job.Flags.handleAbandonedJobs() + && internalStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED) { + numAbandonedFailures++; + numFailures++; } else { numSystemStops++; } + + int backoffPolicy = job.getBackoffPolicy(); + if (shouldUseAggressiveBackoff(numAbandonedFailures)) { + backoffPolicy = JobInfo.BACKOFF_POLICY_EXPONENTIAL; + } + final int backoffAttempts = numFailures + numSystemStops / mConstants.SYSTEM_STOP_TO_FAILURE_RATIO; final long earliestRuntimeMs; @@ -3017,7 +3043,7 @@ public class JobSchedulerService extends com.android.server.SystemService earliestRuntimeMs = JobStatus.NO_EARLIEST_RUNTIME; } else { long delayMillis; - switch (job.getBackoffPolicy()) { + switch (backoffPolicy) { case JobInfo.BACKOFF_POLICY_LINEAR: { long backoff = initialBackoffMillis; if (backoff < mConstants.MIN_LINEAR_BACKOFF_TIME_MS) { @@ -3046,7 +3072,7 @@ public class JobSchedulerService extends com.android.server.SystemService } JobStatus newJob = new JobStatus(failureToReschedule, earliestRuntimeMs, - JobStatus.NO_LATEST_RUNTIME, numFailures, numSystemStops, + JobStatus.NO_LATEST_RUNTIME, numFailures, numAbandonedFailures, numSystemStops, failureToReschedule.getLastSuccessfulRunTime(), sSystemClock.millis(), failureToReschedule.getCumulativeExecutionTimeMs()); if (stopReason == JobParameters.STOP_REASON_USER) { @@ -3069,6 +3095,20 @@ public class JobSchedulerService extends com.android.server.SystemService } /** + * Returns {@code true} if the given number of abandoned failures indicates that JobScheduler + * should use an aggressive backoff policy. + * + * @param numAbandonedFailures The number of abandoned failures. + * @return {@code true} if the given number of abandoned failures indicates that JobScheduler + * should use an aggressive backoff policy. + */ + public boolean shouldUseAggressiveBackoff(int numAbandonedFailures) { + return android.app.job.Flags.handleAbandonedJobs() + && numAbandonedFailures + > mConstants.ABANDONED_JOB_TIMEOUTS_BEFORE_AGGRESSIVE_BACKOFF; + } + + /** * Maximum time buffer in which JobScheduler will try to optimize periodic job scheduling. This * does not cause a job's period to be larger than requested (eg: if the requested period is * shorter than this buffer). This is used to put a limit on when JobScheduler will intervene @@ -3147,6 +3187,7 @@ public class JobSchedulerService extends com.android.server.SystemService return new JobStatus(periodicToReschedule, elapsedNow + period - flex, elapsedNow + period, 0 /* numFailures */, 0 /* numSystemStops */, + 0 /* numAbandonedFailures */, sSystemClock.millis() /* lastSuccessfulRunTime */, periodicToReschedule.getLastFailedRunTime(), 0 /* Reset cumulativeExecutionTime because of successful execution */); @@ -3163,6 +3204,7 @@ public class JobSchedulerService extends com.android.server.SystemService return new JobStatus(periodicToReschedule, newEarliestRunTimeElapsed, newLatestRuntimeElapsed, 0 /* numFailures */, 0 /* numSystemStops */, + 0 /* numAbandonedFailures */, sSystemClock.millis() /* lastSuccessfulRunTime */, periodicToReschedule.getLastFailedRunTime(), 0 /* Reset cumulativeExecutionTime because of successful execution */); @@ -3171,6 +3213,10 @@ public class JobSchedulerService extends com.android.server.SystemService @VisibleForTesting void maybeProcessBuggyJob(@NonNull JobStatus jobStatus, int debugStopReason) { boolean jobTimedOut = debugStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT; + if (android.app.job.Flags.handleAbandonedJobs()) { + jobTimedOut |= (debugStopReason + == JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); + } // If madeActive = 0, the job never actually started. if (!jobTimedOut && jobStatus.madeActive > 0) { final long executionDurationMs = sUptimeMillisClock.millis() - jobStatus.madeActive; @@ -3252,9 +3298,12 @@ public class JobSchedulerService extends com.android.server.SystemService // we stop it. final JobStatus rescheduledJob = needsReschedule ? getRescheduleJobForFailureLocked(jobStatus, stopReason, debugStopReason) : null; + final boolean isStopReasonAbandoned = android.app.job.Flags.handleAbandonedJobs() + && (debugStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); if (rescheduledJob != null && !rescheduledJob.shouldTreatAsUserInitiatedJob() && (debugStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT + || isStopReasonAbandoned || debugStopReason == JobParameters.INTERNAL_STOP_REASON_PREEMPT)) { rescheduledJob.disallowRunInBatterySaverAndDoze(); } diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java index d8934d8f83b8..dfb36818c818 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java @@ -269,7 +269,9 @@ public final class JobStore { convertRtcBoundsToElapsed(utcTimes, elapsedNow); JobStatus newJob = new JobStatus(job, elapsedRuntimes.first, elapsedRuntimes.second, - 0, 0, job.getLastSuccessfulRunTime(), job.getLastFailedRunTime(), + 0 /* numFailures */, 0 /* numAbandonedFailures */, + 0 /* numSystemStops */, job.getLastSuccessfulRunTime(), + job.getLastFailedRunTime(), job.getCumulativeExecutionTimeMs()); newJob.prepareLocked(); toAdd.add(newJob); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java index a3eaefd5f057..5a33aa0ab7eb 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java @@ -316,6 +316,12 @@ public final class JobStatus { private final int numFailures; /** + * How many times this job has stopped due to {@link + * JobParameters#STOP_REASON_TIMEOUT_ABANDONED}. + */ + private final int mNumAbandonedFailures; + + /** * The number of times JobScheduler has forced this job to stop due to reasons mostly outside * of the app's control. */ @@ -605,6 +611,8 @@ public final class JobStatus { * @param tag A string associated with the job for debugging/logging purposes. * @param numFailures Count of how many times this job has requested a reschedule because * its work was not yet finished. + * @param mNumAbandonedFailures Count of how many times this job has requested a reschedule + * because it was abandoned. * @param numSystemStops Count of how many times JobScheduler has forced this job to stop due to * factors mostly out of the app's control. * @param earliestRunTimeElapsedMillis Milestone: earliest point in time at which the job @@ -617,7 +625,7 @@ public final class JobStatus { */ private JobStatus(JobInfo job, int callingUid, String sourcePackageName, int sourceUserId, int standbyBucket, @Nullable String namespace, String tag, - int numFailures, int numSystemStops, + int numFailures, int mNumAbandonedFailures, int numSystemStops, long earliestRunTimeElapsedMillis, long latestRunTimeElapsedMillis, long lastSuccessfulRunTime, long lastFailedRunTime, long cumulativeExecutionTimeMs, int internalFlags, @@ -677,6 +685,7 @@ public final class JobStatus { this.latestRunTimeElapsedMillis = latestRunTimeElapsedMillis; this.mOriginalLatestRunTimeElapsedMillis = latestRunTimeElapsedMillis; this.numFailures = numFailures; + this.mNumAbandonedFailures = mNumAbandonedFailures; mNumSystemStops = numSystemStops; int requiredConstraints = job.getConstraintFlags(); @@ -750,7 +759,8 @@ public final class JobStatus { this(jobStatus.getJob(), jobStatus.getUid(), jobStatus.getSourcePackageName(), jobStatus.getSourceUserId(), jobStatus.getStandbyBucket(), jobStatus.getNamespace(), - jobStatus.getSourceTag(), jobStatus.getNumFailures(), jobStatus.getNumSystemStops(), + jobStatus.getSourceTag(), jobStatus.getNumFailures(), + jobStatus.getNumAbandonedFailures(), jobStatus.getNumSystemStops(), jobStatus.getEarliestRunTime(), jobStatus.getLatestRunTimeElapsed(), jobStatus.getLastSuccessfulRunTime(), jobStatus.getLastFailedRunTime(), jobStatus.getCumulativeExecutionTimeMs(), @@ -787,6 +797,7 @@ public final class JobStatus { this(job, callingUid, sourcePkgName, sourceUserId, standbyBucket, namespace, sourceTag, /* numFailures */ 0, /* numSystemStops */ 0, + /* mNumAbandonedFailures */ 0, earliestRunTimeElapsedMillis, latestRunTimeElapsedMillis, lastSuccessfulRunTime, lastFailedRunTime, cumulativeExecutionTimeMs, innerFlags, dynamicConstraints); @@ -806,13 +817,15 @@ public final class JobStatus { /** Create a new job to be rescheduled with the provided parameters. */ public JobStatus(JobStatus rescheduling, long newEarliestRuntimeElapsedMillis, - long newLatestRuntimeElapsedMillis, int numFailures, int numSystemStops, + long newLatestRuntimeElapsedMillis, int numFailures, + int mNumAbandonedFailures, int numSystemStops, long lastSuccessfulRunTime, long lastFailedRunTime, long cumulativeExecutionTimeMs) { this(rescheduling.job, rescheduling.getUid(), rescheduling.getSourcePackageName(), rescheduling.getSourceUserId(), rescheduling.getStandbyBucket(), rescheduling.getNamespace(), - rescheduling.getSourceTag(), numFailures, numSystemStops, + rescheduling.getSourceTag(), numFailures, + mNumAbandonedFailures, numSystemStops, newEarliestRuntimeElapsedMillis, newLatestRuntimeElapsedMillis, lastSuccessfulRunTime, lastFailedRunTime, cumulativeExecutionTimeMs, @@ -851,7 +864,8 @@ public final class JobStatus { int standbyBucket = JobSchedulerService.standbyBucketForPackage(jobPackage, sourceUserId, elapsedNow); return new JobStatus(job, callingUid, sourcePkg, sourceUserId, - standbyBucket, namespace, tag, /* numFailures */ 0, /* numSystemStops */ 0, + standbyBucket, namespace, tag, /* numFailures */ 0, + /* mNumAbandonedFailures */ 0, /* numSystemStops */ 0, earliestRunTimeElapsedMillis, latestRunTimeElapsedMillis, 0 /* lastSuccessfulRunTime */, 0 /* lastFailedRunTime */, /* cumulativeExecutionTime */ 0, @@ -1146,6 +1160,13 @@ public final class JobStatus { } /** + * Returns the number of times the job stopped previously for STOP_REASON_TIMEOUT_ABANDONED. + */ + public int getNumAbandonedFailures() { + return mNumAbandonedFailures; + } + + /** * Returns the number of times the system stopped a previous execution of this job for reasons * that were likely outside the app's control. */ diff --git a/core/api/current.txt b/core/api/current.txt index 3af8e7e17dbd..af7d6f1a5da1 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -13225,8 +13225,8 @@ package android.content.pm { public abstract class PackageManager { ctor @Deprecated public PackageManager(); method @Deprecated public abstract void addPackageToPreferred(@NonNull String); - method public abstract boolean addPermission(@NonNull android.content.pm.PermissionInfo); - method public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo); + method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract boolean addPermission(@NonNull android.content.pm.PermissionInfo); + method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo); method @Deprecated public abstract void addPreferredActivity(@NonNull android.content.IntentFilter, int, @Nullable android.content.ComponentName[], @NonNull android.content.ComponentName); method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean addWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int); method public boolean canPackageQuery(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; @@ -13367,7 +13367,7 @@ package android.content.pm { method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryServiceProperty(@NonNull String); method public void relinquishUpdateOwnership(@NonNull String); method @Deprecated public abstract void removePackageFromPreferred(@NonNull String); - method public abstract void removePermission(@NonNull String); + method @Deprecated @FlaggedApi("android.permission.flags.permission_tree_apis_deprecated") public abstract void removePermission(@NonNull String); method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean removeWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int); method public void requestChecksums(@NonNull String, boolean, int, @NonNull java.util.List<java.security.cert.Certificate>, @NonNull android.content.pm.PackageManager.OnChecksumsReadyListener) throws java.security.cert.CertificateEncodingException, android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int); @@ -33612,9 +33612,14 @@ package android.os { @FlaggedApi("android.os.cpu_gpu_headrooms") public final class CpuHeadroomParams { ctor public CpuHeadroomParams(); method public int getCalculationType(); + method @IntRange(from=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) public long getCalculationWindowMillis(); method public void setCalculationType(int); + method public void setCalculationWindowMillis(@IntRange(from=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.CpuHeadroomParams.CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int); + method public void setTids(@NonNull int...); field public static final int CPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; // 0x1 field public static final int CPU_HEADROOM_CALCULATION_TYPE_MIN = 0; // 0x0 + field public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; // 0x2710 + field public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; // 0x32 } public final class CpuUsageInfo implements android.os.Parcelable { @@ -33867,9 +33872,13 @@ package android.os { @FlaggedApi("android.os.cpu_gpu_headrooms") public final class GpuHeadroomParams { ctor public GpuHeadroomParams(); method public int getCalculationType(); + method @IntRange(from=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) public int getCalculationWindowMillis(); method public void setCalculationType(int); + method public void setCalculationWindowMillis(@IntRange(from=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to=android.os.GpuHeadroomParams.GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int); field public static final int GPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; // 0x1 field public static final int GPU_HEADROOM_CALCULATION_TYPE_MIN = 0; // 0x0 + field public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; // 0x2710 + field public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; // 0x32 } public class Handler { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4b83b43bfd8f..83699ac30939 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3940,6 +3940,7 @@ package android.content { field public static final String WIFI_NL80211_SERVICE = "wifinl80211"; field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager"; field public static final String WIFI_SCANNING_SERVICE = "wifiscanner"; + field @FlaggedApi("android.net.wifi.flags.usd") public static final String WIFI_USD_SERVICE = "wifi_usd"; } public final class ContextParams { @@ -5209,6 +5210,11 @@ package android.hardware.contexthub { method @NonNull public java.util.Collection<android.hardware.contexthub.HubServiceInfo> getServiceInfoCollection(); method @Nullable public String getTag(); method public int getVersion(); + field public static final int REASON_CLOSE_ENDPOINT_SESSION_REQUESTED = 4; // 0x4 + field public static final int REASON_ENDPOINT_INVALID = 5; // 0x5 + field public static final int REASON_ENDPOINT_STOPPED = 6; // 0x6 + field public static final int REASON_FAILURE = 0; // 0x0 + field public static final int REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED = 3; // 0x3 } public static final class HubEndpoint.Builder { @@ -5295,16 +5301,13 @@ package android.hardware.contexthub { @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointDiscoveryCallback { method public void onEndpointsStarted(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>); - method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>); + method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>, int); } @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointLifecycleCallback { method public void onSessionClosed(@NonNull android.hardware.contexthub.HubEndpointSession, int); method @NonNull public android.hardware.contexthub.HubEndpointSessionResult onSessionOpenRequest(@NonNull android.hardware.contexthub.HubEndpointInfo, @Nullable android.hardware.contexthub.HubServiceInfo); method public void onSessionOpened(@NonNull android.hardware.contexthub.HubEndpointSession); - field public static final int REASON_CLOSE_ENDPOINT_SESSION_REQUESTED = 4; // 0x4 - field public static final int REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED = 3; // 0x3 - field public static final int REASON_UNSPECIFIED = 0; // 0x0 } @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointMessageCallback { @@ -7634,10 +7637,11 @@ package android.media { method public boolean isActive(); method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean isMuted(); method public boolean isSpatialized(); - field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_APP_OPS = 8; // 0x8 + field @Deprecated @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_APP_OPS = 8; // 0x8 field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_CLIENT_VOLUME = 16; // 0x10 field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_MASTER = 1; // 0x1 field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_OP_CONTROL_AUDIO = 128; // 0x80 + field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_OP_PLAY_AUDIO = 8; // 0x8 field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_PORT_VOLUME = 64; // 0x40 field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_MUTED = 4; // 0x4 field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_VOLUME = 2; // 0x2 diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 7e0a9b69b7bd..3cbea87e135e 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -130,7 +130,6 @@ import android.util.Slog; import android.util.Xml; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.Immutable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.SomeArgs; import com.android.internal.pm.RoSystemFeatures; @@ -1020,6 +1019,33 @@ public class ApplicationPackageManager extends PackageManager { } } + @Override + public void setPageSizeAppCompatFlagsSettingsOverride(String packageName, boolean enabled) { + try { + mPM.setPageSizeAppCompatFlagsSettingsOverride(packageName, enabled); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override + public boolean isPageSizeCompatEnabled(String packageName) { + try { + return mPM.isPageSizeCompatEnabled(packageName); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override + public String getPageSizeCompatWarningMessage(String packageName) { + try { + return mPM.getPageSizeCompatWarningMessage(packageName); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + private static List<byte[]> encodeCertificates(List<Certificate> certs) throws CertificateEncodingException { if (certs == null) { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index f3d999adefab..7fcae45ea452 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -817,13 +817,13 @@ public class Notification implements Parcelable R.layout.notification_2025_template_expanded_base, R.layout.notification_2025_template_heads_up_base, R.layout.notification_2025_template_header, + R.layout.notification_2025_template_collapsed_messaging, + R.layout.notification_2025_template_collapsed_media, R.layout.notification_template_material_big_picture, R.layout.notification_template_material_big_text, R.layout.notification_template_material_inbox, - R.layout.notification_template_material_messaging, R.layout.notification_template_material_big_messaging, R.layout.notification_template_material_conversation, - R.layout.notification_template_material_media, R.layout.notification_template_material_big_media, R.layout.notification_template_material_call, R.layout.notification_template_material_big_call, @@ -5924,7 +5924,7 @@ public class Notification implements Parcelable || resId == getCompactHeadsUpBaseLayoutResource() || resId == getMessagingCompactHeadsUpLayoutResource() || resId == getCollapsedMessagingLayoutResource() - || resId == R.layout.notification_template_material_media); + || resId == getCollapsedMediaLayoutResource()); RemoteViews contentView = new BuilderRemoteViews(mContext.getApplicationInfo(), resId); resetStandardTemplate(contentView); @@ -7573,13 +7573,25 @@ public class Notification implements Parcelable } private int getCollapsedMessagingLayoutResource() { - return R.layout.notification_template_material_messaging; + if (Flags.notificationsRedesignTemplates()) { + return R.layout.notification_2025_template_collapsed_messaging; + } else { + return R.layout.notification_template_material_messaging; + } } private int getExpandedMessagingLayoutResource() { return R.layout.notification_template_material_big_messaging; } + private int getCollapsedMediaLayoutResource() { + if (Flags.notificationsRedesignTemplates()) { + return R.layout.notification_2025_template_collapsed_media; + } else { + return R.layout.notification_template_material_media; + } + } + private int getConversationLayoutResource() { return R.layout.notification_template_material_conversation; } @@ -10480,7 +10492,7 @@ public class Notification implements Parcelable .fillTextsFrom(mBuilder); TemplateBindResult result = new TemplateBindResult(); RemoteViews template = mBuilder.applyStandardTemplate( - R.layout.notification_template_material_media, p, + mBuilder.getCollapsedMediaLayoutResource(), p, null /* result */); for (int i = 0; i < MAX_MEDIA_BUTTONS_IN_COMPACT; i++) { diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index e218418336c5..3973c58c0708 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -61,6 +61,8 @@ import java.util.Random; import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; /** @@ -680,12 +682,17 @@ public class PropertyInvalidatedCache<Query, Result> { @GuardedBy("mLock") private boolean mTestMode = false; - /** - * The local value of the handler, used during testing but also used directly by the - * NonceLocal handler. - */ + // This is the local value of the nonce, as last set by the NonceHandler. It is always + // updated by the setNonce() operation. The getNonce() operation returns this value in + // NonceLocal handlers and handlers in test mode. + @GuardedBy("mLock") + protected long mShadowNonce = NONCE_UNSET; + + // A list of watchers to be notified of changes. This is null until at least one watcher + // registers. Checking for null is meant to be the fastest way the handler can determine + // that there are no watchers to be notified. @GuardedBy("mLock") - protected long mTestNonce = NONCE_UNSET; + private ArrayList<Semaphore> mWatchers; /** * The methods to get and set a nonce from whatever storage is being used. mLock may be @@ -701,27 +708,60 @@ public class PropertyInvalidatedCache<Query, Result> { /** * Get a nonce from storage. If the handler is in test mode, the nonce is returned from - * the local mTestNonce. + * the local mShadowNonce. */ long getNonce() { synchronized (mLock) { - if (mTestMode) return mTestNonce; + if (mTestMode) return mShadowNonce; } return getNonceInternal(); } /** - * Write a nonce to storage. If the handler is in test mode, the nonce is written to the - * local mTestNonce and storage is not affected. + * Write a nonce to storage. The nonce is always written to the local mShadowNonce. If + * the handler is not in test mode the nonce is also written to storage. */ void setNonce(long val) { synchronized (mLock) { - if (mTestMode) { - mTestNonce = val; - return; + mShadowNonce = val; + if (!mTestMode) { + setNonceInternal(val); + } + wakeAllWatchersLocked(); + } + } + + @GuardedBy("mLock") + private void wakeAllWatchersLocked() { + if (mWatchers != null) { + for (int i = 0; i < mWatchers.size(); i++) { + mWatchers.get(i).release(); + } + } + } + + /** + * Register a watcher to be notified when a nonce changes. There is no check for + * duplicates. In general, this method is called only from {@link NonceWatcher}. + */ + void registerWatcher(Semaphore s) { + synchronized (mLock) { + if (mWatchers == null) { + mWatchers = new ArrayList<>(); + } + mWatchers.add(s); + } + } + + /** + * Unregister a watcher. Nothing happens if the watcher is not registered. + */ + void unregisterWatcher(Semaphore s) { + synchronized (mLock) { + if (mWatchers != null) { + mWatchers.remove(s); } } - setNonceInternal(val); } /** @@ -854,7 +894,7 @@ public class PropertyInvalidatedCache<Query, Result> { void setTestMode(boolean mode) { synchronized (mLock) { mTestMode = mode; - mTestNonce = NONCE_UNSET; + mShadowNonce = NONCE_UNSET; } } @@ -1028,7 +1068,7 @@ public class PropertyInvalidatedCache<Query, Result> { /** * SystemProperties and shared storage are protected and cannot be written by random * processes. So, for testing purposes, the NonceLocal handler stores the nonce locally. The - * NonceLocal uses the mTestNonce in the superclass, regardless of test mode. + * NonceLocal uses the mShadowNonce in the superclass, regardless of test mode. */ private static class NonceLocal extends NonceHandler { // The saved nonce. @@ -1040,16 +1080,130 @@ public class PropertyInvalidatedCache<Query, Result> { @Override long getNonceInternal() { - return mTestNonce; + return mShadowNonce; } @Override void setNonceInternal(long value) { - mTestNonce = value; + mShadowNonce = value; + } + } + + /** + * A NonceWatcher lets an external client test if a nonce value has changed from the last time + * the watcher was checked. + * @hide + */ + public static class NonceWatcher implements AutoCloseable { + // The handler for the key. + private final NonceHandler mHandler; + + // The last-seen value. This is initialized to "unset". + private long mLastSeen = NONCE_UNSET; + + // The semaphore that the watcher waits on. A permit is released every time the nonce + // changes. Permits are acquired in the wait method. + private final Semaphore mSem = new Semaphore(0); + + /** + * Create a watcher for a handler. The last-seen value is not set here and will be + * "unset". Therefore, a call to isChanged() will return true if the nonce has ever been + * set, no matter when the watcher is first created. Clients may want to flush that + * change by calling isChanged() immediately after constructing the object. + */ + private NonceWatcher(@NonNull NonceHandler handler) { + mHandler = handler; + mHandler.registerWatcher(mSem); + } + + /** + * Unregister to be notified when a nonce changes. NonceHandler allows a call to + * unregisterWatcher with a semaphore that is not registered, so there is no check inside + * this method to guard against multiple closures. + */ + @Override + public void close() { + mHandler.unregisterWatcher(mSem); + } + + /** + * Return the last seen value of the nonce. This does not update that value. Only + * {@link #isChanged()} updates the value. + */ + public long lastSeen() { + return mLastSeen; + } + + /** + * Return true if the nonce has changed from the last time isChanged() was called. The + * method is not thread safe. + * @hide + */ + public boolean isChanged() { + long current = mHandler.getNonce(); + if (current != mLastSeen) { + mLastSeen = current; + return true; + } + return false; + } + + /** + * Wait for the nonce value to change. It is not guaranteed that the nonce has changed when + * this returns: clients must confirm with {@link #isChanged}. The wait operation is only + * effective in a process that writes the nonces. The function returns the number of times + * the nonce had changed since the last call to the method. + * @hide + */ + public int waitForChange() throws InterruptedException { + mSem.acquire(1); + return 1 + mSem.drainPermits(); + } + + /** + * Wait for the nonce value to change. It is not guaranteed that the nonce has changed when + * this returns: clients must confirm with {@link #isChanged}. The wait operation is only + * effective in a process that writes the nonces. The function returns the number of times + * the nonce changed since the last call to the method. A return value of zero means the + * timeout expired. Beware that a timeout of 0 means the function will not wait at all. + * @hide + */ + public int waitForChange(long timeout, TimeUnit timeUnit) throws InterruptedException { + if (mSem.tryAcquire(1, timeout, timeUnit)) { + return 1 + mSem.drainPermits(); + } else { + return 0; + } + } + + /** + * Wake the watcher by releasing the semaphore. This can be used to wake clients that are + * blocked in {@link #waitForChange} without affecting the underlying nonce. + * @hide + */ + public void wakeUp() { + mSem.release(); } } /** + * Return a NonceWatcher for the cache. + * @hide + */ + public NonceWatcher getNonceWatcher() { + return new NonceWatcher(mNonce); + } + + /** + * Return a NonceWatcher for the given property. If a handler does not exist for the + * property, one is created. This throws if the property name is not a valid cache key. + * @hide + */ + public static NonceWatcher getNonceWatcher(@NonNull String propertyName) { + return new NonceWatcher(getNonceHandler(propertyName)); + } + + /** * Complete key prefixes. */ private static final String PREFIX_TEST = CACHE_KEY_PREFIX + "." + MODULE_TEST + "."; @@ -1663,6 +1817,26 @@ public class PropertyInvalidatedCache<Query, Result> { } /** + * Non-static version of corkInvalidations() for situations in which the cache instance is + * available. This is slightly faster than than the static versions because it does not have + * to look up the NonceHandler for a given property name. + * @hide + */ + public void corkInvalidations() { + mNonce.cork(); + } + + /** + * Non-static version of uncorkInvalidations() for situations in which the cache instance is + * available. This is slightly faster than than the static versions because it does not have + * to look up the NonceHandler for a given property name. + * @hide + */ + public void uncorkInvalidations() { + mNonce.uncork(); + } + + /** * Invalidate caches in all processes that are keyed for the module and api. * @hide */ diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index acad92c90c59..6e2ca2c109f1 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4250,6 +4250,7 @@ public abstract class Context { //@hide: WIFI_RTT_SERVICE, //@hide: ETHERNET_SERVICE, WIFI_RTT_RANGING_SERVICE, + WIFI_USD_SERVICE, NSD_SERVICE, AUDIO_SERVICE, AUDIO_DEVICE_VOLUME_SERVICE, @@ -5096,6 +5097,19 @@ public abstract class Context { */ public static final String WIFI_RTT_RANGING_SERVICE = "wifirtt"; + + /** + * Use with {@link #getSystemService(String)} to retrieve a {@link + * android.net.wifi.usd.UsdManager} for Unsynchronized Service Discovery (USD) operation. + * + * @see #getSystemService(String) + * @see android.net.wifi.usd.UsdManager + * @hide + */ + @FlaggedApi(android.net.wifi.flags.Flags.FLAG_USD) + @SystemApi + public static final String WIFI_USD_SERVICE = "wifi_usd"; + /** * Use with {@link #getSystemService(String)} to retrieve a {@link * android.net.lowpan.LowpanManager} for handling management of diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index cccfdb0938e5..94784227049d 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -1449,6 +1449,97 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } } + /** + * Use this to report any errors during alignment checks + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_ERROR = -1; + + /** + * Initial value for mPageSizeAppCompatFlags + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED = 0; + + /** + * if set, extract libs forcefully for 16 KB device and show warning dialog. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED = 1 << 1; + + /** + * if set, load 4 KB aligned ELFs on 16 KB device in compat mode and show warning dialog. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED = 1 << 2; + + /** + * Run in 16 KB app compat mode. This flag will be set explicitly through settings. If set, 16 + * KB app compat warning dialogs will still show up. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED = 1 << 3; + + /** + * Disable 16 KB app compat mode through settings. It should only affect ELF loading as app is + * already installed. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED = 1 << 4; + + /** + * Run in 16 KB app compat mode. This flag will be set explicitly through manifest. If set, hide + * the 16 KB app compat warning dialogs. This has the highest priority to enable compat mode. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED = 1 << 5; + + /** + * Disable 16 KB app compat mode. This has the highest priority to disable compat mode. + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED = 1 << 6; + + /** + * Max value for page size app compat + * + * @hide + */ + public static final int PAGE_SIZE_APP_COMPAT_FLAG_MAX = 1 << 7; + + /** + * 16 KB app compat status for the app. App can have native shared libs which are not page + * aligned, LOAD segments inside the shared libs have to be page aligned. Apps can specify the + * override in manifest file as well. + */ + private @PageSizeAppCompatFlags int mPageSizeAppCompatFlags = + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + + /** {@hide} */ + @IntDef( + prefix = {"PAGE_SIZE_APP_COMPAT_FLAG_"}, + value = { + PAGE_SIZE_APP_COMPAT_FLAG_ERROR, + PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED, + PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED, + PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED, + PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED, + PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED, + PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED, + PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED, + PAGE_SIZE_APP_COMPAT_FLAG_MAX, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface PageSizeAppCompatFlags {} + /** @hide */ public String classLoaderName; @@ -1777,7 +1868,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { pw.println(prefix + "enableOnBackInvokedCallback=" + isOnBackInvokedCallbackEnabled()); pw.println(prefix + "allowCrossUidActivitySwitchFromBelow=" + allowCrossUidActivitySwitchFromBelow); - + pw.println(prefix + "mPageSizeAppCompatFlags=" + mPageSizeAppCompatFlags); } pw.println(prefix + "createTimestamp=" + createTimestamp); if (mKnownActivityEmbeddingCerts != null) { @@ -1897,6 +1988,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } proto.write(ApplicationInfoProto.Detail.ALLOW_CROSS_UID_ACTIVITY_SWITCH_FROM_BELOW, allowCrossUidActivitySwitchFromBelow); + + proto.write(ApplicationInfoProto.Detail.ENABLE_PAGE_SIZE_APP_COMPAT, + mPageSizeAppCompatFlags); + proto.end(detailToken); } if (!ArrayUtils.isEmpty(mKnownActivityEmbeddingCerts)) { @@ -2024,6 +2119,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { localeConfigRes = orig.localeConfigRes; allowCrossUidActivitySwitchFromBelow = orig.allowCrossUidActivitySwitchFromBelow; createTimestamp = SystemClock.uptimeMillis(); + mPageSizeAppCompatFlags = orig.mPageSizeAppCompatFlags; } public String toString() { @@ -2128,6 +2224,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } dest.writeInt(localeConfigRes); dest.writeInt(allowCrossUidActivitySwitchFromBelow ? 1 : 0); + dest.writeInt(mPageSizeAppCompatFlags); sForStringSet.parcel(mKnownActivityEmbeddingCerts, dest, flags); } @@ -2228,6 +2325,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } localeConfigRes = source.readInt(); allowCrossUidActivitySwitchFromBelow = source.readInt() != 0; + mPageSizeAppCompatFlags = source.readInt(); mKnownActivityEmbeddingCerts = sForStringSet.unparcel(source); if (mKnownActivityEmbeddingCerts.isEmpty()) { @@ -2765,6 +2863,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { requestRawExternalStorageAccess = value; } + /** {@hide} */ + public void setPageSizeAppCompatFlags(@PageSizeAppCompatFlags int value) { + mPageSizeAppCompatFlags |= value; + } + /** * Replaces {@link #mAppClassNamesByProcess}. This takes over the ownership of the passed map. * Do not modify the argument at the callsite. diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 5d4babb8a36d..9f898b823a76 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -848,4 +848,12 @@ interface IPackageManager { int getAppMetadataSource(String packageName, int userId); ComponentName getDomainVerificationAgent(int userId); + + void setPageSizeAppCompatFlagsSettingsOverride(in String packageName, boolean enabled); + + boolean isPageSizeCompatEnabled(in String packageName); + + String getPageSizeCompatWarningMessage(in String packageName); + + List<String> getAllApexDirectories(); } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index d2b43b9bd2b4..23d3693628e7 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -804,7 +804,6 @@ public abstract class PackageManager { @Deprecated private void __metadata() {} - //@formatter:on // End of generated code @@ -6729,6 +6728,11 @@ public abstract class PackageManager { * If the given permission already exists, the info you supply here * will be used to update it. * + * @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic + * permissions should declare their permissions statically inside their app manifest instead. + * This method will become a no-op in a future Android release and eventually be removed from + * the SDK. + * * @param info Description of the permission to be added. * * @return Returns true if a new permission was created, false if an @@ -6739,7 +6743,9 @@ public abstract class PackageManager { * * @see #removePermission(String) */ - //@Deprecated + @SuppressWarnings("HiddenAbstractMethod") + @FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED) + @Deprecated public abstract boolean addPermission(@NonNull PermissionInfo info); /** @@ -6748,8 +6754,15 @@ public abstract class PackageManager { * allowing it to return quicker and batch a series of adds at the * expense of no guarantee the added permission will be retained if * the device is rebooted before it is written. + * + * @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic + * permissions should declare their permissions statically inside their app manifest instead. + * This method will become a no-op in a future Android release and eventually be removed from + * the SDK. */ - //@Deprecated + @SuppressWarnings("HiddenAbstractMethod") + @FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED) + @Deprecated public abstract boolean addPermissionAsync(@NonNull PermissionInfo info); /** @@ -6758,6 +6771,11 @@ public abstract class PackageManager { * -- you are only allowed to remove permissions that you are allowed * to add. * + * @deprecated Support for dynamic permissions is going to be removed, and apps that use dynamic + * permissions should declare their permissions statically inside their app manifest instead. + * This method will become a no-op in a future Android release and eventually be removed from + * the SDK. + * * @param permName The name of the permission to remove. * * @throws SecurityException if you are not allowed to remove the @@ -6765,7 +6783,9 @@ public abstract class PackageManager { * * @see #addPermission(PermissionInfo) */ - //@Deprecated + @SuppressWarnings("HiddenAbstractMethod") + @FlaggedApi(android.permission.flags.Flags.FLAG_PERMISSION_TREE_APIS_DEPRECATED) + @Deprecated public abstract void removePermission(@NonNull String permName); /** @@ -10987,6 +11007,41 @@ public abstract class PackageManager { } /** + * Set the page compat mode override for given package + * + * @hide + */ + @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) + public void setPageSizeAppCompatFlagsSettingsOverride(@NonNull String packageName, + boolean enabled) { + throw new UnsupportedOperationException( + "setPageSizeAppCompatFlagsSettingsOverride not implemented in subclass"); + } + + /** + * Check whether page size app compat mode is enabled for given package + * + * @hide + */ + @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) + public boolean isPageSizeCompatEnabled(@NonNull String packageName) { + throw new UnsupportedOperationException( + "isPageSizeCompatEnabled not implemented in subclass"); + } + + /** + * Get the page size app compat warning dialog to show at app launch time + * + * @hide + */ + @Nullable + @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) + public String getPageSizeCompatWarningMessage(@NonNull String packageName) { + throw new UnsupportedOperationException( + "getPageSizeCompatWarningMessage not implemented in subclass"); + } + + /** * Returns the harmful app warning string for the given app, or null if there is none set. * * @param packageName The full name of the desired package. diff --git a/core/java/android/hardware/contexthub/HubEndpoint.java b/core/java/android/hardware/contexthub/HubEndpoint.java index 078b4d4629e0..7efdd6dbdf41 100644 --- a/core/java/android/hardware/contexthub/HubEndpoint.java +++ b/core/java/android/hardware/contexthub/HubEndpoint.java @@ -18,6 +18,7 @@ package android.hardware.contexthub; import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -31,6 +32,8 @@ import android.util.SparseArray; import androidx.annotation.GuardedBy; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -48,6 +51,46 @@ import java.util.concurrent.Executor; public class HubEndpoint { private static final String TAG = "HubEndpoint"; + /** + * Constants describing the outcome of operations through HubEndpoints (like opening/closing of + * sessions or stopping of endpoints). + * + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef( + prefix = {"REASON_"}, + value = { + REASON_FAILURE, + REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED, + REASON_CLOSE_ENDPOINT_SESSION_REQUESTED, + REASON_ENDPOINT_INVALID, + REASON_ENDPOINT_STOPPED, + }) + public @interface Reason {} + + /** Unclassified failure */ + public static final int REASON_FAILURE = 0; + + // The values 1 and 2 are reserved at the Context Hub HAL but not exposed to apps. + + /** The peer rejected the request to open this endpoint session. */ + public static final int REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED = 3; + + /** The peer closed this endpoint session. */ + public static final int REASON_CLOSE_ENDPOINT_SESSION_REQUESTED = 4; + + /** The peer endpoint is invalid. */ + public static final int REASON_ENDPOINT_INVALID = 5; + + /** + * The endpoint is now stopped. The app should retrieve the endpoint info using {@link + * android.hardware.location.ContextHubManager#findEndpoints} or register updates through + * {@link android.hardware.location.ContextHubManager#registerEndpointDiscoveryCallback} + * to get notified if the endpoint restarts. + */ + public static final int REASON_ENDPOINT_STOPPED = 6; + private final Object mLock = new Object(); private final HubEndpointInfo mPendingHubEndpointInfo; @Nullable private final IHubEndpointLifecycleCallback mLifecycleCallback; @@ -173,9 +216,7 @@ public class HubEndpoint { try { mServiceToken.closeSession( - sessionId, - IHubEndpointLifecycleCallback - .REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED); + sessionId, REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED); } catch (RemoteException e) { e.rethrowFromSystemServer(); } @@ -396,9 +437,7 @@ public class HubEndpoint { try { // Oneway notification to system service - serviceToken.closeSession( - session.getId(), - IHubEndpointLifecycleCallback.REASON_CLOSE_ENDPOINT_SESSION_REQUESTED); + serviceToken.closeSession(session.getId(), REASON_CLOSE_ENDPOINT_SESSION_REQUESTED); } catch (RemoteException e) { Log.e(TAG, "closeSession: failed to close session " + session, e); e.rethrowFromSystemServer(); diff --git a/core/java/android/hardware/contexthub/IContextHubEndpointDiscoveryCallback.aidl b/core/java/android/hardware/contexthub/IContextHubEndpointDiscoveryCallback.aidl index 85775c05bad9..245be930a897 100644 --- a/core/java/android/hardware/contexthub/IContextHubEndpointDiscoveryCallback.aidl +++ b/core/java/android/hardware/contexthub/IContextHubEndpointDiscoveryCallback.aidl @@ -31,6 +31,7 @@ oneway interface IContextHubEndpointDiscoveryCallback { /** * Called when endpoint(s) stopped. * @param hubEndpointInfoList The list of endpoints that started. + * @param reason The reason why the endpoints stopped. */ - void onEndpointsStopped(in HubEndpointInfo[] hubEndpointInfoList); + void onEndpointsStopped(in HubEndpointInfo[] hubEndpointInfoList, int reason); } diff --git a/core/java/android/hardware/contexthub/IHubEndpointDiscoveryCallback.java b/core/java/android/hardware/contexthub/IHubEndpointDiscoveryCallback.java index 0b77ddb8cb0b..a61a7ebd0de9 100644 --- a/core/java/android/hardware/contexthub/IHubEndpointDiscoveryCallback.java +++ b/core/java/android/hardware/contexthub/IHubEndpointDiscoveryCallback.java @@ -42,7 +42,8 @@ public interface IHubEndpointDiscoveryCallback { * Called when a list of hub endpoints have stopped. * * @param discoveryInfoList The list containing hub discovery information. + * @param reason The reason the endpoints stopped. */ - // TODO(b/375487784): Add endpoint stop reason - void onEndpointsStopped(@NonNull List<HubDiscoveryInfo> discoveryInfoList); + void onEndpointsStopped( + @NonNull List<HubDiscoveryInfo> discoveryInfoList, @HubEndpoint.Reason int reason); } diff --git a/core/java/android/hardware/contexthub/IHubEndpointLifecycleCallback.java b/core/java/android/hardware/contexthub/IHubEndpointLifecycleCallback.java index 46884393b49b..fe449bb5ce0e 100644 --- a/core/java/android/hardware/contexthub/IHubEndpointLifecycleCallback.java +++ b/core/java/android/hardware/contexthub/IHubEndpointLifecycleCallback.java @@ -17,15 +17,11 @@ package android.hardware.contexthub; import android.annotation.FlaggedApi; -import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.chre.flags.Flags; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - /** * Interface for listening to lifecycle events of a hub endpoint. * @@ -34,24 +30,6 @@ import java.lang.annotation.RetentionPolicy; @SystemApi @FlaggedApi(Flags.FLAG_OFFLOAD_API) public interface IHubEndpointLifecycleCallback { - /** Unknown reason. */ - int REASON_UNSPECIFIED = 0; - - /** The peer rejected the request to open this endpoint session. */ - int REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED = 3; - - /** The peer closed this endpoint session. */ - int REASON_CLOSE_ENDPOINT_SESSION_REQUESTED = 4; - - /** @hide */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({ - REASON_UNSPECIFIED, - REASON_OPEN_ENDPOINT_SESSION_REQUEST_REJECTED, - REASON_CLOSE_ENDPOINT_SESSION_REQUESTED, - }) - @interface EndpointLifecycleReason {} - /** * Called when an endpoint is requesting a session be opened with another endpoint. * @@ -78,5 +56,5 @@ public interface IHubEndpointLifecycleCallback { * used. * @param reason The reason why this session was closed. */ - void onSessionClosed(@NonNull HubEndpointSession session, @EndpointLifecycleReason int reason); + void onSessionClosed(@NonNull HubEndpointSession session, @HubEndpoint.Reason int reason); } diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 7054c37cbc3b..25327a9b1d52 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -24,7 +24,6 @@ import static android.view.Display.INVALID_DISPLAY; import static com.android.server.display.feature.flags.Flags.FLAG_DISPLAY_LISTENER_PERFORMANCE_IMPROVEMENTS; import android.Manifest; -import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.IntDef; @@ -71,7 +70,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.Executor; -import java.util.function.Consumer; import java.util.function.Predicate; @@ -1843,30 +1841,6 @@ public final class DisplayManager { } /** - * Register a listener to receive display topology updates. - * @param executor The executor specifying the thread on which the callbacks will be invoked - * @param listener The listener - * - * @hide - */ - @RequiresPermission(MANAGE_DISPLAYS) - public void registerTopologyListener(@NonNull @CallbackExecutor Executor executor, - @NonNull Consumer<DisplayTopology> listener) { - mGlobal.registerTopologyListener(executor, listener, ActivityThread.currentPackageName()); - } - - /** - * Unregister a display topology listener. - * @param listener The listener to unregister - * - * @hide - */ - @RequiresPermission(MANAGE_DISPLAYS) - public void unregisterTopologyListener(@NonNull Consumer<DisplayTopology> listener) { - mGlobal.unregisterTopologyListener(listener); - } - - /** * Listens for changes in available display devices. */ public interface DisplayListener { diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index 1eec65619d4e..1e66beea42a6 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -23,7 +23,6 @@ import static android.Manifest.permission.MANAGE_DISPLAYS; import static android.view.Display.HdrCapabilities.HdrType; import android.Manifest; -import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.IntDef; @@ -74,7 +73,6 @@ import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; /** * Manager communication with the display manager service on behalf of @@ -128,7 +126,7 @@ public final class DisplayManagerGlobal { public static final int EVENT_DISPLAY_REFRESH_RATE_CHANGED = 8; public static final int EVENT_DISPLAY_STATE_CHANGED = 9; - @LongDef(prefix = {"INTERNAL_EVENT_FLAG_"}, flag = true, value = { + @LongDef(prefix = {"INTERNAL_EVENT_DISPLAY"}, flag = true, value = { INTERNAL_EVENT_FLAG_DISPLAY_ADDED, INTERNAL_EVENT_FLAG_DISPLAY_CHANGED, INTERNAL_EVENT_FLAG_DISPLAY_REMOVED, @@ -136,8 +134,7 @@ public final class DisplayManagerGlobal { INTERNAL_EVENT_FLAG_DISPLAY_HDR_SDR_RATIO_CHANGED, INTERNAL_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED, INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE, - INTERNAL_EVENT_FLAG_DISPLAY_STATE, - INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED, + INTERNAL_EVENT_FLAG_DISPLAY_STATE }) @Retention(RetentionPolicy.SOURCE) public @interface InternalEventFlag {} @@ -150,7 +147,6 @@ public final class DisplayManagerGlobal { public static final long INTERNAL_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED = 1L << 5; public static final long INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE = 1L << 6; public static final long INTERNAL_EVENT_FLAG_DISPLAY_STATE = 1L << 7; - public static final long INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED = 1L << 8; @UnsupportedAppUsage private static DisplayManagerGlobal sInstance; @@ -168,9 +164,6 @@ public final class DisplayManagerGlobal { private final CopyOnWriteArrayList<DisplayListenerDelegate> mDisplayListeners = new CopyOnWriteArrayList<>(); - private final CopyOnWriteArrayList<DisplayTopologyListenerDelegate> mTopologyListeners = - new CopyOnWriteArrayList<>(); - private final SparseArray<DisplayInfo> mDisplayInfoCache = new SparseArray<>(); private final ColorSpace mWideColorSpace; private final OverlayProperties mOverlayProperties; @@ -464,18 +457,6 @@ public final class DisplayManagerGlobal { } } - private void maybeLogAllTopologyListeners() { - if (!extraLogging()) { - return; - } - Slog.i(TAG, "Currently registered display topology listeners:"); - int i = 0; - for (DisplayTopologyListenerDelegate d : mTopologyListeners) { - Slog.i(TAG, i + ": " + d); - i++; - } - } - /** * Called when there is a display-related window configuration change. Reroutes the event from * WindowManager to make sure the {@link Display} fields are up-to-date in the last callback. @@ -521,22 +502,9 @@ public final class DisplayManagerGlobal { | INTERNAL_EVENT_FLAG_DISPLAY_CHANGED | INTERNAL_EVENT_FLAG_DISPLAY_REMOVED; } - if (!mTopologyListeners.isEmpty()) { - mask |= INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED; - } return mask; } - private DisplayTopologyListenerDelegate findTopologyListenerLocked( - @NonNull Consumer<DisplayTopology> listener) { - for (DisplayTopologyListenerDelegate delegate : mTopologyListeners) { - if (delegate.mListener == listener) { - return delegate; - } - } - return null; - } - private void registerCallbackIfNeededLocked() { if (mCallback == null) { mCallback = new DisplayManagerCallback(); @@ -1348,9 +1316,6 @@ public final class DisplayManagerGlobal { */ @RequiresPermission(MANAGE_DISPLAYS) public void setDisplayTopology(DisplayTopology topology) { - if (topology == null) { - throw new IllegalArgumentException("Topology must not be null"); - } try { mDm.setDisplayTopology(topology); } catch (RemoteException ex) { @@ -1358,57 +1323,6 @@ public final class DisplayManagerGlobal { } } - /** - * @see DisplayManager#registerTopologyListener - */ - @RequiresPermission(MANAGE_DISPLAYS) - public void registerTopologyListener(@NonNull @CallbackExecutor Executor executor, - @NonNull Consumer<DisplayTopology> listener, String packageName) { - if (!Flags.displayTopology()) { - return; - } - if (listener == null) { - throw new IllegalArgumentException("listener must not be null"); - } - if (extraLogging()) { - Slog.i(TAG, "Registering display topology listener: packageName=" + packageName); - } - synchronized (mLock) { - DisplayTopologyListenerDelegate delegate = findTopologyListenerLocked(listener); - if (delegate == null) { - mTopologyListeners.add(new DisplayTopologyListenerDelegate(listener, executor, - packageName)); - registerCallbackIfNeededLocked(); - updateCallbackIfNeededLocked(); - } - maybeLogAllTopologyListeners(); - } - } - - /** - * @see DisplayManager#unregisterTopologyListener - */ - @RequiresPermission(MANAGE_DISPLAYS) - public void unregisterTopologyListener(@NonNull Consumer<DisplayTopology> listener) { - if (!Flags.displayTopology()) { - return; - } - if (listener == null) { - throw new IllegalArgumentException("listener must not be null"); - } - if (extraLogging()) { - Slog.i(TAG, "Unregistering display topology listener: " + listener); - } - synchronized (mLock) { - DisplayTopologyListenerDelegate delegate = findTopologyListenerLocked(listener); - if (delegate != null) { - mTopologyListeners.remove(delegate); - updateCallbackIfNeededLocked(); - } - } - maybeLogAllTopologyListeners(); - } - private final class DisplayManagerCallback extends IDisplayManagerCallback.Stub { @Override public void onDisplayEvent(int displayId, @DisplayEvent int event) { @@ -1418,16 +1332,6 @@ public final class DisplayManagerGlobal { } handleDisplayEvent(displayId, event, false /* forceUpdate */); } - - @Override - public void onTopologyChanged(DisplayTopology topology) { - if (DEBUG) { - Log.d(TAG, "onTopologyChanged: " + topology); - } - for (DisplayTopologyListenerDelegate listener : mTopologyListeners) { - listener.onTopologyChanged(topology); - } - } } private static final class DisplayListenerDelegate { @@ -1612,31 +1516,6 @@ public final class DisplayManagerGlobal { } } - private static final class DisplayTopologyListenerDelegate { - private final Consumer<DisplayTopology> mListener; - private final Executor mExecutor; - private final String mPackageName; - - DisplayTopologyListenerDelegate(@NonNull Consumer<DisplayTopology> listener, - @NonNull @CallbackExecutor Executor executor, String packageName) { - mExecutor = executor; - mListener = listener; - mPackageName = packageName; - } - - @Override - public String toString() { - return "DisplayTopologyListener {packageName=" + mPackageName + "}"; - } - - void onTopologyChanged(DisplayTopology topology) { - if (extraLogging()) { - Slog.i(TAG, "Sending topology update: " + topology); - } - mExecutor.execute(() -> mListener.accept(topology)); - } - } - /** * The API portion of the key that identifies the unique PropertyInvalidatedCache token which * changes every time we update the system's display configuration. diff --git a/core/java/android/hardware/display/DisplayTopology.java b/core/java/android/hardware/display/DisplayTopology.java index 0e53d873e43c..f00c3a53ad0c 100644 --- a/core/java/android/hardware/display/DisplayTopology.java +++ b/core/java/android/hardware/display/DisplayTopology.java @@ -283,14 +283,6 @@ public final class DisplayTopology implements Parcelable { normalize(); } - /** - * @return A deep copy of the topology that will not be modified by the system. - */ - public DisplayTopology copy() { - TreeNode rootCopy = mRoot == null ? null : mRoot.copy(); - return new DisplayTopology(rootCopy, mPrimaryDisplayId); - } - @Override public int describeContents() { return 0; @@ -702,17 +694,6 @@ public final class DisplayTopology implements Parcelable { return Collections.unmodifiableList(mChildren); } - /** - * @return A deep copy of the node that will not be modified by the system. - */ - public TreeNode copy() { - TreeNode copy = new TreeNode(mDisplayId, mWidth, mHeight, mPosition, mOffset); - for (TreeNode child : mChildren) { - copy.mChildren.add(child.copy()); - } - return copy; - } - @Override public String toString() { return "Display {id=" + mDisplayId + ", width=" + mWidth + ", height=" + mHeight diff --git a/core/java/android/hardware/display/IDisplayManagerCallback.aidl b/core/java/android/hardware/display/IDisplayManagerCallback.aidl index d05a1b8400b0..c50e3fb26156 100644 --- a/core/java/android/hardware/display/IDisplayManagerCallback.aidl +++ b/core/java/android/hardware/display/IDisplayManagerCallback.aidl @@ -16,10 +16,7 @@ package android.hardware.display; -import android.hardware.display.DisplayTopology; - /** @hide */ interface IDisplayManagerCallback { oneway void onDisplayEvent(int displayId, int event); - oneway void onTopologyChanged(in DisplayTopology topology); } diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index 5e8a18724cdf..117d8fe24809 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -791,7 +791,7 @@ public final class ContextHubManager { } @Override - public void onEndpointsStopped(HubEndpointInfo[] hubEndpointInfoList) { + public void onEndpointsStopped(HubEndpointInfo[] hubEndpointInfoList, int reason) { if (hubEndpointInfoList.length == 0) { Log.w(TAG, "onEndpointsStopped: received empty discovery list"); return; @@ -815,7 +815,7 @@ public final class ContextHubManager { if (discoveryList.isEmpty()) { Log.w(TAG, "onEndpointsStopped: no matching service descriptor"); } else { - callback.onEndpointsStopped(discoveryList); + callback.onEndpointsStopped(discoveryList, reason); } }); } diff --git a/core/java/android/os/AggregateBatteryConsumer.java b/core/java/android/os/AggregateBatteryConsumer.java index f0e12ca644dd..f5fee4f2d9be 100644 --- a/core/java/android/os/AggregateBatteryConsumer.java +++ b/core/java/android/os/AggregateBatteryConsumer.java @@ -17,7 +17,6 @@ package android.os; import android.annotation.NonNull; -import android.util.proto.ProtoOutputStream; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; @@ -100,19 +99,6 @@ public final class AggregateBatteryConsumer extends BatteryConsumer { } } - void writePowerComponentModelProto(@NonNull ProtoOutputStream proto) { - for (int i = 0; i < POWER_COMPONENT_COUNT; i++) { - final int powerModel = getPowerModel(i); - if (powerModel == BatteryConsumer.POWER_MODEL_UNDEFINED) continue; - - final long token = proto.start(BatteryUsageStatsAtomsProto.COMPONENT_MODELS); - proto.write(BatteryUsageStatsAtomsProto.PowerComponentModel.COMPONENT, i); - proto.write(BatteryUsageStatsAtomsProto.PowerComponentModel.POWER_MODEL, - powerModelToProtoEnum(powerModel)); - proto.end(token); - } - } - /** * Builder for DeviceBatteryConsumer. */ diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java index 14b67f64b6da..96ea1683b5cf 100644 --- a/core/java/android/os/BatteryConsumer.java +++ b/core/java/android/os/BatteryConsumer.java @@ -161,18 +161,27 @@ public abstract class BatteryConsumer { /** * Unspecified power model. + * + * @deprecated PowerModel is no longer supported */ + @Deprecated public static final int POWER_MODEL_UNDEFINED = 0; /** * Power model that is based on average consumption rates that hardware components * consume in various states. + * + * @deprecated PowerModel is no longer supported */ + @Deprecated public static final int POWER_MODEL_POWER_PROFILE = 1; /** * Power model that is based on energy consumption stats provided by PowerStats HAL. + * + * @deprecated PowerModel is no longer supported */ + @Deprecated public static final int POWER_MODEL_ENERGY_CONSUMPTION = 2; /** @@ -380,19 +389,17 @@ public abstract class BatteryConsumer { public final @ScreenState int screenState; public final @PowerState int powerState; - final int mPowerModelColumnIndex; final int mPowerColumnIndex; final int mDurationColumnIndex; private Key(@PowerComponentId int powerComponentId, @ProcessState int processState, - @ScreenState int screenState, @PowerState int powerState, int powerModelColumnIndex, + @ScreenState int screenState, @PowerState int powerState, int powerColumnIndex, int durationColumnIndex) { this.powerComponentId = powerComponentId; this.processState = processState; this.screenState = screenState; this.powerState = powerState; - mPowerModelColumnIndex = powerModelColumnIndex; mPowerColumnIndex = powerColumnIndex; mDurationColumnIndex = durationColumnIndex; } @@ -577,11 +584,11 @@ public abstract class BatteryConsumer { * * @param componentId The ID of the power component, e.g. * {@link BatteryConsumer#POWER_COMPONENT_CPU}. + * @deprecated PowerModel is no longer supported */ + @Deprecated public @PowerModel int getPowerModel(@PowerComponentId int componentId) { - return mPowerComponents.getPowerModel( - mData.layout.getKeyOrThrow(componentId, PROCESS_STATE_UNSPECIFIED, - SCREEN_STATE_UNSPECIFIED, POWER_STATE_UNSPECIFIED)); + return POWER_MODEL_UNDEFINED; } /** @@ -589,9 +596,11 @@ public abstract class BatteryConsumer { * * @param key The key of the power component, obtained by calling {@link #getKey} or * {@link #getKeys} method. + * @deprecated PowerModel is no longer supported */ + @Deprecated public @PowerModel int getPowerModel(@NonNull BatteryConsumer.Key key) { - return mPowerComponents.getPowerModel(key); + return POWER_MODEL_UNDEFINED; } /** @@ -657,20 +666,6 @@ public abstract class BatteryConsumer { } /** - * Returns the name of the specified power model. Intended for logging and debugging. - */ - public static String powerModelToString(@BatteryConsumer.PowerModel int powerModel) { - switch (powerModel) { - case BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION: - return "energy consumption"; - case BatteryConsumer.POWER_MODEL_POWER_PROFILE: - return "power profile"; - default: - return ""; - } - } - - /** * Returns the equivalent PowerModel enum for the specified power model. * {@see BatteryUsageStatsAtomsProto.BatteryConsumerData.PowerComponentUsage.PowerModel} */ @@ -857,10 +852,8 @@ public abstract class BatteryConsumer { static class BatteryConsumerDataLayout { private static final Key[] KEY_ARRAY = new Key[0]; - public static final int POWER_MODEL_NOT_INCLUDED = -1; public final String[] customPowerComponentNames; public final int customPowerComponentCount; - public final boolean powerModelsIncluded; public final boolean processStateDataIncluded; public final boolean screenStateDataIncluded; public final boolean powerStateDataIncluded; @@ -872,11 +865,10 @@ public abstract class BatteryConsumer { private SparseArray<Key[]> mPerComponentKeys; private BatteryConsumerDataLayout(int firstColumn, String[] customPowerComponentNames, - boolean powerModelsIncluded, boolean includeProcessStateData, - boolean includeScreenState, boolean includePowerState) { + boolean includeProcessStateData, boolean includeScreenState, + boolean includePowerState) { this.customPowerComponentNames = customPowerComponentNames; this.customPowerComponentCount = customPowerComponentNames.length; - this.powerModelsIncluded = powerModelsIncluded; this.processStateDataIncluded = includeProcessStateData; this.screenStateDataIncluded = includeScreenState; this.powerStateDataIncluded = includePowerState; @@ -904,7 +896,7 @@ public abstract class BatteryConsumer { continue; } for (int i = 0; i < powerComponentIds.length; i++) { - columnIndex = addKeys(keyList, powerModelsIncluded, includeProcessStateData, + columnIndex = addKeys(keyList, includeProcessStateData, powerComponentIds[i], screenState, powerState, columnIndex); } } @@ -934,13 +926,10 @@ public abstract class BatteryConsumer { } } - private int addKeys(List<Key> keys, boolean powerModelsIncluded, - boolean includeProcessStateData, @PowerComponentId int componentId, - int screenState, int powerState, int columnIndex) { + private int addKeys(List<Key> keys, boolean includeProcessStateData, + @PowerComponentId int componentId, int screenState, int powerState, + int columnIndex) { keys.add(new Key(componentId, PROCESS_STATE_UNSPECIFIED, screenState, powerState, - powerModelsIncluded - ? columnIndex++ - : POWER_MODEL_NOT_INCLUDED, // power model columnIndex++, // power columnIndex++ // usage duration )); @@ -956,9 +945,6 @@ public abstract class BatteryConsumer { continue; } keys.add(new Key(componentId, processState, screenState, powerState, - powerModelsIncluded - ? columnIndex++ - : POWER_MODEL_NOT_INCLUDED, // power model columnIndex++, // power columnIndex++ // usage duration )); @@ -1016,7 +1002,7 @@ public abstract class BatteryConsumer { } static BatteryConsumerDataLayout createBatteryConsumerDataLayout( - String[] customPowerComponentNames, boolean includePowerModels, + String[] customPowerComponentNames, boolean includeProcessStateData, boolean includeScreenStateData, boolean includePowerStateData) { int columnCount = BatteryConsumer.COLUMN_COUNT; @@ -1025,8 +1011,7 @@ public abstract class BatteryConsumer { columnCount = Math.max(columnCount, UserBatteryConsumer.COLUMN_COUNT); return new BatteryConsumerDataLayout(columnCount, customPowerComponentNames, - includePowerModels, includeProcessStateData, includeScreenStateData, - includePowerStateData); + includeProcessStateData, includeScreenStateData, includePowerStateData); } protected abstract static class BaseBuilder<T extends BaseBuilder<?>> { @@ -1086,7 +1071,7 @@ public abstract class BatteryConsumer { public T setConsumedPower(@PowerComponentId int componentId, double componentPower, @PowerModel int powerModel) { mPowerComponentsBuilder.setConsumedPower(getKey(componentId, PROCESS_STATE_UNSPECIFIED), - componentPower, powerModel); + componentPower); return (T) this; } @@ -1095,14 +1080,14 @@ public abstract class BatteryConsumer { public T addConsumedPower(@PowerComponentId int componentId, double componentPower, @PowerModel int powerModel) { mPowerComponentsBuilder.addConsumedPower(getKey(componentId, PROCESS_STATE_UNSPECIFIED), - componentPower, powerModel); + componentPower); return (T) this; } @SuppressWarnings("unchecked") @NonNull public T setConsumedPower(Key key, double componentPower, @PowerModel int powerModel) { - mPowerComponentsBuilder.setConsumedPower(key, componentPower, powerModel); + mPowerComponentsBuilder.setConsumedPower(key, componentPower); return (T) this; } @@ -1110,21 +1095,14 @@ public abstract class BatteryConsumer { @NonNull public T addConsumedPower(@PowerComponentId int componentId, double componentPower) { mPowerComponentsBuilder.addConsumedPower(getKey(componentId, PROCESS_STATE_UNSPECIFIED), - componentPower, POWER_MODEL_UNDEFINED); + componentPower); return (T) this; } @SuppressWarnings("unchecked") @NonNull public T addConsumedPower(Key key, double componentPower) { - mPowerComponentsBuilder.addConsumedPower(key, componentPower, POWER_MODEL_UNDEFINED); - return (T) this; - } - - @SuppressWarnings("unchecked") - @NonNull - public T addConsumedPower(Key key, double componentPower, @PowerModel int powerModel) { - mPowerComponentsBuilder.addConsumedPower(key, componentPower, powerModel); + mPowerComponentsBuilder.addConsumedPower(key, componentPower); return (T) this; } diff --git a/core/java/android/os/BatteryUsageStats.java b/core/java/android/os/BatteryUsageStats.java index 72e4cef2f6eb..f913fcfd56d4 100644 --- a/core/java/android/os/BatteryUsageStats.java +++ b/core/java/android/os/BatteryUsageStats.java @@ -114,7 +114,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { static final String XML_ATTR_POWER_STATE = "power_state"; static final String XML_ATTR_POWER = "power"; static final String XML_ATTR_DURATION = "duration"; - static final String XML_ATTR_MODEL = "model"; static final String XML_ATTR_BATTERY_CAPACITY = "battery_capacity"; static final String XML_ATTR_DISCHARGE_PERCENT = "discharge_pct"; static final String XML_ATTR_DISCHARGE_LOWER = "discharge_lower"; @@ -155,7 +154,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { private final long mBatteryTimeRemainingMs; private final long mChargeTimeRemainingMs; private final String[] mCustomPowerComponentNames; - private final boolean mIncludesPowerModels; private final boolean mIncludesProcessStateData; private final boolean mIncludesScreenStateData; private final boolean mIncludesPowerStateData; @@ -179,7 +177,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { mBatteryTimeRemainingMs = builder.mBatteryTimeRemainingMs; mChargeTimeRemainingMs = builder.mChargeTimeRemainingMs; mCustomPowerComponentNames = builder.mCustomPowerComponentNames; - mIncludesPowerModels = builder.mIncludePowerModels; mIncludesProcessStateData = builder.mIncludesProcessStateData; mIncludesScreenStateData = builder.mIncludesScreenStateData; mIncludesPowerStateData = builder.mIncludesPowerStateData; @@ -364,14 +361,13 @@ public final class BatteryUsageStats implements Parcelable, Closeable { mBatteryTimeRemainingMs = source.readLong(); mChargeTimeRemainingMs = source.readLong(); mCustomPowerComponentNames = source.readStringArray(); - mIncludesPowerModels = source.readBoolean(); mIncludesProcessStateData = source.readBoolean(); mIncludesScreenStateData = source.readBoolean(); mIncludesPowerStateData = source.readBoolean(); mBatteryConsumersCursorWindow = CursorWindow.newFromParcel(source); mBatteryConsumerDataLayout = BatteryConsumer.createBatteryConsumerDataLayout( - mCustomPowerComponentNames, mIncludesPowerModels, mIncludesProcessStateData, + mCustomPowerComponentNames, mIncludesProcessStateData, mIncludesScreenStateData, mIncludesPowerStateData); final int numRows = mBatteryConsumersCursorWindow.getNumRows(); @@ -424,7 +420,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { dest.writeLong(mBatteryTimeRemainingMs); dest.writeLong(mChargeTimeRemainingMs); dest.writeStringArray(mCustomPowerComponentNames); - dest.writeBoolean(mIncludesPowerModels); dest.writeBoolean(mIncludesProcessStateData); dest.writeBoolean(mIncludesScreenStateData); dest.writeBoolean(mIncludesPowerStateData); @@ -506,9 +501,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { getDischargeDurationMs()); deviceBatteryConsumer.writeStatsProto(proto, BatteryUsageStatsAtomsProto.DEVICE_BATTERY_CONSUMER); - if (mIncludesPowerModels) { - deviceBatteryConsumer.writePowerComponentModelProto(proto); - } writeUidBatteryConsumersProto(proto, maxRawSize); } @@ -629,7 +621,7 @@ public final class BatteryUsageStats implements Parcelable, Closeable { printPowerComponent(pw, prefix, mBatteryConsumerDataLayout.getPowerComponentName(powerComponent), - devicePowerMah, appsPowerMah, BatteryConsumer.POWER_MODEL_UNDEFINED, + devicePowerMah, appsPowerMah, deviceConsumer.getUsageDurationMillis(powerComponent)); } @@ -716,23 +708,15 @@ public final class BatteryUsageStats implements Parcelable, Closeable { printPowerComponent(pw, prefix, mBatteryConsumerDataLayout.getPowerComponentName(powerComponent), devicePowerMah, appsPowerMah, - mIncludesPowerModels ? deviceConsumer.getPowerModel(powerComponent) - : BatteryConsumer.POWER_MODEL_UNDEFINED, deviceConsumer.getUsageDurationMillis(dimensions)); } } private void printPowerComponent(PrintWriter pw, String prefix, String label, - double devicePowerMah, double appsPowerMah, int powerModel, long durationMs) { + double devicePowerMah, double appsPowerMah, long durationMs) { StringBuilder sb = new StringBuilder(); sb.append(prefix).append(" ").append(label).append(": ") .append(BatteryStats.formatCharge(devicePowerMah)); - if (powerModel != BatteryConsumer.POWER_MODEL_UNDEFINED - && powerModel != BatteryConsumer.POWER_MODEL_POWER_PROFILE) { - sb.append(" ["); - sb.append(BatteryConsumer.powerModelToString(powerModel)); - sb.append("]"); - } sb.append(" apps: ").append(BatteryStats.formatCharge(appsPowerMah)); if (durationMs != 0) { sb.append(" duration: "); @@ -828,7 +812,7 @@ public final class BatteryUsageStats implements Parcelable, Closeable { final boolean includesPowerStateData = parser.getAttributeBoolean(null, XML_ATTR_PREFIX_INCLUDES_POWER_STATE_DATA, false); - builder = new Builder(customComponentNames.toArray(new String[0]), true, + builder = new Builder(customComponentNames.toArray(new String[0]), includesProcStateData, includesScreenStateData, includesPowerStateData, 0); builder.setStatsStartTimestamp( @@ -913,7 +897,6 @@ public final class BatteryUsageStats implements Parcelable, Closeable { private final CursorWindow mBatteryConsumersCursorWindow; @NonNull private final String[] mCustomPowerComponentNames; - private final boolean mIncludePowerModels; private final boolean mIncludesProcessStateData; private final boolean mIncludesScreenStateData; private final boolean mIncludesPowerStateData; @@ -938,22 +921,21 @@ public final class BatteryUsageStats implements Parcelable, Closeable { private BatteryStatsHistory mBatteryStatsHistory; public Builder(@NonNull String[] customPowerComponentNames) { - this(customPowerComponentNames, false, false, false, false, 0); + this(customPowerComponentNames, false, false, false, 0); } - public Builder(@NonNull String[] customPowerComponentNames, boolean includePowerModels, + public Builder(@NonNull String[] customPowerComponentNames, boolean includeProcessStateData, boolean includeScreenStateData, boolean includesPowerStateData, double minConsumedPowerThreshold) { mBatteryConsumersCursorWindow = new CursorWindow(null, BATTERY_CONSUMER_CURSOR_WINDOW_SIZE); onCursorWindowAllocated(mBatteryConsumersCursorWindow); mBatteryConsumerDataLayout = BatteryConsumer.createBatteryConsumerDataLayout( - customPowerComponentNames, includePowerModels, includeProcessStateData, + customPowerComponentNames, includeProcessStateData, includeScreenStateData, includesPowerStateData); mBatteryConsumersCursorWindow.setNumColumns(mBatteryConsumerDataLayout.columnCount); mCustomPowerComponentNames = customPowerComponentNames; - mIncludePowerModels = includePowerModels; mIncludesProcessStateData = includeProcessStateData; mIncludesScreenStateData = includeScreenStateData; mIncludesPowerStateData = includesPowerStateData; diff --git a/core/java/android/os/BatteryUsageStatsQuery.java b/core/java/android/os/BatteryUsageStatsQuery.java index 6325b003a999..6e67578fadc8 100644 --- a/core/java/android/os/BatteryUsageStatsQuery.java +++ b/core/java/android/os/BatteryUsageStatsQuery.java @@ -24,6 +24,7 @@ import com.android.internal.os.MonotonicClock; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; /** * Query parameters for the {@link BatteryStatsManager#getBatteryUsageStats()} call. @@ -65,12 +66,6 @@ public final class BatteryUsageStatsQuery implements Parcelable { */ public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY = 0x0002; - /** - * Indicates that identifiers of power models used for computations of power - * consumption should be included in the BatteryUsageStats. - */ - public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS = 0x0004; - public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA = 0x0008; public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_VIRTUAL_UIDS = 0x0010; @@ -202,7 +197,24 @@ public final class BatteryUsageStatsQuery implements Parcelable { return mAggregatedToTimestamp; } + @Override + public String toString() { + return "BatteryUsageStatsQuery{" + + "mFlags=" + Integer.toHexString(mFlags) + + ", mUserIds=" + Arrays.toString(mUserIds) + + ", mMaxStatsAgeMs=" + mMaxStatsAgeMs + + ", mAggregatedFromTimestamp=" + mAggregatedFromTimestamp + + ", mAggregatedToTimestamp=" + mAggregatedToTimestamp + + ", mMonotonicStartTime=" + mMonotonicStartTime + + ", mMonotonicEndTime=" + mMonotonicEndTime + + ", mMinConsumedPowerThreshold=" + mMinConsumedPowerThreshold + + ", mPowerComponents=" + Arrays.toString(mPowerComponents) + + '}'; + } + private BatteryUsageStatsQuery(Parcel in) { + mMonotonicStartTime = in.readLong(); + mMonotonicEndTime = in.readLong(); mFlags = in.readInt(); mUserIds = new int[in.readInt()]; in.readIntArray(mUserIds); @@ -215,6 +227,8 @@ public final class BatteryUsageStatsQuery implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { + dest.writeLong(mMonotonicStartTime); + dest.writeLong(mMonotonicEndTime); dest.writeInt(mFlags); dest.writeInt(mUserIds.length); dest.writeIntArray(mUserIds); @@ -311,7 +325,10 @@ public final class BatteryUsageStatsQuery implements Parcelable { * power monitoring data is available. * * Should only be used for testing and debugging. + * + * @deprecated PowerModel is no longer supported */ + @Deprecated public Builder powerProfileModeledOnly() { mFlags |= BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_POWER_PROFILE_MODEL; return this; @@ -322,9 +339,10 @@ public final class BatteryUsageStatsQuery implements Parcelable { * of power consumption. * * Should only be used for testing and debugging. + * @deprecated PowerModel is no longer supported */ + @Deprecated public Builder includePowerModels() { - mFlags |= BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS; return this; } diff --git a/core/java/android/os/CpuHeadroomParams.java b/core/java/android/os/CpuHeadroomParams.java index f0d4f7d8737f..8e78b7e355f9 100644 --- a/core/java/android/os/CpuHeadroomParams.java +++ b/core/java/android/os/CpuHeadroomParams.java @@ -18,10 +18,13 @@ package android.os; import android.annotation.FlaggedApi; import android.annotation.IntDef; +import android.annotation.IntRange; +import android.annotation.NonNull; import android.os.health.SystemHealthManager; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; /** * Headroom request params used by {@link SystemHealthManager#getCpuHeadroom(CpuHeadroomParams)}. @@ -54,6 +57,16 @@ public final class CpuHeadroomParams { public static final int CPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; /** + * Minimum CPU headroom calculation window size. + */ + public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; + + /** + * Maximum CPU headroom calculation window size. + */ + public static final int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; + + /** * Sets the headroom calculation type. * <p> * @@ -83,6 +96,63 @@ public final class CpuHeadroomParams { } /** + * Sets the headroom calculation window size in milliseconds. + * <p> + * + * @param windowMillis the window size in milliseconds, ranged from + * [{@link #CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN}, + * {@link #CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX}]. The smaller + * the value, the larger fluctuation in value should be expected. The + * default value can be retrieved from the + * {@link #getCalculationWindowMillis}. The device will try to use the + * closest feasible window size to this param. + * @throws IllegalArgumentException if the window size is not in allowed range. + */ + public void setCalculationWindowMillis( + @IntRange(from = CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to = + CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int windowMillis) { + if (windowMillis < CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN + || windowMillis > CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) { + throw new IllegalArgumentException("Invalid calculation window: " + windowMillis); + } + mInternal.calculationWindowMillis = windowMillis; + } + + /** + * Gets the headroom calculation window size in milliseconds. + * <p> + * This will return the default value chosen by the device if not set. + */ + public @IntRange(from = CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to = + CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) long getCalculationWindowMillis() { + return mInternal.calculationWindowMillis; + } + + /** + * Sets the thread TIDs to track. + * <p> + * The TIDs should belong to the same of the process that will the headroom call. And they + * should not have different core affinity. + * <p> + * If not set, the headroom will be based on the PID of the process making the call. + * + * @param tids non-empty list of TIDs, maximum 5. + * @throws IllegalArgumentException if the list size is not in allowed range or TID is not + * positive. + */ + public void setTids(@NonNull int... tids) { + if (tids.length == 0 || tids.length > 5) { + throw new IllegalArgumentException("Invalid number of TIDs: " + tids.length); + } + for (int tid : tids) { + if (tid <= 0) { + throw new IllegalArgumentException("Invalid TID: " + tid); + } + } + mInternal.tids = Arrays.copyOf(tids, tids.length); + } + + /** * @hide */ public CpuHeadroomParamsInternal getInternal() { diff --git a/core/java/android/os/CpuHeadroomParamsInternal.aidl b/core/java/android/os/CpuHeadroomParamsInternal.aidl index 6cc4699a809e..d572f965579b 100644 --- a/core/java/android/os/CpuHeadroomParamsInternal.aidl +++ b/core/java/android/os/CpuHeadroomParamsInternal.aidl @@ -25,6 +25,8 @@ import android.hardware.power.CpuHeadroomParams; @JavaDerive(equals = true, toString = true) parcelable CpuHeadroomParamsInternal { boolean usesDeviceHeadroom = false; + int[] tids; + int calculationWindowMillis = 1000; CpuHeadroomParams.CalculationType calculationType = CpuHeadroomParams.CalculationType.MIN; CpuHeadroomParams.SelectionType selectionType = CpuHeadroomParams.SelectionType.ALL; } diff --git a/core/java/android/os/GpuHeadroomParams.java b/core/java/android/os/GpuHeadroomParams.java index efb2a28ad2b5..4dc98264e57b 100644 --- a/core/java/android/os/GpuHeadroomParams.java +++ b/core/java/android/os/GpuHeadroomParams.java @@ -18,6 +18,7 @@ package android.os; import android.annotation.FlaggedApi; import android.annotation.IntDef; +import android.annotation.IntRange; import android.os.health.SystemHealthManager; import java.lang.annotation.Retention; @@ -54,6 +55,16 @@ public final class GpuHeadroomParams { public static final int GPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1; /** + * Minimum GPU headroom calculation window size. + */ + public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; + + /** + * Maximum GPU headroom calculation window size. + */ + public static final int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; + + /** * Sets the headroom calculation type. * <p> * @@ -83,6 +94,39 @@ public final class GpuHeadroomParams { } /** + * Sets the headroom calculation window size in milliseconds. + * <p> + * + * @param windowMillis the window size in milliseconds, ranged from + * [{@link #GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN}, + * {@link #GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX}]. The smaller + * the value, the larger fluctuation in value should be expected. The + * default value can be retrieved from the + * {@link #getCalculationWindowMillis}. If the device will try to use the + * closest feasible window size to this param. + * @throws IllegalArgumentException if the window is invalid. + */ + public void setCalculationWindowMillis( + @IntRange(from = GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to = + GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int windowMillis) { + if (windowMillis < GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN + || windowMillis > GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) { + throw new IllegalArgumentException("Invalid calculation window: " + windowMillis); + } + mInternal.calculationWindowMillis = windowMillis; + } + + /** + * Gets the headroom calculation window size in milliseconds. + * <p> + * This will return the default value chosen by the device if not set. + */ + public @IntRange(from = GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN, to = + GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX) int getCalculationWindowMillis() { + return mInternal.calculationWindowMillis; + } + + /** * @hide */ public GpuHeadroomParamsInternal getInternal() { diff --git a/core/java/android/os/GpuHeadroomParamsInternal.aidl b/core/java/android/os/GpuHeadroomParamsInternal.aidl index 20309e7673f2..40d5d8e409ef 100644 --- a/core/java/android/os/GpuHeadroomParamsInternal.aidl +++ b/core/java/android/os/GpuHeadroomParamsInternal.aidl @@ -24,5 +24,6 @@ import android.hardware.power.GpuHeadroomParams; */ @JavaDerive(equals = true, toString = true) parcelable GpuHeadroomParamsInternal { + int calculationWindowMillis = 1000; GpuHeadroomParams.CalculationType calculationType = GpuHeadroomParams.CalculationType.MIN; } diff --git a/core/java/android/os/IHintManager.aidl b/core/java/android/os/IHintManager.aidl index a043da9b7a36..f1936b5e0ff9 100644 --- a/core/java/android/os/IHintManager.aidl +++ b/core/java/android/os/IHintManager.aidl @@ -21,7 +21,9 @@ import android.os.CpuHeadroomParamsInternal; import android.os.GpuHeadroomParamsInternal; import android.os.IHintSession; import android.os.SessionCreationConfig; +import android.hardware.power.CpuHeadroomResult; import android.hardware.power.ChannelConfig; +import android.hardware.power.GpuHeadroomResult; import android.hardware.power.SessionConfig; import android.hardware.power.SessionTag; @@ -53,9 +55,9 @@ interface IHintManager { */ @nullable ChannelConfig getSessionChannel(in IBinder token); oneway void closeSessionChannel(); - float[] getCpuHeadroom(in CpuHeadroomParamsInternal params); + @nullable CpuHeadroomResult getCpuHeadroom(in CpuHeadroomParamsInternal params); long getCpuHeadroomMinIntervalMillis(); - float getGpuHeadroom(in GpuHeadroomParamsInternal params); + @nullable GpuHeadroomResult getGpuHeadroom(in GpuHeadroomParamsInternal params); long getGpuHeadroomMinIntervalMillis(); /** diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index 94259d7cf819..f9789c19b0d5 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -91,6 +91,8 @@ per-file DdmSyncStageUpdater.java = sanglardf@google.com, rpaquay@google.com # PerformanceHintManager per-file CpuHeadroom*.aidl = file:/ADPF_OWNERS per-file GpuHeadroom*.aidl = file:/ADPF_OWNERS +per-file CpuHeadroom*.java = file:/ADPF_OWNERS +per-file GpuHeadroom*.java = file:/ADPF_OWNERS per-file PerformanceHintManager.java = file:/ADPF_OWNERS per-file WorkDuration.java = file:/ADPF_OWNERS per-file IHintManager.aidl = file:/ADPF_OWNERS diff --git a/core/java/android/os/PowerComponents.java b/core/java/android/os/PowerComponents.java index d116e0737c46..4db1f1b32407 100644 --- a/core/java/android/os/PowerComponents.java +++ b/core/java/android/os/PowerComponents.java @@ -15,7 +15,6 @@ */ package android.os; -import static android.os.BatteryConsumer.BatteryConsumerDataLayout.POWER_MODEL_NOT_INCLUDED; import static android.os.BatteryConsumer.POWER_COMPONENT_ANY; import static android.os.BatteryConsumer.POWER_COMPONENT_BASE; import static android.os.BatteryConsumer.POWER_STATE_ANY; @@ -156,15 +155,6 @@ class PowerComponents { return mData.layout.getPowerComponentName(componentId); } - @BatteryConsumer.PowerModel - int getPowerModel(BatteryConsumer.Key key) { - if (key.mPowerModelColumnIndex == POWER_MODEL_NOT_INCLUDED) { - throw new IllegalStateException( - "Power model IDs were not requested in the BatteryUsageStatsQuery"); - } - return mData.getInt(key.mPowerModelColumnIndex); - } - /** * Returns the amount of time used by the specified component, e.g. CPU, WiFi etc. * @@ -378,10 +368,6 @@ class PowerComponents { if (durationMs != 0) { serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_DURATION, durationMs); } - if (mData.layout.powerModelsIncluded) { - serializer.attributeInt(null, BatteryUsageStats.XML_ATTR_MODEL, - getPowerModel(key)); - } serializer.endTag(null, BatteryUsageStats.XML_TAG_COMPONENT); } serializer.endTag(null, BatteryUsageStats.XML_TAG_POWER_COMPONENTS); @@ -411,7 +397,6 @@ class PowerComponents { int powerState = POWER_STATE_UNSPECIFIED; double powerMah = 0; long durationMs = 0; - int model = BatteryConsumer.POWER_MODEL_UNDEFINED; for (int i = 0; i < parser.getAttributeCount(); i++) { switch (parser.getAttributeName(i)) { case BatteryUsageStats.XML_ATTR_ID: @@ -432,14 +417,11 @@ class PowerComponents { case BatteryUsageStats.XML_ATTR_DURATION: durationMs = parser.getAttributeLong(i); break; - case BatteryUsageStats.XML_ATTR_MODEL: - model = parser.getAttributeInt(i); - break; } } final BatteryConsumer.Key key = builder.mData.layout.getKey(componentId, processState, screenState, powerState); - builder.addConsumedPower(key, powerMah, model); + builder.addConsumedPower(key, powerMah); builder.addUsageDurationMillis(key, durationMs); break; } @@ -453,43 +435,28 @@ class PowerComponents { * Builder for PowerComponents. */ static final class Builder { - private static final byte POWER_MODEL_UNINITIALIZED = -1; - private final BatteryConsumer.BatteryConsumerData mData; private final double mMinConsumedPowerThreshold; Builder(BatteryConsumer.BatteryConsumerData data, double minConsumedPowerThreshold) { mData = data; mMinConsumedPowerThreshold = minConsumedPowerThreshold; - for (BatteryConsumer.Key key : mData.layout.keys) { - if (key.mPowerModelColumnIndex != POWER_MODEL_NOT_INCLUDED) { - mData.putInt(key.mPowerModelColumnIndex, POWER_MODEL_UNINITIALIZED); - } - } } /** - * @deprecated use {@link #addConsumedPower(BatteryConsumer.Key, double, int)} + * @deprecated use {@link #addConsumedPower(BatteryConsumer.Key, double)} */ @Deprecated @NonNull - public Builder setConsumedPower(BatteryConsumer.Key key, double componentPower, - int powerModel) { + public Builder setConsumedPower(BatteryConsumer.Key key, double componentPower) { mData.putDouble(key.mPowerColumnIndex, componentPower); - if (key.mPowerModelColumnIndex != POWER_MODEL_NOT_INCLUDED) { - mData.putInt(key.mPowerModelColumnIndex, powerModel); - } return this; } @NonNull - public Builder addConsumedPower(BatteryConsumer.Key key, double componentPower, - int powerModel) { + public Builder addConsumedPower(BatteryConsumer.Key key, double componentPower) { mData.putDouble(key.mPowerColumnIndex, mData.getDouble(key.mPowerColumnIndex) + componentPower); - if (key.mPowerModelColumnIndex != POWER_MODEL_NOT_INCLUDED) { - mData.putInt(key.mPowerModelColumnIndex, powerModel); - } return this; } @@ -547,28 +514,6 @@ class PowerComponents { mData.getLong(key.mDurationColumnIndex) + otherData.getLong(otherKey.mDurationColumnIndex)); } - if (key.mPowerModelColumnIndex == POWER_MODEL_NOT_INCLUDED) { - continue; - } - - boolean undefined = false; - if (otherKey.mPowerModelColumnIndex == POWER_MODEL_NOT_INCLUDED) { - undefined = true; - } else { - final int powerModel = mData.getInt(key.mPowerModelColumnIndex); - int otherPowerModel = otherData.getInt(otherKey.mPowerModelColumnIndex); - if (powerModel == POWER_MODEL_UNINITIALIZED) { - mData.putInt(key.mPowerModelColumnIndex, otherPowerModel); - } else if (powerModel != otherPowerModel - && otherPowerModel != POWER_MODEL_UNINITIALIZED) { - undefined = true; - } - } - - if (undefined) { - mData.putInt(key.mPowerModelColumnIndex, - BatteryConsumer.POWER_MODEL_UNDEFINED); - } } } @@ -594,13 +539,6 @@ class PowerComponents { @NonNull public PowerComponents build() { for (BatteryConsumer.Key key : mData.layout.keys) { - if (key.mPowerModelColumnIndex != POWER_MODEL_NOT_INCLUDED) { - if (mData.getInt(key.mPowerModelColumnIndex) == POWER_MODEL_UNINITIALIZED) { - mData.putInt(key.mPowerModelColumnIndex, - BatteryConsumer.POWER_MODEL_UNDEFINED); - } - } - if (mMinConsumedPowerThreshold != 0) { if (mData.getDouble(key.mPowerColumnIndex) < mMinConsumedPowerThreshold) { mData.putDouble(key.mPowerColumnIndex, 0); diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index 4db9bc333e2b..cd79e416531a 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -23,6 +23,8 @@ import android.annotation.Nullable; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.hardware.power.CpuHeadroomResult; +import android.hardware.power.GpuHeadroomResult; import android.os.BatteryStats; import android.os.Build; import android.os.Bundle; @@ -110,15 +112,16 @@ public class SystemHealthManager { } /** - * Provides an estimate of global available CPU headroom of the calling thread. + * Provides an estimate of global available CPU headroom. * <p> * * @param params params to customize the CPU headroom calculation, null to use default params. - * @return a single value a {@code Float.NaN} if it's temporarily unavailable. + * @return a single value headroom or a {@code Float.NaN} if it's temporarily unavailable. * A valid value is ranged from [0, 100], where 0 indicates no more CPU resources can be * granted. - * @throws UnsupportedOperationException if the API is unsupported or the request params can't - * be served. + * @throws UnsupportedOperationException if the API is unsupported. + * @throws SecurityException if the TIDs of the params don't belong to the same process. + * @throws IllegalStateException if the TIDs of the params don't have the same affinity setting. */ @FlaggedApi(android.os.Flags.FLAG_CPU_GPU_HEADROOMS) public @FloatRange(from = 0f, to = 100f) float getCpuHeadroom( @@ -127,8 +130,12 @@ public class SystemHealthManager { throw new UnsupportedOperationException(); } try { - return mHintManager.getCpuHeadroom( - params != null ? params.getInternal() : new CpuHeadroomParamsInternal())[0]; + final CpuHeadroomResult ret = mHintManager.getCpuHeadroom( + params != null ? params.getInternal() : new CpuHeadroomParamsInternal()); + if (ret == null || ret.getTag() != CpuHeadroomResult.globalHeadroom) { + return Float.NaN; + } + return ret.getGlobalHeadroom(); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } @@ -144,8 +151,7 @@ public class SystemHealthManager { * @return a single value headroom or a {@code Float.NaN} if it's temporarily unavailable. * A valid value is ranged from [0, 100], where 0 indicates no more GPU resources can be * granted. - * @throws UnsupportedOperationException if the API is unsupported or the request params can't - * be served. + * @throws UnsupportedOperationException if the API is unsupported. */ @FlaggedApi(android.os.Flags.FLAG_CPU_GPU_HEADROOMS) public @FloatRange(from = 0f, to = 100f) float getGpuHeadroom( @@ -154,8 +160,12 @@ public class SystemHealthManager { throw new UnsupportedOperationException(); } try { - return mHintManager.getGpuHeadroom( + final GpuHeadroomResult ret = mHintManager.getGpuHeadroom( params != null ? params.getInternal() : new GpuHeadroomParamsInternal()); + if (ret == null || ret.getTag() != GpuHeadroomResult.globalHeadroom) { + return Float.NaN; + } + return ret.getGlobalHeadroom(); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index a653e0a493ee..a7195834e6bb 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -436,3 +436,12 @@ flag { description: "Use profile labels from UserManager for default app section titles to allow partner customization" bug: "358369931" } + +flag { + name: "wallet_role_cross_user_enabled" + is_exported: true + is_fixed_read_only: true + namespace: "wallet_integration" + description: "Enable the Wallet role within profiles" + bug: "356107987" +} diff --git a/core/java/android/security/responsible_apis_flags.aconfig b/core/java/android/security/responsible_apis_flags.aconfig index 3c3570173442..a5c837b88fa4 100644 --- a/core/java/android/security/responsible_apis_flags.aconfig +++ b/core/java/android/security/responsible_apis_flags.aconfig @@ -132,3 +132,9 @@ flag { description: "Android Advanced Protection Mode Feature: Memory Tagging Extension" bug: "378931989" } +flag { + name: "aapm_feature_disable_cellular_2g" + namespace: "responsible_apis" + description: "Android Advanced Protection Mode Feature: Disable Cellular 2G" + bug: "377748286" +} diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index b6e114b3a3ca..a0feccd87a81 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1236,6 +1236,8 @@ public final class ViewRootImpl implements ViewParent, private @ActivityInfo.ColorMode int mCurrentColorMode = ActivityInfo.COLOR_MODE_DEFAULT; private long mColorModeLastSetMillis = -1; + private final boolean mIsSubscribeGranularDisplayEventsEnabled; + public ViewRootImpl(Context context, Display display) { this(context, display, WindowManagerGlobal.getWindowSession(), new WindowLayout()); } @@ -1333,6 +1335,8 @@ public final class ViewRootImpl implements ViewParent, // Disable DRAW_WAKE_LOCK starting U. mDisableDrawWakeLock = CompatChanges.isChangeEnabled(DISABLE_DRAW_WAKE_LOCK) && disableDrawWakeLock(); + mIsSubscribeGranularDisplayEventsEnabled = + com.android.server.display.feature.flags.Flags.subscribeGranularDisplayEvents(); } public static void addFirstDrawHandler(Runnable callback) { @@ -1810,14 +1814,22 @@ public final class ViewRootImpl implements ViewParent, mAccessibilityInteractionConnectionManager, mHandler); mAccessibilityManager.addHighContrastTextStateChangeListener( mExecutor, mHighContrastTextManager); + + + long eventsToBeRegistered = + (mIsSubscribeGranularDisplayEventsEnabled) + ? DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED + | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_STATE + | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REMOVED + : DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED + | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_CHANGED + | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REMOVED; DisplayManagerGlobal .getInstance() .registerDisplayListener( mDisplayListener, mHandler, - DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED - | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_CHANGED - | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REMOVED, + eventsToBeRegistered, mBasePackageName); if (forceInvertColor()) { diff --git a/core/java/android/view/accessibility/AccessibilityEvent.java b/core/java/android/view/accessibility/AccessibilityEvent.java index 0dfaf4149ce5..88ccf88d40f6 100644 --- a/core/java/android/view/accessibility/AccessibilityEvent.java +++ b/core/java/android/view/accessibility/AccessibilityEvent.java @@ -959,6 +959,8 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par CONTENT_CHANGE_TYPE_CONTENT_INVALID, CONTENT_CHANGE_TYPE_ERROR, CONTENT_CHANGE_TYPE_ENABLED, + CONTENT_CHANGE_TYPE_CHECKED, + CONTENT_CHANGE_TYPE_EXPANDED, CONTENT_CHANGE_TYPE_SUPPLEMENTAL_DESCRIPTION, }) public @interface ContentChangeTypes {} @@ -1241,6 +1243,16 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par case CONTENT_CHANGE_TYPE_ERROR: return "CONTENT_CHANGE_TYPE_ERROR"; case CONTENT_CHANGE_TYPE_ENABLED: return "CONTENT_CHANGE_TYPE_ENABLED"; default: { + if (Flags.triStateChecked()) { + if (type == CONTENT_CHANGE_TYPE_CHECKED) { + return "CONTENT_CHANGE_TYPE_CHECKED"; + } + } + if (Flags.a11yExpansionStateApi()) { + if (type == CONTENT_CHANGE_TYPE_EXPANDED) { + return "CONTENT_CHANGE_TYPE_EXPANDED"; + } + } if (Flags.supplementalDescription()) { if (type == CONTENT_CHANGE_TYPE_SUPPLEMENTAL_DESCRIPTION) { return "CONTENT_CHANGE_TYPE_SUPPLEMENTAL_DESCRIPTION"; diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 595eb260f998..7e3b90444429 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -1298,7 +1298,13 @@ public class RemoteViews implements Parcelable, Filter { @Override public void visitUris(@NonNull Consumer<Uri> visitor) { - if (mIntentId != -1 || mItems == null) { + if (mItems == null) { + // Null item indicates adapter conversion took place, so the URIs in cached items + // need to be validated. + RemoteCollectionItems cachedItems = mCollectionCache.getItemsForId(mIntentId); + if (cachedItems != null) { + cachedItems.visitUris(visitor); + } return; } diff --git a/core/java/android/window/WindowContext.java b/core/java/android/window/WindowContext.java index fdaab66f2de3..2b370b9797e5 100644 --- a/core/java/android/window/WindowContext.java +++ b/core/java/android/window/WindowContext.java @@ -94,6 +94,23 @@ public class WindowContext extends ContextWrapper implements WindowProvider { mController.attachToDisplayArea(mType, getDisplayId(), mOptions); } + /** + * Updates this context to a new displayId. + * <p> + * Note that this doesn't re-parent previously attached windows (they should be removed and + * re-added manually after this is called). Resources associated with this context will have + * the correct value and configuration for the new display after this is called. + */ + @Override + public void updateDisplay(int displayId) { + if (displayId == getDisplayId()) { + return; + } + super.updateDisplay(displayId); + mController.detachIfNeeded(); + mController.attachToDisplayArea(mType, displayId, mOptions); + } + @Override public Object getSystemService(String name) { if (WINDOW_SERVICE.equals(name)) { diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java index 0c56c677e06f..6ad7fef95357 100644 --- a/core/java/com/android/internal/content/NativeLibraryHelper.java +++ b/core/java/com/android/internal/content/NativeLibraryHelper.java @@ -26,6 +26,7 @@ import static android.system.OsConstants.S_IXGRP; import static android.system.OsConstants.S_IXOTH; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.parsing.ApkLiteParseUtils; import android.content.pm.parsing.PackageLite; @@ -177,6 +178,13 @@ public class NativeLibraryHelper { private native static int nativeCopyNativeBinaries(long handle, String sharedLibraryPath, String abiToCopy, boolean extractNativeLibs, boolean debuggable); + private static native int nativeCheckAlignment( + long handle, + String sharedLibraryPath, + String abi, + boolean extractNativeLibs, + boolean debuggable); + private static long sumNativeBinaries(Handle handle, String abi) { long sum = 0; for (long apkHandle : handle.apkHandles) { @@ -432,6 +440,51 @@ public class NativeLibraryHelper { } } + /** + * Checks alignment of APK and native libraries for 16KB device + * + * @param handle APK file to scan for native libraries + * @param libraryRoot directory for libraries + * @param abiOverride abiOverride for package + * @return {@link Modes from ApplicationInfo.PageSizeAppCompat} if successful or error code + * which suggests undefined mode + */ + @ApplicationInfo.PageSizeAppCompatFlags + public static int checkAlignmentForCompatMode( + Handle handle, + String libraryRoot, + boolean nativeLibraryRootRequiresIsa, + String abiOverride) { + // Keep the code below in sync with copyNativeBinariesForSupportedAbi + int abi = findSupportedAbi(handle, Build.SUPPORTED_64_BIT_ABIS); + if (abi < 0) { + return ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + final String supportedAbi = Build.SUPPORTED_64_BIT_ABIS[abi]; + final String instructionSet = VMRuntime.getInstructionSet(supportedAbi); + String subDir = libraryRoot; + if (nativeLibraryRootRequiresIsa) { + subDir += "/" + instructionSet; + } + + int mode = ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + for (long apkHandle : handle.apkHandles) { + int res = + nativeCheckAlignment( + apkHandle, + subDir, + Build.SUPPORTED_64_BIT_ABIS[abi], + handle.extractNativeLibs, + handle.debuggable); + if (res == ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_ERROR) { + return res; + } + mode |= res; + } + return mode; + } + public static long sumNativeBinariesWithOverride(Handle handle, String abiOverride) throws IOException { long sum = 0; diff --git a/core/java/com/android/internal/jank/Cuj.java b/core/java/com/android/internal/jank/Cuj.java index 1204ef3f48fc..fc415377f1ee 100644 --- a/core/java/com/android/internal/jank/Cuj.java +++ b/core/java/com/android/internal/jank/Cuj.java @@ -235,8 +235,19 @@ public class Cuj { */ public static final int CUJ_DESKTOP_MODE_SNAP_RESIZE = 118; + /** + * Track unmaximize window interaction in desktop mode. + * + * <p> Tracking starts when the maximize button or option is clicked {@link + * com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel#onClick} + * and finishes when the animation finishes {@link + * com.android.wm.shell.windowdecor.ToggleResizeDesktopTaskTransitionHandler#startAnimation} + * </p> + */ + public static final int CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW = 119; + // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE. - @VisibleForTesting static final int LAST_CUJ = CUJ_DESKTOP_MODE_SNAP_RESIZE; + @VisibleForTesting static final int LAST_CUJ = CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW; /** @hide */ @IntDef({ @@ -346,7 +357,8 @@ public class Cuj { CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH, CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE, CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE, - CUJ_DESKTOP_MODE_SNAP_RESIZE + CUJ_DESKTOP_MODE_SNAP_RESIZE, + CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW }) @Retention(RetentionPolicy.SOURCE) public @interface CujType {} @@ -467,6 +479,7 @@ public class Cuj { CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE; CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_SNAP_RESIZE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_SNAP_RESIZE; + CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_UNMAXIMIZE_WINDOW; } private Cuj() { @@ -699,6 +712,8 @@ public class Cuj { return "DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE"; case CUJ_DESKTOP_MODE_SNAP_RESIZE: return "DESKTOP_MODE_SNAP_RESIZE"; + case CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW: + return "DESKTOP_MODE_UNMAXIMIZE_WINDOW"; } return "UNKNOWN"; } diff --git a/core/java/com/android/internal/pm/parsing/pkg/PackageImpl.java b/core/java/com/android/internal/pm/parsing/pkg/PackageImpl.java index 48d0d6c777de..5ec5762c0533 100644 --- a/core/java/com/android/internal/pm/parsing/pkg/PackageImpl.java +++ b/core/java/com/android/internal/pm/parsing/pkg/PackageImpl.java @@ -392,6 +392,10 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, private int memtagMode; @ApplicationInfo.NativeHeapZeroInitialized private int nativeHeapZeroInitialized; + + @ApplicationInfo.PageSizeAppCompatFlags private int mPageSizeAppCompatFlags = + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + @Nullable @DataClass.ParcelWith(Parcelling.BuiltIn.ForBoolean.class) private Boolean requestRawExternalStorageAccess; @@ -1118,6 +1122,12 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, return nativeHeapZeroInitialized; } + @ApplicationInfo.PageSizeAppCompatFlags + @Override + public int getPageSizeAppCompatFlags() { + return mPageSizeAppCompatFlags; + } + @Override public int getNetworkSecurityConfigResourceId() { return networkSecurityConfigRes; @@ -2221,6 +2231,12 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, } @Override + public PackageImpl setPageSizeAppCompatFlags(@ApplicationInfo.PageSizeAppCompatFlags int flag) { + mPageSizeAppCompatFlags = flag; + return this; + } + + @Override public PackageImpl setNetworkSecurityConfigResourceId(int value) { networkSecurityConfigRes = value; return this; @@ -2703,6 +2719,7 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, appInfo.setKnownActivityEmbeddingCerts(mKnownActivityEmbeddingCerts); } appInfo.allowCrossUidActivitySwitchFromBelow = mAllowCrossUidActivitySwitchFromBelow; + appInfo.setPageSizeAppCompatFlags(mPageSizeAppCompatFlags); return appInfo; } @@ -3305,6 +3322,7 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, dest.writeInt(this.mIntentMatchingFlags); dest.writeIntArray(this.mAlternateLauncherIconResIds); dest.writeIntArray(this.mAlternateLauncherLabelResIds); + dest.writeInt(this.mPageSizeAppCompatFlags); } private void writeFeatureFlagState(@NonNull Parcel dest) { @@ -3499,6 +3517,7 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal, this.mIntentMatchingFlags = in.readInt(); this.mAlternateLauncherIconResIds = in.createIntArray(); this.mAlternateLauncherLabelResIds = in.createIntArray(); + this.mPageSizeAppCompatFlags = in.readInt(); assignDerivedFields(); assignDerivedFields2(); diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java index 67b985a61455..5062d58d4dca 100644 --- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java +++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java @@ -31,7 +31,6 @@ import android.util.ArraySet; import android.util.SparseArray; import android.util.SparseIntArray; -import com.android.internal.R; import com.android.internal.pm.parsing.pkg.ParsedPackage; import com.android.internal.pm.pkg.component.ParsedActivity; import com.android.internal.pm.pkg.component.ParsedApexSystemService; @@ -280,6 +279,9 @@ public interface ParsingPackage { ParsingPackage setNativeHeapZeroInitialized( @ApplicationInfo.NativeHeapZeroInitialized int nativeHeapZeroInitialized); + /** Manifest option pageSizeCompat will populate this field */ + ParsingPackage setPageSizeAppCompatFlags(@ApplicationInfo.PageSizeAppCompatFlags int value); + ParsingPackage setRequestRawExternalStorageAccess( @Nullable Boolean requestRawExternalStorageAccess); diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java index 5fc1276dd9f9..0f93e6e8109b 100644 --- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java +++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java @@ -541,6 +541,7 @@ public class ParsingPackageUtils { pkg.setGwpAsanMode(-1); pkg.setMemtagMode(-1); + pkg.setPageSizeAppCompatFlags(ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED); afterParseBaseApplication(pkg); @@ -2182,6 +2183,13 @@ public class ParsingPackageUtils { pkg.setGwpAsanMode(sa.getInt(R.styleable.AndroidManifestApplication_gwpAsanMode, -1)); pkg.setMemtagMode(sa.getInt(R.styleable.AndroidManifestApplication_memtagMode, -1)); + + if (Flags.appCompatOption16kb()) { + pkg.setPageSizeAppCompatFlags( + sa.getInt(R.styleable.AndroidManifestApplication_pageSizeCompat, + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED)); + } + if (sa.hasValue(R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized)) { final boolean v = sa.getBoolean( R.styleable.AndroidManifestApplication_nativeHeapZeroInitialized, false); diff --git a/core/java/com/android/server/pm/pkg/AndroidPackage.java b/core/java/com/android/server/pm/pkg/AndroidPackage.java index d05f5e3950b4..70dd10f2c371 100644 --- a/core/java/com/android/server/pm/pkg/AndroidPackage.java +++ b/core/java/com/android/server/pm/pkg/AndroidPackage.java @@ -875,6 +875,14 @@ public interface AndroidPackage { int getMemtagMode(); /** + * @see ApplicationInfo#getPageSizeAppCompatFlags() + * @see R.styleable#AndroidManifestApplication_pageSizeCompat + * @hide + */ + @ApplicationInfo.PageSizeAppCompatFlags + int getPageSizeAppCompatFlags(); + + /** * TODO(b/135203078): Make all the Bundles immutable (and non-null by shared empty reference?) * @see R.styleable#AndroidManifestMetaData * @hide diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 7ad18b83f0d6..b2eeff36c007 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -21,6 +21,7 @@ #include <androidfw/ApkParsing.h> #include <androidfw/ZipFileRO.h> #include <androidfw/ZipUtils.h> +#include <elf.h> #include <errno.h> #include <fcntl.h> #include <inttypes.h> @@ -38,6 +39,7 @@ #include <memory> #include <string> +#include <vector> #include "com_android_internal_content_FileSystemUtils.h" #include "core_jni_helpers.h" @@ -60,6 +62,12 @@ enum install_status_t { NO_NATIVE_LIBRARIES = -114 }; +// These code should match with PageSizeAppCompatFlags inside ApplicationInfo.java +constexpr int PAGE_SIZE_APP_COMPAT_FLAG_ERROR = -1; +constexpr int PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED = 0; +constexpr int PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED = 1 << 1; +constexpr int PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED = 1 << 2; + typedef install_status_t (*iterFunc)(JNIEnv*, void*, ZipFileRO*, ZipEntryRO, const char*); static bool @@ -524,11 +532,7 @@ static inline bool app_compat_16kb_enabled() { static const size_t kPageSize = getpagesize(); // App compat is only applicable on 16kb-page-size devices. - if (kPageSize != 0x4000) { - return false; - } - - return android::base::GetBoolProperty("bionic.linker.16kb.app_compat.enabled", false); + return kPageSize == 0x4000; } static jint @@ -626,6 +630,166 @@ com_android_internal_content_NativeLibraryHelper_openApkFd(JNIEnv *env, jclass, return reinterpret_cast<jlong>(zipFile); } +static jint checkLoadSegmentAlignment(const char* fileName, off64_t offset) { + std::vector<Elf64_Phdr> programHeaders; + if (!getLoadSegmentPhdrs(fileName, offset, programHeaders)) { + ALOGE("Failed to read program headers from ELF file."); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + int mode = PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + for (auto programHeader : programHeaders) { + if (programHeader.p_type != PT_LOAD) { + continue; + } + + // Set ELF alignment bit if 4 KB aligned LOAD segment is found + if (programHeader.p_align == 0x1000) { + ALOGI("Setting page size compat mode PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED"); + mode |= PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED; + break; + } + } + + return mode; +} + +static jint checkExtractedLibAlignment(ZipFileRO* zipFile, ZipEntryRO zipEntry, + const char* fileName, const std::string nativeLibPath) { + // Build local file path + const size_t fileNameLen = strlen(fileName); + char localFileName[nativeLibPath.size() + fileNameLen + 2]; + + if (strlcpy(localFileName, nativeLibPath.c_str(), sizeof(localFileName)) != + nativeLibPath.size()) { + ALOGE("Couldn't allocate local file name for library"); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + *(localFileName + nativeLibPath.size()) = '/'; + + if (strlcpy(localFileName + nativeLibPath.size() + 1, fileName, + sizeof(localFileName) - nativeLibPath.size() - 1) != fileNameLen) { + ALOGE("Couldn't allocate local file name for library"); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + struct statfs64 fsInfo; + int result = statfs64(localFileName, &fsInfo); + if (result < 0) { + ALOGE("Failed to stat file :%s", localFileName); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + return checkLoadSegmentAlignment(localFileName, 0); +} + +static jint checkAlignment(JNIEnv* env, jstring javaNativeLibPath, jboolean extractNativeLibs, + ZipFileRO* zipFile, ZipEntryRO zipEntry, const char* fileName) { + int mode = PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + // Need two separate install status for APK and ELF alignment + static const size_t kPageSize = getpagesize(); + jint ret = INSTALL_SUCCEEDED; + + ScopedUtfChars nativeLibPath(env, javaNativeLibPath); + if (extractNativeLibs) { + ALOGI("extractNativeLibs specified, checking for extracted lib %s", fileName); + return checkExtractedLibAlignment(zipFile, zipEntry, fileName, nativeLibPath.c_str()); + } + + uint16_t method; + off64_t offset; + if (!zipFile->getEntryInfo(zipEntry, &method, nullptr, nullptr, &offset, nullptr, nullptr, + nullptr)) { + ALOGE("Couldn't read zip entry info from zipFile %s", zipFile->getZipFileName()); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + // check if library is uncompressed and page-aligned + if (method != ZipFileRO::kCompressStored) { + ALOGE("Library '%s' is compressed - will not be able to open it directly from apk.\n", + fileName); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + if (offset % kPageSize != 0) { + ALOGW("Library '%s' is not PAGE(%zu)-aligned - will not be able to open it directly " + "from apk.\n", + fileName, kPageSize); + mode |= PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED; + ALOGI("Setting page size compat mode " + "PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED for %s", + zipFile->getZipFileName()); + } + + int loadMode = checkLoadSegmentAlignment(zipFile->getZipFileName(), offset); + if (loadMode == PAGE_SIZE_APP_COMPAT_FLAG_ERROR) { + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + mode |= loadMode; + return mode; +} + +// TODO(b/371049373): This function is copy of iterateOverNativeFiles with different way of handling +// and combining return values for all ELF and APKs. Find a way to consolidate two functions. +static jint com_android_internal_content_NativeLibraryHelper_checkApkAlignment( + JNIEnv* env, jclass clazz, jlong apkHandle, jstring javaNativeLibPath, jstring javaCpuAbi, + jboolean extractNativeLibs, jboolean debuggable) { + int mode = PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + ZipFileRO* zipFile = reinterpret_cast<ZipFileRO*>(apkHandle); + if (zipFile == nullptr) { + ALOGE("zipfile handle is null"); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + auto result = NativeLibrariesIterator::create(zipFile, debuggable); + if (!result.ok()) { + ALOGE("Can't iterate over native libs for file:%s", zipFile->getZipFileName()); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + std::unique_ptr<NativeLibrariesIterator> it(std::move(result.value())); + + const ScopedUtfChars cpuAbi(env, javaCpuAbi); + if (cpuAbi.c_str() == nullptr) { + ALOGE("cpuAbi is nullptr"); + // This would've thrown, so this return code isn't observable by Java. + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + + while (true) { + auto next = it->next(); + if (!next.ok()) { + ALOGE("next iterator not found Error:%d", next.error()); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + auto entry = next.value(); + if (entry == nullptr) { + break; + } + + const char* fileName = it->currentEntry(); + const char* lastSlash = it->lastSlash(); + + // Check to make sure the CPU ABI of this file is one we support. + const char* cpuAbiOffset = fileName + APK_LIB_LEN; + const size_t cpuAbiRegionSize = lastSlash - cpuAbiOffset; + + if (cpuAbi.size() == cpuAbiRegionSize && + !strncmp(cpuAbiOffset, cpuAbi.c_str(), cpuAbiRegionSize)) { + int ret = checkAlignment(env, javaNativeLibPath, extractNativeLibs, zipFile, entry, + lastSlash + 1); + if (ret == PAGE_SIZE_APP_COMPAT_FLAG_ERROR) { + ALOGE("Alignment check returned for zipfile: %s, entry:%s", + zipFile->getZipFileName(), lastSlash + 1); + return PAGE_SIZE_APP_COMPAT_FLAG_ERROR; + } + mode |= ret; + } + } + + return mode; +} + static void com_android_internal_content_NativeLibraryHelper_close(JNIEnv *env, jclass, jlong apkHandle) { @@ -633,29 +797,23 @@ com_android_internal_content_NativeLibraryHelper_close(JNIEnv *env, jclass, jlon } static const JNINativeMethod gMethods[] = { - {"nativeOpenApk", - "(Ljava/lang/String;)J", - (void *)com_android_internal_content_NativeLibraryHelper_openApk}, - {"nativeOpenApkFd", - "(Ljava/io/FileDescriptor;Ljava/lang/String;)J", - (void *)com_android_internal_content_NativeLibraryHelper_openApkFd}, - {"nativeClose", - "(J)V", - (void *)com_android_internal_content_NativeLibraryHelper_close}, - {"nativeCopyNativeBinaries", - "(JLjava/lang/String;Ljava/lang/String;ZZ)I", - (void *)com_android_internal_content_NativeLibraryHelper_copyNativeBinaries}, - {"nativeSumNativeBinaries", - "(JLjava/lang/String;Z)J", - (void *)com_android_internal_content_NativeLibraryHelper_sumNativeBinaries}, - {"nativeFindSupportedAbi", - "(J[Ljava/lang/String;Z)I", - (void *)com_android_internal_content_NativeLibraryHelper_findSupportedAbi}, - {"hasRenderscriptBitcode", "(J)I", - (void *)com_android_internal_content_NativeLibraryHelper_hasRenderscriptBitcode}, + {"nativeOpenApk", "(Ljava/lang/String;)J", + (void*)com_android_internal_content_NativeLibraryHelper_openApk}, + {"nativeOpenApkFd", "(Ljava/io/FileDescriptor;Ljava/lang/String;)J", + (void*)com_android_internal_content_NativeLibraryHelper_openApkFd}, + {"nativeClose", "(J)V", (void*)com_android_internal_content_NativeLibraryHelper_close}, + {"nativeCopyNativeBinaries", "(JLjava/lang/String;Ljava/lang/String;ZZ)I", + (void*)com_android_internal_content_NativeLibraryHelper_copyNativeBinaries}, + {"nativeSumNativeBinaries", "(JLjava/lang/String;Z)J", + (void*)com_android_internal_content_NativeLibraryHelper_sumNativeBinaries}, + {"nativeFindSupportedAbi", "(J[Ljava/lang/String;Z)I", + (void*)com_android_internal_content_NativeLibraryHelper_findSupportedAbi}, + {"hasRenderscriptBitcode", "(J)I", + (void*)com_android_internal_content_NativeLibraryHelper_hasRenderscriptBitcode}, + {"nativeCheckAlignment", "(JLjava/lang/String;Ljava/lang/String;ZZ)I", + (void*)com_android_internal_content_NativeLibraryHelper_checkApkAlignment}, }; - int register_com_android_internal_content_NativeLibraryHelper(JNIEnv *env) { return RegisterMethodsOrDie(env, diff --git a/core/proto/android/content/package_item_info.proto b/core/proto/android/content/package_item_info.proto index b7408a4da381..facadeedd1f8 100644 --- a/core/proto/android/content/package_item_info.proto +++ b/core/proto/android/content/package_item_info.proto @@ -114,6 +114,7 @@ message ApplicationInfoProto { optional int32 enable_memtag = 20; optional bool native_heap_zero_init = 21; optional bool allow_cross_uid_activity_switch_from_below = 22; + optional int32 enable_page_size_app_compat = 23; } optional Detail detail = 17; repeated string overlay_paths = 18; diff --git a/core/res/res/layout/notification_2025_template_collapsed_base.xml b/core/res/res/layout/notification_2025_template_collapsed_base.xml index 4eac6d991272..a790e5da20de 100644 --- a/core/res/res/layout/notification_2025_template_collapsed_base.xml +++ b/core/res/res/layout/notification_2025_template_collapsed_base.xml @@ -123,7 +123,7 @@ <!-- This is the simplest way to keep this text vertically centered without gravity="center_vertical" which causes jumpiness in expansion animations. --> <include - layout="@layout/notification_2025_template_text" + layout="@layout/notification_2025_text" android:layout_width="match_parent" android:layout_height="@dimen/notification_text_height" android:layout_gravity="center_vertical" diff --git a/core/res/res/layout/notification_2025_template_collapsed_media.xml b/core/res/res/layout/notification_2025_template_collapsed_media.xml new file mode 100644 index 000000000000..427c4e42e40c --- /dev/null +++ b/core/res/res/layout/notification_2025_template_collapsed_media.xml @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<!-- Note: This is the old media style notification (different from UMO). --> + +<!-- extends FrameLayout --> +<com.android.internal.widget.MediaNotificationView + android:id="@+id/status_bar_latest_event_content" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_min_height" + android:tag="media" + > + + + <ImageView + android:id="@+id/left_icon" + android:layout_width="@dimen/notification_2025_left_icon_size" + android:layout_height="@dimen/notification_2025_left_icon_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_left_icon_start" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + android:visibility="gone" + /> + + <com.android.internal.widget.NotificationRowIconView + android:id="@+id/icon" + android:layout_width="@dimen/notification_2025_icon_circle_size" + android:layout_height="@dimen/notification_2025_icon_circle_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_icon_circle_start" + android:background="@drawable/notification_icon_circle" + android:padding="@dimen/notification_2025_icon_circle_padding" + /> + + <FrameLayout + android:id="@+id/alternate_expand_target" + android:layout_width="@dimen/notification_2025_content_margin_start" + android:layout_height="match_parent" + android:layout_gravity="start" + android:importantForAccessibility="no" + android:focusable="false" + /> + + <LinearLayout + android:id="@+id/notification_headerless_view_row" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="@dimen/notification_2025_content_margin_start" + android:orientation="horizontal" + > + + <LinearLayout + android:id="@+id/notification_headerless_view_column" + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:layout_marginBottom="@dimen/notification_headerless_margin_twoline" + android:layout_marginTop="@dimen/notification_headerless_margin_twoline" + android:orientation="vertical" + > + + <NotificationTopLineView + android:id="@+id/notification_top_line" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_headerless_line_height" + android:clipChildren="false" + android:theme="@style/Theme.DeviceDefault.Notification" + > + + <!-- + NOTE: The notification_top_line_views layout contains the app_name_text. + In order to include the title view at the beginning, the Notification.Builder + has logic to hide that view whenever this title view is to be visible. + --> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:ellipsize="end" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAlignment="viewStart" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" + /> + + <include layout="@layout/notification_top_line_views" /> + + </NotificationTopLineView> + + <LinearLayout + android:id="@+id/notification_main_column" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + > + + <com.android.internal.widget.NotificationVanishingFrameLayout + android:layout_width="match_parent" + android:layout_height="@dimen/notification_headerless_line_height" + > + <!-- This is the simplest way to keep this text vertically centered without + gravity="center_vertical" which causes jumpiness in expansion animations. --> + <include + layout="@layout/notification_template_text" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_text_height" + android:layout_gravity="center_vertical" + android:layout_marginTop="0dp" + /> + </com.android.internal.widget.NotificationVanishingFrameLayout> + + <include + layout="@layout/notification_template_progress" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_headerless_line_height" + /> + + </LinearLayout> + + </LinearLayout> + + <ImageView + android:id="@+id/right_icon" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginTop="@dimen/notification_right_icon_headerless_margin" + android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin" + android:layout_marginStart="@dimen/notification_right_icon_content_margin" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + /> + + <LinearLayout + android:id="@+id/media_actions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layoutDirection="ltr" + android:orientation="horizontal" + > + <include + layout="@layout/notification_material_media_action" + android:id="@+id/action0" + /> + <include + layout="@layout/notification_material_media_action" + android:id="@+id/action1" + /> + <include + layout="@layout/notification_material_media_action" + android:id="@+id/action2" + /> + </LinearLayout> + + <FrameLayout + android:id="@+id/expand_button_touch_container" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="@dimen/notification_content_margin_end" + > + + <include layout="@layout/notification_expand_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + /> + + </FrameLayout> + + </LinearLayout> +</com.android.internal.widget.MediaNotificationView> diff --git a/core/res/res/layout/notification_2025_template_collapsed_messaging.xml b/core/res/res/layout/notification_2025_template_collapsed_messaging.xml new file mode 100644 index 000000000000..f0e4c0f272fb --- /dev/null +++ b/core/res/res/layout/notification_2025_template_collapsed_messaging.xml @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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 + --> + +<!-- Note: This is the old "Messaging Style" notification (not a conversation). --> + +<!-- extends FrameLayout --> +<com.android.internal.widget.MessagingLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/status_bar_latest_event_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:tag="messaging" + > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:orientation="vertical" + > + + + <com.android.internal.widget.NotificationMaxHeightFrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_min_height" + android:clipChildren="false" + > + + <ImageView + android:id="@+id/left_icon" + android:layout_width="@dimen/notification_2025_left_icon_size" + android:layout_height="@dimen/notification_2025_left_icon_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_left_icon_start" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + android:visibility="gone" + /> + + <com.android.internal.widget.NotificationRowIconView + android:id="@+id/icon" + android:layout_width="@dimen/notification_2025_icon_circle_size" + android:layout_height="@dimen/notification_2025_icon_circle_size" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="@dimen/notification_icon_circle_start" + android:background="@drawable/notification_icon_circle" + android:padding="@dimen/notification_2025_icon_circle_padding" + /> + + <FrameLayout + android:id="@+id/alternate_expand_target" + android:layout_width="@dimen/notification_2025_content_margin_start" + android:layout_height="match_parent" + android:layout_gravity="start" + android:importantForAccessibility="no" + android:focusable="false" + /> + + <!-- + NOTE: to make the expansion animation of id/notification_messaging happen vertically, + its X positioning must be the left edge of the notification, so instead of putting the + layout_marginStart on the id/notification_headerless_view_row, we put it on + id/notification_top_line, making the layout here just a bit different from the base. + --> + <LinearLayout + android:id="@+id/notification_headerless_view_row" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:clipChildren="false" + > + + <!-- + NOTE: because messaging will always have 2 lines, this LinearLayout should NOT + have the id/notification_headerless_view_column, as that is used for modifying + vertical margins to accommodate the single-line state that base supports + --> + <LinearLayout + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:layout_marginBottom="@dimen/notification_headerless_margin_twoline" + android:layout_marginTop="@dimen/notification_headerless_margin_twoline" + android:layout_marginStart="@dimen/notification_2025_content_margin_start" + android:clipChildren="false" + android:orientation="vertical" + > + + <NotificationTopLineView + android:id="@+id/notification_top_line" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_headerless_line_height" + android:clipChildren="false" + android:theme="@style/Theme.DeviceDefault.Notification" + > + + <!-- + NOTE: The notification_top_line_views layout contains the app_name_text. + In order to include the title view at the beginning, the Notification.Builder + has logic to hide that view whenever this title view is to be visible. + --> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:ellipsize="end" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAlignment="viewStart" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" + /> + + <include layout="@layout/notification_top_line_views" /> + + </NotificationTopLineView> + + <LinearLayout + android:id="@+id/notification_main_column" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:clipChildren="false" + > + <com.android.internal.widget.MessagingLinearLayout + android:id="@+id/notification_messaging" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:spacing="@dimen/notification_messaging_spacing" /> + </LinearLayout> + + </LinearLayout> + + <!-- Images --> + <com.android.internal.widget.MessagingLinearLayout + android:id="@+id/conversation_image_message_container" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginTop="@dimen/notification_right_icon_headerless_margin" + android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin" + android:layout_marginStart="@dimen/notification_right_icon_content_margin" + android:forceHasOverlappingRendering="false" + android:spacing="0dp" + android:clipChildren="false" + android:visibility="gone" + /> + + <ImageView + android:id="@+id/right_icon" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="center_vertical|end" + android:layout_marginTop="@dimen/notification_right_icon_headerless_margin" + android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin" + android:layout_marginStart="@dimen/notification_right_icon_content_margin" + android:background="@drawable/notification_large_icon_outline" + android:clipToOutline="true" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + /> + + <FrameLayout + android:id="@+id/expand_button_touch_container" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="@dimen/notification_content_margin_end" + > + + <include layout="@layout/notification_expand_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + /> + + </FrameLayout> + + </LinearLayout> + + </com.android.internal.widget.NotificationMaxHeightFrameLayout> + + <LinearLayout + android:id="@+id/notification_action_list_margin_target" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-20dp" + android:clipChildren="false" + android:orientation="vertical"> + <include layout="@layout/notification_template_smart_reply_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginStart="@dimen/notification_2025_content_margin_start" + android:layout_marginEnd="@dimen/notification_content_margin_end" /> + <include layout="@layout/notification_material_action_list" /> + </LinearLayout> +</LinearLayout> +</com.android.internal.widget.MessagingLayout> diff --git a/core/res/res/layout/notification_2025_template_text.xml b/core/res/res/layout/notification_2025_text.xml index 48b1083a5e53..48b1083a5e53 100644 --- a/core/res/res/layout/notification_2025_template_text.xml +++ b/core/res/res/layout/notification_2025_text.xml diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 7ef539492aa4..cdf184c9c944 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1867,8 +1867,12 @@ 16 KB device. 4 KB natives libs will be loaded app-compat mode if they are eligible. @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) --> <attr name="pageSizeCompat"> - <enum name="enabled" value="5" /> - <enum name="disabled" value="6" /> + <!-- value for enabled must match with + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED --> + <enum name="enabled" value="32" /> + <!-- value for disabled must match with + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED --> + <enum name="disabled" value="64" /> </attr> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 38ebda733270..73d696ba3567 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -6003,6 +6003,12 @@ <!-- If true, show multiuser switcher by default unless the user specifically disables it. --> <bool name="config_showUserSwitcherByDefault">false</bool> + <!-- If true, user can change state of multiuser switcher. --> + <bool name="config_allowChangeUserSwitcherEnabled">true</bool> + + <!-- If true, multiuser switcher would be automatically enabled when second user is created on the device. --> + <bool name="config_enableUserSwitcherUponUserCreation">true</bool> + <!-- Set to true to make assistant show in front of the dream/screensaver. --> <bool name="config_assistantOnTopOfDream">false</bool> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 413f0c3e0c58..d498b9191559 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -199,6 +199,21 @@ <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. --> <string name="CLIRDefaultOffNextCallOff">Caller ID defaults to not restricted. Next call: Not restricted</string> + <!-- Message displayed in dialog when APK is not 16 KB aligned. [CHAR LIMIT=NONE] --> + <string name="page_size_compat_apk_warning">This app isn’t 16 KB compatible. APK alignment check failed. + This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. + For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> </string> + + <!-- Message displayed in dialog when ELF is not 16 KB aligned. [CHAR LIMIT=NONE] --> + <string name="page_size_compat_elf_warning">This app isn’t 16 KB compatible. ELF alignment check failed. + This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. + For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a></string> + + <!-- Message displayed in dialog when APK and ELF are not 16 KB aligned. [CHAR LIMIT=NONE] --> + <string name="page_size_compat_apk_and_elf_warning">This app isn’t 16 KB compatible. APK and ELF alignment checks failed. + This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. + For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a></string> + <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. --> <string name="serviceNotProvisioned">Service not provisioned.</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index fc24f4599b25..2f82011726ec 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2393,6 +2393,8 @@ <java-symbol type="layout" name="notification_2025_template_expanded_base" /> <java-symbol type="layout" name="notification_2025_template_heads_up_base" /> <java-symbol type="layout" name="notification_2025_template_header" /> + <java-symbol type="layout" name="notification_2025_template_collapsed_messaging" /> + <java-symbol type="layout" name="notification_2025_template_collapsed_media" /> <java-symbol type="layout" name="notification_template_material_base" /> <java-symbol type="layout" name="notification_template_material_heads_up_base" /> <java-symbol type="layout" name="notification_template_material_compact_heads_up_base" /> @@ -3310,6 +3312,11 @@ <java-symbol type="string" name="language_selection_title" /> <java-symbol type="string" name="search_language_hint" /> + <!-- Strings for page size app compat dialog --> + <java-symbol type="string" name="page_size_compat_apk_warning" /> + <java-symbol type="string" name="page_size_compat_elf_warning" /> + <java-symbol type="string" name="page_size_compat_apk_and_elf_warning" /> + <!-- Work profile unlaunchable app alert dialog--> <java-symbol type="style" name="AlertDialogWithEmergencyButton"/> <java-symbol type="string" name="work_mode_emergency_call_button" /> @@ -4695,6 +4702,8 @@ <!-- If true, show multiuser switcher by default unless the user specifically disables it. --> <java-symbol type="bool" name="config_showUserSwitcherByDefault" /> + <java-symbol type="bool" name="config_allowChangeUserSwitcherEnabled" /> + <java-symbol type="bool" name="config_enableUserSwitcherUponUserCreation" /> <!-- Set to true to make assistant show in front of the dream/screensaver. --> <java-symbol type="bool" name="config_assistantOnTopOfDream"/> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_ltr.9.png b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_ltr.9.png Binary files differnew file mode 100644 index 000000000000..c7e937c6d77a --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_ltr.9.png diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_tr.9.png b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_tr.9.png Binary files differnew file mode 100644 index 000000000000..a3cff989bad8 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_tr.9.png diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/power_other_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/power_other_24.xml new file mode 100644 index 000000000000..c9fb53ee78da --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/power_other_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportHeight="960" + android:viewportWidth="960"> + <path + android:fillColor="@android:color/white" + android:pathData="M720,600L720,520L800,520Q817,520 828.5,531.5Q840,543 840,560Q840,577 828.5,588.5Q817,600 800,600L720,600ZM720,760L720,680L800,680Q817,680 828.5,691.5Q840,703 840,720Q840,737 828.5,748.5Q817,760 800,760L720,760ZM560,800Q527,800 503.5,776.5Q480,753 480,720L400,720L400,560L480,560Q480,527 503.5,503.5Q527,480 560,480L680,480L680,800L560,800ZM280,680Q214,680 167,633Q120,586 120,520Q120,454 167,407Q214,360 280,360L340,360Q365,360 382.5,342.5Q400,325 400,300Q400,275 382.5,257.5Q365,240 340,240L200,240Q183,240 171.5,228.5Q160,217 160,200Q160,183 171.5,171.5Q183,160 200,160L340,160Q398,160 439,201Q480,242 480,300Q480,358 439,399Q398,440 340,440L280,440Q247,440 223.5,463.5Q200,487 200,520Q200,553 223.5,576.5Q247,600 280,600L360,600L360,680L280,680Z" /> +</vector>
\ No newline at end of file diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_off_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_off_24.xml new file mode 100644 index 000000000000..ca9482503c92 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_off_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportHeight="960" + android:viewportWidth="960"> + <path + android:fillColor="@android:color/white" + android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" /> +</vector>
\ No newline at end of file diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_on_24.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_on_24.xml new file mode 100644 index 000000000000..48f990c3ba37 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_on_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportHeight="960" + android:viewportWidth="960"> + <path + android:fillColor="@android:color/white" + android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" /> +</vector>
\ No newline at end of file diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml index be0e135af23a..e1f46232488c 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (C) 2020 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,46 +13,127 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingTop="8dp" - android:paddingBottom="8dp"> - - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginEnd="8dp" - android:paddingBottom="8dp"/> - - <TextView - android:id="@+id/title" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearanceBody"/> + android:orientation="vertical"> - <TextView - android:id="@+id/value1" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:gravity="right" - android:maxLines="1" - android:textAppearance="@style/TextAppearanceBody"/> - - <TextView - android:id="@+id/value2" - android:layout_width="76dp" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:orientation="horizontal" + android:paddingBottom="8dp" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingTop="8dp"> + + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginEnd="8dp" + android:paddingBottom="8dp" /> + + <TextView + android:id="@+id/title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAppearance="@style/TextAppearanceBody" /> + + <TextView + android:id="@+id/value1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:gravity="right" + android:maxLines="1" + android:textAppearance="@style/TextAppearanceBody" /> + + <TextView + android:id="@+id/value2" + android:layout_width="76dp" + android:layout_height="wrap_content" + android:gravity="right" + android:maxLines="1" + android:textAppearance="@style/TextAppearanceBody" /> + </LinearLayout> + + <TableLayout + android:id="@+id/table" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="right" - android:maxLines="1" - android:textAppearance="@style/TextAppearanceBody"/> + android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd" + android:layout_marginStart="50dp" + android:stretchColumns="1,2,3,4"> + + <TableRow android:background="#EEFFEE"> + <LinearLayout + style="@style/TableCell.Start" + android:layout_width="65dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="3dip" + android:text="State" + android:textStyle="bold" /> + </LinearLayout> + + <RelativeLayout style="@style/TableCell.Inner"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/screen_on_24" + android:tint="@color/battery_consumer_slice_icon" /> + </RelativeLayout> + + <RelativeLayout style="@style/TableCell.Inner"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/screen_off_24" + android:tint="@color/battery_consumer_slice_icon" /> + </RelativeLayout> + + <RelativeLayout style="@style/TableCell.Inner"> + <ImageView + android:id="@+id/screen_on_24_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/screen_on_24" + android:tint="@color/battery_consumer_slice_icon" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/screen_on_24_icon" + android:src="@drawable/power_other_24" + android:tint="@color/battery_consumer_slice_icon" /> + </RelativeLayout> + + <RelativeLayout style="@style/TableCell.End"> + <ImageView + android:id="@+id/screen_off_24_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/screen_off_24" + android:tint="@color/battery_consumer_slice_icon" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/screen_off_24_icon" + android:src="@drawable/power_other_24" + android:tint="@color/battery_consumer_slice_icon" /> + </RelativeLayout> + </TableRow> + + <View + android:layout_height="1dip" + android:background="#000000" /> + </TableLayout> </LinearLayout> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml index 987de6bcb4f4..b88425a57187 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml @@ -14,16 +14,30 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<androidx.swiperefreshlayout.widget.SwipeRefreshLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/swipe_refresh" - android:paddingTop="?attr/actionBarSize" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical" + android:fitsSystemWindows="true"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/list_view" + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:elevation="4dp" + android:theme="@style/ThemeOverlay.AppCompat.ActionBar" /> -</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipe_refresh" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/list_view" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> +</LinearLayout> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_slices_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_slices_layout.xml new file mode 100644 index 000000000000..642c0deac6f4 --- /dev/null +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_slices_layout.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2024 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<TableRow xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout style="@style/TableCell.Start"> + <TextView + android:id="@+id/procState" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </LinearLayout> + + <LinearLayout + style="@style/TableCell.Inner" + android:orientation="vertical"> + <TextView + android:id="@+id/power_b_on" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + <TextView + android:id="@+id/duration_b_on" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + </LinearLayout> + + <LinearLayout + style="@style/TableCell.Inner" + android:orientation="vertical"> + <TextView + android:id="@+id/power_b_off" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + <TextView + android:id="@+id/duration_b_off" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + </LinearLayout> + + <LinearLayout + style="@style/TableCell.Inner" + android:orientation="vertical"> + <TextView + android:id="@+id/power_c_on" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + <TextView + android:id="@+id/duration_c_on" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + </LinearLayout> + + <LinearLayout + style="@style/TableCell.End" + android:orientation="vertical"> + <TextView + android:id="@+id/power_c_off" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + <TextView + android:id="@+id/duration_c_off" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" /> + </LinearLayout> +</TableRow> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml index 2d276a51a1da..46d8f04f9eef 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml @@ -17,13 +17,12 @@ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/swipe_refresh" - android:paddingTop="?attr/actionBarSize" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <LinearLayout android:orientation="vertical" - android:paddingTop="?attr/actionBarSize" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml index 6cc70bd1af61..1dc288af89b6 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml @@ -18,4 +18,5 @@ <resources> <color name="battery_consumer_bg_power_profile">#ffffff</color> <color name="battery_consumer_bg_energy_consumption">#fff5eb</color> + <color name="battery_consumer_slice_icon">#aaaaaa</color> </resources> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml index fa30b2c8dc6f..a298cc9f59e3 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml @@ -17,11 +17,9 @@ --> <resources> - <style name="Theme" parent="Theme.MaterialComponents.Light"> + <style name="Theme" parent="Theme.MaterialComponents.Light.NoActionBar"> <item name="colorPrimary">#34a853</item> - <item name="android:windowActionBar">true</item> - <item name="android:windowNoTitle">false</item> - <item name="android:windowDrawsSystemBarBackgrounds">false</item> + <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item> </style> <style name="LoadTestCardView" parent="Widget.MaterialComponents.CardView"> @@ -32,4 +30,25 @@ <item name="android:textColor">#000000</item> <item name="android:textSize">18sp</item> </style> -</resources>
\ No newline at end of file + + <style name="TableCell"> + <item name="android:layout_height">match_parent</item> + <item name="android:padding">4dp</item> + </style> + + <style name="TableCell.Start" parent="TableCell"> + <item name="android:background">@drawable/border_ltr</item> + </style> + + <style name="TableCell.Inner" parent="TableCell"> + <item name="android:background">@drawable/border_tr</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_weight">1</item> + </style> + + <style name="TableCell.End" parent="TableCell"> + <item name="android:background">@drawable/border_tr</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_weight">1</item> + </style> +</resources> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java index f691a1b90934..35175a755e89 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java @@ -31,22 +31,16 @@ public class BatteryConsumerData { public static final String UID_BATTERY_CONSUMER_ID_PREFIX = "APP|"; public static final String AGGREGATE_BATTERY_CONSUMER_ID = "SYS|"; - enum EntryType { - UID_TOTAL_POWER, - UID_POWER_PROFILE, - UID_POWER_PROFILE_PROCESS_STATE, - UID_POWER_ENERGY_CONSUMPTION, - UID_POWER_ENERGY_PROCESS_STATE, - UID_POWER_CUSTOM, - UID_DURATION, + public enum EntryType { DEVICE_TOTAL_POWER, - DEVICE_POWER_MODELED, + DEVICE_POWER, DEVICE_POWER_ENERGY_CONSUMPTION, DEVICE_POWER_CUSTOM, DEVICE_DURATION, + UID, } - enum ConsumerType { + public enum ConsumerType { UID_BATTERY_CONSUMER, DEVICE_POWER_COMPONENT, } @@ -56,34 +50,38 @@ public class BatteryConsumerData { public String title; public double value1; public double value2; + public List<Slice> slices; + } + + public static class Slice { + public int powerState; + public int screenState; + public int processState; + public double powerMah; + public long durationMs; } private BatteryConsumerInfoHelper.BatteryConsumerInfo mBatteryConsumerInfo; private final List<Entry> mEntries = new ArrayList<>(); public BatteryConsumerData(Context context, - List<BatteryUsageStats> batteryUsageStatsList, String batteryConsumerId) { + BatteryUsageStats batteryUsageStats, String batteryConsumerId) { switch (getConsumerType(batteryConsumerId)) { case UID_BATTERY_CONSUMER: - populateForUidBatteryConsumer(context, batteryUsageStatsList, batteryConsumerId); + populateForUidBatteryConsumer(context, batteryUsageStats, batteryConsumerId); break; case DEVICE_POWER_COMPONENT: - populateForAggregateBatteryConsumer(context, batteryUsageStatsList); + populateForAggregateBatteryConsumer(context, batteryUsageStats); break; } } - private void populateForUidBatteryConsumer( - Context context, List<BatteryUsageStats> batteryUsageStatsList, + private void populateForUidBatteryConsumer(Context context, BatteryUsageStats batteryUsageStats, String batteryConsumerId) { - BatteryUsageStats batteryUsageStats = batteryUsageStatsList.get(0); - BatteryUsageStats modeledBatteryUsageStats = batteryUsageStatsList.get(1); BatteryConsumer requestedBatteryConsumer = getRequestedBatteryConsumer(batteryUsageStats, batteryConsumerId); - BatteryConsumer requestedModeledBatteryConsumer = getRequestedBatteryConsumer( - modeledBatteryUsageStats, batteryConsumerId); - if (requestedBatteryConsumer == null || requestedModeledBatteryConsumer == null) { + if (requestedBatteryConsumer == null) { mBatteryConsumerInfo = null; return; } @@ -92,118 +90,95 @@ public class BatteryConsumerData { batteryUsageStats, batteryConsumerId, context.getPackageManager()); double[] totalPowerByComponentMah = new double[BatteryConsumer.POWER_COMPONENT_COUNT]; - double[] totalModeledPowerByComponentMah = - new double[BatteryConsumer.POWER_COMPONENT_COUNT]; long[] totalDurationByComponentMs = new long[BatteryConsumer.POWER_COMPONENT_COUNT]; - final int customComponentCount = - requestedBatteryConsumer.getCustomPowerComponentCount(); + final int customComponentCount = requestedBatteryConsumer.getCustomPowerComponentCount(); double[] totalCustomPowerByComponentMah = new double[customComponentCount]; computeTotalPower(batteryUsageStats, totalPowerByComponentMah); - computeTotalPower(modeledBatteryUsageStats, totalModeledPowerByComponentMah); computeTotalPowerForCustomComponent(batteryUsageStats, totalCustomPowerByComponentMah); computeTotalDuration(batteryUsageStats, totalDurationByComponentMs); - if (isPowerProfileModelsOnly(requestedBatteryConsumer)) { - addEntry("Consumed", EntryType.UID_TOTAL_POWER, - requestedBatteryConsumer.getConsumedPower(), - batteryUsageStats.getAggregateBatteryConsumer( - BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .getConsumedPower()); - } else { - addEntry("Consumed (PowerStats)", EntryType.UID_TOTAL_POWER, - requestedBatteryConsumer.getConsumedPower(), - batteryUsageStats.getAggregateBatteryConsumer( - BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .getConsumedPower()); - addEntry("Consumed (PowerProfile)", EntryType.UID_TOTAL_POWER, - requestedModeledBatteryConsumer.getConsumedPower(), - modeledBatteryUsageStats.getAggregateBatteryConsumer( - BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) - .getConsumedPower()); + Entry totalsEntry = addEntry("Consumed", EntryType.UID, + requestedBatteryConsumer.getConsumedPower(), + batteryUsageStats.getAggregateBatteryConsumer( + BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) + .getConsumedPower()); + addSlices(totalsEntry, requestedBatteryConsumer, BatteryConsumer.POWER_COMPONENT_BASE); + for (Slice slice : totalsEntry.slices) { + slice.powerMah = requestedBatteryConsumer.getConsumedPower( + new BatteryConsumer.Dimensions(BatteryConsumer.POWER_COMPONENT_ANY, + slice.processState, slice.screenState, slice.powerState)); } for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { + if (component == BatteryConsumer.POWER_COMPONENT_BASE) { + continue; + } final String metricTitle = getPowerMetricTitle(component); - final int powerModel = requestedBatteryConsumer.getPowerModel(component); - if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE - || powerModel == BatteryConsumer.POWER_MODEL_UNDEFINED) { - addEntry(metricTitle, EntryType.UID_POWER_PROFILE, - requestedBatteryConsumer.getConsumedPower(component), + double consumedPower = requestedBatteryConsumer.getConsumedPower(component); + if (consumedPower != 0) { + Entry entry = addEntry(metricTitle, EntryType.UID, consumedPower, totalPowerByComponentMah[component]); - addProcessStateEntries(metricTitle, EntryType.UID_POWER_PROFILE_PROCESS_STATE, - requestedBatteryConsumer, component); - } else { - addEntry(metricTitle + " (PowerStats)", EntryType.UID_POWER_ENERGY_CONSUMPTION, - requestedBatteryConsumer.getConsumedPower(component), - totalPowerByComponentMah[component]); - addProcessStateEntries(metricTitle, EntryType.UID_POWER_ENERGY_PROCESS_STATE, - requestedBatteryConsumer, component); - addEntry(metricTitle + " (PowerProfile)", EntryType.UID_POWER_PROFILE, - requestedModeledBatteryConsumer.getConsumedPower(component), - totalModeledPowerByComponentMah[component]); - addProcessStateEntries(metricTitle, EntryType.UID_POWER_PROFILE_PROCESS_STATE, - requestedModeledBatteryConsumer, component); + addSlices(entry, requestedBatteryConsumer, component); } } for (int component = 0; component < customComponentCount; component++) { - final String name = requestedBatteryConsumer.getCustomPowerComponentName( - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component); - addEntry(name + " (PowerStats)", EntryType.UID_POWER_CUSTOM, - requestedBatteryConsumer.getConsumedPowerForCustomComponent( - BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component), - totalCustomPowerByComponentMah[component] - ); - } - - for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { - final String metricTitle = getTimeMetricTitle(component); - addEntry(metricTitle, EntryType.UID_DURATION, - requestedBatteryConsumer.getUsageDurationMillis(component), - totalDurationByComponentMs[component] - ); + int componentId = BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component; + final String name = requestedBatteryConsumer.getCustomPowerComponentName(componentId); + double consumedPower = requestedBatteryConsumer.getConsumedPower(componentId); + if (consumedPower != 0) { + Entry entry = addEntry(name, EntryType.UID, consumedPower, + totalCustomPowerByComponentMah[component]); + addSlices(entry, requestedBatteryConsumer, componentId); + } } mBatteryConsumerInfo = BatteryConsumerInfoHelper.makeBatteryConsumerInfo(batteryUsageStats, batteryConsumerId, context.getPackageManager()); } - private void addProcessStateEntries(String metricTitle, EntryType entryType, - BatteryConsumer batteryConsumer, int component) { + private void addSlices(Entry entry, BatteryConsumer batteryConsumer, int component) { final BatteryConsumer.Key[] keys = batteryConsumer.getKeys(component); if (keys == null || keys.length <= 1) { return; } + boolean hasProcStateData = false; for (BatteryConsumer.Key key : keys) { - String label; - switch (key.processState) { - case BatteryConsumer.PROCESS_STATE_FOREGROUND: - label = "foreground"; - break; - case BatteryConsumer.PROCESS_STATE_BACKGROUND: - label = "background"; - break; - case BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE: - label = "FGS"; - break; - case BatteryConsumer.PROCESS_STATE_CACHED: - label = "cached"; - break; - default: - continue; + if (key.processState != BatteryConsumer.PROCESS_STATE_UNSPECIFIED) { + hasProcStateData = true; + break; } - addEntry(metricTitle + " \u2022 " + label, entryType, - batteryConsumer.getConsumedPower(key), 0); } + + ArrayList<Slice> slices = new ArrayList<>(); + for (BatteryConsumer.Key key : keys) { + if (hasProcStateData && key.processState == BatteryConsumer.PROCESS_STATE_UNSPECIFIED) { + continue; + } + + double powerMah = batteryConsumer.getConsumedPower(key); + long durationMs = batteryConsumer.getUsageDurationMillis(key); + + if (powerMah == 0 && durationMs == 0) { + continue; + } + + Slice slice = new Slice(); + slice.powerState = key.powerState; + slice.screenState = key.screenState; + slice.processState = key.processState; + slice.powerMah = powerMah; + slice.durationMs = durationMs; + + slices.add(slice); + } + entry.slices = slices; } private void populateForAggregateBatteryConsumer(Context context, - List<BatteryUsageStats> batteryUsageStatsList) { - BatteryUsageStats batteryUsageStats = batteryUsageStatsList.get(0); - BatteryUsageStats modeledBatteryUsageStats = batteryUsageStatsList.get(1); - + BatteryUsageStats batteryUsageStats) { final BatteryConsumer deviceBatteryConsumer = batteryUsageStats.getAggregateBatteryConsumer( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE); @@ -211,46 +186,18 @@ public class BatteryConsumerData { batteryUsageStats.getAggregateBatteryConsumer( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS); - BatteryConsumer modeledDeviceBatteryConsumer = - modeledBatteryUsageStats.getAggregateBatteryConsumer( - BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE); - BatteryConsumer modeledAppsBatteryConsumer = - modeledBatteryUsageStats.getAggregateBatteryConsumer( - BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS); - - if (isPowerProfileModelsOnly(deviceBatteryConsumer)) { - addEntry("Consumed", EntryType.DEVICE_TOTAL_POWER, - deviceBatteryConsumer.getConsumedPower(), - appsBatteryConsumer.getConsumedPower()); - } else { - addEntry("Consumed (PowerStats)", EntryType.DEVICE_TOTAL_POWER, - deviceBatteryConsumer.getConsumedPower(), - appsBatteryConsumer.getConsumedPower()); - addEntry("Consumed (PowerProfile)", EntryType.DEVICE_TOTAL_POWER, - modeledDeviceBatteryConsumer.getConsumedPower(), - modeledAppsBatteryConsumer.getConsumedPower()); - } + addEntry("Consumed", EntryType.DEVICE_TOTAL_POWER, + deviceBatteryConsumer.getConsumedPower(), + appsBatteryConsumer.getConsumedPower()); mBatteryConsumerInfo = BatteryConsumerInfoHelper.makeBatteryConsumerInfo(batteryUsageStats, AGGREGATE_BATTERY_CONSUMER_ID, context.getPackageManager()); - for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { final String metricTitle = getPowerMetricTitle(component); - final int powerModel = deviceBatteryConsumer.getPowerModel(component); - if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE - || powerModel == BatteryConsumer.POWER_MODEL_UNDEFINED) { - addEntry(metricTitle, EntryType.DEVICE_POWER_MODELED, - deviceBatteryConsumer.getConsumedPower(component), - appsBatteryConsumer.getConsumedPower(component)); - } else { - addEntry(metricTitle + " (PowerStats)", EntryType.DEVICE_POWER_ENERGY_CONSUMPTION, - deviceBatteryConsumer.getConsumedPower(component), - appsBatteryConsumer.getConsumedPower(component)); - addEntry(metricTitle + " (PowerProfile)", EntryType.DEVICE_POWER_MODELED, - modeledDeviceBatteryConsumer.getConsumedPower(component), - modeledAppsBatteryConsumer.getConsumedPower(component)); - } + addEntry(metricTitle, EntryType.DEVICE_POWER, + deviceBatteryConsumer.getConsumedPower(component), + appsBatteryConsumer.getConsumedPower(component)); } final int customComponentCount = @@ -258,10 +205,10 @@ public class BatteryConsumerData { for (int component = 0; component < customComponentCount; component++) { final String name = deviceBatteryConsumer.getCustomPowerComponentName( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component); - addEntry(name + " (PowerStats)", EntryType.DEVICE_POWER_CUSTOM, - deviceBatteryConsumer.getConsumedPowerForCustomComponent( + addEntry(name, EntryType.DEVICE_POWER_CUSTOM, + deviceBatteryConsumer.getConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component), - appsBatteryConsumer.getConsumedPowerForCustomComponent( + appsBatteryConsumer.getConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + component)); } @@ -272,17 +219,6 @@ public class BatteryConsumerData { } } - private boolean isPowerProfileModelsOnly(BatteryConsumer batteryConsumer) { - for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { - final int powerModel = batteryConsumer.getPowerModel(component); - if (powerModel != BatteryConsumer.POWER_MODEL_POWER_PROFILE - && powerModel != BatteryConsumer.POWER_MODEL_UNDEFINED) { - return false; - } - } - return true; - } - private BatteryConsumer getRequestedBatteryConsumer(BatteryUsageStats batteryUsageStats, String batteryConsumerId) { for (UidBatteryConsumer consumer : batteryUsageStats.getUidBatteryConsumers()) { @@ -352,13 +288,14 @@ public class BatteryConsumerData { } } - private void addEntry(String title, EntryType entryType, double value1, double value2) { + private Entry addEntry(String title, EntryType entryType, double value1, double value2) { Entry entry = new Entry(); entry.title = title; entry.entryType = entryType; entry.value1 = value1; entry.value2 = value2; mEntries.add(entry); + return entry; } public BatteryConsumerInfoHelper.BatteryConsumerInfo getBatteryConsumerInfo() { diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java index c6d71c3f573a..37d6b17a665c 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerInfoHelper.java @@ -24,6 +24,8 @@ import android.os.UidBatteryConsumer; import androidx.annotation.NonNull; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.List; class BatteryConsumerInfoHelper { @@ -76,6 +78,8 @@ class BatteryConsumerInfoHelper { String packageWithHighestDrain = uidBatteryConsumer.getPackageWithHighestDrain(); if (uid == Process.ROOT_UID) { info.label = "<root>"; + } else if (uid < Process.FIRST_APPLICATION_UID) { + info.label = makeSystemUidLabel(uid); } else { String[] packages = packageManager.getPackagesForUid(uid); String primaryPackageName = null; @@ -134,6 +138,23 @@ class BatteryConsumerInfoHelper { return info; } + private static CharSequence makeSystemUidLabel(int uid) { + for (Field field : Process.class.getDeclaredFields()) { + final int modifiers = field.getModifiers(); + if (Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers) + && field.getType().equals(int.class) && field.getName().endsWith("_UID")) { + try { + if (uid == field.getInt(null)) { + String label = field.getName(); + return label.substring(0, label.lastIndexOf("_UID")); + } + } catch (IllegalAccessException ignored) { + } + } + } + return null; + } + private static BatteryConsumerInfo makeAggregateBatteryConsumerInfo( BatteryUsageStats batteryUsageStats) { BatteryConsumerInfo info = new BatteryConsumerInfo(); diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java index 4469168a77b4..3699690aca59 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java @@ -30,8 +30,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.activity.ComponentActivity; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; @@ -50,7 +50,7 @@ import java.util.Locale; * Picker, showing a sorted lists of applications and other types of entities consuming power. * Opens BatteryStatsViewerActivity upon item selection. */ -public class BatteryConsumerPickerActivity extends ComponentActivity { +public class BatteryConsumerPickerActivity extends AppCompatActivity { private static final String PREF_SELECTED_BATTERY_CONSUMER = "batteryConsumerId"; private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000; private static final String FORCE_FRESH_STATS = "force_fresh_stats"; @@ -68,6 +68,7 @@ public class BatteryConsumerPickerActivity extends ComponentActivity { super.onCreate(icicle); setContentView(R.layout.battery_consumer_picker_layout); + setSupportActionBar(findViewById(R.id.toolbar)); mSwipeRefreshLayout = findViewById(R.id.swipe_refresh); mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_green_light); diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java index e165c49ff55d..350213161b7b 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java @@ -17,14 +17,18 @@ package com.android.frameworks.core.batterystatsviewer; import android.content.Context; +import android.os.BatteryConsumer; import android.os.BatteryStatsManager; import android.os.BatteryUsageStats; import android.os.BatteryUsageStatsQuery; import android.os.Bundle; +import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.TableLayout; +import android.widget.TableRow; import android.widget.TextView; import android.widget.Toast; @@ -40,6 +44,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.android.settingslib.utils.AsyncLoaderCompat; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -63,7 +68,16 @@ public class BatteryStatsViewerActivity extends ComponentActivity { private SwipeRefreshLayout mSwipeRefreshLayout; private View mCardView; private View mEmptyView; - private List<BatteryUsageStats> mBatteryUsageStats; + private BatteryUsageStats mBatteryUsageStats; + + private static SparseArray<String> sProcStateNames = new SparseArray<>(); + static { + sProcStateNames.put(BatteryConsumer.PROCESS_STATE_UNSPECIFIED, "-"); + sProcStateNames.put(BatteryConsumer.PROCESS_STATE_FOREGROUND, "FG"); + sProcStateNames.put(BatteryConsumer.PROCESS_STATE_BACKGROUND, "BG"); + sProcStateNames.put(BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE, "FGS"); + sProcStateNames.put(BatteryConsumer.PROCESS_STATE_CACHED, "Cached"); + } @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -122,7 +136,7 @@ public class BatteryStatsViewerActivity extends ComponentActivity { } private static class BatteryUsageStatsLoader extends - AsyncLoaderCompat<List<BatteryUsageStats>> { + AsyncLoaderCompat<BatteryUsageStats> { private final BatteryStatsManager mBatteryStatsManager; private final boolean mForceFreshStats; @@ -133,51 +147,44 @@ public class BatteryStatsViewerActivity extends ComponentActivity { } @Override - public List<BatteryUsageStats> loadInBackground() { + public BatteryUsageStats loadInBackground() { final int maxStatsAgeMs = mForceFreshStats ? 0 : BATTERY_STATS_REFRESH_RATE_MILLIS; final BatteryUsageStatsQuery queryDefault = new BatteryUsageStatsQuery.Builder() - .includePowerModels() .includeProcessStateData() + .includeScreenStateData() + .includePowerStateData() .setMaxStatsAgeMs(maxStatsAgeMs) .build(); - final BatteryUsageStatsQuery queryPowerProfileModeledOnly = - new BatteryUsageStatsQuery.Builder() - .powerProfileModeledOnly() - .includePowerModels() - .includeProcessStateData() - .setMaxStatsAgeMs(maxStatsAgeMs) - .build(); - return mBatteryStatsManager.getBatteryUsageStats( - List.of(queryDefault, queryPowerProfileModeledOnly)); + return mBatteryStatsManager.getBatteryUsageStats(queryDefault); } @Override - protected void onDiscardResult(List<BatteryUsageStats> result) { + protected void onDiscardResult(BatteryUsageStats result) { } } private class BatteryUsageStatsLoaderCallbacks - implements LoaderCallbacks<List<BatteryUsageStats>> { + implements LoaderCallbacks<BatteryUsageStats> { @NonNull @Override - public Loader<List<BatteryUsageStats>> onCreateLoader(int id, Bundle args) { + public Loader<BatteryUsageStats> onCreateLoader(int id, Bundle args) { return new BatteryUsageStatsLoader(BatteryStatsViewerActivity.this, args.getBoolean(FORCE_FRESH_STATS)); } @Override - public void onLoadFinished(@NonNull Loader<List<BatteryUsageStats>> loader, - List<BatteryUsageStats> batteryUsageStats) { + public void onLoadFinished(@NonNull Loader<BatteryUsageStats> loader, + BatteryUsageStats batteryUsageStats) { onBatteryUsageStatsLoaded(batteryUsageStats); } @Override - public void onLoaderReset(@NonNull Loader<List<BatteryUsageStats>> loader) { + public void onLoaderReset(@NonNull Loader<BatteryUsageStats> loader) { } } - private void onBatteryUsageStatsLoaded(List<BatteryUsageStats> batteryUsageStats) { + private void onBatteryUsageStatsLoaded(BatteryUsageStats batteryUsageStats) { mBatteryUsageStats = batteryUsageStats; onBatteryStatsDataLoaded(); } @@ -238,10 +245,21 @@ public class BatteryStatsViewerActivity extends ComponentActivity { private static class BatteryStatsDataAdapter extends RecyclerView.Adapter<BatteryStatsDataAdapter.ViewHolder> { public static class ViewHolder extends RecyclerView.ViewHolder { + public static class SliceViewHolder { + public TableRow tableRow; + public int procState; + public int powerState; + public int screenState; + public TextView powerTextView; + public TextView durationTextView; + } + public ImageView iconImageView; public TextView titleTextView; public TextView value1TextView; public TextView value2TextView; + public TableLayout table; + public List<SliceViewHolder> slices = new ArrayList<>(); ViewHolder(View itemView) { super(itemView); @@ -250,6 +268,40 @@ public class BatteryStatsViewerActivity extends ComponentActivity { titleTextView = itemView.findViewById(R.id.title); value1TextView = itemView.findViewById(R.id.value1); value2TextView = itemView.findViewById(R.id.value2); + table = itemView.findViewById(R.id.table); + + for (int i = 0; i < sProcStateNames.size(); i++) { + int procState = sProcStateNames.keyAt(i); + slices.add(createSliceViewHolder(procState, + BatteryConsumer.POWER_STATE_BATTERY, + BatteryConsumer.SCREEN_STATE_ON, + R.id.power_b_on, R.id.duration_b_on)); + slices.add(createSliceViewHolder(procState, + BatteryConsumer.POWER_STATE_BATTERY, + BatteryConsumer.SCREEN_STATE_OTHER, + R.id.power_b_off, R.id.duration_b_off)); + slices.add(createSliceViewHolder(procState, + BatteryConsumer.POWER_STATE_OTHER, + BatteryConsumer.SCREEN_STATE_ON, + R.id.power_c_on, R.id.duration_c_on)); + slices.add(createSliceViewHolder(procState, + BatteryConsumer.POWER_STATE_OTHER, + BatteryConsumer.SCREEN_STATE_OTHER, + R.id.power_c_off, R.id.duration_c_off)); + } + } + + private SliceViewHolder createSliceViewHolder(int procState, int powerState, + int screenState, int powerTextViewResId, int durationTextViewResId) { + TableRow powerRow = table.findViewWithTag("procstate" + procState); + SliceViewHolder svh = new SliceViewHolder(); + svh.tableRow = powerRow; + svh.procState = procState; + svh.powerState = powerState; + svh.screenState = screenState; + svh.powerTextView = powerRow.findViewById(powerTextViewResId); + svh.durationTextView = powerRow.findViewById(durationTextViewResId); + return svh; } } @@ -269,62 +321,32 @@ public class BatteryStatsViewerActivity extends ComponentActivity { @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int position) { LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext()); - View itemView = layoutInflater.inflate(R.layout.battery_consumer_entry_layout, parent, - false); + ViewGroup itemView = (ViewGroup) layoutInflater.inflate( + R.layout.battery_consumer_entry_layout, parent, false); + TableLayout table = itemView.findViewById(R.id.table); + int offset = 1; // Skip header + for (int i = 0; i < sProcStateNames.size(); i++) { + View powerRow = layoutInflater.inflate(R.layout.battery_consumer_slices_layout, + itemView, false); + ((TextView) powerRow.findViewById(R.id.procState)) + .setText(sProcStateNames.valueAt(i)); + powerRow.setTag("procstate" + sProcStateNames.keyAt(i)); + table.addView(powerRow, offset++); + } + return new ViewHolder(itemView); } @Override public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) { BatteryConsumerData.Entry entry = mEntries.get(position); - switch (entry.entryType) { - case UID_TOTAL_POWER: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_sum_24, 0); - setPowerText(viewHolder.value1TextView, entry.value1); - setProportionText(viewHolder.value2TextView, entry); - break; - case UID_POWER_PROFILE: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_calculate_24, - R.color.battery_consumer_bg_power_profile); - setPowerText(viewHolder.value1TextView, entry.value1); - setProportionText(viewHolder.value2TextView, entry); - break; - case UID_POWER_PROFILE_PROCESS_STATE: - setTitleIconAndBackground(viewHolder, " " + entry.title, - R.drawable.gm_calculate_24, - R.color.battery_consumer_bg_power_profile); - setPowerText(viewHolder.value1TextView, entry.value1); - viewHolder.value2TextView.setVisibility(View.INVISIBLE); - break; - case UID_POWER_ENERGY_CONSUMPTION: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_energy_24, - R.color.battery_consumer_bg_energy_consumption); - setPowerText(viewHolder.value1TextView, entry.value1); - setProportionText(viewHolder.value2TextView, entry); - break; - case UID_POWER_ENERGY_PROCESS_STATE: - setTitleIconAndBackground(viewHolder, " " + entry.title, - R.drawable.gm_energy_24, - R.color.battery_consumer_bg_energy_consumption); - setPowerText(viewHolder.value1TextView, entry.value1); - viewHolder.value2TextView.setVisibility(View.INVISIBLE); - break; - case UID_POWER_CUSTOM: + case UID: setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_energy_24, - R.color.battery_consumer_bg_energy_consumption); + R.drawable.gm_energy_24, 0); setPowerText(viewHolder.value1TextView, entry.value1); setProportionText(viewHolder.value2TextView, entry); - break; - case UID_DURATION: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_timer_24, 0); - setDurationText(viewHolder.value1TextView, (long) entry.value1); - setProportionText(viewHolder.value2TextView, entry); + bindSlices(viewHolder, entry); break; case DEVICE_TOTAL_POWER: setTitleIconAndBackground(viewHolder, entry.title, @@ -332,27 +354,13 @@ public class BatteryStatsViewerActivity extends ComponentActivity { setPowerText(viewHolder.value1TextView, entry.value1); setPowerText(viewHolder.value2TextView, entry.value2); break; - case DEVICE_POWER_MODELED: + case DEVICE_POWER: setTitleIconAndBackground(viewHolder, entry.title, R.drawable.gm_calculate_24, R.color.battery_consumer_bg_power_profile); setPowerText(viewHolder.value1TextView, entry.value1); setPowerText(viewHolder.value2TextView, entry.value2); break; - case DEVICE_POWER_ENERGY_CONSUMPTION: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_energy_24, - R.color.battery_consumer_bg_energy_consumption); - setPowerText(viewHolder.value1TextView, entry.value1); - setPowerText(viewHolder.value2TextView, entry.value2); - break; - case DEVICE_POWER_CUSTOM: - setTitleIconAndBackground(viewHolder, entry.title, - R.drawable.gm_energy_24, - R.color.battery_consumer_bg_energy_consumption); - setPowerText(viewHolder.value1TextView, entry.value1); - setPowerText(viewHolder.value2TextView, entry.value2); - break; case DEVICE_DURATION: setTitleIconAndBackground(viewHolder, entry.title, R.drawable.gm_timer_24, 0); @@ -362,6 +370,65 @@ public class BatteryStatsViewerActivity extends ComponentActivity { } } + private void bindSlices(ViewHolder viewHolder, BatteryConsumerData.Entry entry) { + if (entry.slices == null || entry.slices.isEmpty()) { + viewHolder.table.setVisibility(View.GONE); + return; + } + viewHolder.table.setVisibility(View.VISIBLE); + + boolean[] procStateRowPopulated = + new boolean[BatteryConsumer.PROCESS_STATE_COUNT]; + for (BatteryConsumerData.Slice s : entry.slices) { + if (s.powerMah != 0 || s.durationMs != 0) { + procStateRowPopulated[s.processState] = true; + } + } + + for (ViewHolder.SliceViewHolder sliceViewHolder : viewHolder.slices) { + BatteryConsumerData.Slice slice = null; + for (BatteryConsumerData.Slice s : entry.slices) { + if (s.powerState == sliceViewHolder.powerState + && s.screenState == sliceViewHolder.screenState + && s.processState == sliceViewHolder.procState) { + slice = s; + break; + } + } + if (!procStateRowPopulated[sliceViewHolder.procState]) { + sliceViewHolder.tableRow.setVisibility(View.GONE); + } else { + sliceViewHolder.tableRow.setVisibility(View.VISIBLE); + + if (slice != null && (slice.powerMah != 0 || slice.durationMs != 0)) { + sliceViewHolder.powerTextView.setText( + String.format(Locale.getDefault(), "%.1f", slice.powerMah)); + } else { + sliceViewHolder.powerTextView.setText(null); + } + + if (slice != null && slice.durationMs != 0) { + sliceViewHolder.durationTextView.setVisibility(View.VISIBLE); + String timeString; + if (slice.durationMs < MILLIS_IN_MINUTE) { + timeString = String.format(Locale.getDefault(), "%ds", + slice.durationMs / 1000); + } else if (slice.durationMs < 60 * MILLIS_IN_MINUTE) { + timeString = String.format(Locale.getDefault(), "%dm %ds", + slice.durationMs / MILLIS_IN_MINUTE, + (slice.durationMs % MILLIS_IN_MINUTE) / 1000); + } else { + timeString = String.format(Locale.getDefault(), "%dm", + slice.durationMs / MILLIS_IN_MINUTE); + } + sliceViewHolder.durationTextView.setText(timeString); + } else { + sliceViewHolder.durationTextView.setVisibility(View.GONE); + } + } + } + } + private void setTitleIconAndBackground(ViewHolder viewHolder, String title, int icon, int background) { viewHolder.titleTextView.setText(title); diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java index b01648838695..412169e7a905 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java @@ -42,5 +42,6 @@ public class TrampolineActivity extends Activity { private void launchMainActivity() { startActivity(new Intent(this, BatteryConsumerPickerActivity.class)); + finish(); } } diff --git a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java index 2fc72e1d3994..177c7f0b2f27 100644 --- a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java +++ b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java @@ -26,6 +26,7 @@ import static android.app.PropertyInvalidatedCache.NonceStore.INVALID_NONCE_INDE import static com.android.internal.os.Flags.FLAG_APPLICATION_SHARED_MEMORY_ENABLED; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; @@ -34,6 +35,8 @@ import static org.junit.Assert.fail; import android.annotation.SuppressLint; import android.app.PropertyInvalidatedCache.Args; +import android.app.PropertyInvalidatedCache.NonceWatcher; +import android.app.PropertyInvalidatedCache.NonceStore; import android.os.Binder; import com.android.internal.os.ApplicationSharedMemory; @@ -45,11 +48,15 @@ import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; +import com.android.internal.os.ApplicationSharedMemory; + import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.TimeUnit; + /** * Test for verifying the behavior of {@link PropertyInvalidatedCache}. This test does * not use any actual binder calls - it is entirely self-contained. This test also relies @@ -490,6 +497,62 @@ public class PropertyInvalidatedCacheTests { } } + // Verify that NonceWatcher change reporting works properly + @Test + public void testNonceWatcherChanged() { + // Create a cache that will write a system nonce. + TestCache sysCache = new TestCache(MODULE_SYSTEM, "watcher1"); + sysCache.testPropertyName(); + + try (NonceWatcher watcher1 = sysCache.getNonceWatcher()) { + + // The property has never been invalidated so it is still unset. + assertFalse(watcher1.isChanged()); + + // Invalidate the cache. The first call to isChanged will return true but the second + // call will return false; + sysCache.invalidateCache(); + assertTrue(watcher1.isChanged()); + assertFalse(watcher1.isChanged()); + + // Invalidate the cache. The first call to isChanged will return true but the second + // call will return false; + sysCache.invalidateCache(); + sysCache.invalidateCache(); + assertTrue(watcher1.isChanged()); + assertFalse(watcher1.isChanged()); + + NonceWatcher watcher2 = sysCache.getNonceWatcher(); + // This watcher return isChanged() immediately because the nonce is not UNSET. + assertTrue(watcher2.isChanged()); + } + } + + // Verify that NonceWatcher wait-for-change works properly + @Test + public void testNonceWatcherWait() throws Exception { + // Create a cache that will write a system nonce. + TestCache sysCache = new TestCache(MODULE_TEST, "watcher1"); + + // Use the watcher outside a try-with-resources block. + NonceWatcher watcher1 = sysCache.getNonceWatcher(); + + // Invalidate the cache and then "wait". + sysCache.invalidateCache(); + assertEquals(watcher1.waitForChange(), 1); + + // Invalidate the cache three times and then "wait". + sysCache.invalidateCache(); + sysCache.invalidateCache(); + sysCache.invalidateCache(); + assertEquals(watcher1.waitForChange(), 3); + + // Wait for a change. It won't happen, but the code will time out after 10ms. + assertEquals(watcher1.waitForChange(10, TimeUnit.MILLISECONDS), 0); + + watcher1.close(); + } + // Verify the behavior of shared memory nonce storage. This does not directly test the cache // storing nonces in shared memory. @RequiresFlagsEnabled(FLAG_APPLICATION_SHARED_MEMORY_ENABLED) @@ -502,10 +565,8 @@ public class PropertyInvalidatedCacheTests { // Create a server-side store and a client-side store. The server's store is mutable and // the client's store is not mutable. - PropertyInvalidatedCache.NonceStore server = - new PropertyInvalidatedCache.NonceStore(shmem.getSystemNonceBlock(), true); - PropertyInvalidatedCache.NonceStore client = - new PropertyInvalidatedCache.NonceStore(shmem.getSystemNonceBlock(), false); + NonceStore server = new NonceStore(shmem.getSystemNonceBlock(), true); + NonceStore client = new NonceStore(shmem.getSystemNonceBlock(), false); final String name1 = "name1"; assertEquals(server.getHandleForName(name1), INVALID_NONCE_INDEX); diff --git a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java index 7a5b3064b3a3..6a5224d4524b 100644 --- a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java +++ b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java @@ -55,9 +55,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import java.util.concurrent.Executor; -import java.util.function.Consumer; - /** * Tests for {@link DisplayManagerGlobal}. * @@ -82,13 +79,10 @@ public class DisplayManagerGlobalTest { private IDisplayManager mDisplayManager; @Mock - private DisplayManager.DisplayListener mDisplayListener; - - @Mock - private DisplayManager.DisplayListener mDisplayListener2; + private DisplayManager.DisplayListener mListener; @Mock - private Consumer<DisplayTopology> mTopologyListener; + private DisplayManager.DisplayListener mListener2; @Captor private ArgumentCaptor<IDisplayManagerCallback> mCallbackCaptor; @@ -96,7 +90,6 @@ public class DisplayManagerGlobalTest { private Context mContext; private DisplayManagerGlobal mDisplayManagerGlobal; private Handler mHandler; - private Executor mExecutor; @Before public void setUp() throws RemoteException { @@ -104,14 +97,13 @@ public class DisplayManagerGlobalTest { Mockito.when(mDisplayManager.getPreferredWideGamutColorSpaceId()).thenReturn(0); mContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); mHandler = mContext.getMainThreadHandler(); - mExecutor = mContext.getMainExecutor(); mDisplayManagerGlobal = new DisplayManagerGlobal(mDisplayManager); } @Test public void testDisplayListenerIsCalled_WhenDisplayEventOccurs() throws RemoteException { - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, - ALL_DISPLAY_EVENTS, /* packageName= */ null); + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, ALL_DISPLAY_EVENTS, + null); Mockito.verify(mDisplayManager) .registerCallbackWithEventMask(mCallbackCaptor.capture(), anyLong()); IDisplayManagerCallback callback = mCallbackCaptor.getValue(); @@ -119,31 +111,31 @@ public class DisplayManagerGlobalTest { int displayId = 1; callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_ADDED); waitForHandler(); - Mockito.verify(mDisplayListener).onDisplayAdded(eq(displayId)); - Mockito.verifyNoMoreInteractions(mDisplayListener); + Mockito.verify(mListener).onDisplayAdded(eq(displayId)); + Mockito.verifyNoMoreInteractions(mListener); - Mockito.reset(mDisplayListener); + Mockito.reset(mListener); // Mock IDisplayManager to return a different display info to trigger display change. final DisplayInfo newDisplayInfo = new DisplayInfo(); newDisplayInfo.rotation++; doReturn(newDisplayInfo).when(mDisplayManager).getDisplayInfo(displayId); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_CHANGED); waitForHandler(); - Mockito.verify(mDisplayListener).onDisplayChanged(eq(displayId)); - Mockito.verifyNoMoreInteractions(mDisplayListener); + Mockito.verify(mListener).onDisplayChanged(eq(displayId)); + Mockito.verifyNoMoreInteractions(mListener); - Mockito.reset(mDisplayListener); + Mockito.reset(mListener); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_REMOVED); waitForHandler(); - Mockito.verify(mDisplayListener).onDisplayRemoved(eq(displayId)); - Mockito.verifyNoMoreInteractions(mDisplayListener); + Mockito.verify(mListener).onDisplayRemoved(eq(displayId)); + Mockito.verifyNoMoreInteractions(mListener); } @Test @RequiresFlagsEnabled(Flags.FLAG_DISPLAY_LISTENER_PERFORMANCE_IMPROVEMENTS) public void testDisplayListenerIsCalled_WhenDisplayPropertyChangeEventOccurs() throws RemoteException { - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE | INTERNAL_EVENT_FLAG_DISPLAY_STATE, null); @@ -153,50 +145,50 @@ public class DisplayManagerGlobalTest { int displayId = 1; - Mockito.reset(mDisplayListener); + Mockito.reset(mListener); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_REFRESH_RATE_CHANGED); waitForHandler(); - Mockito.verify(mDisplayListener).onDisplayChanged(eq(displayId)); - Mockito.verifyNoMoreInteractions(mDisplayListener); + Mockito.verify(mListener).onDisplayChanged(eq(displayId)); + Mockito.verifyNoMoreInteractions(mListener); - Mockito.reset(mDisplayListener); + Mockito.reset(mListener); callback.onDisplayEvent(displayId, EVENT_DISPLAY_STATE_CHANGED); waitForHandler(); - Mockito.verify(mDisplayListener).onDisplayChanged(eq(displayId)); - Mockito.verifyNoMoreInteractions(mDisplayListener); + Mockito.verify(mListener).onDisplayChanged(eq(displayId)); + Mockito.verifyNoMoreInteractions(mListener); } @Test public void testDisplayListenerIsNotCalled_WhenClientIsNotSubscribed() throws RemoteException { // First we subscribe to all events in order to test that the subsequent calls to // registerDisplayListener will update the event mask. - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, - ALL_DISPLAY_EVENTS, /* packageName= */ null); + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, ALL_DISPLAY_EVENTS, + null); Mockito.verify(mDisplayManager) .registerCallbackWithEventMask(mCallbackCaptor.capture(), anyLong()); IDisplayManagerCallback callback = mCallbackCaptor.getValue(); int displayId = 1; - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, ALL_DISPLAY_EVENTS & ~DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED, null); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_ADDED); waitForHandler(); - Mockito.verifyZeroInteractions(mDisplayListener); + Mockito.verifyZeroInteractions(mListener); - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, ALL_DISPLAY_EVENTS & ~DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_CHANGED, null); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_CHANGED); waitForHandler(); - Mockito.verifyZeroInteractions(mDisplayListener); + Mockito.verifyZeroInteractions(mListener); - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, ALL_DISPLAY_EVENTS & ~DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REMOVED, null); callback.onDisplayEvent(displayId, DisplayManagerGlobal.EVENT_DISPLAY_REMOVED); waitForHandler(); - Mockito.verifyZeroInteractions(mDisplayListener); + Mockito.verifyZeroInteractions(mListener); } @Test @@ -215,7 +207,7 @@ public class DisplayManagerGlobalTest { @Test public void testDisplayManagerGlobalRegistersWithDisplayManager_WhenThereAreListeners() throws RemoteException { - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_BRIGHTNESS_CHANGED, null); InOrder inOrder = Mockito.inOrder(mDisplayManager); @@ -236,7 +228,7 @@ public class DisplayManagerGlobalTest { .registerCallbackWithEventMask(mCallbackCaptor.capture(), eq(DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_BRIGHTNESS_CHANGED)); - mDisplayManagerGlobal.unregisterDisplayListener(mDisplayListener); + mDisplayManagerGlobal.unregisterDisplayListener(mListener); inOrder.verify(mDisplayManager) .registerCallbackWithEventMask(mCallbackCaptor.capture(), eq(0L)); } @@ -252,49 +244,33 @@ public class DisplayManagerGlobalTest { mDisplayManagerGlobal.handleDisplayChangeFromWindowManager(123); // One listener listens on add/remove, and the other one listens on change. - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener, mHandler, DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REMOVED, null /* packageName */); - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener2, mHandler, + mDisplayManagerGlobal.registerDisplayListener(mListener2, mHandler, DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_CHANGED, null /* packageName */); mDisplayManagerGlobal.handleDisplayChangeFromWindowManager(321); waitForHandler(); - verify(mDisplayListener, never()).onDisplayChanged(anyInt()); - verify(mDisplayListener2).onDisplayChanged(321); + verify(mListener, never()).onDisplayChanged(anyInt()); + verify(mListener2).onDisplayChanged(321); // Trigger the callback again even if the display info is not changed. - clearInvocations(mDisplayListener2); + clearInvocations(mListener2); mDisplayManagerGlobal.handleDisplayChangeFromWindowManager(321); waitForHandler(); - verify(mDisplayListener2).onDisplayChanged(321); + verify(mListener2).onDisplayChanged(321); // No callback for non-existing display (no display info returned from IDisplayManager). - clearInvocations(mDisplayListener2); + clearInvocations(mListener2); mDisplayManagerGlobal.handleDisplayChangeFromWindowManager(456); waitForHandler(); - verify(mDisplayListener2, never()).onDisplayChanged(anyInt()); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_DISPLAY_TOPOLOGY) - public void testTopologyListenerIsCalled_WhenTopologyUpdateOccurs() throws RemoteException { - mDisplayManagerGlobal.registerTopologyListener(mExecutor, mTopologyListener, - /* packageName= */ null); - Mockito.verify(mDisplayManager).registerCallbackWithEventMask(mCallbackCaptor.capture(), - eq(DisplayManagerGlobal.INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED)); - IDisplayManagerCallback callback = mCallbackCaptor.getValue(); - - DisplayTopology topology = new DisplayTopology(); - callback.onTopologyChanged(topology); - waitForHandler(); - Mockito.verify(mTopologyListener).accept(topology); - Mockito.verifyNoMoreInteractions(mTopologyListener); + verify(mListener2, never()).onDisplayChanged(anyInt()); } @Test diff --git a/core/tests/coretests/src/android/hardware/display/DisplayTopologyTest.kt b/core/tests/coretests/src/android/hardware/display/DisplayTopologyTest.kt index f584ab971d04..8969b2b72e77 100644 --- a/core/tests/coretests/src/android/hardware/display/DisplayTopologyTest.kt +++ b/core/tests/coretests/src/android/hardware/display/DisplayTopologyTest.kt @@ -513,7 +513,7 @@ class DisplayTopologyTest { val nodes = rearrangeRects( RectF(0f, 0f, 150f, 100f), RectF(-150f, 0f, 0f, 100f), - RectF(0f, -100f, 150f, 0f), + RectF(0f,-100f, 150f, 0f), RectF(150f, 0f, 300f, 100f), RectF(0f, 100f, 150f, 200f), ) @@ -584,15 +584,15 @@ class DisplayTopologyTest { @Test fun rearrange_useLargerEdge() { val nodes = rearrangeRects( - // 444111 - // 444111 - // 444111 - // 000222 - // 000222 - // 000222 - // 333 - // 333 - // 333 + //444111 + //444111 + //444111 + // 000222 + // 000222 + // 000222 + // 333 + // 333 + // 333 RectF(20f, 30f, 50f, 60f), RectF(30f, 0f, 60f, 30f), RectF(50f, 30f, 80f, 60f), @@ -617,25 +617,24 @@ class DisplayTopologyTest { @Test fun rearrange_closeGaps() { val nodes = rearrangeRects( - // 000 - // 000 111 - // 000 111 - // 111 + //000 + //000 111 + //000 111 + // 111 // - // 222 - // 222 - // 222 + // 222 + // 222 + // 222 RectF(0f, 0f, 30f, 30f), RectF(40f, 10f, 70f, 40f), - RectF(80.5f, 50f, 110f, 80f), // left+=0.5 to cause a preference for - // TOP/BOTTOM attach + RectF(80.5f, 50f, 110f, 80f), // left+=0.5 to cause a preference for TOP/BOTTOM attach ) assertPositioning( nodes, // In the case of corner adjacency, we prefer a left/right attachment. Pair(POSITION_RIGHT, 10f), - Pair(POSITION_BOTTOM, 40.5f), // TODO: fix implementation to remove this gap + Pair(POSITION_BOTTOM, 40.5f), // TODO: fix implementation to remove this gap ) assertThat(nodes[0].children).containsExactly(nodes[1]) @@ -643,65 +642,11 @@ class DisplayTopologyTest { assertThat(nodes[2].children).isEmpty() } - @Test - fun copy() { - val display1 = DisplayTopology.TreeNode(/* displayId= */ 1, /* width= */ 200f, - /* height= */ 600f, /* position= */ 0, /* offset= */ 0f) - - val display2 = DisplayTopology.TreeNode(/* displayId= */ 2, /* width= */ 600f, - /* height= */ 200f, POSITION_RIGHT, /* offset= */ 0f) - display1.addChild(display2) - - val primaryDisplayId = 3 - val display3 = DisplayTopology.TreeNode(primaryDisplayId, /* width= */ 600f, - /* height= */ 200f, POSITION_RIGHT, /* offset= */ 400f) - display1.addChild(display3) - - val display4 = DisplayTopology.TreeNode(/* displayId= */ 4, /* width= */ 200f, - /* height= */ 600f, POSITION_RIGHT, /* offset= */ 0f) - display2.addChild(display4) - - topology = DisplayTopology(display1, primaryDisplayId) - val copy = topology.copy() - - assertThat(copy.primaryDisplayId).isEqualTo(primaryDisplayId) - - val actualDisplay1 = copy.root!! - assertThat(actualDisplay1.displayId).isEqualTo(1) - assertThat(actualDisplay1.width).isEqualTo(200f) - assertThat(actualDisplay1.height).isEqualTo(600f) - assertThat(actualDisplay1.children).hasSize(2) - - val actualDisplay2 = actualDisplay1.children[0] - assertThat(actualDisplay2.displayId).isEqualTo(2) - assertThat(actualDisplay2.width).isEqualTo(600f) - assertThat(actualDisplay2.height).isEqualTo(200f) - assertThat(actualDisplay2.position).isEqualTo(POSITION_RIGHT) - assertThat(actualDisplay2.offset).isEqualTo(0f) - assertThat(actualDisplay2.children).hasSize(1) - - val actualDisplay3 = actualDisplay1.children[1] - assertThat(actualDisplay3.displayId).isEqualTo(3) - assertThat(actualDisplay3.width).isEqualTo(600f) - assertThat(actualDisplay3.height).isEqualTo(200f) - assertThat(actualDisplay3.position).isEqualTo(POSITION_RIGHT) - assertThat(actualDisplay3.offset).isEqualTo(400f) - assertThat(actualDisplay3.children).isEmpty() - - val actualDisplay4 = actualDisplay2.children[0] - assertThat(actualDisplay4.displayId).isEqualTo(4) - assertThat(actualDisplay4.width).isEqualTo(200f) - assertThat(actualDisplay4.height).isEqualTo(600f) - assertThat(actualDisplay4.position).isEqualTo(POSITION_RIGHT) - assertThat(actualDisplay4.offset).isEqualTo(0f) - assertThat(actualDisplay4.children).isEmpty() - } - /** * Runs the rearrange algorithm and returns the resulting tree as a list of nodes, with the * root at index 0. The number of nodes is inferred from the number of positions passed. */ - private fun rearrangeRects(vararg pos: RectF): List<DisplayTopology.TreeNode> { + private fun rearrangeRects(vararg pos : RectF) : List<DisplayTopology.TreeNode> { // Generates a linear sequence of nodes in order in the List from root to leaf, // left-to-right. IDs are ascending from 0 to count - 1. @@ -723,7 +668,7 @@ class DisplayTopologyTest { } private fun assertPositioning( - nodes: List<DisplayTopology.TreeNode>, vararg positions: Pair<Int, Float>) { + nodes : List<DisplayTopology.TreeNode>, vararg positions : Pair<Int, Float>) { assertThat(nodes.drop(1).map { Pair(it.position, it.offset )}) .containsExactly(*positions) .inOrder() diff --git a/core/tests/coretests/src/android/os/OWNERS b/core/tests/coretests/src/android/os/OWNERS index 4620cb8d8148..c45080fb5e26 100644 --- a/core/tests/coretests/src/android/os/OWNERS +++ b/core/tests/coretests/src/android/os/OWNERS @@ -15,3 +15,6 @@ per-file IpcDataCache* = file:/PERFORMANCE_OWNERS # RemoteCallbackList per-file RemoteCallbackListTest.java = shayba@google.com + +# MessageQueue +per-file MessageQueueTest.java = mfasheh@google.com, shayba@google.com diff --git a/core/tests/coretests/src/android/window/WindowContextTest.java b/core/tests/coretests/src/android/window/WindowContextTest.java index f1fbd559b8f8..21930d17ed68 100644 --- a/core/tests/coretests/src/android/window/WindowContextTest.java +++ b/core/tests/coretests/src/android/window/WindowContextTest.java @@ -29,6 +29,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import android.app.Activity; import android.app.EmptyActivity; @@ -60,6 +65,8 @@ import androidx.test.rule.ActivityTestRule; import com.android.frameworks.coretests.R; +import org.junit.After; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -88,9 +95,21 @@ public class WindowContextTest { private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation(); private final WindowContext mWindowContext = createWindowContext(); private final IWindowManager mWms = WindowManagerGlobal.getWindowManagerService(); + private WindowTokenClientController mOriginalWindowTokenClientController; private static final int TIMEOUT_IN_SECONDS = 4; + @Before + public void setUp() { + // Keeping the original to set it back after each test, in case they applied any override. + mOriginalWindowTokenClientController = WindowTokenClientController.getInstance(); + } + + @After + public void tearDown() { + WindowTokenClientController.overrideForTesting(mOriginalWindowTokenClientController); + } + @Test public void testCreateWindowContextWindowManagerAttachClientToken() { final WindowManager windowContextWm = WindowManagerImpl @@ -320,6 +339,20 @@ public class WindowContextTest { } } + @Test + public void updateDisplay_wasAttached_detachThenAttachedPropagatedToTokenController() { + final WindowTokenClientController mockWindowTokenClientController = + mock(WindowTokenClientController.class); + WindowTokenClientController.overrideForTesting(mockWindowTokenClientController); + + mWindowContext.updateDisplay(DEFAULT_DISPLAY + 1); + + verify(mockWindowTokenClientController).detachIfNeeded(any()); + verify(mockWindowTokenClientController).attachToDisplayArea(any(), + anyInt(), /* displayId= */ eq(DEFAULT_DISPLAY + 1), + any()); + } + private WindowContext createWindowContext() { return createWindowContext(TYPE_APPLICATION_OVERLAY); } diff --git a/errorprone/Android.bp b/errorprone/Android.bp index b559a15c3a60..1428b8965473 100644 --- a/errorprone/Android.bp +++ b/errorprone/Android.bp @@ -31,6 +31,14 @@ java_library_host { "//external/auto:auto_service_annotations", ], + javacflags: [ + // These exports are needed because this errorprone plugin access some private classes + // of the java compiler. + "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + ], + plugins: [ "//external/auto:auto_service_plugin", ], diff --git a/libs/WindowManager/Shell/shared/res/values/strings.xml b/libs/WindowManager/Shell/shared/res/values/strings.xml new file mode 100644 index 000000000000..d1804c04cbec --- /dev/null +++ b/libs/WindowManager/Shell/shared/res/values/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <!-- Accessibility text for the icons generated by the Manage Windows submenu + in desktop mode and taskbar. [CHAR LIMIT=NONE] --> + <string name="manage_windows_icon_text">Open Window %1$d</string> +</resources> diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/ManageWindowsViewContainer.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt index f14dfdbc7d30..0954b52ff151 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/ManageWindowsViewContainer.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.wm.shell.shared.desktopmode +package com.android.wm.shell.shared.multiinstance import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.AnimatorSet @@ -34,6 +34,7 @@ import android.view.View.SCALE_Y import android.view.ViewGroup.MarginLayoutParams import android.widget.LinearLayout import android.window.TaskSnapshot +import com.android.wm.shell.shared.R /** * View for the All Windows menu option, used by both Desktop Windowing and Taskbar. @@ -167,6 +168,9 @@ abstract class ManageWindowsViewContainer( val appSnapshotButton = SurfaceView(context) appSnapshotButton.cornerRadius = iconRadius appSnapshotButton.setZOrderOnTop(true) + appSnapshotButton.contentDescription = context.resources.getString( + R.string.manage_windows_icon_text, iconCount + 1 + ) appSnapshotButton.setOnClickListener { onIconClickListener?.invoke(taskId) } @@ -230,10 +234,12 @@ abstract class ManageWindowsViewContainer( /** Play the animation for opening the menu. */ fun animateOpen() { animateView(rootView, MENU_BOUNDS_SHRUNK_SCALE, MENU_BOUNDS_FULL_SCALE, - MENU_START_ALPHA, MENU_FULL_ALPHA) + MENU_START_ALPHA, MENU_FULL_ALPHA + ) for (view in iconViews) { animateView(view, MENU_BOUNDS_SHRUNK_SCALE, MENU_BOUNDS_FULL_SCALE, - MENU_START_ALPHA, MENU_FULL_ALPHA) + MENU_START_ALPHA, MENU_FULL_ALPHA + ) } createAnimatorSet().start() } @@ -241,10 +247,12 @@ abstract class ManageWindowsViewContainer( /** Play the animation for closing the menu. */ fun animateClose(callback: () -> Unit) { animateView(rootView, MENU_BOUNDS_FULL_SCALE, MENU_BOUNDS_SHRUNK_SCALE, - MENU_FULL_ALPHA, MENU_START_ALPHA) + MENU_FULL_ALPHA, MENU_START_ALPHA + ) for (view in iconViews) { animateView(view, MENU_BOUNDS_FULL_SCALE, MENU_BOUNDS_SHRUNK_SCALE, - MENU_FULL_ALPHA, MENU_START_ALPHA) + MENU_FULL_ALPHA, MENU_START_ALPHA + ) } createAnimatorSet().apply { addListener( diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/transition/TransitionStateHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/transition/TransitionStateHolder.kt new file mode 100644 index 000000000000..4dda2a894253 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/transition/TransitionStateHolder.kt @@ -0,0 +1,56 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.common.transition + +import com.android.wm.shell.dagger.WMSingleton +import com.android.wm.shell.recents.RecentsTransitionHandler +import com.android.wm.shell.recents.RecentsTransitionStateListener +import com.android.wm.shell.recents.RecentsTransitionStateListener.RecentsTransitionState +import com.android.wm.shell.recents.RecentsTransitionStateListener.isRunning +import com.android.wm.shell.sysui.ShellInit +import javax.inject.Inject + +/** + * Holder for the state of the transitions. + */ +@WMSingleton +class TransitionStateHolder @Inject constructor( + shellInit: ShellInit, + private val recentsTransitionHandler: RecentsTransitionHandler +) { + + @Volatile + @RecentsTransitionState + private var recentsTransitionState: Int = + RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING + + init { + shellInit.addInitCallback({ onInit() }, this) + } + + fun isRecentsTransitionRunning(): Boolean = isRunning(recentsTransitionState) + + private fun onInit() { + recentsTransitionHandler.addTransitionStateListener( + object : RecentsTransitionStateListener { + override fun onTransitionStateChanged(@RecentsTransitionState state: Int) { + recentsTransitionState = state + } + } + ) + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxController.kt index 0ac7aff306a0..523e2f5cf7dc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxController.kt @@ -18,133 +18,51 @@ package com.android.wm.shell.compatui.letterbox import android.graphics.Rect import android.view.SurfaceControl -import com.android.internal.protolog.ProtoLog -import com.android.wm.shell.dagger.WMSingleton -import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_APP_COMPAT -import javax.inject.Inject +import android.view.SurfaceControl.Transaction /** - * Component responsible for handling the lifecycle of the letterbox surfaces. + * Abstracts the component responsible to handle a single or multiple letterbox surfaces for a + * specific [Change]. */ -@WMSingleton -class LetterboxController @Inject constructor( - private val letterboxConfiguration: LetterboxConfiguration -) { - - companion object { - /* - * Letterbox surfaces need to stay below the activity layer which is 0. - */ - // TODO(b/378673153): Consider adding this to [TaskConstants]. - @JvmStatic - private val TASK_CHILD_LAYER_LETTERBOX_BACKGROUND = -1000 - @JvmStatic - private val TAG = "LetterboxController" - } - - private val letterboxMap = mutableMapOf<LetterboxKey, LetterboxItem>() +interface LetterboxController { /** * Creates a Letterbox Surface for a given displayId/taskId if it doesn't exist. */ fun createLetterboxSurface( key: LetterboxKey, - startTransaction: SurfaceControl.Transaction, + transaction: Transaction, parentLeash: SurfaceControl - ) { - letterboxMap.runOnItem(key, onMissed = { k, m -> - m[k] = LetterboxItem( - SurfaceControl.Builder() - .setName("ShellLetterboxSurface-$key") - .setHidden(true) - .setColorLayer() - .setParent(parentLeash) - .setCallsite("LetterboxController-createLetterboxSurface") - .build().apply { - startTransaction.setLayer( - this, - TASK_CHILD_LAYER_LETTERBOX_BACKGROUND - ).setColorSpaceAgnostic(this, true) - .setColor(this, letterboxConfiguration.getBackgroundColorRgbArray()) - } - ) - }) - } + ) /** * Invoked to destroy the surfaces for a letterbox session for given displayId/taskId. */ fun destroyLetterboxSurface( key: LetterboxKey, - startTransaction: SurfaceControl.Transaction - ) { - letterboxMap.runOnItem(key, onFound = { item -> - item.fullWindowSurface?.run { - startTransaction.remove(this) - } - }) - letterboxMap.remove(key) - } + transaction: Transaction + ) /** * Invoked to show/hide the letterbox surfaces for given displayId/taskId. */ fun updateLetterboxSurfaceVisibility( key: LetterboxKey, - startTransaction: SurfaceControl.Transaction, - visible: Boolean = true - ) { - letterboxMap.runOnItem(key, onFound = { item -> - item.fullWindowSurface?.run { - startTransaction.setVisibility(this, visible) - } - }) - } + transaction: Transaction, + visible: Boolean + ) /** * Updates the bounds for the letterbox surfaces for given displayId/taskId. */ fun updateLetterboxSurfaceBounds( key: LetterboxKey, - startTransaction: SurfaceControl.Transaction, - bounds: Rect - ) { - letterboxMap.runOnItem(key, onFound = { item -> - item.fullWindowSurface?.run { - startTransaction.moveAndCrop(this, bounds) - } - }) - } + transaction: Transaction, + taskBounds: Rect + ) - /* - * Executes [onFound] on the [LetterboxItem] if present or [onMissed] if not present. + /** + * Utility method to dump the current state. */ - private fun MutableMap<LetterboxKey, LetterboxItem>.runOnItem( - key: LetterboxKey, - onFound: (LetterboxItem) -> Unit = { _ -> }, - onMissed: ( - LetterboxKey, - MutableMap<LetterboxKey, LetterboxItem> - ) -> Unit = { _, _ -> } - ) { - this[key]?.let { - return onFound(it) - } - return onMissed(key, this) - } - - fun dump() { - ProtoLog.v(WM_SHELL_APP_COMPAT, "%s: %s", TAG, "${letterboxMap.keys}") - } - - private fun SurfaceControl.Transaction.moveAndCrop( - surface: SurfaceControl, - rect: Rect - ): SurfaceControl.Transaction = - setPosition(surface, rect.left.toFloat(), rect.top.toFloat()) - .setWindowCrop( - surface, - rect.width(), - rect.height() - ) + fun dump() } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxData.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxData.kt index 98fd2472f1e4..adb034cc4787 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxData.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxData.kt @@ -16,10 +16,5 @@ package com.android.wm.shell.compatui.letterbox -import android.view.SurfaceControl - // The key to use for identify the letterbox sessions. -data class LetterboxKey(val displayId: Int, val taskId: Int) - -// Encapsulate the objects for the specific letterbox session. -data class LetterboxItem(val fullWindowSurface: SurfaceControl?)
\ No newline at end of file +data class LetterboxKey(val displayId: Int, val taskId: Int)
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilder.kt new file mode 100644 index 000000000000..e88d91f3956c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilder.kt @@ -0,0 +1,59 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.view.SurfaceControl +import com.android.wm.shell.dagger.WMSingleton +import javax.inject.Inject + +/** + * Component responsible for the actual creation of the Letterbox surfaces. + */ +@WMSingleton +class LetterboxSurfaceBuilder @Inject constructor( + private val letterboxConfiguration: LetterboxConfiguration +) { + + companion object { + /* + * Letterbox surfaces need to stay below the activity layer which is 0. + */ + // TODO(b/378673153): Consider adding this to [TaskConstants]. + @JvmStatic + private val TASK_CHILD_LAYER_LETTERBOX_BACKGROUND = -1000 + } + + fun createSurface( + tx: SurfaceControl.Transaction, + parentLeash: SurfaceControl, + surfaceName: String, + callSite: String, + surfaceBuilder: SurfaceControl.Builder = SurfaceControl.Builder() + ) = surfaceBuilder + .setName(surfaceName) + .setHidden(true) + .setColorLayer() + .setParent(parentLeash) + .setCallsite(callSite) + .build().apply { + tx.setLayer( + this, + TASK_CHILD_LAYER_LETTERBOX_BACKGROUND + ).setColorSpaceAgnostic(this, true) + .setColor(this, letterboxConfiguration.getBackgroundColorRgbArray()) + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt index 67429bdd112b..b50716ad07a3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt @@ -43,12 +43,7 @@ class LetterboxTransitionObserver( init { if (appCompatRefactoring()) { - ProtoLog.v( - WM_SHELL_APP_COMPAT, - "%s: %s", - TAG, - "Initializing LetterboxTransitionObserver" - ) + logV("Initializing LetterboxTransitionObserver") shellInit.addInitCallback({ transitions.registerObserver(this) }, this) @@ -69,38 +64,45 @@ class LetterboxTransitionObserver( for (change in info.changes) { change.taskInfo?.let { ti -> val key = LetterboxKey(ti.displayId, ti.taskId) - if (isClosingType(change.mode)) { - letterboxController.destroyLetterboxSurface( - key, - startTransaction - ) - } else { - val isTopActivityLetterboxed = ti.appCompatTaskInfo.isTopActivityLetterboxed - if (isTopActivityLetterboxed) { - letterboxController.createLetterboxSurface( + val taskBounds = Rect( + change.endRelOffset.x, + change.endRelOffset.y, + change.endAbsBounds.width(), + change.endAbsBounds.height() + ) + with(letterboxController) { + if (isClosingType(change.mode)) { + destroyLetterboxSurface( key, - startTransaction, - change.leash + startTransaction ) - letterboxController.updateLetterboxSurfaceBounds( + } else { + val isTopActivityLetterboxed = ti.appCompatTaskInfo.isTopActivityLetterboxed + if (isTopActivityLetterboxed) { + createLetterboxSurface( + key, + startTransaction, + change.leash + ) + updateLetterboxSurfaceBounds( + key, + startTransaction, + taskBounds + ) + } + updateLetterboxSurfaceVisibility( key, startTransaction, - Rect( - change.endRelOffset.x, - change.endRelOffset.y, - change.endAbsBounds.width(), - change.endAbsBounds.height() - ) + isTopActivityLetterboxed ) } - letterboxController.updateLetterboxSurfaceVisibility( - key, - startTransaction, - isTopActivityLetterboxed - ) + dump() } - letterboxController.dump() } } } + + private fun logV(msg: String) { + ProtoLog.v(WM_SHELL_APP_COMPAT, "%s: %s", TAG, msg) + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/SingleSurfaceLetterboxController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/SingleSurfaceLetterboxController.kt new file mode 100644 index 000000000000..f21a7272287e --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/SingleSurfaceLetterboxController.kt @@ -0,0 +1,136 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.graphics.Rect +import android.view.SurfaceControl +import android.view.SurfaceControl.Transaction +import com.android.internal.protolog.ProtoLog +import com.android.wm.shell.dagger.WMSingleton +import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_APP_COMPAT +import javax.inject.Inject + +/** + * Component responsible for handling the lifecycle of a single letterbox surface. + */ +@WMSingleton +class SingleSurfaceLetterboxController @Inject constructor( + private val letterboxBuilder: LetterboxSurfaceBuilder +) : LetterboxController { + + companion object { + @JvmStatic + private val TAG = "LetterboxController" + } + + private val letterboxMap = mutableMapOf<LetterboxKey, SurfaceControl>() + + /** + * Creates a Letterbox Surface for a given displayId/taskId if it doesn't exist. + */ + override fun createLetterboxSurface( + key: LetterboxKey, + transaction: Transaction, + parentLeash: SurfaceControl + ) { + letterboxMap.runOnItem(key, onMissed = { k, m -> + m[k] = letterboxBuilder.createSurface( + transaction, + parentLeash, + surfaceName = "ShellLetterboxSurface-$key", + callSite = "LetterboxController-createLetterboxSurface" + ) + }) + } + + /** + * Invoked to destroy the surfaces for a letterbox session for given displayId/taskId. + */ + override fun destroyLetterboxSurface( + key: LetterboxKey, + transaction: Transaction + ) { + letterboxMap.runOnItem(key, onFound = { item -> + item.run { + transaction.remove(this) + } + }) + letterboxMap.remove(key) + } + + /** + * Invoked to show/hide the letterbox surfaces for given displayId/taskId. + */ + override fun updateLetterboxSurfaceVisibility( + key: LetterboxKey, + transaction: Transaction, + visible: Boolean + ) { + letterboxMap.runOnItem(key, onFound = { item -> + item.run { + transaction.setVisibility(this, visible) + } + }) + } + + /** + * Updates the bounds for the letterbox surfaces for given displayId/taskId. + */ + override fun updateLetterboxSurfaceBounds( + key: LetterboxKey, + transaction: Transaction, + taskBounds: Rect + ) { + letterboxMap.runOnItem(key, onFound = { item -> + item.run { + transaction.moveAndCrop(this, taskBounds) + } + }) + } + + override fun dump() { + ProtoLog.v(WM_SHELL_APP_COMPAT, "%s: %s", TAG, "${letterboxMap.keys}") + } + + /* + * Executes [onFound] on the [SurfaceControl] if present or [onMissed] if not present. + */ + private fun MutableMap<LetterboxKey, SurfaceControl>.runOnItem( + key: LetterboxKey, + onFound: (SurfaceControl) -> Unit = { _ -> }, + onMissed: ( + LetterboxKey, + MutableMap<LetterboxKey, SurfaceControl> + ) -> Unit = { _, _ -> } + ) { + this[key]?.let { + return onFound(it) + } + return onMissed(key, this) + } + + private fun Transaction.moveAndCrop( + surface: SurfaceControl, + rect: Rect + ): Transaction = + setPosition(surface, rect.left.toFloat(), rect.top.toFloat()) + .setWindowCrop( + surface, + rect.width(), + rect.height() + ) +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index b04a75dd9cd5..974535385334 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -71,6 +71,7 @@ import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.compatui.letterbox.LetterboxCommandHandler; import com.android.wm.shell.compatui.letterbox.LetterboxController; import com.android.wm.shell.compatui.letterbox.LetterboxTransitionObserver; +import com.android.wm.shell.compatui.letterbox.SingleSurfaceLetterboxController; import com.android.wm.shell.dagger.back.ShellBackAnimationModule; import com.android.wm.shell.dagger.pip.PipModule; import com.android.wm.shell.desktopmode.CloseDesktopTaskTransitionHandler; @@ -854,14 +855,15 @@ public abstract class WMShellModule { Optional<DesktopTasksController> desktopTasksController, InputManager inputManager, ShellTaskOrganizer shellTaskOrganizer, - FocusTransitionObserver focusTransitionObserver) { + FocusTransitionObserver focusTransitionObserver, + @ShellMainThread ShellExecutor mainExecutor) { if (DesktopModeStatus.canEnterDesktopMode(context) && useKeyGestureEventHandler() && manageKeyGestures() && (Flags.enableMoveToNextDisplayShortcut() || Flags.enableTaskResizingKeyboardShortcuts())) { return Optional.of(new DesktopModeKeyGestureHandler(context, desktopModeWindowDecorViewModel, desktopTasksController, - inputManager, shellTaskOrganizer, focusTransitionObserver)); + inputManager, shellTaskOrganizer, focusTransitionObserver, mainExecutor)); } return Optional.empty(); } @@ -1318,4 +1320,9 @@ public abstract class WMShellModule { ) { return new LetterboxTransitionObserver(shellInit, transitions, letterboxController); } + + @WMSingleton + @Binds + abstract LetterboxController bindsLetterboxController( + SingleSurfaceLetterboxController letterboxController); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt index 798e499d68eb..2b0724d64d0e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt @@ -30,9 +30,11 @@ import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.content.Context import com.android.hardware.input.Flags.manageKeyGestures import com.android.window.flags.Flags.enableTaskResizingKeyboardShortcuts +import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ResizeTrigger import com.android.wm.shell.transition.FocusTransitionObserver import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE +import com.android.wm.shell.shared.annotations.ShellMainThread import java.util.Optional /** @@ -45,6 +47,7 @@ class DesktopModeKeyGestureHandler( inputManager: InputManager, private val shellTaskOrganizer: ShellTaskOrganizer, private val focusTransitionObserver: FocusTransitionObserver, + @ShellMainThread private val mainExecutor: ShellExecutor, ) : KeyGestureEventHandler { init { @@ -104,9 +107,11 @@ class DesktopModeKeyGestureHandler( KeyGestureEvent.KEY_GESTURE_TYPE_MINIMIZE_FREEFORM_WINDOW -> { logV("Key gesture MINIMIZE_FREEFORM_WINDOW is handled") getGloballyFocusedFreeformTask()?.let { - desktopTasksController.get().minimizeTask( - it, - ) + mainExecutor.execute { + desktopTasksController.get().minimizeTask( + it, + ) + } } return true } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index ad28dcc5598a..c479ab382acb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -797,6 +797,8 @@ class DesktopTasksController( taskInfo: RunningTaskInfo, resizeTrigger: ResizeTrigger, inputMethod: InputMethod, + maximizeCujRecorder: (() -> Unit)? = null, + unmaximizeCujRecorder: (() -> Unit)? = null, ) { val currentTaskBounds = taskInfo.configuration.windowConfiguration.bounds desktopModeEventLogger.logTaskResizingStarted( @@ -818,6 +820,7 @@ class DesktopTasksController( // helpful to eliminate the current task from logic to calculate taskbar corner rounding. val willMaximize = !isMaximized if (isMaximized) { + unmaximizeCujRecorder?.invoke() // The desktop task is at the maximized width and/or height of the stable bounds. // If the task's pre-maximize stable bounds were saved, toggle the task to those bounds. // Otherwise, toggle to the default bounds. @@ -833,6 +836,7 @@ class DesktopTasksController( } } } else { + maximizeCujRecorder?.invoke() // Save current bounds so that task can be restored back to original bounds if necessary // and toggle to the stable bounds. desktopTilingDecorViewModel.removeTaskIfTiled(taskInfo.displayId, taskInfo.taskId) @@ -889,7 +893,7 @@ class DesktopTasksController( toggleDesktopTaskSize( taskInfo, ResizeTrigger.DRAG_TO_TOP_RESIZE_TRIGGER, - DesktopModeEventLogger.getInputMethodFromMotionEvent(motionEvent) + DesktopModeEventLogger.getInputMethodFromMotionEvent(motionEvent), ) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt index 941115083717..6df3302f47a5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ToggleResizeDesktopTaskTransitionHandler.kt @@ -119,6 +119,7 @@ class ToggleResizeDesktopTaskTransitionHandler( initialBounds = null boundsAnimator = null interactionJankMonitor.end(Cuj.CUJ_DESKTOP_MODE_MAXIMIZE_WINDOW) + interactionJankMonitor.end(Cuj.CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW) interactionJankMonitor.end(Cuj.CUJ_DESKTOP_MODE_SNAP_RESIZE) } ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java index 55e90e74a404..5276d9d6a4df 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java @@ -324,8 +324,6 @@ public class PipAnimationController { private final @AnimationType int mAnimationType; private final Rect mDestinationBounds = new Rect(); - private final Point mLeashOffset = new Point(); - private T mBaseValue; protected T mCurrentValue; protected T mStartValue; @@ -340,22 +338,13 @@ public class PipAnimationController { // Flag to avoid double-end private boolean mHasRequestedEnd; - private PipTransitionAnimator(@NonNull TaskInfo taskInfo, @NonNull SurfaceControl leash, - @AnimationType int animationType, @NonNull Rect destinationBounds, - @NonNull T baseValue, @NonNull T startValue, @NonNull T endValue) { - this(taskInfo, leash, animationType, destinationBounds, new Point(), baseValue, - startValue, endValue); - } - - private PipTransitionAnimator(@NonNull TaskInfo taskInfo, @NonNull SurfaceControl leash, - @AnimationType int animationType, @NonNull Rect destinationBounds, - @NonNull Point leashOffset, @NonNull T baseValue, @NonNull T startValue, - @NonNull T endValue) { + private PipTransitionAnimator(TaskInfo taskInfo, SurfaceControl leash, + @AnimationType int animationType, + Rect destinationBounds, T baseValue, T startValue, T endValue) { mTaskInfo = taskInfo; mLeash = leash; mAnimationType = animationType; mDestinationBounds.set(destinationBounds); - mLeashOffset.set(leashOffset); mBaseValue = baseValue; mStartValue = startValue; mEndValue = endValue; @@ -507,15 +496,6 @@ public class PipAnimationController { } } - /** - * Returns the offset of the {@link #mLeash}. - */ - @NonNull - Point getLeashOffset() { - // Use copy to prevent the leash to be modified unexpectedly. - return new Point(mLeashOffset); - } - void setCurrentValue(T value) { mCurrentValue = value; } @@ -712,8 +692,8 @@ public class PipAnimationController { final Rect zeroInsets = new Rect(0, 0, 0, 0); // construct new Rect instances in case they are recycled - return new PipTransitionAnimator<Rect>(taskInfo, leash, ANIM_TYPE_BOUNDS, endBounds, - leashOffset, new Rect(baseBounds), new Rect(startBounds), new Rect(endBounds)) { + return new PipTransitionAnimator<Rect>(taskInfo, leash, ANIM_TYPE_BOUNDS, + endBounds, new Rect(baseBounds), new Rect(startBounds), new Rect(endBounds)) { private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect()); private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect()); @@ -740,7 +720,6 @@ public class PipAnimationController { // Use the bounds relative to the task leash in case the leash does not // start from (0, 0). final Rect relativeEndBounds = new Rect(end); - final Point leashOffset = getLeashOffset(); relativeEndBounds.offset(-leashOffset.x, -leashOffset.y); getSurfaceTransactionHelper() .crop(tx, leash, relativeEndBounds) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 30f1948efa2d..fb4afe41e193 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -26,6 +26,8 @@ import static android.util.RotationUtils.rotateBounds; import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_PIP; import static com.android.wm.shell.ShellTaskOrganizer.taskListenerTypeToString; +import static com.android.wm.shell.desktopmode.DesktopModeUtils.calculateInitialBounds; +import static com.android.wm.shell.desktopmode.DesktopTasksController.DESKTOP_MODE_INITIAL_BOUNDS_SCALE; import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA; import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_BOUNDS; import static com.android.wm.shell.pip.PipAnimationController.FRACTION_START; @@ -152,6 +154,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, @Nullable private final PipPerfHintController mPipPerfHintController; private final Optional<DesktopRepository> mDesktopRepositoryOptional; private final RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer; + private final DisplayController mDisplayController; protected final ShellTaskOrganizer mTaskOrganizer; protected final ShellExecutor mMainExecutor; @@ -425,6 +428,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, mPipPerfHintController = pipPerfHintControllerOptional.orElse(null); mDesktopRepositoryOptional = desktopRepositoryOptional; mRootTaskDisplayAreaOrganizer = rootTaskDisplayAreaOrganizer; + mDisplayController = displayController; mTaskOrganizer = shellTaskOrganizer; mMainExecutor = mainExecutor; @@ -754,19 +758,30 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, /** Returns the bounds to restore to when exiting PIP mode. */ // TODO(b/377581840): Instead of manually tracking bounds, use bounds from Core. public Rect getExitDestinationBounds() { - if (isPipLaunchedInDesktopMode()) { - final Rect freeformBounds = mDesktopRepositoryOptional.get().removeBoundsBeforeMinimize( + if (isPipExitingToDesktopMode()) { + // If we are exiting PiP while device is in Desktop mode: + // 1) If PiP was entered via Desktop minimize (e.g. via minimize button), restore to the + // previous freeform bounds that is saved in DesktopRepository. + // 2) If PiP was entered through other means (e.g. user swipe up), exit to initial + // freeform bounds. Note that this case has a flicker at the moment (b/379984108). + Rect freeformBounds = mDesktopRepositoryOptional.get().removeBoundsBeforeMinimize( mTaskInfo.taskId); - return Objects.requireNonNullElseGet(freeformBounds, mPipBoundsState::getDisplayBounds); + return freeformBounds != null + ? freeformBounds + : calculateInitialBounds( + mDisplayController.getDisplayLayout(mTaskInfo.displayId), + mTaskInfo, + DESKTOP_MODE_INITIAL_BOUNDS_SCALE); } return mPipBoundsState.getDisplayBounds(); } - /** Returns whether PiP was launched while in desktop mode. */ - // TODO(377581840): Update this check to include non-minimized cases, e.g. split to PiP etc. - private boolean isPipLaunchedInDesktopMode() { + /** Returns whether PiP is exiting while we're in desktop mode. */ + // TODO(b/377581840): Update this check to include non-minimized cases, e.g. split to PiP etc. + private boolean isPipExitingToDesktopMode() { return Flags.enableDesktopWindowingPip() && mDesktopRepositoryOptional.isPresent() - && mDesktopRepositoryOptional.get().isMinimizedTask(mTaskInfo.taskId); + && (mDesktopRepositoryOptional.get().getVisibleTaskCount(mTaskInfo.displayId) > 0 + || isDisplayInFreeform()); } private void exitLaunchIntoPipTask(WindowContainerTransaction wct) { @@ -1827,23 +1842,28 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, == SPLIT_POSITION_TOP_OR_LEFT; } + private boolean isDisplayInFreeform() { + final DisplayAreaInfo tdaInfo = mRootTaskDisplayAreaOrganizer.getDisplayAreaInfo( + mTaskInfo.displayId); + if (tdaInfo != null) { + return tdaInfo.configuration.windowConfiguration.getWindowingMode() + == WINDOWING_MODE_FREEFORM; + } + return false; + } + /** * The windowing mode to restore to when resizing out of PIP direction. Defaults to undefined * and can be overridden to restore to an alternate windowing mode. */ public int getOutPipWindowingMode() { - final DisplayAreaInfo tdaInfo = mRootTaskDisplayAreaOrganizer.getDisplayAreaInfo( - mTaskInfo.displayId); - - // If PiP was launched while in desktop mode (we should return the task to freeform - // windowing mode): + // If we are exiting PiP while the device is in Desktop mode (the task should expand to + // freeform windowing mode): // 1) If the display windowing mode is freeform, set windowing mode to undefined so it will // resolve the windowing mode to the display's windowing mode. // 2) If the display windowing mode is not freeform, set windowing mode to freeform. - if (tdaInfo != null && isPipLaunchedInDesktopMode()) { - final int displayWindowingMode = - tdaInfo.configuration.windowConfiguration.getWindowingMode(); - if (displayWindowingMode == WINDOWING_MODE_FREEFORM) { + if (isPipExitingToDesktopMode()) { + if (isDisplayInFreeform()) { return WINDOWING_MODE_UNDEFINED; } else { return WINDOWING_MODE_FREEFORM; 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 0042ec954f32..72c1ef06806a 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 @@ -507,8 +507,8 @@ public class PipTransition extends PipTransitionController { } @Override - public void onFinishResize(@NonNull TaskInfo taskInfo, @NonNull Rect destinationBounds, - @NonNull Point leashOffset, @PipAnimationController.TransitionDirection int direction, + public void onFinishResize(TaskInfo taskInfo, Rect destinationBounds, + @PipAnimationController.TransitionDirection int direction, @NonNull SurfaceControl.Transaction tx) { final boolean enteringPip = isInPipDirection(direction); if (enteringPip) { @@ -531,16 +531,12 @@ public class PipTransition extends PipTransitionController { if (mFixedRotationState != FIXED_ROTATION_TRANSITION && mFinishTransaction != null) { mFinishTransaction.merge(tx); - // Set crop and position to destination bounds to avoid flickering. + // Set window crop and position to destination bounds to avoid flickering. if (hasValidLeash) { - final Rect relativeDestinationBounds = new Rect(destinationBounds); - relativeDestinationBounds.offset(-leashOffset.x, -leashOffset.y); - mFinishTransaction - .setCrop(leash, relativeDestinationBounds) - // Note that we should set the position to the start position of - // leash then the visible region will be at the same place even if - // the crop region doesn't start at (0, 0). - .setPosition(leash, leashOffset.x, leashOffset.y); + mFinishTransaction.setWindowCrop(leash, destinationBounds.width(), + destinationBounds.height()); + mFinishTransaction.setPosition(leash, destinationBounds.left, + destinationBounds.top); } } } else { @@ -1271,8 +1267,7 @@ public class PipTransition extends PipTransitionController { mPipBoundsState.setBounds(destinationBounds); final SurfaceControl.Transaction tx = new SurfaceControl.Transaction(); - onFinishResize(pipTaskInfo, destinationBounds, animator.getLeashOffset(), - TRANSITION_DIRECTION_TO_PIP, tx); + onFinishResize(pipTaskInfo, destinationBounds, TRANSITION_DIRECTION_TO_PIP, tx); sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP); if (swipePipToHomeOverlay != null) { mPipOrganizer.fadeOutAndRemoveOverlay(swipePipToHomeOverlay, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java index 6129651dc271..a273822759f6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java @@ -31,7 +31,6 @@ import android.app.PictureInPictureUiState; import android.app.TaskInfo; import android.content.ComponentName; import android.content.pm.ActivityInfo; -import android.graphics.Point; import android.graphics.Rect; import android.os.IBinder; import android.os.RemoteException; @@ -93,8 +92,7 @@ public abstract class PipTransitionController implements Transitions.TransitionH mPipOrganizer.fadeOutAndRemoveOverlay(mPipOrganizer.mPipOverlay, null /* callback */, true /* withStartDelay*/); } - onFinishResize(taskInfo, animator.getDestinationBounds(), - animator.getLeashOffset(), direction, tx); + onFinishResize(taskInfo, animator.getDestinationBounds(), direction, tx); sendOnPipTransitionFinished(direction); } @@ -114,9 +112,9 @@ public abstract class PipTransitionController implements Transitions.TransitionH * Called when transition is about to finish. This is usually for performing tasks such as * applying WindowContainerTransaction to finalize the PiP bounds and send to the framework. */ - public void onFinishResize(@NonNull TaskInfo taskInfo, @NonNull Rect destinationBounds, - @NonNull Point leashOffset, @PipAnimationController.TransitionDirection int direction, - @NonNull SurfaceControl.Transaction tx) { + public void onFinishResize(TaskInfo taskInfo, Rect destinationBounds, + @PipAnimationController.TransitionDirection int direction, + SurfaceControl.Transaction tx) { } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index 8ee087b33609..8f02c1b157b5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -35,6 +35,7 @@ import android.animation.ValueAnimator; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PictureInPictureParams; +import android.app.TaskInfo; import android.content.Context; import android.graphics.Point; import android.graphics.PointF; @@ -57,6 +58,7 @@ import com.android.wm.shell.common.pip.PipBoundsState; import com.android.wm.shell.common.pip.PipDisplayLayoutState; import com.android.wm.shell.common.pip.PipMenuController; import com.android.wm.shell.common.pip.PipUtils; +import com.android.wm.shell.common.split.SplitScreenUtils; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.pip2.animation.PipAlphaAnimator; import com.android.wm.shell.pip2.animation.PipEnterAnimator; @@ -74,8 +76,8 @@ public class PipTransition extends PipTransitionController implements private static final String TAG = PipTransition.class.getSimpleName(); // Used when for ENTERING_PIP state update. - private static final String PIP_TASK_TOKEN = "pip_task_token"; private static final String PIP_TASK_LEASH = "pip_task_leash"; + private static final String PIP_TASK_INFO = "pip_task_info"; // Used for PiP CHANGING_BOUNDS state update. static final String PIP_START_TX = "pip_start_tx"; @@ -245,8 +247,8 @@ public class PipTransition extends PipTransitionController implements // Update the PipTransitionState while supplying the PiP leash and token to be cached. Bundle extra = new Bundle(); - extra.putParcelable(PIP_TASK_TOKEN, pipChange.getContainer()); extra.putParcelable(PIP_TASK_LEASH, pipChange.getLeash()); + extra.putParcelable(PIP_TASK_INFO, pipChange.getTaskInfo()); mPipTransitionState.setState(PipTransitionState.ENTERING_PIP, extra); if (isInSwipePipToHomeTransition()) { @@ -899,10 +901,10 @@ public class PipTransition extends PipTransitionController implements Preconditions.checkState(extra != null, "No extra bundle for " + mPipTransitionState); - mPipTransitionState.setPipTaskToken(extra.getParcelable( - PIP_TASK_TOKEN, WindowContainerToken.class)); mPipTransitionState.setPinnedTaskLeash(extra.getParcelable( PIP_TASK_LEASH, SurfaceControl.class)); + mPipTransitionState.setPipTaskInfo(extra.getParcelable( + PIP_TASK_INFO, TaskInfo.class)); boolean hasValidTokenAndLeash = mPipTransitionState.getPipTaskToken() != null && mPipTransitionState.getPinnedTaskLeash() != null; @@ -915,16 +917,16 @@ public class PipTransition extends PipTransitionController implements mPipBoundsState.getBounds()); mPipBoundsState.saveReentryState(snapFraction); - mPipTransitionState.setPipTaskToken(null); mPipTransitionState.setPinnedTaskLeash(null); + mPipTransitionState.setPipTaskInfo(null); break; } } @Override public boolean isPackageActiveInPip(@Nullable String packageName) { - return packageName != null - && mPipBoundsState.getLastPipComponentName() != null - && packageName.equals(mPipBoundsState.getLastPipComponentName().getPackageName()); + final TaskInfo inPipTask = mPipTransitionState.getPipTaskInfo(); + return packageName != null && inPipTask != null && mPipTransitionState.isInPip() + && packageName.equals(SplitScreenUtils.getPackageName(inPipTask.baseIntent)); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java index 8e90bfee2636..6f9f40a487c7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransitionState.java @@ -17,6 +17,7 @@ package com.android.wm.shell.pip2.phone; import android.annotation.IntDef; +import android.app.TaskInfo; import android.graphics.Rect; import android.os.Bundle; import android.os.Handler; @@ -133,17 +134,17 @@ public class PipTransitionState { private final Rect mSwipePipToHomeAppBounds = new Rect(); // - // Tokens and leashes + // Task related caches // - // pinned PiP task's WC token - @Nullable - private WindowContainerToken mPipTaskToken; - // pinned PiP task's leash @Nullable private SurfaceControl mPinnedTaskLeash; + // pinned PiP task info + @Nullable + private TaskInfo mPipTaskInfo; + // Overlay leash potentially used during swipe PiP to home transition; // if null while mInSwipePipToHomeTransition is true, then srcRectHint was invalid. @Nullable @@ -305,11 +306,7 @@ public class PipTransitionState { } @Nullable WindowContainerToken getPipTaskToken() { - return mPipTaskToken; - } - - public void setPipTaskToken(@Nullable WindowContainerToken token) { - mPipTaskToken = token; + return mPipTaskInfo != null ? mPipTaskInfo.getToken() : null; } @Nullable SurfaceControl getPinnedTaskLeash() { @@ -320,6 +317,14 @@ public class PipTransitionState { mPinnedTaskLeash = leash; } + @Nullable TaskInfo getPipTaskInfo() { + return mPipTaskInfo; + } + + void setPipTaskInfo(@Nullable TaskInfo pipTaskInfo) { + mPipTaskInfo = pipTaskInfo; + } + /** * @return true if either in swipe or button-nav fixed rotation. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index 4f0f6760a951..6e0e696e15fe 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -582,6 +582,7 @@ public class SplitScreenController implements SplitDragPolicy.Starter, @Nullable WindowContainerToken hideTaskToken) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, "Legacy startTask does not support hide task token"); + if (isTaskInSplitScreenForeground(taskId)) return; final int[] result = new int[1]; IRemoteAnimationRunner wrapper = new IRemoteAnimationRunner.Stub() { @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHandleManageWindowsMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHandleManageWindowsMenu.kt index b8c91519422c..4d95cde1492f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHandleManageWindowsMenu.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHandleManageWindowsMenu.kt @@ -24,7 +24,7 @@ import android.view.WindowManager import android.window.TaskSnapshot import androidx.compose.ui.graphics.toArgb import com.android.wm.shell.shared.desktopmode.DesktopModeStatus -import com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer +import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer import com.android.wm.shell.shared.split.SplitScreenConstants import com.android.wm.shell.splitscreen.SplitScreenController import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenu.kt index dd68105d28c1..101467df03ac 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenu.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenu.kt @@ -33,7 +33,7 @@ import com.android.window.flags.Flags import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.common.DisplayController import com.android.wm.shell.desktopmode.DesktopRepository -import com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer +import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewContainer import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewHostViewContainer diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index cdd439281ed5..04ef7c1dc461 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -39,7 +39,7 @@ import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.Indica import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_SPLIT_LEFT_INDICATOR; import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_SPLIT_RIGHT_INDICATOR; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE; -import static com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer.MANAGE_WINDOWS_MINIMUM_INSTANCES; +import static com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer.MANAGE_WINDOWS_MINIMUM_INSTANCES; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED; @@ -586,11 +586,18 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, if (decoration == null) { return; } - mInteractionJankMonitor.begin( - decoration.mTaskSurface, mContext, mMainHandler, - Cuj.CUJ_DESKTOP_MODE_MAXIMIZE_WINDOW, source); mDesktopTasksController.toggleDesktopTaskSize(decoration.mTaskInfo, resizeTrigger, - DesktopModeEventLogger.getInputMethodFromMotionEvent(motionEvent)); + DesktopModeEventLogger.getInputMethodFromMotionEvent(motionEvent), () -> { + mInteractionJankMonitor.begin( + decoration.mTaskSurface, mContext, mMainHandler, + Cuj.CUJ_DESKTOP_MODE_MAXIMIZE_WINDOW, source); + return null; + }, () -> { + mInteractionJankMonitor.begin( + decoration.mTaskSurface, mContext, mMainHandler, + Cuj.CUJ_DESKTOP_MODE_UNMAXIMIZE_WINDOW, source); + return null; + }); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index e283982b8469..96cc559a64ae 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -104,7 +104,7 @@ import com.android.wm.shell.desktopmode.WindowDecorCaptionHandleRepository; import com.android.wm.shell.shared.annotations.ShellBackgroundThread; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; -import com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer; +import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; import com.android.wm.shell.windowdecor.viewholder.AppHandleViewHolder; @@ -1459,10 +1459,13 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin @NonNull Function1<Integer, Unit> onIconClickListener ) { if (mTaskInfo.isFreeform()) { + // The menu uses display-wide coordinates for positioning, so make position the sum + // of task position and caption position. + final Rect taskBounds = mTaskInfo.configuration.windowConfiguration.getBounds(); mManageWindowsMenu = new DesktopHeaderManageWindowsMenu( mTaskInfo, - /* x= */ mResult.mCaptionX, - /* y= */ mResult.mCaptionY + mResult.mCaptionTopPadding, + /* x= */ taskBounds.left + mResult.mCaptionX, + /* y= */ taskBounds.top + mResult.mCaptionY + mResult.mCaptionTopPadding, mDisplayController, mRootTaskDisplayAreaOrganizer, mContext, diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/BottomHalfPipLaunchingActivity.java b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/UnmaximizeAppWindowTest.kt index d9d4361411bb..7a71d4bf7a27 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/BottomHalfPipLaunchingActivity.java +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/UnmaximizeAppWindowTest.kt @@ -14,18 +14,14 @@ * limitations under the License. */ -package com.android.server.wm.flicker.testapp; +package com.android.wm.shell.functional -import android.content.Intent; -import android.os.Bundle; +import android.platform.test.annotations.Postsubmit +import com.android.wm.shell.scenarios.UnmaximizeAppWindow +import org.junit.runner.RunWith +import org.junit.runners.BlockJUnit4ClassRunner -public class BottomHalfPipLaunchingActivity extends SimpleActivity { - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - final Intent intent = new Intent(this, BottomHalfPipActivity.class); - startActivity(intent); - } -} +/* Functional test for [UnmaximizeAppWindow]. */ +@RunWith(BlockJUnit4ClassRunner::class) +@Postsubmit +class UnmaximizeAppWindowTest : UnmaximizeAppWindow() diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/UnmaximizeAppWindow.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/UnmaximizeAppWindow.kt new file mode 100644 index 000000000000..741125031b0a --- /dev/null +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/UnmaximizeAppWindow.kt @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.scenarios + +import android.app.Instrumentation +import android.tools.NavBar +import android.tools.Rotation +import android.tools.flicker.rules.ChangeDisplayOrientationRule +import android.tools.traces.parsers.WindowManagerStateHelper +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import com.android.launcher3.tapl.LauncherInstrumentation +import com.android.server.wm.flicker.helpers.DesktopModeAppHelper +import com.android.server.wm.flicker.helpers.NonResizeableAppHelper +import com.android.server.wm.flicker.helpers.SimpleAppHelper +import com.android.window.flags.Flags +import com.android.wm.shell.Utils +import org.junit.After +import org.junit.Assume +import org.junit.Before +import org.junit.Ignore +import org.junit.Rule +import org.junit.Test + +/** + * Testing "unmaximizing" a window e.g. making it get out of/exit a window that was already + * maximized. + */ +@Ignore("Test Base Class") +abstract class UnmaximizeAppWindow +constructor(private val rotation: Rotation = Rotation.ROTATION_0, isResizable: Boolean = true) { + + private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val tapl = LauncherInstrumentation() + private val wmHelper = WindowManagerStateHelper(instrumentation) + private val device = UiDevice.getInstance(instrumentation) + private val testApp = if (isResizable) { + DesktopModeAppHelper(SimpleAppHelper(instrumentation)) + } else { + DesktopModeAppHelper(NonResizeableAppHelper(instrumentation)) + } + + @Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation) + + @Before + fun setup() { + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) + tapl.setEnableRotation(true) + tapl.setExpectedRotation(rotation.value) + ChangeDisplayOrientationRule.setRotation(rotation) + testApp.enterDesktopMode(wmHelper, device) + // Press the buttonn once to setup app window to be maximized already + testApp.maximiseDesktopApp(wmHelper, device) + } + + @Test + open fun unmaximizeAppWindow() { + // Re-press button to exit maximized state + testApp.maximiseDesktopApp(wmHelper, device) + } + + @After + fun teardown() { + testApp.exit(wmHelper) + } +} diff --git a/libs/WindowManager/Shell/tests/flicker/pip/Android.bp b/libs/WindowManager/Shell/tests/flicker/pip/Android.bp index f40edaebec5e..ddbc681f7cac 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/Android.bp +++ b/libs/WindowManager/Shell/tests/flicker/pip/Android.bp @@ -266,26 +266,5 @@ test_module_config { test_suites: ["device-tests"], } -test_module_config { - name: "WMShellFlickerTestsPip-nonMatchParent", - base: "WMShellFlickerTestsPip", - include_filters: ["com.android.wm.shell.flicker.pip.nonmatchparent.*"], - test_suites: ["device-tests"], -} - -test_module_config { - name: "WMShellFlickerTestsPip-BottomHalfExitPipToAppViaExpandButtonTest", - base: "WMShellFlickerTestsPip", - include_filters: ["com.android.wm.shell.flicker.pip.nonmatchparent.BottomHalfExitPipToAppViaExpandButtonTest"], - test_suites: ["device-tests"], -} - -test_module_config { - name: "WMShellFlickerTestsPip-BottomHalfExitPipToAppViaIntentTest", - base: "WMShellFlickerTestsPip", - include_filters: ["com.android.wm.shell.flicker.pip.nonmatchparent.BottomHalfExitPipToAppViaIntentTest"], - test_suites: ["device-tests"], -} - // End breakdowns for WMShellFlickerTestsPip module //////////////////////////////////////////////////////////////////////////////// diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/common/PipTransition.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/common/PipTransition.kt index 7861d201cd29..c37bf3579e93 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/common/PipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/common/PipTransition.kt @@ -40,6 +40,7 @@ abstract class PipTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) { @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + protected val pipApp = PipAppHelper(instrumentation) protected val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.startRotation) protected val broadcastActionTrigger = BroadcastActionTrigger(instrumentation) @@ -62,11 +63,6 @@ abstract class PipTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) { } } - /** - * Defines the test app to run PIP flicker test. - */ - protected open val pipApp = PipAppHelper(instrumentation) - /** Defines the transition used to run the test */ protected open val thisTransition: FlickerBuilder.() -> Unit = {} diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppTransition.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppTransition.kt deleted file mode 100644 index a6f29fc3452b..000000000000 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppTransition.kt +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.wm.shell.flicker.pip.nonmatchparent - -import android.platform.test.annotations.Presubmit -import android.platform.test.annotations.RequiresFlagsEnabled -import android.tools.flicker.legacy.LegacyFlickerTest -import android.tools.traces.component.ComponentNameMatcher -import com.android.server.wm.flicker.helpers.BottomHalfPipAppHelper -import com.android.server.wm.flicker.helpers.PipAppHelper -import com.android.window.flags.Flags -import com.android.wm.shell.flicker.pip.common.ExitPipToAppTransition -import org.junit.Test - -/** - * Base test class to verify PIP exit animation with an activity layout to the bottom half of - * the container. - */ -@RequiresFlagsEnabled(Flags.FLAG_BETTER_SUPPORT_NON_MATCH_PARENT_ACTIVITY) -abstract class BottomHalfExitPipToAppTransition(flicker: LegacyFlickerTest) : - ExitPipToAppTransition(flicker) { - - override val pipApp: PipAppHelper = BottomHalfPipAppHelper(instrumentation) - - @Presubmit - @Test - override fun showBothAppLayersThenHidePip() { - // Disabled since the BottomHalfPipActivity just covers half of the simple activity. - } - - @Presubmit - @Test - override fun showBothAppWindowsThenHidePip() { - // Disabled since the BottomHalfPipActivity just covers half of the simple activity. - } - - @Presubmit - @Test - override fun pipAppCoversFullScreenAtEnd() { - // Disabled since the BottomHalfPipActivity just covers half of the simple activity. - } - - /** - * Checks that the [testApp] and [pipApp] are always visible since the [pipApp] only covers - * half of screen. - */ - @Presubmit - @Test - fun showBothAppLayersDuringPipTransition() { - flicker.assertLayers { - isVisible(testApp) - .isVisible(pipApp.or(ComponentNameMatcher.TRANSITION_SNAPSHOT)) - } - } - - /** - * Checks that the [testApp] and [pipApp] are always visible since the [pipApp] only covers - * half of screen. - */ - @Presubmit - @Test - fun showBothAppWindowsDuringPipTransition() { - flicker.assertWm { - isAppWindowVisible(testApp) - .isAppWindowOnTop(pipApp) - .isAppWindowVisible(pipApp) - } - } - - /** - * Verify that the [testApp] and [pipApp] covers the entire screen at the end of PIP exit - * animation since the [pipApp] will use a bottom half layout. - */ - @Presubmit - @Test - fun testPlusPipAppCoversWindowFrameAtEnd() { - flicker.assertLayersEnd { - val pipRegion = visibleRegion(pipApp).region - visibleRegion(testApp).plus(pipRegion).coversExactly(displayBounds) - } - } -}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaExpandButtonTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaExpandButtonTest.kt deleted file mode 100644 index f492bd444702..000000000000 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaExpandButtonTest.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package com.android.wm.shell.flicker.pip.nonmatchparent - -import android.tools.flicker.junit.FlickerParametersRunnerFactory -import android.tools.flicker.legacy.FlickerBuilder -import android.tools.flicker.legacy.LegacyFlickerTest -import org.junit.FixMethodOrder -import org.junit.runner.RunWith -import org.junit.runners.MethodSorters -import org.junit.runners.Parameterized - -/** - * Test expanding a pip window back to bottom half layout via the expand button - * - * To run this test: `atest WMShellFlickerTestsPip:BottomHalfExitPipToAppViaExpandButtonTest` - * - * Actions: - * ``` - * Launch an app in pip mode [bottomHalfPipApp], - * Launch another full screen mode [testApp] - * Expand [bottomHalfPipApp] app to bottom half layout by clicking on the pip window and - * then on the expand button - * ``` - * - * Notes: - * ``` - * 1. Some default assertions (e.g., nav bar, status bar and screen covered) - * are inherited [PipTransition] - * 2. Part of the test setup occurs automatically via - * [android.tools.flicker.legacy.runner.TransitionRunner], - * including configuring navigation mode, initial orientation and ensuring no - * apps are running before setup - * ``` - */ -@RunWith(Parameterized::class) -@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -class BottomHalfExitPipToAppViaExpandButtonTest(flicker: LegacyFlickerTest) : - BottomHalfExitPipToAppTransition(flicker) -{ - override val thisTransition: FlickerBuilder.() -> Unit = { - setup { - // launch an app behind the pip one - testApp.launchViaIntent(wmHelper) - } - transitions { - // This will bring PipApp to fullscreen - pipApp.expandPipWindowToApp(wmHelper) - // Wait until the transition idle and test and pip app still shows. - wmHelper.StateSyncBuilder().withLayerVisible(testApp).withLayerVisible(pipApp) - .withAppTransitionIdle().waitForAndVerify() - } - } -}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaIntentTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaIntentTest.kt deleted file mode 100644 index a76a647348a1..000000000000 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/nonmatchparent/BottomHalfExitPipToAppViaIntentTest.kt +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.wm.shell.flicker.pip.nonmatchparent - -import android.tools.flicker.junit.FlickerParametersRunnerFactory -import android.tools.flicker.legacy.FlickerBuilder -import android.tools.flicker.legacy.LegacyFlickerTest -import org.junit.FixMethodOrder -import org.junit.runner.RunWith -import org.junit.runners.MethodSorters -import org.junit.runners.Parameterized - -/** - * Test expanding a pip window back to bottom half layout via an intent - * - * To run this test: `atest WMShellFlickerTestsPip:BottomHalfExitPipToAppViaIntentTest` - * - * Actions: - * ``` - * Launch an app in pip mode [bottomHalfPipApp], - * Launch another full screen mode [testApp] - * Expand [bottomHalfPipApp] app to bottom half layout via an intent - * ``` - * - * Notes: - * ``` - * 1. Some default assertions (e.g., nav bar, status bar and screen covered) - * are inherited from [PipTransition] - * 2. Part of the test setup occurs automatically via - * [android.tools.flicker.legacy.runner.TransitionRunner], - * including configuring navigation mode, initial orientation and ensuring no - * apps are running before setup - * ``` - */ -@RunWith(Parameterized::class) -@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -class BottomHalfExitPipToAppViaIntentTest(flicker: LegacyFlickerTest) : - BottomHalfExitPipToAppTransition(flicker) -{ - override val thisTransition: FlickerBuilder.() -> Unit = { - setup { - // launch an app behind the pip one - testApp.launchViaIntent(wmHelper) - } - transitions { - // This will bring PipApp to fullscreen - pipApp.exitPipToFullScreenViaIntent(wmHelper) - // Wait until the transition idle and test and pip app still shows. - wmHelper.StateSyncBuilder().withLayerVisible(testApp).withLayerVisible(pipApp) - .withAppTransitionIdle().waitForAndVerify() - } - } -}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/transition/TransitionStateHolderTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/transition/TransitionStateHolderTest.kt new file mode 100644 index 000000000000..7b1d27a8b823 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/transition/TransitionStateHolderTest.kt @@ -0,0 +1,100 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.common.transition + +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.server.testutils.any +import com.android.wm.shell.TestShellExecutor +import com.android.wm.shell.recents.RecentsTransitionHandler +import com.android.wm.shell.recents.RecentsTransitionStateListener +import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_ANIMATING +import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING +import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_REQUESTED +import com.android.wm.shell.sysui.ShellInit +import kotlin.test.assertNotNull +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Mockito.mock +import org.mockito.Mockito.verify +import org.mockito.kotlin.never + +/** + * Test class for {@link TransitionStateHolder} + * + * Usage: atest WMShellUnitTests:TransitionStateHolderTest + */ +@SmallTest +@RunWith(AndroidTestingRunner::class) +class TransitionStateHolderTest { + + lateinit var recentTransitionHandler: RecentsTransitionHandler + lateinit var shellInit: ShellInit + + @Before + fun before() { + recentTransitionHandler = mock(RecentsTransitionHandler::class.java) + shellInit = ShellInit(TestShellExecutor()) + } + + @Test + fun `No TransitionStateHolder listeners before initialization`() { + TransitionStateHolder(shellInit, recentTransitionHandler) + verify(recentTransitionHandler, never()).addTransitionStateListener(any()) + } + + @Test + fun `When TransitionStateHolder initialized a listener has been registered `() { + TransitionStateHolder(shellInit, recentTransitionHandler) + shellInit.init() + assertNotNull(recentsTransitionStateListener) + } + + @Test + fun `When TransitionStateHolder is created no recent animation running`() { + val holder = TransitionStateHolder(shellInit, recentTransitionHandler) + shellInit.init() + assertFalse(holder.isRecentsTransitionRunning()) + } + + @Test + fun `Recent animation running updates after callback value`() { + val holder = TransitionStateHolder(shellInit, recentTransitionHandler) + shellInit.init() + + assertFalse(holder.isRecentsTransitionRunning()) + + recentsTransitionStateListener.onTransitionStateChanged(TRANSITION_STATE_NOT_RUNNING) + assertFalse(holder.isRecentsTransitionRunning()) + + recentsTransitionStateListener.onTransitionStateChanged(TRANSITION_STATE_REQUESTED) + assertTrue(holder.isRecentsTransitionRunning()) + + recentsTransitionStateListener.onTransitionStateChanged(TRANSITION_STATE_ANIMATING) + assertTrue(holder.isRecentsTransitionRunning()) + } + + private val recentsTransitionStateListener: RecentsTransitionStateListener + get() = ArgumentCaptor.forClass(RecentsTransitionStateListener::class.java).run { + verify(recentTransitionHandler).addTransitionStateListener(capture()) + value + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilderTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilderTest.kt new file mode 100644 index 000000000000..68d9bf9b926f --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxSurfaceBuilderTest.kt @@ -0,0 +1,146 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.content.Context +import android.testing.AndroidTestingRunner +import android.view.SurfaceControl +import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn +import com.android.wm.shell.ShellTestCase +import java.util.function.Consumer +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers +import org.mockito.Mockito.verify +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.verification.VerificationMode + +/** + * Tests for [LetterboxSurfaceBuilder]. + * + * Build/Install/Run: + * atest WMShellUnitTests:LetterboxSurfaceBuilderTest + */ +@RunWith(AndroidTestingRunner::class) +@SmallTest +class LetterboxSurfaceBuilderTest : ShellTestCase() { + + @Test + fun `When surface is created mandatory methods are invoked`() { + runTestScenario { r -> + r.invokeBuilder() + + r.checkNameIsSet(expected = true) + r.checkCallSiteIsSet(expected = true) + r.checkSurfaceIsHidden(invoked = true, isHidden = true) + r.checkColorLayerIsSet(expected = true) + r.checkParentLeashIsSet(expected = true) + r.checkSetLayerIsInvoked(expected = true) + r.checkColorSpaceAgnosticIsSet(expected = true, value = true) + r.checkColorIsSetFromLetterboxConfiguration(expected = true) + } + } + + /** + * Runs a test scenario providing a Robot. + */ + fun runTestScenario(consumer: Consumer<LetterboxSurfaceBuilderRobotTest>) { + val robot = LetterboxSurfaceBuilderRobotTest(mContext) + consumer.accept(robot) + } + + class LetterboxSurfaceBuilderRobotTest(val ctx: Context) { + + private val letterboxConfiguration: LetterboxConfiguration + private val letterboxSurfaceBuilder: LetterboxSurfaceBuilder + private val tx: SurfaceControl.Transaction + private val parentLeash: SurfaceControl + private val surfaceBuilder: SurfaceControl.Builder + + companion object { + @JvmStatic + val TEST_SURFACE_NAME = "SurfaceForTest" + + @JvmStatic + val TEST_SURFACE_CALL_SITE = "CallSiteForTest" + } + + init { + letterboxConfiguration = LetterboxConfiguration(ctx) + letterboxSurfaceBuilder = LetterboxSurfaceBuilder(letterboxConfiguration) + tx = org.mockito.kotlin.mock<SurfaceControl.Transaction>() + doReturn(tx).`when`(tx).setLayer(anyOrNull(), anyOrNull()) + doReturn(tx).`when`(tx).setColorSpaceAgnostic(anyOrNull(), anyOrNull()) + parentLeash = org.mockito.kotlin.mock<SurfaceControl>() + surfaceBuilder = SurfaceControl.Builder() + spyOn(surfaceBuilder) + } + + fun invokeBuilder() { + letterboxSurfaceBuilder.createSurface( + tx, + parentLeash, + TEST_SURFACE_NAME, + TEST_SURFACE_CALL_SITE, + surfaceBuilder + ) + } + + fun checkNameIsSet(expected: Boolean) { + verify(surfaceBuilder, expected.asMode()) + .setName(TEST_SURFACE_NAME) + } + + fun checkCallSiteIsSet(expected: Boolean) { + verify(surfaceBuilder, expected.asMode()) + .setCallsite(TEST_SURFACE_CALL_SITE) + } + + fun checkSurfaceIsHidden(invoked: Boolean, isHidden: Boolean) { + verify(surfaceBuilder, invoked.asMode()) + .setHidden(isHidden) + } + + fun checkColorLayerIsSet(expected: Boolean) { + verify(surfaceBuilder, expected.asMode()).setColorLayer() + } + + fun checkParentLeashIsSet(expected: Boolean) { + verify(surfaceBuilder, expected.asMode()).setParent(parentLeash) + } + + fun checkSetLayerIsInvoked(expected: Boolean) { + verify(tx, expected.asMode()).setLayer(anyOrNull(), ArgumentMatchers.anyInt()) + } + + fun checkColorSpaceAgnosticIsSet(expected: Boolean, value: Boolean) { + verify(tx, expected.asMode()).setColorSpaceAgnostic(anyOrNull(), eq(value)) + } + + fun checkColorIsSetFromLetterboxConfiguration(expected: Boolean) { + val components = letterboxConfiguration.getBackgroundColorRgbArray() + verify(tx, expected.asMode()).setColor(anyOrNull(), eq(components)) + } + + private fun Boolean.asMode(): VerificationMode = if (this) times(1) else never() + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt index 1ae1c3fc4563..9c6afcb8be63 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt @@ -16,10 +16,13 @@ package com.android.wm.shell.compatui.letterbox +import android.graphics.Point +import android.graphics.Rect import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule import android.testing.AndroidTestingRunner +import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CLOSE import androidx.test.filters.SmallTest import com.android.window.flags.Flags @@ -33,12 +36,12 @@ import java.util.function.Consumer import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito import org.mockito.kotlin.any import org.mockito.kotlin.eq +import org.mockito.kotlin.mock import org.mockito.kotlin.never import org.mockito.kotlin.times -import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.verify import org.mockito.verification.VerificationMode /** @@ -93,7 +96,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { r.creationEventDetected(expected = false) r.visibilityEventDetected(expected = false) r.destroyEventDetected(expected = false) - r.boundsEventDetected(expected = false) + r.updateSurfaceBoundsEventDetected(expected = false) } } } @@ -107,14 +110,23 @@ class LetterboxTransitionObserverTest : ShellTestCase() { inputBuilder { buildTransitionInfo() - r.createTopActivityChange(inputBuilder = this, isLetterboxed = true) + r.createTopActivityChange( + inputBuilder = this, + isLetterboxed = true, + taskPosition = Point(20, 30), + taskWidth = 200, + taskHeight = 300 + ) } validateOutput { r.creationEventDetected(expected = true) r.visibilityEventDetected(expected = true, visible = true) r.destroyEventDetected(expected = false) - r.boundsEventDetected(expected = true) + r.updateSurfaceBoundsEventDetected( + expected = true, + taskBounds = Rect(20, 30, 200, 300) + ) } } } @@ -135,7 +147,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { r.creationEventDetected(expected = false) r.visibilityEventDetected(expected = true, visible = false) r.destroyEventDetected(expected = false) - r.boundsEventDetected(expected = false) + r.updateSurfaceBoundsEventDetected(expected = false) } } } @@ -156,7 +168,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { r.destroyEventDetected(expected = true) r.creationEventDetected(expected = false) r.visibilityEventDetected(expected = false, visible = false) - r.boundsEventDetected(expected = false) + r.updateSurfaceBoundsEventDetected(expected = false) } } } @@ -189,10 +201,10 @@ class LetterboxTransitionObserverTest : ShellTestCase() { val observerFactory: () -> LetterboxTransitionObserver init { - executor = Mockito.mock(ShellExecutor::class.java) + executor = mock<ShellExecutor>() shellInit = ShellInit(executor) - transitions = Mockito.mock(Transitions::class.java) - letterboxController = Mockito.mock(LetterboxController::class.java) + transitions = mock<Transitions>() + letterboxController = mock<LetterboxController>() letterboxObserver = LetterboxTransitionObserver(shellInit, transitions, letterboxController) observerFactory = { letterboxObserver } @@ -203,67 +215,78 @@ class LetterboxTransitionObserverTest : ShellTestCase() { fun observer() = letterboxObserver fun checkObservableIsRegistered(expected: Boolean) { - Mockito.verify(transitions, expected.asMode()).registerObserver(observer()) + verify(transitions, expected.asMode()).registerObserver(observer()) } fun creationEventDetected( expected: Boolean, displayId: Int = DISPLAY_ID, taskId: Int = TASK_ID - ) { - Mockito.verify(letterboxController, expected.asMode()).createLetterboxSurface( - toLetterboxKeyMatcher(displayId, taskId), - anyOrNull(), - anyOrNull() - ) - } + ) = verify( + letterboxController, + expected.asMode() + ).createLetterboxSurface( + eq(LetterboxKey(displayId, taskId)), + any<SurfaceControl.Transaction>(), + any<SurfaceControl>() + ) fun visibilityEventDetected( expected: Boolean, + visible: Boolean = true, displayId: Int = DISPLAY_ID, - taskId: Int = TASK_ID, - visible: Boolean? = null - ) { - Mockito.verify(letterboxController, expected.asMode()).updateLetterboxSurfaceVisibility( - toLetterboxKeyMatcher(displayId, taskId), - anyOrNull(), - visible.asMatcher() - ) - } + taskId: Int = TASK_ID + ) = verify(letterboxController, expected.asMode()).updateLetterboxSurfaceVisibility( + eq(LetterboxKey(displayId, taskId)), + any<SurfaceControl.Transaction>(), + eq(visible) + ) fun destroyEventDetected( expected: Boolean, displayId: Int = DISPLAY_ID, taskId: Int = TASK_ID - ) { - Mockito.verify(letterboxController, expected.asMode()).destroyLetterboxSurface( - toLetterboxKeyMatcher(displayId, taskId), - anyOrNull() - ) - } - - fun boundsEventDetected( + ) = verify( + letterboxController, + expected.asMode() + ).destroyLetterboxSurface( + eq(LetterboxKey(displayId, taskId)), + any<SurfaceControl.Transaction>() + ) + + fun updateSurfaceBoundsEventDetected( expected: Boolean, displayId: Int = DISPLAY_ID, - taskId: Int = TASK_ID - ) { - Mockito.verify(letterboxController, expected.asMode()).updateLetterboxSurfaceBounds( - toLetterboxKeyMatcher(displayId, taskId), - anyOrNull(), - anyOrNull() - ) - } + taskId: Int = TASK_ID, + taskBounds: Rect = Rect() + ) = verify( + letterboxController, + expected.asMode() + ).updateLetterboxSurfaceBounds( + eq(LetterboxKey(displayId, taskId)), + any<SurfaceControl.Transaction>(), + eq(taskBounds) + ) fun createTopActivityChange( inputBuilder: TransitionObserverInputBuilder, isLetterboxed: Boolean = true, displayId: Int = DISPLAY_ID, - taskId: Int = TASK_ID + taskId: Int = TASK_ID, + taskPosition: Point = Point(), + taskWidth: Int = 0, + taskHeight: Int = 0 ) { - inputBuilder.addChange(changeTaskInfo = inputBuilder.createTaskInfo().apply { - appCompatTaskInfo.isTopActivityLetterboxed = isLetterboxed - this.taskId = taskId - this.displayId = displayId + inputBuilder.addChange(inputBuilder.createChange( + changeTaskInfo = inputBuilder.createTaskInfo().apply { + appCompatTaskInfo.isTopActivityLetterboxed = isLetterboxed + this.taskId = taskId + this.displayId = displayId + } + ).apply { + endRelOffset.x = taskPosition.x + endRelOffset.y = taskPosition.y + endAbsBounds.set(Rect(0, 0, taskWidth, taskHeight)) }) } @@ -279,16 +302,5 @@ class LetterboxTransitionObserverTest : ShellTestCase() { } private fun Boolean.asMode(): VerificationMode = if (this) times(1) else never() - - private fun Boolean?.asMatcher(): Boolean = - if (this != null) eq(this) else any() - - private fun toLetterboxKeyMatcher(displayId: Int, taskId: Int): LetterboxKey { - if (displayId < 0 || taskId < 0) { - return any() - } else { - return eq(LetterboxKey(displayId, taskId)) - } - } } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt index 0756b6b6246c..d4682c1325f2 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt @@ -134,6 +134,12 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { null }.whenever(inputManager).registerKeyGestureEventHandler(any()) shellInit.init() + + desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( + context, + Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), + inputManager, shellTaskOrganizer, focusTransitionObserver, testExecutor + ) } @After @@ -151,11 +157,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { FLAG_USE_KEY_GESTURE_EVENT_HANDLER ) fun keyGestureMoveToNextDisplay_shouldMoveToNextDisplay() { - desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( - context, - Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), - inputManager, shellTaskOrganizer, focusTransitionObserver - ) // Set up two display ids whenever(rootTaskDisplayAreaOrganizer.displayIds) .thenReturn(intArrayOf(DEFAULT_DISPLAY, SECOND_DISPLAY)) @@ -187,11 +188,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS ) fun keyGestureSnapLeft_shouldSnapResizeTaskToLeft() { - desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( - context, - Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), - inputManager, shellTaskOrganizer, focusTransitionObserver - ) val task = setUpFreeformTask() task.isFocused = true whenever(shellTaskOrganizer.getRunningTasks()).thenReturn(arrayListOf(task)) @@ -219,11 +215,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS ) fun keyGestureSnapRight_shouldSnapResizeTaskToRight() { - desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( - context, - Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), - inputManager, shellTaskOrganizer, focusTransitionObserver - ) val task = setUpFreeformTask() task.isFocused = true whenever(shellTaskOrganizer.getRunningTasks()).thenReturn(arrayListOf(task)) @@ -251,11 +242,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS ) fun keyGestureToggleFreeformWindowSize_shouldToggleTaskSize() { - desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( - context, - Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), - inputManager, shellTaskOrganizer, focusTransitionObserver - ) val task = setUpFreeformTask() task.isFocused = true whenever(shellTaskOrganizer.getRunningTasks()).thenReturn(arrayListOf(task)) @@ -272,7 +258,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { verify(desktopTasksController).toggleDesktopTaskSize( task, ResizeTrigger.MAXIMIZE_MENU, - DesktopModeEventLogger.Companion.InputMethod.KEYBOARD + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, ) } @@ -282,11 +268,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS ) fun keyGestureMinimizeFreeformWindow_shouldMinimizeTask() { - desktopModeKeyGestureHandler = DesktopModeKeyGestureHandler( - context, - Optional.of(desktopModeWindowDecorViewModel), Optional.of(desktopTasksController), - inputManager, shellTaskOrganizer, focusTransitionObserver - ) val task = setUpFreeformTask() task.isFocused = true whenever(shellTaskOrganizer.getRunningTasks()).thenReturn(arrayListOf(task)) @@ -300,7 +281,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) assertThat(result).isTrue() - verify(desktopTasksController).minimizeTask(task) } private fun setUpFreeformTask( diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/TransitionObserverTestUtils.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/TransitionObserverTestUtils.kt index 3e26ee0deed0..0e15668a05a7 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/TransitionObserverTestUtils.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/TransitionObserverTestUtils.kt @@ -36,7 +36,6 @@ import android.window.TransitionInfo.TransitionMode import android.window.WindowContainerToken import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn import com.android.wm.shell.transition.Transitions.TransitionObserver -import org.mockito.Mockito import org.mockito.kotlin.mock @DslMarker @@ -93,10 +92,10 @@ class TransitionObserverTestContext : TransitionObserverTestStep { */ class TransitionObserverInputBuilder : TransitionObserverTestStep { - private val transition = Mockito.mock(IBinder::class.java) + private val transition = mock<IBinder>() private var transitionInfo: TransitionInfo? = null - private val startTransaction = Mockito.mock(Transaction::class.java) - private val finishTransaction = Mockito.mock(Transaction::class.java) + private val startTransaction = mock<Transaction>() + private val finishTransaction = mock<Transaction>() fun buildTransitionInfo( @TransitionType type: Int = TRANSIT_NONE, @@ -143,7 +142,7 @@ class TransitionObserverInputBuilder : TransitionObserverTestStep { taskId = id displayId = DEFAULT_DISPLAY configuration.windowConfiguration.windowingMode = windowingMode - token = WindowContainerToken(Mockito.mock(IWindowContainerToken::class.java)) + token = WindowContainerToken(mock<IWindowContainerToken>()) baseIntent = Intent().apply { component = ComponentName("package", "component.name") } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt index 6c910f56f069..153be07bd204 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt @@ -398,9 +398,11 @@ class DesktopModeWindowDecorViewModelTests : DesktopModeWindowDecorViewModelTest maxOrRestoreListenerCaptor.value.invoke() verify(mockDesktopTasksController).toggleDesktopTaskSize( - decor.mTaskInfo, - ResizeTrigger.MAXIMIZE_MENU, - InputMethod.UNKNOWN_INPUT_METHOD + eq(decor.mTaskInfo), + eq(ResizeTrigger.MAXIMIZE_MENU), + eq(InputMethod.UNKNOWN_INPUT_METHOD), + any(), + any() ) } @@ -1059,9 +1061,11 @@ class DesktopModeWindowDecorViewModelTests : DesktopModeWindowDecorViewModelTest verify(mockDesktopTasksController) .toggleDesktopTaskSize( - decor.mTaskInfo, - ResizeTrigger.MAXIMIZE_BUTTON, - InputMethod.UNKNOWN_INPUT_METHOD + eq(decor.mTaskInfo), + eq(ResizeTrigger.MAXIMIZE_BUTTON), + eq(InputMethod.UNKNOWN_INPUT_METHOD), + any(), + any(), ) } diff --git a/media/java/android/media/AudioPlaybackConfiguration.java b/media/java/android/media/AudioPlaybackConfiguration.java index 66da03144a7d..dba9cc95d902 100644 --- a/media/java/android/media/AudioPlaybackConfiguration.java +++ b/media/java/android/media/AudioPlaybackConfiguration.java @@ -283,8 +283,19 @@ public final class AudioPlaybackConfiguration implements Parcelable { * Flag used when playback is muted by AppOpsManager#OP_PLAY_AUDIO. */ @SystemApi + @FlaggedApi(FLAG_MUTED_BY_PORT_VOLUME_API) + @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) + public static final int MUTED_BY_OP_PLAY_AUDIO = (1 << 3); + /** + * @hide + * Flag used when playback is muted by AppOpsManager#OP_PLAY_AUDIO. + * @deprecated see {@link MUTED_BY_OP_PLAY_AUDIO} + */ + @SystemApi + @Deprecated + @FlaggedApi(FLAG_MUTED_BY_PORT_VOLUME_API) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) - public static final int MUTED_BY_APP_OPS = (1 << 3); + public static final int MUTED_BY_APP_OPS = MUTED_BY_OP_PLAY_AUDIO; /** * @hide * Flag used when muted by client volume. @@ -324,7 +335,7 @@ public final class AudioPlaybackConfiguration implements Parcelable { @IntDef( flag = true, value = {MUTED_BY_MASTER, MUTED_BY_STREAM_VOLUME, MUTED_BY_STREAM_MUTED, - MUTED_BY_APP_OPS, MUTED_BY_CLIENT_VOLUME, MUTED_BY_VOLUME_SHAPER, + MUTED_BY_OP_PLAY_AUDIO, MUTED_BY_CLIENT_VOLUME, MUTED_BY_VOLUME_SHAPER, MUTED_BY_PORT_VOLUME, MUTED_BY_OP_CONTROL_AUDIO}) @Retention(RetentionPolicy.SOURCE) public @interface PlayerMuteEvent { @@ -770,7 +781,7 @@ public final class AudioPlaybackConfiguration implements Parcelable { private boolean isMuteAffectingActiveState() { return (mMutedState & MUTED_BY_CLIENT_VOLUME) != 0 || (mMutedState & MUTED_BY_VOLUME_SHAPER) != 0 - || (mMutedState & MUTED_BY_APP_OPS) != 0; + || (mMutedState & MUTED_BY_OP_PLAY_AUDIO) != 0; } /** @@ -911,8 +922,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { if ((mMutedState & MUTED_BY_STREAM_MUTED) != 0) { apcToString.append("streamMute "); } - if ((mMutedState & MUTED_BY_APP_OPS) != 0) { - apcToString.append("appOps "); + if ((mMutedState & MUTED_BY_OP_PLAY_AUDIO) != 0) { + apcToString.append("opPlayAudio "); } if ((mMutedState & MUTED_BY_CLIENT_VOLUME) != 0) { apcToString.append("clientVolume "); diff --git a/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp b/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp index c5fb80840b84..b00658052bde 100644 --- a/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp +++ b/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp @@ -73,13 +73,13 @@ public: MOCK_METHOD(ScopedAStatus, closeSessionChannel, (), (override)); MOCK_METHOD(ScopedAStatus, getCpuHeadroom, (const ::aidl::android::os::CpuHeadroomParamsInternal& in_params, - std::vector<float>* _aidl_return), + std::optional<hal::CpuHeadroomResult>* _aidl_return), (override)); MOCK_METHOD(ScopedAStatus, getCpuHeadroomMinIntervalMillis, (int64_t* _aidl_return), (override)); MOCK_METHOD(ScopedAStatus, getGpuHeadroom, (const ::aidl::android::os::GpuHeadroomParamsInternal& in_params, - float* _aidl_return), + std::optional<hal::GpuHeadroomResult>* _aidl_return), (override)); MOCK_METHOD(ScopedAStatus, getGpuHeadroomMinIntervalMillis, (int64_t* _aidl_return), (override)); diff --git a/nfc/tests/src/android/nfc/NdefMessageTest.java b/nfc/tests/src/android/nfc/NdefMessageTest.java new file mode 100644 index 000000000000..9ca295da75c3 --- /dev/null +++ b/nfc/tests/src/android/nfc/NdefMessageTest.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.nfc; + +import static com.google.common.truth.Truth.assertThat; + +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class NdefMessageTest { + private NdefMessage mNdefMessage; + private NdefRecord mNdefRecord; + + @Before + public void setUp() { + mNdefRecord = NdefRecord.createUri("http://www.example.com"); + mNdefMessage = new NdefMessage(mNdefRecord); + } + + @After + public void tearDown() { + } + + @Test + public void testGetRecords() { + NdefRecord[] records = mNdefMessage.getRecords(); + assertThat(records).isNotNull(); + assertThat(records).hasLength(1); + assertThat(records[0]).isEqualTo(mNdefRecord); + } + + @Test + public void testToByteArray() throws FormatException { + byte[] bytes = mNdefMessage.toByteArray(); + assertThat(bytes).isNotNull(); + assertThat(bytes.length).isGreaterThan(0); + NdefMessage ndefMessage = new NdefMessage(bytes); + assertThat(ndefMessage).isNotNull(); + } +} diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java index 83858d9c9c54..bc62e565599c 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java @@ -141,7 +141,7 @@ public class MainSwitchPreference extends TwoStatePreference @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - super.setChecked(isChecked); + buttonView.post(() -> super.setChecked(isChecked)); } /** diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt index c2728b4ad012..7601b9a31041 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceDataStoreAdapter.kt @@ -20,7 +20,7 @@ import androidx.preference.PreferenceDataStore import com.android.settingslib.datastore.KeyValueStore /** Adapter to translate [KeyValueStore] into [PreferenceDataStore]. */ -class PreferenceDataStoreAdapter(private val keyValueStore: KeyValueStore) : PreferenceDataStore() { +class PreferenceDataStoreAdapter(val keyValueStore: KeyValueStore) : PreferenceDataStore() { override fun getBoolean(key: String, defValue: Boolean): Boolean = keyValueStore.getValue(key, Boolean::class.javaObjectType) ?: defValue diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt index 62ac3ade62a4..7cec59c9090c 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt @@ -74,16 +74,12 @@ class PreferenceScreenBindingHelper( private val preferences: ImmutableMap<String, PreferenceHierarchyNode> private val dependencies: ImmutableMultimap<String, String> private val lifecycleAwarePreferences: Array<PreferenceLifecycleProvider> - private val storages = mutableSetOf<KeyedObservable<String>>() + private val storages = mutableMapOf<String, KeyedObservable<String>>() private val preferenceObserver: KeyedObserver<String?> private val storageObserver = - KeyedObserver<String?> { key, _ -> - if (key != null) { - notifyChange(key, CHANGE_REASON_VALUE) - } - } + KeyedObserver<String> { key, _ -> notifyChange(key, CHANGE_REASON_VALUE) } init { val preferencesBuilder = ImmutableMap.builder<String, PreferenceHierarchyNode>() @@ -98,7 +94,6 @@ class PreferenceScreenBindingHelper( preferencesBuilder.put(it.key, this) it.dependencyOfEnabledState(context)?.addDependency(it) if (it is PreferenceLifecycleProvider) lifecycleAwarePreferences.add(it) - if (it is PersistentPreference<*>) storages.add(it.storage(context)) } } @@ -120,7 +115,16 @@ class PreferenceScreenBindingHelper( preferenceObserver = KeyedObserver { key, reason -> onPreferenceChange(key, reason) } addObserver(preferenceObserver, mainExecutor) - for (storage in storages) storage.addObserver(storageObserver, mainExecutor) + + preferenceScreen.forEachRecursively { + val preferenceDataStore = it.preferenceDataStore + if (preferenceDataStore is PreferenceDataStoreAdapter) { + val key = it.key + val keyValueStore = preferenceDataStore.keyValueStore + storages[key] = keyValueStore + keyValueStore.addObserver(key, storageObserver, mainExecutor) + } + } } private fun onPreferenceChange(key: String?, reason: Int) { @@ -181,7 +185,7 @@ class PreferenceScreenBindingHelper( fun onDestroy() { removeObserver(preferenceObserver) - for (storage in storages) storage.removeObserver(storageObserver) + for ((key, storage) in storages) storage.removeObserver(key, storageObserver) for (preference in lifecycleAwarePreferences) { preference.onDestroy(preferenceLifecycleContext) } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt new file mode 100644 index 000000000000..2e7221bd4d7f --- /dev/null +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/Utils.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settingslib.preference + +import androidx.preference.Preference +import androidx.preference.PreferenceGroup + +/** Traversals preference hierarchy recursively and applies an action. */ +fun PreferenceGroup.forEachRecursively(action: (Preference) -> Unit) { + action.invoke(this) + for (index in 0 until preferenceCount) { + val preference = getPreference(index) + if (preference is PreferenceGroup) { + preference.forEachRecursively(action) + } else { + action.invoke(preference) + } + } +} diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 03fea37deaf5..6128d45831fb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -130,10 +130,12 @@ import com.google.android.collect.Sets; import libcore.util.HexEncoding; +import java.io.BufferedReader; import java.io.File; import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -380,6 +382,8 @@ public class SettingsProvider extends ContentProvider { @GuardedBy("mLock") private Handler mHandler; + private static final Set<String> sDeviceConfigAllowlistedNamespaces = new ArraySet<>(); + // We have to call in the user manager with no lock held, private volatile UserManager mUserManager; @@ -2442,6 +2446,10 @@ public class SettingsProvider extends ContentProvider { if (!isRestrictedShell && hasWritePermission) { assertCallingUserDenyList(flags); } else if (hasAllowlistPermission) { + Set<String> allowlistedDeviceConfigNamespaces = null; + if (isRestrictedShell) { + allowlistedDeviceConfigNamespaces = getAllowlistedDeviceConfigNamespaces(); + } for (String flag : flags) { boolean namespaceAllowed = false; if (isRestrictedShell) { @@ -2452,7 +2460,7 @@ public class SettingsProvider extends ContentProvider { } else { flagNamespace = flag; } - if (WritableNamespaces.ALLOWLIST.contains(flagNamespace)) { + if (allowlistedDeviceConfigNamespaces.contains(flagNamespace)) { namespaceAllowed = true; } } else { @@ -2513,6 +2521,60 @@ public class SettingsProvider extends ContentProvider { } } + /** + * Returns a Set of DeviceConfig allowlisted namespaces in which all flags can be modified + * by a caller with the {@code WRITE_ALLOWLISTED_DEVICE_CONFIG} permission. + * <p> + * This method also supports mainline modules that introduce their own allowlisted + * namespaces within the {@code etc/writable_namespaces} file under their directory. + */ + private Set<String> getAllowlistedDeviceConfigNamespaces() { + synchronized (sDeviceConfigAllowlistedNamespaces) { + if (!sDeviceConfigAllowlistedNamespaces.isEmpty()) { + return sDeviceConfigAllowlistedNamespaces; + } + if (android.provider.flags.Flags.deviceConfigWritableNamespacesApi()) { + sDeviceConfigAllowlistedNamespaces.addAll(DeviceConfig.getAdbWritableNamespaces()); + } else { + sDeviceConfigAllowlistedNamespaces.addAll(WritableNamespaces.ALLOWLIST); + } + final long identity = Binder.clearCallingIdentity(); + try { + List<String> apexDirectories; + try { + apexDirectories = mPackageManager.getAllApexDirectories(); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Caught a RemoteException obtaining APEX directories: ", e); + return sDeviceConfigAllowlistedNamespaces; + } + for (int i = 0; i < apexDirectories.size(); i++) { + String apexDirectory = apexDirectories.get(i); + File namespaceFile = Environment.buildPath(new File(apexDirectory), "etc", + "writable_namespaces"); + if (namespaceFile.exists() && namespaceFile.isFile()) { + try (BufferedReader reader = new BufferedReader( + new FileReader(namespaceFile))) { + String namespace; + while ((namespace = reader.readLine()) != null) { + namespace = namespace.trim(); + // Support comments by ignoring any lines that start with '#'. + if (!namespace.isEmpty() && !namespace.startsWith("#")) { + sDeviceConfigAllowlistedNamespaces.add(namespace); + } + } + } catch (IOException e) { + Slog.e(LOG_TAG, "Caught an exception parsing file: " + namespaceFile, + e); + } + } + } + } finally { + Binder.restoreCallingIdentity(identity); + } + return sDeviceConfigAllowlistedNamespaces; + } + } + private static void warnOrThrowForUndesiredSecureSettingsMutationForTargetSdk( int targetSdkVersion, String name) { // If the app targets Lollipop MR1 or older SDK we warn, otherwise crash. diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespaces.java b/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespaces.java index b0409c037107..5ce97eb22a04 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespaces.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespaces.java @@ -33,6 +33,7 @@ import java.util.Set; final class WritableNamespaces { public static final Set<String> ALLOWLIST = new ArraySet<String>(Arrays.asList( + "adservices", "captive_portal_login", "connectivity", "exo", diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index d1a22e8612d3..3d250fd82473 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -81,33 +81,37 @@ filegroup { visibility: ["//visibility:private"], } -// Tests where robolectric conversion caused errors in SystemUITests at runtime +// Tests where robolectric failed at runtime. (go/central-multivalent) filegroup { - name: "SystemUI-tests-broken-robofiles-sysui-run", + name: "SystemUI-tests-broken-robofiles-run", srcs: [ + "tests/src/**/systemui/shade/NotificationShadeWindowViewControllerTest.kt", + "tests/src/**/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt", + "tests/src/**/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt", + "tests/src/**/systemui/biometrics/udfps/SinglePointerTouchProcessorTest.kt", + "tests/src/**/systemui/animation/back/FlingOnBackAnimationCallbackTest.kt", + "tests/src/**/systemui/education/domain/ui/view/ContextualEduDialogTest.kt", + "tests/src/**/systemui/screenshot/ActionIntentCreatorTest.kt", + "tests/src/**/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt", + "tests/src/**/systemui/accessibility/WindowMagnificationControllerTest.java", "tests/src/**/systemui/broadcast/BroadcastDispatcherTest.kt", - "tests/src/**/systemui/broadcast/ActionReceiverTest.kt", "tests/src/**/systemui/globalactions/GlobalActionsDialogLiteTest.java", "tests/src/**/systemui/globalactions/GlobalActionsImeTest.java", - "tests/src/**/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt", - "tests/src/**/systemui/media/dialog/MediaOutputAdapterTest.java", "tests/src/**/systemui/media/dialog/MediaOutputBaseDialogTest.java", "tests/src/**/systemui/media/dialog/MediaOutputBroadcastDialogTest.java", "tests/src/**/systemui/media/dialog/MediaOutputDialogTest.java", - "tests/src/**/systemui/mediaprojection/permission/MediaProjectionPermissionDialogDelegateTest.kt", "tests/src/**/systemui/settings/brightness/BrightnessDialogTest.kt", - ], -} - -// Tests where robolectric failed at runtime. (go/central-multivalent) -filegroup { - name: "SystemUI-tests-broken-robofiles-run", - srcs: [ - "tests/src/**/systemui/ExpandHelperTest.java", + "tests/src/**/systemui/shared/clocks/view/SimpleDigitalClockTextViewTest.kt", + "tests/src/**/systemui/statusbar/policy/SecurityControllerTest.java", + "tests/src/**/systemui/lifecycle/SysUiViewModelTest.kt", + "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt", + "tests/src/**/systemui/graphics/ImageLoaderContentProviderTest.kt", + "tests/src/**/systemui/flags/FakeFeatureFlagsTest.kt", + "tests/src/**/systemui/communal/data/backup/CommunalBackupUtilsTest.kt", "tests/src/**/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java", "tests/src/**/systemui/accessibility/AccessibilityGestureTargetsObserverTest.java", "tests/src/**/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java", - "tests/src/**/systemui/accessibility/floatingmenu/AccessibilityTargetAdapterTest.java", "tests/src/**/systemui/screenshot/appclips/AppClipsActivityTest.java", "tests/src/**/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java", "tests/src/**/systemui/screenshot/appclips/AppClipsViewModelTest.java", @@ -124,36 +128,27 @@ filegroup { "tests/src/**/systemui/classifier/FalsingDataProviderTest.java", "tests/src/**/systemui/screenshot/ImageExporterTest.java", "tests/src/**/systemui/bouncer/data/repository/KeyguardBouncerRepositoryTest.kt", - "tests/src/**/systemui/keyguard/domain/interactor/scenetransition/LockscreenSceneTransitionInteractorTest.kt", "tests/src/**/systemui/logcat/LogAccessDialogActivityTest.java", "tests/src/**/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt", "tests/src/**/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterTest.kt", "tests/src/**/systemui/accessibility/floatingmenu/MenuNotificationFactoryTest.java", "tests/src/**/systemui/accessibility/floatingmenu/MenuViewLayerTest.java", - "tests/src/**/systemui/accessibility/floatingmenu/MenuViewTest.java", "tests/src/**/systemui/classifier/PointerCountClassifierTest.java", "tests/src/**/systemui/accessibility/floatingmenu/RadiiAnimatorTest.java", "tests/src/**/systemui/screenrecord/RecordingControllerTest.java", "tests/src/**/systemui/screenshot/RequestProcessorTest.kt", "tests/src/**/systemui/media/controls/domain/resume/ResumeMediaBrowserTest.kt", - "tests/src/**/systemui/screenshot/SaveImageInBackgroundTaskTest.kt", "tests/src/**/systemui/screenshot/scroll/ScrollCaptureClientTest.java", "tests/src/**/systemui/accessibility/SecureSettingsContentObserverTest.java", "tests/src/**/systemui/media/controls/ui/viewmodel/SeekBarViewModelTest.kt", "tests/src/**/systemui/qs/external/TileServicesTest.java", "tests/src/**/systemui/ambient/touch/TouchMonitorTest.java", - "tests/src/**/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java", "tests/src/**/systemui/accessibility/WindowMagnificationSettingsTest.java", - "tests/src/androidx/core/animation/AnimatorTestRuleIsolationTest.kt", "tests/src/**/systemui/CameraProtectionLoaderImplTest.kt", - "tests/src/**/systemui/DependencyTest.java", - "tests/src/**/systemui/InitControllerTest.java", "tests/src/**/systemui/SliceBroadcastRelayHandlerTest.java", "tests/src/**/systemui/SystemUIApplicationTest.kt", "tests/src/**/systemui/SysUICutoutProviderTest.kt", - "tests/src/**/keyguard/ActiveUnlockConfigTest.kt", "tests/src/**/keyguard/AdminSecondaryLockScreenControllerTest.java", - "tests/src/**/keyguard/KeyguardClockAccessibilityDelegateTest.java", "tests/src/**/keyguard/KeyguardStatusViewControllerTest.java", "tests/src/**/systemui/accessibility/AccessibilityButtonModeObserverTest.java", "tests/src/**/systemui/accessibility/AccessibilityButtonTargetsObserverTest.java", @@ -164,16 +159,12 @@ filegroup { "tests/src/**/systemui/animation/TextAnimatorTest.kt", "tests/src/**/systemui/animation/TextInterpolatorTest.kt", "tests/src/**/systemui/animation/ActivityTransitionAnimatorTest.kt", - "tests/src/**/systemui/animation/AnimatorTestRuleOrderTest.kt", "tests/src/**/systemui/animation/DialogTransitionAnimatorTest.kt", - "tests/src/**/systemui/broadcast/ActionReceiverTest.kt", "tests/src/**/systemui/broadcast/BroadcastDispatcherTest.kt", - "tests/src/**/systemui/compose/ComposeInitializerTest.kt", "tests/src/**/systemui/controls/ui/ControlsActivityTest.kt", "tests/src/**/systemui/controls/management/ControlsEditingActivityTest.kt", "tests/src/**/systemui/controls/management/ControlsRequestDialogTest.kt", "tests/src/**/systemui/controls/ui/DetailDialogTest.kt", - "tests/src/**/systemui/fontscaling/FontScalingDialogDelegateTest.kt", "tests/src/**/systemui/keyguard/CustomizationProviderTest.kt", "tests/src/**/systemui/globalactions/GlobalActionsColumnLayoutTest.java", "tests/src/**/systemui/globalactions/GlobalActionsDialogLiteTest.java", @@ -182,10 +173,6 @@ filegroup { "tests/src/**/systemui/keyguard/CustomizationProviderTest.kt", "tests/src/**/systemui/keyguard/KeyguardViewMediatorTest.java", "tests/src/**/systemui/keyguard/LifecycleTest.java", - "tests/src/**/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt", - "tests/src/**/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt", - "tests/src/**/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt", - "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModelTest.kt", "tests/src/**/systemui/lifecycle/RepeatWhenAttachedTest.kt", "tests/src/**/systemui/log/LogBufferTest.kt", "tests/src/**/systemui/media/dialog/MediaOutputBaseDialogTest.java", @@ -193,52 +180,35 @@ filegroup { "tests/src/**/systemui/media/dialog/MediaOutputDialogTest.java", "tests/src/**/systemui/media/controls/domain/resume/MediaResumeListenerTest.kt", "tests/src/**/systemui/mediaprojection/taskswitcher/ui/TaskSwitcherNotificationCoordinatorTest.kt", - "tests/src/**/systemui/navigationbar/views/NavigationBarButtonTest.java", "tests/src/**/systemui/people/PeopleProviderTest.java", "tests/src/**/systemui/people/PeopleSpaceUtilsTest.java", "tests/src/**/systemui/people/widget/PeopleSpaceWidgetManagerTest.java", "tests/src/**/systemui/people/PeopleTileViewHelperTest.java", "tests/src/**/systemui/power/data/repository/PowerRepositoryImplTest.kt", - "tests/src/**/systemui/privacy/PrivacyConfigFlagsTest.kt", - "tests/src/**/systemui/privacy/PrivacyDialogV2Test.kt", - "tests/src/**/systemui/qs/external/TileRequestDialogEventLoggerTest.kt", - "tests/src/**/systemui/qs/AutoAddTrackerTest.kt", - "tests/src/**/systemui/qs/external/TileRequestDialogEventLoggerTest.kt", "tests/src/**/systemui/qs/tiles/DndTileTest.kt", "tests/src/**/systemui/qs/tiles/DreamTileTest.java", - "tests/src/**/systemui/qs/FgsManagerControllerTest.java", "tests/src/**/systemui/qs/QSPanelTest.kt", "tests/src/**/systemui/reardisplay/RearDisplayCoreStartableTest.kt", "tests/src/**/systemui/reardisplay/RearDisplayDialogControllerTest.java", "tests/src/**/systemui/reardisplay/RearDisplayInnerDialogDelegateTest.kt", "tests/src/**/systemui/statusbar/KeyboardShortcutListSearchTest.java", "tests/src/**/systemui/statusbar/KeyboardShortcutsTest.java", - "tests/src/**/systemui/statusbar/KeyguardIndicationControllerWithCoroutinesTest.kt", - "tests/src/**/systemui/statusbar/notification/AssistantFeedbackControllerTest.java", "tests/src/**/systemui/statusbar/notification/collection/NotificationEntryTest.java", - "tests/src/**/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt", "tests/src/**/systemui/statusbar/notification/collection/ShadeListBuilderTest.java", - "tests/src/**/systemui/statusbar/notification/footer/ui/view/FooterViewTest.java", "tests/src/**/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java", "tests/src/**/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt", "tests/src/**/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt", - "tests/src/**/systemui/statusbar/NotificationLockscreenUserManagerTest.java", "tests/src/**/systemui/statusbar/notification/logging/NotificationLoggerTest.java", "tests/src/**/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java", - "tests/src/**/systemui/statusbar/notification/row/NotificationContentInflaterTest.java", "tests/src/**/systemui/statusbar/notification/row/NotificationContentViewTest.kt", "tests/src/**/systemui/statusbar/notification/row/NotificationConversationInfoTest.java", - "tests/src/**/systemui/statusbar/notification/row/NotificationGutsManagerTest.java", "tests/src/**/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt", "tests/src/**/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapperTest.kt", "tests/src/**/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java", - "tests/src/**/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt", - "tests/src/**/systemui/statusbar/phone/AutoTileManagerTest.java", "tests/src/**/systemui/statusbar/phone/CentralSurfacesImplTest.java", "tests/src/**/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java", "tests/src/**/systemui/statusbar/phone/PhoneStatusBarTransitionsTest.kt", "tests/src/**/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt", - "tests/src/**/systemui/statusbar/phone/PhoneStatusBarView.java", "tests/src/**/systemui/statusbar/phone/PhoneStatusBarViewTest.kt", "tests/src/**/systemui/statusbar/phone/StatusBarBoundsProviderTest.kt", "tests/src/**/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt", @@ -252,13 +222,9 @@ filegroup { "tests/src/**/systemui/statusbar/policy/LocationControllerImplTest.java", "tests/src/**/systemui/statusbar/policy/RemoteInputViewTest.java", "tests/src/**/systemui/statusbar/policy/SmartReplyViewTest.java", - "tests/src/**/systemui/statusbar/policy/ui/dialog/ModesDialogDelegateTest.kt", - "tests/src/**/systemui/statusbar/StatusBarStateControllerImplTest.kt", "tests/src/**/systemui/theme/ThemeOverlayApplierTest.java", "tests/src/**/systemui/touch/TouchInsetManagerTest.java", "tests/src/**/systemui/util/LifecycleFragmentTest.java", - "tests/src/**/systemui/util/kotlin/PairwiseFlowTest", - "tests/src/**/systemui/util/sensors/AsyncManagerTest.java", "tests/src/**/systemui/util/sensors/ThresholdSensorImplTest.java", "tests/src/**/systemui/volume/VolumeDialogImplTest.java", "tests/src/**/systemui/wallet/controller/QuickAccessWalletControllerTest.java", @@ -271,26 +237,17 @@ filegroup { "tests/src/**/systemui/clipboardoverlay/ClipboardListenerTest.java", "tests/src/**/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt", "tests/src/**/systemui/communal/data/db/CommunalWidgetDaoTest.kt", - "tests/src/**/systemui/display/data/repository/DisplayWindowPropertiesRepositoryImplTest.kt", "tests/src/**/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt", "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt", "tests/src/**/systemui/lifecycle/ActivatableTest.kt", - "tests/src/**/systemui/lifecycle/HydratorTest.kt", "tests/src/**/systemui/media/dialog/MediaSwitchingControllerTest.java", "tests/src/**/systemui/qs/QSImplTest.java", "tests/src/**/systemui/qs/panels/ui/compose/DragAndDropTest.kt", "tests/src/**/systemui/qs/panels/ui/compose/ResizingTest.kt", "tests/src/**/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java", - "tests/src/**/systemui/accessibility/floatingmenu/PositionTest.java", "tests/src/**/systemui/animation/TransitionAnimatorTest.kt", - "tests/src/**/systemui/screenshot/scroll/ScrollCaptureControllerTest.java", - "tests/src/**/systemui/lifecycle/SysuiViewModelTest.kt", - "tests/src/**/systemui/flags/FakeFeatureFlags.kt", "tests/src/**/systemui/animation/TransitionAnimatorTest.kt", - "tests/src/**/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java", "tests/src/**/systemui/statusbar/connectivity/NetworkControllerSignalTest.java", - "tests/src/**/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt", - "tests/src/**/systemui/statusbar/policy/RotationLockControllerImplTest.java", "tests/src/**/systemui/statusbar/phone/ScrimControllerTest.java", "tests/src/**/systemui/toast/ToastUITest.java", "tests/src/**/systemui/statusbar/policy/FlashlightControllerImplTest.kt", @@ -329,47 +286,48 @@ filegroup { "tests/src/**/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java", "tests/src/**/systemui/qs/external/TileLifecycleManagerTest.java", "tests/src/**/systemui/ScreenDecorationsTest.java", + "tests/src/**/systemui/statusbar/policy/BatteryControllerStartableTest.java", "tests/src/**/keyguard/CarrierTextManagerTest.java", "tests/src/**/keyguard/KeyguardUpdateMonitorTest.java", ], } -// Tests where robolectric failed at compile time. (go/multivalent-tests) +// Tests where compilation failed due to kotlin internal references. filegroup { - name: "SystemUI-tests-broken-robofiles-compile", + name: "SystemUI-tests-broken-robofiles-internal", srcs: [ - "tests/src/**/systemui/statusbar/notification/icon/IconManagerTest.kt", - "tests/src/**/systemui/statusbar/KeyguardIndicationControllerTest.java", - "tests/src/**/systemui/doze/DozeScreenStateTest.java", - "tests/src/**/systemui/notetask/NoteTaskInitializerTest.kt", - "tests/src/**/systemui/media/controls/ui/controller/MediaHierarchyManagerTest.kt", - "tests/src/**/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt", - "tests/src/**/systemui/controls/management/ControlsFavoritingActivityTest.kt", - "tests/src/**/systemui/controls/management/ControlsProviderSelectorActivityTest.kt", - "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt", - "tests/src/**/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt", - "tests/src/**/systemui/qs/tileimpl/QSTileViewImplTest.kt", + "tests/src/**/android/systemui/media/controls/ui/controller/MediaHierarchyManagerTest.kt", + "tests/src/**/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt", + "tests/src/**/android/systemui/statusbar/notification/icon/IconManagerTest.kt", + "tests/src/**/android/systemui/notetask/NoteTaskInitializerTest.kt", + "tests/src/**/systemui/statusbar/policy/VariableDateViewControllerTest.kt", + "tests/src/**/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt", + "tests/src/**/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelIconParameterizedTest.kt", + "tests/src/**/systemui/statusbar/pipeline/wifi/shared/model/WifiNetworkModelTest.kt", + "tests/src/**/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt", + "tests/src/**/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt", "tests/src/**/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt", + "tests/src/**/systemui/statusbar/policy/WalletControllerImplTest.kt", "tests/src/**/keyguard/ClockEventControllerTest.kt", - "tests/src/**/systemui/bluetooth/qsdialog/BluetoothAutoOnRepositoryTest.kt", + "tests/src/**/systemui/bluetooth/qsdialog/BluetoothStateInteractorTest.kt", "tests/src/**/systemui/bluetooth/qsdialog/BluetoothTileDialogDelegateTest.kt", "tests/src/**/systemui/bluetooth/qsdialog/BluetoothTileDialogRepositoryTest.kt", "tests/src/**/systemui/bluetooth/qsdialog/BluetoothTileDialogViewModelTest.kt", + "tests/src/**/systemui/bluetooth/qsdialog/DeviceItemFactoryTest.kt", "tests/src/**/systemui/bluetooth/qsdialog/DeviceItemInteractorTest.kt", "tests/src/**/systemui/broadcast/UserBroadcastDispatcherTest.kt", "tests/src/**/systemui/charging/WiredChargingRippleControllerTest.kt", "tests/src/**/systemui/clipboardoverlay/ClipboardModelTest.kt", "tests/src/**/systemui/controls/controller/AuxiliaryPersistenceWrapperTest.kt", - "tests/src/**/systemui/controls/controller/ControlsBindingControllerImplTest.kt", "tests/src/**/systemui/controls/controller/ControlsControllerImplTest.kt", "tests/src/**/systemui/controls/controller/DeletionJobServiceTest.kt", - "tests/src/**/systemui/controls/settings/ControlsSettingsDialogManagerImplTest.kt", + "tests/src/**/systemui/controls/management/ControlsFavoritingActivityTest.kt", "tests/src/**/systemui/controls/ui/ControlsUiControllerImplTest.kt", - "tests/src/**/systemui/controls/ui/ControlViewHolderTest.kt", "tests/src/**/systemui/controls/ui/SelectionItemTest.kt", "tests/src/**/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySectionTest.kt", "tests/src/**/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt", - "tests/src/**/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt", + "tests/src/**/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt", + "tests/src/**/systemui/media/controls/ui/MediaPlayerDataTest.kt", "tests/src/**/systemui/media/controls/ui/animation/AnimationBindHandlerTest.kt", "tests/src/**/systemui/media/controls/ui/animation/ColorSchemeTransitionTest.kt", "tests/src/**/systemui/media/controls/ui/animation/MetadataAnimationHandlerTest.kt", @@ -377,7 +335,6 @@ filegroup { "tests/src/**/systemui/media/controls/ui/controller/MediaControlPanelTest.kt", "tests/src/**/systemui/media/controls/ui/controller/MediaViewControllerTest.kt", "tests/src/**/systemui/media/controls/ui/drawable/SquigglyProgressTest.kt", - "tests/src/**/systemui/media/controls/ui/MediaPlayerDataTest.kt", "tests/src/**/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt", "tests/src/**/systemui/navigationbar/gestural/BackPanelControllerTest.kt", "tests/src/**/systemui/notetask/NoteTaskControllerTest.kt", @@ -386,61 +343,61 @@ filegroup { "tests/src/**/systemui/qs/external/CustomTileStatePersisterTest.kt", "tests/src/**/systemui/qs/external/TileRequestDialogTest.kt", "tests/src/**/systemui/qs/external/TileServiceRequestControllerTest.kt", - "tests/src/**/systemui/qs/tileimpl/TilesStatesTextTest.kt", + "tests/src/**/systemui/qs/tileimpl/QSTileViewImplTest.kt", "tests/src/**/systemui/qs/tiles/AlarmTileTest.kt", "tests/src/**/systemui/qs/tiles/BluetoothTileTest.kt", - "tests/src/**/systemui/screenshot/ScreenshotPolicyImplTest.kt", - "tests/src/**/systemui/settings/DisplayTrackerImplTest.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherTest.kt", + "tests/src/**/systemui/statusbar/pipeline/mobile/data/model/SystemUiCarrierConfigTest.kt", + "tests/src/**/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt", + "tests/src/**/systemui/statusbar/phone/FoldStateListenerTest.kt", + "tests/src/**/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt", + "tests/src/**/systemui/statusbar/notification/row/TextPrecomputerTest.kt", + "tests/src/**/systemui/statusbar/notification/row/SingleLineConversationViewBinderTest.kt", + "tests/src/**/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt", + "tests/src/**/systemui/statusbar/notification/row/SingleLineViewInflaterTest.kt", + "tests/src/**/systemui/statusbar/notification/row/ChannelEditorDialogControllerTest.kt", + "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryLoggerTest.kt", + "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryMeterTest.kt", + "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryViewWalkerTest.kt", + "tests/src/**/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt", + "tests/src/**/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt", + "tests/src/**/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorTest.kt", + "tests/src/**/systemui/statusbar/notification/collection/coordinator/DataStoreCoordinatorTest.kt", + "tests/src/**/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinatorTest.kt", + "tests/src/**/systemui/statusbar/notification/RoundableTest.kt", + "tests/src/**/systemui/stylus/StylusUsiPowerUiTest.kt", + "tests/src/**/systemui/statusbar/gesture/GenericGestureDetectorTest.kt", + "tests/src/**/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt", + "tests/src/**/systemui/statusbar/connectivity/MobileStateTest.kt", + "tests/src/**/systemui/statusbar/commandline/CommandParserTest.kt", + "tests/src/**/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt", + "tests/src/**/systemui/statusbar/LightRevealScrimTest.kt", + "tests/src/**/systemui/shade/transition/LargeScreenShadeInterpolatorImplTest.kt", + "tests/src/**/systemui/shade/ShadeExpansionStateManagerTest.kt", + "tests/src/**/systemui/shade/ShadeHeaderControllerTest.kt", + "tests/src/**/systemui/shade/NotificationsQSContainerControllerTest.kt", "tests/src/**/systemui/settings/UserFileManagerImplTest.kt", "tests/src/**/systemui/settings/UserTrackerImplReceiveTest.kt", "tests/src/**/systemui/settings/UserTrackerImplTest.kt", "tests/src/**/systemui/shade/GlanceableHubContainerControllerTest.kt", "tests/src/**/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt", - "tests/src/**/systemui/shade/NotificationsQSContainerControllerTest.kt", - "tests/src/**/systemui/shade/ShadeExpansionStateManagerTest.kt", - "tests/src/**/systemui/shade/ShadeHeaderControllerTest.kt", - "tests/src/**/systemui/shade/transition/LargeScreenShadeInterpolatorImplTest.kt", - "tests/src/**/systemui/statusbar/commandline/CommandParserTest.kt", - "tests/src/**/systemui/statusbar/connectivity/MobileStateTest.kt", - "tests/src/**/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt", - "tests/src/**/systemui/statusbar/gesture/GenericGestureDetectorTest.kt", - "tests/src/**/systemui/statusbar/LightRevealScrimTest.kt", - "tests/src/**/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt", - "tests/src/**/systemui/statusbar/notification/collection/coordinator/DataStoreCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryLoggerTest.kt", - "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryMeterTest.kt", - "tests/src/**/systemui/statusbar/notification/logging/NotificationMemoryViewWalkerTest.kt", - "tests/src/**/systemui/statusbar/notification/RoundableTest.kt", - "tests/src/**/systemui/statusbar/notification/row/ChannelEditorDialogControllerTest.kt", - "tests/src/**/systemui/statusbar/notification/row/SingleLineConversationViewBinderTest.kt", - "tests/src/**/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt", - "tests/src/**/systemui/statusbar/notification/row/SingleLineViewInflaterTest.kt", - "tests/src/**/systemui/statusbar/notification/row/TextPrecomputerTest.kt", - "tests/src/**/systemui/statusbar/phone/FoldStateListenerTest.kt", - "tests/src/**/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt", - "tests/src/**/systemui/statusbar/pipeline/mobile/data/model/SystemUiCarrierConfigTest.kt", - "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherTest.kt", - "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt", - "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt", - "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionTelephonySmokeTests.kt", - "tests/src/**/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt", - "tests/src/**/systemui/statusbar/pipeline/wifi/shared/model/WifiNetworkModelTest.kt", - "tests/src/**/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelIconParameterizedTest.kt", - "tests/src/**/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt", - "tests/src/**/systemui/statusbar/policy/VariableDateViewControllerTest.kt", - "tests/src/**/systemui/statusbar/policy/WalletControllerImplTest.kt", - "tests/src/**/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt", - "tests/src/**/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt", - "tests/src/**/systemui/statusbar/policy/BatteryControllerStartableTest.java", - "tests/src/**/systemui/shared/plugins/PluginActionManagerTest.java", - "tests/src/**/systemui/statusbar/policy/SecurityControllerTest.java", - "tests/src/**/systemui/shared/clocks/view/SimpleDigitalClockTextViewTest.kt", + "tests/src/**/systemui/screenshot/ScreenshotPolicyImplTest.kt", + "tests/src/**/systemui/qs/tileimpl/TilesStatesTextTest.kt", + "tests/src/**/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt", + "tests/src/**/systemui/controls/ui/ControlViewHolderTest.kt", + "tests/src/**/systemui/controls/settings/ControlsSettingsDialogManagerImplTest.kt", + "tests/src/**/systemui/controls/controller/ControlsBindingControllerImplTest.kt", + "tests/src/**/systemui/bluetooth/qsdialog/BluetoothAutoOnRepositoryTest.kt", + "tests/src/**/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt", + "tests/src/**/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt", + "tests/src/**/systemui/controls/management/ControlsProviderSelectorActivityTest.kt", + "tests/src/**/systemui/settings/DisplayTrackerImplTest.kt", + "tests/src/**/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt", + "tests/src/**/systemui/wmshell/BubblesTest.java", ], - visibility: ["//visibility:private"], } //Create a library to expose SystemUI's resources to other modules. @@ -903,9 +860,8 @@ android_robolectric_test { ], exclude_srcs: [ ":SystemUI-tests-broken-robofiles-mockito-extended", - ":SystemUI-tests-broken-robofiles-compile", + ":SystemUI-tests-broken-robofiles-internal", ":SystemUI-tests-broken-robofiles-run", - ":SystemUI-tests-broken-robofiles-sysui-run", ], static_libs: [ "RoboTestLibraries", diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java index 3db61a58c7a3..6bc0f42f39aa 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java @@ -220,9 +220,6 @@ public class A11yMenuOverlayLayout { @SuppressLint("MissingPermission") private boolean isShortcutRestricted(int shortcutId) { - if (!Flags.hideRestrictedActions()) { - return false; - } final UserManager userManager = mService.getSystemService(UserManager.class); if (userManager == null) { return false; @@ -366,12 +363,11 @@ public class A11yMenuOverlayLayout { if (mLayout.getVisibility() == View.VISIBLE) { mLayout.setVisibility(View.GONE); } else { - if (Flags.hideRestrictedActions()) { - // Reconfigure the shortcut list in case the set of restricted actions has changed. - mA11yMenuViewPager.configureViewPagerAndFooter( - mLayout, createShortcutList(), getPageIndex()); - updateViewLayout(); - } + // Reconfigure the shortcut list in case the set of restricted actions has changed. + mA11yMenuViewPager.configureViewPagerAndFooter( + mLayout, createShortcutList(), getPageIndex()); + updateViewLayout(); + mLayout.setVisibility(View.VISIBLE); } } diff --git a/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java b/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java index 4ab771be55f4..71726199aeb6 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java @@ -46,9 +46,6 @@ import android.hardware.display.DisplayManager; import android.media.AudioManager; import android.os.PowerManager; import android.os.UserManager; -import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.platform.uiautomator_helpers.WaitUtils; import android.provider.Settings; import android.util.Log; @@ -63,7 +60,6 @@ import androidx.test.uiautomator.Configurator; import androidx.test.uiautomator.UiDevice; import com.android.compatibility.common.util.TestUtils; -import com.android.systemui.accessibility.accessibilitymenu.Flags; import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortcut.ShortcutId; import org.junit.After; @@ -71,7 +67,6 @@ import org.junit.AfterClass; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -82,9 +77,6 @@ import java.util.concurrent.atomic.AtomicInteger; @RunWith(AndroidJUnit4.class) public class AccessibilityMenuServiceTest { - @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); - private static final String TAG = "A11yMenuServiceTest"; private static final int CLICK_ID = AccessibilityNodeInfo.ACTION_CLICK; @@ -499,7 +491,6 @@ public class AccessibilityMenuServiceTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_HIDE_RESTRICTED_ACTIONS) public void testRestrictedActions_BrightnessNotAvailable() throws Throwable { try { setUserRestriction(UserManager.DISALLOW_CONFIG_BRIGHTNESS, true); @@ -519,7 +510,6 @@ public class AccessibilityMenuServiceTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_HIDE_RESTRICTED_ACTIONS) public void testRestrictedActions_VolumeNotAvailable() throws Throwable { try { setUserRestriction(UserManager.DISALLOW_ADJUST_VOLUME, true); diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index e59fe47194da..20b83e10e821 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1509,6 +1509,16 @@ flag { } flag { + name: "sim_pin_use_slot_id" + namespace: "systemui" + description: "Reorient SIM data processing around slotId instead of subId" + bug: "376173142" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "use_transitions_for_keyguard_occluded" namespace: "systemui" description: "Use Keyguard Transitions to set Notification Shade occlusion state" diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 5b1203fa17c9..787edfb9168c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -141,6 +141,7 @@ import androidx.compose.ui.semantics.CustomAccessibilityAction import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.customActions +import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.onClick import androidx.compose.ui.semantics.paneTitle import androidx.compose.ui.semantics.semantics @@ -902,11 +903,17 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal Arrangement.spacedBy(Dimensions.Spacing, Alignment.CenterVertically), horizontalAlignment = Alignment.CenterHorizontally, ) { + val titleForEmptyStateCTA = stringResource(R.string.title_for_empty_state_cta) Text( - text = stringResource(R.string.title_for_empty_state_cta), + text = titleForEmptyStateCTA, style = MaterialTheme.typography.displaySmall, textAlign = TextAlign.Center, color = colors.secondary, + modifier = + Modifier.focusable().semantics(mergeDescendants = true) { + contentDescription = titleForEmptyStateCTA + heading() + }, ) Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) { Button( diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalTouchableSurface.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalTouchableSurface.kt index 3707a87249b9..f2edec657cd4 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalTouchableSurface.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalTouchableSurface.kt @@ -27,6 +27,8 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.pointer.motionEventSpy +import androidx.compose.ui.semantics.hideFromAccessibility +import androidx.compose.ui.semantics.semantics import com.android.systemui.communal.ui.viewmodel.CommunalViewModel @OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class) @@ -42,6 +44,9 @@ fun CommunalTouchableSurface( Box( modifier = modifier + // The touchable surface is hidden for accessibility because these actions are + // already provided through custom accessibility actions. + .semantics { hideFromAccessibility() } .combinedClickable( onLongClick = viewModel::onLongClick, onClick = viewModel::onClick, diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java index aa95abb3528f..aa95abb3528f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java index 944066fa4954..d47ec8cfe4e5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java @@ -25,15 +25,12 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; import android.testing.TestableLooper; import android.util.Size; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.util.FakeSharedPreferences; @@ -59,18 +56,6 @@ public class WindowMagnificationFrameSizePrefsTest extends SysuiTestCase { mWindowMagnificationFrameSizePrefs = new WindowMagnificationFrameSizePrefs(mContext); } - @DisableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) - @Test - public void saveSizeForCurrentDensity_getExpectedSize() { - Size testSize = new Size(500, 500); - mWindowMagnificationFrameSizePrefs - .saveIndexAndSizeForCurrentDensity(MagnificationSize.CUSTOM, testSize); - - assertThat(mWindowMagnificationFrameSizePrefs.getSizeForCurrentDensity()) - .isEqualTo(testSize); - } - - @EnableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) @Test public void saveSizeForCurrentDensity_validPreference_getExpectedSize() { int testIndex = MagnificationSize.MEDIUM; @@ -81,7 +66,6 @@ public class WindowMagnificationFrameSizePrefsTest extends SysuiTestCase { .isEqualTo(testSize); } - @EnableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) @Test public void saveSizeForCurrentDensity_validPreference_getExpectedIndex() { int testIndex = MagnificationSize.MEDIUM; @@ -92,7 +76,6 @@ public class WindowMagnificationFrameSizePrefsTest extends SysuiTestCase { .isEqualTo(testIndex); } - @EnableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) @Test public void saveSizeForCurrentDensity_invalidPreference_getDefaultIndex() { mSharedPreferences diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryTest.kt new file mode 100644 index 000000000000..d6ba98d65d15 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryTest.kt @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.activity.data.repository + +import android.app.ActivityManager +import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND +import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE +import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_TOP_SLEEPING +import android.app.activityManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.log.core.Logger +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class ActivityManagerRepositoryTest : SysuiTestCase() { + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + private val logger = Logger(logcatLogBuffer("ActivityManagerRepositoryTest"), "tag") + + private val Kosmos.underTest by Kosmos.Fixture { realActivityManagerRepository } + + @Test + fun createIsAppVisibleFlow_fetchesInitialValue_true() = + kosmos.runTest { + whenever(activityManager.getUidImportance(THIS_UID)).thenReturn(IMPORTANCE_FOREGROUND) + + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + assertThat(latest).isTrue() + } + + @Test + fun createIsAppVisibleFlow_fetchesInitialValue_false() = + kosmos.runTest { + whenever(activityManager.getUidImportance(THIS_UID)).thenReturn(IMPORTANCE_GONE) + + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + assertThat(latest).isFalse() + } + + @Test + fun createIsAppVisibleFlow_getsImportanceUpdates() = + kosmos.runTest { + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + val listenerCaptor = argumentCaptor<ActivityManager.OnUidImportanceListener>() + verify(activityManager).addOnUidImportanceListener(listenerCaptor.capture(), any()) + val listener = listenerCaptor.firstValue + + listener.onUidImportance(THIS_UID, IMPORTANCE_GONE) + assertThat(latest).isFalse() + + listener.onUidImportance(THIS_UID, IMPORTANCE_FOREGROUND) + assertThat(latest).isTrue() + + listener.onUidImportance(THIS_UID, IMPORTANCE_TOP_SLEEPING) + assertThat(latest).isFalse() + } + + @Test + fun createIsAppVisibleFlow_ignoresUpdatesForOtherUids() = + kosmos.runTest { + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + val listenerCaptor = argumentCaptor<ActivityManager.OnUidImportanceListener>() + verify(activityManager).addOnUidImportanceListener(listenerCaptor.capture(), any()) + val listener = listenerCaptor.firstValue + + listener.onUidImportance(THIS_UID, IMPORTANCE_GONE) + assertThat(latest).isFalse() + + // WHEN another UID becomes foreground + listener.onUidImportance(THIS_UID + 2, IMPORTANCE_FOREGROUND) + + // THEN this UID still stays not visible + assertThat(latest).isFalse() + } + + @Test + fun createIsAppVisibleFlow_securityExceptionOnUidRegistration_ok() = + kosmos.runTest { + whenever(activityManager.getUidImportance(THIS_UID)).thenReturn(IMPORTANCE_GONE) + whenever(activityManager.addOnUidImportanceListener(any(), any())) + .thenThrow(SecurityException()) + + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + // Verify no crash, and we get a value emitted + assertThat(latest).isFalse() + } + + /** Regression test for b/216248574. */ + @Test + fun createIsAppVisibleFlow_getUidImportanceThrowsException_ok() = + kosmos.runTest { + whenever(activityManager.getUidImportance(any())).thenThrow(SecurityException()) + + val latest by + collectLastValue(underTest.createIsAppVisibleFlow(THIS_UID, logger, LOG_TAG)) + + // Verify no crash, and we get a value emitted + assertThat(latest).isFalse() + } + + companion object { + private const val THIS_UID = 558 + private const val LOG_TAG = "LogTag" + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt index 91f9cce5b69b..91f9cce5b69b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeScreenStateTest.java index ba578a39b558..bbd78b317560 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeScreenStateTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; @@ -315,6 +315,6 @@ public class DozeScreenStateTest extends SysuiTestCase { public void authCallbackRemovedOnDestroy() { mScreen.destroy(); - verify(mAuthController).removeCallback(anyObject()); + verify(mAuthController).removeCallback(any()); } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt index dd8370231ef0..e288522ec212 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt @@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.contextualeducation.GestureType import com.android.systemui.contextualeducation.GestureType.BACK +import com.android.systemui.contextualeducation.GestureType.HOME import com.android.systemui.education.data.repository.fakeEduClock import com.android.systemui.education.domain.interactor.KeyboardTouchpadEduInteractor import com.android.systemui.education.domain.interactor.contextualEducationInteractor @@ -52,6 +53,7 @@ import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock import org.mockito.junit.MockitoJUnit import org.mockito.kotlin.any +import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -66,6 +68,7 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { private val minDurationForNextEdu = KeyboardTouchpadEduInteractor.minIntervalBetweenEdu + 1.seconds private lateinit var underTest: ContextualEduUiCoordinator + private lateinit var previousDialog: Dialog @Mock private lateinit var dialog: Dialog @Mock private lateinit var notificationManager: NotificationManager @Mock private lateinit var accessibilityManagerWrapper: AccessibilityManagerWrapper @@ -95,9 +98,11 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { kosmos.applicationCoroutineScope, viewModel, kosmos.applicationContext, - notificationManager + notificationManager, ) { model -> toastContent = model.message + previousDialog = dialog + dialog = mock<Dialog>() dialog } underTest.start() @@ -129,6 +134,14 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { } @Test + fun dismissPreviousDialogOnNewDialog() = + testScope.runTest { + triggerEducation(BACK) + triggerEducation(HOME) + verify(previousDialog).dismiss() + } + + @Test fun verifyBackEduToastContent() = testScope.runTest { triggerEducation(BACK) @@ -149,14 +162,14 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { verifyNotificationContent( R.string.back_edu_notification_title, R.string.back_edu_notification_content, - notificationCaptor.value + notificationCaptor.value, ) } private fun verifyNotificationContent( titleResId: Int, contentResId: Int, - notification: Notification + notification: Notification, ) { val expectedContent = context.getString(contentResId) val expectedTitle = context.getString(titleResId) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt index d0ce34c2d68d..d0ce34c2d68d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorTest.kt index bd26e4205242..bef995fa5225 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorTest.kt @@ -18,6 +18,7 @@ package com.android.systemui.keyguard.domain.interactor import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.internal.widget.lockPatternUtils import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectValues import com.android.systemui.keyguard.data.repository.biometricSettingsRepository @@ -33,6 +34,8 @@ import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.kotlin.whenever @SmallTest @RunWith(AndroidJUnit4::class) @@ -52,14 +55,21 @@ class KeyguardLockWhileAwakeInteractorTest : SysuiTestCase() { testScope.runTest { val values by collectValues(underTest.lockWhileAwakeEvents) - underTest.onKeyguardServiceDoKeyguardTimeout(options = null) + kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(true) + runCurrent() + + kosmos.keyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout( + options = null + ) runCurrent() assertThat(values) .containsExactly(LockWhileAwakeReason.KEYGUARD_TIMEOUT_WHILE_SCREEN_ON) advanceTimeBy(1000) - underTest.onKeyguardServiceDoKeyguardTimeout(options = null) + kosmos.keyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout( + options = null + ) runCurrent() assertThat(values) @@ -69,8 +79,15 @@ class KeyguardLockWhileAwakeInteractorTest : SysuiTestCase() { ) } + /** + * We re-show keyguard when it's re-enabled, but only if it was originally showing when we + * disabled it. + * + * If it wasn't showing when originally disabled it, re-enabling it should do nothing (the + * keyguard will re-show next time we're locked). + */ @Test - fun emitsWhenKeyguardEnabled_onlyIfShowingWhenDisabled() = + fun emitsWhenKeyguardReenabled_onlyIfShowingWhenDisabled() = testScope.runTest { val values by collectValues(underTest.lockWhileAwakeEvents) @@ -98,4 +115,49 @@ class KeyguardLockWhileAwakeInteractorTest : SysuiTestCase() { assertThat(values).containsExactly(LockWhileAwakeReason.KEYGUARD_REENABLED) } + + /** + * Un-suppressing keyguard should never cause us to re-show. We'll re-show when we're next + * locked, even if we were showing when originally suppressed. + */ + @Test + fun doesNotEmit_keyguardNoLongerSuppressed() = + testScope.runTest { + val values by collectValues(underTest.lockWhileAwakeEvents) + + // Enable keyguard and then suppress it. + kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(true) + whenever(kosmos.lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true) + runCurrent() + + assertEquals(0, values.size) + + // Un-suppress keyguard. + whenever(kosmos.lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false) + runCurrent() + + assertEquals(0, values.size) + } + + /** + * Lockdown and lockNow() should not cause us to lock while awake if we are suppressed via adb. + */ + @Test + fun doesNotEmit_fromLockdown_orFromLockNow_ifEnabledButSuppressed() = + testScope.runTest { + val values by collectValues(underTest.lockWhileAwakeEvents) + + // Set keyguard enabled, but then disable lockscreen (suppress it). + kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(true) + whenever(kosmos.lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true) + runCurrent() + + kosmos.keyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout(null) + runCurrent() + + kosmos.biometricSettingsRepository.setIsUserInLockdown(true) + runCurrent() + + assertEquals(0, values.size) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt index 7e249e8c179d..ead151ee6df2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt @@ -87,9 +87,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) repository.setKeyguardEnabled(false) @@ -100,33 +100,26 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { false, // Default to false. true, // True now that keyguard service is disabled ), - canWake + canWake, ) repository.setKeyguardEnabled(true) runCurrent() - assertEquals( - listOf( - false, - true, - false, - ), - canWake - ) + assertEquals(listOf(false, true, false), canWake) } @Test @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR) - fun testCanWakeDirectlyToGone_lockscreenDisabledThenEnabled() = + fun testCanWakeDirectlyToGone_lockscreenDisabledThenEnabled_onlyAfterWakefulnessChange() = testScope.runTest { val canWake by collectValues(underTest.canWakeDirectlyToGone) assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true) @@ -136,9 +129,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { listOf( // Still false - isLockScreenDisabled only causes canWakeDirectlyToGone to // update on the next wake/sleep event. - false, + false ), - canWake + canWake, ) kosmos.powerInteractor.setAsleepForTest() @@ -150,7 +143,7 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { // True since we slept after setting isLockScreenDisabled=true true, ), - canWake + canWake, ) kosmos.powerInteractor.setAwakeForTest() @@ -159,25 +152,75 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { kosmos.powerInteractor.setAsleepForTest() runCurrent() + assertEquals(listOf(false, true), canWake) + + whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false) + kosmos.powerInteractor.setAwakeForTest() + runCurrent() + + assertEquals(listOf(false, true, false), canWake) + } + + @Test + @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR) + fun testCanWakeDirectlyToGone_lockscreenDisabledThenEnabled_lockNowEvent() = + testScope.runTest { + val canWake by collectValues(underTest.canWakeDirectlyToGone) + + assertEquals( + listOf( + false // Defaults to false. + ), + canWake, + ) + + whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true) + runCurrent() + + assertEquals( + listOf( + // Still false - isLockScreenDisabled only causes canWakeDirectlyToGone to + // update on the next wakefulness or lockNow event. + false + ), + canWake, + ) + + kosmos.keyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout(null) + runCurrent() + assertEquals( listOf( false, + // True when lockNow() called after setting isLockScreenDisabled=true true, ), - canWake + canWake, ) whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false) - kosmos.powerInteractor.setAwakeForTest() + runCurrent() + + assertEquals( + listOf( + false, + // Still true since no lockNow() calls made. + true, + ), + canWake, + ) + + kosmos.keyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout(null) runCurrent() assertEquals( listOf( false, true, + // False again after the lockNow() call. false, ), - canWake + canWake, ) } @@ -189,9 +232,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) repository.setBiometricUnlockState(BiometricUnlockMode.WAKE_AND_UNLOCK) @@ -213,9 +256,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) repository.setCanIgnoreAuthAndReturnToGone(true) @@ -237,9 +280,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) whenever(kosmos.devicePolicyManager.getMaximumTimeToLock(eq(null), anyInt())) @@ -257,13 +300,7 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { ) runCurrent() - assertEquals( - listOf( - false, - true, - ), - canWake - ) + assertEquals(listOf(false, true), canWake) verify(kosmos.alarmManager) .setExactAndAllowWhileIdle( @@ -281,9 +318,9 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { assertEquals( listOf( - false, // Defaults to false. + false // Defaults to false. ), - canWake + canWake, ) whenever(kosmos.devicePolicyManager.getMaximumTimeToLock(eq(null), anyInt())) @@ -312,7 +349,7 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { // Timed out, so we can ignore auth/return to GONE. true, ), - canWake + canWake, ) verify(kosmos.alarmManager) @@ -338,7 +375,7 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { // alarm in flight that should be canceled. false, ), - canWake + canWake, ) kosmos.powerInteractor.setAsleepForTest( @@ -354,25 +391,17 @@ class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() { // Back to sleep. true, ), - canWake + canWake, ) // Simulate the first sleep's alarm coming in. lastRegisteredBroadcastReceiver?.onReceive( kosmos.mockedContext, - Intent("com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD") + Intent("com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD"), ) runCurrent() // It should not have any effect. - assertEquals( - listOf( - false, - true, - false, - true, - ), - canWake - ) + assertEquals(listOf(false, true, false, true), canWake) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 63ec78fd9ee5..63ec78fd9ee5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index d720e1a6595d..0d8d57e52dbf 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -178,7 +178,7 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; -import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; +import com.android.systemui.statusbar.phone.ShadeTouchableRegionManager; import com.android.systemui.statusbar.phone.TapAgainViewController; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; import com.android.systemui.statusbar.policy.CastController; @@ -245,7 +245,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { @Mock protected NotificationPanelView mView; @Mock protected LayoutInflater mLayoutInflater; @Mock protected DynamicPrivacyController mDynamicPrivacyController; - @Mock protected StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + @Mock protected ShadeTouchableRegionManager mShadeTouchableRegionManager; @Mock protected KeyguardStateController mKeyguardStateController; @Mock protected DozeLog mDozeLog; private final ShadeLogger mShadeLog = new ShadeLogger(logcatLogBuffer()); @@ -703,7 +703,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mMetricsLogger, mShadeLog, mConfigurationController, - () -> flingAnimationUtilsBuilder, mStatusBarTouchableRegionManager, + () -> flingAnimationUtilsBuilder, mShadeTouchableRegionManager, mConversationNotificationManager, mMediaHierarchyManager, mStatusBarKeyguardViewManager, mGutsManager, @@ -819,7 +819,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { mLockscreenShadeTransitionController, mNotificationShadeDepthController, mShadeHeaderController, - mStatusBarTouchableRegionManager, + mShadeTouchableRegionManager, () -> mStatusBarLongPressGestureDetector, mKeyguardStateController, mKeyguardBypassController, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java index 61d4c9968d49..b58c13c34505 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java @@ -71,8 +71,8 @@ import com.android.systemui.statusbar.phone.KeyguardStatusBarView; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.ScrimController; +import com.android.systemui.statusbar.phone.ShadeTouchableRegionManager; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; -import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController; @@ -125,7 +125,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { @Mock protected LockscreenShadeTransitionController mLockscreenShadeTransitionController; @Mock protected NotificationShadeDepthController mNotificationShadeDepthController; @Mock protected ShadeHeaderController mShadeHeaderController; - @Mock protected StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + @Mock protected ShadeTouchableRegionManager mShadeTouchableRegionManager; @Mock protected StatusBarLongPressGestureDetector mStatusBarLongPressGestureDetector; @Mock protected DozeParameters mDozeParameters; @Mock protected KeyguardStateController mKeyguardStateController; @@ -250,7 +250,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { mLockscreenShadeTransitionController, mNotificationShadeDepthController, mShadeHeaderController, - mStatusBarTouchableRegionManager, + mShadeTouchableRegionManager, () -> mStatusBarLongPressGestureDetector, mKeyguardStateController, mKeyguardBypassController, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryTest.kt new file mode 100644 index 000000000000..096675962d80 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryTest.kt @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.data.repository + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectValues +import com.android.systemui.kosmos.testScope +import com.android.systemui.shade.display.ShadeDisplayPolicy +import com.android.systemui.shade.display.SpecificDisplayIdPolicy +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class ShadeDisplaysRepositoryTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val defaultPolicy = SpecificDisplayIdPolicy(0) + + private val shadeDisplaysRepository = + ShadeDisplaysRepositoryImpl(defaultPolicy, testScope.backgroundScope) + + @Test + fun policy_changing_propagatedFromTheLatestPolicy() = + testScope.runTest { + val displayIds by collectValues(shadeDisplaysRepository.displayId) + val policy1 = MutablePolicy() + val policy2 = MutablePolicy() + + assertThat(displayIds).containsExactly(0) + + shadeDisplaysRepository.policy.value = policy1 + + policy1.sendDisplayId(1) + + assertThat(displayIds).containsExactly(0, 1) + + policy1.sendDisplayId(2) + + assertThat(displayIds).containsExactly(0, 1, 2) + + shadeDisplaysRepository.policy.value = policy2 + + assertThat(displayIds).containsExactly(0, 1, 2, 0) + + policy1.sendDisplayId(4) + + // Changes to the first policy don't affect the output now + assertThat(displayIds).containsExactly(0, 1, 2, 0) + + policy2.sendDisplayId(5) + + assertThat(displayIds).containsExactly(0, 1, 2, 0, 5) + } + + private class MutablePolicy : ShadeDisplayPolicy { + fun sendDisplayId(id: Int) { + _displayId.value = id + } + + private val _displayId = MutableStateFlow(0) + override val name: String + get() = "mutable_policy" + + override val displayId: StateFlow<Int> + get() = _displayId + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadePrimaryDisplayCommandTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadePrimaryDisplayCommandTest.kt index af01547be7e3..d584dc9ceef2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadePrimaryDisplayCommandTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadePrimaryDisplayCommandTest.kt @@ -23,12 +23,17 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.display.data.repository.displayRepository import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher import com.android.systemui.shade.ShadePrimaryDisplayCommand +import com.android.systemui.shade.display.ShadeDisplayPolicy import com.android.systemui.statusbar.commandline.commandRegistry import com.android.systemui.testKosmos +import com.google.common.truth.StringSubject import com.google.common.truth.Truth.assertThat import java.io.PrintWriter import java.io.StringWriter +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test @@ -37,15 +42,26 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) class ShadePrimaryDisplayCommandTest : SysuiTestCase() { - private val kosmos = testKosmos() + private val kosmos = testKosmos().useUnconfinedTestDispatcher() private val testScope = kosmos.testScope private val commandRegistry = kosmos.commandRegistry private val displayRepository = kosmos.displayRepository - private val shadeDisplaysRepository = ShadeDisplaysRepositoryImpl() + private val defaultPolicy = kosmos.defaultShadeDisplayPolicy + private val policy1 = makePolicy("policy_1") + private val shadeDisplaysRepository = kosmos.shadeDisplaysRepository private val pw = PrintWriter(StringWriter()) + private val policies = + setOf(defaultPolicy, policy1, makePolicy("policy_2"), makePolicy("policy_3")) + private val underTest = - ShadePrimaryDisplayCommand(commandRegistry, displayRepository, shadeDisplaysRepository) + ShadePrimaryDisplayCommand( + commandRegistry, + displayRepository, + shadeDisplaysRepository, + policies, + defaultPolicy, + ) @Before fun setUp() { @@ -96,4 +112,41 @@ class ShadePrimaryDisplayCommandTest : SysuiTestCase() { assertThat(displayId).isEqualTo(newDisplayId) } + + @Test + fun policies_listsAllPolicies() = + testScope.runTest { + val stringWriter = StringWriter() + commandRegistry.onShellCommand( + PrintWriter(stringWriter), + arrayOf("shade_display_override", "policies"), + ) + val result = stringWriter.toString() + + assertThat(result).containsAllIn(policies.map { it.name }) + } + + @Test + fun policies_setsSpecificPolicy() = + testScope.runTest { + val policy by collectLastValue(shadeDisplaysRepository.policy) + + commandRegistry.onShellCommand(pw, arrayOf("shade_display_override", policy1.name)) + + assertThat(policy!!.name).isEqualTo(policy1.name) + } + + private fun makePolicy(policyName: String): ShadeDisplayPolicy { + return object : ShadeDisplayPolicy { + override val name: String + get() = policyName + + override val displayId: StateFlow<Int> + get() = MutableStateFlow(0) + } + } +} + +private fun StringSubject.containsAllIn(strings: List<String>) { + strings.forEach { contains(it) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicyTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicyTest.kt new file mode 100644 index 000000000000..4d4efd11f3a8 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicyTest.kt @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.display + +import android.view.Display +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.display.data.repository.display +import com.android.systemui.display.data.repository.displayRepository +import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlin.test.Test +import kotlinx.coroutines.test.runTest +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class AnyExternalShadeDisplayPolicyTest : SysuiTestCase() { + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + private val testScope = kosmos.testScope + private val displayRepository = kosmos.displayRepository + val underTest = AnyExternalShadeDisplayPolicy(displayRepository, testScope.backgroundScope) + + @Test + fun displayId_ignoresUnwantedTypes() = + testScope.runTest { + val displayId by collectLastValue(underTest.displayId) + + displayRepository.addDisplays( + display(id = 0, type = Display.TYPE_INTERNAL), + display(id = 1, type = Display.TYPE_UNKNOWN), + display(id = 2, type = Display.TYPE_VIRTUAL), + display(id = 3, type = Display.TYPE_EXTERNAL), + ) + + assertThat(displayId).isEqualTo(3) + } + + @Test + fun displayId_onceRemoved_goesToNextDisplay() = + testScope.runTest { + val displayId by collectLastValue(underTest.displayId) + + displayRepository.addDisplays( + display(id = 0, type = Display.TYPE_INTERNAL), + display(id = 2, type = Display.TYPE_EXTERNAL), + display(id = 3, type = Display.TYPE_EXTERNAL), + ) + + assertThat(displayId).isEqualTo(2) + + displayRepository.removeDisplay(2) + + assertThat(displayId).isEqualTo(3) + } + + @Test + fun displayId_onlyDefaultDisplay_defaultDisplay() = + testScope.runTest { + val displayId by collectLastValue(underTest.displayId) + + displayRepository.addDisplays(display(id = 0, type = Display.TYPE_INTERNAL)) + + assertThat(displayId).isEqualTo(0) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt index 016a24acd461..982c51b8318c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt @@ -17,7 +17,6 @@ package com.android.systemui.shade.domain.interactor import android.content.Context -import android.content.MutableContextWrapper import android.content.res.Configuration import android.content.res.Resources import android.view.Display @@ -30,7 +29,6 @@ import com.android.systemui.display.data.repository.FakeDisplayWindowPropertiesR import com.android.systemui.display.shared.model.DisplayWindowProperties import com.android.systemui.scene.ui.view.WindowRootView import com.android.systemui.shade.data.repository.FakeShadeDisplayRepository -import com.android.systemui.statusbar.phone.ConfigurationForwarder import java.util.Optional import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestScope @@ -39,6 +37,7 @@ import kotlinx.coroutines.test.advanceUntilIdle import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.Mockito.inOrder import org.mockito.Mockito.verify import org.mockito.kotlin.any import org.mockito.kotlin.eq @@ -53,13 +52,10 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { private val shadeRootview = mock<WindowRootView>() private val positionRepository = FakeShadeDisplayRepository() - private val defaultContext = mock<Context>() - private val secondaryContext = mock<Context>() + private val shadeContext = mock<Context>() private val contextStore = FakeDisplayWindowPropertiesRepository() private val testScope = TestScope(UnconfinedTestDispatcher()) - private val configurationForwarder = mock<ConfigurationForwarder>() - private val defaultWm = mock<WindowManager>() - private val secondaryWm = mock<WindowManager>() + private val shadeWm = mock<WindowManager>() private val resources = mock<Resources>() private val configuration = mock<Configuration>() private val display = mock<Display>() @@ -68,11 +64,9 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { ShadeDisplaysInteractor( Optional.of(shadeRootview), positionRepository, - MutableContextWrapper(defaultContext), - resources, - contextStore, + shadeContext, + shadeWm, testScope.backgroundScope, - configurationForwarder, testScope.backgroundScope.coroutineContext, ) @@ -83,28 +77,15 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { whenever(resources.configuration).thenReturn(configuration) - whenever(defaultContext.displayId).thenReturn(0) - whenever(defaultContext.getSystemService(any())).thenReturn(defaultWm) - whenever(defaultContext.resources).thenReturn(resources) + whenever(shadeContext.displayId).thenReturn(0) + whenever(shadeContext.getSystemService(any())).thenReturn(shadeWm) + whenever(shadeContext.resources).thenReturn(resources) contextStore.insert( DisplayWindowProperties( displayId = 0, windowType = TYPE_NOTIFICATION_SHADE, - context = defaultContext, - windowManager = defaultWm, - layoutInflater = mock(), - ) - ) - - whenever(secondaryContext.displayId).thenReturn(1) - whenever(secondaryContext.getSystemService(any())).thenReturn(secondaryWm) - whenever(secondaryContext.resources).thenReturn(resources) - contextStore.insert( - DisplayWindowProperties( - displayId = 1, - windowType = TYPE_NOTIFICATION_SHADE, - context = secondaryContext, - windowManager = secondaryWm, + context = shadeContext, + windowManager = shadeWm, layoutInflater = mock(), ) ) @@ -117,8 +98,7 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { interactor.start() testScope.advanceUntilIdle() - verifyNoMoreInteractions(defaultWm) - verifyNoMoreInteractions(secondaryWm) + verifyNoMoreInteractions(shadeWm) } @Test @@ -127,8 +107,10 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { positionRepository.setDisplayId(1) interactor.start() - verify(defaultWm).removeView(eq(shadeRootview)) - verify(secondaryWm).addView(eq(shadeRootview), any()) + inOrder(shadeWm).apply { + verify(shadeWm).removeView(eq(shadeRootview)) + verify(shadeWm).addView(eq(shadeRootview), any()) + } } @Test @@ -139,18 +121,9 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { positionRepository.setDisplayId(1) - verify(defaultWm).removeView(eq(shadeRootview)) - verify(secondaryWm).addView(eq(shadeRootview), any()) - } - - @Test - fun start_shadePositionChanges_newConfigPropagated() { - whenever(display.displayId).thenReturn(0) - positionRepository.setDisplayId(0) - interactor.start() - - positionRepository.setDisplayId(1) - - verify(configurationForwarder).onConfigurationChanged(eq(configuration)) + inOrder(shadeWm).apply { + verify(shadeWm).removeView(eq(shadeRootview)) + verify(shadeWm).addView(eq(shadeRootview), any()) + } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/plugins/PluginActionManagerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/plugins/PluginActionManagerTest.java index 3ad0605f2781..3ad0605f2781 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/plugins/PluginActionManagerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shared/plugins/PluginActionManagerTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index da0029ff6746..32a9f544ae17 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -48,7 +48,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.clearInvocations; @@ -1633,7 +1632,7 @@ public class KeyguardIndicationControllerTest extends KeyguardIndicationControll } else { verify(mRotateTextViewController).hideIndication(type); verify(mRotateTextViewController, never()).updateIndication(eq(type), - anyObject(), anyBoolean()); + any(), anyBoolean()); } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt new file mode 100644 index 000000000000..7fed47a4653e --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.chips.notification.domain.interactor + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.activity.data.repository.activityManagerRepository +import com.android.systemui.activity.data.repository.fake +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.statusbar.StatusBarIconView +import com.android.systemui.statusbar.notification.data.model.activeNotificationModel +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock + +@SmallTest +@RunWith(AndroidJUnit4::class) +class SingleNotificationChipInteractorTest : SysuiTestCase() { + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + val factory = kosmos.singleNotificationChipInteractorFactory + + @Test + fun notificationChip_startsWithStartingModel() = + kosmos.runTest { + val icon = mock<StatusBarIconView>() + val startingNotif = activeNotificationModel(key = "notif1", statusBarChipIcon = icon) + + val underTest = factory.create(startingNotif) + + val latest by collectLastValue(underTest.notificationChip) + + assertThat(latest!!.key).isEqualTo("notif1") + assertThat(latest!!.statusBarChipIconView).isEqualTo(icon) + } + + @Test + fun notificationChip_updatesAfterSet() = + kosmos.runTest { + val originalIconView = mock<StatusBarIconView>() + val underTest = + factory.create( + activeNotificationModel(key = "notif1", statusBarChipIcon = originalIconView) + ) + + val latest by collectLastValue(underTest.notificationChip) + + val newIconView = mock<StatusBarIconView>() + underTest.setNotification( + activeNotificationModel(key = "notif1", statusBarChipIcon = newIconView) + ) + + assertThat(latest!!.key).isEqualTo("notif1") + assertThat(latest!!.statusBarChipIconView).isEqualTo(newIconView) + } + + @Test + fun notificationChip_ignoresSetWithDifferentKey() = + kosmos.runTest { + val originalIconView = mock<StatusBarIconView>() + val underTest = + factory.create( + activeNotificationModel(key = "notif1", statusBarChipIcon = originalIconView) + ) + + val latest by collectLastValue(underTest.notificationChip) + + val newIconView = mock<StatusBarIconView>() + underTest.setNotification( + activeNotificationModel(key = "other_notif", statusBarChipIcon = newIconView) + ) + + assertThat(latest!!.key).isEqualTo("notif1") + assertThat(latest!!.statusBarChipIconView).isEqualTo(originalIconView) + } + + @Test + fun notificationChip_missingStatusBarIconChipView_inConstructor_emitsNull() = + kosmos.runTest { + val underTest = + factory.create(activeNotificationModel(key = "notif1", statusBarChipIcon = null)) + + val latest by collectLastValue(underTest.notificationChip) + + assertThat(latest).isNull() + } + + @Test + fun notificationChip_missingStatusBarIconChipView_inSet_emitsNull() = + kosmos.runTest { + val startingNotif = activeNotificationModel(key = "notif1", statusBarChipIcon = mock()) + val underTest = factory.create(startingNotif) + val latest by collectLastValue(underTest.notificationChip) + assertThat(latest).isNotNull() + + underTest.setNotification( + activeNotificationModel(key = "notif1", statusBarChipIcon = null) + ) + + assertThat(latest).isNull() + } + + @Test + fun notificationChip_appIsVisibleOnCreation_emitsNull() = + kosmos.runTest { + activityManagerRepository.fake.startingIsAppVisibleValue = true + + val underTest = + factory.create( + activeNotificationModel(key = "notif", uid = UID, statusBarChipIcon = mock()) + ) + + val latest by collectLastValue(underTest.notificationChip) + + assertThat(latest).isNull() + } + + @Test + fun notificationChip_appNotVisibleOnCreation_emitsValue() = + kosmos.runTest { + activityManagerRepository.fake.startingIsAppVisibleValue = false + + val underTest = + factory.create( + activeNotificationModel(key = "notif", uid = UID, statusBarChipIcon = mock()) + ) + + val latest by collectLastValue(underTest.notificationChip) + + assertThat(latest).isNotNull() + } + + @Test + fun notificationChip_hidesWhenAppIsVisible() = + kosmos.runTest { + val underTest = + factory.create( + activeNotificationModel(key = "notif", uid = UID, statusBarChipIcon = mock()) + ) + + val latest by collectLastValue(underTest.notificationChip) + + activityManagerRepository.fake.setIsAppVisible(UID, false) + assertThat(latest).isNotNull() + + activityManagerRepository.fake.setIsAppVisible(UID, true) + assertThat(latest).isNull() + + activityManagerRepository.fake.setIsAppVisible(UID, false) + assertThat(latest).isNotNull() + } + + // Note: This test is theoretically impossible because the notification key should contain the + // UID, so if the UID changes then the key would also change and a new interactor would be + // created. But, test it just in case. + @Test + fun notificationChip_updatedUid_rechecksAppVisibility_oldObserverUnregistered() = + kosmos.runTest { + activityManagerRepository.fake.startingIsAppVisibleValue = false + + val hiddenUid = 100 + val shownUid = 101 + + val underTest = + factory.create( + activeNotificationModel( + key = "notif", + uid = hiddenUid, + statusBarChipIcon = mock(), + ) + ) + val latest by collectLastValue(underTest.notificationChip) + assertThat(latest).isNotNull() + + // WHEN the notif gets a new UID that starts as visible + activityManagerRepository.fake.startingIsAppVisibleValue = true + underTest.setNotification( + activeNotificationModel(key = "notif", uid = shownUid, statusBarChipIcon = mock()) + ) + + // THEN we re-fetch the app visibility state with the new UID, and since that UID is + // visible, we hide the chip + assertThat(latest).isNull() + } + + companion object { + private const val UID = 885 + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt index 19ed6a57d2f0..702e101d2d39 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt @@ -16,30 +16,277 @@ package com.android.systemui.statusbar.chips.notification.domain.interactor +import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.kosmos.testScope import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.statusbar.StatusBarIconView import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips +import com.android.systemui.statusbar.notification.data.model.activeNotificationModel +import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore +import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlin.test.Test import kotlinx.coroutines.test.runTest import org.junit.runner.RunWith +import org.mockito.kotlin.mock @SmallTest @RunWith(AndroidJUnit4::class) -@EnableFlags(StatusBarNotifChips.FLAG_NAME) class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { private val kosmos = testKosmos().useUnconfinedTestDispatcher() private val testScope = kosmos.testScope + private val activeNotificationListRepository = kosmos.activeNotificationListRepository - private val underTest = kosmos.statusBarNotificationChipsInteractor + private val underTest by lazy { + kosmos.statusBarNotificationChipsInteractor.also { it.start() } + } @Test + @DisableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_flagOff_noNotifs() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = mock<StatusBarIconView>(), + isPromoted = true, + ) + ) + ) + + assertThat(latest).isEmpty() + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_noNotifs_empty() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + setNotifs(emptyList()) + + assertThat(latest).isEmpty() + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_notifMissingStatusBarChipIconView_empty() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = null, + isPromoted = true, + ) + ) + ) + + assertThat(latest).isEmpty() + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_onePromotedNotif_statusBarIconViewMatches() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + val icon = mock<StatusBarIconView>() + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = icon, + isPromoted = true, + ) + ) + ) + + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(icon) + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_onlyForPromotedNotifs() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + val firstIcon = mock<StatusBarIconView>() + val secondIcon = mock<StatusBarIconView>() + setNotifs( + listOf( + activeNotificationModel( + key = "notif1", + statusBarChipIcon = firstIcon, + isPromoted = true, + ), + activeNotificationModel( + key = "notif2", + statusBarChipIcon = secondIcon, + isPromoted = true, + ), + activeNotificationModel( + key = "notif3", + statusBarChipIcon = mock<StatusBarIconView>(), + isPromoted = false, + ), + ) + ) + + assertThat(latest).hasSize(2) + assertThat(latest!![0].key).isEqualTo("notif1") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(firstIcon) + assertThat(latest!![1].key).isEqualTo("notif2") + assertThat(latest!![1].statusBarChipIconView).isEqualTo(secondIcon) + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_notifUpdatesGoThrough() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + val firstIcon = mock<StatusBarIconView>() + val secondIcon = mock<StatusBarIconView>() + val thirdIcon = mock<StatusBarIconView>() + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = firstIcon, + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(firstIcon) + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = secondIcon, + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(secondIcon) + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = thirdIcon, + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(thirdIcon) + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_promotedNotifDisappearsThenReappears() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = mock(), + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = mock(), + isPromoted = false, + ) + ) + ) + assertThat(latest).isEmpty() + + setNotifs( + listOf( + activeNotificationModel( + key = "notif", + statusBarChipIcon = mock(), + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif") + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) + fun notificationChips_notifChangesKey() = + testScope.runTest { + val latest by collectLastValue(underTest.notificationChips) + + val firstIcon = mock<StatusBarIconView>() + val secondIcon = mock<StatusBarIconView>() + setNotifs( + listOf( + activeNotificationModel( + key = "notif|uid1", + statusBarChipIcon = firstIcon, + isPromoted = true, + ) + ) + ) + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif|uid1") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(firstIcon) + + // WHEN a notification changes UID, which is a key change + setNotifs( + listOf( + activeNotificationModel( + key = "notif|uid2", + statusBarChipIcon = secondIcon, + isPromoted = true, + ) + ) + ) + + // THEN we correctly update + assertThat(latest).hasSize(1) + assertThat(latest!![0].key).isEqualTo("notif|uid2") + assertThat(latest!![0].statusBarChipIconView).isEqualTo(secondIcon) + } + + @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) fun onPromotedNotificationChipTapped_emitsKeys() = testScope.runTest { val latest by collectValues(underTest.promotedNotificationChipTapEvent) @@ -56,6 +303,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { } @Test + @EnableFlags(StatusBarNotifChips.FLAG_NAME) fun onPromotedNotificationChipTapped_sameKeyTwice_emitsTwice() = testScope.runTest { val latest by collectValues(underTest.promotedNotificationChipTapEvent) @@ -67,4 +315,11 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { assertThat(latest[0]).isEqualTo("fakeKey") assertThat(latest[1]).isEqualTo("fakeKey") } + + private fun setNotifs(notifs: List<ActiveNotificationModel>) { + activeNotificationListRepository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { notifs.forEach { addIndividualNotif(it) } } + .build() + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt index 1b4132910555..16376c5b3850 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt @@ -22,7 +22,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.useUnconfinedTestDispatcher import com.android.systemui.statusbar.StatusBarIconView import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips @@ -34,26 +36,28 @@ import com.android.systemui.statusbar.notification.shared.ActiveNotificationMode import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlin.test.Test -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest +import org.junit.Before import org.junit.runner.RunWith import org.mockito.kotlin.mock @SmallTest @RunWith(AndroidJUnit4::class) -@OptIn(ExperimentalCoroutinesApi::class) @EnableFlags(StatusBarNotifChips.FLAG_NAME) class NotifChipsViewModelTest : SysuiTestCase() { - private val kosmos = testKosmos() - private val testScope = kosmos.testScope + private val kosmos = testKosmos().useUnconfinedTestDispatcher() private val activeNotificationListRepository = kosmos.activeNotificationListRepository - private val underTest = kosmos.notifChipsViewModel + private val underTest by lazy { kosmos.notifChipsViewModel } + + @Before + fun setUp() { + kosmos.statusBarNotificationChipsInteractor.start() + } @Test fun chips_noNotifs_empty() = - testScope.runTest { + kosmos.runTest { val latest by collectLastValue(underTest.chips) setNotifs(emptyList()) @@ -63,7 +67,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { @Test fun chips_notifMissingStatusBarChipIconView_empty() = - testScope.runTest { + kosmos.runTest { val latest by collectLastValue(underTest.chips) setNotifs( @@ -81,7 +85,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { @Test fun chips_onePromotedNotif_statusBarIconViewMatches() = - testScope.runTest { + kosmos.runTest { val latest by collectLastValue(underTest.chips) val icon = mock<StatusBarIconView>() @@ -103,7 +107,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { @Test fun chips_onlyForPromotedNotifs() = - testScope.runTest { + kosmos.runTest { val latest by collectLastValue(underTest.chips) val firstIcon = mock<StatusBarIconView>() @@ -135,7 +139,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { @Test fun chips_clickingChipNotifiesInteractor() = - testScope.runTest { + kosmos.runTest { val latest by collectLastValue(underTest.chips) val latestChipTap by collectLastValue( @@ -163,7 +167,6 @@ class NotifChipsViewModelTest : SysuiTestCase() { ActiveNotificationsStore.Builder() .apply { notifs.forEach { addIndividualNotif(it) } } .build() - testScope.runCurrent() } companion object { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt index 25d5ce50e03f..eb0978eff24b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt @@ -27,6 +27,7 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher import com.android.systemui.mediaprojection.data.model.MediaProjectionState import com.android.systemui.mediaprojection.data.repository.fakeMediaProjectionRepository import com.android.systemui.mediaprojection.taskswitcher.FakeActivityTaskManager.Companion.createTask @@ -38,6 +39,7 @@ import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.Me import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.MediaProjectionChipInteractorTest.Companion.setUpPackageManagerForMediaProjection import com.android.systemui.statusbar.chips.notification.demo.ui.viewmodel.DemoNotifChipViewModelTest.Companion.addDemoNotifChip import com.android.systemui.statusbar.chips.notification.demo.ui.viewmodel.demoNotifChipViewModel +import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips import com.android.systemui.statusbar.chips.notification.ui.viewmodel.NotifChipsViewModelTest.Companion.assertIsNotifChip import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChipsModel @@ -67,6 +69,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before +import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.any @@ -79,7 +82,7 @@ import org.mockito.kotlin.whenever @OptIn(ExperimentalCoroutinesApi::class) @EnableFlags(StatusBarNotifChips.FLAG_NAME) class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { - private val kosmos = testKosmos() + private val kosmos = testKosmos().useUnconfinedTestDispatcher() private val testScope = kosmos.testScope private val systemClock = kosmos.fakeSystemClock private val commandRegistry = kosmos.commandRegistry @@ -103,12 +106,13 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { .thenReturn(chipBackgroundView) } - private val underTest = kosmos.ongoingActivityChipsViewModel + private val underTest by lazy { kosmos.ongoingActivityChipsViewModel } @Before fun setUp() { setUpPackageManagerForMediaProjection(kosmos) kosmos.demoNotifChipViewModel.start() + kosmos.statusBarNotificationChipsInteractor.start() val icon = BitmapDrawable( context.resources, @@ -616,6 +620,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { } @Test + @Ignore("b/364653005") // We'll need to re-do the animation story when we implement RON chips fun primaryChip_screenRecordStoppedViaDialog_chipHiddenWithoutAnimation() = testScope.runTest { screenRecordState.value = ScreenRecordModel.Recording diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt index e5d2cf65a389..1d7f25784327 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt @@ -83,7 +83,9 @@ import org.mockito.MockitoAnnotations class HeadsUpCoordinatorTest : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope - private val statusBarNotificationChipsInteractor = kosmos.statusBarNotificationChipsInteractor + private val statusBarNotificationChipsInteractor by lazy { + kosmos.statusBarNotificationChipsInteractor + } private val notifCollection = kosmos.mockNotifCollection private lateinit var coordinator: HeadsUpCoordinator diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManagerTest.kt index a00858842742..d82cb86406ec 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManagerTest.kt @@ -41,12 +41,12 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) @OptIn(ExperimentalCoroutinesApi::class) -class StatusBarTouchableRegionManagerTest : SysuiTestCase() { +class ShadeTouchableRegionManagerTest : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope private val sceneRepository = kosmos.sceneContainerRepository - private val underTest by Lazy { kosmos.statusBarTouchableRegionManager } + private val underTest by Lazy { kosmos.shadeTouchableRegionManager } @Test @EnableSceneContainer diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/data/repository/KeyguardBypassRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/data/repository/KeyguardBypassRepositoryTest.kt index a2fabf3b9baa..a2fabf3b9baa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/data/repository/KeyguardBypassRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/data/repository/KeyguardBypassRepositoryTest.kt diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogEventLoggerTest.kt b/packages/SystemUI/multivalentTests/utils/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogEventLoggerTest.kt index 5146f77bbcf6..5146f77bbcf6 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogEventLoggerTest.kt +++ b/packages/SystemUI/multivalentTests/utils/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogEventLoggerTest.kt diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java index b116e297ccbf..dcbacec5b630 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java @@ -16,6 +16,7 @@ package com.android.keyguard; +import static com.android.systemui.Flags.simPinUseSlotId; import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_ACTIVE_DATA_SUB_CHANGED; import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_ON_TELEPHONY_CAPABLE; import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_REFRESH_CARRIER_INFO; @@ -368,10 +369,12 @@ public class CarrierTextManager { for (int i = 0; i < numSubs; i++) { int subId = subs.get(i).getSubscriptionId(); + int slotId = subs.get(i).getSimSlotIndex(); carrierNames[i] = ""; subsIds[i] = subId; - subOrderBySlot[subs.get(i).getSimSlotIndex()] = i; - int simState = mKeyguardUpdateMonitor.getSimState(subId); + subOrderBySlot[slotId] = i; + int simState = simPinUseSlotId() ? mKeyguardUpdateMonitor.getSimStateForSlotId(slotId) + : mKeyguardUpdateMonitor.getSimState(subId); CharSequence carrierName = subs.get(i).getCarrierName(); CharSequence carrierTextForSimState = getCarrierTextForSimState(simState, carrierName); mLogger.logUpdateLoopStart(subId, simState, String.valueOf(carrierName)); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 8ca0e807b31c..2c8fff83a821 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -44,6 +44,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; import static com.android.systemui.Flags.simPinBouncerReset; +import static com.android.systemui.Flags.simPinUseSlotId; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED; import android.annotation.AnyThread; @@ -172,7 +173,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -318,6 +318,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private final Object mSimDataLockObject = new Object(); HashMap<Integer, SimData> mSimDatas = new HashMap<>(); + HashMap<Integer, SimData> mSimDatasBySlotId = new HashMap<>(); HashMap<Integer, ServiceState> mServiceStates = new HashMap<>(); private int mPhoneState; @@ -616,16 +617,17 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab // It is possible for active subscriptions to become invalid (-1), and these will // not be present in the subscriptionInfo list synchronized (mSimDataLockObject) { - Iterator<Map.Entry<Integer, SimData>> iter = mSimDatas.entrySet().iterator(); + var iter = simPinUseSlotId() ? mSimDatasBySlotId.entrySet().iterator() + : mSimDatas.entrySet().iterator(); + while (iter.hasNext()) { - Map.Entry<Integer, SimData> simData = iter.next(); - if (!activeSubIds.contains(simData.getKey())) { - mSimLogger.logInvalidSubId(simData.getKey()); + SimData data = iter.next().getValue(); + if (!activeSubIds.contains(data.subId)) { + mSimLogger.logInvalidSubId(data.subId, data.slotId); iter.remove(); - SimData data = simData.getValue(); for (int j = 0; j < mCallbacks.size(); j++) { - KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get(); + var cb = mCallbacks.get(j).get(); if (cb != null) { cb.onSimStateChanged(data.subId, data.slotId, data.simState); } @@ -634,10 +636,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } for (int i = 0; i < changedSubscriptions.size(); i++) { - SimData data = mSimDatas.get( - changedSubscriptions.get(i).getSubscriptionId()); + SimData data; + if (simPinUseSlotId()) { + data = mSimDatasBySlotId.get(changedSubscriptions.get(i) + .getSimSlotIndex()); + } else { + data = mSimDatas.get(changedSubscriptions.get(i).getSubscriptionId()); + } for (int j = 0; j < mCallbacks.size(); j++) { - KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get(); + var cb = mCallbacks.get(j).get(); if (cb != null) { cb.onSimStateChanged(data.subId, data.slotId, data.simState); } @@ -3409,12 +3416,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab */ private void invalidateSlot(int slotId) { synchronized (mSimDataLockObject) { - Iterator<Map.Entry<Integer, SimData>> iter = mSimDatas.entrySet().iterator(); + var iter = simPinUseSlotId() ? mSimDatasBySlotId.entrySet().iterator() + : mSimDatas.entrySet().iterator(); while (iter.hasNext()) { SimData data = iter.next().getValue(); if (data.slotId == slotId && SubscriptionManager.isValidSubscriptionId(data.subId)) { - mSimLogger.logInvalidSubId(data.subId); + mSimLogger.logInvalidSubId(data.subId, data.slotId); iter.remove(); } } @@ -3427,7 +3435,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @VisibleForTesting void handleSimStateChange(int subId, int slotId, int state) { Assert.isMainThread(); - mSimLogger.logSimState(subId, slotId, state); + mSimLogger.logSimState(subId, slotId, TelephonyManager.simStateToString(state)); boolean becameAbsent = ABSENT_SIM_STATE_LIST.contains(state); if (!SubscriptionManager.isValidSubscriptionId(subId)) { @@ -3444,11 +3452,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab // TODO(b/327476182): Preserve SIM_STATE_CARD_IO_ERROR sims in a separate data source. synchronized (mSimDataLockObject) { - SimData data = mSimDatas.get(subId); + SimData data = simPinUseSlotId() ? mSimDatasBySlotId.get(slotId) : mSimDatas.get(subId); final boolean changed; if (data == null) { data = new SimData(state, slotId, subId); - mSimDatas.put(subId, data); + if (simPinUseSlotId()) { + mSimDatasBySlotId.put(slotId, data); + } else { + mSimDatas.put(subId, data); + } changed = true; // no data yet; force update } else { changed = (data.simState != state || data.subId != subId || data.slotId != slotId); @@ -3727,7 +3739,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab callback.onTelephonyCapable(mTelephonyCapable); synchronized (mSimDataLockObject) { - for (Entry<Integer, SimData> data : mSimDatas.entrySet()) { + var simDatas = simPinUseSlotId() ? mSimDatasBySlotId : mSimDatas; + for (Entry<Integer, SimData> data : simDatas.entrySet()) { final SimData state = data.getValue(); callback.onSimStateChanged(state.subId, state.slotId, state.simState); } @@ -3860,7 +3873,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab */ public boolean isSimPinSecure() { synchronized (mSimDataLockObject) { - for (SimData data : mSimDatas.values()) { + var simDatas = simPinUseSlotId() ? mSimDatasBySlotId : mSimDatas; + for (SimData data : simDatas.values()) { if (isSimPinSecure(data.simState)) { return true; } @@ -3870,6 +3884,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } public int getSimState(int subId) { + if (simPinUseSlotId()) { + throw new UnsupportedOperationException("Method not supported with flag " + + "simPinUseSlotId"); + } synchronized (mSimDataLockObject) { if (mSimDatas.containsKey(subId)) { return mSimDatas.get(subId).simState; @@ -3879,12 +3897,32 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } } + /** + * Find the sim state for a slot id, or SIM_STATE_UNKNOWN if not found. + */ + public int getSimStateForSlotId(int slotId) { + if (!simPinUseSlotId()) { + throw new UnsupportedOperationException("Method not supported without flag " + + "simPinUseSlotId"); + } + synchronized (mSimDataLockObject) { + if (mSimDatasBySlotId.containsKey(slotId)) { + return mSimDatasBySlotId.get(slotId).simState; + } else { + return TelephonyManager.SIM_STATE_UNKNOWN; + } + } + } + private int getSlotId(int subId) { synchronized (mSimDataLockObject) { - if (!mSimDatas.containsKey(subId)) { - refreshSimState(subId, SubscriptionManager.getSlotIndex(subId)); + var simDatas = simPinUseSlotId() ? mSimDatasBySlotId : mSimDatas; + int slotId = SubscriptionManager.getSlotIndex(subId); + int index = simPinUseSlotId() ? slotId : subId; + if (!simDatas.containsKey(index)) { + refreshSimState(subId, slotId); } - SimData simData = mSimDatas.get(subId); + SimData simData = simDatas.get(index); return simData != null ? simData.slotId : SubscriptionManager.INVALID_SUBSCRIPTION_ID; } } @@ -3928,8 +3966,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private boolean refreshSimState(int subId, int slotId) { int state = mTelephonyManager.getSimState(slotId); synchronized (mSimDataLockObject) { - SimData data = mSimDatas.get(subId); - + SimData data = simPinUseSlotId() ? mSimDatasBySlotId.get(slotId) : mSimDatas.get(subId); if (!SubscriptionManager.isValidSubscriptionId(subId)) { invalidateSlot(slotId); } @@ -3937,7 +3974,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab final boolean changed; if (data == null) { data = new SimData(state, slotId, subId); - mSimDatas.put(subId, data); + if (simPinUseSlotId()) { + mSimDatasBySlotId.put(slotId, data); + } else { + mSimDatas.put(subId, data); + } changed = true; // no data yet; force update } else { changed = data.simState != state; @@ -4033,10 +4074,17 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab for (int i = 0; i < list.size(); i++) { final SubscriptionInfo info = list.get(i); final int id = info.getSubscriptionId(); - int slotId = getSlotId(id); - if (state == getSimState(id) && bestSlotId > slotId) { - resultId = id; - bestSlotId = slotId; + final int slotId = info.getSimSlotIndex(); + if (simPinUseSlotId()) { + if (state == getSimStateForSlotId(slotId) && bestSlotId > slotId) { + resultId = id; + bestSlotId = slotId; + } + } else { + if (state == getSimState(id) && bestSlotId > slotId) { + resultId = id; + bestSlotId = slotId; + } } } return resultId; diff --git a/packages/SystemUI/src/com/android/keyguard/logging/SimLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/SimLogger.kt index a81698ba3387..fb26c6a00c27 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/SimLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/SimLogger.kt @@ -47,12 +47,15 @@ class SimLogger @Inject constructor(@SimLog private val logBuffer: LogBuffer) { fun log(@CompileTimeConstant msg: String, level: LogLevel) = logBuffer.log(TAG, level, msg) - fun logInvalidSubId(subId: Int) { + fun logInvalidSubId(subId: Int, slotId: Int) { logBuffer.log( TAG, INFO, - { int1 = subId }, - { "Previously active sub id $int1 is now invalid, will remove" }, + { + int1 = subId + int2 = slotId + }, + { "Previously active subId: $int1, slotId: $int2 is now invalid, will remove" }, ) } @@ -94,16 +97,16 @@ class SimLogger @Inject constructor(@SimLog private val logBuffer: LogBuffer) { ) } - fun logSimState(subId: Int, slotId: Int, state: Int) { + fun logSimState(subId: Int, slotId: Int, state: String) { logBuffer.log( TAG, DEBUG, { int1 = subId int2 = slotId - long1 = state.toLong() + str1 = state }, - { "handleSimStateChange(subId=$int1, slotId=$int2, state=$long1)" }, + { "handleSimStateChange(subId=$int1, slotId=$int2, state=$str1)" }, ) } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index 7d5cf232bcb9..3794e7bf6b55 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -283,7 +283,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold com.android.internal.R.integer.config_shortAnimTime)); updateDimensions(); - final Size windowFrameSize = restoreMagnificationWindowFrameSizeIfPossible(); + final Size windowFrameSize = restoreMagnificationWindowFrameIndexAndSizeIfPossible(); setMagnificationFrame(windowFrameSize.getWidth(), windowFrameSize.getHeight(), mWindowBounds.width() / 2, mWindowBounds.height() / 2); computeBounceAnimationScale(); @@ -541,7 +541,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold return false; } mWindowBounds.set(currentWindowBounds); - final Size windowFrameSize = restoreMagnificationWindowFrameSizeIfPossible(); + final Size windowFrameSize = restoreMagnificationWindowFrameIndexAndSizeIfPossible(); final float newCenterX = (getCenterX()) * mWindowBounds.width() / oldWindowBounds.width(); final float newCenterY = (getCenterY()) * mWindowBounds.height() / oldWindowBounds.height(); @@ -787,18 +787,6 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold mMagnificationFrame.set(initX, initY, initX + width, initY + height); } - private Size restoreMagnificationWindowFrameSizeIfPossible() { - if (Flags.saveAndRestoreMagnificationSettingsButtons()) { - return restoreMagnificationWindowFrameIndexAndSizeIfPossible(); - } - - if (!mWindowMagnificationFrameSizePrefs.isPreferenceSavedForCurrentDensity()) { - return getDefaultMagnificationWindowFrameSize(); - } - - return mWindowMagnificationFrameSizePrefs.getSizeForCurrentDensity(); - } - private Size restoreMagnificationWindowFrameIndexAndSizeIfPossible() { if (!mWindowMagnificationFrameSizePrefs.isPreferenceSavedForCurrentDensity()) { notifyWindowSizeRestored(MagnificationSize.DEFAULT); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefs.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefs.java index ee36c6e8ad35..558c87c456ef 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefs.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefs.java @@ -22,8 +22,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Size; -import com.android.systemui.Flags; - /** * Class to handle SharedPreference for window magnification size. */ @@ -52,14 +50,10 @@ final class WindowMagnificationFrameSizePrefs { * Saves the window frame size for current screen density. */ public void saveIndexAndSizeForCurrentDensity(int index, Size size) { - if (Flags.saveAndRestoreMagnificationSettingsButtons()) { - mWindowMagnificationSizePreferences.edit() - .putString(getKey(), - WindowMagnificationFrameSpec.serialize(index, size)).apply(); - } else { - mWindowMagnificationSizePreferences.edit() - .putString(getKey(), size.toString()).apply(); - } + mWindowMagnificationSizePreferences + .edit() + .putString(getKey(), WindowMagnificationFrameSpec.serialize(index, size)) + .apply(); } /** @@ -91,13 +85,9 @@ final class WindowMagnificationFrameSizePrefs { * Gets the size preference for current screen density. */ public Size getSizeForCurrentDensity() { - if (Flags.saveAndRestoreMagnificationSettingsButtons()) { - return WindowMagnificationFrameSpec - .deserialize(mWindowMagnificationSizePreferences.getString(getKey(), null)) - .getSize(); - } else { - return Size.parseSize(mWindowMagnificationSizePreferences.getString(getKey(), null)); - } + return WindowMagnificationFrameSpec.deserialize( + mWindowMagnificationSizePreferences.getString(getKey(), null)) + .getSize(); } } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java index 2f0ca6e6bf9d..9525822ae141 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java @@ -59,7 +59,6 @@ import android.widget.Switch; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.graphics.SfVsyncFrameCallbackProvider; -import com.android.systemui.Flags; import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView; import com.android.systemui.res.R; import com.android.systemui.util.settings.SecureSettings; @@ -460,12 +459,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest mAllowDiagonalScrollingView.setVisibility(View.VISIBLE); mFullScreenButton.setVisibility(View.GONE); if (selectedButtonIndex == MagnificationSize.FULLSCREEN) { - if (Flags.saveAndRestoreMagnificationSettingsButtons()) { - selectedButtonIndex = - windowMagnificationFrameSizePrefs.getIndexForCurrentDensity(); - } else { - selectedButtonIndex = MagnificationSize.CUSTOM; - } + selectedButtonIndex = + windowMagnificationFrameSizePrefs.getIndexForCurrentDensity(); } break; @@ -482,10 +477,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest } else { // mode = ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW mEditButton.setVisibility(View.VISIBLE); mAllowDiagonalScrollingView.setVisibility(View.VISIBLE); - if (Flags.saveAndRestoreMagnificationSettingsButtons()) { - selectedButtonIndex = - windowMagnificationFrameSizePrefs.getIndexForCurrentDensity(); - } + selectedButtonIndex = + windowMagnificationFrameSizePrefs.getIndexForCurrentDensity(); } break; diff --git a/packages/SystemUI/src/com/android/systemui/activity/ActivityManagerModule.kt b/packages/SystemUI/src/com/android/systemui/activity/ActivityManagerModule.kt new file mode 100644 index 000000000000..db315e4e0bf7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/activity/ActivityManagerModule.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.activity + +import com.android.systemui.activity.data.repository.ActivityManagerRepository +import com.android.systemui.activity.data.repository.ActivityManagerRepositoryImpl +import com.android.systemui.dagger.SysUISingleton +import dagger.Binds +import dagger.Module + +@Module +interface ActivityManagerModule { + @Binds + @SysUISingleton + fun activityManagerRepository(impl: ActivityManagerRepositoryImpl): ActivityManagerRepository +} diff --git a/packages/SystemUI/src/com/android/systemui/activity/data/repository/ActivityManagerRepository.kt b/packages/SystemUI/src/com/android/systemui/activity/data/repository/ActivityManagerRepository.kt new file mode 100644 index 000000000000..94614b70beda --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/activity/data/repository/ActivityManagerRepository.kt @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.activity.data.repository + +import android.app.ActivityManager +import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.log.core.Logger +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.onStart + +/** Repository for interfacing with [ActivityManager]. */ +interface ActivityManagerRepository { + /** + * Given a UID, creates a flow that emits true when the process with the given UID is visible to + * the user and false otherwise. + * + * @param identifyingLogTag a tag identifying who created this flow, used for logging. + */ + fun createIsAppVisibleFlow( + creationUid: Int, + logger: Logger, + identifyingLogTag: String, + ): Flow<Boolean> +} + +@SysUISingleton +class ActivityManagerRepositoryImpl +@Inject +constructor( + @Background private val backgroundContext: CoroutineContext, + private val activityManager: ActivityManager, +) : ActivityManagerRepository { + override fun createIsAppVisibleFlow( + creationUid: Int, + logger: Logger, + identifyingLogTag: String, + ): Flow<Boolean> { + return conflatedCallbackFlow { + val listener = + object : ActivityManager.OnUidImportanceListener { + override fun onUidImportance(uid: Int, importance: Int) { + if (uid != creationUid) { + return + } + val isAppVisible = isAppVisibleToUser(importance) + logger.d({ + "$str1: #onUidImportance. importance=$int1, isAppVisible=$bool1" + }) { + str1 = identifyingLogTag + int1 = importance + bool1 = isAppVisible + } + trySend(isAppVisible) + } + } + try { + // TODO(b/286258140): Replace this with the #addOnUidImportanceListener + // overload that filters to certain UIDs. + activityManager.addOnUidImportanceListener(listener, IMPORTANCE_CUTPOINT) + } catch (e: SecurityException) { + logger.e({ "$str1: Security exception on #addOnUidImportanceListener" }, e) { + str1 = identifyingLogTag + } + } + + awaitClose { activityManager.removeOnUidImportanceListener(listener) } + } + .distinctUntilChanged() + .onStart { + try { + val isVisibleOnStart = + isAppVisibleToUser(activityManager.getUidImportance(creationUid)) + logger.d({ "$str1: Starting UID observation. isAppVisible=$bool1" }) { + str1 = identifyingLogTag + bool1 = isVisibleOnStart + } + emit(isVisibleOnStart) + } catch (e: SecurityException) { + logger.e({ "$str1: Security exception on #getUidImportance" }, e) { + str1 = identifyingLogTag + } + emit(false) + } + } + .flowOn(backgroundContext) + } + + /** Returns true if the given [importance] represents an app that's visible to the user. */ + private fun isAppVisibleToUser(importance: Int): Boolean { + return importance <= IMPORTANCE_CUTPOINT + } + + companion object { + private const val IMPORTANCE_CUTPOINT = IMPORTANCE_FOREGROUND + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 6a777ee7417b..d6f8957ace33 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -32,6 +32,7 @@ import com.android.systemui.BootCompleteCacheImpl; import com.android.systemui.CameraProtectionModule; import com.android.systemui.CoreStartable; import com.android.systemui.SystemUISecondaryUserService; +import com.android.systemui.activity.ActivityManagerModule; import com.android.systemui.ambient.dagger.AmbientModule; import com.android.systemui.appops.dagger.AppOpsModule; import com.android.systemui.assist.AssistModule; @@ -198,6 +199,7 @@ import javax.inject.Named; * may not appreciate that. */ @Module(includes = { + ActivityManagerModule.class, AmbientModule.class, AppOpsModule.class, AssistModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt b/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt index 2a3729b1aeab..c49ba80c660b 100644 --- a/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt @@ -27,6 +27,7 @@ import android.os.Bundle import android.os.UserHandle import android.view.accessibility.AccessibilityManager import androidx.core.app.NotificationCompat +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -39,7 +40,6 @@ import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutoria import com.android.systemui.res.R import javax.inject.Inject import kotlinx.coroutines.CoroutineScope -import com.android.app.tracing.coroutines.launchTraced as launch /** * A class to show contextual education on UI based on the edu produced from @@ -107,6 +107,7 @@ constructor( } private fun showDialog(model: ContextualEduToastViewModel) { + dialog?.dismiss() dialog = createDialog(model) dialog?.show() } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 7097c1d2fc4e..d40fe468b0a5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -81,7 +81,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.keyguard.domain.interactor.KeyguardDismissInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardEnabledInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; -import com.android.systemui.keyguard.domain.interactor.KeyguardLockWhileAwakeInteractor; +import com.android.systemui.keyguard.domain.interactor.KeyguardServiceLockNowInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardStateCallbackInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardWakeDirectlyToGoneInteractor; import com.android.systemui.keyguard.ui.binder.KeyguardSurfaceBehindParamsApplier; @@ -330,8 +330,7 @@ public class KeyguardService extends Service { return new FoldGracePeriodProvider(); } }; - private final KeyguardLockWhileAwakeInteractor - mKeyguardLockWhileAwakeInteractor; + private final KeyguardServiceLockNowInteractor mKeyguardServiceLockNowInteractor; @Inject public KeyguardService( @@ -357,7 +356,7 @@ public class KeyguardService extends Service { KeyguardDismissInteractor keyguardDismissInteractor, Lazy<DeviceEntryInteractor> deviceEntryInteractorLazy, KeyguardStateCallbackInteractor keyguardStateCallbackInteractor, - KeyguardLockWhileAwakeInteractor keyguardLockWhileAwakeInteractor) { + KeyguardServiceLockNowInteractor keyguardServiceLockNowInteractor) { super(); mKeyguardViewMediator = keyguardViewMediator; mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher; @@ -389,7 +388,7 @@ public class KeyguardService extends Service { mKeyguardEnabledInteractor = keyguardEnabledInteractor; mKeyguardWakeDirectlyToGoneInteractor = keyguardWakeDirectlyToGoneInteractor; mKeyguardDismissInteractor = keyguardDismissInteractor; - mKeyguardLockWhileAwakeInteractor = keyguardLockWhileAwakeInteractor; + mKeyguardServiceLockNowInteractor = keyguardServiceLockNowInteractor; } @Override @@ -665,7 +664,7 @@ public class KeyguardService extends Service { if (SceneContainerFlag.isEnabled()) { mDeviceEntryInteractorLazy.get().lockNow(); } else if (KeyguardWmStateRefactor.isEnabled()) { - mKeyguardLockWhileAwakeInteractor.onKeyguardServiceDoKeyguardTimeout(options); + mKeyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout(options); } mKeyguardViewMediator.doKeyguardTimeout(options); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 01ec4d026646..9f131607cb99 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -3943,7 +3943,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } private void notifyDefaultDisplayCallbacks(boolean showing) { - if (SceneContainerFlag.isEnabled()) { + if (SceneContainerFlag.isEnabled() || KeyguardWmStateRefactor.isEnabled()) { return; } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractor.kt index 631e44aca26d..42cbd7d39248 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractor.kt @@ -16,39 +16,52 @@ package com.android.systemui.keyguard.domain.interactor +import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.internal.widget.LockPatternUtils import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.keyguard.data.repository.KeyguardRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.kotlin.sample import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach -import com.android.app.tracing.coroutines.launchTraced as launch +import kotlinx.coroutines.withContext /** - * Logic around the keyguard being enabled/disabled, per [KeyguardService]. If the keyguard is not - * enabled, the lockscreen cannot be shown and the device will go from AOD/DOZING directly to GONE. + * Logic around the keyguard being enabled, disabled, or suppressed via adb. If the keyguard is + * disabled or suppressed, the lockscreen cannot be shown and the device will go from AOD/DOZING + * directly to GONE. * * Keyguard can be disabled by selecting Security: "None" in settings, or by apps that hold * permission to do so (such as Phone). Some CTS tests also disable keyguard in onCreate or onStart * rather than simply dismissing the keyguard or setting up the device to have Security: None, for * reasons unknown. + * + * Keyguard can be suppressed by calling "adb shell locksettings set-disabled true", which is + * frequently done in tests. If keyguard is suppressed, it won't show even if the keyguard is + * enabled. If keyguard is not suppressed, then we defer to whether keyguard is enabled or disabled. */ @SysUISingleton class KeyguardEnabledInteractor @Inject constructor( - @Application scope: CoroutineScope, + @Application val scope: CoroutineScope, + @Background val backgroundDispatcher: CoroutineDispatcher, val repository: KeyguardRepository, val biometricSettingsRepository: BiometricSettingsRepository, - keyguardDismissTransitionInteractor: KeyguardDismissTransitionInteractor, + private val selectedUserInteractor: SelectedUserInteractor, + private val lockPatternUtils: LockPatternUtils, + keyguardDismissTransitionInteractor: dagger.Lazy<KeyguardDismissTransitionInteractor>, internalTransitionInteractor: InternalKeyguardTransitionInteractor, ) { @@ -62,6 +75,10 @@ constructor( * If the keyguard is disabled while we're locked, we will transition to GONE unless we're in * lockdown mode. If the keyguard is re-enabled, we'll transition back to LOCKSCREEN if we were * locked when it was disabled. + * + * Even if the keyguard is enabled, it's possible for it to be suppressed temporarily via adb. + * If you need to respect that adb command, you will need to use + * [isKeyguardEnabledAndNotSuppressed] instead of using this flow. */ val isKeyguardEnabled: StateFlow<Boolean> = repository.isKeyguardEnabled @@ -96,9 +113,9 @@ constructor( val currentTransitionInfo = internalTransitionInteractor.currentTransitionInfoInternal() if (currentTransitionInfo.to != KeyguardState.GONE && !inLockdown) { - keyguardDismissTransitionInteractor.startDismissKeyguardTransition( - "keyguard disabled" - ) + keyguardDismissTransitionInteractor + .get() + .startDismissKeyguardTransition("keyguard disabled") } } } @@ -116,4 +133,37 @@ constructor( fun isShowKeyguardWhenReenabled(): Boolean { return repository.isShowKeyguardWhenReenabled() } + + /** + * Whether the keyguard is enabled, and has not been suppressed via adb. + * + * There is unfortunately no callback for [isKeyguardSuppressed], which means this can't be a + * flow, since it's ambiguous when we would query the latest suppression value. + */ + suspend fun isKeyguardEnabledAndNotSuppressed(): Boolean { + return isKeyguardEnabled.value && !isKeyguardSuppressed() + } + + /** + * Returns whether the lockscreen has been disabled ("suppressed") via "adb shell locksettings + * set-disabled". If suppressed, we'll ignore all signals that would typically result in showing + * the keyguard, regardless of the value of [isKeyguardEnabled]. + * + * It's extremely confusing to have [isKeyguardEnabled] not be the inverse of "is lockscreen + * disabled", so this method intentionally re-terms it as "suppressed". + * + * Note that if the lockscreen is currently showing when it's suppressed, it will remain visible + * until it's unlocked, at which point it will never re-appear until suppression is removed. + */ + suspend fun isKeyguardSuppressed( + userId: Int = selectedUserInteractor.getSelectedUserId() + ): Boolean { + // isLockScreenDisabled returns true whenever keyguard is not enabled, even if the adb + // command was not used to disable/suppress the lockscreen. To make these booleans as clear + // as possible, only return true if keyguard is suppressed when it otherwise would have + // been enabled. + return withContext(backgroundDispatcher) { + isKeyguardEnabled.value && lockPatternUtils.isLockScreenDisabled(userId) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractor.kt index 0ab3e5c0927f..ce84e71a3562 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractor.kt @@ -16,27 +16,16 @@ package com.android.systemui.keyguard.domain.interactor -import android.os.Bundle import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge -/** - * Emitted when we receive a [KeyguardLockWhileAwakeInteractor.onKeyguardServiceDoKeyguardTimeout] - * call. - * - * Includes a timestamp so it's not conflated by the StateFlow. - */ -data class KeyguardTimeoutWhileAwakeEvent(val timestamp: Long, val options: Bundle?) - /** The reason we're locking while awake, used for logging. */ enum class LockWhileAwakeReason(private val logReason: String) { LOCKDOWN("Lockdown initiated."), @@ -71,10 +60,8 @@ class KeyguardLockWhileAwakeInteractor constructor( biometricSettingsRepository: BiometricSettingsRepository, keyguardEnabledInteractor: KeyguardEnabledInteractor, + keyguardServiceLockNowInteractor: KeyguardServiceLockNowInteractor, ) { - /** Emits whenever a timeout event is received by [KeyguardService]. */ - private val timeoutEvents: MutableStateFlow<KeyguardTimeoutWhileAwakeEvent?> = - MutableStateFlow(null) /** Emits whenever the current user is in lockdown mode. */ private val inLockdown: Flow<LockWhileAwakeReason> = @@ -97,25 +84,19 @@ constructor( /** Emits whenever we should lock while the screen is on, for any reason. */ val lockWhileAwakeEvents: Flow<LockWhileAwakeReason> = merge( - inLockdown, - keyguardReenabled, - timeoutEvents.filterNotNull().map { - LockWhileAwakeReason.KEYGUARD_TIMEOUT_WHILE_SCREEN_ON - }, + // We're in lockdown, and the keyguard is enabled. If the keyguard is disabled, the + // lockdown button is hidden in the UI, but it's still possible to trigger lockdown in + // tests. + inLockdown + .filter { keyguardEnabledInteractor.isKeyguardEnabledAndNotSuppressed() } + .map { LockWhileAwakeReason.LOCKDOWN }, + // The keyguard was re-enabled, and it was showing when it was originally disabled. + // Tests currently expect that if the keyguard is re-enabled, it will show even if it's + // suppressed, so we don't check for isKeyguardEnabledAndNotSuppressed() on this flow. + keyguardReenabled.map { LockWhileAwakeReason.KEYGUARD_REENABLED }, + // KeyguardService says we need to lock now, and the lockscreen is enabled. + keyguardServiceLockNowInteractor.lockNowEvents + .filter { keyguardEnabledInteractor.isKeyguardEnabledAndNotSuppressed() } + .map { LockWhileAwakeReason.KEYGUARD_TIMEOUT_WHILE_SCREEN_ON }, ) - - /** - * Called by [KeyguardService] when it receives a doKeyguardTimeout() call. This indicates that - * the device locked while the screen was on. - * - * [options] appears to be no longer used, but we'll keep it in this interactor in case that - * turns out not to be true. - */ - fun onKeyguardServiceDoKeyguardTimeout(options: Bundle?) { - timeoutEvents.value = - KeyguardTimeoutWhileAwakeEvent( - timestamp = System.currentTimeMillis(), - options = options, - ) - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt new file mode 100644 index 000000000000..9ed53ea74316 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.domain.interactor + +import android.annotation.SuppressLint +import android.os.Bundle +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.launch + +/** + * Emitted when we receive a [KeyguardServiceLockNowInteractor.onKeyguardServiceDoKeyguardTimeout] + * call. + */ +data class KeyguardLockNowEvent(val options: Bundle?) + +/** + * Logic around requests by [KeyguardService] to lock the device right now, even though the device + * is awake and not going to sleep. + * + * This can happen if WM#lockNow() is called, or if the screen is forced to stay awake but the lock + * timeout elapses. + * + * This is not the only way for the device to lock while the screen is on. The other cases, which do + * not directly involve [KeyguardService], are handled in [KeyguardLockWhileAwakeInteractor]. + */ +@SysUISingleton +class KeyguardServiceLockNowInteractor +@Inject +constructor(@Background val backgroundScope: CoroutineScope) { + + /** + * Emits whenever [KeyguardService] receives a call that indicates we should lock the device + * right now, even though the device is awake and not going to sleep. + * + * WARNING: This is only one of multiple reasons the device might need to lock while not going + * to sleep. Unless you're dealing with keyguard internals that specifically need to know that + * we're locking due to a call to doKeyguardTimeout, use + * [KeyguardLockWhileAwakeInteractor.lockWhileAwakeEvents]. + * + * This is fundamentally an event flow, hence the SharedFlow. + */ + @SuppressLint("SharedFlowCreation") + val lockNowEvents: MutableSharedFlow<KeyguardLockNowEvent> = MutableSharedFlow() + + /** + * Called by [KeyguardService] when it receives a doKeyguardTimeout() call. This indicates that + * the device locked while the screen was on. + * + * [options] appears to be no longer used, but we'll keep it in this interactor in case that + * turns out not to be true. + */ + fun onKeyguardServiceDoKeyguardTimeout(options: Bundle?) { + backgroundScope.launch { lockNowEvents.emit(KeyguardLockNowEvent(options = options)) } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractor.kt index fbc7e2aecbdf..8641dfa5a183 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractor.kt @@ -25,6 +25,7 @@ import android.content.Intent import android.content.IntentFilter import android.provider.Settings import android.provider.Settings.Secure +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.internal.widget.LockPatternUtils import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -48,20 +49,21 @@ import javax.inject.Inject import kotlin.math.max import kotlin.math.min import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.map -import com.android.app.tracing.coroutines.launchTraced as launch +import kotlinx.coroutines.flow.merge +import kotlinx.coroutines.flow.onStart /** * Logic related to the ability to wake directly to GONE from asleep (AOD/DOZING), without going * through LOCKSCREEN or a BOUNCER state. * * This is possible in the following scenarios: - * - The lockscreen is disabled, either from an app request (SUW does this), or by the security + * - The keyguard is not enabled, either from an app request (SUW does this), or by the security * "None" setting. + * - The keyguard was suppressed via adb. * - A biometric authentication event occurred while we were asleep (fingerprint auth, etc). This * specifically is referred to throughout the codebase as "wake and unlock". * - The screen timed out, but the "lock after screen timeout" duration has not elapsed. @@ -86,43 +88,44 @@ constructor( private val lockPatternUtils: LockPatternUtils, private val systemSettings: SystemSettings, private val selectedUserInteractor: SelectedUserInteractor, + keyguardEnabledInteractor: KeyguardEnabledInteractor, + keyguardServiceLockNowInteractor: KeyguardServiceLockNowInteractor, ) { /** - * Whether the lockscreen was disabled as of the last wake/sleep event, according to - * LockPatternUtils. - * - * This will always be true if [repository.isKeyguardServiceEnabled]=false, but it can also be - * true when the keyguard service is enabled if the lockscreen has been disabled via adb using - * the `adb shell locksettings set-disabled true` command, which is often done in tests. - * - * Unlike keyguardServiceEnabled, changes to this value should *not* immediately show or hide - * the keyguard. If the lockscreen is disabled in this way, it will just not show on the next - * sleep/wake. + * Whether the keyguard was suppressed as of the most recent wakefulness event or lockNow + * command. Keyguard suppression can only be queried (there is no callback available), and + * legacy code only queried the value in onStartedGoingToSleep and doKeyguardTimeout. Tests now + * depend on that behavior, so for now, we'll replicate it here. */ - private val isLockscreenDisabled: Flow<Boolean> = - powerInteractor.isAwake.map { isLockscreenDisabled() } + private val shouldSuppressKeyguard = + merge(powerInteractor.isAwake, keyguardServiceLockNowInteractor.lockNowEvents) + .map { keyguardEnabledInteractor.isKeyguardSuppressed() } + // Default to false, so that flows that combine this one emit prior to the first + // wakefulness emission. + .onStart { emit(false) } /** * Whether we can wake from AOD/DOZING directly to GONE, bypassing LOCKSCREEN/BOUNCER states. * * This is possible in the following cases: * - Keyguard is disabled, either from an app request or from security being set to "None". + * - Keyguard is suppressed, via adb locksettings. * - We're wake and unlocking (fingerprint auth occurred while asleep). * - We're allowed to ignore auth and return to GONE, due to timeouts not elapsing. */ val canWakeDirectlyToGone = combine( repository.isKeyguardEnabled, - isLockscreenDisabled, + shouldSuppressKeyguard, repository.biometricUnlockState, repository.canIgnoreAuthAndReturnToGone, ) { keyguardEnabled, - isLockscreenDisabled, + shouldSuppressKeyguard, biometricUnlockState, canIgnoreAuthAndReturnToGone -> - (!keyguardEnabled || isLockscreenDisabled) || + (!keyguardEnabled || shouldSuppressKeyguard) || BiometricUnlockMode.isWakeAndUnlock(biometricUnlockState.mode) || canIgnoreAuthAndReturnToGone } @@ -186,9 +189,9 @@ constructor( .sample( transitionInteractor.isCurrentlyIn( Scenes.Gone, - stateWithoutSceneContainer = KeyguardState.GONE + stateWithoutSceneContainer = KeyguardState.GONE, ), - ::Pair + ::Pair, ) .collect { (wakefulness, finishedInGone) -> // Save isAwake for use in onDreamingStarted/onDreamingStopped. @@ -260,7 +263,7 @@ constructor( delayedActionFilter, SYSTEMUI_PERMISSION, null /* scheduler */, - Context.RECEIVER_EXPORTED_UNAUDITED + Context.RECEIVER_EXPORTED_UNAUDITED, ) } @@ -282,7 +285,7 @@ constructor( context, 0, intent, - PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) val time = systemClock.elapsedRealtime() + getCanIgnoreAuthAndReturnToGoneDuration() @@ -311,16 +314,6 @@ constructor( } /** - * Returns whether the lockscreen is disabled, either because the keyguard service is disabled - * or because an adb command has disabled the lockscreen. - */ - private fun isLockscreenDisabled( - userId: Int = selectedUserInteractor.getSelectedUserId() - ): Boolean { - return lockPatternUtils.isLockScreenDisabled(userId) - } - - /** * Returns the duration within which we can return to GONE without auth after a screen timeout * (or power button press, if lock instantly is disabled). * @@ -336,7 +329,7 @@ constructor( .getIntForUser( Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, KEYGUARD_CAN_IGNORE_AUTH_DURATION, - userId + userId, ) .toLong() @@ -352,7 +345,7 @@ constructor( .getIntForUser( Settings.System.SCREEN_OFF_TIMEOUT, KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT, - userId + userId, ) .toLong() diff --git a/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt index 49ceba834dd4..31780a56f7f0 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt @@ -37,9 +37,11 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.compose.theme.PlatformTheme import com.android.internal.annotations.VisibleForTesting import com.android.systemui.Flags +import com.android.systemui.Flags.communalHubOnMobile import com.android.systemui.ambient.touch.TouchMonitor import com.android.systemui.ambient.touch.dagger.AmbientTouchComponent import com.android.systemui.communal.dagger.Communal @@ -70,7 +72,6 @@ import java.util.function.Consumer import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine -import com.android.app.tracing.coroutines.launchTraced as launch /** * Controller that's responsible for the glanceable hub container view and its touch handling. @@ -513,14 +514,19 @@ constructor( val touchOnUmo = keyguardMediaController.isWithinMediaViewBounds(ev.x.toInt(), ev.y.toInt()) val touchOnSmartspace = lockscreenSmartspaceController.isWithinSmartspaceBounds(ev.x.toInt(), ev.y.toInt()) - if (!hubShowing && (touchOnNotifications || touchOnUmo || touchOnSmartspace)) { + val glanceableHubV2 = communalHubOnMobile() + if ( + !hubShowing && + (touchOnNotifications || touchOnUmo || touchOnSmartspace || glanceableHubV2) + ) { logger.d({ "Lockscreen touch ignored: touchOnNotifications: $bool1, touchOnUmo: $bool2, " + - "touchOnSmartspace: $bool3" + "touchOnSmartspace: $bool3, glanceableHubV2: $bool4" }) { bool1 = touchOnNotifications bool2 = touchOnUmo bool3 = touchOnSmartspace + bool4 = glanceableHubV2 } return false } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 0c0add2dd237..88522d559c30 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -219,8 +219,8 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.phone.ScrimController; +import com.android.systemui.statusbar.phone.ShadeTouchableRegionManager; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; -import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; import com.android.systemui.statusbar.phone.TapAgainViewController; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -298,7 +298,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump * The minimum scale to "squish" the Shade and associated elements down to, for Back gesture */ public static final float SHADE_BACK_ANIM_MIN_SCALE = 0.9f; - private final StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + private final ShadeTouchableRegionManager mShadeTouchableRegionManager; private final Resources mResources; private final KeyguardStateController mKeyguardStateController; private final SysuiStatusBarStateController mStatusBarStateController; @@ -695,7 +695,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump ShadeLogger shadeLogger, @ShadeDisplayAware ConfigurationController configurationController, Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilder, - StatusBarTouchableRegionManager statusBarTouchableRegionManager, + ShadeTouchableRegionManager shadeTouchableRegionManager, ConversationNotificationManager conversationNotificationManager, MediaHierarchyManager mediaHierarchyManager, StatusBarKeyguardViewManager statusBarKeyguardViewManager, @@ -840,7 +840,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mVibratorHelper = vibratorHelper; mMSDLPlayer = msdlPlayer; mVibrateOnOpening = mResources.getBoolean(R.bool.config_vibrateOnIconAnimation); - mStatusBarTouchableRegionManager = statusBarTouchableRegionManager; + mShadeTouchableRegionManager = shadeTouchableRegionManager; mSystemClock = systemClock; mKeyguardMediaController = keyguardMediaController; mMetricsLogger = metricsLogger; @@ -1551,7 +1551,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump private Rect calculateGestureExclusionRect() { Rect exclusionRect = null; - Region touchableRegion = mStatusBarTouchableRegionManager.calculateTouchableRegion(); + Region touchableRegion = mShadeTouchableRegionManager.calculateTouchableRegion(); if (isFullyCollapsed() && touchableRegion != null) { // Note: The manager also calculates the non-pinned touchable region exclusionRect = touchableRegion.getBounds(); diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java index 04f89be97e0a..0df2299eb8dd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java @@ -98,7 +98,7 @@ import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; -import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; +import com.android.systemui.statusbar.phone.ShadeTouchableRegionManager; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.SplitShadeStateController; @@ -141,7 +141,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum private final LockscreenShadeTransitionController mLockscreenShadeTransitionController; private final NotificationShadeDepthController mDepthController; private final ShadeHeaderController mShadeHeaderController; - private final StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + private final ShadeTouchableRegionManager mShadeTouchableRegionManager; private final Provider<StatusBarLongPressGestureDetector> mStatusBarLongPressGestureDetector; private final KeyguardStateController mKeyguardStateController; private final KeyguardBypassController mKeyguardBypassController; @@ -317,7 +317,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum LockscreenShadeTransitionController lockscreenShadeTransitionController, NotificationShadeDepthController notificationShadeDepthController, ShadeHeaderController shadeHeaderController, - StatusBarTouchableRegionManager statusBarTouchableRegionManager, + ShadeTouchableRegionManager shadeTouchableRegionManager, Provider<StatusBarLongPressGestureDetector> statusBarLongPressGestureDetector, KeyguardStateController keyguardStateController, KeyguardBypassController keyguardBypassController, @@ -366,7 +366,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum mLockscreenShadeTransitionController = lockscreenShadeTransitionController; mDepthController = notificationShadeDepthController; mShadeHeaderController = shadeHeaderController; - mStatusBarTouchableRegionManager = statusBarTouchableRegionManager; + mShadeTouchableRegionManager = shadeTouchableRegionManager; mStatusBarLongPressGestureDetector = statusBarLongPressGestureDetector; mKeyguardStateController = keyguardStateController; mKeyguardBypassController = keyguardBypassController; @@ -695,7 +695,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum /* right= */ (int) mQsFrame.getX() + mQsFrame.getWidth(), /* bottom= */ headerBottom + frameTop); // Also allow QS to intercept if the touch is near the notch. - mStatusBarTouchableRegionManager.updateRegionForNotch(mInterceptRegion); + mShadeTouchableRegionManager.updateRegionForNotch(mInterceptRegion); final boolean onHeader = mInterceptRegion.contains((int) x, (int) y); if (getExpanded()) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt index 0b36e685d914..91ca2ca52287 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt @@ -17,9 +17,10 @@ package com.android.systemui.shade import android.content.Context -import android.content.MutableContextWrapper import android.content.res.Resources import android.view.LayoutInflater +import android.view.WindowManager +import android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE import com.android.systemui.CoreStartable import com.android.systemui.common.ui.ConfigurationState import com.android.systemui.common.ui.ConfigurationStateImpl @@ -29,9 +30,12 @@ import com.android.systemui.common.ui.data.repository.ConfigurationRepositoryImp import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractorImpl import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.res.R import com.android.systemui.scene.ui.view.WindowRootView +import com.android.systemui.shade.data.repository.MutableShadeDisplaysRepository import com.android.systemui.shade.data.repository.ShadeDisplaysRepository import com.android.systemui.shade.data.repository.ShadeDisplaysRepositoryImpl +import com.android.systemui.shade.display.ShadeDisplayPolicyModule import com.android.systemui.shade.domain.interactor.ShadeDisplaysInteractor import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround import com.android.systemui.statusbar.phone.ConfigurationControllerImpl @@ -56,7 +60,7 @@ import javax.inject.Provider * By using this dedicated module, we ensure the notification shade window always utilizes the * correct display context and resources, regardless of the display it's on. */ -@Module(includes = [OptionalShadeDisplayAwareBindings::class]) +@Module(includes = [OptionalShadeDisplayAwareBindings::class, ShadeDisplayPolicyModule::class]) object ShadeDisplayAwareModule { /** Creates a new context for the shade window. */ @@ -65,7 +69,9 @@ object ShadeDisplayAwareModule { @SysUISingleton fun provideShadeDisplayAwareContext(context: Context): Context { return if (ShadeWindowGoesAround.isEnabled) { - MutableContextWrapper(context) + context + .createWindowContext(context.display, TYPE_NOTIFICATION_SHADE, /* options= */ null) + .apply { setTheme(R.style.Theme_SystemUI) } } else { context } @@ -74,6 +80,20 @@ object ShadeDisplayAwareModule { @Provides @ShadeDisplayAware @SysUISingleton + fun provideShadeWindowManager( + defaultWindowManager: WindowManager, + @ShadeDisplayAware context: Context, + ): WindowManager { + return if (ShadeWindowGoesAround.isEnabled) { + context.getSystemService(WindowManager::class.java) as WindowManager + } else { + defaultWindowManager + } + } + + @Provides + @ShadeDisplayAware + @SysUISingleton fun provideShadeDisplayAwareResources(@ShadeDisplayAware context: Context): Resources { return context.resources } @@ -163,6 +183,15 @@ object ShadeDisplayAwareModule { return impl } + @SysUISingleton + @Provides + fun provideMutableShadePositionRepository( + impl: ShadeDisplaysRepositoryImpl + ): MutableShadeDisplaysRepository { + ShadeWindowGoesAround.isUnexpectedlyInLegacyMode() + return impl + } + @Provides @IntoMap @ClassKey(ShadePrimaryDisplayCommand::class) diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadePrimaryDisplayCommand.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadePrimaryDisplayCommand.kt index a5d9e9660ca5..a54f6b9c6743 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadePrimaryDisplayCommand.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadePrimaryDisplayCommand.kt @@ -20,11 +20,14 @@ import android.view.Display import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.display.data.repository.DisplayRepository -import com.android.systemui.shade.data.repository.ShadeDisplaysRepository +import com.android.systemui.shade.data.repository.MutableShadeDisplaysRepository +import com.android.systemui.shade.display.ShadeDisplayPolicy +import com.android.systemui.shade.display.SpecificDisplayIdPolicy import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import java.io.PrintWriter import javax.inject.Inject +import kotlin.text.toIntOrNull @SysUISingleton class ShadePrimaryDisplayCommand @@ -32,7 +35,9 @@ class ShadePrimaryDisplayCommand constructor( private val commandRegistry: CommandRegistry, private val displaysRepository: DisplayRepository, - private val positionRepository: ShadeDisplaysRepository, + private val positionRepository: MutableShadeDisplaysRepository, + private val policies: Set<@JvmSuppressWildcards ShadeDisplayPolicy>, + private val defaultPolicy: ShadeDisplayPolicy, ) : Command, CoreStartable { override fun start() { @@ -40,8 +45,11 @@ constructor( } override fun help(pw: PrintWriter) { - pw.println("shade_display_override <displayId> ") - pw.println("Set the display which is holding the shade.") + pw.println("shade_display_override (<displayId>|<policyName>) ") + pw.println("Set the display which is holding the shade, or the policy that defines it.") + pw.println() + pw.println("shade_display_override policies") + pw.println("Lists available policies") pw.println() pw.println("shade_display_override reset ") pw.println("Reset the display which is holding the shade.") @@ -68,21 +76,27 @@ constructor( "reset" -> reset() "list", "status" -> printStatus() + "policies" -> printPolicies() "any_external" -> anyExternal() - else -> { - val cmdAsInteger = command?.toIntOrNull() - if (cmdAsInteger != null) { - changeDisplay(displayId = cmdAsInteger) - } else { - help(pw) - } + null -> help(pw) + else -> parsePolicy(command) + } + } + + private fun parsePolicy(policyIdentifier: String) { + val displayId = policyIdentifier.toIntOrNull() + when { + displayId != null -> changeDisplay(displayId = displayId) + policies.any { it.name == policyIdentifier } -> { + positionRepository.policy.value = policies.first { it.name == policyIdentifier } } + else -> help(pw) } } private fun reset() { - positionRepository.resetDisplayId() - pw.println("Reset shade primary display id to ${Display.DEFAULT_DISPLAY}") + positionRepository.policy.value = defaultPolicy + pw.println("Reset shade display policy to default policy: ${defaultPolicy.name}") } private fun printStatus() { @@ -95,6 +109,15 @@ constructor( } } + private fun printPolicies() { + val currentPolicyName = positionRepository.policy.value.name + pw.println("Available policies: ") + policies.forEach { + pw.print(" - ${it.name}") + pw.println(if (currentPolicyName == it.name) " (Current policy)" else "") + } + } + private fun anyExternal() { val anyExternalDisplay = displaysRepository.displays.value.firstOrNull { @@ -116,7 +139,7 @@ constructor( } private fun setDisplay(id: Int) { - positionRepository.setDisplayId(id) + positionRepository.policy.value = SpecificDisplayIdPolicy(id) pw.println("New shade primary display id is $id") } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/data/repository/FakeShadeDisplayRepository.kt b/packages/SystemUI/src/com/android/systemui/shade/data/repository/FakeShadeDisplayRepository.kt index 71c565816362..732d4d1500e7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/data/repository/FakeShadeDisplayRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/data/repository/FakeShadeDisplayRepository.kt @@ -23,14 +23,14 @@ import kotlinx.coroutines.flow.StateFlow class FakeShadeDisplayRepository : ShadeDisplaysRepository { private val _displayId = MutableStateFlow(Display.DEFAULT_DISPLAY) - override fun setDisplayId(displayId: Int) { + fun setDisplayId(displayId: Int) { _displayId.value = displayId } override val displayId: StateFlow<Int> get() = _displayId - override fun resetDisplayId() { + fun resetDisplayId() { _displayId.value = Display.DEFAULT_DISPLAY } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepository.kt b/packages/SystemUI/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepository.kt index 4a95e339cade..756241e9b071 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepository.kt @@ -18,37 +18,40 @@ package com.android.systemui.shade.data.repository import android.view.Display import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.shade.display.ShadeDisplayPolicy import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.stateIn +/** Source of truth for the display currently holding the shade. */ interface ShadeDisplaysRepository { /** ID of the display which currently hosts the shade */ val displayId: StateFlow<Int> +} - /** - * Updates the value of the shade display id stored, emitting to the new display id to every - * component dependent on the shade display id - */ - fun setDisplayId(displayId: Int) - - /** Resets value of shade primary display to the default display */ - fun resetDisplayId() +/** Allows to change the policy that determines in which display the Shade window is visible. */ +interface MutableShadeDisplaysRepository : ShadeDisplaysRepository { + /** Updates the policy to select where the shade is visible. */ + val policy: MutableStateFlow<ShadeDisplayPolicy> } -/** Source of truth for the display currently holding the shade. */ +/** Keeps the policy and propagates the display id for the shade from it. */ @SysUISingleton -class ShadeDisplaysRepositoryImpl @Inject constructor() : ShadeDisplaysRepository { - private val _displayId = MutableStateFlow(Display.DEFAULT_DISPLAY) - - override val displayId: StateFlow<Int> - get() = _displayId - - override fun setDisplayId(displayId: Int) { - _displayId.value = displayId - } - - override fun resetDisplayId() { - _displayId.value = Display.DEFAULT_DISPLAY - } +@OptIn(ExperimentalCoroutinesApi::class) +class ShadeDisplaysRepositoryImpl +@Inject +constructor(defaultPolicy: ShadeDisplayPolicy, @Background bgScope: CoroutineScope) : + MutableShadeDisplaysRepository { + override val policy = MutableStateFlow<ShadeDisplayPolicy>(defaultPolicy) + + override val displayId: StateFlow<Int> = + policy + .flatMapLatest { it.displayId } + .stateIn(bgScope, SharingStarted.WhileSubscribed(), Display.DEFAULT_DISPLAY) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicy.kt b/packages/SystemUI/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicy.kt new file mode 100644 index 000000000000..3f6c949fcba6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/shade/display/AnyExternalShadeDisplayPolicy.kt @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.display + +import android.view.Display +import android.view.Display.DEFAULT_DISPLAY +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.display.data.repository.DisplayRepository +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn + +/** + * Returns an external display if one exists, otherwise the default display. + * + * If there are multiple external displays, the one with minimum display ID is returned. + */ +@SysUISingleton +class AnyExternalShadeDisplayPolicy +@Inject +constructor(displayRepository: DisplayRepository, @Background bgScope: CoroutineScope) : + ShadeDisplayPolicy { + override val name: String + get() = "any_external_display" + + override val displayId: StateFlow<Int> = + displayRepository.displays + .map { displays -> + displays + .filter { it.displayId != DEFAULT_DISPLAY && it.type in ALLOWED_DISPLAY_TYPES } + .minOfOrNull { it.displayId } ?: DEFAULT_DISPLAY + } + .stateIn(bgScope, SharingStarted.WhileSubscribed(), DEFAULT_DISPLAY) + + private companion object { + val ALLOWED_DISPLAY_TYPES = + setOf(Display.TYPE_EXTERNAL, Display.TYPE_OVERLAY, Display.TYPE_WIFI) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/shade/display/ShadeDisplayPolicy.kt b/packages/SystemUI/src/com/android/systemui/shade/display/ShadeDisplayPolicy.kt new file mode 100644 index 000000000000..1b22ee40009b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/shade/display/ShadeDisplayPolicy.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.display + +import dagger.Binds +import dagger.Module +import dagger.multibindings.IntoSet +import kotlinx.coroutines.flow.StateFlow + +/** Describes the display the shade should be shown in. */ +interface ShadeDisplayPolicy { + val name: String + + /** The display id the shade should be at, according to this policy. */ + val displayId: StateFlow<Int> +} + +@Module +interface ShadeDisplayPolicyModule { + @IntoSet + @Binds + fun provideDefaultPolicyToSet(impl: DefaultShadeDisplayPolicy): ShadeDisplayPolicy + + @IntoSet + @Binds + fun provideAnyExternalShadeDisplayPolicyToSet( + impl: AnyExternalShadeDisplayPolicy + ): ShadeDisplayPolicy + + @Binds fun provideDefaultPolicy(impl: DefaultShadeDisplayPolicy): ShadeDisplayPolicy +} diff --git a/packages/SystemUI/src/com/android/systemui/shade/display/SpecificDisplayIdPolicy.kt b/packages/SystemUI/src/com/android/systemui/shade/display/SpecificDisplayIdPolicy.kt new file mode 100644 index 000000000000..13e766409bab --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/shade/display/SpecificDisplayIdPolicy.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.display + +import android.view.Display +import javax.inject.Inject +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow + +/** Policy to specify a display id explicitly. */ +open class SpecificDisplayIdPolicy(displayId: Int) : ShadeDisplayPolicy { + override val name: String + get() = "display_${displayId}_policy" + + override val displayId: StateFlow<Int> = MutableStateFlow(displayId) +} + +class DefaultShadeDisplayPolicy @Inject constructor() : + SpecificDisplayIdPolicy(Display.DEFAULT_DISPLAY) diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt index 432d5f553fbb..fb2cbec84236 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt @@ -16,28 +16,21 @@ package com.android.systemui.shade.domain.interactor -import android.content.ComponentCallbacks import android.content.Context -import android.content.MutableContextWrapper -import android.content.res.Configuration -import android.content.res.Resources import android.util.Log import android.view.WindowManager -import android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE +import androidx.annotation.UiThread import com.android.app.tracing.coroutines.launchTraced import com.android.app.tracing.traceSection import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.display.data.repository.DisplayWindowPropertiesRepository -import com.android.systemui.display.shared.model.DisplayWindowProperties import com.android.systemui.scene.ui.view.WindowRootView import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.ShadeWindowLayoutParams import com.android.systemui.shade.data.repository.ShadeDisplaysRepository import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround -import com.android.systemui.statusbar.phone.ConfigurationForwarder import com.android.systemui.util.kotlin.getOrNull import java.util.Optional import javax.inject.Inject @@ -53,13 +46,14 @@ constructor( optionalShadeRootView: Optional<WindowRootView>, private val shadePositionRepository: ShadeDisplaysRepository, @ShadeDisplayAware private val shadeContext: Context, - @ShadeDisplayAware private val shadeResources: Resources, - private val displayWindowPropertiesRepository: DisplayWindowPropertiesRepository, + @ShadeDisplayAware private val wm: WindowManager, @Background private val bgScope: CoroutineScope, - @ShadeDisplayAware private val shadeConfigurationForwarder: ConfigurationForwarder, @Main private val mainThreadContext: CoroutineContext, ) : CoreStartable { + private val shadeLayoutParams: WindowManager.LayoutParams = + ShadeWindowLayoutParams.create(shadeContext) + private val shadeRootView = optionalShadeRootView.getOrNull() ?: error( @@ -69,9 +63,6 @@ constructor( """ .trimIndent() ) - // TODO: b/362719719 - Get rid of this callback as the root view should automatically get the - // correct configuration once it's moved to another window. - private var unregisterConfigChangedCallbacks: (() -> Unit)? = null override fun start() { ShadeWindowGoesAround.isUnexpectedlyInLegacyMode() @@ -94,7 +85,7 @@ constructor( return } try { - moveShadeWindow(fromId = currentId, toId = destinationId) + withContext(mainThreadContext) { moveShadeWindow(toId = destinationId) } } catch (e: IllegalStateException) { Log.e( TAG, @@ -104,68 +95,26 @@ constructor( } } - private suspend fun moveShadeWindow(fromId: Int, toId: Int) { - val (_, _, _, sourceWm) = getDisplayWindowProperties(fromId) - val (_, _, destContext, destWm) = getDisplayWindowProperties(toId) - withContext(mainThreadContext) { - traceSection({ "MovingShadeWindow from $fromId to $toId" }) { - removeShade(sourceWm) - addShade(destWm) - overrideContextAndResources(newContext = destContext) - registerConfigurationChange(destContext) - } - traceSection("ShadeDisplaysInteractor#onConfigurationChanged") { - dispatchConfigurationChanged(destContext.resources.configuration) - } - } - } - - private fun removeShade(wm: WindowManager): Unit = - traceSection("removeView") { wm.removeView(shadeRootView) } - - private fun addShade(wm: WindowManager): Unit = - traceSection("addView") { - wm.addView(shadeRootView, ShadeWindowLayoutParams.create(shadeContext)) + @UiThread + private fun moveShadeWindow(toId: Int) { + traceSection({ "moveShadeWindow to $toId" }) { + removeShadeWindow() + updateContextDisplay(toId) + addShadeWindow() } - - private fun overrideContextAndResources(newContext: Context) { - val contextWrapper = - shadeContext as? MutableContextWrapper - ?: error("Shade context is not a MutableContextWrapper!") - contextWrapper.baseContext = newContext - // Override needed in case someone is keeping a reference to the resources from the old - // context. - // TODO: b/362719719 - This shouldn't be needed, as resources should be updated when the - // window is moved to the new display automatically. - shadeResources.impl = shadeContext.resources.impl - } - - private fun dispatchConfigurationChanged(newConfig: Configuration) { - shadeConfigurationForwarder.onConfigurationChanged(newConfig) - shadeRootView.dispatchConfigurationChanged(newConfig) - shadeRootView.requestLayout() } - private fun registerConfigurationChange(context: Context) { - // we should keep only one at the time. - unregisterConfigChangedCallbacks?.invoke() - val callback = - object : ComponentCallbacks { - override fun onConfigurationChanged(newConfig: Configuration) { - dispatchConfigurationChanged(newConfig) - } + @UiThread + private fun removeShadeWindow(): Unit = + traceSection("removeShadeWindow") { wm.removeView(shadeRootView) } - override fun onLowMemory() {} - } - context.registerComponentCallbacks(callback) - unregisterConfigChangedCallbacks = { - context.unregisterComponentCallbacks(callback) - unregisterConfigChangedCallbacks = null - } - } + @UiThread + private fun addShadeWindow(): Unit = + traceSection("addShadeWindow") { wm.addView(shadeRootView, shadeLayoutParams) } - private fun getDisplayWindowProperties(displayId: Int): DisplayWindowProperties { - return displayWindowPropertiesRepository.get(displayId, TYPE_NOTIFICATION_SHADE) + @UiThread + private fun updateContextDisplay(newDisplayId: Int) { + traceSection("updateContextDisplay") { shadeContext.updateDisplay(newDisplayId) } } private companion object { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/StatusBarChipsModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/StatusBarChipsModule.kt index 8ce0dbf8e171..6db610bbc3a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/StatusBarChipsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/StatusBarChipsModule.kt @@ -21,7 +21,10 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory import com.android.systemui.statusbar.chips.notification.demo.ui.viewmodel.DemoNotifChipViewModel +import com.android.systemui.statusbar.chips.notification.domain.interactor.StatusBarNotificationChipsInteractor +import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips import dagger.Binds +import dagger.Lazy import dagger.Module import dagger.Provides import dagger.multibindings.ClassKey @@ -41,5 +44,19 @@ abstract class StatusBarChipsModule { fun provideChipsLogBuffer(factory: LogBufferFactory): LogBuffer { return factory.create("StatusBarChips", 200) } + + @Provides + @SysUISingleton + @IntoMap + @ClassKey(StatusBarNotificationChipsInteractor::class) + fun statusBarNotificationChipsInteractorAsCoreStartable( + interactorLazy: Lazy<StatusBarNotificationChipsInteractor> + ): CoreStartable { + return if (StatusBarNotifChips.isEnabled) { + interactorLazy.get() + } else { + CoreStartable.NOP + } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt new file mode 100644 index 000000000000..087b51032fcf --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.chips.notification.domain.interactor + +import com.android.systemui.activity.data.repository.ActivityManagerRepository +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.core.Logger +import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad +import com.android.systemui.statusbar.chips.StatusBarChipsLog +import com.android.systemui.statusbar.chips.notification.domain.model.NotificationChipModel +import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.map + +/** + * Interactor representing a single notification's status bar chip. + * + * [startingModel.key] dictates which notification this interactor corresponds to - all updates sent + * to this interactor via [setNotification] should only be for the notification with the same key. + * + * [StatusBarNotificationChipsInteractor] will collect all the individual instances of this + * interactor and send all the necessary information to the UI layer. + */ +@OptIn(ExperimentalCoroutinesApi::class) +class SingleNotificationChipInteractor +@AssistedInject +constructor( + @Assisted startingModel: ActiveNotificationModel, + private val activityManagerRepository: ActivityManagerRepository, + @StatusBarChipsLog private val logBuffer: LogBuffer, +) { + private val key = startingModel.key + private val logger = Logger(logBuffer, "Notif".pad()) + // [StatusBarChipLogTag] recommends a max tag length of 20, so [extraLogTag] should NOT be the + // top-level tag. It should instead be provided as the first string in each log message. + private val extraLogTag = "SingleChipInteractor[key=$key]" + + private val _notificationModel = MutableStateFlow(startingModel) + + /** + * Sets the new notification info corresponding to this interactor. The key on [model] *must* + * match the key on the original [startingModel], otherwise the update won't be processed. + */ + fun setNotification(model: ActiveNotificationModel) { + if (model.key != this.key) { + logger.w({ "$str1: received model for different key $str2" }) { + str1 = extraLogTag + str2 = model.key + } + return + } + _notificationModel.value = model + } + + private val uid: Flow<Int> = _notificationModel.map { it.uid } + + /** True if the application managing the notification is visible to the user. */ + private val isAppVisible: Flow<Boolean> = + uid.flatMapLatest { currentUid -> + activityManagerRepository.createIsAppVisibleFlow(currentUid, logger, extraLogTag) + } + + /** + * Emits this notification's status bar chip, or null if this notification shouldn't show a + * status bar chip. + */ + val notificationChip: Flow<NotificationChipModel?> = + combine(_notificationModel, isAppVisible) { notif, isAppVisible -> + if (isAppVisible) { + // If the app that posted this notification is visible, we want to hide the chip + // because information between the status bar chip and the app itself could be + // out-of-sync (like a timer that's slightly off) + null + } else { + notif.toNotificationChipModel() + } + } + + private fun ActiveNotificationModel.toNotificationChipModel(): NotificationChipModel? { + val statusBarChipIconView = this.statusBarChipIconView + if (statusBarChipIconView == null) { + logger.w({ "$str1: Can't show chip because status bar chip icon view is null" }) { + str1 = extraLogTag + } + return null + } + return NotificationChipModel(key, statusBarChipIconView) + } + + @AssistedFactory + fun interface Factory { + fun create(startingModel: ActiveNotificationModel): SingleNotificationChipInteractor + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractor.kt index 9e09671bc7bf..e8cb35b06999 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractor.kt @@ -17,16 +17,42 @@ package com.android.systemui.statusbar.chips.notification.domain.interactor import android.annotation.SuppressLint +import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.core.Logger +import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad +import com.android.systemui.statusbar.chips.StatusBarChipsLog +import com.android.systemui.statusbar.chips.notification.domain.model.NotificationChipModel import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips +import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor +import com.android.systemui.util.kotlin.pairwise import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf /** An interactor for the notification chips shown in the status bar. */ @SysUISingleton -class StatusBarNotificationChipsInteractor @Inject constructor() { +@OptIn(ExperimentalCoroutinesApi::class) +class StatusBarNotificationChipsInteractor +@Inject +constructor( + @Background private val backgroundScope: CoroutineScope, + private val activeNotificationsInteractor: ActiveNotificationsInteractor, + private val singleNotificationChipInteractorFactory: SingleNotificationChipInteractor.Factory, + @StatusBarChipsLog private val logBuffer: LogBuffer, +) : CoreStartable { + private val logger = Logger(logBuffer, "AllNotifs".pad()) // Each chip tap is an individual event, *not* a state, which is why we're using SharedFlow not // StateFlow. There shouldn't be multiple updates per frame, which should avoid performance @@ -45,4 +71,79 @@ class StatusBarNotificationChipsInteractor @Inject constructor() { StatusBarNotifChips.assertInNewMode() _promotedNotificationChipTapEvent.emit(key) } + + /** + * A cache of interactors. Each currently-promoted notification should have a corresponding + * interactor in this map. + */ + private val promotedNotificationInteractorMap = + mutableMapOf<String, SingleNotificationChipInteractor>() + + /** + * A list of interactors. Each currently-promoted notification should have a corresponding + * interactor in this list. + */ + private val promotedNotificationInteractors = + MutableStateFlow<List<SingleNotificationChipInteractor>>(emptyList()) + + override fun start() { + if (!StatusBarNotifChips.isEnabled) { + return + } + + backgroundScope.launch("StatusBarNotificationChipsInteractor") { + activeNotificationsInteractor.promotedOngoingNotifications + .pairwise(initialValue = emptyList()) + .collect { (oldNotifs, currentNotifs) -> + val removedNotifs = oldNotifs.minus(currentNotifs.toSet()) + removedNotifs.forEach { removedNotif -> + val wasRemoved = promotedNotificationInteractorMap.remove(removedNotif.key) + if (wasRemoved == null) { + logger.w({ + "Attempted to remove $str1 from interactor map but it wasn't present" + }) { + str1 = removedNotif.key + } + } + } + currentNotifs.forEach { notif -> + val interactor = + promotedNotificationInteractorMap.computeIfAbsent(notif.key) { + singleNotificationChipInteractorFactory.create(notif) + } + interactor.setNotification(notif) + } + logger.d({ "Interactors: $str1" }) { + str1 = + promotedNotificationInteractorMap.keys.joinToString(separator = " /// ") + } + promotedNotificationInteractors.value = + promotedNotificationInteractorMap.values.toList() + } + } + } + + /** + * A flow modeling the notifications that should be shown as chips in the status bar. Emits an + * empty list if there are no notifications that should show a status bar chip. + */ + val notificationChips: Flow<List<NotificationChipModel>> = + if (StatusBarNotifChips.isEnabled) { + // For all our current interactors... + promotedNotificationInteractors.flatMapLatest { interactors -> + if (interactors.isNotEmpty()) { + // Combine each interactor's [notificationChip] flow... + val allNotificationChips: List<Flow<NotificationChipModel?>> = + interactors.map { interactor -> interactor.notificationChip } + combine(allNotificationChips) { + // ... and emit just the non-null chips + it.filterNotNull() + } + } else { + flowOf(emptyList()) + } + } + } else { + flowOf(emptyList()) + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt new file mode 100644 index 000000000000..5698ee6d1917 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.chips.notification.domain.model + +import com.android.systemui.statusbar.StatusBarIconView + +/** Modeling all the data needed to render a status bar notification chip. */ +data class NotificationChipModel(val key: String, val statusBarChipIconView: StatusBarIconView) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt index 752674854e2d..9eff627c8714 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt @@ -20,11 +20,10 @@ import android.view.View import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.statusbar.chips.notification.domain.interactor.StatusBarNotificationChipsInteractor +import com.android.systemui.statusbar.chips.notification.domain.model.NotificationChipModel import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips import com.android.systemui.statusbar.chips.ui.model.ColorsModel import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor -import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow @@ -37,7 +36,6 @@ class NotifChipsViewModel @Inject constructor( @Application private val applicationScope: CoroutineScope, - activeNotificationsInteractor: ActiveNotificationsInteractor, private val notifChipsInteractor: StatusBarNotificationChipsInteractor, ) { /** @@ -45,19 +43,14 @@ constructor( * no notifications that should show a status bar chip. */ val chips: Flow<List<OngoingActivityChipModel.Shown>> = - activeNotificationsInteractor.promotedOngoingNotifications.map { notifications -> - notifications.mapNotNull { it.toChipModel() } + notifChipsInteractor.notificationChips.map { notifications -> + notifications.map { it.toActivityChipModel() } } - /** - * Converts the notification to the [OngoingActivityChipModel] object. Returns null if the - * notification has invalid data such that it can't be displayed as a chip. - */ - private fun ActiveNotificationModel.toChipModel(): OngoingActivityChipModel.Shown? { + /** Converts the notification to the [OngoingActivityChipModel] object. */ + private fun NotificationChipModel.toActivityChipModel(): OngoingActivityChipModel.Shown { StatusBarNotifChips.assertInNewMode() - // TODO(b/364653005): Log error if there's no icon view. - val rawIcon = this.statusBarChipIconView ?: return null - val icon = OngoingActivityChipModel.ChipIcon.StatusBarView(rawIcon) + val icon = OngoingActivityChipModel.ChipIcon.StatusBarView(this.statusBarChipIconView) // TODO(b/364653005): Use the notification color if applicable. val colors = ColorsModel.Themed val onClickListener = @@ -65,7 +58,9 @@ constructor( // The notification pipeline needs everything to run on the main thread, so keep // this event on the main thread. applicationScope.launch { - notifChipsInteractor.onPromotedNotificationChipTapped(this@toChipModel.key) + notifChipsInteractor.onPromotedNotificationChipTapped( + this@toActivityChipModel.key + ) } } return OngoingActivityChipModel.Shown.IconOnly(icon, colors, onClickListener) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 7fa6707eb99d..c6af3280eef1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -401,7 +401,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final KeyguardBypassController mKeyguardBypassController; private final KeyguardStateController mKeyguardStateController; private final HeadsUpManager mHeadsUpManager; - private final StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + private final ShadeTouchableRegionManager mShadeTouchableRegionManager; private final FalsingCollector mFalsingCollector; private final FalsingManager mFalsingManager; private final BroadcastDispatcher mBroadcastDispatcher; @@ -681,7 +681,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { KeyguardIndicationController keyguardIndicationController, DemoModeController demoModeController, Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy, - StatusBarTouchableRegionManager statusBarTouchableRegionManager, + ShadeTouchableRegionManager shadeTouchableRegionManager, BrightnessSliderController.Factory brightnessSliderFactory, ScreenOffAnimationController screenOffAnimationController, WallpaperController wallpaperController, @@ -724,7 +724,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mHeadsUpManager = headsUpManager; mBackActionInteractor = backActionInteractor; mKeyguardIndicationController = keyguardIndicationController; - mStatusBarTouchableRegionManager = statusBarTouchableRegionManager; + mShadeTouchableRegionManager = shadeTouchableRegionManager; mFalsingCollector = falsingCollector; mFalsingManager = falsingManager; mBroadcastDispatcher = broadcastDispatcher; @@ -1232,7 +1232,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mStatusBarInitializer.initializeStatusBar(); } - mStatusBarTouchableRegionManager.setup(getNotificationShadeWindowView()); + mShadeTouchableRegionManager.setup(getNotificationShadeWindowView()); if (!StatusBarConnectedDisplays.isEnabled()) { createNavigationBar(result); @@ -1856,10 +1856,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { pw.println(" mHeadsUpManager: null"); } - if (mStatusBarTouchableRegionManager != null) { - mStatusBarTouchableRegionManager.dump(pw, args); + if (mShadeTouchableRegionManager != null) { + mShadeTouchableRegionManager.dump(pw, args); } else { - pw.println(" mStatusBarTouchableRegionManager: null"); + pw.println(" mShadeTouchableRegionManager: null"); } if (mLightBarController != null) { @@ -2566,7 +2566,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { dismissVolumeDialog(); mWakeUpCoordinator.setFullyAwake(false); mKeyguardBypassController.onStartedGoingToSleep(); - mStatusBarTouchableRegionManager.updateTouchableRegion(); + mShadeTouchableRegionManager.updateTouchableRegion(); // The unlocked screen off and fold to aod animations might use our LightRevealScrim - // we need to be expanded for it to be visible. @@ -2655,7 +2655,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { // once we fully woke up. updateRevealEffect(true /* wakingUp */); updateNotificationPanelTouchState(); - mStatusBarTouchableRegionManager.updateTouchableRegion(); + mShadeTouchableRegionManager.updateTouchableRegion(); // If we are waking up during the screen off animation, we should undo making the // expanded visible (we did that so the LightRevealScrim would be visible). diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManager.java index c09b9c52bb53..bea8397fed62 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManager.java @@ -62,7 +62,7 @@ import javax.inject.Provider; * of HeadsUpNotifications. */ @SysUISingleton -public final class StatusBarTouchableRegionManager implements Dumpable { +public final class ShadeTouchableRegionManager implements Dumpable { private static final String TAG = "TouchableRegionManager"; private final Context mContext; @@ -90,7 +90,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { private final OnComputeInternalInsetsListener mOnComputeInternalInsetsListener; @Inject - public StatusBarTouchableRegionManager( + public ShadeTouchableRegionManager( Context context, NotificationShadeWindowController notificationShadeWindowController, ConfigurationController configurationController, @@ -165,7 +165,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { @Override public void dump(PrintWriter pw, String[] args) { - pw.println("StatusBarTouchableRegionManager state:"); + pw.println("ShadeTouchableRegionManager state:"); pw.print(" mTouchableRegion="); pw.println(mTouchableRegion); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt index ee8c1ae6c5f9..42b9d5b12afc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt @@ -207,5 +207,19 @@ interface StatusBarPhoneModule { singleDisplayLazy.get() } } + + @Provides + @SysUISingleton + @IntoMap + @ClassKey(AutoHideControllerStore::class) + fun storeAsCoreStartable( + multiDisplayLazy: Lazy<MultiDisplayAutoHideControllerStore> + ): CoreStartable { + return if (StatusBarConnectedDisplays.isEnabled) { + multiDisplayLazy.get() + } else { + CoreStartable.NOP + } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt index aac2cd1755d0..78926c78a368 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt @@ -25,6 +25,7 @@ import android.app.UidObserver import android.content.Context import android.view.View import androidx.annotation.VisibleForTesting +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.CoreStartable import com.android.systemui.Dumpable @@ -58,7 +59,6 @@ import java.io.PrintWriter import java.util.concurrent.Executor import javax.inject.Inject import kotlinx.coroutines.CoroutineScope -import com.android.app.tracing.coroutines.launchTraced as launch /** A controller to handle the ongoing call chip in the collapsed status bar. */ @SysUISingleton @@ -122,9 +122,9 @@ constructor( entry.sbn.uid, entry.sbn.notification.extras.getInt( Notification.EXTRA_CALL_TYPE, - -1 + -1, ) == CALL_TYPE_ONGOING, - statusBarSwipedAway = callNotificationInfo?.statusBarSwipedAway ?: false + statusBarSwipedAway = callNotificationInfo?.statusBarSwipedAway ?: false, ) if (newOngoingCallInfo == callNotificationInfo) { return @@ -236,7 +236,7 @@ constructor( bool1 = Flags.statusBarCallChipNotificationIcon() bool2 = currentInfo.notificationIconView != null }, - { "Creating OngoingCallModel.InCall. notifIconFlag=$bool1 hasIcon=$bool2" } + { "Creating OngoingCallModel.InCall. notifIconFlag=$bool1 hasIcon=$bool2" }, ) val icon = if (Flags.statusBarCallChipNotificationIcon()) { @@ -288,7 +288,7 @@ constructor( str1 = notifModel.callType.name bool1 = notifModel.statusBarChipIconView != null }, - { "NotifInteractorCallModel: key=$str1 when=$long1 callType=$str2 hasIcon=$bool1" } + { "NotifInteractorCallModel: key=$str1 when=$long1 callType=$str2 hasIcon=$bool1" }, ) val newOngoingCallInfo = @@ -299,7 +299,7 @@ constructor( notifModel.contentIntent, notifModel.uid, isOngoing = true, - statusBarSwipedAway = callNotificationInfo?.statusBarSwipedAway ?: false + statusBarSwipedAway = callNotificationInfo?.statusBarSwipedAway ?: false, ) if (newOngoingCallInfo == callNotificationInfo) { return @@ -378,7 +378,7 @@ constructor( ActivityTransitionAnimator.Controller.fromView( backgroundView, InteractionJankMonitor.CUJ_STATUS_BAR_APP_LAUNCH_FROM_CALL_CHIP, - ) + ), ) } } @@ -455,7 +455,7 @@ constructor( /** True if the call is currently ongoing (as opposed to incoming, screening, etc.). */ val isOngoing: Boolean, /** True if the user has swiped away the status bar while in this phone call. */ - val statusBarSwipedAway: Boolean + val statusBarSwipedAway: Boolean, ) { /** * Returns true if the notification information has a valid call start time. See @@ -472,6 +472,9 @@ constructor( /** * Observer to tell us when the app that posted the ongoing call notification is visible so that * we don't show the call chip at the same time (since the timers could be out-of-sync). + * + * For a more recommended architecture implementation, see + * [com.android.systemui.activity.data.repository.ActivityManagerRepository]. */ inner class CallAppUidObserver : UidObserver() { /** True if the application managing the call is visible to the user. */ @@ -512,7 +515,7 @@ constructor( uidObserver, ActivityManager.UID_OBSERVER_PROCSTATE, ActivityManager.PROCESS_STATE_UNKNOWN, - context.opPackageName + context.opPackageName, ) isRegistered = true } catch (se: SecurityException) { @@ -537,7 +540,7 @@ constructor( uid: Int, procState: Int, procStateSeq: Long, - capability: Int + capability: Int, ) { val currentCallAppUid = callAppUid ?: return if (uid != currentCallAppUid) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java index bf13ceb5666a..4bc5f2303ee8 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java @@ -45,6 +45,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; import android.provider.Settings; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; @@ -56,6 +58,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.keyguard.logging.CarrierTextManagerLogger; +import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.kosmos.KosmosJavaAdapter; @@ -200,6 +203,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testAirplaneMode() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); reset(mCarrierTextCallback); @@ -220,8 +224,32 @@ public class CarrierTextManagerTest extends SysuiTestCase { assertEquals(AIRPLANE_MODE_TEXT, captor.getValue().carrierText); } + @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testAirplaneMode_flagEnabled() { + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(0)).thenReturn( + TelephonyManager.SIM_STATE_READY); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + mCarrierTextManager.updateCarrierText(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertEquals(AIRPLANE_MODE_TEXT, captor.getValue().carrierText); + } + /** regression test for b/281706473, caused by sending NULL plmn / spn to the logger */ @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testAirplaneMode_noSim_nullPlmn_nullSpn_doesNotCrash() { // GIVEN - sticy broadcast that returns a null PLMN and null SPN Intent stickyIntent = new Intent(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED); @@ -263,7 +291,52 @@ public class CarrierTextManagerTest extends SysuiTestCase { // No assert, this test should not crash } + /** regression test for b/281706473, caused by sending NULL plmn / spn to the logger */ + @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testAirplaneMode_noSim_nullPlmn_nullSpn_doesNotCrash_flagEnabled() { + // GIVEN - sticy broadcast that returns a null PLMN and null SPN + Intent stickyIntent = new Intent(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED); + stickyIntent.putExtra(TelephonyManager.EXTRA_SHOW_PLMN, true); + stickyIntent.removeExtra(TelephonyManager.EXTRA_PLMN); + stickyIntent.putExtra(TelephonyManager.EXTRA_SHOW_SPN, true); + stickyIntent.removeExtra(TelephonyManager.EXTRA_SPN); + + mCarrierTextManager = new CarrierTextManager.Builder( + getContextSpyForStickyBroadcast(stickyIntent), + mContext.getResources(), + mWifiRepository, + mSatelliteViewModel, + mJavaAdapter, + mTelephonyManager, + mTelephonyListenerManager, + mWakefulnessLifecycle, + mMainExecutor, + mBgExecutor, + mKeyguardUpdateMonitor, + mLogger + ) + .setShowAirplaneMode(true) + .setShowMissingSim(true) + .build(); + + // GIVEN - airplane mode is off (causing CTM to fetch the sticky broadcast) + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(0)) + .thenReturn(TelephonyManager.SIM_STATE_NOT_READY); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + // WHEN CTM fetches the broadcast and attempts to log the result, no crash results + mCarrierTextManager.updateCarrierText(); + + // No assert, this test should not crash + } + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCardIOError() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -299,6 +372,44 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCardIOError_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(0)).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(1)).thenReturn( + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + mCarrierTextManager.mCallback.onSimStateChanged(3, 1, + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertEquals("TEST_CARRIER" + SEPARATOR + INVALID_CARD_TEXT, captor.getValue().carrierText); + // There's only one subscription in the list + assertEquals(1, captor.getValue().listOfCarriers.length); + assertEquals(TEST_CARRIER, captor.getValue().listOfCarriers[0]); + + // Now it becomes single SIM active mode. + reset(mCarrierTextCallback); + when(mTelephonyManager.getActiveModemCount()).thenReturn(1); + // Update carrier text. It should ignore error state of subId 3 in inactive slotId. + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertEquals("TEST_CARRIER", captor.getValue().carrierText); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testWrongSlots() { reset(mCarrierTextCallback); when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn( @@ -313,6 +424,22 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testWrongSlots_flagEnabled() { + reset(mCarrierTextCallback); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn( + new ArrayList<>()); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + // This should not produce an out of bounds error, even though there are no subscriptions + mCarrierTextManager.mCallback.onSimStateChanged(0, -3, + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + mCarrierTextManager.mCallback.onSimStateChanged(0, 3, TelephonyManager.SIM_STATE_READY); + verify(mCarrierTextCallback, never()).updateCarrierInfo(any()); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testMoreSlotsThanSubs() { reset(mCarrierTextCallback); when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn( @@ -335,6 +462,29 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testMoreSlotsThanSubs_flagEnabled() { + reset(mCarrierTextCallback); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn( + new ArrayList<>()); + + // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the + // same answer as KeyguardUpdateMonitor. Remove when this is addressed + when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn( + new ArrayList<>()); + + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + // This should not produce an out of bounds error, even though there are no subscriptions + mCarrierTextManager.mCallback.onSimStateChanged(0, 1, + TelephonyManager.SIM_STATE_CARD_IO_ERROR); + + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo( + any(CarrierTextManager.CarrierTextCallbackInfo.class)); + } + + @Test public void testCallback() { reset(mCarrierTextCallback); mCarrierTextManager.postToCallback(mCarrierTextCallbackInfo); @@ -360,6 +510,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCreateInfo_OneValidSubscription() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -385,6 +536,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCreateInfo_OneValidSubscription_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + CarrierTextManager.CarrierTextCallbackInfo info = captor.getValue(); + assertEquals(1, info.listOfCarriers.length); + assertEquals(TEST_CARRIER, info.listOfCarriers[0]); + assertEquals(1, info.subscriptionIds.length); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCreateInfo_OneValidSubscriptionWithRoaming() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -410,6 +588,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCreateInfo_OneValidSubscriptionWithRoaming_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION_ROAMING); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + CarrierTextManager.CarrierTextCallbackInfo info = captor.getValue(); + assertEquals(1, info.listOfCarriers.length); + assertTrue(info.listOfCarriers[0].toString().contains(TEST_CARRIER)); + assertEquals(1, info.subscriptionIds.length); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_noTextOnReadySimWhenNull() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -434,6 +639,32 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_noTextOnReadySimWhenNull_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION_NULL); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertTrue("Carrier text should be empty, instead it's " + captor.getValue().carrierText, + TextUtils.isEmpty(captor.getValue().carrierText)); + assertFalse("No SIM should be available", captor.getValue().anySimReady); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_noTextOnReadySimWhenNull_airplaneMode_wifiOn() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); reset(mCarrierTextCallback); @@ -472,6 +703,46 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_noTextOnReadySimWhenNull_airplaneMode_wifiOn_flagEnabled() { + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION_NULL); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + assertFalse(mWifiRepository.isWifiConnectedWithValidSsid()); + mWifiRepository.setWifiNetwork( + WifiNetworkModel.Active.Companion.of( + /* isValidated= */ false, + /* level= */ 0, + /* ssid= */ "", + /* hotspotDeviceType= */ WifiNetworkModel.HotspotDeviceType.NONE)); + assertTrue(mWifiRepository.isWifiConnectedWithValidSsid()); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + ServiceState ss = mock(ServiceState.class); + when(ss.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE); + mKeyguardUpdateMonitor.mServiceStates.put(TEST_SUBSCRIPTION_NULL.getSubscriptionId(), ss); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertFalse("No SIM should be available", captor.getValue().anySimReady); + // There's no airplane mode if at least one SIM is State.READY and there's wifi + assertFalse("Device should not be in airplane mode", captor.getValue().airplaneMode); + assertNotEquals(AIRPLANE_MODE_TEXT, captor.getValue().carrierText); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void carrierText_satelliteTextNull_isSatelliteFalse_textNotUsed() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -497,6 +768,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void carrierText_satelliteTextNull_isSatelliteFalse_textNotUsed_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + // WHEN the satellite text is null + mSatelliteViewModel.getCarrierText().setValue(null); + mTestScope.getTestScheduler().runCurrent(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + + // THEN satellite mode is false and the default subscription carrier text is used + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertThat(captor.getValue().isInSatelliteMode).isFalse(); + assertThat(captor.getValue().carrierText).isEqualTo(TEST_CARRIER); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void carrierText_hasSatelliteText_isSatelliteTrue_textUsed() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -522,6 +820,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void carrierText_hasSatelliteText_isSatelliteTrue_textUsed_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + // WHEN the satellite text is non-null + mSatelliteViewModel.getCarrierText().setValue("Satellite Test Text"); + mTestScope.getTestScheduler().runCurrent(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + + // THEN satellite mode is true and the satellite text is used + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertThat(captor.getValue().isInSatelliteMode).isTrue(); + assertThat(captor.getValue().carrierText).isEqualTo("Satellite Test Text"); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void carrierText_satelliteTextUpdates_autoTriggersCallback() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -559,6 +884,45 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void carrierText_satelliteTextUpdates_autoTriggersCallback_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + // WHEN the satellite text is set + mSatelliteViewModel.getCarrierText().setValue("Test satellite text"); + mTestScope.getTestScheduler().runCurrent(); + + // THEN we should automatically re-trigger #updateCarrierText and get callback info + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + // AND use the satellite text as the carrier text + assertThat(captor.getValue().isInSatelliteMode).isTrue(); + assertThat(captor.getValue().carrierText).isEqualTo("Test satellite text"); + + // WHEN the satellite text is reset to null + reset(mCarrierTextCallback); + mSatelliteViewModel.getCarrierText().setValue(null); + mTestScope.getTestScheduler().runCurrent(); + + // THEN we should automatically re-trigger #updateCarrierText and get callback info + // that doesn't include the satellite info + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertThat(captor.getValue().isInSatelliteMode).isFalse(); + assertThat(captor.getValue().carrierText).isEqualTo(TEST_CARRIER); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void carrierText_updatedWhileNotListening_getsNewValueWhenListening() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -602,6 +966,50 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void carrierText_updatedWhileNotListening_getsNewValueWhenListening_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + mSatelliteViewModel.getCarrierText().setValue("Old satellite text"); + mTestScope.getTestScheduler().runCurrent(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertThat(captor.getValue().carrierText).isEqualTo("Old satellite text"); + + // WHEN we stop listening + reset(mCarrierTextCallback); + mCarrierTextManager.setListening(null); + + // AND the satellite text updates + mSatelliteViewModel.getCarrierText().setValue("New satellite text"); + + // THEN we don't get new callback info because we aren't listening + verify(mCarrierTextCallback, never()).updateCarrierInfo(any()); + + // WHEN we start listening again + reset(mCarrierTextCallback); + mCarrierTextManager.setListening(mCarrierTextCallback); + + // THEN we should automatically re-trigger #updateCarrierText and get callback info + // that includes the new satellite state and text + mTestScope.getTestScheduler().runCurrent(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + assertThat(captor.getValue().isInSatelliteMode).isTrue(); + assertThat(captor.getValue().carrierText).isEqualTo("New satellite text"); + } + + @Test public void testCreateInfo_noSubscriptions() { reset(mCarrierTextCallback); when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn( @@ -622,6 +1030,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_oneValidSubscription() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -644,6 +1053,30 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_oneValidSubscription_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertThat(captor.getValue().carrierText).isEqualTo(TEST_CARRIER); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_twoValidSubscriptions() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -668,6 +1101,32 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_twoValidSubscriptions_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())).thenReturn( + TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertEquals(TEST_CARRIER + SEPARATOR + TEST_CARRIER, + captor.getValue().carrierText); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_oneDisabledSub() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -693,6 +1152,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_oneDisabledSub_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + .thenReturn(TelephonyManager.SIM_STATE_NOT_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertEquals(TEST_CARRIER, + captor.getValue().carrierText); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_firstDisabledSub() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -718,6 +1204,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_firstDisabledSub_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())) + .thenReturn(TelephonyManager.SIM_STATE_NOT_READY) + .thenReturn(TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertEquals(TEST_CARRIER, + captor.getValue().carrierText); + } + + @Test + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) public void testCarrierText_threeSubsMiddleDisabled() { reset(mCarrierTextCallback); List<SubscriptionInfo> list = new ArrayList<>(); @@ -744,6 +1257,33 @@ public class CarrierTextManagerTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testCarrierText_threeSubsMiddleDisabled_flagEnabled() { + reset(mCarrierTextCallback); + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + list.add(TEST_SUBSCRIPTION); + list.add(TEST_SUBSCRIPTION); + when(mKeyguardUpdateMonitor.getSimStateForSlotId(anyInt())) + .thenReturn(TelephonyManager.SIM_STATE_READY) + .thenReturn(TelephonyManager.SIM_STATE_NOT_READY) + .thenReturn(TelephonyManager.SIM_STATE_READY); + when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list); + mKeyguardUpdateMonitor.mServiceStates = new HashMap<>(); + + ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor = + ArgumentCaptor.forClass( + CarrierTextManager.CarrierTextCallbackInfo.class); + + mCarrierTextManager.updateCarrierText(); + FakeExecutor.exhaustExecutors(mMainExecutor, mBgExecutor); + verify(mCarrierTextCallback).updateCarrierInfo(captor.capture()); + + assertEquals(TEST_CARRIER + SEPARATOR + TEST_CARRIER, + captor.getValue().carrierText); + } + + @Test public void testGetStatusForIccState() { when(mKeyguardUpdateMonitor.isDeviceProvisioned()).thenReturn(false); assertEquals(CarrierTextManager.StatusMode.SimMissingLocked, diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index a39ca5de787d..839a2bdf5588 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -103,6 +103,7 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.FlagsParameterization; import android.service.dreams.IDreamManager; @@ -200,8 +201,9 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { private static final String TEST_CARRIER_2 = "TEST_CARRIER_2"; private static final int TEST_CARRIER_ID = 1; private static final String TEST_GROUP_UUID = "59b5c870-fc4c-47a4-a99e-9db826b48b24"; - private static final SubscriptionInfo TEST_SUBSCRIPTION = new SubscriptionInfo(1, "", 0, - TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "", + private static final int TEST_SLOT_ID = 3; + private static final SubscriptionInfo TEST_SUBSCRIPTION = new SubscriptionInfo(1, "", + TEST_SLOT_ID, TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "", DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", false, TEST_GROUP_UUID, TEST_CARRIER_ID, 0); private static final SubscriptionInfo TEST_SUBSCRIPTION_2 = new SubscriptionInfo(2, "", 0, @@ -483,7 +485,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test - public void testSimStateInitialized() { + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testSimStateInitialized_flagDisabled() { cleanupKeyguardUpdateMonitor(); final int subId = 3; final int state = TelephonyManager.SIM_STATE_ABSENT; @@ -500,6 +503,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testSimStateInitialized_flagEnabled() { + cleanupKeyguardUpdateMonitor(); + final int state = TelephonyManager.SIM_STATE_ABSENT; + final int slotId = 0; + final int subId = 3; + when(mTelephonyManager.getActiveModemCount()).thenReturn(1); + when(mTelephonyManager.getSimState(anyInt())).thenReturn(state); + when(mSubscriptionManager.getSubscriptionIds(anyInt())).thenReturn(new int[]{subId}); + + KeyguardUpdateMonitor testKUM = new TestableKeyguardUpdateMonitor(mContext); + + mTestableLooper.processAllMessages(); + + assertThat(testKUM.getSimStateForSlotId(slotId)).isEqualTo(state); + } + + @Test public void testIgnoresSimStateCallback_rebroadcast() { Intent intent = defaultSimStateChangedIntent(); @@ -1240,7 +1261,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test - public void testActiveSubscriptionBecomesInactive() { + @DisableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testActiveSubscriptionBecomesInactive_flagDisabled() { List<SubscriptionInfo> list = new ArrayList<>(); list.add(TEST_SUBSCRIPTION); when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(list); @@ -1263,6 +1285,28 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + @EnableFlags(Flags.FLAG_SIM_PIN_USE_SLOT_ID) + public void testActiveSubscriptionBecomesInactive_flagEnabled() { + List<SubscriptionInfo> list = new ArrayList<>(); + list.add(TEST_SUBSCRIPTION); + when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(list); + mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged( + TEST_SUBSCRIPTION.getSubscriptionId()); + mTestableLooper.processAllMessages(); + assertThat(mKeyguardUpdateMonitor.mSimDatasBySlotId.get(TEST_SLOT_ID)) + .isNotNull(); + + when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()) + .thenReturn(new ArrayList<>()); + mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged( + SubscriptionManager.INVALID_SUBSCRIPTION_ID); + mTestableLooper.processAllMessages(); + + assertThat(mKeyguardUpdateMonitor.mSimDatasBySlotId.get(TEST_SLOT_ID)) + .isNull(); + } + + @Test public void testActiveSubscriptionList_filtersProvisioningNetworks() { List<SubscriptionInfo> list = new ArrayList<>(); list.add(TEST_SUBSCRIPTION_PROVISIONING); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index f41d5c8eeb23..8552e48a2024 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -63,8 +63,6 @@ import android.graphics.Rect; import android.os.Handler; import android.os.RemoteException; import android.os.SystemClock; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; import android.provider.Settings; import android.testing.TestableLooper; import android.testing.TestableResources; @@ -90,7 +88,6 @@ import androidx.test.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; -import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.AnimatorTestRule; import com.android.systemui.kosmos.KosmosJavaAdapter; @@ -612,46 +609,6 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { .isEqualTo(expectedRatio); } - @DisableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) - @Test - public void onScreenSizeAndDensityChanged_enabled_restoreSavedMagnifierWindow() { - int newSmallestScreenWidthDp = - mContext.getResources().getConfiguration().smallestScreenWidthDp * 2; - int windowFrameSize = mResources.getDimensionPixelSize( - com.android.internal.R.dimen.accessibility_window_magnifier_min_size); - Size preferredWindowSize = new Size(windowFrameSize, windowFrameSize); - mSharedPreferences - .edit() - .putString(String.valueOf(newSmallestScreenWidthDp), - preferredWindowSize.toString()) - .commit(); - mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.updateWindowMagnificationInternal(Float.NaN, Float.NaN, - Float.NaN); - }); - - // Screen density and size change - mContext.getResources().getConfiguration().smallestScreenWidthDp = newSmallestScreenWidthDp; - final Rect testWindowBounds = new Rect( - mWindowManager.getCurrentWindowMetrics().getBounds()); - testWindowBounds.set(testWindowBounds.left, testWindowBounds.top, - testWindowBounds.right + 100, testWindowBounds.bottom + 100); - mWindowManager.setWindowBounds(testWindowBounds); - mInstrumentation.runOnMainSync(() -> { - mWindowMagnificationController.onConfigurationChanged(ActivityInfo.CONFIG_SCREEN_SIZE); - }); - - // wait for rect update - waitForIdleSync(); - ViewGroup.LayoutParams params = mSurfaceControlViewHost.getView().getLayoutParams(); - final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( - R.dimen.magnification_mirror_surface_margin); - // The width and height of the view include the magnification frame and the margins. - assertThat(params.width).isEqualTo(windowFrameSize + 2 * mirrorSurfaceMargin); - assertThat(params.height).isEqualTo(windowFrameSize + 2 * mirrorSurfaceMargin); - } - - @EnableFlags(Flags.FLAG_SAVE_AND_RESTORE_MAGNIFICATION_SETTINGS_BUTTONS) @Test public void onScreenSizeAndDensityChanged_enabled_restoreSavedMagnifierIndexAndWindow() { int newSmallestScreenWidthDp = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/animation/back/FlingOnBackAnimationCallbackTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/back/FlingOnBackAnimationCallbackTest.kt index 75a5768193cf..75a5768193cf 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/animation/back/FlingOnBackAnimationCallbackTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/back/FlingOnBackAnimationCallbackTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/udfps/SinglePointerTouchProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/udfps/SinglePointerTouchProcessorTest.kt index a4653e736745..77db97710174 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/udfps/SinglePointerTouchProcessorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/udfps/SinglePointerTouchProcessorTest.kt @@ -29,7 +29,6 @@ import com.google.common.truth.Truth.assertThat import org.junit.Test import platform.test.runner.parameterized.ParameterizedAndroidJunit4 import platform.test.runner.parameterized.Parameters -import platform.test.runner.parameterized.Parameter import org.junit.runner.RunWith @SmallTest diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt index 2a6d29c61890..2a6d29c61890 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadEduInteractorTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/education/domain/ui/view/ContextualEduDialogTest.kt index 90727b240caf..90727b240caf 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduDialogTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/education/domain/ui/view/ContextualEduDialogTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt index 32fa160fc29f..32fa160fc29f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt index 859f84edda39..e7fb470cfa76 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt @@ -33,6 +33,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.test.filters.SmallTest import com.android.compose.animation.scene.SceneKey import com.android.systemui.Flags +import com.android.systemui.Flags.FLAG_COMMUNAL_HUB_ON_MOBILE import com.android.systemui.Flags.FLAG_HUBMODE_FULLSCREEN_VERTICAL_SWIPE_FIX import com.android.systemui.SysuiTestCase import com.android.systemui.ambient.touch.TouchHandler @@ -630,6 +631,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { } } + @DisableFlags(FLAG_COMMUNAL_HUB_ON_MOBILE) @Test fun onTouchEvent_shadeInteracting_movesNotDispatched() = with(kosmos) { @@ -686,6 +688,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { } } + @DisableFlags(FLAG_COMMUNAL_HUB_ON_MOBILE) @Test fun onTouchEvent_bouncerInteracting_movesNotDispatched() = with(kosmos) { @@ -718,6 +721,19 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { } } + @EnableFlags(FLAG_COMMUNAL_HUB_ON_MOBILE) + @Test + fun onTouchEvent_onLockscreenAndGlanceableHubV2_touchIgnored() = + with(kosmos) { + testScope.runTest { + // On lockscreen. + goToScene(CommunalScenes.Blank) + + assertThat(underTest.onTouchEvent(DOWN_EVENT)).isFalse() + verify(containerView, never()).onTouchEvent(DOWN_EVENT) + } + } + @Test fun disposeView_destroysTouchMonitor() { clearInvocations(touchMonitor) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 041d1a611b55..041d1a611b55 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index 8b4c3355443c..6912eda3c3d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -334,7 +334,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { @Mock private CentralSurfacesCommandQueueCallbacks mCentralSurfacesCommandQueueCallbacks; @Mock private PluginManager mPluginManager; @Mock private ViewMediatorCallback mViewMediatorCallback; - @Mock private StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; + @Mock private ShadeTouchableRegionManager mShadeTouchableRegionManager; @Mock private PluginDependencyProvider mPluginDependencyProvider; @Mock private ExtensionController mExtensionController; @Mock private UserInfoControllerImpl mUserInfoControllerImpl; @@ -617,7 +617,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mKeyguardIndicationController, mDemoModeController, mNotificationShadeDepthControllerLazy, - mStatusBarTouchableRegionManager, + mShadeTouchableRegionManager, mBrightnessSliderFactory, mScreenOffAnimationController, mWallpaperController, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt index 3d7603368ebc..3d7603368ebc 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java index 564dca095d7a..3247a1ab6eb0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java @@ -354,8 +354,8 @@ public class DeviceStateRotationLockSettingControllerTest extends SysuiTestCase } private static DeviceState createDeviceState(int identifier, @NonNull String name, - @NonNull Set<Integer> systemProperties, - @NonNull Set<Integer> physicalProperties) { + @NonNull Set<@DeviceState.SystemDeviceStateProperties Integer> systemProperties, + @NonNull Set<@DeviceState.PhysicalDeviceStateProperties Integer> physicalProperties) { DeviceState.Configuration deviceStateConfiguration = new DeviceState.Configuration.Builder( identifier, name).setSystemProperties(systemProperties).setPhysicalProperties( physicalProperties).build(); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt index 1184a76d54ff..1184a76d54ff 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MotionEventHelper.java b/packages/SystemUI/tests/utils/src/com/android/systemui/accessibility/MotionEventHelper.java index 550e77d63c3b..550e77d63c3b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MotionEventHelper.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/accessibility/MotionEventHelper.java diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/TestableWindowManager.java b/packages/SystemUI/tests/utils/src/com/android/systemui/accessibility/TestableWindowManager.java index 859517839388..859517839388 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/TestableWindowManager.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/accessibility/TestableWindowManager.java diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryKosmos.kt new file mode 100644 index 000000000000..a6e71333c816 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/activity/data/repository/ActivityManagerRepositoryKosmos.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.activity.data.repository + +import android.app.activityManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.log.core.Logger +import kotlinx.coroutines.flow.MutableStateFlow + +val Kosmos.activityManagerRepository by Kosmos.Fixture { FakeActivityManagerRepository() } + +val Kosmos.realActivityManagerRepository by + Kosmos.Fixture { ActivityManagerRepositoryImpl(testDispatcher, activityManager) } + +class FakeActivityManagerRepository : ActivityManagerRepository { + private val uidFlows = mutableMapOf<Int, MutableList<MutableStateFlow<Boolean>>>() + + var startingIsAppVisibleValue = false + + override fun createIsAppVisibleFlow( + creationUid: Int, + logger: Logger, + identifyingLogTag: String, + ): MutableStateFlow<Boolean> { + val newFlow = MutableStateFlow(startingIsAppVisibleValue) + uidFlows.computeIfAbsent(creationUid) { mutableListOf() }.add(newFlow) + return newFlow + } + + fun setIsAppVisible(uid: Int, isAppVisible: Boolean) { + uidFlows[uid]?.forEach { stateFlow -> stateFlow.value = isAppVisible } + } +} + +val ActivityManagerRepository.fake + get() = this as FakeActivityManagerRepository diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/display/data/repository/FakeDisplayRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/display/data/repository/FakeDisplayRepository.kt index 78ea70086605..ddcc92691f5b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/display/data/repository/FakeDisplayRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/display/data/repository/FakeDisplayRepository.kt @@ -57,6 +57,10 @@ class FakeDisplayRepository @Inject constructor() : DisplayRepository { addDisplay(display(type, id = displayId)) } + suspend fun addDisplays(vararg displays: Display) { + displays.forEach { addDisplay(it) } + } + suspend fun addDisplay(display: Display) { flow.value += display displayAdditionEventFlow.emit(display) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeServiceFake.java b/packages/SystemUI/tests/utils/src/com/android/systemui/doze/DozeServiceFake.java index f55c2b77ca0f..f55c2b77ca0f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeServiceFake.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/doze/DozeServiceFake.java diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt index 548b5646f5d4..548b5646f5d4 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractorKosmos.kt index 007d2297e387..f88ed07046ab 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardEnabledInteractorKosmos.kt @@ -16,18 +16,24 @@ package com.android.systemui.keyguard.domain.interactor +import com.android.internal.widget.lockPatternUtils import com.android.systemui.keyguard.data.repository.biometricSettingsRepository import com.android.systemui.keyguard.data.repository.keyguardRepository import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.user.domain.interactor.selectedUserInteractor val Kosmos.keyguardEnabledInteractor by Kosmos.Fixture { KeyguardEnabledInteractor( applicationCoroutineScope, + testDispatcher, keyguardRepository, biometricSettingsRepository, - keyguardDismissTransitionInteractor, + selectedUserInteractor, + lockPatternUtils, + { keyguardDismissTransitionInteractor }, internalTransitionInteractor = internalKeyguardTransitionInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorKosmos.kt index 39236c7c9fae..2423949cdacc 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorKosmos.kt @@ -24,5 +24,6 @@ val Kosmos.keyguardLockWhileAwakeInteractor by KeyguardLockWhileAwakeInteractor( biometricSettingsRepository = biometricSettingsRepository, keyguardEnabledInteractor = keyguardEnabledInteractor, + keyguardServiceLockNowInteractor = keyguardServiceLockNowInteractor, ) } diff --git a/ravenwood/junit-stub-src/android/platform/test/ravenwood/RavenwoodConfigState.java b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt index 7d3d8b9f7974..29335c590a75 100644 --- a/ravenwood/junit-stub-src/android/platform/test/ravenwood/RavenwoodConfigState.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.platform.test.ravenwood; -/** Stub class. The actual implementation is in junit-impl-src. */ -public class RavenwoodConfigState { - public RavenwoodConfigState(RavenwoodConfig config) { - } -} +package com.android.systemui.keyguard.domain.interactor + +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope + +val Kosmos.keyguardServiceLockNowInteractor by + Kosmos.Fixture { KeyguardServiceLockNowInteractor(backgroundScope = testScope) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt index 63e168d018bf..4aa132c1d3af 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt @@ -41,5 +41,7 @@ val Kosmos.keyguardWakeDirectlyToGoneInteractor by lockPatternUtils, fakeSettings, selectedUserInteractor, + keyguardEnabledInteractor, + keyguardServiceLockNowInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt new file mode 100644 index 000000000000..dbaa0b1d5bf6 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.data.repository + +import android.view.Display +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.shade.display.ShadeDisplayPolicy +import com.android.systemui.shade.display.SpecificDisplayIdPolicy + +val Kosmos.defaultShadeDisplayPolicy: ShadeDisplayPolicy by + Kosmos.Fixture { SpecificDisplayIdPolicy(Display.DEFAULT_DISPLAY) } + +val Kosmos.shadeDisplaysRepository: MutableShadeDisplaysRepository by + Kosmos.Fixture { + ShadeDisplaysRepositoryImpl( + defaultPolicy = defaultShadeDisplayPolicy, + bgScope = testScope.backgroundScope, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorFactoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorFactoryKosmos.kt new file mode 100644 index 000000000000..1c095e11dffa --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorFactoryKosmos.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.chips.notification.domain.interactor + +import com.android.systemui.activity.data.repository.activityManagerRepository +import com.android.systemui.activity.data.repository.fake +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.statusbar.chips.statusBarChipsLogger + +val Kosmos.singleNotificationChipInteractorFactory: SingleNotificationChipInteractor.Factory by + Kosmos.Fixture { + SingleNotificationChipInteractor.Factory { startingModel -> + SingleNotificationChipInteractor( + startingModel, + activityManagerRepository.fake, + logBuffer = statusBarChipsLogger, + ) + } + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorKosmos.kt index 74c7611a6392..03e9f3d52ca3 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorKosmos.kt @@ -17,6 +17,16 @@ package com.android.systemui.statusbar.chips.notification.domain.interactor import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.statusbar.chips.statusBarChipsLogger +import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor val Kosmos.statusBarNotificationChipsInteractor: StatusBarNotificationChipsInteractor by - Kosmos.Fixture { StatusBarNotificationChipsInteractor() } + Kosmos.Fixture { + StatusBarNotificationChipsInteractor( + testScope.backgroundScope, + activeNotificationsInteractor, + singleNotificationChipInteractorFactory, + logBuffer = statusBarChipsLogger, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelKosmos.kt index 68b28adb4b3a..4bcce8601d64 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelKosmos.kt @@ -19,13 +19,8 @@ package com.android.systemui.statusbar.chips.notification.ui.viewmodel import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor -import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor val Kosmos.notifChipsViewModel: NotifChipsViewModel by Kosmos.Fixture { - NotifChipsViewModel( - applicationCoroutineScope, - activeNotificationsInteractor, - statusBarNotificationChipsInteractor, - ) + NotifChipsViewModel(applicationCoroutineScope, statusBarNotificationChipsInteractor) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManagerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManagerKosmos.kt index 6eb6fe87b6c1..5b7f23b0cff2 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManagerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ShadeTouchableRegionManagerKosmos.kt @@ -30,9 +30,9 @@ import com.android.systemui.statusbar.policy.configurationController import com.android.systemui.util.kotlin.JavaAdapter import com.android.systemui.util.mockito.mock -var Kosmos.statusBarTouchableRegionManager by +var Kosmos.shadeTouchableRegionManager by Kosmos.Fixture { - StatusBarTouchableRegionManager( + ShadeTouchableRegionManager( applicationContext, notificationShadeWindowController, configurationController, diff --git a/packages/Vcn/service-b/Android.bp b/packages/Vcn/service-b/Android.bp index a462297c07af..03ef4e67af1c 100644 --- a/packages/Vcn/service-b/Android.bp +++ b/packages/Vcn/service-b/Android.bp @@ -19,6 +19,19 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +filegroup { + name: "vcn-location-sources", + srcs: select(release_flag("RELEASE_MOVE_VCN_TO_MAINLINE"), { + true: [ + "vcn-location-flag/module/com/android/server/vcn/VcnLocation.java", + ], + default: [ + "vcn-location-flag/platform/com/android/server/vcn/VcnLocation.java", + ], + }), + visibility: ["//frameworks/base/services/core"], +} + java_library { name: "service-connectivity-b-pre-jarjar", sdk_version: "system_server_current", diff --git a/packages/Vcn/service-b/vcn-location-flag/module/com/android/server/vcn/VcnLocation.java b/packages/Vcn/service-b/vcn-location-flag/module/com/android/server/vcn/VcnLocation.java new file mode 100644 index 000000000000..6c7d24db8bac --- /dev/null +++ b/packages/Vcn/service-b/vcn-location-flag/module/com/android/server/vcn/VcnLocation.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.vcn; + +/** + * Class to represent that VCN is in a mainline module + * + * <p>This class is used to check whether VCN is in the non-updatable platform or in a mainline + * module. + */ +// When VCN is in a mainline module, this class (module/com/android/server/vcn/VcnLocation.java) +// will be built in to the vcn-location-sources filegroup. When VCN is in the non-updatable +// platform, platform/com/android/server/vcn/VcnLocation.java will be built in to the filegroup +public class VcnLocation { + /** Indicate that VCN is the platform */ + public static final boolean IS_VCN_IN_MAINLINE = true; +} diff --git a/packages/Vcn/service-b/vcn-location-flag/platform/com/android/server/vcn/VcnLocation.java b/packages/Vcn/service-b/vcn-location-flag/platform/com/android/server/vcn/VcnLocation.java new file mode 100644 index 000000000000..c6c82a55de0f --- /dev/null +++ b/packages/Vcn/service-b/vcn-location-flag/platform/com/android/server/vcn/VcnLocation.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.vcn; + +/** + * Class to represent that VCN is in the platform + * + * <p>This class is used to check whether VCN is in the non-updatable platform or in a mainline + * module. + */ +// When VCN is in a mainline module, module/com/android/server/vcn/VcnLocation.java +// will be built in to the vcn-location-sources filegroup. When VCN is in the non-updatable +// platform, this class (platform/com/android/server/vcn/VcnLocation.java) will be built in to the +// filegroup +public class VcnLocation { + /** Indicate that VCN is the platform */ + public static final boolean IS_VCN_IN_MAINLINE = false; +} diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java index 9b71f8050c80..de3c5f2c23ab 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java @@ -133,9 +133,6 @@ public final class RavenwoodAwareTestRunner extends RavenwoodAwareTestRunnerBase Log.v(TAG, "RavenwoodAwareTestRunner starting for " + testClass.getCanonicalName()); - // This is needed to make AndroidJUnit4ClassRunner happy. - InstrumentationRegistry.registerInstance(null, Bundle.EMPTY); - // Hook point to allow more customization. runAnnotatedMethodsOnRavenwood(RavenwoodTestRunnerInitializing.class, null); diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodConfigState.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodConfigState.java deleted file mode 100644 index 870a10a1f57e..000000000000 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodConfigState.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.platform.test.ravenwood; - -import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_EMPTY_RESOURCES_APK; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import android.annotation.Nullable; -import android.app.ResourcesManager; -import android.content.res.Resources; -import android.view.DisplayAdjustments; - -import java.io.File; -import java.util.HashMap; - -/** - * Used to store various states associated with {@link RavenwoodConfig} that's inly needed - * in junit-impl. - * - * We don't want to put it in junit-src to avoid having to recompile all the downstream - * dependencies after changing this class. - * - * All members must be called from the runner's main thread. - */ -public class RavenwoodConfigState { - private static final String TAG = "RavenwoodConfigState"; - - private final RavenwoodConfig mConfig; - - // TODO: Move the other contexts from RavenwoodConfig to here too? They're used by - // RavenwoodRule too, but RavenwoodRule can probably use InstrumentationRegistry? - RavenwoodContext mSystemServerContext; - - public RavenwoodConfigState(RavenwoodConfig config) { - mConfig = config; - } - - /** Map from path -> resources. */ - private final HashMap<File, Resources> mCachedResources = new HashMap<>(); - - /** - * Load {@link Resources} from an APK, with cache. - */ - public Resources loadResources(@Nullable File apkPath) { - var cached = mCachedResources.get(apkPath); - if (cached != null) { - return cached; - } - - var fileToLoad = apkPath != null ? apkPath : new File(RAVENWOOD_EMPTY_RESOURCES_APK); - - assertTrue("File " + fileToLoad + " doesn't exist.", fileToLoad.isFile()); - - final String path = fileToLoad.getAbsolutePath(); - final var emptyPaths = new String[0]; - - ResourcesManager.getInstance().initializeApplicationPaths(path, emptyPaths); - - final var ret = ResourcesManager.getInstance().getResources(null, path, - emptyPaths, emptyPaths, emptyPaths, - emptyPaths, null, null, - new DisplayAdjustments().getCompatibilityInfo(), - RavenwoodRuntimeEnvironmentController.class.getClassLoader(), null); - - assertNotNull(ret); - - mCachedResources.put(apkPath, ret); - return ret; - } -} diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java index ec00e8fea887..6dfcf4ce03cf 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java @@ -15,24 +15,23 @@ */ package android.platform.test.ravenwood; -import static com.android.ravenwood.common.RavenwoodCommonUtils.ensureIsPublicMember; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import android.annotation.Nullable; import android.util.Log; +import android.util.Pair; -import com.android.ravenwood.common.RavenwoodRuntimeException; +import com.android.ravenwood.RavenwoodRuntimeNative; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.rules.TestRule; import org.junit.runner.Description; -import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; /** - * Used to store various states associated with the current test runner that's inly needed + * Used to store various states associated with the current test runner that's only needed * in junit-impl. * * We don't want to put it in junit-src to avoid having to recompile all the downstream @@ -42,6 +41,11 @@ import java.lang.reflect.Field; */ public final class RavenwoodRunnerState { private static final String TAG = "RavenwoodRunnerState"; + private static final String RAVENWOOD_RULE_ERROR = + "RavenwoodRule(s) are not executed in the correct order"; + + private static final List<Pair<RavenwoodRule, RavenwoodPropertyState>> sActiveProperties = + new ArrayList<>(); private final RavenwoodAwareTestRunner mRunner; @@ -52,207 +56,95 @@ public final class RavenwoodRunnerState { mRunner = runner; } - /** - * The RavenwoodConfig used to configure the current Ravenwood environment. - * This can either come from mConfig or mRule. - */ - private RavenwoodConfig mCurrentConfig; - /** - * The RavenwoodConfig declared in the test class - */ - private RavenwoodConfig mConfig; - /** - * The RavenwoodRule currently in effect, declared in the test class - */ - private RavenwoodRule mRule; - private boolean mHasRavenwoodRule; private Description mMethodDescription; - public RavenwoodConfig getConfig() { - return mCurrentConfig; - } - public void enterTestRunner() { Log.i(TAG, "enterTestRunner: " + mRunner); - - mHasRavenwoodRule = hasRavenwoodRule(mRunner.mTestJavaClass); - mConfig = extractConfiguration(mRunner.mTestJavaClass); - - if (mConfig != null) { - if (mHasRavenwoodRule) { - fail("RavenwoodConfig and RavenwoodRule cannot be used in the same class." - + " Suggest migrating to RavenwoodConfig."); - } - mCurrentConfig = mConfig; - } else if (!mHasRavenwoodRule) { - // If no RavenwoodConfig and no RavenwoodRule, use a default config - mCurrentConfig = new RavenwoodConfig.Builder().build(); - } - - if (mCurrentConfig != null) { - RavenwoodRuntimeEnvironmentController.init(mRunner); - } + RavenwoodRuntimeEnvironmentController.initForRunner(); } public void enterTestClass() { Log.i(TAG, "enterTestClass: " + mRunner.mTestJavaClass.getName()); - - if (mCurrentConfig != null) { - RavenwoodRuntimeEnvironmentController.init(mRunner); - } } public void exitTestClass() { Log.i(TAG, "exitTestClass: " + mRunner.mTestJavaClass.getName()); - try { - if (mCurrentConfig != null) { - RavenwoodRuntimeEnvironmentController.reset(); - } - } finally { - mConfig = null; - mRule = null; - } + assertTrue(RAVENWOOD_RULE_ERROR, sActiveProperties.isEmpty()); + RavenwoodRuntimeEnvironmentController.exitTestClass(); } public void enterTestMethod(Description description) { mMethodDescription = description; + RavenwoodRuntimeEnvironmentController.initForMethod(); } public void exitTestMethod() { mMethodDescription = null; - RavenwoodRuntimeEnvironmentController.reinit(); } public void enterRavenwoodRule(RavenwoodRule rule) { - if (!mHasRavenwoodRule) { - fail("If you have a RavenwoodRule in your test, make sure the field type is" - + " RavenwoodRule so Ravenwood can detect it."); - } - if (mRule != null) { - fail("Multiple nesting RavenwoodRule's are detected in the same class," - + " which is not supported."); - } - mRule = rule; - if (mCurrentConfig == null) { - mCurrentConfig = rule.getConfiguration(); - } - RavenwoodRuntimeEnvironmentController.init(mRunner); + pushTestProperties(rule); } public void exitRavenwoodRule(RavenwoodRule rule) { - if (mRule != rule) { - fail("RavenwoodRule did not take effect."); - } - mRule = null; + popTestProperties(rule); } - /** - * @return a configuration from a test class, if any. - */ - @Nullable - private static RavenwoodConfig extractConfiguration(Class<?> testClass) { - var field = findConfigurationField(testClass); - if (field == null) { - return null; - } + static class RavenwoodPropertyState { - try { - return (RavenwoodConfig) field.get(null); - } catch (IllegalAccessException e) { - throw new RavenwoodRuntimeException("Failed to fetch from the configuration field", e); - } - } + final List<Pair<String, String>> mBackup; + final Set<String> mKeyReadable; + final Set<String> mKeyWritable; - /** - * @return true if the current target class (or its super classes) has any @Rule / @ClassRule - * fields of type RavenwoodRule. - * - * Note, this check won't detect cases where a Rule is of type - * {@link TestRule} and still be a {@link RavenwoodRule}. But that'll be detected at runtime - * as a failure, in {@link #enterRavenwoodRule}. - */ - private static boolean hasRavenwoodRule(Class<?> testClass) { - for (var field : testClass.getDeclaredFields()) { - if (!field.isAnnotationPresent(Rule.class) - && !field.isAnnotationPresent(ClassRule.class)) { - continue; - } - if (field.getType().equals(RavenwoodRule.class)) { - return true; - } + RavenwoodPropertyState(RavenwoodTestProperties props) { + mBackup = props.mValues.keySet().stream() + .map(key -> Pair.create(key, RavenwoodRuntimeNative.getSystemProperty(key))) + .toList(); + mKeyReadable = Set.copyOf(props.mKeyReadable); + mKeyWritable = Set.copyOf(props.mKeyWritable); } - // JUnit supports rules as methods, so we need to check them too. - for (var method : testClass.getDeclaredMethods()) { - if (!method.isAnnotationPresent(Rule.class) - && !method.isAnnotationPresent(ClassRule.class)) { - continue; - } - if (method.getReturnType().equals(RavenwoodRule.class)) { - return true; - } + + boolean isKeyAccessible(String key, boolean write) { + return write ? mKeyWritable.contains(key) : mKeyReadable.contains(key); } - // Look into the super class. - if (!testClass.getSuperclass().equals(Object.class)) { - return hasRavenwoodRule(testClass.getSuperclass()); + + void restore() { + mBackup.forEach(pair -> { + if (pair.second == null) { + RavenwoodRuntimeNative.removeSystemProperty(pair.first); + } else { + RavenwoodRuntimeNative.setSystemProperty(pair.first, pair.second); + } + }); } - return false; } - /** - * Find and return a field with @RavenwoodConfig.Config, which must be of type - * RavenwoodConfig. - */ - @Nullable - private static Field findConfigurationField(Class<?> testClass) { - Field foundField = null; - - for (var field : testClass.getDeclaredFields()) { - final var hasAnot = field.isAnnotationPresent(RavenwoodConfig.Config.class); - final var isType = field.getType().equals(RavenwoodConfig.class); + private static void pushTestProperties(RavenwoodRule rule) { + sActiveProperties.add(Pair.create(rule, new RavenwoodPropertyState(rule.mProperties))); + rule.mProperties.mValues.forEach(RavenwoodRuntimeNative::setSystemProperty); + } - if (hasAnot) { - if (isType) { - // Good, use this field. - if (foundField != null) { - fail(String.format( - "Class %s has multiple fields with %s", - testClass.getCanonicalName(), - "@RavenwoodConfig.Config")); - } - // Make sure it's static public - ensureIsPublicMember(field, true); + private static void popTestProperties(RavenwoodRule rule) { + var pair = sActiveProperties.removeLast(); + assertNotNull(RAVENWOOD_RULE_ERROR, pair); + assertEquals(RAVENWOOD_RULE_ERROR, rule, pair.first); + pair.second.restore(); + } - foundField = field; - } else { - fail(String.format( - "Field %s.%s has %s but type is not %s", - testClass.getCanonicalName(), - field.getName(), - "@RavenwoodConfig.Config", - "RavenwoodConfig")); - return null; // unreachable - } - } else { - if (isType) { - fail(String.format( - "Field %s.%s does not have %s but type is %s", - testClass.getCanonicalName(), - field.getName(), - "@RavenwoodConfig.Config", - "RavenwoodConfig")); - return null; // unreachable - } else { - // Unrelated field, ignore. - continue; - } - } - } - if (foundField != null) { - return foundField; + @SuppressWarnings("unused") // Called from native code (ravenwood_sysprop.cpp) + private static void checkSystemPropertyAccess(String key, boolean write) { + if (write && RavenwoodSystemProperties.sDefaultValues.containsKey(key)) { + // The default core values should never be modified + throw new IllegalArgumentException( + "Setting core system property '" + key + "' is not allowed"); } - if (!testClass.getSuperclass().equals(Object.class)) { - return findConfigurationField(testClass.getSuperclass()); + + final boolean result = RavenwoodSystemProperties.isKeyAccessible(key, write) + || sActiveProperties.stream().anyMatch(p -> p.second.isKeyAccessible(key, write)); + + if (!result) { + throw new IllegalArgumentException((write ? "Write" : "Read") + + " access to system property '" + key + "' denied via RavenwoodRule"); } - return null; } } diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java index 979076eaabfd..e730a292a9da 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -16,8 +16,11 @@ package android.platform.test.ravenwood; +import static android.os.Process.FIRST_APPLICATION_UID; +import static android.os.UserHandle.SYSTEM; import static android.platform.test.ravenwood.RavenwoodSystemServer.ANDROID_PACKAGE_NAME; +import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_EMPTY_RESOURCES_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_INST_RESOURCE_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_RESOURCE_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERBOSE_LOGGING; @@ -25,7 +28,9 @@ import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERSIO import static com.android.ravenwood.common.RavenwoodCommonUtils.parseNullableInt; import static com.android.ravenwood.common.RavenwoodCommonUtils.withDefault; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -53,6 +58,7 @@ import android.provider.DeviceConfig_host; import android.system.ErrnoException; import android.system.Os; import android.util.Log; +import android.view.DisplayAdjustments; import androidx.test.platform.app.InstrumentationRegistry; @@ -62,7 +68,6 @@ import com.android.internal.os.RuntimeInit; import com.android.ravenwood.RavenwoodRuntimeNative; import com.android.ravenwood.RavenwoodRuntimeState; import com.android.ravenwood.common.RavenwoodCommonUtils; -import com.android.ravenwood.common.RavenwoodRuntimeException; import com.android.ravenwood.common.SneakyThrow; import com.android.server.LocalServices; import com.android.server.compat.PlatformCompat; @@ -74,8 +79,10 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.Random; import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -85,8 +92,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; /** - * Responsible for initializing and de-initializing the environment, according to a - * {@link RavenwoodConfig}. + * Responsible for initializing and the environment. */ public class RavenwoodRuntimeEnvironmentController { private static final String TAG = "RavenwoodRuntimeEnvironmentController"; @@ -113,8 +119,6 @@ public class RavenwoodRuntimeEnvironmentController { private static ScheduledFuture<?> sPendingTimeout; - private static long sOriginalIdentityToken = -1; - /** * When enabled, attempt to detect uncaught exceptions from background threads. */ @@ -147,6 +151,10 @@ public class RavenwoodRuntimeEnvironmentController { return res; } + /** Map from path -> resources. */ + private static final HashMap<File, Resources> sCachedResources = new HashMap<>(); + private static Set<String> sAdoptedPermissions = Collections.emptySet(); + private static final Object sInitializationLock = new Object(); @GuardedBy("sInitializationLock") @@ -155,15 +163,16 @@ public class RavenwoodRuntimeEnvironmentController { @GuardedBy("sInitializationLock") private static Throwable sExceptionFromGlobalInit; - private static RavenwoodAwareTestRunner sRunner; - private static RavenwoodSystemProperties sProps; - private static final int DEFAULT_TARGET_SDK_LEVEL = VERSION_CODES.CUR_DEVELOPMENT; private static final String DEFAULT_PACKAGE_NAME = "com.android.ravenwoodtests.defaultname"; + private static final int sMyPid = new Random().nextInt(100, 32768); private static int sTargetSdkLevel; private static String sTestPackageName; private static String sTargetPackageName; + private static Instrumentation sInstrumentation; + private static final long sCallingIdentity = + packBinderIdentityToken(false, FIRST_APPLICATION_UID, sMyPid); /** * Initialize the global environment. @@ -182,7 +191,7 @@ public class RavenwoodRuntimeEnvironmentController { Log.e(TAG, "globalInit() failed", th); sExceptionFromGlobalInit = th; - throw th; + SneakyThrow.sneakyThrow(th); } } else { // Subsequent calls. If the first call threw, just throw the same error, to prevent @@ -197,10 +206,13 @@ public class RavenwoodRuntimeEnvironmentController { } } - private static void globalInitInner() { + private static void globalInitInner() throws IOException { if (RAVENWOOD_VERBOSE_LOGGING) { Log.v(TAG, "globalInit() called here...", new RuntimeException("NOT A CRASH")); } + if (ENABLE_UNCAUGHT_EXCEPTION_DETECTION) { + Thread.setDefaultUncaughtExceptionHandler(sUncaughtExceptionHandler); + } // Some process-wide initialization. (maybe redirect stdout/stderr) RavenwoodCommonUtils.loadJniLibrary(LIBRAVENWOOD_INITIALIZER_NAME); @@ -220,7 +232,6 @@ public class RavenwoodRuntimeEnvironmentController { // Do the basic set up for the android sysprops. RavenwoodSystemProperties.initialize(); - setSystemProperties(null); // Do this after loading RAVENWOOD_NATIVE_RUNTIME_NAME (which backs Os.setenv()), // before loadFrameworkNativeCode() (which uses $ANDROID_LOG_TAGS). @@ -251,82 +262,32 @@ public class RavenwoodRuntimeEnvironmentController { loadRavenwoodProperties(); assertMockitoVersion(); - } - - private static void loadRavenwoodProperties() { - var props = RavenwoodSystemProperties.readProperties("ravenwood.properties"); - - sTargetSdkLevel = withDefault( - parseNullableInt(props.get("targetSdkVersionInt")), DEFAULT_TARGET_SDK_LEVEL); - sTargetPackageName = withDefault(props.get("packageName"), DEFAULT_PACKAGE_NAME); - sTestPackageName = withDefault(props.get("instPackageName"), sTargetPackageName); - - // TODO(b/377765941) Read them from the manifest too? - } - - /** - * Initialize the environment. - */ - public static void init(RavenwoodAwareTestRunner runner) { - if (RAVENWOOD_VERBOSE_LOGGING) { - Log.v(TAG, "init() called here: " + runner, new RuntimeException("STACKTRACE")); - } - if (sRunner == runner) { - return; - } - if (sRunner != null) { - reset(); - } - sRunner = runner; - try { - initInner(runner.mState.getConfig()); - } catch (Exception th) { - Log.e(TAG, "init() failed", th); - - RavenwoodCommonUtils.runIgnoringException(()-> reset()); - - SneakyThrow.sneakyThrow(th); - } - } - - private static void initInner(RavenwoodConfig config) throws IOException { - if (ENABLE_UNCAUGHT_EXCEPTION_DETECTION) { - maybeThrowPendingUncaughtException(false); - Thread.setDefaultUncaughtExceptionHandler(sUncaughtExceptionHandler); - } - - config.mTargetPackageName = sTargetPackageName; - config.mTestPackageName = sTestPackageName; - config.mTargetSdkLevel = sTargetSdkLevel; Log.i(TAG, "TargetPackageName=" + sTargetPackageName); Log.i(TAG, "TestPackageName=" + sTestPackageName); Log.i(TAG, "TargetSdkLevel=" + sTargetSdkLevel); - RavenwoodRuntimeState.sUid = config.mUid; - RavenwoodRuntimeState.sPid = config.mPid; - RavenwoodRuntimeState.sTargetSdkLevel = config.mTargetSdkLevel; - sOriginalIdentityToken = Binder.clearCallingIdentity(); - reinit(); - setSystemProperties(config.mSystemProperties); + RavenwoodRuntimeState.sUid = FIRST_APPLICATION_UID; + RavenwoodRuntimeState.sPid = sMyPid; + RavenwoodRuntimeState.sTargetSdkLevel = sTargetSdkLevel; ServiceManager.init$ravenwood(); LocalServices.removeAllServicesForTest(); - ActivityManager.init$ravenwood(config.mCurrentUser); + ActivityManager.init$ravenwood(SYSTEM.getIdentifier()); final var main = new HandlerThread(MAIN_THREAD_NAME); main.start(); Looper.setMainLooperForTest(main.getLooper()); final boolean isSelfInstrumenting = - Objects.equals(config.mTestPackageName, config.mTargetPackageName); + Objects.equals(sTestPackageName, sTargetPackageName); // This will load the resources from the apk set to `resource_apk` in the build file. // This is supposed to be the "target app"'s resources. final Supplier<Resources> targetResourcesLoader = () -> { var file = new File(RAVENWOOD_RESOURCE_APK); - return config.mState.loadResources(file.exists() ? file : null); + return loadResources(file.exists() ? file : null); }; // Set up test context's (== instrumentation context's) resources. @@ -337,18 +298,17 @@ public class RavenwoodRuntimeEnvironmentController { } else { instResourcesLoader = () -> { var file = new File(RAVENWOOD_INST_RESOURCE_APK); - return config.mState.loadResources(file.exists() ? file : null); + return loadResources(file.exists() ? file : null); }; } var instContext = new RavenwoodContext( - config.mTestPackageName, main, instResourcesLoader); + sTestPackageName, main, instResourcesLoader); var targetContext = new RavenwoodContext( - config.mTargetPackageName, main, targetResourcesLoader); + sTargetPackageName, main, targetResourcesLoader); // Set up app context. - var appContext = new RavenwoodContext( - config.mTargetPackageName, main, targetResourcesLoader); + var appContext = new RavenwoodContext(sTargetPackageName, main, targetResourcesLoader); appContext.setApplicationContext(appContext); if (isSelfInstrumenting) { instContext.setApplicationContext(appContext); @@ -357,42 +317,68 @@ public class RavenwoodRuntimeEnvironmentController { // When instrumenting into another APK, the test context doesn't have an app context. targetContext.setApplicationContext(appContext); } - config.mInstContext = instContext; - config.mTargetContext = targetContext; - final Supplier<Resources> systemResourcesLoader = () -> config.mState.loadResources(null); + final Supplier<Resources> systemResourcesLoader = () -> loadResources(null); - config.mState.mSystemServerContext = + var systemServerContext = new RavenwoodContext(ANDROID_PACKAGE_NAME, main, systemResourcesLoader); - // Prepare other fields. - config.mInstrumentation = new Instrumentation(); - config.mInstrumentation.basicInit(instContext, targetContext, createMockUiAutomation()); - InstrumentationRegistry.registerInstance(config.mInstrumentation, Bundle.EMPTY); + sInstrumentation = new Instrumentation(); + sInstrumentation.basicInit(instContext, targetContext, null); + InstrumentationRegistry.registerInstance(sInstrumentation, Bundle.EMPTY); + + RavenwoodSystemServer.init(systemServerContext); + + initializeCompatIds(); + } + + private static void loadRavenwoodProperties() { + var props = RavenwoodSystemProperties.readProperties("ravenwood.properties"); + + sTargetSdkLevel = withDefault( + parseNullableInt(props.get("targetSdkVersionInt")), DEFAULT_TARGET_SDK_LEVEL); + sTargetPackageName = withDefault(props.get("packageName"), DEFAULT_PACKAGE_NAME); + sTestPackageName = withDefault(props.get("instPackageName"), sTargetPackageName); + + // TODO(b/377765941) Read them from the manifest too? + } - RavenwoodSystemServer.init(config); + /** + * Partially reset and initialize before each test class invocation + */ + public static void initForRunner() { + var targetContext = sInstrumentation.getTargetContext(); + var instContext = sInstrumentation.getContext(); + // We need to recreate the mock UiAutomation for each test class, because sometimes tests + // will call Mockito.framework().clearInlineMocks() after execution. + sInstrumentation.basicInit(instContext, targetContext, createMockUiAutomation()); + + // Reset some global state + Process_ravenwood.reset(); + DeviceConfig_host.reset(); + Binder.restoreCallingIdentity(sCallingIdentity); - initializeCompatIds(config); + SystemProperties.clearChangeCallbacksForTest(); if (ENABLE_TIMEOUT_STACKS) { sPendingTimeout = sTimeoutExecutor.schedule( RavenwoodRuntimeEnvironmentController::dumpStacks, TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); } + if (ENABLE_UNCAUGHT_EXCEPTION_DETECTION) { + maybeThrowPendingUncaughtException(false); + } } /** - * Partially re-initialize after each test method invocation + * Partially reset and initialize before each test method invocation */ - public static void reinit() { - // sRunner could be null, if there was a failure in the initialization. - if (sRunner != null) { - var config = sRunner.mState.getConfig(); - Binder.restoreCallingIdentity(packBinderIdentityToken(false, config.mUid, config.mPid)); - } + public static void initForMethod() { + // TODO(b/375272444): this is a hacky workaround to ensure binder identity + Binder.restoreCallingIdentity(sCallingIdentity); } - private static void initializeCompatIds(RavenwoodConfig config) { + private static void initializeCompatIds() { // Set up compat-IDs for the app side. // TODO: Inside the system server, all the compat-IDs should be enabled, // Due to the `AppCompatCallbacks.install(new long[0], new long[0])` call in @@ -400,8 +386,8 @@ public class RavenwoodRuntimeEnvironmentController { // Compat framework only uses the package name and the target SDK level. ApplicationInfo appInfo = new ApplicationInfo(); - appInfo.packageName = config.mTargetPackageName; - appInfo.targetSdkVersion = config.mTargetSdkLevel; + appInfo.packageName = sTargetPackageName; + appInfo.targetSdkVersion = sTargetSdkLevel; PlatformCompat platformCompat = null; try { @@ -418,65 +404,42 @@ public class RavenwoodRuntimeEnvironmentController { } /** - * De-initialize. - * - * Note, we call this method when init() fails too, so this method should deal with - * any partially-initialized states. + * Load {@link Resources} from an APK, with cache. */ - public static void reset() { - if (RAVENWOOD_VERBOSE_LOGGING) { - Log.v(TAG, "reset() called here", new RuntimeException("STACKTRACE")); - } - if (sRunner == null) { - throw new RavenwoodRuntimeException("Internal error: reset() already called"); + private static Resources loadResources(@Nullable File apkPath) { + var cached = sCachedResources.get(apkPath); + if (cached != null) { + return cached; } - var config = sRunner.mState.getConfig(); - sRunner = null; - if (ENABLE_TIMEOUT_STACKS) { - sPendingTimeout.cancel(false); - } + var fileToLoad = apkPath != null ? apkPath : new File(RAVENWOOD_EMPTY_RESOURCES_APK); - RavenwoodSystemServer.reset(config); + assertTrue("File " + fileToLoad + " doesn't exist.", fileToLoad.isFile()); - InstrumentationRegistry.registerInstance(null, Bundle.EMPTY); - config.mInstrumentation = null; - if (config.mInstContext != null) { - ((RavenwoodContext) config.mInstContext).cleanUp(); - config.mInstContext = null; - } - if (config.mTargetContext != null) { - ((RavenwoodContext) config.mTargetContext).cleanUp(); - config.mTargetContext = null; - } - if (config.mState.mSystemServerContext != null) { - config.mState.mSystemServerContext.cleanUp(); - } + final String path = fileToLoad.getAbsolutePath(); + final var emptyPaths = new String[0]; - if (Looper.getMainLooper() != null) { - Looper.getMainLooper().quit(); - } - Looper.clearMainLooperForTest(); + ResourcesManager.getInstance().initializeApplicationPaths(path, emptyPaths); - ActivityManager.reset$ravenwood(); + final var ret = ResourcesManager.getInstance().getResources(null, path, + emptyPaths, emptyPaths, emptyPaths, + emptyPaths, null, null, + new DisplayAdjustments().getCompatibilityInfo(), + RavenwoodRuntimeEnvironmentController.class.getClassLoader(), null); - LocalServices.removeAllServicesForTest(); - ServiceManager.reset$ravenwood(); + assertNotNull(ret); - setSystemProperties(null); - if (sOriginalIdentityToken != -1) { - Binder.restoreCallingIdentity(sOriginalIdentityToken); - } - RavenwoodRuntimeState.reset(); - Process_ravenwood.reset(); - DeviceConfig_host.reset(); + sCachedResources.put(apkPath, ret); + return ret; + } - try { - ResourcesManager.setInstance(null); // Better structure needed. - } catch (Exception e) { - // AOSP-CHANGE: AOSP doesn't support resources yet. + /** + * A callback when a test class finishes its execution, mostly only for debugging. + */ + public static void exitTestClass() { + if (ENABLE_TIMEOUT_STACKS) { + sPendingTimeout.cancel(false); } - if (ENABLE_UNCAUGHT_EXCEPTION_DETECTION) { maybeThrowPendingUncaughtException(true); } @@ -521,19 +484,6 @@ public class RavenwoodRuntimeEnvironmentController { } } - /** - * Set the current configuration to the actual SystemProperties. - */ - private static void setSystemProperties(@Nullable RavenwoodSystemProperties systemProperties) { - SystemProperties.clearChangeCallbacksForTest(); - RavenwoodRuntimeNative.clearSystemProperties(); - if (systemProperties == null) systemProperties = new RavenwoodSystemProperties(); - sProps = new RavenwoodSystemProperties(systemProperties, true); - for (var entry : systemProperties.getValues().entrySet()) { - RavenwoodRuntimeNative.setSystemProperty(entry.getKey(), entry.getValue()); - } - } - private static final String MOCKITO_ERROR = "FATAL: Unsupported Mockito detected!" + " Your test or its dependencies use one of the \"mockito-target-*\"" + " modules as static library, which is unusable on host side." @@ -558,40 +508,31 @@ public class RavenwoodRuntimeEnvironmentController { // TODO: use the real UiAutomation class instead of a mock private static UiAutomation createMockUiAutomation() { - final Set[] adoptedPermission = { Collections.emptySet() }; + sAdoptedPermissions = Collections.emptySet(); var mock = mock(UiAutomation.class, inv -> { HostTestUtils.onThrowMethodCalled(); return null; }); doAnswer(inv -> { - adoptedPermission[0] = UiAutomation.ALL_PERMISSIONS; + sAdoptedPermissions = UiAutomation.ALL_PERMISSIONS; return null; }).when(mock).adoptShellPermissionIdentity(); doAnswer(inv -> { if (inv.getArgument(0) == null) { - adoptedPermission[0] = UiAutomation.ALL_PERMISSIONS; + sAdoptedPermissions = UiAutomation.ALL_PERMISSIONS; } else { - adoptedPermission[0] = Set.of(inv.getArguments()); + sAdoptedPermissions = (Set) Set.of(inv.getArguments()); } return null; }).when(mock).adoptShellPermissionIdentity(any()); doAnswer(inv -> { - adoptedPermission[0] = Collections.emptySet(); + sAdoptedPermissions = Collections.emptySet(); return null; }).when(mock).dropShellPermissionIdentity(); - doAnswer(inv -> adoptedPermission[0]).when(mock).getAdoptedShellPermissions(); + doAnswer(inv -> sAdoptedPermissions).when(mock).getAdoptedShellPermissions(); return mock; } - @SuppressWarnings("unused") // Called from native code (ravenwood_sysprop.cpp) - private static void checkSystemPropertyAccess(String key, boolean write) { - boolean result = write ? sProps.isKeyWritable(key) : sProps.isKeyReadable(key); - if (!result) { - throw new IllegalArgumentException((write ? "Write" : "Read") - + " access to system property '" + key + "' denied via RavenwoodConfig"); - } - } - private static void dumpCommandLineArgs() { Log.i(TAG, "JVM arguments:"); diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java index 9bd376a76f77..c545baacdf3e 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package android.platform.test.ravenwood; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERBOSE_LOGGING; @@ -21,26 +20,30 @@ import static com.android.ravenwood.common.RavenwoodCommonUtils.getRavenwoodRunt import android.util.Log; +import com.android.ravenwood.RavenwoodRuntimeNative; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +/** + * A class to manage the core default system properties of the Ravenwood environment. + */ public class RavenwoodSystemProperties { private static final String TAG = "RavenwoodSystemProperties"; - /** We pull in propeties from this file. */ + /** We pull in properties from this file. */ private static final String RAVENWOOD_BUILD_PROP = "ravenwood-data/ravenwood-build.prop"; /** This is the actual build.prop we use to build the device (contents depends on lunch). */ private static final String DEVICE_BUILD_PROP = "ravenwood-data/build.prop"; /** The default values. */ - private static final Map<String, String> sDefaultValues = new HashMap<>(); + static final Map<String, String> sDefaultValues = new HashMap<>(); private static final String[] PARTITIONS = { "bootimage", @@ -91,7 +94,7 @@ public class RavenwoodSystemProperties { var deviceValue = deviceProps.get(deviceKey); if (deviceValue == null) { throw new RuntimeException("Failed to initialize system properties. Key '" - + deviceKey + "' doesn't exist in the device side build.prop"); + + deviceKey + "' doesn't exist in the device side build.prop"); } value = deviceValue; } else { @@ -115,6 +118,7 @@ public class RavenwoodSystemProperties { } } } + if (RAVENWOOD_VERBOSE_LOGGING) { // Dump all properties for local debugging. Log.v(TAG, "All system properties:"); @@ -122,35 +126,12 @@ public class RavenwoodSystemProperties { Log.v(TAG, "" + key + "=" + sDefaultValues.get(key)); } } - } - - private volatile boolean mIsImmutable; - - private final Map<String, String> mValues = new HashMap<>(); - - /** Set of additional keys that should be considered readable */ - private final Set<String> mKeyReadable = new HashSet<>(); - - /** Set of additional keys that should be considered writable */ - private final Set<String> mKeyWritable = new HashSet<>(); - - public RavenwoodSystemProperties() { - mValues.putAll(sDefaultValues); - } - - /** Copy constructor */ - public RavenwoodSystemProperties(RavenwoodSystemProperties source, boolean immutable) { - mKeyReadable.addAll(source.mKeyReadable); - mKeyWritable.addAll(source.mKeyWritable); - mValues.putAll(source.mValues); - mIsImmutable = immutable; - } - public Map<String, String> getValues() { - return new HashMap<>(mValues); + // Actually set the system properties + sDefaultValues.forEach(RavenwoodRuntimeNative::setSystemProperty); } - public boolean isKeyReadable(String key) { + private static boolean isKeyReadable(String key) { final String root = getKeyRoot(key); if (root.startsWith("debug.")) return true; @@ -183,10 +164,10 @@ public class RavenwoodSystemProperties { return true; } - return mKeyReadable.contains(key); + return false; } - public boolean isKeyWritable(String key) { + private static boolean isKeyWritable(String key) { final String root = getKeyRoot(key); if (root.startsWith("debug.")) return true; @@ -194,42 +175,11 @@ public class RavenwoodSystemProperties { // For PropertyInvalidatedCache if (root.startsWith("cache_key.")) return true; - return mKeyWritable.contains(key); - } - - private void ensureNotImmutable() { - if (mIsImmutable) { - throw new RuntimeException("Unable to update immutable instance"); - } - } - - public void setValue(String key, Object value) { - ensureNotImmutable(); - - final String valueString = (value == null) ? null : String.valueOf(value); - if ((valueString == null) || valueString.isEmpty()) { - mValues.remove(key); - } else { - mValues.put(key, valueString); - } - } - - public void setAccessNone(String key) { - ensureNotImmutable(); - mKeyReadable.remove(key); - mKeyWritable.remove(key); - } - - public void setAccessReadOnly(String key) { - ensureNotImmutable(); - mKeyReadable.add(key); - mKeyWritable.remove(key); + return false; } - public void setAccessReadWrite(String key) { - ensureNotImmutable(); - mKeyReadable.add(key); - mKeyWritable.add(key); + static boolean isKeyAccessible(String key, boolean write) { + return write ? isKeyWritable(key) : isKeyReadable(key); } /** diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java index 438a2bfa7a14..3346635b7f7b 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemServer.java @@ -33,7 +33,7 @@ import com.android.server.compat.PlatformCompat; import com.android.server.compat.PlatformCompatNative; import com.android.server.utils.TimingsTraceAndSlog; -import java.util.List; +import java.util.Collection; import java.util.Set; public class RavenwoodSystemServer { @@ -68,27 +68,24 @@ public class RavenwoodSystemServer { private static TimingsTraceAndSlog sTimings; private static SystemServiceManager sServiceManager; - public static void init(RavenwoodConfig config) { + public static void init(Context systemServerContext) { // Always start PlatformCompat, regardless of the requested services. // PlatformCompat is not really a SystemService, so it won't receive boot phases / etc. // This initialization code is copied from SystemServer.java. - PlatformCompat platformCompat = new PlatformCompat(config.mState.mSystemServerContext); + PlatformCompat platformCompat = new PlatformCompat(systemServerContext); ServiceManager.addService(Context.PLATFORM_COMPAT_SERVICE, platformCompat); ServiceManager.addService(Context.PLATFORM_COMPAT_NATIVE_SERVICE, new PlatformCompatNative(platformCompat)); - // Avoid overhead if no services required - if (config.mServicesRequired.isEmpty()) return; - sStartedServices = new ArraySet<>(); sTimings = new TimingsTraceAndSlog(); - sServiceManager = new SystemServiceManager(config.mState.mSystemServerContext); + sServiceManager = new SystemServiceManager(systemServerContext); sServiceManager.setStartInfo(false, SystemClock.elapsedRealtime(), SystemClock.uptimeMillis()); LocalServices.addService(SystemServiceManager.class, sServiceManager); - startServices(config.mServicesRequired); + startServices(sKnownServices.keySet()); sServiceManager.sealStartedServices(); // TODO: expand to include additional boot phases when relevant @@ -96,7 +93,7 @@ public class RavenwoodSystemServer { sServiceManager.startBootPhase(sTimings, SystemService.PHASE_BOOT_COMPLETED); } - public static void reset(RavenwoodConfig config) { + public static void reset() { // TODO: consider introducing shutdown boot phases LocalServices.removeServiceForTest(SystemServiceManager.class); @@ -105,7 +102,7 @@ public class RavenwoodSystemServer { sStartedServices = null; } - private static void startServices(List<Class<?>> serviceClasses) { + private static void startServices(Collection<Class<?>> serviceClasses) { for (Class<?> serviceClass : serviceClasses) { // Quietly ignore duplicate requests if service already started if (sStartedServices.contains(serviceClass)) continue; diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodConfig.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodConfig.java index 7ca9239d2062..3ed0f50434fb 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodConfig.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodConfig.java @@ -15,21 +15,13 @@ */ package android.platform.test.ravenwood; -import static android.os.Process.FIRST_APPLICATION_UID; -import static android.os.UserHandle.SYSTEM; - import android.annotation.NonNull; import android.annotation.Nullable; -import android.app.Instrumentation; -import android.content.Context; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; /** * @deprecated This class will be removed. Reach out to g/ravenwood if you need any features in it. @@ -45,37 +37,10 @@ public final class RavenwoodConfig { public @interface Config { } - private static final int NOBODY_UID = 9999; - - private static final AtomicInteger sNextPid = new AtomicInteger(100); - - int mCurrentUser = SYSTEM.getIdentifier(); - - /** - * Unless the test author requests differently, run as "nobody", and give each collection of - * tests its own unique PID. - */ - int mUid = FIRST_APPLICATION_UID; - int mPid = sNextPid.getAndIncrement(); - - String mTestPackageName; - String mTargetPackageName; - - int mTargetSdkLevel; - - final RavenwoodSystemProperties mSystemProperties = new RavenwoodSystemProperties(); - - final List<Class<?>> mServicesRequired = new ArrayList<>(); - - volatile Context mInstContext; - volatile Context mTargetContext; - volatile Instrumentation mInstrumentation; - /** * Stores internal states / methods associated with this config that's only needed in * junit-impl. */ - final RavenwoodConfigState mState = new RavenwoodConfigState(this); private RavenwoodConfig() { } @@ -159,34 +124,11 @@ public final class RavenwoodConfig { return this; } - Builder setSystemPropertyImmutableReal(@NonNull String key, - @Nullable Object value) { - mConfig.mSystemProperties.setValue(key, value); - mConfig.mSystemProperties.setAccessReadOnly(key); - return this; - } - - Builder setSystemPropertyMutableReal(@NonNull String key, - @Nullable Object value) { - mConfig.mSystemProperties.setValue(key, value); - mConfig.mSystemProperties.setAccessReadWrite(key); - return this; - } - /** - * Configure the set of system services that are required for this test to operate. - * - * For example, passing {@code android.hardware.SerialManager.class} as an argument will - * ensure that the underlying service is created, initialized, and ready to use for the - * duration of the test. The {@code SerialManager} instance can be obtained via - * {@code RavenwoodRule.getContext()} and {@code Context.getSystemService()}, and - * {@code SerialManagerInternal} can be obtained via {@code LocalServices.getService()}. + * @deprecated no longer used. All supported services are available. */ + @Deprecated public Builder setServicesRequired(@NonNull Class<?>... services) { - mConfig.mServicesRequired.clear(); - for (Class<?> service : services) { - mConfig.mServicesRequired.add(service); - } return this; } diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java index 5681a9040f63..e49d3d934e9f 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java @@ -92,19 +92,11 @@ public final class RavenwoodRule implements TestRule { } } - private final RavenwoodConfig mConfiguration; - - public RavenwoodRule() { - mConfiguration = new RavenwoodConfig.Builder().build(); - } - - private RavenwoodRule(RavenwoodConfig config) { - mConfiguration = config; - } + final RavenwoodTestProperties mProperties = new RavenwoodTestProperties(); public static class Builder { - private final RavenwoodConfig.Builder mBuilder = - new RavenwoodConfig.Builder(); + + private final RavenwoodRule mRule = new RavenwoodRule(); public Builder() { } @@ -152,7 +144,8 @@ public final class RavenwoodRule implements TestRule { * Has no effect on non-Ravenwood environments. */ public Builder setSystemPropertyImmutable(@NonNull String key, @Nullable Object value) { - mBuilder.setSystemPropertyImmutableReal(key, value); + mRule.mProperties.setValue(key, value); + mRule.mProperties.setAccessReadOnly(key); return this; } @@ -167,26 +160,21 @@ public final class RavenwoodRule implements TestRule { * Has no effect on non-Ravenwood environments. */ public Builder setSystemPropertyMutable(@NonNull String key, @Nullable Object value) { - mBuilder.setSystemPropertyMutableReal(key, value); + mRule.mProperties.setValue(key, value); + mRule.mProperties.setAccessReadWrite(key); return this; } /** - * Configure the set of system services that are required for this test to operate. - * - * For example, passing {@code android.hardware.SerialManager.class} as an argument will - * ensure that the underlying service is created, initialized, and ready to use for the - * duration of the test. The {@code SerialManager} instance can be obtained via - * {@code RavenwoodRule.getContext()} and {@code Context.getSystemService()}, and - * {@code SerialManagerInternal} can be obtained via {@code LocalServices.getService()}. + * @deprecated no longer used. All supported services are available. */ + @Deprecated public Builder setServicesRequired(@NonNull Class<?>... services) { - mBuilder.setServicesRequired(services); return this; } public RavenwoodRule build() { - return new RavenwoodRule(mBuilder.build()); + return mRule; } } @@ -227,7 +215,7 @@ public final class RavenwoodRule implements TestRule { @Override public Statement apply(Statement base, Description description) { - if (!RavenwoodConfig.isOnRavenwood()) { + if (!IS_ON_RAVENWOOD) { return base; } return new Statement() { @@ -296,8 +284,4 @@ public final class RavenwoodRule implements TestRule { public static RavenwoodPrivate private$ravenwood() { return sRavenwoodPrivate; } - - RavenwoodConfig getConfiguration() { - return mConfiguration; - } } diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodTestProperties.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodTestProperties.java new file mode 100644 index 000000000000..66a26b511213 --- /dev/null +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodTestProperties.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.platform.test.ravenwood; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * A class to store system properties defined by tests. + */ +public class RavenwoodTestProperties { + final Map<String, String> mValues = new HashMap<>(); + + /** Set of additional keys that should be considered readable */ + final Set<String> mKeyReadable = new HashSet<>(); + + /** Set of additional keys that should be considered writable */ + final Set<String> mKeyWritable = new HashSet<>(); + + public void setValue(String key, Object value) { + final String valueString = (value == null) ? null : String.valueOf(value); + if ((valueString == null) || valueString.isEmpty()) { + mValues.remove(key); + } else { + mValues.put(key, valueString); + } + } + + public void setAccessNone(String key) { + mKeyReadable.remove(key); + mKeyWritable.remove(key); + } + + public void setAccessReadOnly(String key) { + mKeyReadable.add(key); + mKeyWritable.remove(key); + } + + public void setAccessReadWrite(String key) { + mKeyReadable.add(key); + mKeyWritable.add(key); + } +} diff --git a/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java index 7b940b423b69..9a78989dad55 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java +++ b/ravenwood/runtime-helper-src/libcore-fake/com/android/ravenwood/RavenwoodRuntimeNative.java @@ -56,7 +56,11 @@ public class RavenwoodRuntimeNative { public static native boolean setSystemProperty(String key, String value); - public static native void clearSystemProperties(); + public static native boolean removeSystemProperty(String key); + + public static void clearSystemProperties() { + removeSystemProperty(null); + } public static native int gettid(); diff --git a/ravenwood/runtime-jni/jni_helper.h b/ravenwood/runtime-jni/jni_helper.h index 561fb3beda6b..25d75193de09 100644 --- a/ravenwood/runtime-jni/jni_helper.h +++ b/ravenwood/runtime-jni/jni_helper.h @@ -26,6 +26,7 @@ constexpr const char* kCommonUtils = "com/android/ravenwood/common/RavenwoodCommonUtils"; constexpr const char* kRuntimeEnvController = "android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController"; +constexpr const char* kRunnerState = "android/platform/test/ravenwood/RavenwoodRunnerState"; constexpr const char* kRuntimeNative = "com/android/ravenwood/RavenwoodRuntimeNative"; // We have to explicitly decode the string to real UTF-8, because when using GetStringUTFChars diff --git a/ravenwood/runtime-jni/ravenwood_sysprop.cpp b/ravenwood/runtime-jni/ravenwood_sysprop.cpp index aafc4268d782..a78aa8da9052 100644 --- a/ravenwood/runtime-jni/ravenwood_sysprop.cpp +++ b/ravenwood/runtime-jni/ravenwood_sysprop.cpp @@ -117,7 +117,7 @@ void __system_property_read_callback(const prop_info* pi, // ---- JNI ---- static JavaVM* gVM = nullptr; -static jclass gEnvController = nullptr; +static jclass gRunnerState = nullptr; static jmethodID gCheckSystemPropertyAccess; static void reloadNativeLibrary(JNIEnv* env, jclass, jstring javaPath) { @@ -128,11 +128,11 @@ static void reloadNativeLibrary(JNIEnv* env, jclass, jstring javaPath) { // Call back into Java code to check property access static void check_system_property_access(const char* key, bool write) { - if (gVM != nullptr && gEnvController != nullptr) { + if (gVM != nullptr && gRunnerState != nullptr) { JNIEnv* env; if (gVM->GetEnv((void**)&env, JNI_VERSION_1_4) >= 0) { ALOGI("%s access to system property '%s'", write ? "Write" : "Read", key); - env->CallStaticVoidMethod(gEnvController, gCheckSystemPropertyAccess, + env->CallStaticVoidMethod(gRunnerState, gCheckSystemPropertyAccess, env->NewStringUTF(key), write ? JNI_TRUE : JNI_FALSE); return; } @@ -155,16 +155,29 @@ static jboolean setSystemProperty(JNIEnv* env, jclass, jstring javaKey, jstring return property_set(key.c_str(), value.c_str()) ? JNI_TRUE : JNI_FALSE; } -static void clearSystemProperties(JNIEnv*, jclass) { +static jboolean removeSystemProperty(JNIEnv* env, jclass, jstring javaKey) { std::lock_guard lock(g_properties_lock); - g_properties.clear(); + + if (javaKey == nullptr) { + g_properties.clear(); + return JNI_TRUE; + } else { + ScopedUtfChars key(env, javaKey); + auto it = g_properties.find(key); + if (it != g_properties.end()) { + g_properties.erase(it); + return JNI_TRUE; + } else { + return JNI_FALSE; + } + } } static const JNINativeMethod sMethods[] = { {"reloadNativeLibrary", "(Ljava/lang/String;)V", (void*)reloadNativeLibrary}, {"getSystemProperty", "(Ljava/lang/String;)Ljava/lang/String;", (void*)getSystemProperty}, {"setSystemProperty", "(Ljava/lang/String;Ljava/lang/String;)Z", (void*)setSystemProperty}, - {"clearSystemProperties", "()V", (void*)clearSystemProperties}, + {"removeSystemProperty", "(Ljava/lang/String;)Z", (void*)removeSystemProperty}, }; extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { @@ -174,9 +187,9 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { gVM = vm; // Fetch several references for future use - gEnvController = FindGlobalClassOrDie(env, kRuntimeEnvController); + gRunnerState = FindGlobalClassOrDie(env, kRunnerState); gCheckSystemPropertyAccess = - GetStaticMethodIDOrDie(env, gEnvController, "checkSystemPropertyAccess", + GetStaticMethodIDOrDie(env, gRunnerState, "checkSystemPropertyAccess", "(Ljava/lang/String;Z)V"); // Expose raw property methods as JNI methods diff --git a/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java deleted file mode 100644 index c25d2b4cbc4d..000000000000 --- a/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.ravenwoodtest.bivalenttest; - -import android.platform.test.ravenwood.RavenwoodConfig; -import android.platform.test.ravenwood.RavenwoodRule; - -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; - -/** - * Make sure having multiple RavenwoodRule's is detected. - * (But only when running on ravenwod. Otherwise it'll be ignored.) - */ -@RunWith(AndroidJUnit4.class) -public class RavenwoodMultipleRuleTest { - - @Rule(order = Integer.MIN_VALUE) - public final ExpectedException mExpectedException = ExpectedException.none(); - - @Rule - public final RavenwoodRule mRavenwood1 = new RavenwoodRule(); - - @Rule - public final RavenwoodRule mRavenwood2 = new RavenwoodRule(); - - public RavenwoodMultipleRuleTest() { - // We can't call it within the test method because the exception happens before - // calling the method, so set it up here. - if (RavenwoodConfig.isOnRavenwood()) { - mExpectedException.expectMessage("Multiple nesting RavenwoodRule"); - } - } - - @Test - public void testMultipleRulesNotAllowed() { - Assume.assumeTrue(RavenwoodConfig.isOnRavenwood()); - } -} diff --git a/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRuleValidationTest.java b/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRuleValidationTest.java new file mode 100644 index 000000000000..f9e73db23740 --- /dev/null +++ b/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRuleValidationTest.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ravenwoodtest.runnercallbacktests; + +import static com.google.common.truth.Truth.assertThat; + +import android.os.SystemProperties; +import android.platform.test.annotations.NoRavenizer; +import android.platform.test.ravenwood.RavenwoodRule; + +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; + +/** + * Test for RavenwoodRule. + */ +@NoRavenizer // This class shouldn't be executed with RavenwoodAwareTestRunner. +public class RavenwoodRuleValidationTest extends RavenwoodRunnerTestBase { + + public static class RuleInBaseClass { + static String PROPERTY_KEY = "debug.ravenwood.prop.in.base"; + static String PROPERTY_VAL = "ravenwood"; + @Rule + public final RavenwoodRule mRavenwood1 = new RavenwoodRule.Builder() + .setSystemPropertyImmutable(PROPERTY_KEY, PROPERTY_VAL).build(); + } + + /** + * Make sure that RavenwoodRule in a base class takes effect. + */ + @RunWith(AndroidJUnit4.class) + // CHECKSTYLE:OFF + @Expected(""" + testRunStarted: classes + testSuiteStarted: classes + testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleInBaseClassSuccessTest + testStarted: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleInBaseClassSuccessTest) + testFinished: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleInBaseClassSuccessTest) + testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleInBaseClassSuccessTest + testSuiteFinished: classes + testRunFinished: 1,0,0,0 + """) + // CHECKSTYLE:ON + public static class RuleInBaseClassSuccessTest extends RuleInBaseClass { + + @Test + public void testRuleInBaseClass() { + assertThat(SystemProperties.get(PROPERTY_KEY)).isEqualTo(PROPERTY_VAL); + } + } + + /** + * Same as {@link RuleInBaseClass}, but the type of the rule field is not {@link RavenwoodRule}. + */ + public abstract static class RuleWithDifferentTypeInBaseClass { + static String PROPERTY_KEY = "debug.ravenwood.prop.in.base.different.type"; + static String PROPERTY_VAL = "ravenwood"; + @Rule + public final TestRule mRavenwood1 = new RavenwoodRule.Builder() + .setSystemPropertyImmutable(PROPERTY_KEY, PROPERTY_VAL).build(); + } + + /** + * Make sure that RavenwoodRule in a base class takes effect, even if the field type is not + */ + @RunWith(AndroidJUnit4.class) + // CHECKSTYLE:OFF + @Expected(""" + testRunStarted: classes + testSuiteStarted: classes + testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest + testStarted: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest) + testFinished: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest) + testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRuleValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest + testSuiteFinished: classes + testRunFinished: 1,0,0,0 + """) + // CHECKSTYLE:ON + public static class RuleWithDifferentTypeInBaseClassSuccessTest extends RuleWithDifferentTypeInBaseClass { + + @Test + public void testRuleInBaseClass() { + assertThat(SystemProperties.get(PROPERTY_KEY)).isEqualTo(PROPERTY_VAL); + } + } +} diff --git a/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRunnerConfigValidationTest.java b/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRunnerConfigValidationTest.java deleted file mode 100644 index f94b98bc1fb8..000000000000 --- a/ravenwood/tests/coretest/test/com/android/ravenwoodtest/runnercallbacktests/RavenwoodRunnerConfigValidationTest.java +++ /dev/null @@ -1,484 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.ravenwoodtest.runnercallbacktests; - -import static com.google.common.truth.Truth.assertThat; - -import android.platform.test.annotations.NoRavenizer; -import android.platform.test.ravenwood.RavenwoodConfig; -import android.platform.test.ravenwood.RavenwoodRule; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; - -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; - - -/** - * Test for @Config field extraction and validation. - * - * TODO(b/377765941) Most of the tests here will be obsolete and deleted with b/377765941, but - * some of the tests may need to be re-implemented one way or another. (e.g. the package name - * test.) Until that happens, we'll keep all tests here but add an {@code @Ignore} instead. - */ -@NoRavenizer // This class shouldn't be executed with RavenwoodAwareTestRunner. -public class RavenwoodRunnerConfigValidationTest extends RavenwoodRunnerTestBase { - public abstract static class ConfigInBaseClass { - static String PACKAGE_NAME = "com.ConfigInBaseClass"; - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = new RavenwoodConfig.Builder() - .setPackageName(PACKAGE_NAME).build(); - } - - /** - * Make sure a config in the base class is detected. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigInBaseClassTest - testStarted: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigInBaseClassTest) - testFinished: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigInBaseClassTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigInBaseClassTest - testSuiteFinished: classes - testRunFinished: 1,0,0,0 - """) - // CHECKSTYLE:ON - @Ignore // Package name is no longer set via config. - public static class ConfigInBaseClassTest extends ConfigInBaseClass { - @Test - public void test() { - assertThat(InstrumentationRegistry.getInstrumentation().getContext().getPackageName()) - .isEqualTo(PACKAGE_NAME); - } - } - - /** - * Make sure a config in the base class is detected. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigOverridingTest - testStarted: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigOverridingTest) - testFinished: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigOverridingTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigOverridingTest - testSuiteFinished: classes - testRunFinished: 1,0,0,0 - """) - // CHECKSTYLE:ON - @Ignore // Package name is no longer set via config. - public static class ConfigOverridingTest extends ConfigInBaseClass { - static String PACKAGE_NAME_OVERRIDE = "com.ConfigOverridingTest"; - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = new RavenwoodConfig.Builder() - .setPackageName(PACKAGE_NAME_OVERRIDE).build(); - - @Test - public void test() { - assertThat(InstrumentationRegistry.getInstrumentation().getContext().getPackageName()) - .isEqualTo(PACKAGE_NAME_OVERRIDE); - } - } - - /** - * Test to make sure that if a test has a config error, the failure would be reported from - * each test method. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ErrorMustBeReportedFromEachTest) - testFailure: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ErrorMustBeReportedFromEachTest.sConfig expected to be public static - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ErrorMustBeReportedFromEachTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class ErrorMustBeReportedFromEachTest { - @RavenwoodConfig.Config - private static RavenwoodConfig sConfig = // Invalid because it's private. - new RavenwoodConfig.Builder().build(); - - @Test - public void testMethod1() { - } - - @Test - public void testMethod2() { - } - - @Test - public void testMethod3() { - } - } - - /** - * Invalid because there are two @Config's. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateConfigTest) - testFailure: Class com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest.DuplicateConfigTest has multiple fields with @RavenwoodConfig.Config - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateConfigTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class DuplicateConfigTest { - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig1 = - new RavenwoodConfig.Builder().build(); - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig2 = - new RavenwoodConfig.Builder().build(); - - @Test - public void testConfig() { - } - } - - /** - * @Config's must be static. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonStaticConfigTest) - testFailure: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonStaticConfigTest.sConfig expected to be public static - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonStaticConfigTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class NonStaticConfigTest { - - @RavenwoodConfig.Config - public RavenwoodConfig sConfig = - new RavenwoodConfig.Builder().build(); - - @Test - public void testConfig() { - } - } - - /** - * @Config's must be public. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonPublicConfigTest) - testFailure: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonPublicConfigTest.sConfig expected to be public static - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$NonPublicConfigTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class NonPublicConfigTest { - - @RavenwoodConfig.Config - RavenwoodConfig sConfig = - new RavenwoodConfig.Builder().build(); - - @Test - public void testConfig() { - } - } - - /** - * @Config's must be of type RavenwoodConfig. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeConfigTest) - testFailure: Field com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest.WrongTypeConfigTest.sConfig has @RavenwoodConfig.Config but type is not RavenwoodConfig - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeConfigTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class WrongTypeConfigTest { - - @RavenwoodConfig.Config - public static Object sConfig = - new RavenwoodConfig.Builder().build(); - - @Test - public void testConfig() { - } - - } - - /** - * @Rule must be of type RavenwoodRule. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeRuleTest - testStarted: testConfig(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeRuleTest) - testFailure: If you have a RavenwoodRule in your test, make sure the field type is RavenwoodRule so Ravenwood can detect it. - testFinished: testConfig(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeRuleTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WrongTypeRuleTest - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class WrongTypeRuleTest { - - @Rule - public TestRule mRule = new RavenwoodRule.Builder().build(); - - @Test - public void testConfig() { - } - - } - - /** - * Config can't be used with a (instance) Rule. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WithInstanceRuleTest) - testFailure: RavenwoodConfig and RavenwoodRule cannot be used in the same class. Suggest migrating to RavenwoodConfig. - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WithInstanceRuleTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class WithInstanceRuleTest { - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = - new RavenwoodConfig.Builder().build(); - - @Rule - public RavenwoodRule mRule = new RavenwoodRule.Builder().build(); - - @Test - public void testConfig() { - } - } - - /** - * Config can't be used with a (static) Rule. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WithStaticRuleTest) - testFailure: Failed to instantiate class androidx.test.ext.junit.runners.AndroidJUnit4 - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$WithStaticRuleTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class WithStaticRuleTest { - - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = - new RavenwoodConfig.Builder().build(); - - @Rule - public static RavenwoodRule sRule = new RavenwoodRule.Builder().build(); - - @Test - public void testConfig() { - } - } - - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateRulesTest - testStarted: testMultipleRulesNotAllowed(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateRulesTest) - testFailure: Multiple nesting RavenwoodRule's are detected in the same class, which is not supported. - testFinished: testMultipleRulesNotAllowed(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateRulesTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$DuplicateRulesTest - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class DuplicateRulesTest { - - @Rule - public final RavenwoodRule mRavenwood1 = new RavenwoodRule(); - - @Rule - public final RavenwoodRule mRavenwood2 = new RavenwoodRule(); - - @Test - public void testMultipleRulesNotAllowed() { - } - } - - public static class RuleInBaseClass { - static String PACKAGE_NAME = "com.RuleInBaseClass"; - @Rule - public final RavenwoodRule mRavenwood1 = new RavenwoodRule.Builder() - .setPackageName(PACKAGE_NAME).build(); - } - - /** - * Make sure that RavenwoodRule in a base class takes effect. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleInBaseClassSuccessTest - testStarted: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleInBaseClassSuccessTest) - testFinished: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleInBaseClassSuccessTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleInBaseClassSuccessTest - testSuiteFinished: classes - testRunFinished: 1,0,0,0 - """) - // CHECKSTYLE:ON - @Ignore // Package name is no longer set via config. - public static class RuleInBaseClassSuccessTest extends RuleInBaseClass { - - @Test - public void testRuleInBaseClass() { - assertThat(InstrumentationRegistry.getInstrumentation().getContext().getPackageName()) - .isEqualTo(PACKAGE_NAME); - } - } - - /** - * Make sure that having a config and a rule in a base class should fail. - * RavenwoodRule. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testStarted: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleInBaseClassTest) - testFailure: RavenwoodConfig and RavenwoodRule cannot be used in the same class. Suggest migrating to RavenwoodConfig. - testFinished: initializationError(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleInBaseClassTest) - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class ConfigWithRuleInBaseClassTest extends RuleInBaseClass { - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = new RavenwoodConfig.Builder().build(); - - @Test - public void test() { - } - } - - /** - * Same as {@link RuleInBaseClass}, but the type of the rule field is not {@link RavenwoodRule}. - */ - public abstract static class RuleWithDifferentTypeInBaseClass { - static String PACKAGE_NAME = "com.RuleWithDifferentTypeInBaseClass"; - @Rule - public final TestRule mRavenwood1 = new RavenwoodRule.Builder() - .setPackageName(PACKAGE_NAME).build(); - } - - /** - * Make sure that RavenwoodRule in a base class takes effect, even if the field type is not - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest - testStarted: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest) - testFailure: If you have a RavenwoodRule in your test, make sure the field type is RavenwoodRule so Ravenwood can detect it. - testFinished: testRuleInBaseClass(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$RuleWithDifferentTypeInBaseClassSuccessTest - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - @Ignore // Package name is no longer set via config. - public static class RuleWithDifferentTypeInBaseClassSuccessTest extends RuleWithDifferentTypeInBaseClass { - - @Test - public void testRuleInBaseClass() { - assertThat(InstrumentationRegistry.getInstrumentation().getContext().getPackageName()) - .isEqualTo(PACKAGE_NAME); - } - } - - /** - * Make sure that having a config and a rule in a base class should fail, even if the field type is not - * RavenwoodRule. - */ - @RunWith(AndroidJUnit4.class) - // CHECKSTYLE:OFF - @Expected(""" - testRunStarted: classes - testSuiteStarted: classes - testSuiteStarted: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleWithDifferentTypeInBaseClassTest - testStarted: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleWithDifferentTypeInBaseClassTest) - testFailure: If you have a RavenwoodRule in your test, make sure the field type is RavenwoodRule so Ravenwood can detect it. - testFinished: test(com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleWithDifferentTypeInBaseClassTest) - testSuiteFinished: com.android.ravenwoodtest.runnercallbacktests.RavenwoodRunnerConfigValidationTest$ConfigWithRuleWithDifferentTypeInBaseClassTest - testSuiteFinished: classes - testRunFinished: 1,1,0,0 - """) - // CHECKSTYLE:ON - public static class ConfigWithRuleWithDifferentTypeInBaseClassTest extends RuleWithDifferentTypeInBaseClass { - @RavenwoodConfig.Config - public static RavenwoodConfig sConfig = new RavenwoodConfig.Builder().build(); - - @Test - public void test() { - } - } -} diff --git a/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/IdentityTest.java b/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/IdentityTest.java index 8e04b698c9d9..271c27f6ae93 100644 --- a/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/IdentityTest.java +++ b/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/IdentityTest.java @@ -15,7 +15,6 @@ */ package com.android.ravenwoodtest.runtimetest; -import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE; import static android.os.Process.FIRST_APPLICATION_UID; import static org.junit.Assert.assertEquals; @@ -23,7 +22,6 @@ import static org.junit.Assert.assertEquals; import android.os.Binder; import android.os.Build; import android.os.Process; -import android.platform.test.ravenwood.RavenwoodConfig; import android.system.Os; import com.android.ravenwood.RavenwoodRuntimeState; @@ -34,13 +32,6 @@ import org.junit.Test; public class IdentityTest { - @RavenwoodConfig.Config - public static final RavenwoodConfig sConfig = - new RavenwoodConfig.Builder() - .setTargetSdkLevel(UPSIDE_DOWN_CAKE) - .setProcessApp() - .build(); - @Test public void testUid() { assertEquals(FIRST_APPLICATION_UID, RavenwoodRuntimeState.sUid); @@ -60,7 +51,7 @@ public class IdentityTest { @Test public void testTargetSdkLevel() { assertEquals(Build.VERSION_CODES.CUR_DEVELOPMENT, RavenwoodRuntimeState.CUR_DEVELOPMENT); - assertEquals(UPSIDE_DOWN_CAKE, RavenwoodRuntimeState.sTargetSdkLevel); - assertEquals(UPSIDE_DOWN_CAKE, VMRuntime.getRuntime().getTargetSdkVersion()); + assertEquals(RavenwoodRuntimeState.sTargetSdkLevel, + VMRuntime.getRuntime().getTargetSdkVersion()); } } diff --git a/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/SystemPropertyTest.java b/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/SystemPropertyTest.java new file mode 100644 index 000000000000..70bf204ed823 --- /dev/null +++ b/ravenwood/tests/runtime-test/test/com/android/ravenwoodtest/runtimetest/SystemPropertyTest.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ravenwoodtest.runtimetest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import android.os.SystemProperties; +import android.platform.test.ravenwood.RavenwoodRule; + +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; + +public class SystemPropertyTest { + + private static final String PROP_KEY_1 = "debug.ravenwood.prop1"; + private static final String PROP_VAL_1 = "ravenwood.1"; + private static final String PROP_KEY_2 = "debug.ravenwood.prop2"; + private static final String PROP_VAL_2 = "ravenwood.2"; + private static final String PROP_KEY_3 = "debug.ravenwood.prop3"; + private static final String PROP_VAL_3 = "ravenwood.3"; + private static final String PROP_VAL_4 = "ravenwood.4"; + + @ClassRule(order = 0) + public static TestRule mCheckClassRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + assertTrue(SystemProperties.get(PROP_KEY_1).isEmpty()); + assertTrue(SystemProperties.get(PROP_KEY_3).isEmpty()); + try { + base.evaluate(); + } finally { + assertTrue(SystemProperties.get(PROP_KEY_1).isEmpty()); + assertTrue(SystemProperties.get(PROP_KEY_3).isEmpty()); + } + } + }; + + @ClassRule(order = 1) + public static RavenwoodRule mClassRule = new RavenwoodRule.Builder() + .setSystemPropertyImmutable(PROP_KEY_1, PROP_VAL_1) + .setSystemPropertyImmutable(PROP_KEY_3, PROP_VAL_4) + .build(); + + @Rule(order = 0) + public TestRule mCheckRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + assertTrue(SystemProperties.get(PROP_KEY_2).isEmpty()); + assertEquals(SystemProperties.get(PROP_KEY_3), PROP_VAL_4); + try { + base.evaluate(); + } finally { + assertTrue(SystemProperties.get(PROP_KEY_2).isEmpty()); + assertEquals(SystemProperties.get(PROP_KEY_3), PROP_VAL_4); + } + } + }; + + @Rule(order = 1) + public RavenwoodRule mRule = new RavenwoodRule.Builder() + .setSystemPropertyImmutable(PROP_KEY_2, PROP_VAL_2) + .setSystemPropertyImmutable(PROP_KEY_3, PROP_VAL_3) + .build(); + + @Test + public void testRavenwoodRuleSetProperty() { + assertEquals(SystemProperties.get(PROP_KEY_1), PROP_VAL_1); + assertEquals(SystemProperties.get(PROP_KEY_2), PROP_VAL_2); + assertEquals(SystemProperties.get(PROP_KEY_3), PROP_VAL_3); + } +} diff --git a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java index 4aae1e11b72e..e83a247bd769 100644 --- a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java +++ b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java @@ -24,8 +24,6 @@ import static org.junit.Assert.fail; import android.content.Context; import android.hardware.SerialManager; import android.hardware.SerialManagerInternal; -import android.platform.test.ravenwood.RavenwoodConfig; -import android.platform.test.ravenwood.RavenwoodConfig.Config; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; @@ -42,12 +40,6 @@ import org.junit.runner.RunWith; public class RavenwoodServicesTest { private static final String TEST_VIRTUAL_PORT = "virtual:example"; - @Config - public static final RavenwoodConfig sRavenwood = new RavenwoodConfig.Builder() - .setProcessSystem() - .setServicesRequired(SerialManager.class) - .build(); - private Context mContext; @Before diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java index d6fc6e461edc..7ef6aace1538 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java @@ -1180,18 +1180,8 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo } private boolean anyServiceWantsGenericMotionEvent(MotionEvent event) { - if (Flags.alwaysAllowObservingTouchEvents()) { - final boolean isTouchEvent = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN); - if (isTouchEvent && !canShareGenericTouchEvent()) { - return false; - } - final int eventSourceWithoutClass = event.getSource() & ~InputDevice.SOURCE_CLASS_MASK; - return (mCombinedGenericMotionEventSources & eventSourceWithoutClass) != 0; - } - // Disable SOURCE_TOUCHSCREEN generic event interception if any service is performing - // touch exploration. - if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) - && (mEnabledFeatures & FLAG_FEATURE_TOUCH_EXPLORATION) != 0) { + final boolean isTouchEvent = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN); + if (isTouchEvent && !canShareGenericTouchEvent()) { return false; } final int eventSourceWithoutClass = event.getSource() & ~InputDevice.SOURCE_CLASS_MASK; @@ -1199,21 +1189,8 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo } private boolean anyServiceWantsToObserveMotionEvent(MotionEvent event) { - if (Flags.alwaysAllowObservingTouchEvents()) { - final int eventSourceWithoutClass = event.getSource() & ~InputDevice.SOURCE_CLASS_MASK; - return (mCombinedMotionEventObservedSources & eventSourceWithoutClass) != 0; - } - // Disable SOURCE_TOUCHSCREEN generic event interception if any service is performing - // touch exploration. - if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) - && (mEnabledFeatures & FLAG_FEATURE_TOUCH_EXPLORATION) != 0) { - return false; - } final int eventSourceWithoutClass = event.getSource() & ~InputDevice.SOURCE_CLASS_MASK; - return (mCombinedGenericMotionEventSources - & mCombinedMotionEventObservedSources - & eventSourceWithoutClass) - != 0; + return (mCombinedMotionEventObservedSources & eventSourceWithoutClass) != 0; } private boolean canShareGenericTouchEvent() { diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index c210e726fc12..71a0fc453a95 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -3797,13 +3797,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub || (Flags.enableMagnificationMultipleFingerMultipleTapGesture() && userState.isMagnificationTwoFingerTripleTapEnabledLocked())); - final boolean createConnectionForCurrentCapability = - com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder() - || (userState.getMagnificationCapabilitiesLocked() - != Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN); - - final boolean connect = (shortcutEnabled && createConnectionForCurrentCapability) - || userHasMagnificationServicesLocked(userState); + final boolean connect = shortcutEnabled || userHasMagnificationServicesLocked(userState); getMagnificationConnectionManager().requestConnection(connect); } @@ -4852,8 +4846,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub getMagnificationConnectionManager().setConnection(connection); - if (com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder() - && connection == null + if (connection == null && mMagnificationController.isFullScreenMagnificationControllerInitialized()) { // Since the connection does not exist, the system ui cannot provide the border // implementation for fullscreen magnification. So we call reset to deactivate the @@ -6548,8 +6541,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub // Only continue setting up the packages if the service has been initialized. // See: b/340927041 - if (Flags.skipPackageChangeBeforeUserSwitch() - && !mManagerService.isServiceInitializedLocked()) { + if (!mManagerService.isServiceInitializedLocked()) { Slog.w(LOG_TAG, "onSomePackagesChanged: service not initialized, skip the callback."); return; diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java index d3d80e12313f..11b8ccb70dfb 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java @@ -699,10 +699,9 @@ public class FullScreenMagnificationController implements if (!mRegistered) { return false; } - // If the border implementation is on system ui side but the connection is not + // The border implementation is on system ui side but the connection is not // established, the fullscreen magnification should not work. - if (com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder() - && !mMagnificationConnectionStateSupplier.get()) { + if (!mMagnificationConnectionStateSupplier.get()) { return false; } if (DEBUG) { diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java index 51c4305061f8..058b2be5f4b3 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java @@ -51,7 +51,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.server.LocalServices; import com.android.server.accessibility.AccessibilityManagerService; import com.android.server.wm.WindowManagerInternal; -import com.android.window.flags.Flags; import java.util.concurrent.Executor; @@ -634,10 +633,8 @@ public class MagnificationController implements MagnificationConnectionManager.C @Override public void onFullScreenMagnificationActivationState(int displayId, boolean activated) { - if (Flags.alwaysDrawMagnificationFullscreenBorder()) { - getMagnificationConnectionManager() - .onFullscreenMagnificationActivationChanged(displayId, activated); - } + getMagnificationConnectionManager() + .onFullscreenMagnificationActivationChanged(displayId, activated); if (activated) { synchronized (mLock) { diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index 3dcca1433dec..4cf17ae3984d 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -69,6 +69,7 @@ import android.service.battery.BatteryServiceDumpProto; import android.sysprop.PowerProperties; import android.util.EventLog; import android.util.Slog; +import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; @@ -303,6 +304,17 @@ public final class BatteryService extends SystemService { */ @VisibleForTesting public long mLastBroadcastVoltageUpdateTime; + /** + * Time when the max charging current was updated last by HAL and we sent the + * {@link Intent#ACTION_BATTERY_CHANGED} broadcast. + * Note: This value is used to rate limit the {@link Intent#ACTION_BATTERY_CHANGED} broadcast + * so it is possible that max current was updated but we did not send the broadcast so in that + * case we do not update the time. + */ + @VisibleForTesting + public long mLastBroadcastMaxChargingCurrentUpdateTime; + + private boolean mIsFirstBatteryChangedUpdate = true; private Led mLed; @@ -350,16 +362,21 @@ public final class BatteryService extends SystemService { private static final int ABSOLUTE_DECI_CELSIUS_DIFF_FOR_TEMP_UPDATE = 10; /** * This value is used to rate limit the {@link Intent#ACTION_BATTERY_CHANGED} broadcast. We - * only send the broadcast if the last voltage was updated at least 20s seconds back and has a + * only send the broadcast if the last voltage was updated at least 20 seconds back and has a * fluctuation of at least 1%. */ private static final int TIME_DIFF_FOR_VOLTAGE_UPDATE_MS = 20000; /** * The value is used to rate limit the {@link Intent#ACTION_BATTERY_CHANGED} broadcast. We - * only send the broadcast if the last voltage was updated at least 20s seconds back and has a + * only send the broadcast if the last voltage was updated at least 20 seconds back and has a * fluctuation of at least 1%. */ private static final float BASE_POINT_DIFF_FOR_VOLTAGE_UPDATE = 0.01f; + /** + * This value is used to rate limit the {@link Intent#ACTION_BATTERY_CHANGED} broadcast. We + * only send the broadcast if the last max charging current was updated at least 5 seconds back. + */ + private static final int TIME_DIFF_FOR_MAX_CHARGING_CURRENT_UPDATE_MS = 5000; private final Handler.Callback mLocalCallback = msg -> { switch (msg.what) { @@ -1252,8 +1269,10 @@ public final class BatteryService extends SystemService { if (!com.android.server.flags.Flags.rateLimitBatteryChangedBroadcast()) { return false; } - if (mLastBroadcastBatteryVoltage == 0 || mLastBroadcastBatteryTemperature == 0) { + if (mIsFirstBatteryChangedUpdate) { mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime(); + mLastBroadcastMaxChargingCurrentUpdateTime = SystemClock.elapsedRealtime(); + mIsFirstBatteryChangedUpdate = false; return false; } @@ -1261,13 +1280,14 @@ public final class BatteryService extends SystemService { mLastBroadcastBatteryVoltage != mHealthInfo.batteryVoltageMillivolts; final boolean temperatureUpdated = mLastBroadcastBatteryTemperature != mHealthInfo.batteryTemperatureTenthsCelsius; + final boolean maxChargingCurrentUpdated = + mLastBroadcastMaxChargingCurrent != mHealthInfo.maxChargingCurrentMicroamps; final boolean otherStatesUpdated = forceUpdate || mHealthInfo.batteryStatus != mLastBroadcastBatteryStatus || mHealthInfo.batteryHealth != mLastBroadcastBatteryHealth || mHealthInfo.batteryPresent != mLastBroadcastBatteryPresent || mHealthInfo.batteryLevel != mLastBroadcastBatteryLevel || mPlugType != mLastBroadcastPlugType - || mHealthInfo.maxChargingCurrentMicroamps != mLastBroadcastMaxChargingCurrent || mHealthInfo.maxChargingVoltageMicrovolts != mLastBroadcastMaxChargingVoltage || mInvalidCharger != mLastBroadcastInvalidCharger || mHealthInfo.batteryCycleCount != mLastBroadcastBatteryCycleCount @@ -1280,6 +1300,9 @@ public final class BatteryService extends SystemService { if (voltageUpdated) { mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime(); } + if (maxChargingCurrentUpdated) { + mLastBroadcastMaxChargingCurrentUpdateTime = SystemClock.elapsedRealtime(); + } return false; } @@ -1295,6 +1318,9 @@ public final class BatteryService extends SystemService { >= TIME_DIFF_FOR_VOLTAGE_UPDATE_MS) { mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime(); + if (maxChargingCurrentUpdated) { + mLastBroadcastMaxChargingCurrentUpdateTime = SystemClock.elapsedRealtime(); + } return false; } @@ -1307,6 +1333,20 @@ public final class BatteryService extends SystemService { if (voltageUpdated) { mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime(); } + if (maxChargingCurrentUpdated) { + mLastBroadcastMaxChargingCurrentUpdateTime = SystemClock.elapsedRealtime(); + } + return false; + } + + if (maxChargingCurrentUpdated + && SystemClock.elapsedRealtime() - mLastBroadcastMaxChargingCurrentUpdateTime + >= TIME_DIFF_FOR_MAX_CHARGING_CURRENT_UPDATE_MS) { + mLastBroadcastMaxChargingCurrentUpdateTime = SystemClock.elapsedRealtime(); + + if (voltageUpdated) { + mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime(); + } return false; } @@ -1615,6 +1655,9 @@ public final class BatteryService extends SystemService { pw.println(" Wireless powered: " + mHealthInfo.chargerWirelessOnline); pw.println(" Dock powered: " + mHealthInfo.chargerDockOnline); pw.println(" Max charging current: " + mHealthInfo.maxChargingCurrentMicroamps); + pw.println(" Time when the latest updated value of the Max charging current was" + + " sent via battery changed broadcast: " + + TimeUtils.formatDuration(mLastBroadcastMaxChargingCurrentUpdateTime)); pw.println(" Max charging voltage: " + mHealthInfo.maxChargingVoltageMicrovolts); pw.println(" Charge counter: " + mHealthInfo.batteryChargeCounterUah); pw.println(" status: " + mHealthInfo.batteryStatus); @@ -1624,7 +1667,8 @@ public final class BatteryService extends SystemService { pw.println(" scale: " + BATTERY_SCALE); pw.println(" voltage: " + mHealthInfo.batteryVoltageMillivolts); pw.println(" Time when the latest updated value of the voltage was sent via " - + "battery changed broadcast: " + mLastBroadcastVoltageUpdateTime); + + "battery changed broadcast: " + + TimeUtils.formatDuration(mLastBroadcastVoltageUpdateTime)); pw.println(" The last voltage value sent via the battery changed broadcast: " + mLastBroadcastBatteryVoltage); pw.println(" temperature: " + mHealthInfo.batteryTemperatureTenthsCelsius); diff --git a/services/core/java/com/android/server/BinaryTransparencyService.java b/services/core/java/com/android/server/BinaryTransparencyService.java index aabbd3bf49ae..0286f7b0b73d 100644 --- a/services/core/java/com/android/server/BinaryTransparencyService.java +++ b/services/core/java/com/android/server/BinaryTransparencyService.java @@ -1580,10 +1580,20 @@ public class BinaryTransparencyService extends SystemService { } private void registerBicCallback() { + if(!com.android.server.flags.Flags.optionalBackgroundInstallControl()) { + Slog.d(TAG, "BICS is disabled for this device, skipping registration."); + return; + } IBackgroundInstallControlService iBics = IBackgroundInstallControlService.Stub.asInterface( ServiceManager.getService( Context.BACKGROUND_INSTALL_CONTROL_SERVICE)); + if(iBics == null) { + Slog.e(TAG, "Failed to register BackgroundInstallControl callback, either " + + "background install control service does not exist or disabled on this " + + "build."); + return; + } try { iBics.registerBackgroundInstallCallback( new BicCallbackHandler(mServiceImpl)); diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING index ce66dc3c76cb..8da835896bd3 100644 --- a/services/core/java/com/android/server/TEST_MAPPING +++ b/services/core/java/com/android/server/TEST_MAPPING @@ -176,6 +176,10 @@ "include-filter": "com.android.server.wm.BackgroundActivityStart*" } ] + }, + { + "name": "FrameworksMockingServicesTests_service_batteryServiceTest", + "file_patterns": ["BatteryService\\.java"] } ] } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 85c4c9eb5563..37d058b06b99 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -1407,6 +1407,12 @@ final class ActivityManagerShellCommand extends ShellCommand { heapFile = "/data/local/tmp/heapdump-" + logNameTimeString + ".prof"; } + String argAfterHeapFile = getNextArg(); + if (argAfterHeapFile != null) { + err.println("Error: Arguments cannot be placed after the heap file"); + return -1; + } + // Writes an error message to stderr on failure ParcelFileDescriptor fd = openFileForSystem(heapFile, "w"); if (fd == null) { diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index d5bd05764f38..400ebfde1741 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -1126,20 +1126,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub break; } case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL: - if (Flags.disableCompositeBatteryUsageStatsAtoms()) { - return StatsManager.PULL_SKIP; - } + return StatsManager.PULL_SKIP; - final BatteryUsageStatsQuery queryPowerProfile = - new BatteryUsageStatsQuery.Builder() - .setMaxStatsAgeMs(0) - .includeProcessStateData() - .includeVirtualUids() - .powerProfileModeledOnly() - .includePowerModels() - .build(); - bus = getBatteryUsageStats(List.of(queryPowerProfile)).get(0); - break; case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET: { if (Flags.disableCompositeBatteryUsageStatsAtoms()) { return StatsManager.PULL_SKIP; @@ -3184,7 +3172,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub } } - private void dumpUsageStats(FileDescriptor fd, PrintWriter pw, int model, + private void dumpUsageStats(FileDescriptor fd, PrintWriter pw, boolean proto, boolean accumulated) { awaitCompletion(); syncStats("dump", BatteryExternalStatsWorker.UPDATE_ALL); @@ -3196,9 +3184,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub if (Flags.batteryUsageStatsByPowerAndScreenState()) { builder.includeScreenStateData().includePowerStateData(); } - if (model == BatteryConsumer.POWER_MODEL_POWER_PROFILE) { - builder.powerProfileModeledOnly(); - } if (accumulated) { builder.accumulated(); } @@ -3393,7 +3378,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub dumpPowerProfile(pw); return; } else if ("--usage".equals(arg)) { - int model = BatteryConsumer.POWER_MODEL_UNDEFINED; boolean proto = false; boolean accumulated = false; for (int j = i + 1; j < args.length; j++) { @@ -3401,29 +3385,12 @@ public final class BatteryStatsService extends IBatteryStats.Stub case "--proto": proto = true; break; - case "--model": { - if (j + 1 < args.length) { - j++; - if ("power-profile".equals(args[j])) { - model = BatteryConsumer.POWER_MODEL_POWER_PROFILE; - } else { - pw.println("Unknown power model: " + args[j]); - dumpHelp(pw); - return; - } - } else { - pw.println("--model without a value"); - dumpHelp(pw); - return; - } - break; - } case "--accumulated": accumulated = true; break; } } - dumpUsageStats(fd, pw, model, proto, accumulated); + dumpUsageStats(fd, pw, proto, accumulated); return; } else if ("--wakeups".equals(arg)) { mCpuWakeupStats.dump(new IndentingPrintWriter(pw, " "), diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index fd6586ab99be..7660c154efd5 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -140,6 +140,7 @@ public class SettingsToPropertiesMapper { // The list is sorted. @VisibleForTesting static final String[] sDeviceConfigAconfigScopes = new String[] { + "aaos_audio_triage", "aaos_power_triage", "aaos_sdv", "accessibility", diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 5c2eb5cf1086..c6317bd29824 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4954,31 +4954,24 @@ public class AudioService extends IAudioService.Stub } final Set<Integer> deviceTypes = getDeviceSetForStreamDirect(streamType); + Set<Integer> absVolumeDeviceTypes = new ArraySet<>( + AudioSystem.DEVICE_OUT_ALL_A2DP_SET); + absVolumeDeviceTypes.addAll(mAbsVolumeMultiModeCaseDevices); - final Set<Integer> a2dpDevices = AudioSystem.intersectionAudioDeviceTypes( - AudioSystem.DEVICE_OUT_ALL_A2DP_SET, deviceTypes); - if (!a2dpDevices.isEmpty()) { - int index = getStreamVolume(streamType, - a2dpDevices.toArray(new Integer[0])[0].intValue()); - mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(index); - } - - final Set<Integer> absVolumeMultiModeCaseDevices = - AudioSystem.intersectionAudioDeviceTypes( - mAbsVolumeMultiModeCaseDevices, deviceTypes); - if (absVolumeMultiModeCaseDevices.isEmpty()) { + final Set<Integer> absVolumeDevices = + AudioSystem.intersectionAudioDeviceTypes(absVolumeDeviceTypes, deviceTypes); + if (absVolumeDevices.isEmpty()) { return; } - if (absVolumeMultiModeCaseDevices.size() > 1) { + if (absVolumeDevices.size() > 1) { Log.w(TAG, "onUpdateContextualVolumes too many active devices: " - + absVolumeMultiModeCaseDevices.stream().map(AudioSystem::getOutputDeviceName) + + absVolumeDevices.stream().map(AudioSystem::getOutputDeviceName) .collect(Collectors.joining(",")) + ", for stream: " + streamType); return; } - final int device = absVolumeMultiModeCaseDevices.toArray(new Integer[0])[0].intValue(); - + final int device = absVolumeDevices.toArray(new Integer[0])[0].intValue(); final int index = getStreamVolume(streamType, device); if (DEBUG_VOL) { @@ -4992,6 +4985,8 @@ public class AudioService extends IAudioService.Stub getVssForStreamOrDefault(streamType).getMaxIndex(), streamType); } else if (device == AudioSystem.DEVICE_OUT_HEARING_AID) { mDeviceBroker.postSetHearingAidVolumeIndex(index * 10, streamType); + } else if (AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)) { + mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(index); } else { return; } diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index a2200c9f8bf5..1c01fb9f19e0 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -17,7 +17,7 @@ package com.android.server.audio; import static android.media.AudioPlaybackConfiguration.EXTRA_PLAYER_EVENT_MUTE; -import static android.media.AudioPlaybackConfiguration.MUTED_BY_APP_OPS; +import static android.media.AudioPlaybackConfiguration.MUTED_BY_OP_PLAY_AUDIO; import static android.media.AudioPlaybackConfiguration.MUTED_BY_CLIENT_VOLUME; import static android.media.AudioPlaybackConfiguration.MUTED_BY_MASTER; import static android.media.AudioPlaybackConfiguration.MUTED_BY_PORT_VOLUME; @@ -1377,8 +1377,8 @@ public final class PlaybackActivityMonitor if ((eventValue & MUTED_BY_STREAM_MUTED) != 0) { builder.append("streamMute "); } - if ((eventValue & MUTED_BY_APP_OPS) != 0) { - builder.append("appOps "); + if ((eventValue & MUTED_BY_OP_PLAY_AUDIO) != 0) { + builder.append("opPlayAudio "); } if ((eventValue & MUTED_BY_CLIENT_VOLUME) != 0) { builder.append("clientVolume "); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index c74943c95a6a..3871f2a57f76 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -668,8 +668,7 @@ public final class DisplayManagerService extends SystemService { mExternalDisplayPolicy = new ExternalDisplayPolicy(new ExternalDisplayPolicyInjector()); if (mFlags.isDisplayTopologyEnabled()) { mDisplayTopologyCoordinator = - new DisplayTopologyCoordinator(this::isExtendedDisplayEnabled, - this::deliverTopologyUpdate, new HandlerExecutor(mHandler), mSyncRoot); + new DisplayTopologyCoordinator(this::isExtendedDisplayEnabled); } else { mDisplayTopologyCoordinator = null; } @@ -3503,28 +3502,6 @@ public final class DisplayManagerService extends SystemService { callbackRecord.notifyDisplayEventAsync(displayId, event); } - private void deliverTopologyUpdate(DisplayTopology topology) { - if (DEBUG) { - Slog.d(TAG, "Delivering topology update"); - } - if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { - Trace.instant(Trace.TRACE_TAG_POWER, "deliverTopologyUpdate"); - } - - // Grab the lock and copy the callbacks. - List<CallbackRecord> callbacks = new ArrayList<>(); - synchronized (mSyncRoot) { - for (int i = 0; i < mCallbacks.size(); i++) { - callbacks.add(mCallbacks.valueAt(i)); - } - } - - // After releasing the lock, send the notifications out. - for (CallbackRecord callback : callbacks) { - callback.notifyTopologyUpdateAsync(topology); - } - } - private boolean extraLogging(String packageName) { return mExtraDisplayEventLogging && mExtraDisplayLoggingPackageName.equals(packageName); } @@ -4160,7 +4137,7 @@ public final class DisplayManagerService extends SystemService { * cached or frozen. */ public boolean notifyDisplayEventAsync(int displayId, @DisplayEvent int event) { - if (!shouldSendDisplayEvent(event)) { + if (!shouldSendEvent(event)) { if (extraLogging(mPackageName)) { Slog.i(TAG, "Not sending displayEvent: " + event + " due to mask:" @@ -4214,7 +4191,7 @@ public final class DisplayManagerService extends SystemService { /** * Return true if the client is interested in this event. */ - private boolean shouldSendDisplayEvent(@DisplayEvent int event) { + private boolean shouldSendEvent(@DisplayEvent int event) { final long mask = mInternalEventFlagsMask.get(); switch (event) { case DisplayManagerGlobal.EVENT_DISPLAY_ADDED: @@ -4275,45 +4252,6 @@ public final class DisplayManagerService extends SystemService { mPendingEvents.add(new Event(displayId, event)); } - /** - * @return {@code false} if RemoteException happens; otherwise {@code true} for - * success. - */ - boolean notifyTopologyUpdateAsync(DisplayTopology topology) { - if ((mInternalEventFlagsMask.get() - & DisplayManagerGlobal.INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED) == 0) { - if (extraLogging(mPackageName)) { - Slog.i(TAG, "Not sending topology update: " + topology + " due to mask: " - + mInternalEventFlagsMask); - } - if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) { - Trace.instant(Trace.TRACE_TAG_POWER, - "notifyTopologyUpdateAsync#notSendingUpdate=" + topology - + ",mInternalEventFlagsMask=" + mInternalEventFlagsMask); - } - // The client is not interested in this event, so do nothing. - return true; - } - return transmitTopologyUpdate(topology); - } - - /** - * Transmit a single display topology update. The client is presumed ready. Return true on - * success and false if the client died. - */ - private boolean transmitTopologyUpdate(DisplayTopology topology) { - // The client is ready to receive the event. - try { - mCallback.onTopologyChanged(topology); - return true; - } catch (RemoteException ex) { - Slog.w(TAG, "Failed to notify process " - + mPid + " that display topology changed, assuming it died.", ex); - binderDied(); - return false; - } - } - // Send all pending events. This can safely be called if the process is not ready, but it // would be unusual to do so. The method returns true on success. // This is only used if {@link deferDisplayEventsWhenFrozen()} is true. diff --git a/services/core/java/com/android/server/display/DisplayTopologyCoordinator.java b/services/core/java/com/android/server/display/DisplayTopologyCoordinator.java index 55b292aefec4..47226861545f 100644 --- a/services/core/java/com/android/server/display/DisplayTopologyCoordinator.java +++ b/services/core/java/com/android/server/display/DisplayTopologyCoordinator.java @@ -25,9 +25,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import java.io.PrintWriter; -import java.util.concurrent.Executor; import java.util.function.BooleanSupplier; -import java.util.function.Consumer; /** * Manages the relative placement (topology) of extended displays. Responsible for updating and @@ -35,7 +33,7 @@ import java.util.function.Consumer; */ class DisplayTopologyCoordinator { - @GuardedBy("mSyncRoot") + @GuardedBy("mLock") private DisplayTopology mTopology; /** @@ -43,31 +41,16 @@ class DisplayTopologyCoordinator { */ private final BooleanSupplier mIsExtendedDisplayEnabled; - /** - * Callback used to send topology updates. - * Should be invoked from the corresponding executor. - * A copy of the topology should be sent that will not be modified by the system. - */ - private final Consumer<DisplayTopology> mOnTopologyChangedCallback; - private final Executor mTopologyChangeExecutor; - private final DisplayManagerService.SyncRoot mSyncRoot; - - DisplayTopologyCoordinator(BooleanSupplier isExtendedDisplayEnabled, - Consumer<DisplayTopology> onTopologyChangedCallback, - Executor topologyChangeExecutor, DisplayManagerService.SyncRoot syncRoot) { - this(new Injector(), isExtendedDisplayEnabled, onTopologyChangedCallback, - topologyChangeExecutor, syncRoot); + private final Object mLock = new Object(); + + DisplayTopologyCoordinator(BooleanSupplier isExtendedDisplayEnabled) { + this(new Injector(), isExtendedDisplayEnabled); } @VisibleForTesting - DisplayTopologyCoordinator(Injector injector, BooleanSupplier isExtendedDisplayEnabled, - Consumer<DisplayTopology> onTopologyChangedCallback, - Executor topologyChangeExecutor, DisplayManagerService.SyncRoot syncRoot) { + DisplayTopologyCoordinator(Injector injector, BooleanSupplier isExtendedDisplayEnabled) { mTopology = injector.getTopology(); mIsExtendedDisplayEnabled = isExtendedDisplayEnabled; - mOnTopologyChangedCallback = onTopologyChangedCallback; - mTopologyChangeExecutor = topologyChangeExecutor; - mSyncRoot = syncRoot; } /** @@ -78,9 +61,8 @@ class DisplayTopologyCoordinator { if (!isDisplayAllowedInTopology(info)) { return; } - synchronized (mSyncRoot) { + synchronized (mLock) { mTopology.addDisplay(info.displayId, getWidth(info), getHeight(info)); - sendTopologyUpdateLocked(); } } @@ -89,9 +71,8 @@ class DisplayTopologyCoordinator { * @param displayId The logical display ID */ void onDisplayRemoved(int displayId) { - synchronized (mSyncRoot) { + synchronized (mLock) { mTopology.removeDisplay(displayId); - sendTopologyUpdateLocked(); } } @@ -99,15 +80,14 @@ class DisplayTopologyCoordinator { * @return A deep copy of the topology. */ DisplayTopology getTopology() { - synchronized (mSyncRoot) { + synchronized (mLock) { return mTopology; } } void setTopology(DisplayTopology topology) { - synchronized (mSyncRoot) { + synchronized (mLock) { mTopology = topology; - sendTopologyUpdateLocked(); } } @@ -116,7 +96,7 @@ class DisplayTopologyCoordinator { * @param pw The stream to dump information to. */ void dump(PrintWriter pw) { - synchronized (mSyncRoot) { + synchronized (mLock) { mTopology.dump(pw); } } @@ -144,12 +124,6 @@ class DisplayTopologyCoordinator { && info.displayGroupId == Display.DEFAULT_DISPLAY_GROUP; } - @GuardedBy("mSyncRoot") - private void sendTopologyUpdateLocked() { - DisplayTopology copy = mTopology.copy(); - mTopologyChangeExecutor.execute(() -> mOnTopologyChangedCallback.accept(copy)); - } - @VisibleForTesting static class Injector { DisplayTopology getTopology() { diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java index e273c6862fe0..45106f54cb9f 100644 --- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java +++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java @@ -257,6 +257,11 @@ public class DisplayManagerFlags { Flags::displayListenerPerformanceImprovements ); + private final FlagState mSubscribeGranularDisplayEvents = new FlagState( + Flags.FLAG_SUBSCRIBE_GRANULAR_DISPLAY_EVENTS, + Flags::subscribeGranularDisplayEvents + ); + /** * @return {@code true} if 'port' is allowed in display layout configuration file. */ @@ -552,6 +557,13 @@ public class DisplayManagerFlags { } /** + * @return {@code true} if the flag for subscribing to granular display events is enabled + */ + public boolean isSubscribeGranularDisplayEventsEnabled() { + return mSubscribeGranularDisplayEvents.isEnabled(); + } + + /** * dumps all flagstates * @param pw printWriter */ @@ -605,6 +617,7 @@ public class DisplayManagerFlags { pw.println(" " + mGetSupportedRefreshRatesFlagState); pw.println(" " + mEnablePluginManagerFlagState); pw.println(" " + mDisplayListenerPerformanceImprovementsFlagState); + pw.println(" " + mSubscribeGranularDisplayEvents); } private static class FlagState { diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig index e7ea868ca04f..3976d01d806d 100644 --- a/services/core/java/com/android/server/display/feature/display_flags.aconfig +++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig @@ -478,3 +478,14 @@ flag { bug: "378385869" is_fixed_read_only: true } + +flag { + name: "subscribe_granular_display_events" + namespace: "display_manager" + description: "Enable subscription to granular display change events." + bug: "379250634" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/services/core/java/com/android/server/pm/PackageAbiHelper.java b/services/core/java/com/android/server/pm/PackageAbiHelper.java index c66a9e98c1d3..09302996d228 100644 --- a/services/core/java/com/android/server/pm/PackageAbiHelper.java +++ b/services/core/java/com/android/server/pm/PackageAbiHelper.java @@ -18,6 +18,7 @@ package com.android.server.pm; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.pm.ApplicationInfo; import android.util.ArraySet; import android.util.Pair; @@ -28,8 +29,6 @@ import com.android.server.pm.pkg.PackageStateInternal; import java.io.File; - - // TODO: Move to .parsing sub-package @VisibleForTesting public interface PackageAbiHelper { @@ -79,6 +78,23 @@ public interface PackageAbiHelper { AndroidPackage scannedPackage); /** + * Checks alignment of APK and native libraries for 16KB device + * + * @param pkg AndroidPackage for which alignment check is being done + * @param libraryRoot directory for libraries + * @param nativeLibraryRootRequiresIsa use isa + * @param cpuAbiOverride ABI override mentioned in package + * @return {ApplicationInfo.PageSizeAppCompat} if successful or error code + * which suggests undefined mode + */ + @ApplicationInfo.PageSizeAppCompatFlags + int checkPackageAlignment( + AndroidPackage pkg, + String libraryRoot, + boolean nativeLibraryRootRequiresIsa, + String cpuAbiOverride); + + /** * The native library paths and related properties that should be set on a * {@link ParsedPackage}. */ diff --git a/services/core/java/com/android/server/pm/PackageAbiHelperImpl.java b/services/core/java/com/android/server/pm/PackageAbiHelperImpl.java index 9db4d33106ce..0f245b6c2201 100644 --- a/services/core/java/com/android/server/pm/PackageAbiHelperImpl.java +++ b/services/core/java/com/android/server/pm/PackageAbiHelperImpl.java @@ -625,4 +625,20 @@ final class PackageAbiHelperImpl implements PackageAbiHelper { } return adjustedAbi; } + + @Override + public int checkPackageAlignment( + AndroidPackage pkg, + String libraryRoot, + boolean nativeLibraryRootRequiresIsa, + String abiOverride) { + NativeLibraryHelper.Handle handle = null; + try { + handle = AndroidPackageUtils.createNativeLibraryHandle(pkg); + return NativeLibraryHelper.checkAlignmentForCompatMode( + handle, libraryRoot, nativeLibraryRootRequiresIsa, abiOverride); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 715633410575..040b1943b23d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -5875,6 +5875,67 @@ public class PackageManagerService implements PackageSender, TestUtilityService userId, callingPackage); } + @Override + public void setPageSizeAppCompatFlagsSettingsOverride(String packageName, boolean enabled) { + final int callingUid = Binder.getCallingUid(); + final int callingAppId = UserHandle.getAppId(callingUid); + + if (!PackageManagerServiceUtils.isSystemOrRoot(callingAppId)) { + throw new SecurityException("Caller must be the system or root."); + } + + int settingsMode = enabled + ? ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED + : ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED; + PackageStateMutator.Result result = + commitPackageStateMutation( + null, + packageName, + packageState -> + packageState + .setPageSizeAppCompatFlags(settingsMode)); + if (result.isSpecificPackageNull()) { + throw new IllegalArgumentException("Unknown package: " + packageName); + } + scheduleWriteSettings(); + } + + @Override + public boolean isPageSizeCompatEnabled(String packageName) { + final int callingUid = Binder.getCallingUid(); + final int callingAppId = UserHandle.getAppId(callingUid); + final int userId = UserHandle.getCallingUserId(); + + if (!PackageManagerServiceUtils.isSystemOrRoot(callingAppId)) { + throw new SecurityException("Caller must be the system or root."); + } + + PackageStateInternal packageState = + snapshotComputer().getPackageStateForInstalledAndFiltered( + packageName, callingUid, userId); + + return packageState == null ? false : packageState.isPageSizeAppCompatEnabled(); + } + + @Override + public String getPageSizeCompatWarningMessage(String packageName) { + final int callingUid = Binder.getCallingUid(); + final int callingAppId = UserHandle.getAppId(callingUid); + final int userId = UserHandle.getCallingUserId(); + + if (!PackageManagerServiceUtils.isSystemOrRoot(callingAppId)) { + throw new SecurityException("Caller must be the system or root."); + } + + PackageStateInternal packageState = + snapshotComputer().getPackageStateForInstalledAndFiltered( + packageName, callingUid, userId); + + return packageState == null + ? null + : packageState.getPageSizeCompatWarningMessage(mContext); + } + @android.annotation.EnforcePermission(android.Manifest.permission.MANAGE_USERS) @Override public boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden, @@ -6579,6 +6640,20 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override + @NonNull + public List<String> getAllApexDirectories() { + PackageManagerServiceUtils.enforceSystemOrRoot( + "getAllApexDirectories can only be called by system or root"); + List<String> apexDirectories = new ArrayList<>(); + List<ApexManager.ActiveApexInfo> apexes = mApexManager.getActiveApexInfos(); + for (int i = 0; i < apexes.size(); i++) { + ApexManager.ActiveApexInfo apex = apexes.get(i); + apexDirectories.add(apex.apexDirectory.getAbsolutePath()); + } + return apexDirectories; + } + + @Override public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { try { diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java index 9428de700385..fb16b862b275 100644 --- a/services/core/java/com/android/server/pm/PackageSetting.java +++ b/services/core/java/com/android/server/pm/PackageSetting.java @@ -27,6 +27,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; import android.content.ComponentName; +import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.SharedLibraryInfo; @@ -221,6 +222,8 @@ public class PackageSetting extends SettingBase implements PackageStateInternal /** @see PackageState#getCategoryOverride() */ private int categoryOverride = ApplicationInfo.CATEGORY_UNDEFINED; + private int mPageSizeAppCompatFlags = ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED; + @NonNull private final PackageStateUnserialized pkgState = new PackageStateUnserialized(this); @@ -863,6 +866,8 @@ public class PackageSetting extends SettingBase implements PackageStateInternal } copyMimeGroups(other.mimeGroups); + mPageSizeAppCompatFlags = other.mPageSizeAppCompatFlags; + pkgState.updateFrom(other.pkgState); onChanged(); } @@ -1617,6 +1622,34 @@ public class PackageSetting extends SettingBase implements PackageStateInternal return this; } + /** + * @see Set page size app compat mode. + */ + public PackageSetting setPageSizeAppCompatFlags(int mode) { + if (mode < 0 || mode >= ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MAX) { + throw new IllegalArgumentException("Invalid page size compat mode specified"); + } + + // OR assignment is used here to avoid overriding the mode set by the manifest. + this.mPageSizeAppCompatFlags |= mode; + + // Only one bit of the following can be set at same time. Both are needed to detect app + // compat 'disabled' state from settings vs bit was never set. + if (ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED == mode) { + this.mPageSizeAppCompatFlags &= + ~ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED; + } else if (ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED == mode) { + this.mPageSizeAppCompatFlags &= + ~ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED; + } + onChanged(); + return this; + } + + public int getPageSizeAppCompatFlags() { + return mPageSizeAppCompatFlags; + } + public PackageSetting setLegacyNativeLibraryPath( String legacyNativeLibraryPathString) { this.legacyNativeLibraryPath = legacyNativeLibraryPathString; @@ -1787,6 +1820,63 @@ public class PackageSetting extends SettingBase implements PackageStateInternal return getBoolean(Booleans.SCANNED_AS_STOPPED_SYSTEM_APP); } + /** Returns true if ELF files will be loaded in Page size compatibility mode */ + @Override + public boolean isPageSizeAppCompatEnabled() { + // If manifest or settings has disabled the compat mode, don't run app in compat mode. + boolean manifestOverrideDisabled = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED) != 0; + boolean settingsOverrideDisabled = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED) != 0; + if (manifestOverrideDisabled || settingsOverrideDisabled) { + return false; + } + + int mask = + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED + | ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED + | ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED; + return (mPageSizeAppCompatFlags & mask) != 0; + } + + /** + * Returns dialog string based on alignment of uncompressed shared libs inside the APK and ELF + * alignment. + */ + @Override + public String getPageSizeCompatWarningMessage(Context context) { + boolean manifestOverrideEnabled = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED) != 0; + boolean settingsOverrideEnabled = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED) != 0; + if (manifestOverrideEnabled || settingsOverrideEnabled) { + return null; + } + + boolean uncompressedLibsNotAligned = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNCOMPRESSED_LIBS_NOT_ALIGNED) != 0; + boolean elfNotAligned = (mPageSizeAppCompatFlags + & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_ELF_NOT_ALIGNED) != 0; + + if (uncompressedLibsNotAligned && elfNotAligned) { + return context.getText( + com.android.internal.R.string.page_size_compat_apk_and_elf_warning) + .toString(); + } + + if (uncompressedLibsNotAligned) { + return context.getText(com.android.internal.R.string.page_size_compat_apk_warning) + .toString(); + } + + if (elfNotAligned) { + return context.getText(com.android.internal.R.string.page_size_compat_elf_warning) + .toString(); + } + + return null; + } + // Code below generated by codegen v1.0.23. @@ -1952,7 +2042,6 @@ public class PackageSetting extends SettingBase implements PackageStateInternal @Deprecated private void __metadata() {} - //@formatter:on // End of generated code diff --git a/services/core/java/com/android/server/pm/ScanPackageUtils.java b/services/core/java/com/android/server/pm/ScanPackageUtils.java index 0802e9ee50bc..2665196bf3be 100644 --- a/services/core/java/com/android/server/pm/ScanPackageUtils.java +++ b/services/core/java/com/android/server/pm/ScanPackageUtils.java @@ -52,6 +52,7 @@ import static com.android.server.pm.PackageManagerServiceUtils.getLastModifiedTi import android.annotation.NonNull; import android.annotation.Nullable; import android.content.pm.ApplicationInfo; +import android.content.pm.Flags; import android.content.pm.PackageManager; import android.content.pm.SharedLibraryInfo; import android.content.pm.SigningDetails; @@ -63,6 +64,8 @@ import android.os.Process; import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; +import android.system.Os; +import android.system.OsConstants; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; @@ -105,6 +108,9 @@ import java.util.UUID; * Helper class that handles package scanning logic */ final class ScanPackageUtils { + + public static final int PAGE_SIZE_16KB = 16384; + /** * Just scans the package without any side effects. * @@ -418,6 +424,32 @@ final class ScanPackageUtils { + " abiOverride=" + pkgSetting.getCpuAbiOverride()); } + boolean is16KbDevice = Os.sysconf(OsConstants._SC_PAGESIZE) == PAGE_SIZE_16KB; + if (Flags.appCompatOption16kb() && is16KbDevice) { + // Alignment checks are used decide whether this app should run in compat mode when + // nothing was specified in manifest. Manifest should always take precedence over + // something decided by platform. + if (parsedPackage.getPageSizeAppCompatFlags() + > ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED) { + pkgSetting.setPageSizeAppCompatFlags(parsedPackage.getPageSizeAppCompatFlags()); + } else { + // 16 KB is only support for 64 bit ABIs and for apps which are being installed + // Check alignment. System, Apex and Platform packages should be page-agnostic now + if ((Build.SUPPORTED_64_BIT_ABIS.length > 0) + && !isSystemApp + && !isApex + && !isPlatformPackage) { + int mode = + packageAbiHelper.checkPackageAlignment( + parsedPackage, + pkgSetting.getLegacyNativeLibraryPath(), + parsedPackage.isNativeLibraryRootRequiresIsa(), + pkgSetting.getCpuAbiOverride()); + pkgSetting.setPageSizeAppCompatFlags(mode); + } + } + } + if ((scanFlags & SCAN_BOOTING) == 0 && oldSharedUserSetting != null) { // We don't do this here during boot because we can do it all // at once after scanning all existing packages. diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 1f672a093b38..485a28070bc5 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -3313,6 +3313,11 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile if (pkg.getBaseRevisionCode() != 0) { serializer.attributeInt(null, "baseRevisionCode", pkg.getBaseRevisionCode()); } + if (pkg.getPageSizeAppCompatFlags() + != ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED) { + serializer.attributeInt(null, "pageSizeCompat", pkg.getPageSizeAppCompatFlags()); + } + serializer.attributeFloat(null, "loadingProgress", pkg.getLoadingProgress()); serializer.attributeLongHex(null, "loadingCompletedTime", pkg.getLoadingCompletedTime()); @@ -4129,6 +4134,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile boolean isScannedAsStoppedSystemApp = false; boolean isSdkLibrary = false; int baseRevisionCode = 0; + int PageSizeCompat = 0; try { name = parser.getAttributeValue(null, ATTR_NAME); realName = parser.getAttributeValue(null, "realName"); @@ -4175,6 +4181,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile appMetadataSource = parser.getAttributeInt(null, "appMetadataSource", PackageManager.APP_METADATA_SOURCE_UNKNOWN); baseRevisionCode = parser.getAttributeInt(null, "baseRevisionCode", 0); + PageSizeCompat = parser.getAttributeInt(null, "pageSizeCompat", + ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED); isScannedAsStoppedSystemApp = parser.getAttributeBoolean(null, "scannedAsStoppedSystemApp", false); @@ -4330,7 +4338,8 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile .setTargetSdkVersion(targetSdkVersion) .setBaseRevisionCode(baseRevisionCode) .setRestrictUpdateHash(restrictUpdateHash) - .setScannedAsStoppedSystemApp(isScannedAsStoppedSystemApp); + .setScannedAsStoppedSystemApp(isScannedAsStoppedSystemApp) + .setPageSizeAppCompatFlags(PageSizeCompat); // Handle legacy string here for single-user mode final String enabledStr = parser.getAttributeValue(null, ATTR_ENABLED); if (enabledStr != null) { @@ -5211,6 +5220,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile pw.print(" (override=true)"); } pw.println(); + pw.print(prefix); + pw.print(" pageSizeCompat="); + pw.print(ps.getPageSizeAppCompatFlags()); + pw.println(); if (!ps.getPkg().getQueriesPackages().isEmpty()) { pw.append(prefix).append(" queriesPackages=") .println(ps.getPkg().getQueriesPackages()); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index b2b8aaf7dd2a..066fce068d61 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -6122,8 +6122,11 @@ public class UserManagerService extends IUserManager.Stub { // If the user switch hasn't been explicitly toggled on or off by the user, turn it on. if (android.provider.Settings.Global.getString(mContext.getContentResolver(), android.provider.Settings.Global.USER_SWITCHER_ENABLED) == null) { - android.provider.Settings.Global.putInt(mContext.getContentResolver(), - android.provider.Settings.Global.USER_SWITCHER_ENABLED, 1); + if (Resources.getSystem().getBoolean( + com.android.internal.R.bool.config_enableUserSwitcherUponUserCreation)) { + android.provider.Settings.Global.putInt(mContext.getContentResolver(), + android.provider.Settings.Global.USER_SWITCHER_ENABLED, 1); + } } } } diff --git a/services/core/java/com/android/server/pm/pkg/PackageState.java b/services/core/java/com/android/server/pm/pkg/PackageState.java index bbc17c83cfac..33fc066a62ee 100644 --- a/services/core/java/com/android/server/pm/pkg/PackageState.java +++ b/services/core/java/com/android/server/pm/pkg/PackageState.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.Size; import android.annotation.SystemApi; import android.annotation.UserIdInt; +import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -198,6 +199,21 @@ public interface PackageState { int getCategoryOverride(); /** + * Returns true if ELF files will be loaded in Page size compatibility mode + * + * @hide + */ + boolean isPageSizeAppCompatEnabled(); + + /** + * Returns dialog string based on alignment of uncompressed shared libs inside the APK and ELF + * alignment. + * + * @hide + */ + String getPageSizeCompatWarningMessage(Context context); + + /** * The install time CPU override, if any. This value is written at install time * and doesn't change during the life of an install. If non-null, * {@link #getPrimaryCpuAbiLegacy()} will also contain the same value. diff --git a/services/core/java/com/android/server/pm/pkg/mutate/PackageStateMutator.java b/services/core/java/com/android/server/pm/pkg/mutate/PackageStateMutator.java index 253eb4006122..a46c4a695d60 100644 --- a/services/core/java/com/android/server/pm/pkg/mutate/PackageStateMutator.java +++ b/services/core/java/com/android/server/pm/pkg/mutate/PackageStateMutator.java @@ -257,6 +257,16 @@ public class PackageStateMutator { @NonNull @Override + public PackageStateWrite setPageSizeAppCompatFlags( + @ApplicationInfo.PageSizeAppCompatFlags int mode) { + if (mState != null) { + mState.setPageSizeAppCompatFlags(mode); + } + return this; + } + + @NonNull + @Override public PackageStateWrite setUpdateAvailable(boolean updateAvailable) { if (mState != null) { mState.setUpdateAvailable(updateAvailable); diff --git a/services/core/java/com/android/server/pm/pkg/mutate/PackageStateWrite.java b/services/core/java/com/android/server/pm/pkg/mutate/PackageStateWrite.java index 55d96f3aee08..f8f8695b2832 100644 --- a/services/core/java/com/android/server/pm/pkg/mutate/PackageStateWrite.java +++ b/services/core/java/com/android/server/pm/pkg/mutate/PackageStateWrite.java @@ -46,6 +46,10 @@ public interface PackageStateWrite { @NonNull PackageStateWrite setCategoryOverride(@ApplicationInfo.Category int category); + /** set 16Kb App compat mode. @see ApplicationInfo.PageSizeAppCompatFlags */ + @NonNull + PackageStateWrite setPageSizeAppCompatFlags(@ApplicationInfo.PageSizeAppCompatFlags int mode); + @NonNull PackageStateWrite setUpdateAvailable(boolean updateAvailable); diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index 71f67d82dbec..aba15c83f907 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -34,7 +34,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.hardware.power.ChannelConfig; import android.hardware.power.CpuHeadroomParams; +import android.hardware.power.CpuHeadroomResult; import android.hardware.power.GpuHeadroomParams; +import android.hardware.power.GpuHeadroomResult; import android.hardware.power.IPower; import android.hardware.power.SessionConfig; import android.hardware.power.SessionTag; @@ -79,6 +81,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; @@ -96,10 +99,10 @@ public final class HintManagerService extends SystemService { private static final int EVENT_CLEAN_UP_UID = 3; @VisibleForTesting static final int CLEAN_UP_UID_DELAY_MILLIS = 1000; + // The minimum interval between the headroom calls as rate limiting. private static final int DEFAULT_GPU_HEADROOM_INTERVAL_MILLIS = 1000; private static final int DEFAULT_CPU_HEADROOM_INTERVAL_MILLIS = 1000; private static final int HEADROOM_INTERVAL_UNSUPPORTED = -1; - @VisibleForTesting static final int DEFAULT_HEADROOM_PID = -1; @VisibleForTesting final long mHintSessionPreferredRate; @@ -184,73 +187,77 @@ public final class HintManagerService extends SystemService { private static final String PROPERTY_SF_ENABLE_CPU_HINT = "debug.sf.enable_adpf_cpu_hint"; private static final String PROPERTY_HWUI_ENABLE_HINT_MANAGER = "debug.hwui.use_hint_manager"; private static final String PROPERTY_USE_HAL_HEADROOMS = "persist.hms.use_hal_headrooms"; + private static final String PROPERTY_CHECK_HEADROOM_TID = "persist.hms.check_headroom_tid"; private Boolean mFMQUsesIntegratedEventFlag = false; private final Object mCpuHeadroomLock = new Object(); - private static class CpuHeadroomCacheItem { - long mExpiredTimeMillis; - CpuHeadroomParamsInternal mParams; - float[] mHeadroom; - long mPid; - CpuHeadroomCacheItem(long expiredTimeMillis, CpuHeadroomParamsInternal params, - float[] headroom, long pid) { - mExpiredTimeMillis = expiredTimeMillis; - mParams = params; - mPid = pid; - mHeadroom = headroom; - } + // this cache tracks the expiration time of the items and performs cleanup on lookup + private static class HeadroomCache<K, V> { + final List<HeadroomCacheItem> mItemList; + final Map<K, HeadroomCacheItem> mKeyItemMap; + final long mItemExpDurationMillis; + + class HeadroomCacheItem { + long mExpTime; + K mKey; + V mValue; - private boolean match(CpuHeadroomParamsInternal params, long pid) { - if (mParams == null && params == null) return true; - if (mParams != null) { - return mParams.equals(params) && pid == mPid; + HeadroomCacheItem(K k, V v) { + mExpTime = System.currentTimeMillis() + mItemExpDurationMillis; + mKey = k; + mValue = v; } - return false; - } - private boolean isExpired() { - return System.currentTimeMillis() > mExpiredTimeMillis; + boolean isExpired() { + return mExpTime <= System.currentTimeMillis(); + } } - } - - @GuardedBy("mCpuHeadroomLock") - private final List<CpuHeadroomCacheItem> mCpuHeadroomCache; - private final long mCpuHeadroomIntervalMillis; - - private final Object mGpuHeadroomLock = new Object(); - private static class GpuHeadroomCacheItem { - long mExpiredTimeMillis; - GpuHeadroomParamsInternal mParams; - float mHeadroom; - - GpuHeadroomCacheItem(long expiredTimeMillis, GpuHeadroomParamsInternal params, - float headroom) { - mExpiredTimeMillis = expiredTimeMillis; - mParams = params; - mHeadroom = headroom; + void add(K key, V value) { + if (mKeyItemMap.containsKey(key)) { + final HeadroomCacheItem item = mKeyItemMap.get(key); + mItemList.remove(item); + } + final HeadroomCacheItem item = new HeadroomCacheItem(key, value); + mItemList.add(item); + mKeyItemMap.put(key, item); } - private boolean match(GpuHeadroomParamsInternal params) { - if (mParams == null && params == null) return true; - if (mParams != null) { - return mParams.equals(params); + V get(K key) { + while (!mItemList.isEmpty() && mItemList.getFirst().isExpired()) { + mKeyItemMap.remove(mItemList.removeFirst().mKey); } - return false; + final HeadroomCacheItem item = mKeyItemMap.get(key); + if (item == null) { + return null; + } + return item.mValue; } - private boolean isExpired() { - return System.currentTimeMillis() > mExpiredTimeMillis; + HeadroomCache(int size, long expDurationMillis) { + mItemList = new LinkedList<>(); + mKeyItemMap = new ArrayMap<>(size); + mItemExpDurationMillis = expDurationMillis; } } + @GuardedBy("mCpuHeadroomLock") + private final HeadroomCache<CpuHeadroomParams, CpuHeadroomResult> mCpuHeadroomCache; + private final long mCpuHeadroomIntervalMillis; + + private final Object mGpuHeadroomLock = new Object(); + @GuardedBy("mGpuHeadroomLock") - private final List<GpuHeadroomCacheItem> mGpuHeadroomCache; + private final HeadroomCache<GpuHeadroomParams, GpuHeadroomResult> mGpuHeadroomCache; private final long mGpuHeadroomIntervalMillis; + // these are set to default values in CpuHeadroomParamsInternal and GpuHeadroomParamsInternal + private final int mDefaultCpuHeadroomCalculationWindowMillis; + private final int mDefaultGpuHeadroomCalculationWindowMillis; + @VisibleForTesting final IHintManager.Stub mService = new BinderService(); @@ -303,26 +310,31 @@ public final class HintManagerService extends SystemService { } } mCpuHeadroomIntervalMillis = cpuHeadroomIntervalMillis; + mDefaultCpuHeadroomCalculationWindowMillis = + new CpuHeadroomParamsInternal().calculationWindowMillis; + mDefaultGpuHeadroomCalculationWindowMillis = + new GpuHeadroomParamsInternal().calculationWindowMillis; mGpuHeadroomIntervalMillis = gpuHeadroomIntervalMillis; if (mCpuHeadroomIntervalMillis > 0) { - mCpuHeadroomCache = new ArrayList<>(4); + mCpuHeadroomCache = new HeadroomCache<>(2, mCpuHeadroomIntervalMillis); } else { mCpuHeadroomCache = null; } if (mGpuHeadroomIntervalMillis > 0) { - mGpuHeadroomCache = new ArrayList<>(2); + mGpuHeadroomCache = new HeadroomCache<>(2, mGpuHeadroomIntervalMillis); } else { mGpuHeadroomCache = null; } } private long checkCpuHeadroomSupport() { + final CpuHeadroomParams params = new CpuHeadroomParams(); + params.tids = new int[]{Process.myPid()}; try { synchronized (mCpuHeadroomLock) { - final CpuHeadroomParams defaultParams = new CpuHeadroomParams(); - defaultParams.pid = Process.myPid(); - float[] ret = mPowerHal.getCpuHeadroom(defaultParams); - if (ret != null && ret.length > 0) { + final CpuHeadroomResult ret = mPowerHal.getCpuHeadroom(params); + if (ret != null && ret.getTag() == CpuHeadroomResult.globalHeadroom + && !Float.isNaN(ret.getGlobalHeadroom())) { return Math.max( DEFAULT_CPU_HEADROOM_INTERVAL_MILLIS, mPowerHal.getCpuHeadroomMinIntervalMillis()); @@ -330,27 +342,29 @@ public final class HintManagerService extends SystemService { } } catch (UnsupportedOperationException e) { - Slog.w(TAG, "getCpuHeadroom HAL API is not supported", e); + Slog.w(TAG, "getCpuHeadroom HAL API is not supported, params: " + params, e); } catch (RemoteException e) { - Slog.e(TAG, "getCpuHeadroom HAL API fails, disabling the API", e); + Slog.e(TAG, "getCpuHeadroom HAL API fails, disabling the API, params: " + params, e); } return HEADROOM_INTERVAL_UNSUPPORTED; } private long checkGpuHeadroomSupport() { + final GpuHeadroomParams params = new GpuHeadroomParams(); try { synchronized (mGpuHeadroomLock) { - float ret = mPowerHal.getGpuHeadroom(new GpuHeadroomParams()); - if (!Float.isNaN(ret)) { + final GpuHeadroomResult ret = mPowerHal.getGpuHeadroom(params); + if (ret != null && ret.getTag() == GpuHeadroomResult.globalHeadroom && !Float.isNaN( + ret.getGlobalHeadroom())) { return Math.max( DEFAULT_GPU_HEADROOM_INTERVAL_MILLIS, mPowerHal.getGpuHeadroomMinIntervalMillis()); } } } catch (UnsupportedOperationException e) { - Slog.w(TAG, "getGpuHeadroom HAL API is not supported", e); + Slog.w(TAG, "getGpuHeadroom HAL API is not supported, params: " + params, e); } catch (RemoteException e) { - Slog.e(TAG, "getGpuHeadroom HAL API fails, disabling the API", e); + Slog.e(TAG, "getGpuHeadroom HAL API fails, disabling the API, params: " + params, e); } return HEADROOM_INTERVAL_UNSUPPORTED; } @@ -1445,109 +1459,98 @@ public final class HintManagerService extends SystemService { } @Override - public float[] getCpuHeadroom(@Nullable CpuHeadroomParamsInternal params) { + public CpuHeadroomResult getCpuHeadroom(@NonNull CpuHeadroomParamsInternal params) { if (mCpuHeadroomIntervalMillis <= 0) { throw new UnsupportedOperationException(); } - CpuHeadroomParams halParams = new CpuHeadroomParams(); - halParams.pid = Binder.getCallingPid(); - if (params != null) { - halParams.calculationType = params.calculationType; - halParams.selectionType = params.selectionType; - if (params.usesDeviceHeadroom) { - halParams.pid = DEFAULT_HEADROOM_PID; - } - } - synchronized (mCpuHeadroomLock) { - while (!mCpuHeadroomCache.isEmpty()) { - if (mCpuHeadroomCache.getFirst().isExpired()) { - mCpuHeadroomCache.removeFirst(); - } else { - break; + final CpuHeadroomParams halParams = new CpuHeadroomParams(); + halParams.tids = new int[]{Binder.getCallingPid()}; + halParams.calculationType = params.calculationType; + halParams.calculationWindowMillis = params.calculationWindowMillis; + halParams.selectionType = params.selectionType; + if (params.usesDeviceHeadroom) { + halParams.tids = new int[]{}; + } else if (params.tids != null && params.tids.length > 0) { + if (params.tids.length > 5) { + throw new IllegalArgumentException( + "More than 5 TIDs is requested: " + params.tids.length); + } + if (SystemProperties.getBoolean(PROPERTY_CHECK_HEADROOM_TID, true)) { + final int tgid = Process.getThreadGroupLeader(Binder.getCallingPid()); + for (int tid : params.tids) { + if (Process.getThreadGroupLeader(tid) != tgid) { + throw new SecurityException("TID " + tid + + " doesn't belong to the calling process with pid " + + tgid); + } } } - for (int i = 0; i < mCpuHeadroomCache.size(); ++i) { - final CpuHeadroomCacheItem item = mCpuHeadroomCache.get(i); - if (item.match(params, halParams.pid)) { - item.mExpiredTimeMillis = - System.currentTimeMillis() + mCpuHeadroomIntervalMillis; - mCpuHeadroomCache.remove(i); - mCpuHeadroomCache.add(item); - return item.mHeadroom; - } + halParams.tids = params.tids; + } + if (halParams.calculationWindowMillis + == mDefaultCpuHeadroomCalculationWindowMillis) { + synchronized (mCpuHeadroomLock) { + final CpuHeadroomResult res = mCpuHeadroomCache.get(halParams); + if (res != null) return res; } } // return from HAL directly try { - float[] headroom = mPowerHal.getCpuHeadroom(halParams); - if (headroom == null || headroom.length == 0) { - Slog.wtf(TAG, - "CPU headroom from Power HAL is invalid: " + Arrays.toString(headroom)); - return new float[]{Float.NaN}; - } - synchronized (mCpuHeadroomLock) { - mCpuHeadroomCache.add(new CpuHeadroomCacheItem( - System.currentTimeMillis() + mCpuHeadroomIntervalMillis, - params, headroom, halParams.pid - )); + final CpuHeadroomResult result = mPowerHal.getCpuHeadroom(halParams); + if (result == null) { + Slog.wtf(TAG, "CPU headroom from Power HAL is invalid"); + return null; + } + if (halParams.calculationWindowMillis + == mDefaultCpuHeadroomCalculationWindowMillis) { + synchronized (mCpuHeadroomLock) { + mCpuHeadroomCache.add(halParams, result); + } } - return headroom; - + return result; } catch (RemoteException e) { - return new float[]{Float.NaN}; + Slog.e(TAG, "Failed to get CPU headroom from Power HAL", e); + return null; } } @Override - public float getGpuHeadroom(@Nullable GpuHeadroomParamsInternal params) { + public GpuHeadroomResult getGpuHeadroom(@NonNull GpuHeadroomParamsInternal params) { if (mGpuHeadroomIntervalMillis <= 0) { throw new UnsupportedOperationException(); } - GpuHeadroomParams halParams = new GpuHeadroomParams(); - if (params != null) { - halParams.calculationType = params.calculationType; - } - synchronized (mGpuHeadroomLock) { - while (!mGpuHeadroomCache.isEmpty()) { - if (mGpuHeadroomCache.getFirst().isExpired()) { - mGpuHeadroomCache.removeFirst(); - } else { - break; - } - } - for (int i = 0; i < mGpuHeadroomCache.size(); ++i) { - final GpuHeadroomCacheItem item = mGpuHeadroomCache.get(i); - if (item.match(params)) { - item.mExpiredTimeMillis = - System.currentTimeMillis() + mGpuHeadroomIntervalMillis; - mGpuHeadroomCache.remove(i); - mGpuHeadroomCache.add(item); - return item.mHeadroom; - } + final GpuHeadroomParams halParams = new GpuHeadroomParams(); + halParams.calculationType = params.calculationType; + halParams.calculationWindowMillis = params.calculationWindowMillis; + if (halParams.calculationWindowMillis + == mDefaultGpuHeadroomCalculationWindowMillis) { + synchronized (mGpuHeadroomLock) { + final GpuHeadroomResult res = mGpuHeadroomCache.get(halParams); + if (res != null) return res; } } // return from HAL directly try { - float headroom = mPowerHal.getGpuHeadroom(halParams); - if (Float.isNaN(headroom)) { - Slog.wtf(TAG, - "GPU headroom from Power HAL is NaN"); - return Float.NaN; - } - synchronized (mGpuHeadroomLock) { - mGpuHeadroomCache.add(new GpuHeadroomCacheItem( - System.currentTimeMillis() + mGpuHeadroomIntervalMillis, - params, headroom - )); + final GpuHeadroomResult headroom = mPowerHal.getGpuHeadroom(halParams); + if (headroom == null) { + Slog.wtf(TAG, "GPU headroom from Power HAL is invalid"); + return null; + } + if (halParams.calculationWindowMillis + == mDefaultGpuHeadroomCalculationWindowMillis) { + synchronized (mGpuHeadroomLock) { + mGpuHeadroomCache.add(halParams, headroom); + } } return headroom; } catch (RemoteException e) { - return Float.NaN; + Slog.e(TAG, "Failed to get GPU headroom from Power HAL", e); + return null; } } @Override - public long getCpuHeadroomMinIntervalMillis() throws RemoteException { + public long getCpuHeadroomMinIntervalMillis() { if (mCpuHeadroomIntervalMillis <= 0) { throw new UnsupportedOperationException(); } @@ -1555,7 +1558,7 @@ public final class HintManagerService extends SystemService { } @Override - public long getGpuHeadroomMinIntervalMillis() throws RemoteException { + public long getGpuHeadroomMinIntervalMillis() { if (mGpuHeadroomIntervalMillis <= 0) { throw new UnsupportedOperationException(); } @@ -1591,17 +1594,23 @@ public final class HintManagerService extends SystemService { CpuHeadroomParamsInternal params = new CpuHeadroomParamsInternal(); params.selectionType = CpuHeadroomParams.SelectionType.ALL; params.usesDeviceHeadroom = true; - pw.println("CPU headroom: " + Arrays.toString(getCpuHeadroom(params))); + CpuHeadroomResult ret = getCpuHeadroom(params); + pw.println("CPU headroom: " + (ret == null ? "N/A" : ret.getGlobalHeadroom())); params = new CpuHeadroomParamsInternal(); params.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; params.usesDeviceHeadroom = true; - pw.println("CPU headroom per core: " + Arrays.toString(getCpuHeadroom(params))); + ret = getCpuHeadroom(params); + pw.println("CPU headroom per core: " + (ret == null ? "N/A" + : Arrays.toString(ret.getPerCoreHeadroom()))); } catch (Exception e) { + Slog.d(TAG, "Failed to dump CPU headroom", e); pw.println("CPU headroom: N/A"); } try { - pw.println("GPU headroom: " + getGpuHeadroom(null)); + GpuHeadroomResult ret = getGpuHeadroom(new GpuHeadroomParamsInternal()); + pw.println("GPU headroom: " + (ret == null ? "N/A" : ret.getGlobalHeadroom())); } catch (Exception e) { + Slog.d(TAG, "Failed to dump GPU headroom", e); pw.println("GPU headroom: N/A"); } } diff --git a/services/core/java/com/android/server/power/hint/flags.aconfig b/services/core/java/com/android/server/power/hint/flags.aconfig index e56b68c93480..c231f5a6caec 100644 --- a/services/core/java/com/android/server/power/hint/flags.aconfig +++ b/services/core/java/com/android/server/power/hint/flags.aconfig @@ -21,3 +21,10 @@ flag { description: "Set reset_on_fork flag." bug: "370988407" } + +flag { + name: "cpu_headroom_affinity_check" + namespace: "game" + description: "Check affinity on CPU headroom." + bug: "346604998" +} diff --git a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java index 606bd1dd0f3f..63e8d9973237 100644 --- a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java +++ b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java @@ -26,6 +26,7 @@ import android.os.BatteryUsageStatsQuery; import android.os.Handler; import android.os.Process; import android.util.Log; +import android.util.LogWriter; import android.util.Slog; import android.util.SparseArray; @@ -34,6 +35,7 @@ import com.android.internal.os.CpuScalingPolicies; import com.android.internal.os.MonotonicClock; import com.android.internal.os.PowerProfile; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -44,6 +46,8 @@ import java.util.List; */ public class BatteryUsageStatsProvider { private static final String TAG = "BatteryUsageStatsProv"; + private static final boolean DEBUG = false; + private final Context mContext; private final PowerAttributor mPowerAttributor; private final PowerStatsStore mPowerStatsStore; @@ -262,17 +266,25 @@ public class BatteryUsageStatsProvider { private BatteryUsageStats getBatteryUsageStats(BatteryStatsImpl stats, BatteryUsageStatsQuery query, long currentTimeMs) { + BatteryUsageStats batteryUsageStats; if ((query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_ACCUMULATED) != 0) { - return getAccumulatedBatteryUsageStats(stats, query, currentTimeMs); + batteryUsageStats = getAccumulatedBatteryUsageStats(stats, query, currentTimeMs); } else if (query.getAggregatedToTimestamp() == 0) { BatteryUsageStats.Builder builder = computeBatteryUsageStats(stats, query, query.getMonotonicStartTime(), query.getMonotonicEndTime(), currentTimeMs); - return builder.build(); + batteryUsageStats = builder.build(); } else { - return getAggregatedBatteryUsageStats(stats, query); + batteryUsageStats = getAggregatedBatteryUsageStats(stats, query); + } + if (DEBUG) { + Slog.d(TAG, "query = " + query); + PrintWriter pw = new PrintWriter(new LogWriter(Log.DEBUG, TAG)); + batteryUsageStats.dump(pw, ""); + pw.flush(); } + return batteryUsageStats; } private BatteryUsageStats getAccumulatedBatteryUsageStats(BatteryStatsImpl stats, @@ -319,7 +331,7 @@ public class BatteryUsageStatsProvider { if (accumulatedStats.builder == null) { accumulatedStats.builder = new BatteryUsageStats.Builder( - stats.getCustomEnergyConsumerNames(), false, true, true, true, 0); + stats.getCustomEnergyConsumerNames(), true, true, true, 0); accumulatedStats.startWallClockTime = stats.getStartClockTime(); accumulatedStats.builder.setStatsStartTimestamp(accumulatedStats.startWallClockTime); } @@ -338,8 +350,6 @@ public class BatteryUsageStatsProvider { private BatteryUsageStats.Builder computeBatteryUsageStats(BatteryStatsImpl stats, BatteryUsageStatsQuery query, long monotonicStartTime, long monotonicEndTime, long currentTimeMs) { - final boolean includePowerModels = (query.getFlags() - & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS) != 0; final boolean includeProcessStateData = ((query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA) != 0) && stats.isProcessStateDataAvailable(); @@ -353,8 +363,7 @@ public class BatteryUsageStatsProvider { } final BatteryUsageStats.Builder batteryUsageStatsBuilder = new BatteryUsageStats.Builder( - customEnergyConsumerNames, includePowerModels, - includeProcessStateData, query.isScreenStateDataNeeded(), + customEnergyConsumerNames, includeProcessStateData, query.isScreenStateDataNeeded(), query.isPowerStateDataNeeded(), minConsumedPowerThreshold); synchronized (stats) { @@ -444,8 +453,6 @@ public class BatteryUsageStatsProvider { private BatteryUsageStats getAggregatedBatteryUsageStats(BatteryStatsImpl stats, BatteryUsageStatsQuery query) { - final boolean includePowerModels = (query.getFlags() - & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS) != 0; final boolean includeProcessStateData = ((query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA) != 0) && stats.isProcessStateDataAvailable(); @@ -453,7 +460,7 @@ public class BatteryUsageStatsProvider { final String[] customEnergyConsumerNames = stats.getCustomEnergyConsumerNames(); final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - customEnergyConsumerNames, includePowerModels, includeProcessStateData, + customEnergyConsumerNames, includeProcessStateData, query.isScreenStateDataNeeded(), query.isPowerStateDataNeeded(), minConsumedPowerThreshold); if (mPowerStatsStore == null) { diff --git a/services/core/java/com/android/server/power/stats/processor/PowerStatsExporter.java b/services/core/java/com/android/server/power/stats/processor/PowerStatsExporter.java index b2442c81b2e5..ef0e63bece90 100644 --- a/services/core/java/com/android/server/power/stats/processor/PowerStatsExporter.java +++ b/services/core/java/com/android/server/power/stats/processor/PowerStatsExporter.java @@ -224,13 +224,12 @@ class PowerStatsExporter { BatteryConsumer.Key key = getKeyForPartialTotal(batteryUsageStatsBuilder, deviceScope, powerComponentId, screenState, powerState); if (key != null) { - deviceScope.addConsumedPower(key, totalPower[0], - BatteryConsumer.POWER_MODEL_UNDEFINED); + deviceScope.addConsumedPower(key, totalPower[0]); deviceScope.addUsageDurationMillis(key, durationMs[0]); } key = deviceScope.getKey(powerComponentId, BatteryConsumer.PROCESS_STATE_UNSPECIFIED); if (key != null) { - deviceScope.addConsumedPower(key, totalPower[0], BatteryConsumer.POWER_MODEL_UNDEFINED); + deviceScope.addConsumedPower(key, totalPower[0]); deviceScope.addUsageDurationMillis(key, durationMs[0]); } } @@ -373,7 +372,7 @@ class PowerStatsExporter { BatteryConsumer.Key key = builder.getKey(powerComponentId, procState, resultScreenState, resultPowerState); if (key != null) { - builder.addConsumedPower(key, power, BatteryConsumer.POWER_MODEL_UNDEFINED); + builder.addConsumedPower(key, power); builder.addUsageDurationMillis(key, duration); } } @@ -384,8 +383,7 @@ class PowerStatsExporter { BatteryConsumer.PROCESS_STATE_UNSPECIFIED); if (key != null) { builder.addConsumedPower(key, - powerByProcState[BatteryConsumer.PROCESS_STATE_UNSPECIFIED], - BatteryConsumer.POWER_MODEL_UNDEFINED); + powerByProcState[BatteryConsumer.PROCESS_STATE_UNSPECIFIED]); builder.addUsageDurationMillis(key, durationByProcState[BatteryConsumer.PROCESS_STATE_UNSPECIFIED]); } @@ -399,11 +397,9 @@ class PowerStatsExporter { BatteryConsumer.Key key = getKeyForPartialTotal(batteryUsageStatsBuilder, allAppsScope, powerComponentId, screenState, powerState); if (key != null) { - allAppsScope.addConsumedPower(key, powerAllApps, - BatteryConsumer.POWER_MODEL_UNDEFINED); + allAppsScope.addConsumedPower(key, powerAllApps); } - allAppsScope.addConsumedPower(powerComponentId, powerAllApps, - BatteryConsumer.POWER_MODEL_UNDEFINED); + allAppsScope.addConsumedPower(powerComponentId, powerAllApps); } @Nullable diff --git a/services/core/java/com/android/server/security/advancedprotection/AdvancedProtectionService.java b/services/core/java/com/android/server/security/advancedprotection/AdvancedProtectionService.java index c9655c684e7f..2cc08c327b71 100644 --- a/services/core/java/com/android/server/security/advancedprotection/AdvancedProtectionService.java +++ b/services/core/java/com/android/server/security/advancedprotection/AdvancedProtectionService.java @@ -46,6 +46,7 @@ import com.android.server.SystemService; import com.android.server.pm.UserManagerInternal; import com.android.server.security.advancedprotection.features.AdvancedProtectionHook; import com.android.server.security.advancedprotection.features.AdvancedProtectionProvider; +import com.android.server.security.advancedprotection.features.DisallowCellular2GAdvancedProtectionHook; import com.android.server.security.advancedprotection.features.DisallowInstallUnknownSourcesAdvancedProtectionHook; import com.android.server.security.advancedprotection.features.MemoryTaggingExtensionHook; @@ -84,6 +85,9 @@ public class AdvancedProtectionService extends IAdvancedProtectionService.Stub if (android.security.Flags.aapmFeatureMemoryTaggingExtension()) { mHooks.add(new MemoryTaggingExtensionHook(mContext, enabled)); } + if (android.security.Flags.aapmFeatureDisableCellular2g()) { + mHooks.add(new DisallowCellular2GAdvancedProtectionHook(mContext, enabled)); + } } // Only for tests diff --git a/services/core/java/com/android/server/security/advancedprotection/features/DisallowCellular2GAdvancedProtectionHook.java b/services/core/java/com/android/server/security/advancedprotection/features/DisallowCellular2GAdvancedProtectionHook.java new file mode 100644 index 000000000000..b9c8d3dc5319 --- /dev/null +++ b/services/core/java/com/android/server/security/advancedprotection/features/DisallowCellular2GAdvancedProtectionHook.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.security.advancedprotection.features; + +import static android.security.advancedprotection.AdvancedProtectionManager.ADVANCED_PROTECTION_SYSTEM_ENTITY; +import static android.security.advancedprotection.AdvancedProtectionManager.FEATURE_ID_DISALLOW_CELLULAR_2G; + +import android.annotation.NonNull; +import android.app.admin.DevicePolicyManager; +import android.content.Context; +import android.os.UserManager; +import android.security.advancedprotection.AdvancedProtectionFeature; +import android.telephony.TelephonyManager; +import android.util.Slog; + +/** @hide */ +public final class DisallowCellular2GAdvancedProtectionHook extends AdvancedProtectionHook { + private static final String TAG = "AdvancedProtectionDisallowCellular2G"; + + private final AdvancedProtectionFeature mFeature = + new AdvancedProtectionFeature(FEATURE_ID_DISALLOW_CELLULAR_2G); + private final DevicePolicyManager mDevicePolicyManager; + private final TelephonyManager mTelephonyManager; + + public DisallowCellular2GAdvancedProtectionHook(@NonNull Context context, boolean enabled) { + super(context, enabled); + mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class); + mTelephonyManager = context.getSystemService(TelephonyManager.class); + + setPolicy(enabled); + } + + @NonNull + @Override + public AdvancedProtectionFeature getFeature() { + return mFeature; + } + + @Override + public boolean isAvailable() { + return mTelephonyManager.isDataCapable(); + } + + private void setPolicy(boolean enabled) { + Slog.i(TAG, "setPolicy called with " + enabled); + + if (enabled) { + Slog.d(TAG, "Setting DISALLOW_CELLULAR_2G_GLOBALLY restriction"); + mDevicePolicyManager.addUserRestrictionGlobally( + ADVANCED_PROTECTION_SYSTEM_ENTITY, UserManager.DISALLOW_CELLULAR_2G); + } else { + Slog.d(TAG, "Clearing DISALLOW_CELLULAR_2G_GLOBALLY restriction"); + mDevicePolicyManager.clearUserRestrictionGlobally( + ADVANCED_PROTECTION_SYSTEM_ENTITY, UserManager.DISALLOW_CELLULAR_2G); + } + } + + @Override + public void onAdvancedProtectionChanged(boolean enabled) { + setPolicy(enabled); + + // Leave 2G disabled even if APM is disabled. + if (!enabled) { + long oldAllowedTypes = + mTelephonyManager.getAllowedNetworkTypesForReason( + TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G); + long newAllowedTypes = oldAllowedTypes & ~TelephonyManager.NETWORK_CLASS_BITMASK_2G; + mTelephonyManager.setAllowedNetworkTypesForReason( + TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G, newAllowedTypes); + } + } +} diff --git a/services/core/java/com/android/server/security/intrusiondetection/DataAggregator.java b/services/core/java/com/android/server/security/intrusiondetection/DataAggregator.java index 06e9dcdcbedd..0ea88e8523f0 100644 --- a/services/core/java/com/android/server/security/intrusiondetection/DataAggregator.java +++ b/services/core/java/com/android/server/security/intrusiondetection/DataAggregator.java @@ -36,6 +36,9 @@ public class DataAggregator { private static final int MSG_DISABLE = 2; private static final int STORED_EVENTS_SIZE_LIMIT = 1024; + private static final IntrusionDetectionAdminReceiver ADMIN_RECEIVER = + new IntrusionDetectionAdminReceiver(); + private final IntrusionDetectionService mIntrusionDetectionService; private final ArrayList<DataSource> mDataSources; @@ -60,10 +63,19 @@ public class DataAggregator { * Initialize DataSources * @return Whether the initialization succeeds. */ - // TODO: Add the corresponding data sources public boolean initialize() { SecurityLogSource securityLogSource = new SecurityLogSource(mContext, this); mDataSources.add(securityLogSource); + + NetworkLogSource networkLogSource = new NetworkLogSource(mContext, this); + ADMIN_RECEIVER.setNetworkLogEventCallback(networkLogSource); + mDataSources.add(networkLogSource); + + for (DataSource ds : mDataSources) { + if (!ds.initialize()) { + return false; + } + } return true; } diff --git a/services/core/java/com/android/server/security/intrusiondetection/DataSource.java b/services/core/java/com/android/server/security/intrusiondetection/DataSource.java index 0bc448245b76..61fac46be82d 100644 --- a/services/core/java/com/android/server/security/intrusiondetection/DataSource.java +++ b/services/core/java/com/android/server/security/intrusiondetection/DataSource.java @@ -18,6 +18,11 @@ package com.android.server.security.intrusiondetection; public interface DataSource { /** + * Initialize the data source. + */ + boolean initialize(); + + /** * Enable the data collection. */ void enable(); diff --git a/services/core/java/com/android/server/security/intrusiondetection/IntrusionDetectionAdminReceiver.java b/services/core/java/com/android/server/security/intrusiondetection/IntrusionDetectionAdminReceiver.java new file mode 100644 index 000000000000..dba7374fe02a --- /dev/null +++ b/services/core/java/com/android/server/security/intrusiondetection/IntrusionDetectionAdminReceiver.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.security.intrusiondetection; + +import android.app.admin.DeviceAdminReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Slog; + +public class IntrusionDetectionAdminReceiver extends DeviceAdminReceiver { + private static final String TAG = "IntrusionDetectionAdminReceiver"; + + private static NetworkLogSource sNetworkLogSource; + + @Override + public void onNetworkLogsAvailable( + Context context, Intent intent, long batchToken, int networkLogsCount) { + if (sNetworkLogSource != null) { + sNetworkLogSource.onNetworkLogsAvailable(batchToken); + } else { + Slog.w(TAG, "Network log receiver is not initialized"); + } + } + + public void setNetworkLogEventCallback(NetworkLogSource networkLogSource) { + sNetworkLogSource = networkLogSource; + } +} diff --git a/services/core/java/com/android/server/security/intrusiondetection/NetworkLogSource.java b/services/core/java/com/android/server/security/intrusiondetection/NetworkLogSource.java new file mode 100644 index 000000000000..1c93d3f9c6a1 --- /dev/null +++ b/services/core/java/com/android/server/security/intrusiondetection/NetworkLogSource.java @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.security.intrusiondetection; + +import android.app.admin.ConnectEvent; +import android.app.admin.DevicePolicyManager; +import android.app.admin.DnsEvent; +import android.app.admin.NetworkEvent; +import android.content.ComponentName; +import android.content.Context; +import android.security.intrusiondetection.IntrusionDetectionEvent; +import android.util.Slog; + +import java.util.List; +import java.util.stream.Collectors; + +public class NetworkLogSource implements DataSource { + + private static final String TAG = "IntrusionDetectionEvent NetworkLogSource"; + + private DevicePolicyManager mDpm; + private ComponentName mAdmin; + private DataAggregator mDataAggregator; + + public NetworkLogSource(Context context, DataAggregator dataAggregator) { + mDataAggregator = dataAggregator; + mDpm = context.getSystemService(DevicePolicyManager.class); + mAdmin = new ComponentName(context, IntrusionDetectionAdminReceiver.class); + } + + @Override + public boolean initialize() { + try { + if (!mDpm.isAdminActive(mAdmin)) { + Slog.e(TAG, "Admin " + mAdmin.flattenToString() + "is not active admin"); + return false; + } + } catch (SecurityException e) { + Slog.e(TAG, "Security exception in initialize: ", e); + return false; + } + return true; + } + + @Override + public void enable() { + enableNetworkLog(); + } + + @Override + public void disable() { + disableNetworkLog(); + } + + private void enableNetworkLog() { + if (!isNetworkLogEnabled()) { + mDpm.setNetworkLoggingEnabled(mAdmin, true); + } + } + + private void disableNetworkLog() { + if (isNetworkLogEnabled()) { + mDpm.setNetworkLoggingEnabled(mAdmin, false); + } + } + + private boolean isNetworkLogEnabled() { + return mDpm.isNetworkLoggingEnabled(mAdmin); + } + + /** + * Retrieve network logs when onNetworkLogsAvailable callback is received. + * + * @param batchToken The token representing the current batch of network logs. + */ + public void onNetworkLogsAvailable(long batchToken) { + List<NetworkEvent> events; + try { + events = mDpm.retrieveNetworkLogs(mAdmin, batchToken); + } catch (SecurityException e) { + Slog.e( + TAG, + "Admin " + + mAdmin.flattenToString() + + "does not have permission to retrieve network logs", + e); + return; + } + if (events == null) { + if (!isNetworkLogEnabled()) { + Slog.w(TAG, "Network logging is disabled"); + } else { + Slog.e(TAG, "Invalid batch token: " + batchToken); + } + return; + } + + List<IntrusionDetectionEvent> intrusionDetectionEvents = + events.stream() + .filter(event -> event != null) + .map(event -> toIntrusionDetectionEvent(event)) + .collect(Collectors.toList()); + mDataAggregator.addBatchData(intrusionDetectionEvents); + } + + private IntrusionDetectionEvent toIntrusionDetectionEvent(NetworkEvent event) { + if (event instanceof DnsEvent) { + DnsEvent dnsEvent = (DnsEvent) event; + return new IntrusionDetectionEvent(dnsEvent); + } else if (event instanceof ConnectEvent) { + ConnectEvent connectEvent = (ConnectEvent) event; + return new IntrusionDetectionEvent(connectEvent); + } + throw new IllegalArgumentException( + "Invalid event type with ID: " + + event.getId() + + "from package: " + + event.getPackageName()); + } +} diff --git a/services/core/java/com/android/server/security/intrusiondetection/SecurityLogSource.java b/services/core/java/com/android/server/security/intrusiondetection/SecurityLogSource.java index 226f9d879cab..c5f736e383b2 100644 --- a/services/core/java/com/android/server/security/intrusiondetection/SecurityLogSource.java +++ b/services/core/java/com/android/server/security/intrusiondetection/SecurityLogSource.java @@ -22,6 +22,7 @@ import android.app.admin.DevicePolicyManager; import android.app.admin.SecurityLog.SecurityEvent; import android.content.Context; import android.security.intrusiondetection.IntrusionDetectionEvent; +import android.util.Slog; import java.util.List; import java.util.concurrent.Executor; @@ -33,7 +34,7 @@ public class SecurityLogSource implements DataSource { private static final String TAG = "IntrusionDetection SecurityLogSource"; - private SecurityEventCallback mEventCallback = new SecurityEventCallback(); + private SecurityEventCallback mEventCallback; private DevicePolicyManager mDpm; private Executor mExecutor; private DataAggregator mDataAggregator; @@ -42,9 +43,26 @@ public class SecurityLogSource implements DataSource { mDataAggregator = dataAggregator; mDpm = context.getSystemService(DevicePolicyManager.class); mExecutor = Executors.newSingleThreadExecutor(); + } + + @Override + public boolean initialize() { + // Confirm caller is system and the device is managed. Otherwise logs will + // be redacted. + try { + if (!mDpm.isDeviceManaged()) { + Slog.e(TAG, "Caller does not have device owner permissions"); + return false; + } + } catch (SecurityException e) { + Slog.e(TAG, "Security exception in initialize: ", e); + return false; + } mEventCallback = new SecurityEventCallback(); + return true; } + @Override @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void enable() { @@ -72,12 +90,8 @@ public class SecurityLogSource implements DataSource { } } - /** - * Check if security audit logging is enabled for the caller. - * - * @return Whether security audit logging is enabled. - */ - public boolean isAuditLogEnabled() { + @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) + private boolean isAuditLogEnabled() { return mDpm.isAuditLogEnabled(); } diff --git a/services/core/java/com/android/server/utils/WatchableImpl.java b/services/core/java/com/android/server/utils/WatchableImpl.java index 8a04ccf2dbc6..fec435154c83 100644 --- a/services/core/java/com/android/server/utils/WatchableImpl.java +++ b/services/core/java/com/android/server/utils/WatchableImpl.java @@ -33,6 +33,7 @@ public class WatchableImpl implements Watchable { /** * The list of observers. */ + @GuardedBy("mObservers") protected final ArrayList<Watcher> mObservers = new ArrayList<>(); /** @@ -83,7 +84,9 @@ public class WatchableImpl implements Watchable { * @return The number of registered observers. */ public int registeredObserverCount() { - return mObservers.size(); + synchronized (mObservers) { + return mObservers.size(); + } } /** diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 4b7e74af474c..dd769173fb34 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -25,7 +25,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_MAGNIFI import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY; import static android.view.WindowManager.TRANSIT_FLAG_IS_RECENTS; -import static com.android.internal.util.DumpUtils.dumpSparseArray; import static com.android.internal.util.DumpUtils.dumpSparseArrayValues; import static com.android.server.accessibility.AccessibilityTraceFileProto.ENTRY; import static com.android.server.accessibility.AccessibilityTraceFileProto.MAGIC_NUMBER; @@ -49,23 +48,15 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowTracingLegacy.WINSCOPE_EXT; import android.accessibilityservice.AccessibilityTrace; -import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Application; import android.content.Context; import android.content.pm.PackageManagerInternal; -import android.graphics.BLASTBufferQueue; -import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Insets; import android.graphics.Matrix; -import android.graphics.Paint; import android.graphics.Path; -import android.graphics.PixelFormat; import android.graphics.Point; -import android.graphics.PorterDuff.Mode; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; @@ -83,25 +74,16 @@ import android.util.Pair; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; -import android.util.TypedValue; import android.util.proto.ProtoOutputStream; import android.view.Display; import android.view.MagnificationSpec; import android.view.Surface; -import android.view.Surface.OutOfResourcesException; -import android.view.SurfaceControl; import android.view.ViewConfiguration; import android.view.WindowInfo; import android.view.WindowManager; import android.view.WindowManager.TransitionFlags; import android.view.WindowManager.TransitionType; -import android.view.WindowManagerPolicyConstants; -import android.view.animation.DecelerateInterpolator; -import android.view.animation.Interpolator; -import com.android.internal.R; -import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.SomeArgs; import com.android.internal.util.TraceBuffer; import com.android.internal.util.function.pooled.PooledLambda; @@ -111,7 +93,6 @@ 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; -import com.android.window.flags.Flags; import java.io.File; import java.io.IOException; @@ -301,36 +282,6 @@ final class AccessibilityController { } } - /** It is only used by unit test. */ - @VisibleForTesting - Surface forceShowMagnifierSurface(int displayId) { - final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId); - if (displayMagnifier != null) { - displayMagnifier.mMagnifiedViewport.mWindow.setAlpha(DisplayMagnifier.MagnifiedViewport - .ViewportWindow.AnimationController.MAX_ALPHA); - return displayMagnifier.mMagnifiedViewport.mWindow.mSurface; - } - return null; - } - - void onWindowLayersChanged(int displayId) { - if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK - | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) { - mAccessibilityTracing.logTrace(TAG + ".onWindowLayersChanged", - FLAGS_MAGNIFICATION_CALLBACK | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK, - "displayId=" + displayId); - } - final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId); - if (displayMagnifier != null) { - displayMagnifier.onWindowLayersChanged(); - } - final WindowsForAccessibilityObserver windowsForA11yObserver = - mWindowsForAccessibilityObserver.get(displayId); - if (windowsForA11yObserver != null) { - windowsForA11yObserver.scheduleComputeChangedWindows(); - } - } - void onDisplaySizeChanged(DisplayContent displayContent) { if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK @@ -563,9 +514,6 @@ final class AccessibilityController { } void dump(PrintWriter pw, String prefix) { - dumpSparseArray(pw, prefix, mDisplayMagnifiers, "magnification display", - (index, key) -> pw.printf("%sDisplay #%d:", prefix + " ", key), - dm -> dm.dump(pw, "")); dumpSparseArrayValues(pw, prefix, mWindowsForAccessibilityObserver, "windows for accessibility observer"); mAccessibilityWindowsPopulator.dump(pw, prefix); @@ -623,7 +571,6 @@ final class AccessibilityController { private final Context mDisplayContext; private final WindowManagerService mService; - private final MagnifiedViewport mMagnifiedViewport; private final Handler mHandler; private final DisplayContent mDisplayContent; private final Display mDisplay; @@ -660,8 +607,6 @@ final class AccessibilityController { mDisplay = display; mHandler = new MyHandler(mService.mH.getLooper()); mUserContextChangedNotifier = new UserContextChangedNotifier(mHandler); - mMagnifiedViewport = Flags.alwaysDrawMagnificationFullscreenBorder() - ? null : new MagnifiedViewport(); mAccessibilityTracing = AccessibilityController.getAccessibilityControllerInternal(mService); mLongAnimationDuration = mDisplayContext.getResources().getInteger( @@ -703,10 +648,6 @@ final class AccessibilityController { } else { mMagnificationSpec.clear(); } - - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.setShowMagnifiedBorderIfNeeded(); - } } void setFullscreenMagnificationActivated(boolean activated) { @@ -715,10 +656,6 @@ final class AccessibilityController { FLAGS_MAGNIFICATION_CALLBACK, "activated=" + activated); } mIsFullscreenMagnificationActivated = activated; - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.setMagnifiedRegionBorderShown(activated, true); - mMagnifiedViewport.showMagnificationBoundsIfNeeded(); - } } boolean isFullscreenMagnificationActivated() { @@ -729,18 +666,6 @@ final class AccessibilityController { return mIsFullscreenMagnificationActivated; } - void onWindowLayersChanged() { - if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { - mAccessibilityTracing.logTrace( - LOG_TAG + ".onWindowLayersChanged", FLAGS_MAGNIFICATION_CALLBACK); - } - if (DEBUG_LAYERS) { - Slog.i(LOG_TAG, "Layers changed."); - } - recomputeBounds(); - mService.scheduleAnimationLocked(); - } - void onDisplaySizeChanged(DisplayContent displayContent) { if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { mAccessibilityTracing.logTrace(LOG_TAG + ".onDisplaySizeChanged", @@ -753,9 +678,6 @@ final class AccessibilityController { } recomputeBounds(); - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.onDisplaySizeChanged(); - } mHandler.sendEmptyMessage(MyHandler.MESSAGE_NOTIFY_DISPLAY_SIZE_CHANGED); } @@ -926,10 +848,6 @@ final class AccessibilityController { if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { mAccessibilityTracing.logTrace(LOG_TAG + ".destroy", FLAGS_MAGNIFICATION_CALLBACK); } - - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.destroyWindow(); - } } void recomputeMagnifiedRegionAndDrawMagnifiedRegionBorderIfNeeded() { @@ -939,10 +857,6 @@ final class AccessibilityController { FLAGS_MAGNIFICATION_CALLBACK); } recomputeBounds(); - - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.drawWindowIfNeeded(); - } } void recomputeBounds() { @@ -1050,16 +964,9 @@ final class AccessibilityController { } visibleWindows.clear(); - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.intersectWithDrawBorderInset(screenWidth, screenHeight); - } - final boolean magnifiedChanged = !mOldMagnificationRegion.equals(mMagnificationRegion); if (magnifiedChanged) { - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.updateBorderDrawingStatus(screenWidth, screenHeight); - } mOldMagnificationRegion.set(mMagnificationRegion); final SomeArgs args = SomeArgs.obtain(); args.arg1 = Region.obtain(mMagnificationRegion); @@ -1139,420 +1046,11 @@ final class AccessibilityController { outSize.set(bounds.width(), bounds.height()); } - void dump(PrintWriter pw, String prefix) { - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.dump(pw, prefix); - } - } - - private final class MagnifiedViewport { - - private final float mBorderWidth; - private final int mHalfBorderWidth; - private final int mDrawBorderInset; - - @Nullable private final ViewportWindow mWindow; - - private boolean mFullRedrawNeeded; - - MagnifiedViewport() { - mBorderWidth = mDisplayContext.getResources().getDimension( - com.android.internal.R.dimen.accessibility_magnification_indicator_width); - mHalfBorderWidth = (int) Math.ceil(mBorderWidth / 2); - mDrawBorderInset = (int) mBorderWidth / 2; - mWindow = new ViewportWindow(mDisplayContext); - } - - void updateBorderDrawingStatus(int screenWidth, int screenHeight) { - mWindow.setBounds(mMagnificationRegion); - final Rect dirtyRect = mTempRect1; - if (mFullRedrawNeeded) { - mFullRedrawNeeded = false; - dirtyRect.set(mDrawBorderInset, mDrawBorderInset, - screenWidth - mDrawBorderInset, - screenHeight - mDrawBorderInset); - mWindow.invalidate(dirtyRect); - } else { - final Region dirtyRegion = mTempRegion3; - dirtyRegion.set(mMagnificationRegion); - dirtyRegion.op(mOldMagnificationRegion, Region.Op.XOR); - dirtyRegion.getBounds(dirtyRect); - mWindow.invalidate(dirtyRect); - } - } - - void setShowMagnifiedBorderIfNeeded() { - // If this message is pending, we are in a rotation animation and do not want - // to show the border. We will do so when the pending message is handled. - if (!mHandler.hasMessages( - MyHandler.MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED)) { - setMagnifiedRegionBorderShown( - isFullscreenMagnificationActivated(), true); - } - } - - // Can be called outside of a surface transaction - void showMagnificationBoundsIfNeeded() { - if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) { - mAccessibilityTracing.logTrace(LOG_TAG + ".showMagnificationBoundsIfNeeded", - FLAGS_MAGNIFICATION_CALLBACK); - } - mHandler.obtainMessage(MyHandler.MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED) - .sendToTarget(); - } - - void intersectWithDrawBorderInset(int screenWidth, int screenHeight) { - mMagnificationRegion.op(mDrawBorderInset, mDrawBorderInset, - screenWidth - mDrawBorderInset, screenHeight - mDrawBorderInset, - Region.Op.INTERSECT); - } - - void onDisplaySizeChanged() { - // If fullscreen magnification is activated, hide the border immediately so - // the user does not see strange artifacts during display size changed caused by - // rotation or folding/unfolding the device. In the rotation case, the - // screenshot used for rotation already has the border. After the rotation is - // completed we will show the border. - if (isFullscreenMagnificationActivated()) { - setMagnifiedRegionBorderShown(false, false); - final long delay = (long) (mLongAnimationDuration - * mService.getWindowAnimationScaleLocked()); - Message message = mHandler.obtainMessage( - MyHandler.MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED); - mHandler.sendMessageDelayed(message, delay); - } - mWindow.updateSize(); - } - - void setMagnifiedRegionBorderShown(boolean shown, boolean animate) { - if (mWindow.setShown(shown, animate)) { - mFullRedrawNeeded = true; - // Clear the old region, so recomputeBounds will refresh the current region. - mOldMagnificationRegion.set(0, 0, 0, 0); - } - } - - void drawWindowIfNeeded() { - mWindow.postDrawIfNeeded(); - } - - void destroyWindow() { - mWindow.releaseSurface(); - } - - void dump(PrintWriter pw, String prefix) { - mWindow.dump(pw, prefix); - } - - // TODO(291891390): Remove this class when we clean up the flag - // alwaysDrawMagnificationFullscreenBorder - private final class ViewportWindow implements Runnable { - private static final String SURFACE_TITLE = "Magnification Overlay"; - - private final Region mBounds = new Region(); - private final Rect mDirtyRect = new Rect(); - private final Paint mPaint = new Paint(); - - private final SurfaceControl mSurfaceControl; - /** After initialization, it should only be accessed from animation thread. */ - private final SurfaceControl.Transaction mTransaction; - private final BLASTBufferQueue mBlastBufferQueue; - private final Surface mSurface; - - private final AnimationController mAnimationController; - - private boolean mShown; - private boolean mLastSurfaceShown; - private int mAlpha; - private int mPreviousAlpha; - - private volatile boolean mInvalidated; - - ViewportWindow(Context context) { - SurfaceControl surfaceControl = null; - try { - surfaceControl = mDisplayContent - .makeOverlay() - .setName(SURFACE_TITLE) - .setBLASTLayer() - .setFormat(PixelFormat.TRANSLUCENT) - .setCallsite("ViewportWindow") - .build(); - } catch (OutOfResourcesException oore) { - /* ignore */ - } - mSurfaceControl = surfaceControl; - mDisplay.getRealSize(mScreenSize); - mBlastBufferQueue = new BLASTBufferQueue(SURFACE_TITLE, mSurfaceControl, - mScreenSize.x, mScreenSize.y, PixelFormat.RGBA_8888); - - final SurfaceControl.Transaction t = mService.mTransactionFactory.get(); - final int layer = - mService.mPolicy.getWindowLayerFromTypeLw(TYPE_MAGNIFICATION_OVERLAY) * - WindowManagerPolicyConstants.TYPE_LAYER_MULTIPLIER; - t.setLayer(mSurfaceControl, layer).setPosition(mSurfaceControl, 0, 0); - InputMonitor.setTrustedOverlayInputInfo(mSurfaceControl, t, - mDisplayContent.getDisplayId(), "Magnification Overlay"); - t.apply(); - mTransaction = t; - mSurface = mBlastBufferQueue.createSurface(); - - mAnimationController = new AnimationController(context, - mService.mH.getLooper()); - - TypedValue typedValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.colorActivatedHighlight, - typedValue, true); - final int borderColor = context.getColor(typedValue.resourceId); - - mPaint.setStyle(Paint.Style.STROKE); - mPaint.setStrokeWidth(mBorderWidth); - mPaint.setColor(borderColor); - - mInvalidated = true; - } - - /** Returns {@code true} if the state is changed to shown. */ - boolean setShown(boolean shown, boolean animate) { - synchronized (mService.mGlobalLock) { - if (mShown == shown) { - return false; - } - mShown = shown; - mAnimationController.onFrameShownStateChanged(shown, animate); - if (DEBUG_VIEWPORT_WINDOW) { - Slog.i(LOG_TAG, "ViewportWindow shown: " + mShown); - } - } - return shown; - } - - @SuppressWarnings("unused") - // Called reflectively from an animator. - int getAlpha() { - synchronized (mService.mGlobalLock) { - return mAlpha; - } - } - - void setAlpha(int alpha) { - synchronized (mService.mGlobalLock) { - if (mAlpha == alpha) { - return; - } - mAlpha = alpha; - invalidate(null); - if (DEBUG_VIEWPORT_WINDOW) { - Slog.i(LOG_TAG, "ViewportWindow set alpha: " + alpha); - } - } - } - - void setBounds(Region bounds) { - synchronized (mService.mGlobalLock) { - if (mBounds.equals(bounds)) { - return; - } - mBounds.set(bounds); - invalidate(mDirtyRect); - if (DEBUG_VIEWPORT_WINDOW) { - Slog.i(LOG_TAG, "ViewportWindow set bounds: " + bounds); - } - } - } - - void updateSize() { - synchronized (mService.mGlobalLock) { - getDisplaySizeLocked(mScreenSize); - mBlastBufferQueue.update(mSurfaceControl, mScreenSize.x, mScreenSize.y, - PixelFormat.RGBA_8888); - invalidate(mDirtyRect); - } - } - - void invalidate(Rect dirtyRect) { - if (dirtyRect != null) { - mDirtyRect.set(dirtyRect); - } else { - mDirtyRect.setEmpty(); - } - mInvalidated = true; - mService.scheduleAnimationLocked(); - } - - void postDrawIfNeeded() { - if (mInvalidated) { - mService.mAnimationHandler.post(this); - } - } - - @Override - public void run() { - drawOrRemoveIfNeeded(); - } - - /** - * This method must only be called by animation handler directly to make sure - * thread safe and there is no lock held outside. - */ - private void drawOrRemoveIfNeeded() { - // Drawing variables (alpha, dirty rect, and bounds) access is synchronized - // using WindowManagerGlobalLock. Grab copies of these values before - // drawing on the canvas so that drawing can be performed outside of the lock. - int alpha; - boolean redrawBounds; - Rect drawingRect = null; - Region drawingBounds = null; - synchronized (mService.mGlobalLock) { - if (mBlastBufferQueue.mNativeObject == 0) { - // Complete removal since releaseSurface has been called. - if (mSurface.isValid()) { - mTransaction.remove(mSurfaceControl).apply(); - mSurface.release(); - } - return; - } - if (!mInvalidated) { - return; - } - mInvalidated = false; - - alpha = mAlpha; - // For b/325863281, we should ensure the drawn border path is cleared when - // alpha = 0. Therefore, we cache the last used alpha when drawing as - // mPreviousAlpha and check it here. If mPreviousAlpha > 0, which means - // the border is showing now, then we should still redraw the clear path - // on the canvas so the border is cleared. - redrawBounds = mAlpha > 0 || mPreviousAlpha > 0; - if (redrawBounds) { - drawingBounds = new Region(mBounds); - // Empty dirty rectangle means unspecified. - if (mDirtyRect.isEmpty()) { - mBounds.getBounds(mDirtyRect); - } - mDirtyRect.inset(-mHalfBorderWidth, -mHalfBorderWidth); - drawingRect = new Rect(mDirtyRect); - if (DEBUG_VIEWPORT_WINDOW) { - Slog.i(LOG_TAG, "ViewportWindow bounds: " + mBounds); - Slog.i(LOG_TAG, "ViewportWindow dirty rect: " + mDirtyRect); - } - } - } - - final boolean showSurface; - // Draw without holding WindowManagerGlobalLock. - if (redrawBounds) { - Canvas canvas = null; - try { - canvas = mSurface.lockCanvas(drawingRect); - } catch (IllegalArgumentException | OutOfResourcesException e) { - /* ignore */ - } - if (canvas == null) { - return; - } - canvas.drawColor(Color.TRANSPARENT, Mode.CLEAR); - mPaint.setAlpha(alpha); - canvas.drawPath(drawingBounds.getBoundaryPath(), mPaint); - mSurface.unlockCanvasAndPost(canvas); - mPreviousAlpha = alpha; - } - - showSurface = alpha > 0; - - if (showSurface && !mLastSurfaceShown) { - mTransaction.show(mSurfaceControl).apply(); - mLastSurfaceShown = true; - } else if (!showSurface && mLastSurfaceShown) { - mTransaction.hide(mSurfaceControl).apply(); - mLastSurfaceShown = false; - } - } - - @GuardedBy("mService.mGlobalLock") - void releaseSurface() { - mBlastBufferQueue.destroy(); - // Post to perform cleanup on the thread which handles mSurface. - mService.mAnimationHandler.post(this); - } - - void dump(PrintWriter pw, String prefix) { - pw.println(prefix - + " mBounds= " + mBounds - + " mDirtyRect= " + mDirtyRect - + " mWidth= " + mScreenSize.x - + " mHeight= " + mScreenSize.y); - } - - private final class AnimationController extends Handler { - private static final String PROPERTY_NAME_ALPHA = "alpha"; - - private static final int MIN_ALPHA = 0; - private static final int MAX_ALPHA = 255; - - private static final int MSG_FRAME_SHOWN_STATE_CHANGED = 1; - - private final ValueAnimator mShowHideFrameAnimator; - - AnimationController(Context context, Looper looper) { - super(looper); - mShowHideFrameAnimator = ObjectAnimator.ofInt(ViewportWindow.this, - PROPERTY_NAME_ALPHA, MIN_ALPHA, MAX_ALPHA); - - Interpolator interpolator = new DecelerateInterpolator(2.5f); - final long longAnimationDuration = context.getResources().getInteger( - com.android.internal.R.integer.config_longAnimTime); - - mShowHideFrameAnimator.setInterpolator(interpolator); - mShowHideFrameAnimator.setDuration(longAnimationDuration); - } - - void onFrameShownStateChanged(boolean shown, boolean animate) { - obtainMessage(MSG_FRAME_SHOWN_STATE_CHANGED, - shown ? 1 : 0, animate ? 1 : 0).sendToTarget(); - } - - @Override - public void handleMessage(Message message) { - switch (message.what) { - case MSG_FRAME_SHOWN_STATE_CHANGED: { - final boolean shown = message.arg1 == 1; - final boolean animate = message.arg2 == 1; - - if (animate) { - if (mShowHideFrameAnimator.isRunning()) { - mShowHideFrameAnimator.reverse(); - } else { - if (shown) { - mShowHideFrameAnimator.start(); - } else { - mShowHideFrameAnimator.reverse(); - } - } - } else { - mShowHideFrameAnimator.cancel(); - if (shown) { - setAlpha(MAX_ALPHA); - } else { - setAlpha(MIN_ALPHA); - } - } - } break; - } - } - } - } - } - private class MyHandler extends Handler { public static final int MESSAGE_NOTIFY_MAGNIFICATION_REGION_CHANGED = 1; public static final int MESSAGE_NOTIFY_USER_CONTEXT_CHANGED = 3; public static final int MESSAGE_NOTIFY_DISPLAY_SIZE_CHANGED = 4; - - // TODO(291891390): Remove this field when we clean up the flag - // alwaysDrawMagnificationFullscreenBorder - public static final int MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED = 5; - public static final int MESSAGE_NOTIFY_IME_WINDOW_VISIBILITY_CHANGED = 6; + public static final int MESSAGE_NOTIFY_IME_WINDOW_VISIBILITY_CHANGED = 5; MyHandler(Looper looper) { super(looper); @@ -1576,17 +1074,6 @@ final class AccessibilityController { mCallbacks.onDisplaySizeChanged(); } break; - case MESSAGE_SHOW_MAGNIFIED_REGION_BOUNDS_IF_NEEDED : { - synchronized (mService.mGlobalLock) { - if (isFullscreenMagnificationActivated()) { - if (!Flags.alwaysDrawMagnificationFullscreenBorder()) { - mMagnifiedViewport.setMagnifiedRegionBorderShown(true, true); - } - mService.scheduleAnimationLocked(); - } - } - } break; - case MESSAGE_NOTIFY_IME_WINDOW_VISIBILITY_CHANGED: { final boolean shown = message.arg1 == 1; mCallbacks.onImeWindowVisibilityChanged(shown); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 82d49fcac305..112414e6c4df 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -422,6 +422,8 @@ public final class SystemServer implements Dumpable { "com.android.server.wifi.aware.WifiAwareService"; private static final String WIFI_P2P_SERVICE_CLASS = "com.android.server.wifi.p2p.WifiP2pService"; + private static final String WIFI_USD_SERVICE_CLASS = + "com.android.server.wifi.usd.UsdService"; private static final String CONNECTIVITY_SERVICE_APEX_PATH = "/apex/com.android.tethering/javalib/service-connectivity.jar"; private static final String CONNECTIVITY_SERVICE_INITIALIZER_CLASS = @@ -2145,6 +2147,13 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startServiceFromJar( WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); t.traceEnd(); + // Start USD service + if (android.net.wifi.flags.Flags.usd()) { + t.traceBegin("StartUsd"); + mSystemServiceManager.startServiceFromJar( + WIFI_USD_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + t.traceEnd(); + } } if (context.getPackageManager().hasSystemFeature( diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt index 3fdb53f5ab59..31f03704a756 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt @@ -289,6 +289,7 @@ class AndroidPackageTest : ParcelableComponentTest(AndroidPackage::class, Packag AndroidPackage::getEmergencyInstaller, AndroidPackage::isAllowCrossUidActivitySwitchFromBelow, AndroidPackage::getIntentMatchingFlags, + AndroidPackage::getPageSizeAppCompatFlags, ) override fun extraParams() = listOf( diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java index 3843404132c1..47e96d378149 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java @@ -234,7 +234,6 @@ public class DisplayManagerServiceTest { private static final String DISPLAY_GROUP_EVENT_ADDED = "DISPLAY_GROUP_EVENT_ADDED"; private static final String DISPLAY_GROUP_EVENT_REMOVED = "DISPLAY_GROUP_EVENT_REMOVED"; private static final String DISPLAY_GROUP_EVENT_CHANGED = "DISPLAY_GROUP_EVENT_CHANGED"; - private static final String TOPOLOGY_CHANGED_EVENT = "TOPOLOGY_CHANGED_EVENT"; @Rule(order = 0) public TestRule compatChangeRule = new PlatformCompatChangeRule(); @@ -3700,7 +3699,8 @@ public class DisplayManagerServiceTest { DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, 1); manageDisplaysPermission(/* granted= */ true); when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerService displayManager = + new DisplayManagerService(mContext, mBasicInjector); DisplayManagerInternal localService = displayManager.new LocalService(); DisplayManagerService.BinderService displayManagerBinderService = displayManager.new BinderService(); @@ -3718,7 +3718,8 @@ public class DisplayManagerServiceTest { public void testGetDisplayTopology_NullIfFlagDisabled() { manageDisplaysPermission(/* granted= */ true); when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(false); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerService displayManager = + new DisplayManagerService(mContext, mBasicInjector); DisplayManagerInternal localService = displayManager.new LocalService(); DisplayManagerService.BinderService displayManagerBinderService = displayManager.new BinderService(); @@ -3732,7 +3733,8 @@ public class DisplayManagerServiceTest { @Test public void testGetDisplayTopology_withoutPermission_shouldThrowException() { when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerService displayManager = + new DisplayManagerService(mContext, mBasicInjector); DisplayManagerInternal localService = displayManager.new LocalService(); DisplayManagerService.BinderService displayManagerBinderService = displayManager.new BinderService(); @@ -3746,7 +3748,8 @@ public class DisplayManagerServiceTest { public void testSetDisplayTopology() { manageDisplaysPermission(/* granted= */ true); when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerService displayManager = + new DisplayManagerService(mContext, mBasicInjector); DisplayManagerInternal localService = displayManager.new LocalService(); DisplayManagerService.BinderService displayManagerBinderService = displayManager.new BinderService(); @@ -3759,7 +3762,8 @@ public class DisplayManagerServiceTest { @Test public void testSetDisplayTopology_withoutPermission_shouldThrowException() { when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerService displayManager = + new DisplayManagerService(mContext, mBasicInjector); DisplayManagerInternal localService = displayManager.new LocalService(); DisplayManagerService.BinderService displayManagerBinderService = displayManager.new BinderService(); @@ -3770,49 +3774,6 @@ public class DisplayManagerServiceTest { () -> displayManagerBinderService.setDisplayTopology(new DisplayTopology())); } - @Test - public void testShouldNotifyTopologyChanged() { - manageDisplaysPermission(/* granted= */ true); - when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); - DisplayManagerService.BinderService displayManagerBinderService = - displayManager.new BinderService(); - Handler handler = displayManager.getDisplayHandler(); - waitForIdleHandler(handler); - - FakeDisplayManagerCallback callback = new FakeDisplayManagerCallback(); - displayManagerBinderService.registerCallbackWithEventMask(callback, - DisplayManagerGlobal.INTERNAL_EVENT_FLAG_TOPOLOGY_UPDATED); - waitForIdleHandler(handler); - - displayManagerBinderService.setDisplayTopology(new DisplayTopology()); - waitForIdleHandler(handler); - - assertThat(callback.receivedEvents()).containsExactly(TOPOLOGY_CHANGED_EVENT); - } - - @Test - public void testShouldNotNotifyTopologyChanged_WhenClientIsNotSubscribed() { - manageDisplaysPermission(/* granted= */ true); - when(mMockFlags.isDisplayTopologyEnabled()).thenReturn(true); - DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); - DisplayManagerService.BinderService displayManagerBinderService = - displayManager.new BinderService(); - Handler handler = displayManager.getDisplayHandler(); - waitForIdleHandler(handler); - - // Only subscribe to display events, not topology events - FakeDisplayManagerCallback callback = new FakeDisplayManagerCallback(); - displayManagerBinderService.registerCallbackWithEventMask(callback, - STANDARD_DISPLAY_EVENTS); - waitForIdleHandler(handler); - - displayManagerBinderService.setDisplayTopology(new DisplayTopology()); - waitForIdleHandler(handler); - - assertThat(callback.receivedEvents()).isEmpty(); - } - private void initDisplayPowerController(DisplayManagerInternal localService) { localService.initPowerManagement(new DisplayManagerInternal.DisplayPowerCallbacks() { @Override @@ -4264,12 +4225,6 @@ public class DisplayManagerServiceTest { eventSeen(DISPLAY_GROUP_EVENT_CHANGED); } - @Override - public void onTopologyChanged(DisplayTopology topology) { - mReceivedEvents.add(TOPOLOGY_CHANGED_EVENT); - eventSeen(TOPOLOGY_CHANGED_EVENT); - } - public void clear() { mReceivedEvents.clear(); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayTopologyCoordinatorTest.kt b/services/tests/displayservicetests/src/com/android/server/display/DisplayTopologyCoordinatorTest.kt index e4b461f307d3..a2d2a81b20b4 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayTopologyCoordinatorTest.kt +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayTopologyCoordinatorTest.kt @@ -24,21 +24,18 @@ import org.junit.Before import org.junit.Test import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt -import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.mockito.kotlin.never import org.mockito.kotlin.verify import org.mockito.kotlin.whenever +import java.util.function.BooleanSupplier class DisplayTopologyCoordinatorTest { private lateinit var coordinator: DisplayTopologyCoordinator private val displayInfo = DisplayInfo() - private val topologyChangeExecutor = Runnable::run private val mockTopology = mock<DisplayTopology>() - private val mockTopologyCopy = mock<DisplayTopology>() - private val mockIsExtendedDisplayEnabled = mock<() -> Boolean>() - private val mockTopologyChangedCallback = mock<(DisplayTopology) -> Unit>() + private val mockIsExtendedDisplayEnabled = mock<BooleanSupplier>() @Before fun setUp() { @@ -50,14 +47,13 @@ class DisplayTopologyCoordinatorTest { val injector = object : DisplayTopologyCoordinator.Injector() { override fun getTopology() = mockTopology } - whenever(mockIsExtendedDisplayEnabled()).thenReturn(true) - whenever(mockTopology.copy()).thenReturn(mockTopologyCopy) - coordinator = DisplayTopologyCoordinator(injector, mockIsExtendedDisplayEnabled, - mockTopologyChangedCallback, topologyChangeExecutor, DisplayManagerService.SyncRoot()) + coordinator = DisplayTopologyCoordinator(injector, mockIsExtendedDisplayEnabled) } @Test fun addDisplay() { + whenever(mockIsExtendedDisplayEnabled.asBoolean).thenReturn(true) + coordinator.onDisplayAdded(displayInfo) val widthDp = displayInfo.logicalWidth * (DisplayMetrics.DENSITY_DEFAULT.toFloat() @@ -65,26 +61,24 @@ class DisplayTopologyCoordinatorTest { val heightDp = displayInfo.logicalHeight * (DisplayMetrics.DENSITY_DEFAULT.toFloat() / displayInfo.logicalDensityDpi) verify(mockTopology).addDisplay(displayInfo.displayId, widthDp, heightDp) - verify(mockTopologyChangedCallback).invoke(mockTopologyCopy) } @Test fun addDisplay_extendedDisplaysDisabled() { - whenever(mockIsExtendedDisplayEnabled()).thenReturn(false) + whenever(mockIsExtendedDisplayEnabled.asBoolean).thenReturn(false) coordinator.onDisplayAdded(displayInfo) verify(mockTopology, never()).addDisplay(anyInt(), anyFloat(), anyFloat()) - verify(mockTopologyChangedCallback, never()).invoke(any()) } @Test fun addDisplay_notInDefaultDisplayGroup() { + whenever(mockIsExtendedDisplayEnabled.asBoolean).thenReturn(true) displayInfo.displayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1 coordinator.onDisplayAdded(displayInfo) verify(mockTopology, never()).addDisplay(anyInt(), anyFloat(), anyFloat()) - verify(mockTopologyChangedCallback, never()).invoke(any()) } }
\ No newline at end of file diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 993569fb17fe..0d25426700a6 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -392,3 +392,10 @@ test_module_config { ], include_filters: ["com.android.server.StorageManagerServiceTest"], } + +test_module_config { + name: "FrameworksMockingServicesTests_service_batteryServiceTest", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.BatteryServiceTest"], +} diff --git a/services/tests/mockingservicestests/src/com/android/server/BatteryServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/BatteryServiceTest.java index 5e2f80bf8311..1fbd53a27a4f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/BatteryServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/BatteryServiceTest.java @@ -79,6 +79,8 @@ public class BatteryServiceTest { private static final int UPDATED_BATTERY_HEALTH = 3; private static final int CURRENT_CHARGE_COUNTER = 4680000; private static final int UPDATED_CHARGE_COUNTER = 4218000; + private static final int CURRENT_MAX_CHARGING_CURRENT = 298125; + private static final int UPDATED_MAX_CHARGING_CURRENT = 398125; private static final int HANDLER_IDLE_TIME_MS = 5000; @Rule public final ExtendedMockitoRule mExtendedMockitoRule = new ExtendedMockitoRule.Builder(this) @@ -143,7 +145,7 @@ public class BatteryServiceTest { @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) public void onlyVoltageUpdated_lessThenOnePercent_broadcastNotSent() { mBatteryService.update(createHealthInfo(VOLTAGE_LESS_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, - CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH)); + CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -156,7 +158,8 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(VOLTAGE_MORE_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, CURRENT_CHARGE_COUNTER, - CURRENT_BATTERY_HEALTH)); + CURRENT_BATTERY_HEALTH, + CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -165,13 +168,17 @@ public class BatteryServiceTest { @Test @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) - public void onlyVoltageUpdated_broadcastSent() { + public void voltageUpdated_withUpdateInChargingCurrent_broadcastSent() { mBatteryService.mLastBroadcastVoltageUpdateTime = SystemClock.elapsedRealtime() - 20000; + long lastChargingCurrentUpdateTime = + mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime; mBatteryService.update(createHealthInfo(VOLTAGE_MORE_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, - CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH)); + CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH, UPDATED_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); + assertTrue(lastChargingCurrentUpdateTime + < mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime); verifyNumberOfTimesBroadcastSent(1); } @@ -180,7 +187,8 @@ public class BatteryServiceTest { public void onlyTempUpdated_lessThenOneDegreeCelsius_broadcastNotSent() { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, TEMP_LESS_THEN_ONE_DEGREE_CELSIUS, - CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH)); + CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH, + CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -191,23 +199,31 @@ public class BatteryServiceTest { @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) public void tempUpdated_broadcastSent() { long lastVoltageUpdateTime = mBatteryService.mLastBroadcastVoltageUpdateTime; + long lastChargingCurrentUpdateTime = + mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime; mBatteryService.update( createHealthInfo(VOLTAGE_LESS_THEN_ONE_PERCENT, TEMP_MORE_THEN_ONE_DEGREE_CELSIUS, - UPDATED_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH)); + UPDATED_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH, + UPDATED_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); assertTrue(lastVoltageUpdateTime < mBatteryService.mLastBroadcastVoltageUpdateTime); + assertTrue(lastChargingCurrentUpdateTime + < mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime); verifyNumberOfTimesBroadcastSent(1); } @Test @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) - public void batteryHealthUpdated_voltageAndTempConst_broadcastSent() { + public void batteryHealthUpdated_withOtherExtrasConstant_broadcastSent() { + long lastVoltageUpdateTime = mBatteryService.mLastBroadcastVoltageUpdateTime; + long lastChargingCurrentUpdateTime = + mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime; mBatteryService.update( - createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, + createHealthInfo(VOLTAGE_LESS_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, CURRENT_CHARGE_COUNTER, - UPDATED_BATTERY_HEALTH)); + UPDATED_BATTERY_HEALTH, UPDATED_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -217,10 +233,13 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, UPDATED_CHARGE_COUNTER, - UPDATED_BATTERY_HEALTH)); + UPDATED_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); + assertTrue(lastVoltageUpdateTime < mBatteryService.mLastBroadcastVoltageUpdateTime); + assertTrue(lastChargingCurrentUpdateTime + < mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime); verifyNumberOfTimesBroadcastSent(1); } @@ -228,7 +247,7 @@ public class BatteryServiceTest { @DisableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) public void voltageUpdated_lessThanOnePercent_flagDisabled_broadcastSent() { mBatteryService.update(createHealthInfo(VOLTAGE_LESS_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, - CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH)); + CURRENT_CHARGE_COUNTER, CURRENT_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -241,7 +260,7 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, UPDATED_CHARGE_COUNTER, - CURRENT_BATTERY_HEALTH)); + CURRENT_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -254,7 +273,7 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, TEMP_LESS_THEN_ONE_DEGREE_CELSIUS, UPDATED_CHARGE_COUNTER, - CURRENT_BATTERY_HEALTH)); + CURRENT_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); @@ -267,10 +286,42 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, UPDATED_CHARGE_COUNTER, - CURRENT_BATTERY_HEALTH)); + CURRENT_BATTERY_HEALTH, CURRENT_MAX_CHARGING_CURRENT)); + + waitForHandlerToExecute(); + + verifyNumberOfTimesBroadcastSent(1); + } + + @Test + @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) + public void onlyMaxChargingCurrentUpdated_beforeFiveSeconds_broadcastNotSent() { + mBatteryService.update( + createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, + CURRENT_CHARGE_COUNTER, + CURRENT_BATTERY_HEALTH, + UPDATED_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); + verifyNumberOfTimesBroadcastSent(0); + } + + @Test + @EnableFlags(Flags.FLAG_RATE_LIMIT_BATTERY_CHANGED_BROADCAST) + public void maxChargingCurrentUpdated_afterFiveSeconds_broadcastSent() { + mBatteryService.mLastBroadcastMaxChargingCurrentUpdateTime = + SystemClock.elapsedRealtime() - 5000; + long lastVoltageUpdateTime = mBatteryService.mLastBroadcastVoltageUpdateTime; + mBatteryService.update( + createHealthInfo(VOLTAGE_MORE_THEN_ONE_PERCENT, CURRENT_BATTERY_TEMP, + CURRENT_CHARGE_COUNTER, + CURRENT_BATTERY_HEALTH, + UPDATED_MAX_CHARGING_CURRENT)); + + waitForHandlerToExecute(); + + assertTrue(lastVoltageUpdateTime < mBatteryService.mLastBroadcastVoltageUpdateTime); verifyNumberOfTimesBroadcastSent(1); } @@ -278,7 +329,8 @@ public class BatteryServiceTest { int batteryVoltage, int batteryTemperature, int batteryChargeCounter, - int batteryHealth) { + int batteryHealth, + int maxChargingCurrent) { HealthInfo h = new HealthInfo(); h.batteryVoltageMillivolts = batteryVoltage; h.batteryTemperatureTenthsCelsius = batteryTemperature; @@ -287,7 +339,7 @@ public class BatteryServiceTest { h.batteryHealth = batteryHealth; h.batteryPresent = true; h.batteryLevel = 100; - h.maxChargingCurrentMicroamps = 298125; + h.maxChargingCurrentMicroamps = maxChargingCurrent; h.batteryCurrentAverageMicroamps = -2812; h.batteryCurrentMicroamps = 298125; h.maxChargingVoltageMicrovolts = 3000; @@ -308,7 +360,8 @@ public class BatteryServiceTest { mBatteryService.update( createHealthInfo(CURRENT_BATTERY_VOLTAGE, CURRENT_BATTERY_TEMP, CURRENT_CHARGE_COUNTER, - CURRENT_BATTERY_HEALTH)); + CURRENT_BATTERY_HEALTH, + CURRENT_MAX_CHARGING_CURRENT)); waitForHandlerToExecute(); } diff --git a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java index dd7ce21e3628..c831475577d8 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java @@ -16,6 +16,7 @@ package com.android.server.job; +import static android.app.job.Flags.FLAG_HANDLE_ABANDONED_JOBS; import static android.text.format.DateUtils.DAY_IN_MILLIS; import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; @@ -82,6 +83,7 @@ import android.os.ServiceManager; import android.os.SystemClock; import android.os.WorkSource; import android.os.WorkSource.WorkChain; +import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; @@ -1056,6 +1058,75 @@ public class JobSchedulerServiceTest { /** * Confirm that * {@link JobSchedulerService#getRescheduleJobForFailureLocked(JobStatus, int, int)} + * returns a job with the correct delay for abandoned jobs. + */ + @Test + @EnableFlags(FLAG_HANDLE_ABANDONED_JOBS) + public void testGetRescheduleJobForFailure_abandonedJob() { + final long nowElapsed = sElapsedRealtimeClock.millis(); + final long initialBackoffMs = MINUTE_IN_MILLIS; + mService.mConstants.SYSTEM_STOP_TO_FAILURE_RATIO = 3; + + JobStatus originalJob = createJobStatus("testGetRescheduleJobForFailure", + createJobInfo() + .setBackoffCriteria(initialBackoffMs, JobInfo.BACKOFF_POLICY_LINEAR)); + assertEquals(JobStatus.NO_EARLIEST_RUNTIME, originalJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, originalJob.getLatestRunTimeElapsed()); + + // failure = 1, systemStop = 0, abandoned = 1 + JobStatus rescheduledJob = mService.getRescheduleJobForFailureLocked(originalJob, + JobParameters.STOP_REASON_DEVICE_STATE, + JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); + assertEquals(nowElapsed + initialBackoffMs, rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + + // failure = 2, systemstop = 0, abandoned = 2 + rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob, + JobParameters.STOP_REASON_DEVICE_STATE, + JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); + assertEquals(nowElapsed + (2 * initialBackoffMs), rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + + // failure = 3, systemstop = 0, abandoned = 3 + rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob, + JobParameters.STOP_REASON_DEVICE_STATE, + JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); + assertEquals(nowElapsed + (3 * initialBackoffMs), rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + + // failure = 4, systemstop = 0, abandoned = 4 + rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob, + JobParameters.STOP_REASON_DEVICE_STATE, + JobParameters.INTERNAL_STOP_REASON_TIMEOUT_ABANDONED); + assertEquals( + nowElapsed + ((long) Math.scalb((float) initialBackoffMs, 3)), + rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + + // failure = 4, systemstop = 1, abandoned = 4 + rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob, + JobParameters.STOP_REASON_DEVICE_STATE, + JobParameters.INTERNAL_STOP_REASON_DEVICE_THERMAL); + assertEquals( + nowElapsed + ((long) Math.scalb((float) initialBackoffMs, 3)), + rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + + // failure = 4, systemStop = 4 / SYSTEM_STOP_TO_FAILURE_RATIO, abandoned = 4 + for (int i = 0; i < mService.mConstants.SYSTEM_STOP_TO_FAILURE_RATIO; ++i) { + rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob, + JobParameters.STOP_REASON_SYSTEM_PROCESSING, + JobParameters.INTERNAL_STOP_REASON_RTC_UPDATED); + } + assertEquals( + nowElapsed + ((long) Math.scalb((float) initialBackoffMs, 4)), + rescheduledJob.getEarliestRunTime()); + assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed()); + } + + /** + * Confirm that + * {@link JobSchedulerService#getRescheduleJobForFailureLocked(JobStatus, int, int)} * returns a job that is correctly marked as demoted by the user. */ @Test diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java index c6a6865f1cf1..c64973a67589 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java @@ -706,14 +706,14 @@ public class FlexibilityControllerTest { // "True" start is nowElapsed + HOUR_IN_MILLIS nowElapsed + HOUR_IN_MILLIS + adjustmentMs, nowElapsed + 2 * HOUR_IN_MILLIS, - 0 /* numFailures */, 0 /* numSystemStops */, + 0 /* numFailures */, 0 /* numAbandonedFailures */, 0 /* numSystemStops */, JobSchedulerService.sSystemClock.millis() /* lastSuccessfulRunTime */, 0, 0); jsFlex = new JobStatus(jsFlex, // "True" start is nowElapsed + 2 * HOUR_IN_MILLIS - 20 * MINUTE_IN_MILLIS nowElapsed + 2 * HOUR_IN_MILLIS - 20 * MINUTE_IN_MILLIS + adjustmentMs, nowElapsed + 2 * HOUR_IN_MILLIS, - 0 /* numFailures */, 0 /* numSystemStops */, + 0 /* numFailures */, 0 /* numAbandonedFailures */, 0 /* numSystemStops */, JobSchedulerService.sSystemClock.millis() /* lastSuccessfulRunTime */, 0, 0); @@ -726,13 +726,13 @@ public class FlexibilityControllerTest { jsBasic = new JobStatus(jsBasic, nowElapsed + 30 * MINUTE_IN_MILLIS, NO_LATEST_RUNTIME, - 1 /* numFailures */, 1 /* numSystemStops */, + 1 /* numFailures */, 0 /* numAbandonedFailures */, 1 /* numSystemStops */, JobSchedulerService.sSystemClock.millis() /* lastSuccessfulRunTime */, 0, 0); jsFlex = new JobStatus(jsFlex, nowElapsed + 30 * MINUTE_IN_MILLIS, NO_LATEST_RUNTIME, - 1 /* numFailures */, 1 /* numSystemStops */, + 1 /* numFailures */, 0 /* numAbandonedFailures */, 1 /* numSystemStops */, JobSchedulerService.sSystemClock.millis() /* lastSuccessfulRunTime */, 0, 0); @@ -847,21 +847,24 @@ public class FlexibilityControllerTest { JobInfo.Builder jb = createJob(0).setOverrideDeadline(HOUR_IN_MILLIS); JobStatus js = createJobStatus("time", jb); js = new JobStatus( - js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 2, /* numSystemStops */ 0, + js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 2, + 0 /* numAbandonedFailures */, /* numSystemStops */ 0, 0, FROZEN_TIME, FROZEN_TIME); assertEquals(mFcConfig.RESCHEDULED_JOB_DEADLINE_MS, mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, 0)); js = new JobStatus( - js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 2, /* numSystemStops */ 1, + js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 2, + 0 /* numAbandonedFailures */, /* numSystemStops */ 1, 0, FROZEN_TIME, FROZEN_TIME); assertEquals(2 * mFcConfig.RESCHEDULED_JOB_DEADLINE_MS, mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, 0)); js = new JobStatus( - js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 0, /* numSystemStops */ 10, + js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 0, + 0 /* numAbandonedFailures */, /* numSystemStops */ 10, 0, FROZEN_TIME, FROZEN_TIME); assertEquals(mFcConfig.MAX_RESCHEDULED_DEADLINE_MS, mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, 0)); @@ -1092,11 +1095,13 @@ public class FlexibilityControllerTest { JobInfo.Builder jb = createJob(0); JobStatus js = createJobStatus("time", jb); js = new JobStatus( - js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 1, /* numSystemStops */ 0, + js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 1, + /* numAbandonedFailures */ 0, /* numSystemStops */ 0, 0, FROZEN_TIME, FROZEN_TIME); assertFalse(js.hasFlexibilityConstraint()); js = new JobStatus( - js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 0, /* numSystemStops */ 1, + js, FROZEN_TIME, NO_LATEST_RUNTIME, /* numFailures */ 0, + /* numAbandonedFailures */ 0, /* numSystemStops */ 1, 0, FROZEN_TIME, FROZEN_TIME); assertFalse(js.hasFlexibilityConstraint()); } diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java index 2d0f4b69e2fe..86101cf591e7 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java @@ -459,35 +459,35 @@ public class JobStatusTest { int numFailures = 1; int numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); // 2+ failures, priority should be lowered as much as possible. numFailures = 2; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); numFailures = 5; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); numFailures = 8; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); // System stops shouldn't factor in the downgrade. numSystemStops = 10; numFailures = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); // Less than 2 failures, but job is downgraded. numFailures = 1; numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); job.addInternalFlags(JobStatus.INTERNAL_FLAG_DEMOTED_BY_USER); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); } @@ -505,44 +505,44 @@ public class JobStatusTest { int numFailures = 1; int numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); // Failures in [2,4), priority should be lowered slightly. numFailures = 2; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_DEFAULT, job.getEffectivePriority()); numFailures = 3; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_DEFAULT, job.getEffectivePriority()); // Failures in [4,6), priority should be lowered more. numFailures = 4; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); numFailures = 5; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); // 6+ failures, priority should be lowered as much as possible. numFailures = 6; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MIN, job.getEffectivePriority()); numFailures = 12; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MIN, job.getEffectivePriority()); // System stops shouldn't factor in the downgrade. numSystemStops = 10; numFailures = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); } @@ -563,32 +563,32 @@ public class JobStatusTest { int numFailures = 1; int numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); numFailures = 4; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); numFailures = 5; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); // 6+ failures, priority should be lowered as much as possible. numFailures = 6; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MIN, job.getEffectivePriority()); numFailures = 12; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MIN, job.getEffectivePriority()); // System stops shouldn't factor in the downgrade. numSystemStops = 10; numFailures = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); } @@ -606,28 +606,28 @@ public class JobStatusTest { int numFailures = 1; int numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); // 2+ failures, priority shouldn't be affected while job is still a UI job numFailures = 2; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); numFailures = 5; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); numFailures = 8; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); // System stops shouldn't factor in the downgrade. numSystemStops = 10; numFailures = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MAX, job.getEffectivePriority()); // Job can no long run as user-initiated. Downgrades should be effective. @@ -641,28 +641,28 @@ public class JobStatusTest { numFailures = 1; numSystemStops = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); // 2+ failures, priority should start getting lower numFailures = 2; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_DEFAULT, job.getEffectivePriority()); numFailures = 5; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_LOW, job.getEffectivePriority()); numFailures = 8; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_MIN, job.getEffectivePriority()); // System stops shouldn't factor in the downgrade. numSystemStops = 10; numFailures = 0; job = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, numFailures, - numSystemStops, 0, 0, 0); + 0, numSystemStops, 0, 0, 0); assertEquals(JobInfo.PRIORITY_HIGH, job.getEffectivePriority()); } @@ -772,14 +772,14 @@ public class JobStatusTest { assertTrue(job.shouldTreatAsUserInitiatedJob()); JobStatus rescheduledJob = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, - 0, 0, 0, 0, 0); + 0, 0, 0, 0, 0, 0); assertTrue(rescheduledJob.shouldTreatAsUserInitiatedJob()); job.addInternalFlags(JobStatus.INTERNAL_FLAG_DEMOTED_BY_USER); assertFalse(job.shouldTreatAsUserInitiatedJob()); rescheduledJob = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, - 0, 0, 0, 0, 0); + 0, 0, 0, 0, 0, 0); assertFalse(rescheduledJob.shouldTreatAsUserInitiatedJob()); rescheduledJob.removeInternalFlags(JobStatus.INTERNAL_FLAG_DEMOTED_BY_USER); @@ -797,14 +797,14 @@ public class JobStatusTest { assertTrue(job.shouldTreatAsUserInitiatedJob()); JobStatus rescheduledJob = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, - 0, 0, 0, 0, 0); + 0, 0, 0, 0, 0, 0); assertTrue(rescheduledJob.shouldTreatAsUserInitiatedJob()); job.addInternalFlags(JobStatus.INTERNAL_FLAG_DEMOTED_BY_SYSTEM_UIJ); assertFalse(job.shouldTreatAsUserInitiatedJob()); rescheduledJob = new JobStatus(job, NO_EARLIEST_RUNTIME, NO_LATEST_RUNTIME, - 0, 0, 0, 0, 0); + 0, 0, 0, 0, 0, 0); assertFalse(rescheduledJob.shouldTreatAsUserInitiatedJob()); rescheduledJob.removeInternalFlags(JobStatus.INTERNAL_FLAG_DEMOTED_BY_SYSTEM_UIJ); diff --git a/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java b/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java index e631cb66eaf7..313c01d5ce58 100644 --- a/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java +++ b/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java @@ -18,7 +18,6 @@ package com.android.server.power.hint; import static com.android.server.power.hint.HintManagerService.CLEAN_UP_UID_DELAY_MILLIS; -import static com.android.server.power.hint.HintManagerService.DEFAULT_HEADROOM_PID; import static com.google.common.truth.Truth.assertThat; @@ -53,7 +52,9 @@ import android.hardware.common.fmq.MQDescriptor; import android.hardware.power.ChannelConfig; import android.hardware.power.ChannelMessage; import android.hardware.power.CpuHeadroomParams; +import android.hardware.power.CpuHeadroomResult; import android.hardware.power.GpuHeadroomParams; +import android.hardware.power.GpuHeadroomResult; import android.hardware.power.IPower; import android.hardware.power.SessionConfig; import android.hardware.power.SessionTag; @@ -1251,67 +1252,98 @@ public class HintManagerServiceTest { CpuHeadroomParams halParams1 = new CpuHeadroomParams(); halParams1.calculationType = CpuHeadroomParams.CalculationType.MIN; halParams1.selectionType = CpuHeadroomParams.SelectionType.ALL; - halParams1.pid = Process.myPid(); + halParams1.tids = new int[]{Process.myPid()}; CpuHeadroomParamsInternal params2 = new CpuHeadroomParamsInternal(); params2.usesDeviceHeadroom = true; - params2.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; + params2.calculationType = CpuHeadroomParams.CalculationType.MIN; params2.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; CpuHeadroomParams halParams2 = new CpuHeadroomParams(); - halParams2.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; + halParams2.calculationType = CpuHeadroomParams.CalculationType.MIN; halParams2.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; - halParams2.pid = DEFAULT_HEADROOM_PID; + halParams2.tids = new int[]{}; + + CpuHeadroomParamsInternal params3 = new CpuHeadroomParamsInternal(); + params3.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; + params3.selectionType = CpuHeadroomParams.SelectionType.ALL; + CpuHeadroomParams halParams3 = new CpuHeadroomParams(); + halParams3.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; + halParams3.selectionType = CpuHeadroomParams.SelectionType.ALL; + halParams3.tids = new int[]{Process.myPid()}; + + // this params should not be cached as the window is not default + CpuHeadroomParamsInternal params4 = new CpuHeadroomParamsInternal(); + params4.calculationWindowMillis = 123; + CpuHeadroomParams halParams4 = new CpuHeadroomParams(); + halParams4.calculationType = CpuHeadroomParams.CalculationType.MIN; + halParams4.selectionType = CpuHeadroomParams.SelectionType.ALL; + halParams4.calculationWindowMillis = 123; + halParams4.tids = new int[]{Process.myPid()}; - float[] headroom1 = new float[] {0.1f}; - when(mIPowerMock.getCpuHeadroom(eq(halParams1))).thenReturn(headroom1); - float[] headroom2 = new float[] {0.1f, 0.5f}; - when(mIPowerMock.getCpuHeadroom(eq(halParams2))).thenReturn(headroom2); + float headroom1 = 0.1f; + CpuHeadroomResult halRet1 = CpuHeadroomResult.globalHeadroom(headroom1); + when(mIPowerMock.getCpuHeadroom(eq(halParams1))).thenReturn(halRet1); + float[] headroom2 = new float[] {0.2f, 0.2f}; + CpuHeadroomResult halRet2 = CpuHeadroomResult.perCoreHeadroom(headroom2); + when(mIPowerMock.getCpuHeadroom(eq(halParams2))).thenReturn(halRet2); + float headroom3 = 0.3f; + CpuHeadroomResult halRet3 = CpuHeadroomResult.globalHeadroom(headroom3); + when(mIPowerMock.getCpuHeadroom(eq(halParams3))).thenReturn(halRet3); + float headroom4 = 0.4f; + CpuHeadroomResult halRet4 = CpuHeadroomResult.globalHeadroom(headroom4); + when(mIPowerMock.getCpuHeadroom(eq(halParams4))).thenReturn(halRet4); HintManagerService service = createService(); clearInvocations(mIPowerMock); service.getBinderServiceInstance().getCpuHeadroomMinIntervalMillis(); verify(mIPowerMock, times(0)).getCpuHeadroomMinIntervalMillis(); - service.getBinderServiceInstance().getCpuHeadroom(params1); + assertEquals(halRet1, service.getBinderServiceInstance().getCpuHeadroom(params1)); verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams1)); - service.getBinderServiceInstance().getCpuHeadroom(params2); + assertEquals(halRet2, service.getBinderServiceInstance().getCpuHeadroom(params2)); verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams2)); + assertEquals(halRet3, service.getBinderServiceInstance().getCpuHeadroom(params3)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams3)); + assertEquals(halRet4, service.getBinderServiceInstance().getCpuHeadroom(params4)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams4)); // verify cache is working clearInvocations(mIPowerMock); - assertArrayEquals(headroom1, service.getBinderServiceInstance().getCpuHeadroom(params1), - 0.01f); - assertArrayEquals(headroom2, service.getBinderServiceInstance().getCpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getCpuHeadroom(any()); + assertEquals(halRet1, service.getBinderServiceInstance().getCpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getCpuHeadroom(params2)); + assertEquals(halRet3, service.getBinderServiceInstance().getCpuHeadroom(params3)); + assertEquals(halRet4, service.getBinderServiceInstance().getCpuHeadroom(params4)); + verify(mIPowerMock, times(1)).getCpuHeadroom(any()); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams1)); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams2)); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams3)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams4)); // after 1 more second it should be served with cache still Thread.sleep(1000); clearInvocations(mIPowerMock); - assertArrayEquals(headroom1, service.getBinderServiceInstance().getCpuHeadroom(params1), - 0.01f); - assertArrayEquals(headroom2, service.getBinderServiceInstance().getCpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getCpuHeadroom(any()); - - // after 1.5 more second it should be served with cache still as timer reset - Thread.sleep(1500); - clearInvocations(mIPowerMock); - assertArrayEquals(headroom1, service.getBinderServiceInstance().getCpuHeadroom(params1), - 0.01f); - assertArrayEquals(headroom2, service.getBinderServiceInstance().getCpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getCpuHeadroom(any()); + assertEquals(halRet1, service.getBinderServiceInstance().getCpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getCpuHeadroom(params2)); + assertEquals(halRet3, service.getBinderServiceInstance().getCpuHeadroom(params3)); + assertEquals(halRet4, service.getBinderServiceInstance().getCpuHeadroom(params4)); + verify(mIPowerMock, times(1)).getCpuHeadroom(any()); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams1)); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams2)); + verify(mIPowerMock, times(0)).getCpuHeadroom(eq(halParams3)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams4)); // after 2+ seconds it should be served from HAL as it exceeds 2000 millis interval - Thread.sleep(2100); + Thread.sleep(1100); clearInvocations(mIPowerMock); - assertArrayEquals(headroom1, service.getBinderServiceInstance().getCpuHeadroom(params1), - 0.01f); - assertArrayEquals(headroom2, service.getBinderServiceInstance().getCpuHeadroom(params2), - 0.01f); + assertEquals(halRet1, service.getBinderServiceInstance().getCpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getCpuHeadroom(params2)); + assertEquals(halRet3, service.getBinderServiceInstance().getCpuHeadroom(params3)); + assertEquals(halRet4, service.getBinderServiceInstance().getCpuHeadroom(params4)); + verify(mIPowerMock, times(4)).getCpuHeadroom(any()); verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams1)); verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams2)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams3)); + verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams4)); } @Test @@ -1322,59 +1354,52 @@ public class HintManagerServiceTest { halParams1.calculationType = GpuHeadroomParams.CalculationType.MIN; GpuHeadroomParamsInternal params2 = new GpuHeadroomParamsInternal(); + params2.calculationType = GpuHeadroomParams.CalculationType.AVERAGE; + params2.calculationWindowMillis = 123; GpuHeadroomParams halParams2 = new GpuHeadroomParams(); - params2.calculationType = - halParams2.calculationType = GpuHeadroomParams.CalculationType.AVERAGE; + halParams2.calculationType = GpuHeadroomParams.CalculationType.AVERAGE; + halParams2.calculationWindowMillis = 123; float headroom1 = 0.1f; - when(mIPowerMock.getGpuHeadroom(eq(halParams1))).thenReturn(headroom1); + GpuHeadroomResult halRet1 = GpuHeadroomResult.globalHeadroom(headroom1); + when(mIPowerMock.getGpuHeadroom(eq(halParams1))).thenReturn(halRet1); float headroom2 = 0.2f; - when(mIPowerMock.getGpuHeadroom(eq(halParams2))).thenReturn(headroom2); + GpuHeadroomResult halRet2 = GpuHeadroomResult.globalHeadroom(headroom2); + when(mIPowerMock.getGpuHeadroom(eq(halParams2))).thenReturn(halRet2); HintManagerService service = createService(); clearInvocations(mIPowerMock); service.getBinderServiceInstance().getGpuHeadroomMinIntervalMillis(); verify(mIPowerMock, times(0)).getGpuHeadroomMinIntervalMillis(); - assertEquals(headroom1, service.getBinderServiceInstance().getGpuHeadroom(params1), - 0.01f); - assertEquals(headroom2, service.getBinderServiceInstance().getGpuHeadroom(params2), - 0.01f); + assertEquals(halRet1, service.getBinderServiceInstance().getGpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getGpuHeadroom(params2)); + verify(mIPowerMock, times(2)).getGpuHeadroom(any()); verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams1)); verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams2)); // verify cache is working clearInvocations(mIPowerMock); - assertEquals(headroom1, service.getBinderServiceInstance().getGpuHeadroom(params1), - 0.01f); - assertEquals(headroom2, service.getBinderServiceInstance().getGpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getGpuHeadroom(any()); + assertEquals(halRet1, service.getBinderServiceInstance().getGpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getGpuHeadroom(params2)); + verify(mIPowerMock, times(1)).getGpuHeadroom(any()); + verify(mIPowerMock, times(0)).getGpuHeadroom(eq(halParams1)); + verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams2)); // after 1 more second it should be served with cache still Thread.sleep(1000); clearInvocations(mIPowerMock); - assertEquals(headroom1, service.getBinderServiceInstance().getGpuHeadroom(params1), - 0.01f); - assertEquals(headroom2, service.getBinderServiceInstance().getGpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getGpuHeadroom(any()); - - // after 1.5 more second it should be served with cache still as timer reset - Thread.sleep(1500); - clearInvocations(mIPowerMock); - assertEquals(headroom1, service.getBinderServiceInstance().getGpuHeadroom(params1), - 0.01f); - assertEquals(headroom2, service.getBinderServiceInstance().getGpuHeadroom(params2), - 0.01f); - verify(mIPowerMock, times(0)).getGpuHeadroom(any()); + assertEquals(halRet1, service.getBinderServiceInstance().getGpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getGpuHeadroom(params2)); + verify(mIPowerMock, times(1)).getGpuHeadroom(any()); + verify(mIPowerMock, times(0)).getGpuHeadroom(eq(halParams1)); + verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams2)); // after 2+ seconds it should be served from HAL as it exceeds 2000 millis interval - Thread.sleep(2100); + Thread.sleep(1100); clearInvocations(mIPowerMock); - assertEquals(headroom1, service.getBinderServiceInstance().getGpuHeadroom(params1), - 0.01f); - assertEquals(headroom2, service.getBinderServiceInstance().getGpuHeadroom(params2), - 0.01f); + assertEquals(halRet1, service.getBinderServiceInstance().getGpuHeadroom(params1)); + assertEquals(halRet2, service.getBinderServiceInstance().getGpuHeadroom(params2)); + verify(mIPowerMock, times(2)).getGpuHeadroom(any()); verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams1)); verify(mIPowerMock, times(1)).getGpuHeadroom(eq(halParams2)); } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java index c0be8652f303..4b91d8418fc3 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java @@ -79,8 +79,6 @@ public class AmbientDisplayPowerCalculatorTest { // 100,000,00 uC / 1000 (micro-/milli-) / 360 (seconds/hour) = 27.777778 mAh assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) .isWithin(PRECISION).of(27.777778); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test @@ -140,8 +138,6 @@ public class AmbientDisplayPowerCalculatorTest { // (seconds/hour) = 27.777778 mAh assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) .isWithin(PRECISION).of(83.33333); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test @@ -163,8 +159,6 @@ public class AmbientDisplayPowerCalculatorTest { .isEqualTo(90 * MINUTE_IN_MS); assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) .isWithin(PRECISION).of(15.0); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -195,7 +189,5 @@ public class AmbientDisplayPowerCalculatorTest { .isEqualTo(120 * MINUTE_IN_MS); assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) .isWithin(PRECISION).of(35.0); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java index 5d50e6c9f715..9da89fcf2e84 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsAtomTest.java @@ -311,10 +311,6 @@ public class BatteryUsageStatsAtomTest { bus.getAggregateBatteryConsumer(AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE), proto.deviceBatteryConsumer); - for (int i = 0; i < BatteryConsumer.POWER_COMPONENT_COUNT; i++) { - assertPowerComponentModel(i, abc.getPowerModel(i), proto); - } - // Now for the UidBatteryConsumers. final List<android.os.UidBatteryConsumer> uidConsumers = bus.getUidBatteryConsumers(); uidConsumers.sort((a, b) -> a.getUid() - b.getUid()); @@ -450,34 +446,6 @@ public class BatteryUsageStatsAtomTest { } } - /** - * Validates the PowerComponentModel object that matches powerComponent. - */ - private void assertPowerComponentModel(int powerComponent, - @BatteryConsumer.PowerModel int powerModel, BatteryUsageStatsAtomsProto proto) { - boolean found = false; - for (BatteryUsageStatsAtomsProto.PowerComponentModel powerComponentModel : - proto.componentModels) { - if (powerComponentModel.component == powerComponent) { - if (found) { - fail("Power component " + BatteryConsumer.powerComponentIdToString( - powerComponent) + " found multiple times in the proto"); - } - found = true; - final int expectedPowerModel = BatteryConsumer.powerModelToProtoEnum(powerModel); - assertEquals(expectedPowerModel, powerComponentModel.powerModel); - } - } - if (!found) { - final int model = BatteryConsumer.powerModelToProtoEnum(powerModel); - assertEquals( - "Power component " + BatteryConsumer.powerComponentIdToString(powerComponent) - + " was not found in the proto but has a defined power model.", - BatteryUsageStatsAtomsProto.PowerComponentModel.UNDEFINED, - model); - } - } - /** Converts charge from milliamp hours (mAh) to decicoulombs (dC). */ private long convertMahToDc(double powerMah) { return (long) (powerMah * 36 + 0.5); @@ -486,7 +454,6 @@ public class BatteryUsageStatsAtomTest { private BatteryUsageStats buildBatteryUsageStats() { final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[]{"CustomConsumer1", "CustomConsumer2"}, - /* includePowerModels */ true, /* includeProcessStats */ true, /* includeScreenStateData */ false, /* includePowerStateData */ false, @@ -524,13 +491,13 @@ public class BatteryUsageStatsAtomTest { final BatteryConsumer.Key keyCached = uidBuilder.getKey(BatteryConsumer.POWER_COMPONENT_CPU, BatteryConsumer.PROCESS_STATE_CACHED); - uidBuilder.addConsumedPower(keyFg, 9100, BatteryConsumer.POWER_MODEL_POWER_PROFILE) + uidBuilder.addConsumedPower(keyFg, 9100) .addUsageDurationMillis(keyFg, 8100) - .addConsumedPower(keyBg, 9200, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addConsumedPower(keyBg, (double) 9200) .addUsageDurationMillis(keyBg, 8200) - .addConsumedPower(keyFgs, 9300, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addConsumedPower(keyFgs, (double) 9300) .addUsageDurationMillis(keyFgs, 8300) - .addConsumedPower(keyCached, 9400, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + .addConsumedPower(keyCached, (double) 9400) .addUsageDurationMillis(keyCached, 8400); final BatteryConsumer.Key keyCustomFg = uidBuilder.getKey( @@ -539,10 +506,8 @@ public class BatteryUsageStatsAtomTest { final BatteryConsumer.Key keyCustomBg = uidBuilder.getKey( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, BatteryConsumer.PROCESS_STATE_BACKGROUND); - uidBuilder.addConsumedPower( - keyCustomFg, 100, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); - uidBuilder.addConsumedPower( - keyCustomBg, 350, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); + uidBuilder.addConsumedPower(keyCustomFg, 100); + uidBuilder.addConsumedPower(keyCustomBg, 350); builder.getOrCreateUidBatteryConsumerBuilder(UID_1) .setPackageWithHighestDrain("myPackage1") @@ -557,14 +522,11 @@ public class BatteryUsageStatsAtomTest { builder.getAggregateBatteryConsumerBuilder(AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE) .addConsumedPower(30000) .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU, 20100, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + BatteryConsumer.POWER_COMPONENT_CPU, 20100) .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_AUDIO, 0, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) // Empty + BatteryConsumer.POWER_COMPONENT_AUDIO, 0) // Empty .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_CAMERA, 20150, - BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION) + BatteryConsumer.POWER_COMPONENT_CAMERA, 20150) .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 20200) .addUsageDurationMillis( @@ -576,8 +538,7 @@ public class BatteryUsageStatsAtomTest { builder.getAggregateBatteryConsumerBuilder( BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS) .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU, 10100, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + BatteryConsumer.POWER_COMPONENT_CPU, 10100) .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, 10200); @@ -587,7 +548,7 @@ public class BatteryUsageStatsAtomTest { @Test public void testLargeAtomTruncated() throws Exception { final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(new String[0], true, false, false, false, 0); + new BatteryUsageStats.Builder(new String[0], false, false, false, 0); // If not truncated, this BatteryUsageStats object would generate a proto buffer // significantly larger than 50 Kb for (int i = 0; i < 3000; i++) { diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsRule.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsRule.java index 383616eb59eb..a3c7ece386c7 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsRule.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsRule.java @@ -423,8 +423,6 @@ public class BatteryUsageStatsRule implements TestRule { mBatteryUsageStats = null; } final String[] customPowerComponentNames = mBatteryStats.getCustomEnergyConsumerNames(); - final boolean includePowerModels = (query.getFlags() - & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_MODELS) != 0; final boolean includeProcessStateData = (query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA) != 0; final boolean includeScreenStateData = (query.getFlags() @@ -433,7 +431,7 @@ public class BatteryUsageStatsRule implements TestRule { & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_POWER_STATE) != 0; final double minConsumedPowerThreshold = query.getMinConsumedPowerThreshold(); BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - customPowerComponentNames, includePowerModels, includeProcessStateData, + customPowerComponentNames, includeProcessStateData, includeScreenStateData, includePowerStateData, minConsumedPowerThreshold); SparseArray<? extends BatteryStats.Uid> uidStats = mBatteryStats.getUidStats(); for (int i = 0; i < uidStats.size(); i++) { diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java index 9771da590e37..dd50431b598e 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java @@ -17,8 +17,6 @@ package com.android.server.power.stats; import static android.os.BatteryConsumer.POWER_COMPONENT_ANY; -import static android.os.BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION; -import static android.os.BatteryConsumer.POWER_MODEL_UNDEFINED; import static android.os.BatteryConsumer.PROCESS_STATE_BACKGROUND; import static android.os.BatteryConsumer.PROCESS_STATE_CACHED; import static android.os.BatteryConsumer.PROCESS_STATE_FOREGROUND; @@ -237,7 +235,7 @@ public class BatteryUsageStatsTest { final BatteryUsageStats stats1 = buildBatteryUsageStats1(false).build(); final BatteryUsageStats stats2 = buildBatteryUsageStats2(new String[]{"FOO"}, true).build(); final BatteryUsageStats sum = - new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, true, 0) + new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, 0) .add(stats1) .add(stats2) .build(); @@ -248,15 +246,13 @@ public class BatteryUsageStatsTest { for (UidBatteryConsumer uidBatteryConsumer : uidBatteryConsumers) { if (uidBatteryConsumer.getUid() == APP_UID1) { assertUidBatteryConsumer(uidBatteryConsumer, 1200 + 924, null, - 5321, 6900, 532, 423, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 400 + 345, - POWER_MODEL_UNDEFINED, + 5321, 6900, 532, 423, 400 + 345, 500 + 456, 1167, 1478, true, 3554, 4732, 3998, 444, 3554, 15542, 3776, 17762, 3998, 19982, 444, 1110); } else if (uidBatteryConsumer.getUid() == APP_UID2) { assertUidBatteryConsumer(uidBatteryConsumer, 1332, "bar", - 1111, 2220, 2, 333, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 444, - BatteryConsumer.POWER_MODEL_POWER_PROFILE, + 1111, 2220, 2, 333, 444, 555, 666, 777, true, 1777, 2443, 1999, 321, 1777, 7771, 1888, 8881, 1999, 9991, 321, 654); @@ -280,7 +276,7 @@ public class BatteryUsageStatsTest { @Test public void testAdd_customComponentMismatch() throws Exception { final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, true, 0); + new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, 0); final BatteryUsageStats stats = buildBatteryUsageStats2(new String[]{"BAR"}, false).build(); assertThrows(IllegalArgumentException.class, () -> builder.add(stats)); @@ -291,7 +287,7 @@ public class BatteryUsageStatsTest { @Test public void testAdd_processStateDataMismatch() throws Exception { final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, true, 0); + new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, true, 0); final BatteryUsageStats stats = buildBatteryUsageStats2(new String[]{"FOO"}, false).build(); assertThrows(IllegalArgumentException.class, () -> builder.add(stats)); @@ -328,7 +324,7 @@ public class BatteryUsageStatsTest { final MockBatteryStatsImpl batteryStats = new MockBatteryStatsImpl(clocks); final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(new String[]{"FOO"}, true, true, + new BatteryUsageStats.Builder(new String[]{"FOO"}, true, includeScreenState, includePowerState, 0) .setBatteryCapacity(4000) .setDischargePercentage(20) @@ -339,8 +335,8 @@ public class BatteryUsageStatsTest { addUidBatteryConsumer(builder, batteryStats, APP_UID1, "foo", 1000, 1500, 500, - 300, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 400, - BatteryConsumer.POWER_MODEL_POWER_PROFILE, 500, 600, 800, + 300, 400, + 500, 600, 800, 1777, 7771, 1888, 8881, 1999, 9991, 123, 456); addAggregateBatteryConsumer(builder, @@ -373,7 +369,7 @@ public class BatteryUsageStatsTest { final MockBatteryStatsImpl batteryStats = new MockBatteryStatsImpl(clocks); final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(customPowerComponentNames, true, + new BatteryUsageStats.Builder(customPowerComponentNames, includeProcessStateData, true, true, 0); builder.setDischargePercentage(30) .setDischargedPowerRange(1234, 2345) @@ -382,14 +378,14 @@ public class BatteryUsageStatsTest { addUidBatteryConsumer(builder, batteryStats, APP_UID1, null, 4321, 5400, 32, - 123, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 345, POWER_MODEL_ENERGY_CONSUMPTION, + 123, 345, 456, 567, 678, 1777, 7771, 1888, 8881, 1999, 9991, 321, 654); addUidBatteryConsumer(builder, batteryStats, APP_UID2, "bar", 1111, 2220, 2, - 333, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 444, - BatteryConsumer.POWER_MODEL_POWER_PROFILE, 555, 666, 777, + 333, 444, + 555, 666, 777, 1777, 7771, 1888, 8881, 1999, 9991, 321, 654); addAggregateBatteryConsumer(builder, @@ -409,7 +405,7 @@ public class BatteryUsageStatsTest { MockBatteryStatsImpl batteryStats, int uid, String packageWithHighestDrain, int timeInProcessStateForeground, int timeInProcessStateBackground, int timeInProcessStateForegroundService, double screenPower, - int screenPowerModel, double cpuPower, int cpuPowerModel, double customComponentPower, + double cpuPower, double customComponentPower, int cpuDuration, int customComponentDuration, double cpuPowerForeground, int cpuDurationForeground, double cpuPowerBackground, int cpuDurationBackground, double cpuPowerFgs, int cpuDurationFgs, double cpuPowerCached, long cpuDurationCached) { @@ -423,9 +419,9 @@ public class BatteryUsageStatsTest { .setTimeInProcessStateMs(PROCESS_STATE_FOREGROUND_SERVICE, timeInProcessStateForegroundService) .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_SCREEN, screenPower, screenPowerModel) + BatteryConsumer.POWER_COMPONENT_SCREEN, screenPower) .addConsumedPower( - BatteryConsumer.POWER_COMPONENT_CPU, cpuPower, cpuPowerModel) + BatteryConsumer.POWER_COMPONENT_CPU, cpuPower) .addConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, customComponentPower) .addUsageDurationMillis( @@ -460,21 +456,15 @@ public class BatteryUsageStatsTest { : uidBuilder.getKey( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID, BatteryConsumer.PROCESS_STATE_BACKGROUND); - uidBuilder - .addConsumedPower(cpuFgKey, cpuPowerForeground, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + uidBuilder.addConsumedPower(cpuFgKey, cpuPowerForeground) .addUsageDurationMillis(cpuFgKey, cpuDurationForeground) - .addConsumedPower(cpuBgKey, cpuPowerBackground, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cpuBgKey, cpuPowerBackground) .addUsageDurationMillis(cpuBgKey, cpuDurationBackground) - .addConsumedPower(cpuFgsKey, cpuPowerFgs, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cpuFgsKey, cpuPowerFgs) .addUsageDurationMillis(cpuFgsKey, cpuDurationFgs) - .addConsumedPower(cachedKey, cpuPowerCached, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cachedKey, cpuPowerCached) .addUsageDurationMillis(cachedKey, cpuDurationCached) - .addConsumedPower(customBgKey, customComponentPower, - BatteryConsumer.POWER_MODEL_UNDEFINED) + .addConsumedPower(customBgKey, customComponentPower) .addUsageDurationMillis(customBgKey, customComponentDuration); } } @@ -518,18 +508,13 @@ public class BatteryUsageStatsTest { BatteryConsumer.PROCESS_STATE_UNSPECIFIED, BatteryConsumer.SCREEN_STATE_OTHER, BatteryConsumer.POWER_STATE_OTHER); - aggBuilder - .addConsumedPower(cpuBatScrOn, cpuPowerBatScrOn, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + aggBuilder.addConsumedPower(cpuBatScrOn, cpuPowerBatScrOn) .addUsageDurationMillis(cpuBatScrOn, cpuDurationBatScrOn) - .addConsumedPower(cpuBatScrOff, cpuPowerBatScrOff, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cpuBatScrOff, cpuPowerBatScrOff) .addUsageDurationMillis(cpuBatScrOff, cpuDurationBatScrOff) - .addConsumedPower(cpuChgScrOn, cpuPowerChgScrOn, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cpuChgScrOn, cpuPowerChgScrOn) .addUsageDurationMillis(cpuChgScrOn, cpuDurationChgScrOn) - .addConsumedPower(cpuChgScrOff, cpuPowerChgScrOff, - BatteryConsumer.POWER_MODEL_POWER_PROFILE) + .addConsumedPower(cpuChgScrOff, cpuPowerChgScrOff) .addUsageDurationMillis(cpuChgScrOff, cpuDurationChgScrOff); } } @@ -544,8 +529,7 @@ public class BatteryUsageStatsTest { for (UidBatteryConsumer uidBatteryConsumer : uidBatteryConsumers) { if (uidBatteryConsumer.getUid() == APP_UID1) { assertUidBatteryConsumer(uidBatteryConsumer, 1200, "foo", - 1000, 1500, 500, 300, BatteryConsumer.POWER_MODEL_POWER_PROFILE, 400, - BatteryConsumer.POWER_MODEL_POWER_PROFILE, + 1000, 1500, 500, 300, 400, 500, 600, 800, true, 1777, 2388, 1999, 123, 1777, 7771, 1888, 8881, 1999, 9991, 123, 456); } else { @@ -596,8 +580,8 @@ public class BatteryUsageStatsTest { private void assertUidBatteryConsumer(UidBatteryConsumer uidBatteryConsumer, double consumedPower, String packageWithHighestDrain, int timeInProcessStateForeground, int timeInProcessStateBackground, int timeInProcessStateForegroundService, - int screenPower, int screenPowerModel, double cpuPower, - int cpuPowerModel, double customComponentPower, int cpuDuration, + int screenPower, double cpuPower, + double customComponentPower, int cpuDuration, int customComponentDuration, boolean processStateDataIncluded, double totalPowerForeground, double totalPowerBackground, double totalPowerFgs, double totalPowerCached, double cpuPowerForeground, int cpuDurationForeground, @@ -620,12 +604,8 @@ public class BatteryUsageStatsTest { PROCESS_STATE_FOREGROUND_SERVICE)).isEqualTo(timeInProcessStateForegroundService); assertThat(uidBatteryConsumer.getConsumedPower( BatteryConsumer.POWER_COMPONENT_SCREEN)).isEqualTo(screenPower); - assertThat(uidBatteryConsumer.getPowerModel( - BatteryConsumer.POWER_COMPONENT_SCREEN)).isEqualTo(screenPowerModel); assertThat(uidBatteryConsumer.getConsumedPower( BatteryConsumer.POWER_COMPONENT_CPU)).isEqualTo(cpuPower); - assertThat(uidBatteryConsumer.getPowerModel( - BatteryConsumer.POWER_COMPONENT_CPU)).isEqualTo(cpuPowerModel); assertThat(uidBatteryConsumer.getConsumedPower( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID)).isEqualTo(customComponentPower); assertThat(uidBatteryConsumer.getUsageDurationMillis( diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java index fe6424f91d83..c9cb0dfa98e4 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java @@ -82,16 +82,16 @@ public class BluetoothPowerCalculatorTest { assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID), - 0.06944, 3000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.06944, 3000); assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(APP_UID), - 0.19444, 9000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.19444, 9000); assertBluetoothPowerAndDuration( mStatsRule.getDeviceBatteryConsumer(), - 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.26388, 12000); assertBluetoothPowerAndDuration( mStatsRule.getAppsBatteryConsumer(), - 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.26388, 12000); } @Test @@ -144,8 +144,6 @@ public class BluetoothPowerCalculatorTest { .isEqualTo(6166); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH)) .isWithin(PRECISION).of(0.1226666); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_BLUETOOTH)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); final BatteryConsumer.Key foreground = uidConsumer.getKey( BatteryConsumer.POWER_COMPONENT_BLUETOOTH, @@ -178,16 +176,16 @@ public class BluetoothPowerCalculatorTest { assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID), - 0.08216, 3583, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.08216, 3583); assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(APP_UID), - 0.18169, 8416, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.18169, 8416); assertBluetoothPowerAndDuration( mStatsRule.getDeviceBatteryConsumer(), - 0.30030, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.30030, 12000); assertBluetoothPowerAndDuration( mStatsRule.getAppsBatteryConsumer(), - 0.26386, 11999, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.26386, 11999); } @Test @@ -202,16 +200,16 @@ public class BluetoothPowerCalculatorTest { assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID), - 0.10378, 3583, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); + 0.10378, 3583); assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(APP_UID), - 0.22950, 8416, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); + 0.22950, 8416); assertBluetoothPowerAndDuration( mStatsRule.getDeviceBatteryConsumer(), - 0.33333, 12000, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); + 0.33333, 12000); assertBluetoothPowerAndDuration( mStatsRule.getAppsBatteryConsumer(), - 0.33329, 11999, BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); + 0.33329, 11999); } @Test @@ -264,8 +262,6 @@ public class BluetoothPowerCalculatorTest { .isEqualTo(6166); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH)) .isWithin(PRECISION).of(0.8220561); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_BLUETOOTH)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); final BatteryConsumer.Key foreground = uidConsumer.getKey( BatteryConsumer.POWER_COMPONENT_BLUETOOTH, @@ -299,16 +295,16 @@ public class BluetoothPowerCalculatorTest { assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID), - 0.08216, 3583, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.08216, 3583); assertBluetoothPowerAndDuration( mStatsRule.getUidBatteryConsumer(APP_UID), - 0.18169, 8416, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.18169, 8416); assertBluetoothPowerAndDuration( mStatsRule.getDeviceBatteryConsumer(), - 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.26388, 12000); assertBluetoothPowerAndDuration( mStatsRule.getAppsBatteryConsumer(), - 0.26386, 11999, BatteryConsumer.POWER_MODEL_POWER_PROFILE); + 0.26386, 11999); } private void setupBluetoothEnergyInfo(long reportedEnergyUc, long consumedEnergyUc) { @@ -326,14 +322,12 @@ public class BluetoothPowerCalculatorTest { } private void assertBluetoothPowerAndDuration(@Nullable BatteryConsumer batteryConsumer, - double powerMah, int durationMs, @BatteryConsumer.PowerModel int powerModel) { + double powerMah, int durationMs) { assertThat(batteryConsumer).isNotNull(); double consumedPower = batteryConsumer.getConsumedPower( BatteryConsumer.POWER_COMPONENT_BLUETOOTH); assertThat(consumedPower).isWithin(PRECISION).of(powerMah); - assertThat(batteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_BLUETOOTH)) - .isEqualTo(powerModel); long usageDurationMillis = batteryConsumer.getUsageDurationMillis( BatteryConsumer.POWER_COMPONENT_BLUETOOTH); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/CameraPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/CameraPowerCalculatorTest.java index 7225f2d3995c..4cd3857a80bb 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/CameraPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/CameraPowerCalculatorTest.java @@ -70,16 +70,12 @@ public class CameraPowerCalculatorTest { .isEqualTo(1000); assertThat(app1Consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.1); - assertThat(app1Consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); UidBatteryConsumer app2Consumer = mStatsRule.getUidBatteryConsumer(APP2_UID); assertThat(app2Consumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isEqualTo(2000); assertThat(app2Consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.2); - assertThat(app2Consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); final BatteryConsumer deviceBatteryConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceBatteryConsumer @@ -87,8 +83,6 @@ public class CameraPowerCalculatorTest { .isEqualTo(3000); assertThat(deviceBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.3); - assertThat(deviceBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); final BatteryConsumer appsBatteryConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsBatteryConsumer @@ -96,8 +90,6 @@ public class CameraPowerCalculatorTest { .isEqualTo(3000); assertThat(appsBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.3); - assertThat(appsBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -122,16 +114,12 @@ public class CameraPowerCalculatorTest { .isEqualTo(1000); assertThat(app1Consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.2); - assertThat(app1Consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer app2Consumer = mStatsRule.getUidBatteryConsumer(APP2_UID); assertThat(app2Consumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isEqualTo(2000); assertThat(app2Consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.3); - assertThat(app2Consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); final BatteryConsumer deviceBatteryConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceBatteryConsumer @@ -139,8 +127,6 @@ public class CameraPowerCalculatorTest { .isEqualTo(3000); assertThat(deviceBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.5); - assertThat(deviceBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); final BatteryConsumer appsBatteryConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsBatteryConsumer @@ -148,7 +134,5 @@ public class CameraPowerCalculatorTest { .isEqualTo(3000); assertThat(appsBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CAMERA)) .isWithin(PRECISION).of(0.5); - assertThat(appsBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CAMERA)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerCalculatorTest.java index 4cea72835fba..527db67a84ae 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerCalculatorTest.java @@ -192,8 +192,6 @@ public class CpuPowerCalculatorTest { .isEqualTo(3333); assertThat(uidConsumer1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(1.031677); - assertThat(uidConsumer1.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); assertThat(uidConsumer1.getPackageWithHighestDrain()).isEqualTo("bar"); UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); @@ -201,21 +199,15 @@ public class CpuPowerCalculatorTest { .isEqualTo(7777); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(2.489544); - assertThat(uidConsumer2.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); assertThat(uidConsumer2.getPackageWithHighestDrain()).isNull(); final BatteryConsumer deviceBatteryConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(3.52122); - assertThat(deviceBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); final BatteryConsumer appsBatteryConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(3.52122); - assertThat(appsBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -264,8 +256,6 @@ public class CpuPowerCalculatorTest { .isEqualTo(3333); assertThat(uidConsumer1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(3.18877); - assertThat(uidConsumer1.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); assertThat(uidConsumer1.getPackageWithHighestDrain()).isEqualTo("bar"); UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); @@ -273,21 +263,15 @@ public class CpuPowerCalculatorTest { .isEqualTo(7777); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(7.44072); - assertThat(uidConsumer2.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); assertThat(uidConsumer2.getPackageWithHighestDrain()).isNull(); final BatteryConsumer deviceBatteryConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(10.62949); - assertThat(deviceBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); final BatteryConsumer appsBatteryConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(appsBatteryConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU)) .isWithin(PRECISION).of(10.62949); - assertThat(appsBatteryConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_CPU)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/GnssPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/GnssPowerCalculatorTest.java index 3b5658c2e40a..506bab4b3600 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/GnssPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/GnssPowerCalculatorTest.java @@ -68,20 +68,14 @@ public class GnssPowerCalculatorTest { .isEqualTo(1000); assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(0.1); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(0.1); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(0.1); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -107,27 +101,19 @@ public class GnssPowerCalculatorTest { .isEqualTo(1000); assertThat(consumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(2.77777); - assertThat(consumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer consumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(consumer2.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_GNSS)) .isEqualTo(2000); assertThat(consumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(5.55555); - assertThat(consumer2.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(8.333333); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_GNSS)) .isWithin(PRECISION).of(8.333333); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_GNSS)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java index 9b810bc01b4d..eba820e95783 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java @@ -164,8 +164,6 @@ public class MobileRadioPowerCalculatorTest { // = 4604000 mA-ms or 1.27888 mA-h assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.27888); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 720 mA * 100 ms (level 0 TX drain rate * level 0 TX duration) // + 1080 mA * 200 ms (level 1 TX drain rate * level 1 TX duration) @@ -178,22 +176,16 @@ public class MobileRadioPowerCalculatorTest { BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.94); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 3/4 of total packets were sent by APP_UID so 75% of total UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.705); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // Rest should go to the other app UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.235); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -321,8 +313,6 @@ public class MobileRadioPowerCalculatorTest { // = 5177753 mA-ms or 1.43826 mA-h total consumption assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.43826); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 720 mA * 100 ms (level 0 TX drain rate * level 0 TX duration) // + 1080 mA * 200 ms (level 1 TX drain rate * level 1 TX duration) @@ -335,22 +325,16 @@ public class MobileRadioPowerCalculatorTest { BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.09938); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 3/4 of total packets were sent by APP_UID so 75% of total UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.82453); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // Rest should go to the other app UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.27484); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -441,8 +425,6 @@ public class MobileRadioPowerCalculatorTest { // = 4604000 mA-ms or 1.27888 mA-h assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.27888); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 720 mA * 100 ms (level 0 TX drain rate * level 0 TX duration) // + 1080 mA * 200 ms (level 1 TX drain rate * level 1 TX duration) @@ -455,22 +437,16 @@ public class MobileRadioPowerCalculatorTest { BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.94); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // 3/4 of total packets were sent by APP_UID so 75% of total UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.705); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); // Rest should go to the other app UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.235); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -648,24 +624,16 @@ public class MobileRadioPowerCalculatorTest { // 200ms phone on duration / 2000 total duration * 2.77778 mAh = 0.27777 assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(2.5); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_PHONE)) .isWithin(PRECISION).of(0.27778); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_PHONE)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.38541); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.38541); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test @@ -782,12 +750,8 @@ public class MobileRadioPowerCalculatorTest { // 1000ms phone on duration / 10000 total duration * 2.77778 mAh = 0.27777 assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(2.5); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_PHONE)) .isWithin(PRECISION).of(0.27778); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_PHONE)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); // CDMA2000 [Tx0, Tx1, Tx2, Tx3, Tx4, Rx] drain * duration // [720, 1080, 1440, 1800, 2160, 1440] mA . [10, 11, 12, 13, 14, 15] ms = 111600 mA-ms @@ -817,8 +781,6 @@ public class MobileRadioPowerCalculatorTest { BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.91094); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); // 240 ms Rx Time, 1110 ms Tx Time, 1350 ms active time // 150 App 1 Rx Packets, 10 App 1 Tx packets @@ -841,15 +803,11 @@ public class MobileRadioPowerCalculatorTest { UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.27574); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); // Rest should go to the other app UidBatteryConsumer uidConsumer2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uidConsumer2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(0.63520); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test @@ -936,12 +894,8 @@ public class MobileRadioPowerCalculatorTest { // 1000ms phone on duration / 10000 total duration * 2.77778 mAh = 0.27777 assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(2.5); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_PHONE)) .isWithin(PRECISION).of(0.27778); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_PHONE)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); // Estimated Rx/Tx modem consumption = 0.94 mAh @@ -949,14 +903,10 @@ public class MobileRadioPowerCalculatorTest { // 2.5 * 0.94 / 1.27888 = 1.83754 mAh assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.83754); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) .isWithin(PRECISION).of(1.83754); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/ScreenPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/ScreenPowerCalculatorTest.java index 2da98e8b9a61..7f20035253f0 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/ScreenPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/ScreenPowerCalculatorTest.java @@ -104,8 +104,6 @@ public class ScreenPowerCalculatorTest { // Uid1 charge = 200000000 + 5 / 45 * 300000000 mAs = 64.81 mAh assertThat(uid1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(64.81481); - assertThat(uid1.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer uid2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uid2.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -116,8 +114,6 @@ public class ScreenPowerCalculatorTest { // Uid2 charge = 40 / 45 * 300000000 + 100000000 mAs = 101.85 mAh assertThat(uid2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(101.85185); - assertThat(uid2.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -126,8 +122,6 @@ public class ScreenPowerCalculatorTest { // 600000000 uAs * (1 mA / 1000 uA) * (1 h / 3600 s) = 166.66666 mAh assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(166.66666); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -135,11 +129,8 @@ public class ScreenPowerCalculatorTest { assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(166.66666); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } - @Test public void testMeasuredEnergyBasedModel_multiDisplay() { mStatsRule.initMeasuredEnergyStatsLocked() @@ -202,8 +193,6 @@ public class ScreenPowerCalculatorTest { // (600000000 + 800000000) uAs * (1 mA / 1000 uA) * (1 h / 3600 s) = 166.66666 mAh assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(388.88888); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer uid1 = mStatsRule.getUidBatteryConsumer(APP_UID1); assertThat(uid1.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -214,8 +203,6 @@ public class ScreenPowerCalculatorTest { // Uid1 charge = 20 / 80 * 600000000 mAs = 41.66666 mAh assertThat(uid1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(41.66666); - assertThat(uid1.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); UidBatteryConsumer uid2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uid2.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -226,17 +213,12 @@ public class ScreenPowerCalculatorTest { // Uid1 charge = 60 / 80 * 600000000 + 800000000 mAs = 347.22222 mAh assertThat(uid2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(347.22222); - assertThat(uid2.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(110 * MINUTE_IN_MS); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(388.88888); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); - } @Test @@ -277,8 +259,6 @@ public class ScreenPowerCalculatorTest { // Uid1 charge = 20 / 80 * 92.0 = 23.0 mAh assertThat(uid1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(23.0); - assertThat(uid1.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); UidBatteryConsumer uid2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uid2.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -288,27 +268,20 @@ public class ScreenPowerCalculatorTest { // Uid2 charge = 60 / 80 * 92.0 = 69.0 mAh assertThat(uid2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(69.0); - assertThat(uid2.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(80 * MINUTE_IN_MS); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(92); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(80 * MINUTE_IN_MS); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(92); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } - @Test public void testPowerProfileBasedModel_multiDisplay() { mStatsRule.setAveragePowerForOrdinal(POWER_GROUP_DISPLAY_SCREEN_ON, 1, 60.0) @@ -364,8 +337,6 @@ public class ScreenPowerCalculatorTest { // 92 + 60 * 0.5 + 10 * 0.1 + 90 * 0.2 + 30 * 0.2 = 147 assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(147); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); UidBatteryConsumer uid1 = mStatsRule.getUidBatteryConsumer(APP_UID1); assertThat(uid1.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -375,8 +346,6 @@ public class ScreenPowerCalculatorTest { // Uid1 charge = 20 / 110 * 147.0 = 23.0 mAh assertThat(uid1.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(26.72727); - assertThat(uid1.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); UidBatteryConsumer uid2 = mStatsRule.getUidBatteryConsumer(APP_UID2); assertThat(uid2.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) @@ -386,17 +355,12 @@ public class ScreenPowerCalculatorTest { // Uid2 charge = 90 / 110 * 92.0 = 69.0 mAh assertThat(uid2.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(120.272727); - assertThat(uid2.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer appsConsumer = mStatsRule.getAppsBatteryConsumer(); assertThat(appsConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isEqualTo(110 * MINUTE_IN_MS); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN)) .isWithin(PRECISION).of(147); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_SCREEN)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); - } private void setProcState(int uid, int procState, boolean resumed, long realtimeMs, diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/WifiPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/WifiPowerCalculatorTest.java index 8e221be261e9..827d2f8f04c8 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/WifiPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/WifiPowerCalculatorTest.java @@ -159,22 +159,16 @@ public class WifiPowerCalculatorTest { .isEqualTo(2473); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.3964); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WIFI)) .isEqualTo(4001); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.86666); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); BatteryConsumer appsConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.866666); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -214,8 +208,6 @@ public class WifiPowerCalculatorTest { .isEqualTo(12423); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(2.0214666); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); final BatteryConsumer.Key foreground = uidConsumer.getKey( BatteryConsumer.POWER_COMPONENT_WIFI, @@ -248,22 +240,16 @@ public class WifiPowerCalculatorTest { /* Same ratio as in testPowerControllerBasedModel_nonMeasured but scaled by 1_000_000uC. */ assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.2214666 / (0.2214666 + 0.645200) * 1_000_000 / 3600000); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(deviceConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WIFI)) .isEqualTo(4002); assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.27777); - assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); BatteryConsumer appsConsumer = mStatsRule.getDeviceBatteryConsumer(); assertThat(appsConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.277777); - assertThat(appsConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } @Test @@ -302,8 +288,6 @@ public class WifiPowerCalculatorTest { .isEqualTo(12423); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(1.0325211); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); final BatteryConsumer.Key foreground = uidConsumer.getKey( BatteryConsumer.POWER_COMPONENT_WIFI, @@ -349,8 +333,6 @@ public class WifiPowerCalculatorTest { .isEqualTo(1000); assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.8231573); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE); } @Test @@ -371,8 +353,6 @@ public class WifiPowerCalculatorTest { /* Same ratio as in testTimerBasedModel_nonMeasured but scaled by 1_000_000uC. */ assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI)) .isWithin(PRECISION).of(0.8231573 / (0.8231573 + 0.8759216) * 1_000_000 / 3600000); - assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) - .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } private WifiActivityEnergyInfo buildWifiActivityEnergyInfo(long timeSinceBoot, diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/BasePowerStatsProcessorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/BasePowerStatsProcessorTest.java index f7a16383974d..cca60339acf7 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/BasePowerStatsProcessorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/BasePowerStatsProcessorTest.java @@ -176,7 +176,6 @@ public class BasePowerStatsProcessorTest { powerStatsAggregator, /* batterySessionTimeSpanSlackMillis */ 0); BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[0], - /* includePowerModels */ false, /* includeProcessStateData */ true, /* includeScreenStateData */ true, /* includesPowerStateData */ true, diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/PowerStatsExporterTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/PowerStatsExporterTest.java index 4643dddb1a33..38fe6134d992 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/PowerStatsExporterTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/PowerStatsExporterTest.java @@ -342,7 +342,7 @@ public class PowerStatsExporterTest { PowerStatsExporter exporter = new PowerStatsExporter(mPowerStatsStore, mPowerStatsAggregator, /* batterySessionTimeSpanSlackMillis */ 0); - BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[0], false, + BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[0], includeProcessStateData, includeScreenStateData, includesPowerStateData, 0); exporter.populateBatteryUsageStatsBuilder(builder, aps); return builder.build(); @@ -361,7 +361,7 @@ public class PowerStatsExporterTest { private void breakdownByProcState_fullRange(boolean includeScreenStateData, boolean includePowerStateData) throws Exception { BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - new String[]{"cu570m"}, /* includePowerModels */ false, + new String[]{"cu570m"}, /* includeProcessStateData */ true, includeScreenStateData, includePowerStateData, /* powerThreshold */ 0); exportAggregatedPowerStats(builder, 1000, 10000); @@ -406,7 +406,7 @@ public class PowerStatsExporterTest { @Test public void breakdownByProcState_subRange() throws Exception { BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - new String[]{"cu570m"}, /* includePowerModels */ false, + new String[]{"cu570m"}, /* includeProcessStateData */ true, true, true, /* powerThreshold */ 0); exportAggregatedPowerStats(builder, 3700, 6700); @@ -438,7 +438,7 @@ public class PowerStatsExporterTest { @Test public void combinedProcessStates() throws Exception { BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder( - new String[]{"cu570m"}, /* includePowerModels */ false, + new String[]{"cu570m"}, /* includeProcessStateData */ false, true, true, /* powerThreshold */ 0); exportAggregatedPowerStats(builder, 1000, 10000); diff --git a/services/tests/security/intrusiondetection/AndroidManifest.xml b/services/tests/security/intrusiondetection/AndroidManifest.xml index f388e7ea8590..39e41cddb662 100644 --- a/services/tests/security/intrusiondetection/AndroidManifest.xml +++ b/services/tests/security/intrusiondetection/AndroidManifest.xml @@ -18,10 +18,19 @@ package="com.android.server.security.intrusiondetection.tests"> <uses-permission android:name="android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING" /> - <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> + <uses-permission android:name="android.permission.INTERNET"/> - <application android:testOnly="true"> + <application android:testOnly="true" android:debuggable="true" android:usesCleartextTraffic="true"> <uses-library android:name="android.test.runner"/> + <receiver android:name="com.android.server.security.intrusiondetection.IntrusionDetectionAdminReceiver" + android:permission="android.permission.BIND_DEVICE_ADMIN" + android:exported="true"> + <meta-data android:name="android.app.device_admin" + android:resource="@xml/device_admin"/> + <intent-filter> + <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/> + </intent-filter> + </receiver> </application> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" diff --git a/services/tests/security/intrusiondetection/res/xml/device_admin.xml b/services/tests/security/intrusiondetection/res/xml/device_admin.xml new file mode 100644 index 000000000000..f8cd8f0b9b44 --- /dev/null +++ b/services/tests/security/intrusiondetection/res/xml/device_admin.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<device-admin xmlns:android="http://schemas.android.com/apk/res/android"> +</device-admin> diff --git a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java index bc854cf6488b..c185ad5ffd61 100644 --- a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java +++ b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java @@ -16,14 +16,19 @@ package com.android.server.security.intrusiondetection; +import static android.Manifest.permission.INTERNET; import static android.Manifest.permission.MANAGE_INTRUSION_DETECTION_STATE; import static android.Manifest.permission.READ_INTRUSION_DETECTION_STATE; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -33,7 +38,9 @@ import static org.mockito.Mockito.verify; import android.annotation.SuppressLint; import android.app.admin.ConnectEvent; import android.app.admin.DnsEvent; +import android.app.admin.SecurityLog; import android.app.admin.SecurityLog.SecurityEvent; +import android.content.ComponentName; import android.content.Context; import android.os.Looper; import android.os.PermissionEnforcer; @@ -43,19 +50,44 @@ import android.os.test.TestLooper; import android.security.intrusiondetection.IIntrusionDetectionServiceCommandCallback; import android.security.intrusiondetection.IIntrusionDetectionServiceStateCallback; import android.security.intrusiondetection.IntrusionDetectionEvent; +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.KeyProperties; import androidx.test.core.app.ApplicationProvider; +import com.android.bedstead.harrier.BedsteadJUnit4; +import com.android.bedstead.harrier.annotations.AfterClass; +import com.android.bedstead.harrier.annotations.BeforeClass; +import com.android.bedstead.multiuser.annotations.RequireRunOnSystemUser; +import com.android.bedstead.nene.TestApis; +import com.android.bedstead.nene.devicepolicy.DeviceOwner; +import com.android.bedstead.nene.exceptions.NeneException; +import com.android.bedstead.permissions.CommonPermissions; +import com.android.bedstead.permissions.PermissionContext; +import com.android.bedstead.permissions.annotations.EnsureHasPermission; import com.android.server.ServiceThread; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; - +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.KeyStore; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +@RunWith(BedsteadJUnit4.class) public class IntrusionDetectionServiceTest { private static final int STATE_UNKNOWN = IIntrusionDetectionServiceStateCallback.State.UNKNOWN; @@ -73,6 +105,8 @@ public class IntrusionDetectionServiceTest { private static final int ERROR_DATA_SOURCE_UNAVAILABLE = IIntrusionDetectionServiceCommandCallback.ErrorCode.DATA_SOURCE_UNAVAILABLE; + private static DeviceOwner sDeviceOwner; + private Context mContext; private IntrusionDetectionEventTransportConnection mIntrusionDetectionEventTransportConnection; private DataAggregator mDataAggregator; @@ -83,6 +117,28 @@ public class IntrusionDetectionServiceTest { private Looper mLooperOfDataAggregator; private FakePermissionEnforcer mPermissionEnforcer; + @BeforeClass + public static void setDeviceOwner() { + ComponentName admin = + new ComponentName( + ApplicationProvider.getApplicationContext(), + IntrusionDetectionAdminReceiver.class); + try { + sDeviceOwner = TestApis.devicePolicy().setDeviceOwner(admin); + } catch (NeneException e) { + fail("Failed to set device owner " + admin.flattenToString() + ": " + e); + } + } + + @AfterClass + public static void removeDeviceOwner() { + try { + sDeviceOwner.remove(); + } catch (NeneException e) { + fail("Failed to remove device owner : " + e); + } + } + @SuppressLint("VisibleForTests") @Before public void setUp() { @@ -343,6 +399,172 @@ public class IntrusionDetectionServiceTest { assertNotNull(receivedEvents.get(2).getDnsEvent()); } + @Test + @RequireRunOnSystemUser + public void testDataSources_Initialize_HasDeviceOwner() throws Exception { + NetworkLogSource networkLogSource = new NetworkLogSource(mContext, mDataAggregator); + SecurityLogSource securityLogSource = new SecurityLogSource(mContext, mDataAggregator); + + assertTrue(networkLogSource.initialize()); + assertTrue(securityLogSource.initialize()); + } + + @Test + @RequireRunOnSystemUser + public void testDataSources_Initialize_NoDeviceOwner() throws Exception { + NetworkLogSource networkLogSource = new NetworkLogSource(mContext, mDataAggregator); + SecurityLogSource securityLogSource = new SecurityLogSource(mContext, mDataAggregator); + ComponentName admin = sDeviceOwner.componentName(); + + try { + sDeviceOwner.remove(); + assertFalse(networkLogSource.initialize()); + assertFalse(securityLogSource.initialize()); + } finally { + sDeviceOwner = TestApis.devicePolicy().setDeviceOwner(admin); + } + } + + @Test + @RequireRunOnSystemUser + @EnsureHasPermission(CommonPermissions.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) + public void testDataAggregator_AddSecurityEvent() throws Exception { + mIntrusionDetectionService.setState(STATE_ENABLED); + ServiceThread mockThread = spy(ServiceThread.class); + mDataAggregator.setHandler(mLooperOfDataAggregator, mockThread); + assertTrue(mDataAggregator.initialize()); + + // SecurityLogging generates a number of events and callbacks, so create a latch to wait for + // the given event. + String eventString = this.getClass().getName() + ".testSecurityEvent"; + + final CountDownLatch latch = new CountDownLatch(1); + // TODO: Replace this mock when the IntrusionDetectionEventTransportConnection is ready. + doAnswer( + new Answer<Boolean>() { + @Override + public Boolean answer(InvocationOnMock input) { + List<IntrusionDetectionEvent> receivedEvents = + (List<IntrusionDetectionEvent>) input.getArguments()[0]; + for (IntrusionDetectionEvent event : receivedEvents) { + if (event.getType() == IntrusionDetectionEvent.SECURITY_EVENT) { + SecurityEvent securityEvent = event.getSecurityEvent(); + Object[] eventData = (Object[]) securityEvent.getData(); + if (securityEvent.getTag() == SecurityLog.TAG_KEY_GENERATED + && eventData[1].equals(eventString)) { + latch.countDown(); + } + } + } + return true; + } + }) + .when(mIntrusionDetectionEventTransportConnection).addData(any()); + mDataAggregator.enable(); + + // Generate the security event. + generateSecurityEvent(eventString); + TestApis.devicePolicy().forceSecurityLogs(); + + // Verify the event is received. + mTestLooper.startAutoDispatch(); + assertTrue(latch.await(1, TimeUnit.SECONDS)); + mTestLooper.stopAutoDispatch(); + + mDataAggregator.disable(); + } + + @Test + @RequireRunOnSystemUser + @EnsureHasPermission(CommonPermissions.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) + public void testDataAggregator_AddNetworkEvent() throws Exception { + mIntrusionDetectionService.setState(STATE_ENABLED); + ServiceThread mockThread = spy(ServiceThread.class); + mDataAggregator.setHandler(mLooperOfDataAggregator, mockThread); + assertTrue(mDataAggregator.initialize()); + + // Network logging may log multiple and callbacks, so create a latch to wait for + // the given event. + // eventServer must be a valid domain to generate a network log event. + String eventServer = "google.com"; + final CountDownLatch latch = new CountDownLatch(1); + // TODO: Replace this mock when the IntrusionDetectionEventTransportConnection is ready. + doAnswer( + new Answer<Boolean>() { + @Override + public Boolean answer(InvocationOnMock input) { + List<IntrusionDetectionEvent> receivedEvents = + (List<IntrusionDetectionEvent>) input.getArguments()[0]; + for (IntrusionDetectionEvent event : receivedEvents) { + if (event.getType() + == IntrusionDetectionEvent.NETWORK_EVENT_DNS) { + DnsEvent dnsEvent = event.getDnsEvent(); + if (dnsEvent.getHostname().equals(eventServer)) { + latch.countDown(); + } + } + } + return true; + } + }) + .when(mIntrusionDetectionEventTransportConnection).addData(any()); + mDataAggregator.enable(); + + // Generate the network event. + generateNetworkEvent(eventServer); + TestApis.devicePolicy().forceNetworkLogs(); + + // Verify the event is received. + mTestLooper.startAutoDispatch(); + assertTrue(latch.await(1, TimeUnit.SECONDS)); + mTestLooper.stopAutoDispatch(); + + mDataAggregator.disable(); + } + + /** Emits a given string into security log (if enabled). */ + private void generateSecurityEvent(String eventString) + throws IllegalArgumentException, GeneralSecurityException, IOException { + if (eventString == null || eventString.isEmpty()) { + throw new IllegalArgumentException( + "Error generating security event: eventString must not be empty"); + } + + final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "AndroidKeyStore"); + keyGen.initialize( + new KeyGenParameterSpec.Builder(eventString, KeyProperties.PURPOSE_SIGN).build()); + // Emit key generation event. + final KeyPair keyPair = keyGen.generateKeyPair(); + assertNotNull(keyPair); + + final KeyStore ks = KeyStore.getInstance("AndroidKeyStore"); + ks.load(null); + // Emit key destruction event. + ks.deleteEntry(eventString); + } + + /** Emits a given string into network log (if enabled). */ + private void generateNetworkEvent(String server) throws IllegalArgumentException, IOException { + if (server == null || server.isEmpty()) { + throw new IllegalArgumentException( + "Error generating network event: server must not be empty"); + } + + HttpURLConnection urlConnection = null; + int connectionTimeoutMS = 2_000; + try (PermissionContext p = TestApis.permissions().withPermission(INTERNET)) { + final URL url = new URL("http://" + server); + urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setConnectTimeout(connectionTimeoutMS); + urlConnection.setReadTimeout(connectionTimeoutMS); + urlConnection.getResponseCode(); + } finally { + if (urlConnection != null) { + urlConnection.disconnect(); + } + } + } + private class MockInjector implements IntrusionDetectionService.Injector { private final Context mContext; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index 492838e9b4fb..27de7644f6b2 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -38,7 +38,6 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE; import static com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity.EXTRA_TYPE_TO_CHOOSE; import static com.android.server.accessibility.AccessibilityManagerService.ACTION_LAUNCH_HEARING_DEVICES_DIALOG; -import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER; import static com.google.common.truth.Truth.assertThat; @@ -601,7 +600,6 @@ public class AccessibilityManagerServiceTest { } @Test - @EnableFlags(FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) public void testSetConnectionNull_borderFlagEnabled_unregisterFullScreenMagnification() throws RemoteException { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java index 7e0c12a5a545..ac27a971102a 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java @@ -21,7 +21,6 @@ import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MOD import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX; import static com.android.server.accessibility.magnification.FullScreenMagnificationController.MagnificationInfoChangedCallback; import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY; -import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -308,7 +307,6 @@ public class FullScreenMagnificationControllerTest { } @Test - @RequiresFlagsEnabled(FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) public void testSetScale_noConnection_doNothing() { register(TEST_DISPLAY); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java index f0d3456a39de..c878799109dc 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java @@ -57,10 +57,6 @@ import android.hardware.display.DisplayManagerInternal; import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; -import android.platform.test.annotations.RequiresFlagsDisabled; -import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.provider.Settings; import android.test.mock.MockContentResolver; import android.testing.DexmakerShareClassLoaderRule; @@ -82,7 +78,6 @@ import com.android.server.accessibility.AccessibilityTraceManager; import com.android.server.accessibility.test.MessageCapturingHandler; import com.android.server.input.InputManagerInternal; import com.android.server.wm.WindowManagerInternal; -import com.android.window.flags.Flags; import org.junit.After; import org.junit.Before; @@ -101,9 +96,6 @@ import org.mockito.stubbing.Answer; @RunWith(AndroidJUnit4.class) public class MagnificationControllerTest { - @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); - private static final int TEST_DISPLAY = Display.DEFAULT_DISPLAY; private static final int TEST_SERVICE_ID = 1; private static final Region INITIAL_SCREEN_MAGNIFICATION_REGION = @@ -1365,8 +1357,7 @@ public class MagnificationControllerTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) - public void onFullscreenMagnificationActivationState_systemUiBorderFlagOn_notifyConnection() { + public void onFullscreenMagnificationActivationState_notifyConnection() { mMagnificationController.onFullScreenMagnificationActivationState( TEST_DISPLAY, /* activated= */ true); @@ -1374,17 +1365,6 @@ public class MagnificationControllerTest { .onFullscreenMagnificationActivationChanged(TEST_DISPLAY, /* activated= */ true); } - @Test - @RequiresFlagsDisabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) - public void - onFullscreenMagnificationActivationState_systemUiBorderFlagOff_neverNotifyConnection() { - mMagnificationController.onFullScreenMagnificationActivationState( - TEST_DISPLAY, /* activated= */ true); - - verify(mMagnificationConnectionManager, never()) - .onFullscreenMagnificationActivationChanged(TEST_DISPLAY, /* activated= */ true); - } - private void setMagnificationEnabled(int mode) throws RemoteException { setMagnificationEnabled(mode, MAGNIFIED_CENTER_X, MAGNIFIED_CENTER_Y); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 8bbba1b17240..a425401c6238 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -42,7 +42,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_TOAST; import static android.view.flags.Flags.FLAG_SENSITIVE_CONTENT_APP_PROTECTION; import static android.window.DisplayAreaOrganizer.FEATURE_VENDOR_FIRST; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; @@ -85,7 +84,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.platform.test.annotations.Presubmit; -import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; @@ -97,7 +95,6 @@ import android.view.InputChannel; import android.view.InputDevice; import android.view.InsetsSourceControl; import android.view.InsetsState; -import android.view.Surface; import android.view.SurfaceControl; import android.view.View; import android.view.WindowInsets; @@ -1192,55 +1189,6 @@ public class WindowManagerServiceTests extends WindowTestsBase { argThat(h -> (h.inputConfig & InputConfig.SENSITIVE_FOR_PRIVACY) != 0)); } - @RequiresFlagsDisabled(Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER) - @Test - public void testDrawMagnifiedViewport() { - final int displayId = mDisplayContent.mDisplayId; - // Use real surface, so ViewportWindow's BlastBufferQueue can be created. - final ArrayList<SurfaceControl> surfaceControls = new ArrayList<>(); - mWm.mSurfaceControlFactory = () -> new SurfaceControl.Builder() { - @Override - public SurfaceControl build() { - final SurfaceControl sc = super.build(); - surfaceControls.add(sc); - return sc; - } - }; - mWm.mAccessibilityController.setMagnificationCallbacks(displayId, - mock(WindowManagerInternal.MagnificationCallbacks.class)); - final boolean[] lockCanvasInWmLock = { false }; - final Surface surface = mWm.mAccessibilityController.forceShowMagnifierSurface(displayId); - spyOn(surface); - doAnswer(invocationOnMock -> { - lockCanvasInWmLock[0] |= Thread.holdsLock(mWm.mGlobalLock); - invocationOnMock.callRealMethod(); - return null; - }).when(surface).lockCanvas(any()); - mWm.mAccessibilityController - .recomputeMagnifiedRegionAndDrawMagnifiedRegionBorderIfNeeded(displayId); - waitUntilHandlersIdle(); - try { - verify(surface).lockCanvas(any()); - - clearInvocations(surface); - // Invalidate and redraw. - mWm.mAccessibilityController.onDisplaySizeChanged(mDisplayContent); - mWm.mAccessibilityController - .recomputeMagnifiedRegionAndDrawMagnifiedRegionBorderIfNeeded(displayId); - // Turn off magnification to release surface. - mWm.mAccessibilityController.setMagnificationCallbacks(displayId, null); - waitUntilHandlersIdle(); - // lockCanvas must not be called after releasing. - verify(surface, never()).lockCanvas(any()); - verify(surface).release(); - assertFalse(lockCanvasInWmLock[0]); - } finally { - for (int i = surfaceControls.size() - 1; i >= 0; --i) { - surfaceControls.get(i).release(); - } - } - } - @Test public void testRequestKeyboardShortcuts_noWindow() { doNothing().when(mWm.mContext).enforceCallingOrSelfPermission(anyString(), anyString()); diff --git a/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java b/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java index bfce3d276a2d..6d818d7287b0 100644 --- a/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java +++ b/tests/BatteryStatsPerfTest/src/com/android/internal/os/BatteryUsageStatsPerfTest.java @@ -159,7 +159,7 @@ public class BatteryUsageStatsPerfTest { private static BatteryUsageStats buildBatteryUsageStats() { final BatteryUsageStats.Builder builder = - new BatteryUsageStats.Builder(new String[]{"FOO"}, true, false, false, false, 0) + new BatteryUsageStats.Builder(new String[]{"FOO"}, false, false, false, 0) .setBatteryCapacity(4000) .setDischargePercentage(20) .setDischargedPowerRange(1000, 2000) @@ -182,8 +182,7 @@ public class BatteryUsageStatsPerfTest { .setTimeInProcessStateMs(UidBatteryConsumer.STATE_BACKGROUND, i * 1000); for (int componentId = 0; componentId < BatteryConsumer.POWER_COMPONENT_COUNT; componentId++) { - consumerBuilder.addConsumedPower(componentId, componentId * 123.0, - BatteryConsumer.POWER_MODEL_POWER_PROFILE); + consumerBuilder.addConsumedPower(componentId, componentId * 123.0); consumerBuilder.addUsageDurationMillis(componentId, componentId * 1000); } diff --git a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/BottomHalfPipAppHelper.kt b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/BottomHalfPipAppHelper.kt deleted file mode 100644 index 6573c2c83f20..000000000000 --- a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/BottomHalfPipAppHelper.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.helpers - -import android.app.Instrumentation -import android.content.Intent -import android.tools.traces.parsers.toFlickerComponent -import com.android.server.wm.flicker.testapp.ActivityOptions - -class BottomHalfPipAppHelper( - instrumentation: Instrumentation, - private val useLaunchingActivity: Boolean = false, -) : PipAppHelper( - instrumentation, - appName = ActivityOptions.BottomHalfPip.LABEL, - componentNameMatcher = ActivityOptions.BottomHalfPip.COMPONENT - .toFlickerComponent() -) { - override val openAppIntent: Intent - get() = super.openAppIntent.apply { - component = if (useLaunchingActivity) { - ActivityOptions.BottomHalfPip.LAUNCHING_APP_COMPONENT - } else { - ActivityOptions.BottomHalfPip.COMPONENT - } - } -}
\ No newline at end of file diff --git a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt index 2fe84b00b040..db4838ee6092 100644 --- a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt +++ b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt @@ -27,7 +27,6 @@ import android.tools.device.apphelpers.StandardAppHelper import android.tools.helpers.FIND_TIMEOUT import android.tools.helpers.SYSTEMUI_PACKAGE import android.tools.traces.ConditionsFactory -import android.tools.traces.component.ComponentNameMatcher import android.tools.traces.component.IComponentMatcher import android.tools.traces.parsers.WindowManagerStateHelper import android.tools.traces.parsers.toFlickerComponent @@ -36,11 +35,12 @@ import androidx.test.uiautomator.By import androidx.test.uiautomator.Until import com.android.server.wm.flicker.testapp.ActivityOptions -open class PipAppHelper( - instrumentation: Instrumentation, - appName: String = ActivityOptions.Pip.LABEL, - componentNameMatcher: ComponentNameMatcher = ActivityOptions.Pip.COMPONENT.toFlickerComponent(), -) : StandardAppHelper(instrumentation, appName, componentNameMatcher) { +open class PipAppHelper(instrumentation: Instrumentation) : + StandardAppHelper( + instrumentation, + ActivityOptions.Pip.LABEL, + ActivityOptions.Pip.COMPONENT.toFlickerComponent() + ) { private val mediaSessionManager: MediaSessionManager get() = context.getSystemService(MediaSessionManager::class.java) diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml index 7c24a4adca3d..9ce8e807f612 100644 --- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml +++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml @@ -347,27 +347,6 @@ <category android:name="android.intent.category.LEANBACK_LAUNCHER"/> </intent-filter> </activity> - <activity android:name=".BottomHalfPipLaunchingActivity" - android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" - android:taskAffinity="com.android.server.wm.flicker.testapp.BottomHalfPipLaunchingActivity" - android:theme="@style/CutoutShortEdges" - android:label="BottomHalfPipLaunchingActivity" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> - </intent-filter> - </activity> - <activity - android:name=".BottomHalfPipActivity" - android:resizeableActivity="true" - android:supportsPictureInPicture="true" - android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" - android:taskAffinity="com.android.server.wm.flicker.testapp.BottomHalfPipLaunchingActivity" - android:theme="@style/TranslucentTheme" - android:label="BottomHalfPipActivity" - android:exported="true"> - </activity> <activity android:name=".SplitScreenActivity" android:resizeableActivity="true" android:taskAffinity="com.android.server.wm.flicker.testapp.SplitScreenActivity" diff --git a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml index 837d050b73ff..47d113717ae0 100644 --- a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml +++ b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml @@ -62,12 +62,6 @@ <item name="android:backgroundDimEnabled">false</item> </style> - <style name="TranslucentTheme" parent="@style/OptOutEdgeToEdge"> - <item name="android:windowIsTranslucent">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:backgroundDimEnabled">false</item> - </style> - <style name="no_starting_window" parent="@style/OptOutEdgeToEdge"> <item name="android:windowDisablePreview">true</item> </style> diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java index 0c1ac9951d32..73625da9dfa5 100644 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java +++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java @@ -241,21 +241,6 @@ public class ActivityOptions { FLICKER_APP_PACKAGE + ".PipActivity"); } - public static class BottomHalfPip { - public static final String LAUNCHING_APP_LABEL = "BottomHalfPipLaunchingActivity"; - // Test App > Bottom Half PIP Activity - public static final String LABEL = "BottomHalfPipActivity"; - - // Use the bottom half layout for PIP Activity - public static final String EXTRA_BOTTOM_HALF_LAYOUT = "bottom_half"; - - public static final ComponentName LAUNCHING_APP_COMPONENT = new ComponentName( - FLICKER_APP_PACKAGE, FLICKER_APP_PACKAGE + ".BottomHalfPipLaunchingActivity"); - - public static final ComponentName COMPONENT = new ComponentName(FLICKER_APP_PACKAGE, - FLICKER_APP_PACKAGE + ".BottomHalfPipActivity"); - } - public static class SplitScreen { public static class Primary { public static final String LABEL = "SplitScreenPrimaryActivity"; diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/BottomHalfPipActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/BottomHalfPipActivity.java deleted file mode 100644 index 3d4865572486..000000000000 --- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/BottomHalfPipActivity.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.flicker.testapp; - -import android.app.Activity; -import android.content.res.Configuration; -import android.os.Bundle; -import android.view.ViewGroup.LayoutParams; -import android.view.WindowManager; - -import androidx.annotation.NonNull; - -public class BottomHalfPipActivity extends PipActivity { - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setTheme(R.style.TranslucentTheme); - updateLayout(); - } - - @Override - public void onConfigurationChanged(@NonNull Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - updateLayout(); - } - - /** - * Sets to match parent layout if the activity is - * {@link Activity#isInPictureInPictureMode()}. Otherwise, set to bottom half - * layout. - * - * @see #setToBottomHalfMode(boolean) - */ - private void updateLayout() { - setToBottomHalfMode(!isInPictureInPictureMode()); - } - - /** - * Sets `useBottomHalfLayout` to `true` to use the bottom half layout. Use the - * [LayoutParams.MATCH_PARENT] layout. - */ - private void setToBottomHalfMode(boolean useBottomHalfLayout) { - final WindowManager.LayoutParams attrs = getWindow().getAttributes(); - if (useBottomHalfLayout) { - final int taskHeight = getWindowManager().getCurrentWindowMetrics().getBounds() - .height(); - attrs.y = taskHeight / 2; - attrs.height = taskHeight / 2; - } else { - attrs.y = 0; - attrs.height = LayoutParams.MATCH_PARENT; - } - getWindow().setAttributes(attrs); - } -} |
