diff options
726 files changed, 24907 insertions, 4583 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 1c6df75a4f02..7e6c30f0719a 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -54,6 +54,7 @@ aconfig_srcjars = [ ":android.service.controls.flags-aconfig-java{.generated_srcjars}", ":android.service.dreams.flags-aconfig-java{.generated_srcjars}", ":android.service.notification.flags-aconfig-java{.generated_srcjars}", + ":android.service.appprediction.flags-aconfig-java{.generated_srcjars}", ":android.service.voice.flags-aconfig-java{.generated_srcjars}", ":android.speech.flags-aconfig-java{.generated_srcjars}", ":android.systemserver.flags-aconfig-java{.generated_srcjars}", @@ -125,6 +126,7 @@ stubs_defaults { "android.provider.flags-aconfig", "android.security.flags-aconfig", "android.server.app.flags-aconfig", + "android.service.appprediction.flags-aconfig", "android.service.autofill.flags-aconfig", "android.service.chooser.flags-aconfig", "android.service.controls.flags-aconfig", @@ -726,6 +728,19 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// App prediction +aconfig_declarations { + name: "android.service.appprediction.flags-aconfig", + package: "android.service.appprediction.flags", + srcs: ["core/java/android/service/appprediction/flags/*.aconfig"], +} + +java_aconfig_library { + name: "android.service.appprediction.flags-aconfig-java", + aconfig_declarations: "android.service.appprediction.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Controls aconfig_declarations { name: "android.service.controls.flags-aconfig", @@ -855,6 +870,13 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "device_policy_aconfig_flags_lib_host", + aconfig_declarations: "device_policy_aconfig_flags", + host_supported: true, + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + cc_aconfig_library { name: "device_policy_aconfig_flags_c_lib", aconfig_declarations: "device_policy_aconfig_flags", @@ -40,4 +40,6 @@ per-file *Ravenwood* = file:ravenwood/OWNERS per-file PERFORMANCE_OWNERS = file:/PERFORMANCE_OWNERS -per-file PACKAGE_MANAGER_OWNERS = file:/PACKAGE_MANAGER_OWNERS
\ No newline at end of file +per-file PACKAGE_MANAGER_OWNERS = file:/PACKAGE_MANAGER_OWNERS + +per-file WEAR_OWNERS = file:/WEAR_OWNERS diff --git a/Ravenwood.bp b/Ravenwood.bp index d13c4d78190c..2babf6a56ab4 100644 --- a/Ravenwood.bp +++ b/Ravenwood.bp @@ -33,6 +33,7 @@ java_genrule { "@$(location ravenwood/ravenwood-standard-options.txt) " + "--debug-log $(location hoststubgen_framework-minus-apex.log) " + + "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " + "--out-impl-jar $(location ravenwood.jar) " + @@ -56,6 +57,7 @@ java_genrule { "hoststubgen_dump.txt", "hoststubgen_framework-minus-apex.log", + "hoststubgen_framework-minus-apex_stats.csv", ], visibility: ["//visibility:private"], } @@ -94,14 +96,19 @@ java_library { android_ravenwood_libgroup { name: "ravenwood-runtime", libs: [ + // Prefixed with "200" to ensure it's sorted early in Tradefed classpath + // so that we provide a concrete implementation before Mainline stubs + "200-kxml2-android", + "all-updatable-modules-system-stubs", + "android.test.mock.ravenwood", "framework-minus-apex.ravenwood", - "hoststubgen-helper-runtime.ravenwood", "hoststubgen-helper-framework-runtime.ravenwood", - "all-updatable-modules-system-stubs", + "hoststubgen-helper-runtime.ravenwood", + + // Provide runtime versions of utils linked in below "junit", "truth", "ravenwood-junit-impl", - "android.test.mock.ravenwood", "mockito-ravenwood-prebuilt", "inline-mockito-ravenwood-prebuilt", ], diff --git a/WEAR_OWNERS b/WEAR_OWNERS index 4127f996da03..da8c83ebcc98 100644 --- a/WEAR_OWNERS +++ b/WEAR_OWNERS @@ -10,3 +10,4 @@ sadrul@google.com rwmyers@google.com nalmalki@google.com shijianli@google.com +latkin@google.com diff --git a/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java b/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java index 123b2eeba5dd..0fd24493f2d5 100644 --- a/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java +++ b/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java @@ -21,8 +21,11 @@ import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.TOOL_TYPE_FINGER; import static android.view.MotionEvent.TOOL_TYPE_STYLUS; +import static android.view.inputmethod.Flags.initiationWithoutInputConnection; +import static org.junit.Assume.assumeFalse; + import android.app.Instrumentation; import android.content.Context; import android.perftests.utils.BenchmarkState; @@ -186,6 +189,7 @@ public class HandwritingInitiatorPerfTest { @Test public void onInputConnectionCreated() { + assumeFalse(initiationWithoutInputConnection()); final BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); final View view = new View(mContext); final EditorInfo editorInfo = new EditorInfo(); @@ -199,6 +203,7 @@ public class HandwritingInitiatorPerfTest { @Test public void onInputConnectionClosed() { + assumeFalse(initiationWithoutInputConnection()); final BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); final View view = new View(mContext); while (state.keepRunning()) { diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index 7284f479df35..60eb4ac61076 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -124,6 +124,15 @@ public class JobInfo implements Parcelable { @Overridable // Aid in testing public static final long ENFORCE_MINIMUM_TIME_WINDOWS = 311402873L; + /** + * Require that minimum latencies and override deadlines are nonnegative. + * + * @hide + */ + @ChangeId + @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + public static final long REJECT_NEGATIVE_DELAYS_AND_DEADLINES = 323349338L; + /** @hide */ @IntDef(prefix = { "NETWORK_TYPE_" }, value = { NETWORK_TYPE_NONE, @@ -692,14 +701,14 @@ public class JobInfo implements Parcelable { * @see JobInfo.Builder#setMinimumLatency(long) */ public long getMinLatencyMillis() { - return minLatencyMillis; + return Math.max(0, minLatencyMillis); } /** * @see JobInfo.Builder#setOverrideDeadline(long) */ public long getMaxExecutionDelayMillis() { - return maxExecutionDelayMillis; + return Math.max(0, maxExecutionDelayMillis); } /** @@ -1869,6 +1878,13 @@ public class JobInfo implements Parcelable { * Because it doesn't make sense setting this property on a periodic job, doing so will * throw an {@link java.lang.IllegalArgumentException} when * {@link android.app.job.JobInfo.Builder#build()} is called. + * + * Negative latencies also don't make sense for a job and are indicative of an error, + * so starting in Android version {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, + * setting a negative deadline will result in + * {@link android.app.job.JobInfo.Builder#build()} throwing an + * {@link java.lang.IllegalArgumentException}. + * * @param minLatencyMillis Milliseconds before which this job will not be considered for * execution. * @see JobInfo#getMinLatencyMillis() @@ -1892,6 +1908,13 @@ public class JobInfo implements Parcelable { * throw an {@link java.lang.IllegalArgumentException} when * {@link android.app.job.JobInfo.Builder#build()} is called. * + * <p> + * Negative deadlines also don't make sense for a job and are indicative of an error, + * so starting in Android version {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, + * setting a negative deadline will result in + * {@link android.app.job.JobInfo.Builder#build()} throwing an + * {@link java.lang.IllegalArgumentException}. + * * <p class="note"> * Since a job will run once the deadline has passed regardless of the status of other * constraints, setting a deadline of 0 (or a {@link #setMinimumLatency(long) delay} equal @@ -2189,13 +2212,15 @@ public class JobInfo implements Parcelable { public JobInfo build() { return build(Compatibility.isChangeEnabled(DISALLOW_DEADLINES_FOR_PREFETCH_JOBS), Compatibility.isChangeEnabled(REJECT_NEGATIVE_NETWORK_ESTIMATES), - Compatibility.isChangeEnabled(ENFORCE_MINIMUM_TIME_WINDOWS)); + Compatibility.isChangeEnabled(ENFORCE_MINIMUM_TIME_WINDOWS), + Compatibility.isChangeEnabled(REJECT_NEGATIVE_DELAYS_AND_DEADLINES)); } /** @hide */ public JobInfo build(boolean disallowPrefetchDeadlines, boolean rejectNegativeNetworkEstimates, - boolean enforceMinimumTimeWindows) { + boolean enforceMinimumTimeWindows, + boolean rejectNegativeDelaysAndDeadlines) { // This check doesn't need to be inside enforceValidity. It's an unnecessary legacy // check that would ideally be phased out instead. if (mBackoffPolicySet && (mConstraintFlags & CONSTRAINT_FLAG_DEVICE_IDLE) != 0) { @@ -2205,7 +2230,7 @@ public class JobInfo implements Parcelable { } JobInfo jobInfo = new JobInfo(this); jobInfo.enforceValidity(disallowPrefetchDeadlines, rejectNegativeNetworkEstimates, - enforceMinimumTimeWindows); + enforceMinimumTimeWindows, rejectNegativeDelaysAndDeadlines); return jobInfo; } @@ -2225,7 +2250,8 @@ public class JobInfo implements Parcelable { */ public final void enforceValidity(boolean disallowPrefetchDeadlines, boolean rejectNegativeNetworkEstimates, - boolean enforceMinimumTimeWindows) { + boolean enforceMinimumTimeWindows, + boolean rejectNegativeDelaysAndDeadlines) { // Check that network estimates require network type and are reasonable values. if ((networkDownloadBytes > 0 || networkUploadBytes > 0 || minimumNetworkChunkBytes > 0) && networkRequest == null) { @@ -2259,6 +2285,17 @@ public class JobInfo implements Parcelable { throw new IllegalArgumentException("Minimum chunk size must be positive"); } + if (rejectNegativeDelaysAndDeadlines) { + if (minLatencyMillis < 0) { + throw new IllegalArgumentException( + "Minimum latency is negative: " + minLatencyMillis); + } + if (maxExecutionDelayMillis < 0) { + throw new IllegalArgumentException( + "Override deadline is negative: " + maxExecutionDelayMillis); + } + } + final boolean hasDeadline = maxExecutionDelayMillis != 0L; // Check that a deadline was not set on a periodic job. if (isPeriodic) { @@ -2354,9 +2391,9 @@ public class JobInfo implements Parcelable { if (maxExecutionDelayMillis - windowStart < MIN_ALLOWED_TIME_WINDOW_MILLIS) { if (enforceMinimumTimeWindows && Flags.enforceMinimumTimeWindows()) { - throw new IllegalArgumentException("Jobs with a deadline and" - + " functional constraints cannot have a time window less than " - + MIN_ALLOWED_TIME_WINDOW_MILLIS + " ms." + throw new IllegalArgumentException("Time window too short. Constraints" + + " unlikely to be satisfied. Increase deadline to a reasonable" + + " duration." + " Job '" + service.flattenToShortString() + "#" + jobId + "'" + " has delay=" + windowStart + ", deadline=" + maxExecutionDelayMillis); 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 a83c099b764d..f819f15b430f 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -4850,7 +4850,7 @@ public class JobSchedulerService extends com.android.server.SystemService Slog.w(TAG, "Uid " + uid + " set bias on its job"); return new JobInfo.Builder(job) .setBias(JobInfo.BIAS_DEFAULT) - .build(false, false, false); + .build(false, false, false, false); } } @@ -4874,7 +4874,9 @@ public class JobSchedulerService extends com.android.server.SystemService JobInfo.DISALLOW_DEADLINES_FOR_PREFETCH_JOBS, callingUid), rejectNegativeNetworkEstimates, CompatChanges.isChangeEnabled( - JobInfo.ENFORCE_MINIMUM_TIME_WINDOWS, callingUid)); + JobInfo.ENFORCE_MINIMUM_TIME_WINDOWS, callingUid), + CompatChanges.isChangeEnabled( + JobInfo.REJECT_NEGATIVE_DELAYS_AND_DEADLINES, callingUid)); if ((job.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0) { getContext().enforceCallingOrSelfPermission( android.Manifest.permission.CONNECTIVITY_INTERNAL, TAG); 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 53b14d616ecc..d8934d8f83b8 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java @@ -1495,7 +1495,7 @@ public final class JobStore { // return value), the deadline is dropped. Periodic jobs require all constraints // to be met, so there's no issue with their deadlines. // The same logic applies for other target SDK-based validation checks. - builtJob = jobBuilder.build(false, false, false); + builtJob = jobBuilder.build(false, false, false, false); } catch (Exception e) { Slog.w(TAG, "Unable to build job from XML, ignoring: " + jobBuilder.summarize(), e); return null; diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java index 6883d18cd937..aec464d0e820 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/FlexibilityController.java @@ -241,6 +241,8 @@ public final class FlexibilityController extends StateController { private static final long MAX_TIME_WINDOW_MS = 24 * HOUR_IN_MILLIS; private final JobScoreBucket[] mScoreBuckets = new JobScoreBucket[NUM_SCORE_BUCKETS]; private int mScoreBucketIndex = 0; + private long mCachedScoreExpirationTimeElapsed; + private int mCachedScore; public void addScore(int add, long nowElapsed) { JobScoreBucket bucket = mScoreBuckets[mScoreBucketIndex]; @@ -248,10 +250,17 @@ public final class FlexibilityController extends StateController { bucket = new JobScoreBucket(); bucket.startTimeElapsed = nowElapsed; mScoreBuckets[mScoreBucketIndex] = bucket; + // Brand new bucket, there's nothing to remove from the score, + // so just update the expiration time if needed. + mCachedScoreExpirationTimeElapsed = Math.min(mCachedScoreExpirationTimeElapsed, + nowElapsed + MAX_TIME_WINDOW_MS); } else if (bucket.startTimeElapsed < nowElapsed - MAX_TIME_WINDOW_MS) { // The bucket is too old. bucket.reset(); bucket.startTimeElapsed = nowElapsed; + // Force a recalculation of the cached score instead of just updating the cached + // value and time in case there are multiple stale buckets. + mCachedScoreExpirationTimeElapsed = nowElapsed; } else if (bucket.startTimeElapsed < nowElapsed - MAX_TIME_WINDOW_MS / NUM_SCORE_BUCKETS) { // The current bucket's duration has completed. Move on to the next bucket. @@ -261,16 +270,26 @@ public final class FlexibilityController extends StateController { } bucket.score += add; + mCachedScore += add; } public int getScore(long nowElapsed) { + if (nowElapsed < mCachedScoreExpirationTimeElapsed) { + return mCachedScore; + } int score = 0; final long earliestElapsed = nowElapsed - MAX_TIME_WINDOW_MS; + long earliestValidBucketTimeElapsed = Long.MAX_VALUE; for (JobScoreBucket bucket : mScoreBuckets) { if (bucket != null && bucket.startTimeElapsed >= earliestElapsed) { score += bucket.score; + if (earliestValidBucketTimeElapsed > bucket.startTimeElapsed) { + earliestValidBucketTimeElapsed = bucket.startTimeElapsed; + } } } + mCachedScore = score; + mCachedScoreExpirationTimeElapsed = earliestValidBucketTimeElapsed + MAX_TIME_WINDOW_MS; return score; } @@ -378,10 +397,16 @@ public final class FlexibilityController extends StateController { @Override public void prepareForExecutionLocked(JobStatus jobStatus) { + if (jobStatus.lastEvaluatedBias == JobInfo.BIAS_TOP_APP) { + // Don't include jobs for the TOP app in the score calculation. + return; + } // Use the job's requested priority to determine its score since that is what the developer // selected and it will be stable across job runs. - final int score = mFallbackFlexibilityDeadlineScores - .get(jobStatus.getJob().getPriority(), jobStatus.getJob().getPriority() / 100); + final int priority = jobStatus.getJob().getPriority(); + final int score = mFallbackFlexibilityDeadlineScores.get(priority, + FcConfig.DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_SCORES + .get(priority, priority / 100)); JobScoreTracker jobScoreTracker = mJobScoreTrackers.get(jobStatus.getSourceUid(), jobStatus.getSourcePackageName()); if (jobScoreTracker == null) { @@ -394,6 +419,10 @@ public final class FlexibilityController extends StateController { @Override public void unprepareFromExecutionLocked(JobStatus jobStatus) { + if (jobStatus.lastEvaluatedBias == JobInfo.BIAS_TOP_APP) { + // Jobs for the TOP app are excluded from the score calculation. + return; + } // The job didn't actually start. Undo the score increase. JobScoreTracker jobScoreTracker = mJobScoreTrackers.get(jobStatus.getSourceUid(), jobStatus.getSourcePackageName()); @@ -401,8 +430,10 @@ public final class FlexibilityController extends StateController { Slog.e(TAG, "Unprepared a job that didn't result in a score change"); return; } - final int score = mFallbackFlexibilityDeadlineScores - .get(jobStatus.getJob().getPriority(), jobStatus.getJob().getPriority() / 100); + final int priority = jobStatus.getJob().getPriority(); + final int score = mFallbackFlexibilityDeadlineScores.get(priority, + FcConfig.DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_SCORES + .get(priority, priority / 100)); jobScoreTracker.addScore(-score, sElapsedRealtimeClock.millis()); } @@ -649,21 +680,24 @@ public final class FlexibilityController extends StateController { (long) Math.scalb(mRescheduledJobDeadline, js.getNumPreviousAttempts() - 2), mMaxRescheduledDeadline); } + + // Intentionally use the effective priority here. If a job's priority was effectively + // lowered, it will be less likely to run quickly given other policies in JobScheduler. + // Thus, there's no need to further delay the job based on flex policy. + final int jobPriority = js.getEffectivePriority(); + final int jobScore = + getScoreLocked(js.getSourceUid(), js.getSourcePackageName(), nowElapsed); + // Set an upper limit on the fallback deadline so that the delay doesn't become extreme. + final long fallbackDurationMs = Math.min(3 * mFallbackFlexibilityDeadlineMs, + mFallbackFlexibilityDeadlines.get(jobPriority, mFallbackFlexibilityDeadlineMs) + + mFallbackFlexibilityAdditionalScoreTimeFactors + .get(jobPriority, MINUTE_IN_MILLIS) * jobScore); + final long fallbackDeadlineMs = earliest + fallbackDurationMs; + if (js.getLatestRunTimeElapsed() == JobStatus.NO_LATEST_RUNTIME) { - // Intentionally use the effective priority here. If a job's priority was effectively - // lowered, it will be less likely to run quickly given other policies in JobScheduler. - // Thus, there's no need to further delay the job based on flex policy. - final int jobPriority = js.getEffectivePriority(); - final int jobScore = - getScoreLocked(js.getSourceUid(), js.getSourcePackageName(), nowElapsed); - // Set an upper limit on the fallback deadline so that the delay doesn't become extreme. - final long fallbackDeadlineMs = Math.min(3 * mFallbackFlexibilityDeadlineMs, - mFallbackFlexibilityDeadlines.get(jobPriority, mFallbackFlexibilityDeadlineMs) - + mFallbackFlexibilityAdditionalScoreTimeFactors - .get(jobPriority, MINUTE_IN_MILLIS) * jobScore); - return earliest + fallbackDeadlineMs; + return fallbackDeadlineMs; } - return js.getLatestRunTimeElapsed(); + return Math.max(fallbackDeadlineMs, js.getLatestRunTimeElapsed()); } @VisibleForTesting @@ -976,7 +1010,8 @@ public final class FlexibilityController extends StateController { // Something has gone horribly wrong. This has only occurred on incorrectly // configured tests, but add a check here for safety. Slog.wtf(TAG, "Got invalid latest when scheduling alarm." - + " Prefetch=" + js.getJob().isPrefetch()); + + " prefetch=" + js.getJob().isPrefetch() + + " periodic=" + js.getJob().isPeriodic()); // Since things have gone wrong, the safest and most reliable thing to do is // stop applying flex policy to the job. mFlexibilityTracker.setNumDroppedFlexibleConstraints(js, @@ -991,7 +1026,7 @@ public final class FlexibilityController extends StateController { if (DEBUG) { Slog.d(TAG, "scheduleDropNumConstraintsAlarm: " - + js.getSourcePackageName() + " " + js.getSourceUserId() + + js.toShortString() + " numApplied: " + js.getNumAppliedFlexibleConstraints() + " numRequired: " + js.getNumRequiredFlexibleConstraints() + " numSatisfied: " + Integer.bitCount( @@ -1199,11 +1234,11 @@ public final class FlexibilityController extends StateController { DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_ADDITIONAL_SCORE_TIME_FACTORS .put(PRIORITY_MAX, 0); DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_ADDITIONAL_SCORE_TIME_FACTORS - .put(PRIORITY_HIGH, 4 * MINUTE_IN_MILLIS); + .put(PRIORITY_HIGH, 3 * MINUTE_IN_MILLIS); DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_ADDITIONAL_SCORE_TIME_FACTORS - .put(PRIORITY_DEFAULT, 3 * MINUTE_IN_MILLIS); + .put(PRIORITY_DEFAULT, 2 * MINUTE_IN_MILLIS); DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_ADDITIONAL_SCORE_TIME_FACTORS - .put(PRIORITY_LOW, 2 * MINUTE_IN_MILLIS); + .put(PRIORITY_LOW, 1 * MINUTE_IN_MILLIS); DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_ADDITIONAL_SCORE_TIME_FACTORS .put(PRIORITY_MIN, 1 * MINUTE_IN_MILLIS); DEFAULT_PERCENTS_TO_DROP_FLEXIBLE_CONSTRAINTS @@ -1220,7 +1255,7 @@ public final class FlexibilityController extends StateController { private static final long DEFAULT_MIN_TIME_BETWEEN_FLEXIBILITY_ALARMS_MS = MINUTE_IN_MILLIS; private static final long DEFAULT_RESCHEDULED_JOB_DEADLINE_MS = HOUR_IN_MILLIS; - private static final long DEFAULT_MAX_RESCHEDULED_DEADLINE_MS = 5 * DAY_IN_MILLIS; + private static final long DEFAULT_MAX_RESCHEDULED_DEADLINE_MS = DAY_IN_MILLIS; @VisibleForTesting static final long DEFAULT_UNSEEN_CONSTRAINT_GRACE_PERIOD_MS = 3 * DAY_IN_MILLIS; 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 a3a686fdc5c8..edd86e3454a5 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 @@ -16,8 +16,6 @@ package com.android.server.job.controllers; -import static android.text.format.DateUtils.HOUR_IN_MILLIS; - import static com.android.server.job.JobSchedulerService.ACTIVE_INDEX; import static com.android.server.job.JobSchedulerService.EXEMPTED_INDEX; import static com.android.server.job.JobSchedulerService.NEVER_INDEX; @@ -430,9 +428,6 @@ public final class JobStatus { */ public static final int INTERNAL_FLAG_DEMOTED_BY_SYSTEM_UIJ = 1 << 2; - /** Minimum difference between start and end time to have flexible constraint */ - @VisibleForTesting - static final long MIN_WINDOW_FOR_FLEXIBILITY_MS = HOUR_IN_MILLIS; /** * Versatile, persistable flags for a job that's updated within the system server, * as opposed to {@link JobInfo#flags} that's set by callers. @@ -657,7 +652,7 @@ public final class JobStatus { .build()); // Don't perform validation checks at this point since we've already passed the // initial validation check. - job = builder.build(false, false, false); + job = builder.build(false, false, false, false); } this.job = job; @@ -708,14 +703,10 @@ public final class JobStatus { final boolean lacksSomeFlexibleConstraints = ((~requiredConstraints) & SYSTEM_WIDE_FLEXIBLE_CONSTRAINTS) != 0 || mCanApplyTransportAffinities; - final boolean satisfiesMinWindowException = - (latestRunTimeElapsedMillis - earliestRunTimeElapsedMillis) - >= MIN_WINDOW_FOR_FLEXIBILITY_MS; // The first time a job is rescheduled it will not be subject to flexible constraints. // Otherwise, every consecutive reschedule increases a jobs' flexibility deadline. if (!isRequestedExpeditedJob() && !job.isUserInitiated() - && satisfiesMinWindowException && (numFailures + numSystemStops) != 1 && lacksSomeFlexibleConstraints) { requiredConstraints |= CONSTRAINT_FLEXIBLE; diff --git a/api/api.go b/api/api.go index c733f5b5bffd..e8858230ba4e 100644 --- a/api/api.go +++ b/api/api.go @@ -79,7 +79,45 @@ func registerBuildComponents(ctx android.RegistrationContext) { var PrepareForCombinedApisTest = android.FixtureRegisterWithContext(registerBuildComponents) +func (a *CombinedApis) apiFingerprintStubDeps() []string { + ret := []string{} + ret = append( + ret, + transformArray(a.properties.Bootclasspath, "", ".stubs")..., + ) + ret = append( + ret, + transformArray(a.properties.Bootclasspath, "", ".stubs.system")..., + ) + ret = append( + ret, + transformArray(a.properties.Bootclasspath, "", ".stubs.module_lib")..., + ) + ret = append( + ret, + transformArray(a.properties.System_server_classpath, "", ".stubs.system_server")..., + ) + return ret +} + +func (a *CombinedApis) DepsMutator(ctx android.BottomUpMutatorContext) { + ctx.AddDependency(ctx.Module(), nil, a.apiFingerprintStubDeps()...) +} + func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) { + ctx.WalkDeps(func(child, parent android.Module) bool { + if _, ok := child.(java.AndroidLibraryDependency); ok && child.Name() != "framework-res" { + // Stubs of BCP and SSCP libraries should not have any dependencies on apps + // This check ensures that we do not run into circular dependencies when UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true + ctx.ModuleErrorf( + "Module %s is not a valid dependency of the stub library %s\n."+ + "If this dependency has been added via `libs` of java_sdk_library, please move it to `impl_only_libs`\n", + child.Name(), parent.Name()) + return false // error detected + } + return true + }) + } type genruleProps struct { diff --git a/cmds/uinput/src/com/android/commands/uinput/Device.java b/cmds/uinput/src/com/android/commands/uinput/Device.java index 76ab475adc0a..b452fc7094ba 100644 --- a/cmds/uinput/src/com/android/commands/uinput/Device.java +++ b/cmds/uinput/src/com/android/commands/uinput/Device.java @@ -129,7 +129,7 @@ public class Device { SomeArgs args = SomeArgs.obtain(); args.arg1 = events; args.argl1 = offsetMicros; - args.argl2 = mTimeToSendNanos; + args.argl2 = SystemClock.uptimeNanos(); Message msg = mHandler.obtainMessage(MSG_INJECT_EVENT, args); mHandler.sendMessageAtTime(msg, getTimeToSendMillis()); } @@ -229,9 +229,8 @@ public class Device { // are in the future and uses the current time instead, making the reported // timestamps inconsistent with the recording we're replaying. // - // To prevent this, we need to use the time we scheduled this first batch - // for (in microseconds, to avoid potential rounding up from - // getTimeToSendMillis), rather than the actual current time. + // To prevent this, we need to use the time at which we scheduled this first + // batch, rather than the actual current time. mLastInjectTimestampMicros = args.argl2 / 1000; } else { mLastInjectTimestampMicros += offsetMicros; diff --git a/cmds/uinput/tests/src/com/android/commands/uinput/tests/EvemuParserTest.java b/cmds/uinput/tests/src/com/android/commands/uinput/tests/EvemuParserTest.java index 4dc4b68eba60..5239fbc7e0a8 100644 --- a/cmds/uinput/tests/src/com/android/commands/uinput/tests/EvemuParserTest.java +++ b/cmds/uinput/tests/src/com/android/commands/uinput/tests/EvemuParserTest.java @@ -455,7 +455,7 @@ public class EvemuParserTest { assertThat(regEvent.getBus()).isEqualTo(0x001d); assertThat(regEvent.getVendorId()).isEqualTo(0x6cb); assertThat(regEvent.getProductId()).isEqualTo(0x0000); - // TODO(b/302297266): check version ID once it's supported + assertThat(regEvent.getVersionId()).isEqualTo(0x0000); assertThat(regEvent.getConfiguration().get(UinputControlCode.UI_SET_PROPBIT.getValue())) .asList().containsExactly(0, 2); diff --git a/core/api/current.txt b/core/api/current.txt index 3fde9a69c5fb..7052fd1c08e9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -140,6 +140,7 @@ package android { field public static final String MANAGE_DEVICE_POLICY_APPS_CONTROL = "android.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL"; field public static final String MANAGE_DEVICE_POLICY_APP_RESTRICTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_RESTRICTIONS"; field public static final String MANAGE_DEVICE_POLICY_APP_USER_DATA = "android.permission.MANAGE_DEVICE_POLICY_APP_USER_DATA"; + field @FlaggedApi("android.app.admin.flags.assist_content_user_restriction_enabled") public static final String MANAGE_DEVICE_POLICY_ASSIST_CONTENT = "android.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT"; field public static final String MANAGE_DEVICE_POLICY_AUDIO_OUTPUT = "android.permission.MANAGE_DEVICE_POLICY_AUDIO_OUTPUT"; field public static final String MANAGE_DEVICE_POLICY_AUTOFILL = "android.permission.MANAGE_DEVICE_POLICY_AUTOFILL"; field public static final String MANAGE_DEVICE_POLICY_BACKUP_SERVICE = "android.permission.MANAGE_DEVICE_POLICY_BACKUP_SERVICE"; @@ -165,6 +166,7 @@ package android { field public static final String MANAGE_DEVICE_POLICY_LOCK = "android.permission.MANAGE_DEVICE_POLICY_LOCK"; field public static final String MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS = "android.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS"; field public static final String MANAGE_DEVICE_POLICY_LOCK_TASK = "android.permission.MANAGE_DEVICE_POLICY_LOCK_TASK"; + field @FlaggedApi("android.app.admin.flags.esim_management_enabled") public static final String MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS = "android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS"; field public static final String MANAGE_DEVICE_POLICY_METERED_DATA = "android.permission.MANAGE_DEVICE_POLICY_METERED_DATA"; field public static final String MANAGE_DEVICE_POLICY_MICROPHONE = "android.permission.MANAGE_DEVICE_POLICY_MICROPHONE"; field public static final String MANAGE_DEVICE_POLICY_MOBILE_NETWORK = "android.permission.MANAGE_DEVICE_POLICY_MOBILE_NETWORK"; @@ -653,6 +655,7 @@ package android { field public static final int contentInsetRight = 16843862; // 0x1010456 field public static final int contentInsetStart = 16843859; // 0x1010453 field public static final int contentInsetStartWithNavigation = 16844066; // 0x1010522 + field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int contentSensitivity; field public static final int contextClickable = 16844007; // 0x10104e7 field public static final int contextDescription = 16844078; // 0x101052e field public static final int contextPopupMenuStyle = 16844033; // 0x1010501 @@ -1602,6 +1605,7 @@ package android { field public static final int supportedTypes = 16844369; // 0x1010651 field public static final int supportsAssist = 16844016; // 0x10104f0 field public static final int supportsBatteryGameMode = 16844374; // 0x1010656 + field @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public static final int supportsConnectionlessStylusHandwriting; field public static final int supportsInlineSuggestions = 16844301; // 0x101060d field public static final int supportsInlineSuggestionsWithTouchExploration = 16844397; // 0x101066d field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1 @@ -1804,6 +1808,7 @@ package android { field public static final int useEmbeddedDex = 16844190; // 0x101059e field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310 field public static final int useLevel = 16843167; // 0x101019f + field @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") public static final int useLocalePreferredLineHeightForMinimum; field public static final int userVisible = 16843409; // 0x1010291 field public static final int usesCleartextTraffic = 16844012; // 0x10104ec field public static final int usesPermissionFlags = 16844356; // 0x1010644 @@ -2004,6 +2009,19 @@ package android { field public static final int system_control_highlight_light = 17170558; // 0x106007e field public static final int system_control_normal_dark = 17170600; // 0x10600a8 field public static final int system_control_normal_light = 17170557; // 0x106007d + field public static final int system_error_0; + field public static final int system_error_10; + field public static final int system_error_100; + field public static final int system_error_1000; + field public static final int system_error_200; + field public static final int system_error_300; + field public static final int system_error_400; + field public static final int system_error_50; + field public static final int system_error_500; + field public static final int system_error_600; + field public static final int system_error_700; + field public static final int system_error_800; + field public static final int system_error_900; field public static final int system_error_container_dark = 17170597; // 0x10600a5 field public static final int system_error_container_light = 17170554; // 0x106007a field public static final int system_error_dark = 17170595; // 0x10600a3 @@ -2053,6 +2071,7 @@ package android { field public static final int system_on_secondary_fixed_variant = 17170619; // 0x10600bb field public static final int system_on_secondary_light = 17170533; // 0x1060065 field public static final int system_on_surface_dark = 17170584; // 0x1060098 + field public static final int system_on_surface_disabled; field public static final int system_on_surface_light = 17170541; // 0x106006d field public static final int system_on_surface_variant_dark = 17170593; // 0x10600a1 field public static final int system_on_surface_variant_light = 17170550; // 0x1060076 @@ -2063,6 +2082,7 @@ package android { field public static final int system_on_tertiary_fixed_variant = 17170623; // 0x10600bf field public static final int system_on_tertiary_light = 17170537; // 0x1060069 field public static final int system_outline_dark = 17170594; // 0x10600a2 + field public static final int system_outline_disabled; field public static final int system_outline_light = 17170551; // 0x1060077 field public static final int system_outline_variant_dark = 17170625; // 0x10600c1 field public static final int system_outline_variant_light = 17170624; // 0x10600c0 @@ -2103,6 +2123,7 @@ package android { field public static final int system_surface_dark = 17170583; // 0x1060097 field public static final int system_surface_dim_dark = 17170591; // 0x106009f field public static final int system_surface_dim_light = 17170548; // 0x1060074 + field public static final int system_surface_disabled; field public static final int system_surface_light = 17170540; // 0x106006c field public static final int system_surface_variant_dark = 17170592; // 0x10600a0 field public static final int system_surface_variant_light = 17170549; // 0x1060075 @@ -2139,6 +2160,11 @@ package android { field public static final int notification_large_icon_width = 17104901; // 0x1050005 field public static final int system_app_widget_background_radius = 17104904; // 0x1050008 field public static final int system_app_widget_inner_radius = 17104905; // 0x1050009 + field public static final int system_corner_radius_large; + field public static final int system_corner_radius_medium; + field public static final int system_corner_radius_small; + field public static final int system_corner_radius_xlarge; + field public static final int system_corner_radius_xsmall; field public static final int thumbnail_height = 17104897; // 0x1050001 field public static final int thumbnail_width = 17104898; // 0x1050002 } @@ -3322,11 +3348,13 @@ package android.accessibilityservice { method @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks") public void attachAccessibilityOverlayToWindow(int, @NonNull android.view.SurfaceControl, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer); method public boolean clearCache(); method public boolean clearCachedSubtree(@NonNull android.view.accessibility.AccessibilityNodeInfo); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void clearTestBrailleDisplayController(); method public final void disableSelf(); method public final boolean dispatchGesture(@NonNull android.accessibilityservice.GestureDescription, @Nullable android.accessibilityservice.AccessibilityService.GestureResultCallback, @Nullable android.os.Handler); method public android.view.accessibility.AccessibilityNodeInfo findFocus(int); method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController(); method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController(int); + method @FlaggedApi("android.view.accessibility.braille_display_hid") @NonNull public android.accessibilityservice.BrailleDisplayController getBrailleDisplayController(); method @NonNull @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public final android.accessibilityservice.FingerprintGestureController getFingerprintGestureController(); method @Nullable public final android.accessibilityservice.InputMethod getInputMethod(); method @NonNull public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController(); @@ -3356,6 +3384,7 @@ package android.accessibilityservice { method public boolean setCacheEnabled(boolean); method public void setGestureDetectionPassthroughRegion(int, @NonNull android.graphics.Region); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void setTestBrailleDisplayController(@NonNull android.accessibilityservice.BrailleDisplayController); method public void setTouchExplorationPassthroughRegion(int, @NonNull android.graphics.Region); method public void takeScreenshot(int, @NonNull java.util.concurrent.Executor, @NonNull android.accessibilityservice.AccessibilityService.TakeScreenshotCallback); method public void takeScreenshotOfWindow(int, @NonNull java.util.concurrent.Executor, @NonNull android.accessibilityservice.AccessibilityService.TakeScreenshotCallback); @@ -3560,6 +3589,25 @@ package android.accessibilityservice { field public String[] packageNames; } + @FlaggedApi("android.view.accessibility.braille_display_hid") public interface BrailleDisplayController { + method @FlaggedApi("android.view.accessibility.braille_display_hid") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void connect(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback); + method @FlaggedApi("android.view.accessibility.braille_display_hid") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void connect(@NonNull android.bluetooth.BluetoothDevice, @NonNull java.util.concurrent.Executor, @NonNull android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void connect(@NonNull android.hardware.usb.UsbDevice, @NonNull android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void connect(@NonNull android.hardware.usb.UsbDevice, @NonNull java.util.concurrent.Executor, @NonNull android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void disconnect(); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public boolean isConnected(); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void write(@NonNull byte[]) throws java.io.IOException; + } + + @FlaggedApi("android.view.accessibility.braille_display_hid") public static interface BrailleDisplayController.BrailleDisplayCallback { + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void onConnected(@NonNull byte[]); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void onConnectionFailed(int); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void onDisconnected(); + method @FlaggedApi("android.view.accessibility.braille_display_hid") public void onInput(@NonNull byte[]); + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final int FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND = 2; // 0x2 + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final int FLAG_ERROR_CANNOT_ACCESS = 1; // 0x1 + } + public final class FingerprintGestureController { method public boolean isGestureDetectionAvailable(); method public void registerFingerprintGestureCallback(@NonNull android.accessibilityservice.FingerprintGestureController.FingerprintGestureCallback, @Nullable android.os.Handler); @@ -5425,7 +5473,6 @@ package android.app { } @FlaggedApi("android.security.content_uri_permission_apis") public final class ComponentCaller { - ctor public ComponentCaller(@NonNull android.os.IBinder, @Nullable android.os.IBinder); method public int checkContentUriPermission(@NonNull android.net.Uri, int); method @Nullable public String getPackage(); method public int getUid(); @@ -7402,6 +7449,7 @@ package android.app { method public int onStartCommand(android.content.Intent, int, int); method public void onTaskRemoved(android.content.Intent); method public void onTimeout(int); + method @FlaggedApi("android.app.introduce_new_service_ontimeout_callback") public void onTimeout(int, int); method public void onTrimMemory(int); method public boolean onUnbind(android.content.Intent); method public final void startForeground(int, android.app.Notification); @@ -7817,6 +7865,7 @@ package android.app.admin { method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DeviceAdminInfo> CREATOR; field public static final int HEADLESS_DEVICE_OWNER_MODE_AFFILIATED = 1; // 0x1 + field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; // 0x2 field public static final int HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED = 0; // 0x0 field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7 field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8 @@ -8020,6 +8069,7 @@ package android.app.admin { method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName); method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName); method public int getStorageEncryptionStatus(); + method @FlaggedApi("android.app.admin.flags.esim_management_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) public java.util.Set<java.lang.Integer> getSubscriptionsIds(); method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy(); method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle(); method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName); @@ -10021,11 +10071,22 @@ package android.content { method public CharSequence coerceToText(android.content.Context); method public String getHtmlText(); method public android.content.Intent getIntent(); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @Nullable public android.app.PendingIntent getPendingIntent(); method public CharSequence getText(); method @Nullable public android.view.textclassifier.TextLinks getTextLinks(); method public android.net.Uri getUri(); } + @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") public static final class ClipData.Item.Builder { + ctor public ClipData.Item.Builder(); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item build(); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item.Builder setHtmlText(@Nullable String); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item.Builder setIntent(@Nullable android.content.Intent); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item.Builder setPendingIntent(@Nullable android.app.PendingIntent); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item.Builder setText(@Nullable CharSequence); + method @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") @NonNull public android.content.ClipData.Item.Builder setUri(@Nullable android.net.Uri); + } + public class ClipDescription implements android.os.Parcelable { ctor public ClipDescription(CharSequence, String[]); ctor public ClipDescription(android.content.ClipDescription); @@ -10690,6 +10751,7 @@ package android.content { field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint"; field public static final String POWER_SERVICE = "power"; field public static final String PRINT_SERVICE = "print"; + field @FlaggedApi("android.os.telemetry_apis_framework_initialization") public static final String PROFILING_SERVICE = "profiling"; field public static final int RECEIVER_EXPORTED = 2; // 0x2 field public static final int RECEIVER_NOT_EXPORTED = 4; // 0x4 field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1 @@ -11280,10 +11342,14 @@ package android.content { field public static final String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_list"; field public static final String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list"; field public static final String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list"; + field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI"; field @FlaggedApi("android.service.chooser.chooser_album_text") public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT = "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT"; field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS"; + field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION"; field public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION = "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION"; field public static final String EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER = "android.intent.extra.CHOOSER_REFINEMENT_INTENT_SENDER"; + field @FlaggedApi("android.service.chooser.enable_chooser_result") public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT"; + field @FlaggedApi("android.service.chooser.enable_chooser_result") public static final String EXTRA_CHOOSER_RESULT_INTENT_SENDER = "android.intent.extra.CHOOSER_RESULT_INTENT_SENDER"; field public static final String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS"; field public static final String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT"; field public static final String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER"; @@ -11312,6 +11378,7 @@ package android.content { field public static final String EXTRA_LOCALE_LIST = "android.intent.extra.LOCALE_LIST"; field public static final String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY"; field public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID"; + field @FlaggedApi("android.service.chooser.enable_sharesheet_metadata_extra") public static final String EXTRA_METADATA_TEXT = "android.intent.extra.METADATA_TEXT"; field public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES"; field public static final String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE"; field public static final String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI"; @@ -13002,6 +13069,7 @@ package android.content.pm { field public static final String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; field public static final String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output"; field public static final String FEATURE_AUDIO_PRO = "android.hardware.audio.pro"; + field @FlaggedApi("android.media.audio.feature_spatial_audio_headtracking_low_latency") public static final String FEATURE_AUDIO_SPATIAL_HEADTRACKING_LOW_LATENCY = "android.hardware.audio.spatial.headtracking.low_latency"; field public static final String FEATURE_AUTOFILL = "android.software.autofill"; field public static final String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive"; field public static final String FEATURE_BACKUP = "android.software.backup"; @@ -18823,6 +18891,7 @@ package android.hardware.biometrics { method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable public android.hardware.biometrics.PromptContentView getContentView(); method @Nullable public CharSequence getDescription(); method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.graphics.Bitmap getLogoBitmap(); + method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public String getLogoDescription(); method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public int getLogoRes(); method @Nullable public CharSequence getNegativeButtonText(); method @Nullable public CharSequence getSubtitle(); @@ -18874,6 +18943,7 @@ package android.hardware.biometrics { method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDescription(@NonNull CharSequence); method @Deprecated @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDeviceCredentialAllowed(boolean); method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoBitmap(@NonNull android.graphics.Bitmap); + method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoDescription(@NonNull String); method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoRes(@DrawableRes int); method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setNegativeButton(@NonNull CharSequence, @NonNull java.util.concurrent.Executor, @NonNull android.content.DialogInterface.OnClickListener); method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence); @@ -19157,7 +19227,7 @@ package android.hardware.camera2 { method public int getCameraAudioRestriction() throws android.hardware.camera2.CameraAccessException; method @NonNull public abstract String getId(); method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public android.hardware.camera2.CameraCharacteristics getSessionCharacteristics(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException; - method @Deprecated public boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException; + method public boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException; method public void setCameraAudioRestriction(int) throws android.hardware.camera2.CameraAccessException; field public static final int AUDIO_RESTRICTION_NONE = 0; // 0x0 field public static final int AUDIO_RESTRICTION_VIBRATION = 1; // 0x1 @@ -19170,6 +19240,13 @@ package android.hardware.camera2 { field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5 } + @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public abstract static class CameraDevice.CameraDeviceSetup { + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException; + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public abstract String getId(); + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public abstract boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException; + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @RequiresPermission(android.Manifest.permission.CAMERA) public abstract void openCamera(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException; + } + public abstract static class CameraDevice.StateCallback { ctor public CameraDevice.StateCallback(); method public void onClosed(@NonNull android.hardware.camera2.CameraDevice); @@ -19238,14 +19315,14 @@ package android.hardware.camera2 { } public final class CameraManager { - method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull @RequiresPermission(android.Manifest.permission.CAMERA) public android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(@NonNull String, int) throws android.hardware.camera2.CameraAccessException; method @NonNull public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(@NonNull String) throws android.hardware.camera2.CameraAccessException; + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public android.hardware.camera2.CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String) throws android.hardware.camera2.CameraAccessException; method @NonNull public android.hardware.camera2.CameraExtensionCharacteristics getCameraExtensionCharacteristics(@NonNull String) throws android.hardware.camera2.CameraAccessException; method @NonNull public String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException; method @NonNull public java.util.Set<java.util.Set<java.lang.String>> getConcurrentCameraIds() throws android.hardware.camera2.CameraAccessException; method public int getTorchStrengthLevel(@NonNull String) throws android.hardware.camera2.CameraAccessException; + method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public boolean isCameraDeviceSetupSupported(@NonNull String) throws android.hardware.camera2.CameraAccessException; method @RequiresPermission(android.Manifest.permission.CAMERA) public boolean isConcurrentSessionConfigurationSupported(@NonNull java.util.Map<java.lang.String,android.hardware.camera2.params.SessionConfiguration>) throws android.hardware.camera2.CameraAccessException; - method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @RequiresPermission(android.Manifest.permission.CAMERA) public boolean isSessionConfigurationWithParametersSupported(@NonNull String, @NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException; method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull android.hardware.camera2.CameraDevice.StateCallback, @Nullable android.os.Handler) throws android.hardware.camera2.CameraAccessException; method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException; method public void registerAvailabilityCallback(@NonNull android.hardware.camera2.CameraManager.AvailabilityCallback, @Nullable android.os.Handler); @@ -25845,7 +25922,13 @@ package android.media.metrics { @FlaggedApi("com.android.media.editing.flags.add_media_metrics_editing") public final class EditingEndedEvent extends android.media.metrics.Event implements android.os.Parcelable { method public int describeContents(); method public int getErrorCode(); + method @Nullable public String getExporterName(); + method public float getFinalProgressPercent(); method public int getFinalState(); + method @NonNull public java.util.List<android.media.metrics.MediaItemInfo> getInputMediaItemInfos(); + method @Nullable public String getMuxerName(); + method public long getOperationTypes(); + method @Nullable public android.media.metrics.MediaItemInfo getOutputMediaItemInfo(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.media.metrics.EditingEndedEvent> CREATOR; field public static final int ERROR_CODE_AUDIO_PROCESSING_FAILED = 18; // 0x12 @@ -25870,14 +25953,29 @@ package android.media.metrics { field public static final int FINAL_STATE_CANCELED = 2; // 0x2 field public static final int FINAL_STATE_ERROR = 3; // 0x3 field public static final int FINAL_STATE_SUCCEEDED = 1; // 0x1 + field public static final long OPERATION_TYPE_AUDIO_EDIT = 8L; // 0x8L + field public static final long OPERATION_TYPE_AUDIO_TRANSCODE = 2L; // 0x2L + field public static final long OPERATION_TYPE_AUDIO_TRANSMUX = 32L; // 0x20L + field public static final long OPERATION_TYPE_PAUSED = 64L; // 0x40L + field public static final long OPERATION_TYPE_RESUMED = 128L; // 0x80L + field public static final long OPERATION_TYPE_VIDEO_EDIT = 4L; // 0x4L + field public static final long OPERATION_TYPE_VIDEO_TRANSCODE = 1L; // 0x1L + field public static final long OPERATION_TYPE_VIDEO_TRANSMUX = 16L; // 0x10L + field public static final int PROGRESS_PERCENT_UNKNOWN = -1; // 0xffffffff field public static final int TIME_SINCE_CREATED_UNKNOWN = -1; // 0xffffffff } @FlaggedApi("com.android.media.editing.flags.add_media_metrics_editing") public static final class EditingEndedEvent.Builder { ctor public EditingEndedEvent.Builder(int); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder addInputMediaItemInfo(@NonNull android.media.metrics.MediaItemInfo); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder addOperationType(long); method @NonNull public android.media.metrics.EditingEndedEvent build(); method @NonNull public android.media.metrics.EditingEndedEvent.Builder setErrorCode(int); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder setExporterName(@NonNull String); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder setFinalProgressPercent(@FloatRange(from=0, to=100) float); method @NonNull public android.media.metrics.EditingEndedEvent.Builder setMetricsBundle(@NonNull android.os.Bundle); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder setMuxerName(@NonNull String); + method @NonNull public android.media.metrics.EditingEndedEvent.Builder setOutputMediaItemInfo(@NonNull android.media.metrics.MediaItemInfo); method @NonNull public android.media.metrics.EditingEndedEvent.Builder setTimeSinceCreatedMillis(@IntRange(from=android.media.metrics.EditingEndedEvent.TIME_SINCE_CREATED_UNKNOWN) long); } @@ -25897,6 +25995,65 @@ package android.media.metrics { field @NonNull public static final android.media.metrics.LogSessionId LOG_SESSION_ID_NONE; } + @FlaggedApi("com.android.media.editing.flags.add_media_metrics_editing") public final class MediaItemInfo implements android.os.Parcelable { + method public int describeContents(); + method public int getAudioChannelCount(); + method public long getAudioSampleCount(); + method public int getAudioSampleRateHz(); + method public long getClipDurationMillis(); + method @NonNull public java.util.List<java.lang.String> getCodecNames(); + method @Nullable public String getContainerMimeType(); + method public long getDataTypes(); + method public long getDurationMillis(); + method @NonNull public java.util.List<java.lang.String> getSampleMimeTypes(); + method public int getSourceType(); + method public int getVideoDataSpace(); + method public float getVideoFrameRate(); + method public long getVideoSampleCount(); + method @NonNull public android.util.Size getVideoSize(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.media.metrics.MediaItemInfo> CREATOR; + field public static final long DATA_TYPE_AUDIO = 4L; // 0x4L + field public static final long DATA_TYPE_CUE_POINTS = 128L; // 0x80L + field public static final long DATA_TYPE_DEPTH = 16L; // 0x10L + field public static final long DATA_TYPE_GAIN_MAP = 32L; // 0x20L + field public static final long DATA_TYPE_GAPLESS = 256L; // 0x100L + field public static final long DATA_TYPE_HIGH_DYNAMIC_RANGE_VIDEO = 1024L; // 0x400L + field public static final long DATA_TYPE_HIGH_FRAME_RATE = 64L; // 0x40L + field public static final long DATA_TYPE_IMAGE = 1L; // 0x1L + field public static final long DATA_TYPE_METADATA = 8L; // 0x8L + field public static final long DATA_TYPE_SPATIAL_AUDIO = 512L; // 0x200L + field public static final long DATA_TYPE_VIDEO = 2L; // 0x2L + field public static final int SOURCE_TYPE_CAMERA = 2; // 0x2 + field public static final int SOURCE_TYPE_EDITING_SESSION = 3; // 0x3 + field public static final int SOURCE_TYPE_GALLERY = 1; // 0x1 + field public static final int SOURCE_TYPE_GENERATED = 7; // 0x7 + field public static final int SOURCE_TYPE_LOCAL_FILE = 4; // 0x4 + field public static final int SOURCE_TYPE_REMOTE_FILE = 5; // 0x5 + field public static final int SOURCE_TYPE_REMOTE_LIVE_STREAM = 6; // 0x6 + field public static final int SOURCE_TYPE_UNSPECIFIED = 0; // 0x0 + field public static final int VALUE_UNSPECIFIED = -1; // 0xffffffff + } + + @FlaggedApi("com.android.media.editing.flags.add_media_metrics_editing") public static final class MediaItemInfo.Builder { + ctor public MediaItemInfo.Builder(); + method @NonNull public android.media.metrics.MediaItemInfo.Builder addCodecName(@NonNull String); + method @NonNull public android.media.metrics.MediaItemInfo.Builder addDataType(long); + method @NonNull public android.media.metrics.MediaItemInfo.Builder addSampleMimeType(@NonNull String); + method @NonNull public android.media.metrics.MediaItemInfo build(); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setAudioChannelCount(@IntRange(from=0) int); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setAudioSampleCount(@IntRange(from=0) long); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setAudioSampleRateHz(@IntRange(from=0) int); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setClipDurationMillis(long); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setContainerMimeType(@NonNull String); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setDurationMillis(long); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setSourceType(int); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setVideoDataSpace(int); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setVideoFrameRate(@FloatRange(from=0) float); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setVideoSampleCount(@IntRange(from=0) long); + method @NonNull public android.media.metrics.MediaItemInfo.Builder setVideoSize(@NonNull android.util.Size); + } + public final class MediaMetricsManager { method @NonNull public android.media.metrics.BundleSession createBundleSession(); method @NonNull public android.media.metrics.EditingSession createEditingSession(); @@ -27695,7 +27852,7 @@ package android.media.tv { package android.media.tv.ad { - @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public class TvAdManager { + @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public final class TvAdManager { method @NonNull public java.util.List<android.media.tv.ad.TvAdServiceInfo> getTvAdServiceList(); method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.ad.TvAdManager.TvAdServiceCallback); method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle); @@ -27706,6 +27863,14 @@ package android.media.tv.ad { field public static final String APP_LINK_KEY_COMMAND_TYPE = "command_type"; field public static final String APP_LINK_KEY_PACKAGE_NAME = "package_name"; field public static final String APP_LINK_KEY_SERVICE_ID = "service_id"; + field public static final int ERROR_BLOCKED = 5; // 0x5 + field public static final int ERROR_ENCRYPTED = 6; // 0x6 + field public static final int ERROR_NONE = 0; // 0x0 + field public static final int ERROR_NOT_SUPPORTED = 2; // 0x2 + field public static final int ERROR_RESOURCE_UNAVAILABLE = 4; // 0x4 + field public static final int ERROR_UNKNOWN = 1; // 0x1 + field public static final int ERROR_UNKNOWN_CHANNEL = 7; // 0x7 + field public static final int ERROR_WEAK_SIGNAL = 3; // 0x3 field public static final String INTENT_KEY_AD_SERVICE_ID = "ad_service_id"; field public static final String INTENT_KEY_CHANNEL_URI = "channel_uri"; field public static final String INTENT_KEY_COMMAND_TYPE = "command_type"; @@ -27718,6 +27883,9 @@ package android.media.tv.ad { field public static final String SESSION_DATA_TYPE_AD_REQUEST = "ad_request"; field public static final String SESSION_DATA_TYPE_BROADCAST_INFO_REQUEST = "broadcast_info_request"; field public static final String SESSION_DATA_TYPE_REMOVE_BROADCAST_INFO_REQUEST = "remove_broadcast_info_request"; + field public static final int SESSION_STATE_ERROR = 3; // 0x3 + field public static final int SESSION_STATE_RUNNING = 2; // 0x2 + field public static final int SESSION_STATE_STOPPED = 1; // 0x1 } public abstract static class TvAdManager.TvAdServiceCallback { @@ -27740,7 +27908,12 @@ package android.media.tv.ad { ctor public TvAdService.Session(@NonNull android.content.Context); method public boolean isMediaViewEnabled(); method @CallSuper public void layoutSurface(int, int, int, int); + method @CallSuper public void notifySessionStateChanged(int, int); method @Nullable public android.view.View onCreateMediaView(); + method public void onCurrentChannelUri(@Nullable android.net.Uri); + method public void onCurrentTvInputId(@Nullable String); + method public void onCurrentVideoBounds(@NonNull android.graphics.Rect); + method public void onError(@NonNull String, @NonNull android.os.Bundle); method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent); method public boolean onKeyDown(int, @Nullable android.view.KeyEvent); method public boolean onKeyLongPress(int, @Nullable android.view.KeyEvent); @@ -27750,12 +27923,20 @@ package android.media.tv.ad { method public abstract void onRelease(); method public void onResetAdService(); method public abstract boolean onSetSurface(@Nullable android.view.Surface); + method public void onSigningResult(@NonNull String, @NonNull byte[]); method public void onStartAdService(); method public void onStopAdService(); method public void onSurfaceChanged(int, int, int); method public boolean onTouchEvent(@NonNull android.view.MotionEvent); + method public void onTrackInfoList(@NonNull java.util.List<android.media.tv.TvTrackInfo>); method public boolean onTrackballEvent(@NonNull android.view.MotionEvent); method public void onTvInputSessionData(@NonNull String, @NonNull android.os.Bundle); + method public void onTvMessage(int, @NonNull android.os.Bundle); + method @CallSuper public void requestCurrentChannelUri(); + method @CallSuper public void requestCurrentTvInputId(); + method @CallSuper public void requestCurrentVideoBounds(); + method @CallSuper public void requestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]); + method @CallSuper public void requestTrackInfoList(); method public void sendTvAdSessionData(@NonNull String, @NonNull android.os.Bundle); method @CallSuper public void setMediaViewEnabled(boolean); } @@ -27774,9 +27955,12 @@ package android.media.tv.ad { ctor public TvAdView(@NonNull android.content.Context); ctor public TvAdView(@NonNull android.content.Context, @Nullable android.util.AttributeSet); ctor public TvAdView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int); + method public void clearCallback(); method public void clearOnUnhandledInputEventListener(); method public boolean dispatchUnhandledInputEvent(@NonNull android.view.InputEvent); method @Nullable public android.media.tv.ad.TvAdView.OnUnhandledInputEventListener getOnUnhandledInputEventListener(); + method public void notifyError(@NonNull String, @NonNull android.os.Bundle); + method public void notifyTvMessage(@NonNull int, @NonNull android.os.Bundle); method public void onAttachedToWindow(); method public void onDetachedFromWindow(); method public void onLayout(boolean, int, int, int, int); @@ -27786,16 +27970,34 @@ package android.media.tv.ad { method public void prepareAdService(@NonNull String, @NonNull String); method public void reset(); method public void resetAdService(); + method public void sendCurrentChannelUri(@Nullable android.net.Uri); + method public void sendCurrentTvInputId(@Nullable String); + method public void sendCurrentVideoBounds(@NonNull android.graphics.Rect); + method public void sendSigningResult(@NonNull String, @NonNull byte[]); + method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>); + method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.ad.TvAdView.TvAdCallback); method public void setOnUnhandledInputEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.ad.TvAdView.OnUnhandledInputEventListener); method public boolean setTvView(@Nullable android.media.tv.TvView); method public void startAdService(); method public void stopAdService(); + field public static final String ERROR_KEY_ERROR_CODE = "error_code"; + field public static final String ERROR_KEY_METHOD_NAME = "method_name"; } public static interface TvAdView.OnUnhandledInputEventListener { method public boolean onUnhandledInputEvent(@NonNull android.view.InputEvent); } + public abstract static class TvAdView.TvAdCallback { + ctor public TvAdView.TvAdCallback(); + method public void onRequestCurrentChannelUri(@NonNull String); + method public void onRequestCurrentTvInputId(@NonNull String); + method public void onRequestCurrentVideoBounds(@NonNull String); + method public void onRequestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull String, @NonNull byte[]); + method public void onRequestTrackInfoList(@NonNull String); + method public void onStateChanged(@NonNull String, int, int); + } + } package android.media.tv.interactive { @@ -33686,6 +33888,7 @@ package android.os { field public static final String DISALLOW_AIRPLANE_MODE = "no_airplane_mode"; field public static final String DISALLOW_AMBIENT_DISPLAY = "no_ambient_display"; field public static final String DISALLOW_APPS_CONTROL = "no_control_apps"; + field @FlaggedApi("android.app.admin.flags.assist_content_user_restriction_enabled") public static final String DISALLOW_ASSIST_CONTENT = "no_assist_content"; field public static final String DISALLOW_AUTOFILL = "no_autofill"; field public static final String DISALLOW_BLUETOOTH = "no_bluetooth"; field public static final String DISALLOW_BLUETOOTH_SHARING = "no_bluetooth_sharing"; @@ -35369,6 +35572,7 @@ package android.provider { ctor public CallLog.Calls(); method public static String getLastOutgoingCall(android.content.Context); field public static final int ANSWERED_EXTERNALLY_TYPE = 7; // 0x7 + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String ASSERTED_DISPLAY_NAME = "asserted_display_name"; field public static final long AUTO_MISSED_EMERGENCY_CALL = 1L; // 0x1L field public static final long AUTO_MISSED_MAXIMUM_DIALING = 4L; // 0x4L field public static final long AUTO_MISSED_MAXIMUM_RINGING = 2L; // 0x2L @@ -35415,6 +35619,7 @@ package android.provider { field public static final int FEATURES_WIFI = 8; // 0x8 field public static final String GEOCODED_LOCATION = "geocoded_location"; field public static final int INCOMING_TYPE = 1; // 0x1 + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String IS_BUSINESS_CALL = "is_business_call"; field public static final String IS_READ = "is_read"; field public static final String LAST_MODIFIED = "last_modified"; field public static final String LIMIT_PARAM_KEY = "limit"; @@ -35463,7 +35668,7 @@ package android.provider { field public static final String LONGITUDE = "longitude"; } - @FlaggedApi("android.provider.user_keys") public class ContactKeysManager { + @FlaggedApi("android.provider.user_keys") public final class ContactKeysManager { method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.ContactKey> getAllContactKeys(@NonNull String); method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.SelfKey> getAllSelfKeys(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public android.provider.ContactKeysManager.ContactKey getContactKey(@NonNull String, @NonNull String, @NonNull String); @@ -35478,9 +35683,9 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public void updateOrInsertContactKey(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]); method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateOrInsertSelfKey(@NonNull String, @NonNull String, @NonNull byte[]); method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, int); - field public static final int UNVERIFIED = 0; // 0x0 - field public static final int VERIFICATION_FAILED = 1; // 0x1 - field public static final int VERIFIED = 2; // 0x2 + field public static final int VERIFICATION_STATE_UNVERIFIED = 0; // 0x0 + field public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1; // 0x1 + field public static final int VERIFICATION_STATE_VERIFIED = 2; // 0x2 } public static final class ContactKeysManager.ContactKey implements android.os.Parcelable { @@ -36977,6 +37182,7 @@ package android.provider { field public static final String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final String ACTION_REQUEST_MANAGE_MEDIA = "android.settings.REQUEST_MANAGE_MEDIA"; field @FlaggedApi("com.android.media.flags.enable_privileged_routing_for_media_routing_control") public static final String ACTION_REQUEST_MEDIA_ROUTING_CONTROL = "android.settings.REQUEST_MEDIA_ROUTING_CONTROL"; + field @FlaggedApi("android.provider.backup_tasks_settings_screen") public static final String ACTION_REQUEST_RUN_BACKUP_JOBS = "android.settings.REQUEST_RUN_BACKUP_JOBS"; field public static final String ACTION_REQUEST_SCHEDULE_EXACT_ALARM = "android.settings.REQUEST_SCHEDULE_EXACT_ALARM"; field public static final String ACTION_REQUEST_SET_AUTOFILL_SERVICE = "android.settings.REQUEST_SET_AUTOFILL_SERVICE"; field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String ACTION_SATELLITE_SETTING = "android.settings.SATELLITE_SETTING"; @@ -40113,6 +40319,21 @@ package android.service.carrier { package android.service.chooser { + @FlaggedApi("android.service.chooser.chooser_payload_toggling") public interface AdditionalContentContract { + } + + public static interface AdditionalContentContract.Columns { + field public static final String URI = "uri"; + } + + public static interface AdditionalContentContract.CursorExtraKeys { + field public static final String POSITION = "position"; + } + + public static interface AdditionalContentContract.MethodNames { + field public static final String ON_SELECTION_CHANGED = "onSelectionChanged"; + } + public final class ChooserAction implements android.os.Parcelable { method public int describeContents(); method @NonNull public android.app.PendingIntent getAction(); @@ -40127,6 +40348,19 @@ package android.service.chooser { method @NonNull public android.service.chooser.ChooserAction build(); } + @FlaggedApi("android.service.chooser.enable_chooser_result") public final class ChooserResult implements android.os.Parcelable { + method public int describeContents(); + method @Nullable public android.content.ComponentName getSelectedComponent(); + method public int getType(); + method public boolean isShortcut(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field public static final int CHOOSER_RESULT_COPY = 1; // 0x1 + field public static final int CHOOSER_RESULT_EDIT = 2; // 0x2 + field public static final int CHOOSER_RESULT_SELECTED_COMPONENT = 0; // 0x0 + field public static final int CHOOSER_RESULT_UNKNOWN = -1; // 0xffffffff + field @NonNull public static final android.os.Parcelable.Creator<android.service.chooser.ChooserResult> CREATOR; + } + @Deprecated public final class ChooserTarget implements android.os.Parcelable { ctor @Deprecated public ChooserTarget(CharSequence, android.graphics.drawable.Icon, float, android.content.ComponentName, @Nullable android.os.Bundle); method @Deprecated public int describeContents(); @@ -41891,8 +42125,10 @@ package android.telecom { field @Deprecated public static final String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts"; field public static final String EVENT_CLEAR_DIAGNOSTIC_MESSAGE = "android.telecom.event.CLEAR_DIAGNOSTIC_MESSAGE"; field public static final String EVENT_DISPLAY_DIAGNOSTIC_MESSAGE = "android.telecom.event.DISPLAY_DIAGNOSTIC_MESSAGE"; + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String EXTRA_ASSERTED_DISPLAY_NAME = "android.telecom.extra.ASSERTED_DISPLAY_NAME"; field public static final String EXTRA_DIAGNOSTIC_MESSAGE = "android.telecom.extra.DIAGNOSTIC_MESSAGE"; field public static final String EXTRA_DIAGNOSTIC_MESSAGE_ID = "android.telecom.extra.DIAGNOSTIC_MESSAGE_ID"; + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String EXTRA_IS_BUSINESS_CALL = "android.telecom.extra.IS_BUSINESS_CALL"; field public static final String EXTRA_IS_SUPPRESSED_BY_DO_NOT_DISTURB = "android.telecom.extra.IS_SUPPRESSED_BY_DO_NOT_DISTURB"; field public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS"; field public static final String EXTRA_SILENT_RINGING_REQUESTED = "android.telecom.extra.SILENT_RINGING_REQUESTED"; @@ -43520,6 +43756,7 @@ package android.telephony { field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool"; field public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING = "subscription_group_uuid_string"; field public static final String KEY_SUPPORTED_PREMIUM_CAPABILITIES_INT_ARRAY = "supported_premium_capabilities_int_array"; + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String KEY_SUPPORTS_BUSINESS_CALL_COMPOSER_BOOL = "supports_business_call_composer_bool"; field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool"; field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL = "supports_device_to_device_communication_using_dtmf_bool"; field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL = "supports_device_to_device_communication_using_rtp_bool"; @@ -45785,6 +46022,7 @@ package android.telephony { field public static final int AUTHTYPE_EAP_SIM = 128; // 0x80 field public static final int AUTHTYPE_GBA_BOOTSTRAP = 132; // 0x84 field public static final int AUTHTYPE_GBA_NAF_KEY_EXTERNAL = 133; // 0x85 + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final int CALL_COMPOSER_STATUS_BUSINESS_ONLY = 2; // 0x2 field public static final int CALL_COMPOSER_STATUS_OFF = 0; // 0x0 field public static final int CALL_COMPOSER_STATUS_ON = 1; // 0x1 field public static final int CALL_STATE_IDLE = 0; // 0x0 @@ -46337,8 +46575,8 @@ package android.telephony.euicc { public class EuiccManager { method @NonNull public android.telephony.euicc.EuiccManager createForCardId(int); - method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void deleteSubscription(int, android.app.PendingIntent); - method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void downloadSubscription(android.telephony.euicc.DownloadableSubscription, boolean, android.app.PendingIntent); + method @RequiresPermission(anyOf={"android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS", android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS}) public void deleteSubscription(int, android.app.PendingIntent); + method @RequiresPermission(anyOf={"android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS", android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS}) public void downloadSubscription(android.telephony.euicc.DownloadableSubscription, boolean, android.app.PendingIntent); method @FlaggedApi("com.android.internal.telephony.flags.esim_available_memory") @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE", "carrier privileges"}) public long getAvailableMemoryInBytes(); method @Nullable public String getEid(); method @Nullable public android.telephony.euicc.EuiccInfo getEuiccInfo(); @@ -46821,6 +47059,7 @@ package android.telephony.ims.feature { public static class MmTelFeature.MmTelCapabilities { method public final boolean isCapable(int); field public static final int CAPABILITY_TYPE_CALL_COMPOSER = 16; // 0x10 + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final int CAPABILITY_TYPE_CALL_COMPOSER_BUSINESS_ONLY = 32; // 0x20 field public static final int CAPABILITY_TYPE_SMS = 8; // 0x8 field public static final int CAPABILITY_TYPE_UT = 4; // 0x4 field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2 @@ -52219,6 +52458,7 @@ package android.view { method public final boolean getClipToOutline(); method @Nullable public final android.view.contentcapture.ContentCaptureSession getContentCaptureSession(); method public CharSequence getContentDescription(); + method @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public final int getContentSensitivity(); method @UiContext public final android.content.Context getContext(); method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo(); method public final boolean getDefaultFocusHighlightEnabled(); @@ -52398,6 +52638,7 @@ package android.view { method public boolean isAttachedToWindow(); method public boolean isAutoHandwritingEnabled(); method public boolean isClickable(); + method @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public final boolean isContentSensitive(); method public boolean isContextClickable(); method public boolean isCredential(); method public boolean isDirty(); @@ -52602,6 +52843,7 @@ package android.view { method public void setClipToOutline(boolean); method public void setContentCaptureSession(@Nullable android.view.contentcapture.ContentCaptureSession); method public void setContentDescription(CharSequence); + method @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public final void setContentSensitivity(int); method public void setContextClickable(boolean); method public void setDefaultFocusHighlightEnabled(boolean); method @Deprecated public void setDrawingCacheBackgroundColor(@ColorInt int); @@ -52786,13 +53028,18 @@ package android.view { field public static final int AUTOFILL_TYPE_NONE = 0; // 0x0 field public static final int AUTOFILL_TYPE_TEXT = 1; // 0x1 field public static final int AUTOFILL_TYPE_TOGGLE = 2; // 0x2 + field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int CONTENT_SENSITIVITY_AUTO = 0; // 0x0 + field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int CONTENT_SENSITIVITY_NOT_SENSITIVE = 2; // 0x2 + field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int CONTENT_SENSITIVITY_SENSITIVE = 1; // 0x1 field public static final int DRAG_FLAG_ACCESSIBILITY_ACTION = 1024; // 0x400 field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100 field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40 field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80 + field @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") public static final int DRAG_FLAG_GLOBAL_SAME_APPLICATION = 4096; // 0x1000 field public static final int DRAG_FLAG_GLOBAL_URI_READ = 1; // 0x1 field public static final int DRAG_FLAG_GLOBAL_URI_WRITE = 2; // 0x2 field public static final int DRAG_FLAG_OPAQUE = 512; // 0x200 + field @FlaggedApi("com.android.window.flags.delegate_unhandled_drags") public static final int DRAG_FLAG_START_PENDING_INTENT_ON_UNHANDLED_DRAG = 8192; // 0x2000 field @Deprecated public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 field @Deprecated public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 field @Deprecated public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 @@ -53882,8 +54129,11 @@ package android.view { method @Deprecated @NonNull public android.view.WindowInsets consumeDisplayCutout(); method @Deprecated @NonNull public android.view.WindowInsets consumeStableInsets(); method @Deprecated @NonNull public android.view.WindowInsets consumeSystemWindowInsets(); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public java.util.List<android.graphics.Rect> getBoundingRects(int); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public java.util.List<android.graphics.Rect> getBoundingRectsIgnoringVisibility(int); method @Nullable public android.view.DisplayCutout getDisplayCutout(); method @Nullable public android.view.DisplayShape getDisplayShape(); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public android.util.Size getFrame(); method @NonNull public android.graphics.Insets getInsets(int); method @NonNull public android.graphics.Insets getInsetsIgnoringVisibility(int); method @Deprecated @NonNull public android.graphics.Insets getMandatorySystemGestureInsets(); @@ -53918,8 +54168,11 @@ package android.view { ctor public WindowInsets.Builder(); ctor public WindowInsets.Builder(@NonNull android.view.WindowInsets); method @NonNull public android.view.WindowInsets build(); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public android.view.WindowInsets.Builder setBoundingRects(int, @NonNull java.util.List<android.graphics.Rect>); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public android.view.WindowInsets.Builder setBoundingRectsIgnoringVisibility(int, @NonNull java.util.List<android.graphics.Rect>); method @NonNull public android.view.WindowInsets.Builder setDisplayCutout(@Nullable android.view.DisplayCutout); method @NonNull public android.view.WindowInsets.Builder setDisplayShape(@NonNull android.view.DisplayShape); + method @FlaggedApi("android.view.flags.customizable_window_headers") @NonNull public android.view.WindowInsets.Builder setFrame(int, int); method @NonNull public android.view.WindowInsets.Builder setInsets(int, @NonNull android.graphics.Insets); method @NonNull public android.view.WindowInsets.Builder setInsetsIgnoringVisibility(int, @NonNull android.graphics.Insets) throws java.lang.IllegalArgumentException; method @Deprecated @NonNull public android.view.WindowInsets.Builder setMandatorySystemGestureInsets(@NonNull android.graphics.Insets); @@ -54013,8 +54266,10 @@ package android.view { method public void setSystemBarsAppearance(int, int); method public void setSystemBarsBehavior(int); method public void show(int); + field @FlaggedApi("android.view.flags.customizable_window_headers") public static final int APPEARANCE_LIGHT_CAPTION_BARS = 256; // 0x100 field public static final int APPEARANCE_LIGHT_NAVIGATION_BARS = 16; // 0x10 field public static final int APPEARANCE_LIGHT_STATUS_BARS = 8; // 0x8 + field @FlaggedApi("android.view.flags.customizable_window_headers") public static final int APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND = 128; // 0x80 field public static final int BEHAVIOR_DEFAULT = 1; // 0x1 field @Deprecated public static final int BEHAVIOR_SHOW_BARS_BY_SWIPE = 1; // 0x1 field @Deprecated public static final int BEHAVIOR_SHOW_BARS_BY_TOUCH = 0; // 0x0 @@ -55481,6 +55736,14 @@ package android.view.inputmethod { field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.CompletionInfo> CREATOR; } + @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public interface ConnectionlessHandwritingCallback { + method public void onError(int); + method public void onResult(@NonNull CharSequence); + field public static final int CONNECTIONLESS_HANDWRITING_ERROR_NO_TEXT_RECOGNIZED = 0; // 0x0 + field public static final int CONNECTIONLESS_HANDWRITING_ERROR_OTHER = 2; // 0x2 + field public static final int CONNECTIONLESS_HANDWRITING_ERROR_UNSUPPORTED = 1; // 0x1 + } + public final class CorrectionInfo implements android.os.Parcelable { ctor public CorrectionInfo(int, CharSequence, CharSequence); method public int describeContents(); @@ -55892,6 +56155,7 @@ package android.view.inputmethod { method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager); method public CharSequence loadLabel(android.content.pm.PackageManager); method public boolean shouldShowInInputMethodPicker(); + method @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public boolean supportsConnectionlessStylusHandwriting(); method public boolean supportsStylusHandwriting(); method public boolean suppressesSpellChecker(); method public void writeToParcel(android.os.Parcel, int); @@ -55921,6 +56185,7 @@ package android.view.inputmethod { method public boolean isAcceptingText(); method public boolean isActive(android.view.View); method public boolean isActive(); + method @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public boolean isConnectionlessStylusHandwritingAvailable(); method public boolean isFullscreenMode(); method public boolean isInputMethodSuppressingSpellChecker(); method public boolean isStylusHandwritingAvailable(); @@ -55941,6 +56206,9 @@ package android.view.inputmethod { method public boolean showSoftInput(android.view.View, int, android.os.ResultReceiver); method @Deprecated public void showSoftInputFromInputMethod(android.os.IBinder, int); method @Deprecated public void showStatusIcon(android.os.IBinder, String, @DrawableRes int); + method @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public void startConnectionlessStylusHandwriting(@NonNull android.view.View, @Nullable android.view.inputmethod.CursorAnchorInfo, @NonNull java.util.concurrent.Executor, @NonNull android.view.inputmethod.ConnectionlessHandwritingCallback); + method @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public void startConnectionlessStylusHandwritingForDelegation(@NonNull android.view.View, @Nullable android.view.inputmethod.CursorAnchorInfo, @NonNull java.util.concurrent.Executor, @NonNull android.view.inputmethod.ConnectionlessHandwritingCallback); + method @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public void startConnectionlessStylusHandwritingForDelegation(@NonNull android.view.View, @Nullable android.view.inputmethod.CursorAnchorInfo, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.view.inputmethod.ConnectionlessHandwritingCallback); method public void startStylusHandwriting(@NonNull android.view.View); method @Deprecated public boolean switchToLastInputMethod(android.os.IBinder); method @Deprecated public boolean switchToNextInputMethod(android.os.IBinder, boolean); @@ -60506,6 +60774,7 @@ package android.widget { method public boolean isFallbackLineSpacing(); method public final boolean isHorizontallyScrollable(); method public boolean isInputMethodTarget(); + method @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") public boolean isLocalePreferredLineHeightForMinimumUsed(); method public boolean isSingleLine(); method public boolean isSuggestionsEnabled(); method public boolean isTextSelectable(); @@ -60588,6 +60857,7 @@ package android.widget { method public final void setLinkTextColor(@ColorInt int); method public final void setLinkTextColor(android.content.res.ColorStateList); method public final void setLinksClickable(boolean); + method @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") public void setLocalePreferredLineHeightForMinimumUsed(boolean); method public void setMarqueeRepeatLimit(int); method public void setMaxEms(int); method public void setMaxHeight(int); diff --git a/core/api/lint-baseline.txt b/core/api/lint-baseline.txt index e901f00d5f5f..b36b963f99c9 100644 --- a/core/api/lint-baseline.txt +++ b/core/api/lint-baseline.txt @@ -1093,6 +1093,66 @@ Todo: android.provider.ContactsContract.RawContacts#newEntityIterator(android.da Documentation mentions 'TODO' +UnflaggedApi: android.R.color#on_surface_disabled_material: + New API must be flagged with @FlaggedApi: field android.R.color.on_surface_disabled_material +UnflaggedApi: android.R.color#outline_disabled_material: + New API must be flagged with @FlaggedApi: field android.R.color.outline_disabled_material +UnflaggedApi: android.R.color#surface_disabled_material: + New API must be flagged with @FlaggedApi: field android.R.color.surface_disabled_material +UnflaggedApi: android.R.color#system_error_0: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_0 +UnflaggedApi: android.R.color#system_error_10: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_10 +UnflaggedApi: android.R.color#system_error_100: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_100 +UnflaggedApi: android.R.color#system_error_1000: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_1000 +UnflaggedApi: android.R.color#system_error_200: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_200 +UnflaggedApi: android.R.color#system_error_300: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_300 +UnflaggedApi: android.R.color#system_error_400: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_400 +UnflaggedApi: android.R.color#system_error_50: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_50 +UnflaggedApi: android.R.color#system_error_500: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_500 +UnflaggedApi: android.R.color#system_error_600: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_600 +UnflaggedApi: android.R.color#system_error_700: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_700 +UnflaggedApi: android.R.color#system_error_800: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_800 +UnflaggedApi: android.R.color#system_error_900: + New API must be flagged with @FlaggedApi: field android.R.color.system_error_900 +UnflaggedApi: android.R.color#system_on_surface_disabled: + New API must be flagged with @FlaggedApi: field android.R.color.system_on_surface_disabled +UnflaggedApi: android.R.color#system_on_surface_disabled_dark: + New API must be flagged with @FlaggedApi: field android.R.color.system_on_surface_disabled_dark +UnflaggedApi: android.R.color#system_on_surface_disabled_light: + New API must be flagged with @FlaggedApi: field android.R.color.system_on_surface_disabled_light +UnflaggedApi: android.R.color#system_outline_disabled: + New API must be flagged with @FlaggedApi: field android.R.color.system_outline_disabled +UnflaggedApi: android.R.color#system_outline_disabled_dark: + New API must be flagged with @FlaggedApi: field android.R.color.system_outline_disabled_dark +UnflaggedApi: android.R.color#system_outline_disabled_light: + New API must be flagged with @FlaggedApi: field android.R.color.system_outline_disabled_light +UnflaggedApi: android.R.color#system_surface_disabled: + New API must be flagged with @FlaggedApi: field android.R.color.system_surface_disabled +UnflaggedApi: android.R.color#system_surface_disabled_dark: + New API must be flagged with @FlaggedApi: field android.R.color.system_surface_disabled_dark +UnflaggedApi: android.R.color#system_surface_disabled_light: + New API must be flagged with @FlaggedApi: field android.R.color.system_surface_disabled_light +UnflaggedApi: android.R.dimen#system_corner_radius_large: + New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_large +UnflaggedApi: android.R.dimen#system_corner_radius_medium: + New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_medium +UnflaggedApi: android.R.dimen#system_corner_radius_small: + New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_small +UnflaggedApi: android.R.dimen#system_corner_radius_xlarge: + New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xlarge +UnflaggedApi: android.R.dimen#system_corner_radius_xsmall: + New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xsmall UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR: New API must be flagged with @FlaggedApi: field android.accessibilityservice.AccessibilityService.OVERLAY_RESULT_INTERNAL_ERROR UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID: diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 1273da71b748..7ba78356af72 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -102,6 +102,7 @@ package android.content { method @NonNull public android.os.UserHandle getUser(); field public static final String PAC_PROXY_SERVICE = "pac_proxy"; field public static final String TEST_NETWORK_SERVICE = "test_network"; + field @FlaggedApi("android.webkit.update_service_ipc_wrapper") public static final String WEBVIEW_UPDATE_SERVICE = "webviewupdate"; } public class Intent implements java.lang.Cloneable android.os.Parcelable { @@ -412,6 +413,19 @@ package android.os { field public static final int VPN_UID = 1016; // 0x3f8 } + @FlaggedApi("android.os.telemetry_apis_framework_initialization") public class ProfilingServiceManager { + method @NonNull public android.os.ProfilingServiceManager.ServiceRegisterer getProfilingServiceRegisterer(); + } + + public static class ProfilingServiceManager.ServiceNotFoundException extends java.lang.Exception { + ctor public ProfilingServiceManager.ServiceNotFoundException(@NonNull String); + } + + public static final class ProfilingServiceManager.ServiceRegisterer { + method @Nullable public android.os.IBinder get(); + method @Nullable public android.os.IBinder getOrThrow() throws android.os.ProfilingServiceManager.ServiceNotFoundException; + } + public final class ServiceManager { method @NonNull public static String[] getDeclaredInstances(@NonNull String); method public static boolean isDeclared(@NonNull String); @@ -637,3 +651,34 @@ package android.view.accessibility { } +package android.webkit { + + @FlaggedApi("android.webkit.update_service_ipc_wrapper") public class WebViewBootstrapFrameworkInitializer { + method public static void registerServiceWrappers(); + } + + @FlaggedApi("android.webkit.update_service_ipc_wrapper") public final class WebViewProviderResponse implements android.os.Parcelable { + ctor public WebViewProviderResponse(@Nullable android.content.pm.PackageInfo, int); + method public int describeContents(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.webkit.WebViewProviderResponse> CREATOR; + field public static final int STATUS_FAILED_LISTING_WEBVIEW_PACKAGES = 4; // 0x4 + field public static final int STATUS_FAILED_WAITING_FOR_RELRO = 3; // 0x3 + field public static final int STATUS_SUCCESS = 0; // 0x0 + field @Nullable public final android.content.pm.PackageInfo packageInfo; + field public final int status; + } + + @FlaggedApi("android.webkit.update_service_ipc_wrapper") public final class WebViewUpdateManager { + method @Nullable @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public String changeProviderAndSetting(@NonNull String); + method @NonNull public android.webkit.WebViewProviderInfo[] getAllWebViewPackages(); + method @Nullable public android.content.pm.PackageInfo getCurrentWebViewPackage(); + method @Nullable public String getCurrentWebViewPackageName(); + method @FlaggedApi("android.webkit.update_service_v2") @NonNull public android.webkit.WebViewProviderInfo getDefaultWebViewPackage(); + method @Nullable public static android.webkit.WebViewUpdateManager getInstance(); + method @NonNull public android.webkit.WebViewProviderInfo[] getValidWebViewPackages(); + method @NonNull public android.webkit.WebViewProviderResponse waitForAndGetProvider(); + } + +} + diff --git a/core/api/system-current.txt b/core/api/system-current.txt index c09653ded9f0..9e09931e5ba7 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -282,6 +282,7 @@ package android { field public static final String RADIO_SCAN_WITHOUT_LOCATION = "android.permission.RADIO_SCAN_WITHOUT_LOCATION"; field public static final String READ_ACTIVE_EMERGENCY_SESSION = "android.permission.READ_ACTIVE_EMERGENCY_SESSION"; field public static final String READ_APP_SPECIFIC_LOCALES = "android.permission.READ_APP_SPECIFIC_LOCALES"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String READ_BLOCKED_NUMBERS = "android.permission.READ_BLOCKED_NUMBERS"; field public static final String READ_CARRIER_APP_INFO = "android.permission.READ_CARRIER_APP_INFO"; field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS"; field public static final String READ_CLIPBOARD_IN_BACKGROUND = "android.permission.READ_CLIPBOARD_IN_BACKGROUND"; @@ -409,6 +410,7 @@ package android { field public static final String WIFI_UPDATE_COEX_UNSAFE_CHANNELS = "android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS"; field public static final String WIFI_UPDATE_USABILITY_STATS_SCORE = "android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"; field public static final String WRITE_ALLOWLISTED_DEVICE_CONFIG = "android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String WRITE_BLOCKED_NUMBERS = "android.permission.WRITE_BLOCKED_NUMBERS"; field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG"; field public static final String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE"; field public static final String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"; @@ -1038,13 +1040,20 @@ package android.app { method @Nullable public android.content.ComponentName getAllowedNotificationAssistant(); method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public java.util.List<android.content.ComponentName> getEnabledNotificationListeners(); method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName); + method @FlaggedApi("android.service.notification.callstyle_callback_api") @RequiresPermission(allOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.ACCESS_NOTIFICATIONS}) public void registerCallNotificationEventListener(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.app.NotificationManager.CallNotificationEventListener); method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean); method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean); + method @FlaggedApi("android.service.notification.callstyle_callback_api") @RequiresPermission(allOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.ACCESS_NOTIFICATIONS}) public void unregisterCallNotificationEventListener(@NonNull android.app.NotificationManager.CallNotificationEventListener); field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_CLOSE_NOTIFICATION_HANDLER_PANEL = "android.app.action.CLOSE_NOTIFICATION_HANDLER_PANEL"; field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_OPEN_NOTIFICATION_HANDLER_PANEL = "android.app.action.OPEN_NOTIFICATION_HANDLER_PANEL"; field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_TOGGLE_NOTIFICATION_HANDLER_PANEL = "android.app.action.TOGGLE_NOTIFICATION_HANDLER_PANEL"; } + @FlaggedApi("android.service.notification.callstyle_callback_api") public static interface NotificationManager.CallNotificationEventListener { + method @FlaggedApi("android.service.notification.callstyle_callback_api") public void onCallNotificationPosted(@NonNull String, @NonNull android.os.UserHandle); + method @FlaggedApi("android.service.notification.callstyle_callback_api") public void onCallNotificationRemoved(@NonNull String, @NonNull android.os.UserHandle); + } + public final class RemoteLockscreenValidationResult implements android.os.Parcelable { method public int describeContents(); method public int getResultCode(); @@ -1389,6 +1398,7 @@ package android.app.admin { field public static final int STATUS_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd field public static final int STATUS_HAS_DEVICE_OWNER = 1; // 0x1 field public static final int STATUS_HAS_PAIRED = 8; // 0x8 + field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; // 0x11 field public static final int STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED = 16; // 0x10 field public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9 field public static final int STATUS_NONSYSTEM_USER_EXISTS = 5; // 0x5 @@ -2204,6 +2214,7 @@ package android.app.prediction { method public void notifyLaunchLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>); method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback); method public void requestPredictionUpdate(); + method @FlaggedApi("android.service.appprediction.flags.service_features_api") public void requestServiceFeatures(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.os.Bundle>); method @Nullable public void sortTargets(@NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>); method public void unregisterPredictionUpdates(@NonNull android.app.prediction.AppPredictor.Callback); } @@ -4359,10 +4370,12 @@ package android.content.pm.verify.domain { public final class DomainVerificationManager { method @Nullable @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public android.content.pm.verify.domain.DomainVerificationInfo getDomainVerificationInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public java.util.SortedSet<android.content.pm.verify.domain.DomainOwner> getOwnersForDomain(@NonNull String); + method @FlaggedApi("android.content.pm.relative_reference_intent_filters") @NonNull public java.util.Map<java.lang.String,java.util.List<android.content.UriRelativeFilterGroup>> getUriRelativeFilterGroups(@NonNull String, @NonNull java.util.List<java.lang.String>); method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> queryValidVerificationPackageNames(); method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationLinkHandlingAllowed(@NonNull String, boolean) throws android.content.pm.PackageManager.NameNotFoundException; method @CheckResult @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public int setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, int) throws android.content.pm.PackageManager.NameNotFoundException; method @CheckResult @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public int setDomainVerificationUserSelection(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, boolean) throws android.content.pm.PackageManager.NameNotFoundException; + method @FlaggedApi("android.content.pm.relative_reference_intent_filters") @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public void setUriRelativeFilterGroups(@NonNull String, @NonNull java.util.Map<java.lang.String,java.util.List<android.content.UriRelativeFilterGroup>>); field public static final int ERROR_DOMAIN_SET_ID_INVALID = 1; // 0x1 field public static final int ERROR_UNABLE_TO_APPROVE = 3; // 0x3 field public static final int ERROR_UNKNOWN_DOMAIN = 2; // 0x2 @@ -6638,6 +6651,7 @@ package android.hardware.usb { method public int getSupportedRoleCombinations(); method public int getUsbDataStatus(); method public boolean isConnected(); + method @FlaggedApi("android.hardware.usb.flags.enable_is_pd_compliant_api") public boolean isPdCompliant(); method public boolean isPowerTransferLimited(); method public boolean isRoleCombinationSupported(int, int); method public void writeToParcel(android.os.Parcel, int); @@ -11062,6 +11076,7 @@ package android.os { field public static final String USER_TYPE_FULL_SYSTEM = "android.os.usertype.full.SYSTEM"; field public static final String USER_TYPE_PROFILE_CLONE = "android.os.usertype.profile.CLONE"; field public static final String USER_TYPE_PROFILE_MANAGED = "android.os.usertype.profile.MANAGED"; + field @FlaggedApi("android.os.allow_private_profile") public static final String USER_TYPE_PROFILE_PRIVATE = "android.os.usertype.profile.PRIVATE"; field public static final String USER_TYPE_SYSTEM_HEADLESS = "android.os.usertype.system.HEADLESS"; } @@ -11452,6 +11467,29 @@ package android.printservice.recommendation { package android.provider { + public static class BlockedNumberContract.BlockedNumbers { + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static void endBlockSuppression(@NonNull android.content.Context); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @NonNull @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static android.provider.BlockedNumberContract.BlockedNumbers.BlockSuppressionStatus getBlockSuppressionStatus(@NonNull android.content.Context); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static boolean getBlockedNumberSetting(@NonNull android.content.Context, @NonNull String); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static void notifyEmergencyContact(@NonNull android.content.Context); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static void setBlockedNumberSetting(@NonNull android.content.Context, @NonNull String, boolean); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static boolean shouldShowEmergencyCallNotification(@NonNull android.content.Context); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @RequiresPermission(allOf={android.Manifest.permission.READ_BLOCKED_NUMBERS, android.Manifest.permission.WRITE_BLOCKED_NUMBERS}) public static int shouldSystemBlockNumber(@NonNull android.content.Context, @NonNull String, int, boolean); + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ACTION_BLOCK_SUPPRESSION_STATE_CHANGED = "android.provider.action.BLOCK_SUPPRESSION_STATE_CHANGED"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_BLOCK_PAYPHONE = "block_payphone_calls_setting"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_BLOCK_PRIVATE = "block_private_number_calls_setting"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE = "block_unavailable_calls_setting"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_BLOCK_UNKNOWN = "block_unknown_calls_setting"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED = "block_numbers_not_in_contacts_setting"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION = "show_emergency_call_notification"; + } + + @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final class BlockedNumberContract.BlockedNumbers.BlockSuppressionStatus { + ctor public BlockedNumberContract.BlockedNumbers.BlockSuppressionStatus(boolean, long); + method public boolean getIsSuppressed(); + method public long getUntilTimestampMillis(); + } + public class CallLog { method @RequiresPermission(allOf={android.Manifest.permission.WRITE_CALL_LOG, android.Manifest.permission.INTERACT_ACROSS_USERS}) public static void storeCallComposerPicture(@NonNull android.content.Context, @NonNull java.io.InputStream, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.net.Uri,android.provider.CallLog.CallComposerLoggingException>); } @@ -11465,7 +11503,7 @@ package android.provider { field public static final int ERROR_UNKNOWN = 0; // 0x0 } - @FlaggedApi("android.provider.user_keys") public class ContactKeysManager { + @FlaggedApi("android.provider.user_keys") public final class ContactKeysManager { method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateContactKeyLocalVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int); method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateContactKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int); method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, int); @@ -12055,6 +12093,7 @@ package android.service.appprediction { method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId); method @MainThread public abstract void onLaunchLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>); method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId); + method @FlaggedApi("android.service.appprediction.flags.service_features_api") @MainThread public void onRequestServiceFeatures(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.function.Consumer<android.os.Bundle>); method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>); method @MainThread public void onStartPredictionUpdates(); method @MainThread public void onStopPredictionUpdates(); @@ -13372,6 +13411,23 @@ package android.service.voice { field public static final int ERROR_CODE_UNKNOWN = 0; // 0x0 } + @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final class VisualQueryAttentionResult implements android.os.Parcelable { + method public int describeContents(); + method @IntRange(from=1, to=100) public int getEngagementLevel(); + method public int getInteractionIntention(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.service.voice.VisualQueryAttentionResult> CREATOR; + field public static final int INTERACTION_INTENTION_AUDIO_VISUAL = 0; // 0x0 + field public static final int INTERACTION_INTENTION_VISUAL_ACCESSIBILITY = 1; // 0x1 + } + + public static final class VisualQueryAttentionResult.Builder { + ctor public VisualQueryAttentionResult.Builder(); + method @NonNull public android.service.voice.VisualQueryAttentionResult build(); + method @NonNull public android.service.voice.VisualQueryAttentionResult.Builder setEngagementLevel(@IntRange(from=1, to=100) int); + method @NonNull public android.service.voice.VisualQueryAttentionResult.Builder setInteractionIntention(int); + } + @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public final class VisualQueryDetectedResult implements android.os.Parcelable { method public int describeContents(); method public static int getMaxSpeakerId(); @@ -13392,7 +13448,9 @@ package android.service.voice { ctor public VisualQueryDetectionService(); method public final void finishQuery() throws java.lang.IllegalStateException; method public final void gainedAttention(); + method @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final void gainedAttention(@NonNull android.service.voice.VisualQueryAttentionResult); method public final void lostAttention(); + method @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final void lostAttention(int); method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent); method public void onStartDetection(); method public void onStopDetection(); @@ -13834,6 +13892,7 @@ package android.telecom { field public static final int CAPABILITY_EMERGENCY_VIDEO_CALLING = 512; // 0x200 field public static final int CAPABILITY_MULTI_USER = 32; // 0x20 field public static final String EXTRA_PLAY_CALL_RECORDING_TONE = "android.telecom.extra.PLAY_CALL_RECORDING_TONE"; + field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String EXTRA_SKIP_CALL_FILTERING = "android.telecom.extra.SKIP_CALL_FILTERING"; field public static final String EXTRA_SORT_ORDER = "android.telecom.extra.SORT_ORDER"; } @@ -16112,6 +16171,7 @@ package android.telephony.ims { field public static final int DIALSTRING_USSD = 2; // 0x2 field public static final String EXTRA_ADDITIONAL_CALL_INFO = "AdditionalCallInfo"; field public static final String EXTRA_ADDITIONAL_SIP_INVITE_FIELDS = "android.telephony.ims.extra.ADDITIONAL_SIP_INVITE_FIELDS"; + field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String EXTRA_ASSERTED_DISPLAY_NAME = "android.telephony.ims.extra.ASSERTED_DISPLAY_NAME"; field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telephony.ims.extra.CALL_DISCONNECT_CAUSE"; field public static final String EXTRA_CALL_NETWORK_TYPE = "android.telephony.ims.extra.CALL_NETWORK_TYPE"; field @Deprecated public static final String EXTRA_CALL_RAT_TYPE = "CallRadioTech"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 288374d4cf49..f8a6af1a5c60 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -104,6 +104,14 @@ package android.accessibilityservice { method @FlaggedApi("android.view.accessibility.motion_event_observing") public void setObservedMotionEventSources(int); } + @FlaggedApi("android.view.accessibility.braille_display_hid") public interface BrailleDisplayController { + method @FlaggedApi("android.view.accessibility.braille_display_hid") @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public static void setTestBrailleDisplayData(@NonNull android.accessibilityservice.AccessibilityService, @NonNull java.util.List<android.os.Bundle>); + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final String TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH = "BUS_BLUETOOTH"; + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final String TEST_BRAILLE_DISPLAY_DESCRIPTOR = "DESCRIPTOR"; + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final String TEST_BRAILLE_DISPLAY_HIDRAW_PATH = "HIDRAW_PATH"; + field @FlaggedApi("android.view.accessibility.braille_display_hid") public static final String TEST_BRAILLE_DISPLAY_UNIQUE_ID = "UNIQUE_ID"; + } + } package android.animation { @@ -913,7 +921,33 @@ package android.companion { package android.companion.virtual { public final class VirtualDeviceManager { + method public int getAudioPlaybackSessionId(int); + method public int getAudioRecordingSessionId(int); + method public int getDeviceIdForDisplayId(int); + method public int getDevicePolicy(int, int); method @FlaggedApi("android.companion.virtual.flags.interactive_screen_mirror") public boolean isVirtualDeviceOwnedMirrorDisplay(int); + method public void playSoundEffect(int, int); + } + +} + +package android.companion.virtual.camera { + + @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCamera implements java.io.Closeable { + method @NonNull public String getId(); + } + +} + +package android.companion.virtual.sensor { + + public final class VirtualSensor implements android.os.Parcelable { + ctor public VirtualSensor(int, int, @NonNull String); + method public int getHandle(); + } + + public final class VirtualSensorConfig implements android.os.Parcelable { + method public int getFlags(); } } @@ -980,6 +1014,7 @@ package android.content { method public void setAutofillOptions(@Nullable android.content.AutofillOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); method public void updateDeviceId(int); + method public abstract void updateDisplay(int); field public static final String ATTENTION_SERVICE = "attention"; field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle"; @@ -993,6 +1028,7 @@ package android.content { public class ContextWrapper extends android.content.Context { method public int getDisplayId(); + method public void updateDisplay(int); } public class Intent implements java.lang.Cloneable android.os.Parcelable { @@ -2081,7 +2117,7 @@ package android.media.metrics { package android.media.projection { public final class MediaProjectionManager { - method @NonNull public android.content.Intent createScreenCaptureIntent(@Nullable android.app.ActivityOptions.LaunchCookie); + method @NonNull public android.content.Intent createScreenCaptureIntent(@NonNull android.app.ActivityOptions.LaunchCookie); } } @@ -2454,7 +2490,6 @@ package android.os { method public boolean isVisibleBackgroundUsersOnDefaultDisplaySupported(); method public boolean isVisibleBackgroundUsersSupported(); method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo preCreateUser(@NonNull String) throws android.os.UserManager.UserOperationException; - field @FlaggedApi("android.os.allow_private_profile") public static final String USER_TYPE_PROFILE_PRIVATE = "android.os.usertype.profile.PRIVATE"; } public final class VibrationAttributes implements android.os.Parcelable { @@ -2700,17 +2735,17 @@ package android.os.vibrator { package android.os.vibrator.persistence { - @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public class ParsedVibration { + public class ParsedVibration { method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffects(); method @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator); } - @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public final class VibrationXmlParser { + public final class VibrationXmlParser { method @Nullable public static android.os.vibrator.persistence.ParsedVibration parseDocument(@NonNull java.io.Reader) throws java.io.IOException; method @Nullable public static android.os.VibrationEffect parseVibrationEffect(@NonNull java.io.Reader) throws java.io.IOException; } - @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public final class VibrationXmlSerializer { + public final class VibrationXmlSerializer { method public static void serialize(@NonNull android.os.VibrationEffect, @NonNull java.io.Writer) throws java.io.IOException, android.os.vibrator.persistence.VibrationXmlSerializer.SerializationFailedException; } @@ -3049,6 +3084,14 @@ package android.service.notification { method @Deprecated public boolean isBound(); } + @FlaggedApi("android.app.modes_api") public final class ZenDeviceEffects implements android.os.Parcelable { + method @NonNull public java.util.Set<java.lang.String> getExtraEffects(); + } + + @FlaggedApi("android.app.modes_api") public static final class ZenDeviceEffects.Builder { + method @NonNull public android.service.notification.ZenDeviceEffects.Builder setExtraEffects(@NonNull java.util.Set<java.lang.String>); + } + public final class ZenPolicy implements android.os.Parcelable { method @FlaggedApi("android.app.modes_api") @NonNull public android.service.notification.ZenPolicy overwrittenWith(@Nullable android.service.notification.ZenPolicy); } @@ -3530,6 +3573,7 @@ package android.view { public final class Display { method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearUserPreferredDisplayMode(); method @NonNull public android.view.Display.Mode getDefaultMode(); + method public int getRemoveMode(); method @NonNull public int[] getReportedHdrTypes(); method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut(); method @Nullable public android.view.Display.Mode getSystemPreferredDisplayMode(); @@ -3894,7 +3938,7 @@ package android.view.inputmethod { } public final class InputMethodInfo implements android.os.Parcelable { - ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, @NonNull String); + ctor @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, boolean, @NonNull String); ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, int); field public static final int COMPONENT_NAME_MAX_LENGTH = 1000; // 0x3e8 field public static final int MAX_IMES_PER_PACKAGE = 20; // 0x14 diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 2a7dbab2bfd1..f7d75222a6f7 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -80,6 +80,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.function.Consumer; import java.util.function.IntConsumer; @@ -364,12 +365,12 @@ public abstract class AccessibilityService extends Service { public static final int GESTURE_SWIPE_UP_AND_RIGHT = 14; /** - * The user has performed an down and left gesture on the touch screen. + * The user has performed a down and left gesture on the touch screen. */ public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15; /** - * The user has performed an down and right gesture on the touch screen. + * The user has performed a down and right gesture on the touch screen. */ public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16; @@ -850,6 +851,8 @@ public abstract class AccessibilityService extends Service { private boolean mInputMethodInitialized = false; private final SparseArray<AccessibilityButtonController> mAccessibilityButtonControllers = new SparseArray<>(0); + private BrailleDisplayController mBrailleDisplayController; + private BrailleDisplayController mTestBrailleDisplayController; private int mGestureStatusCallbackSequence; @@ -3634,4 +3637,56 @@ public abstract class AccessibilityService extends Service { .attachAccessibilityOverlayToWindow( mConnectionId, accessibilityWindowId, sc, executor, callback); } + + /** + * Returns the {@link BrailleDisplayController} which may be used to communicate with + * refreshable Braille displays that provide USB or Bluetooth Braille display HID support. + */ + @FlaggedApi(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + @NonNull + public BrailleDisplayController getBrailleDisplayController() { + BrailleDisplayController.checkApiFlagIsEnabled(); + synchronized (mLock) { + if (mTestBrailleDisplayController != null) { + return mTestBrailleDisplayController; + } + + if (mBrailleDisplayController == null) { + mBrailleDisplayController = new BrailleDisplayControllerImpl(this, mLock); + } + return mBrailleDisplayController; + } + } + + /** + * Set the {@link BrailleDisplayController} implementation that will be returned by + * {@link #getBrailleDisplayController}, to allow this accessibility service to test its + * interaction with BrailleDisplayController without requiring a real Braille display. + * + * <p>For full test fidelity, ensure that this test-only implementation follows the same + * behavior specified in the documentation for {@link BrailleDisplayController}, including + * thrown exceptions. + * + * @param controller A test-only implementation of {@link BrailleDisplayController}. + */ + @FlaggedApi(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void setTestBrailleDisplayController(@NonNull BrailleDisplayController controller) { + BrailleDisplayController.checkApiFlagIsEnabled(); + Objects.requireNonNull(controller); + synchronized (mLock) { + mTestBrailleDisplayController = controller; + } + } + + /** + * Clears the {@link BrailleDisplayController} previously set by + * {@link #setTestBrailleDisplayController}. + */ + @FlaggedApi(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void clearTestBrailleDisplayController() { + BrailleDisplayController.checkApiFlagIsEnabled(); + synchronized (mLock) { + mTestBrailleDisplayController = null; + } + } } diff --git a/core/java/android/accessibilityservice/BrailleDisplayController.java b/core/java/android/accessibilityservice/BrailleDisplayController.java new file mode 100644 index 000000000000..5282aa3fccf7 --- /dev/null +++ b/core/java/android/accessibilityservice/BrailleDisplayController.java @@ -0,0 +1,308 @@ +/* + * 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.accessibilityservice; + +import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; +import android.annotation.TestApi; +import android.bluetooth.BluetoothDevice; +import android.hardware.usb.UsbDevice; +import android.os.Bundle; +import android.os.IBinder; +import android.os.RemoteException; +import android.view.accessibility.AccessibilityInteractionClient; +import android.view.accessibility.Flags; + +import java.io.IOException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.List; +import java.util.concurrent.Executor; + +/** + * Used to communicate with a Braille display that supports the Braille display HID standard + * (usage page 0x41). + * + * <p>Only one Braille display may be connected at a time. + */ +// This interface doesn't actually own resources. Its I/O connections are owned, monitored, +// and automatically closed by the system after the accessibility service is disconnected. +@SuppressLint("NotCloseable") +@FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) +public interface BrailleDisplayController { + + /** + * Throw {@link IllegalStateException} if this feature's aconfig flag is disabled. + * + * @hide + */ + static void checkApiFlagIsEnabled() { + if (!Flags.brailleDisplayHid()) { + throw new IllegalStateException("Flag BRAILLE_DISPLAY_HID not enabled"); + } + } + + /** + * Interface provided to {@link BrailleDisplayController} connection methods to + * receive callbacks from the system. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + interface BrailleDisplayCallback { + /** + * The system cannot access connected HID devices. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + int FLAG_ERROR_CANNOT_ACCESS = 1 << 0; + /** + * A unique Braille display matching the requested properties could not be identified. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + int FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND = 1 << 1; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = true, prefix = "FLAG_ERROR_", value = { + FLAG_ERROR_CANNOT_ACCESS, + FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND, + }) + @interface ErrorCode { + } + + /** + * Callback to observe a successful Braille display connection. + * + * <p>The provided HID report descriptor should be used to understand the input bytes + * received from the Braille display via {@link #onInput} and to prepare + * the output sent to the Braille display via {@link #write}. + * + * @param hidDescriptor The HID report descriptor for this Braille display. + * @see #connect(BluetoothDevice, BrailleDisplayCallback) + * @see #connect(UsbDevice, BrailleDisplayCallback) + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void onConnected(@NonNull byte[] hidDescriptor); + + /** + * Callback to observe a failed Braille display connection. + * + * @param errorFlags A bitmask of error codes for the connection failure. + * @see #connect(BluetoothDevice, BrailleDisplayCallback) + * @see #connect(UsbDevice, BrailleDisplayCallback) + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void onConnectionFailed(@ErrorCode int errorFlags); + + /** + * Callback to observe input bytes from the currently connected Braille display. + * + * @param input The input bytes from the Braille display, formatted according to the HID + * report descriptor and the HIDRAW kernel driver. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void onInput(@NonNull byte[] input); + + /** + * Callback to observe when the currently connected Braille display is disconnected by the + * system. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void onDisconnected(); + } + + /** + * Connects to the requested bluetooth Braille display using the Braille + * display HID standard (usage page 0x41). + * + * <p>If successful then the HID report descriptor will be provided to + * {@link BrailleDisplayCallback#onConnected} + * and the Braille display will start sending incoming input bytes to + * {@link BrailleDisplayCallback#onInput}. If there is an error in reading input + * then the system will disconnect the Braille display. + * + * <p>Note that the callbacks will be executed on the main thread using + * {@link AccessibilityService#getMainExecutor()}. To specify the execution thread, use + * {@link #connect(BluetoothDevice, Executor, BrailleDisplayCallback)}. + * + * @param bluetoothDevice The Braille display device. + * @param callback Callbacks used to provide connection results. + * @see BrailleDisplayCallback#onConnected + * @see BrailleDisplayCallback#onConnectionFailed + * @throws IllegalStateException if a Braille display is already connected to this controller. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) + void connect(@NonNull BluetoothDevice bluetoothDevice, + @NonNull BrailleDisplayCallback callback); + + /** + * Connects to the requested bluetooth Braille display using the Braille + * display HID standard (usage page 0x41). + * + * <p>If successful then the HID report descriptor will be provided to + * {@link BrailleDisplayCallback#onConnected} + * and the Braille display will start sending incoming input bytes to + * {@link BrailleDisplayCallback#onInput}. If there is an error in reading input + * then the system will disconnect the Braille display. + * + * @param bluetoothDevice The Braille display device. + * @param callbackExecutor Executor for executing the provided callbacks. + * @param callback Callbacks used to provide connection results. + * @see BrailleDisplayCallback#onConnected + * @see BrailleDisplayCallback#onConnectionFailed + * @throws IllegalStateException if a Braille display is already connected to this controller. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) + void connect(@NonNull BluetoothDevice bluetoothDevice, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull BrailleDisplayCallback callback); + + /** + * Connects to the requested USB Braille display using the Braille + * display HID standard (usage page 0x41). + * + * <p>If successful then the HID report descriptor will be provided to + * {@link BrailleDisplayCallback#onConnected} + * and the Braille display will start sending incoming input bytes to + * {@link BrailleDisplayCallback#onInput}. If there is an error in reading input + * then the system will disconnect the Braille display. + * + * <p>The accessibility service app must already have approval to access the USB device + * from the standard {@link android.hardware.usb.UsbManager} access approval process. + * + * <p>Note that the callbacks will be executed on the main thread using + * {@link AccessibilityService#getMainExecutor()}. To specify the execution thread, use + * {@link #connect(UsbDevice, Executor, BrailleDisplayCallback)}. + * + * @param usbDevice The Braille display device. + * @param callback Callbacks used to provide connection results. + * @see BrailleDisplayCallback#onConnected + * @see BrailleDisplayCallback#onConnectionFailed + * @throws SecurityException if the caller does not have USB device approval. + * @throws IllegalStateException if a Braille display is already connected to this controller. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void connect(@NonNull UsbDevice usbDevice, + @NonNull BrailleDisplayCallback callback); + + /** + * Connects to the requested USB Braille display using the Braille + * display HID standard (usage page 0x41). + * + * <p>If successful then the HID report descriptor will be provided to + * {@link BrailleDisplayCallback#onConnected} + * and the Braille display will start sending incoming input bytes to + * {@link BrailleDisplayCallback#onInput}. If there is an error in reading input + * then the system will disconnect the Braille display. + * + * <p>The accessibility service app must already have approval to access the USB device + * from the standard {@link android.hardware.usb.UsbManager} access approval process. + * + * @param usbDevice The Braille display device. + * @param callbackExecutor Executor for executing the provided callbacks. + * @param callback Callbacks used to provide connection results. + * @see BrailleDisplayCallback#onConnected + * @see BrailleDisplayCallback#onConnectionFailed + * @throws SecurityException if the caller does not have USB device approval. + * @throws IllegalStateException if a Braille display is already connected to this controller. + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void connect(@NonNull UsbDevice usbDevice, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull BrailleDisplayCallback callback); + + /** + * Returns true if a Braille display is currently connected, otherwise false. + * + * @see #connect + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + boolean isConnected(); + + /** + * Writes a HID report to the currently connected Braille display. + * + * <p>This method returns immediately after dispatching the write request to the system. + * If the system experiences an error in writing output (e.g. the Braille display is unplugged + * after the system receives the write request but before writing the bytes to the Braille + * display) then the system will disconnect the Braille display, which calls + * {@link BrailleDisplayCallback#onDisconnected()}. + * + * @param buffer The bytes to write to the Braille display. These bytes should be formatted + * according to the HID report descriptor and the HIDRAW kernel driver. + * @throws IOException if there is no currently connected Braille display. + * @throws IllegalArgumentException if the buffer exceeds the maximum safe payload size for + * binder transactions of + * {@link IBinder#getSuggestedMaxIpcSizeBytes()} + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void write(@NonNull byte[] buffer) throws IOException; + + /** + * Disconnects from the currently connected Braille display. + * + * @see #isConnected() + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + void disconnect(); + + /** + * Provides test Braille display data to be used for automated CTS tests. + * + * <p>See {@code TEST_BRAILLE_DISPLAY_*} bundle keys. + * + * @hide + */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) + @TestApi + static void setTestBrailleDisplayData( + @NonNull AccessibilityService service, + @NonNull List<Bundle> brailleDisplays) { + checkApiFlagIsEnabled(); + final IAccessibilityServiceConnection serviceConnection = + AccessibilityInteractionClient.getConnection(service.getConnectionId()); + if (serviceConnection != null) { + try { + serviceConnection.setTestBrailleDisplayData(brailleDisplays); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** @hide */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @TestApi + String TEST_BRAILLE_DISPLAY_HIDRAW_PATH = "HIDRAW_PATH"; + /** @hide */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @TestApi + String TEST_BRAILLE_DISPLAY_DESCRIPTOR = "DESCRIPTOR"; + /** @hide */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @TestApi + String TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH = "BUS_BLUETOOTH"; + /** @hide */ + @FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) + @TestApi + String TEST_BRAILLE_DISPLAY_UNIQUE_ID = "UNIQUE_ID"; +} diff --git a/core/java/android/accessibilityservice/BrailleDisplayControllerImpl.java b/core/java/android/accessibilityservice/BrailleDisplayControllerImpl.java new file mode 100644 index 000000000000..cac1dc4e04a9 --- /dev/null +++ b/core/java/android/accessibilityservice/BrailleDisplayControllerImpl.java @@ -0,0 +1,267 @@ +/* + * 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.accessibilityservice; + +import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; +import android.annotation.NonNull; +import android.annotation.RequiresPermission; +import android.bluetooth.BluetoothDevice; +import android.hardware.usb.UsbDevice; +import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; +import android.view.accessibility.AccessibilityInteractionClient; +import android.view.accessibility.Flags; + +import com.android.internal.util.FunctionalUtils; + +import java.io.IOException; +import java.util.Objects; +import java.util.concurrent.Executor; + +/** + * Default implementation of {@link BrailleDisplayController}. + */ +// BrailleDisplayControllerImpl is not an API, but it implements BrailleDisplayController APIs. +// This @FlaggedApi annotation tells the linter that this method delegates API checks to its +// callers. +@FlaggedApi(Flags.FLAG_BRAILLE_DISPLAY_HID) +final class BrailleDisplayControllerImpl implements BrailleDisplayController { + + private final AccessibilityService mAccessibilityService; + private final Object mLock; + + private IBrailleDisplayConnection mBrailleDisplayConnection; + private Executor mCallbackExecutor; + private BrailleDisplayCallback mCallback; + + BrailleDisplayControllerImpl(AccessibilityService accessibilityService, + Object lock) { + mAccessibilityService = accessibilityService; + mLock = lock; + } + + @Override + @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) + public void connect(@NonNull BluetoothDevice bluetoothDevice, + @NonNull BrailleDisplayCallback callback) { + connect(bluetoothDevice, mAccessibilityService.getMainExecutor(), callback); + } + + @Override + @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) + public void connect(@NonNull BluetoothDevice bluetoothDevice, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull BrailleDisplayCallback callback) { + Objects.requireNonNull(bluetoothDevice); + Objects.requireNonNull(callbackExecutor); + Objects.requireNonNull(callback); + connect(serviceConnection -> serviceConnection.connectBluetoothBrailleDisplay( + bluetoothDevice.getAddress(), new IBrailleDisplayControllerWrapper()), + callbackExecutor, callback); + } + + @Override + public void connect(@NonNull UsbDevice usbDevice, + @NonNull BrailleDisplayCallback callback) { + connect(usbDevice, mAccessibilityService.getMainExecutor(), callback); + } + + @Override + public void connect(@NonNull UsbDevice usbDevice, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull BrailleDisplayCallback callback) { + Objects.requireNonNull(usbDevice); + Objects.requireNonNull(callbackExecutor); + Objects.requireNonNull(callback); + connect(serviceConnection -> serviceConnection.connectUsbBrailleDisplay( + usbDevice, new IBrailleDisplayControllerWrapper()), + callbackExecutor, callback); + } + + /** + * Shared implementation for the {@code connect()} API methods. + * + * <p>Performs a blocking call to system_server to create the connection. Success is + * returned through {@link BrailleDisplayCallback#onConnected} while normal connection + * errors are returned through {@link BrailleDisplayCallback#onConnectionFailed}. This + * connection is implemented using cached data from the HIDRAW driver so it returns + * quickly without needing to perform any I/O with the Braille display. + * + * <p>The AIDL call to system_server is blocking (not posted to a handler thread) so + * that runtime exceptions signaling abnormal connection errors from API misuse + * (e.g. lacking permissions, providing an invalid BluetoothDevice, calling connect + * while already connected) are propagated to the API caller. + */ + private void connect( + FunctionalUtils.RemoteExceptionIgnoringConsumer<IAccessibilityServiceConnection> + createConnection, + @NonNull Executor callbackExecutor, @NonNull BrailleDisplayCallback callback) { + BrailleDisplayController.checkApiFlagIsEnabled(); + if (isConnected()) { + throw new IllegalStateException( + "This service already has a connected Braille display"); + } + final IAccessibilityServiceConnection serviceConnection = + AccessibilityInteractionClient.getConnection( + mAccessibilityService.getConnectionId()); + if (serviceConnection == null) { + throw new IllegalStateException("Accessibility service is not connected"); + } + synchronized (mLock) { + mCallbackExecutor = callbackExecutor; + mCallback = callback; + } + try { + createConnection.acceptOrThrow(serviceConnection); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override + public boolean isConnected() { + BrailleDisplayController.checkApiFlagIsEnabled(); + return mBrailleDisplayConnection != null; + } + + @Override + public void write(@NonNull byte[] buffer) throws IOException { + BrailleDisplayController.checkApiFlagIsEnabled(); + Objects.requireNonNull(buffer); + if (buffer.length > IBinder.getSuggestedMaxIpcSizeBytes()) { + // This same check must be performed in the system to prevent reflection misuse, + // but perform it here too to prevent unnecessary IPCs from non-reflection callers. + throw new IllegalArgumentException("Invalid write buffer size " + buffer.length); + } + synchronized (mLock) { + if (mBrailleDisplayConnection == null) { + throw new IOException("Braille display is not connected"); + } + try { + mBrailleDisplayConnection.write(buffer); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + @Override + public void disconnect() { + BrailleDisplayController.checkApiFlagIsEnabled(); + synchronized (mLock) { + try { + if (mBrailleDisplayConnection != null) { + mBrailleDisplayConnection.disconnect(); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } finally { + clearConnectionLocked(); + } + } + } + + /** + * Implementation of the {@code IBrailleDisplayController} AIDL interface provided to + * system_server, which system_server uses to pass messages back to this + * {@code BrailleDisplayController}. + * + * <p>Messages from system_server are routed to the {@link BrailleDisplayCallback} callbacks + * implemented by the accessibility service. + * + * <p>Note: Per API Guidelines 7.5 the Binder identity must be cleared before invoking the + * callback executor so that Binder identity checks in the callbacks are performed using the + * app's identity. + */ + private final class IBrailleDisplayControllerWrapper extends IBrailleDisplayController.Stub { + /** + * Called when the system successfully connects to a Braille display. + */ + @Override + public void onConnected(IBrailleDisplayConnection connection, byte[] hidDescriptor) { + BrailleDisplayController.checkApiFlagIsEnabled(); + final long identity = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + mBrailleDisplayConnection = connection; + mCallbackExecutor.execute(() -> mCallback.onConnected(hidDescriptor)); + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + /** + * Called when the system is unable to connect to a Braille display. + */ + @Override + public void onConnectionFailed(@BrailleDisplayCallback.ErrorCode int errorCode) { + BrailleDisplayController.checkApiFlagIsEnabled(); + final long identity = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + mCallbackExecutor.execute(() -> mCallback.onConnectionFailed(errorCode)); + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + /** + * Called when input is received from the currently connected Braille display. + */ + @Override + public void onInput(byte[] input) { + BrailleDisplayController.checkApiFlagIsEnabled(); + final long identity = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + // Ignore input that arrives after disconnection. + if (mBrailleDisplayConnection != null) { + mCallbackExecutor.execute(() -> mCallback.onInput(input)); + } + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + /** + * Called when the currently connected Braille display is disconnected. + */ + @Override + public void onDisconnected() { + BrailleDisplayController.checkApiFlagIsEnabled(); + final long identity = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + mCallbackExecutor.execute(mCallback::onDisconnected); + clearConnectionLocked(); + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + + private void clearConnectionLocked() { + mBrailleDisplayConnection = null; + } + +} diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 96716dbbaca1..dc5c7f694c58 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -17,10 +17,12 @@ package android.accessibilityservice; import android.accessibilityservice.AccessibilityServiceInfo; +import android.accessibilityservice.IBrailleDisplayController; import android.accessibilityservice.MagnificationConfig; import android.content.pm.ParceledListSlice; import android.graphics.Bitmap; import android.graphics.Region; +import android.hardware.usb.UsbDevice; import android.os.Bundle; import android.os.RemoteCallback; import android.view.MagnificationSpec; @@ -160,4 +162,12 @@ interface IAccessibilityServiceConnection { void attachAccessibilityOverlayToDisplay(int interactionId, int displayId, in SurfaceControl sc, IAccessibilityInteractionConnectionCallback callback); void attachAccessibilityOverlayToWindow(int interactionId, int accessibilityWindowId, in SurfaceControl sc, IAccessibilityInteractionConnectionCallback callback); + + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)") + void connectBluetoothBrailleDisplay(in String bluetoothAddress, in IBrailleDisplayController controller); + + void connectUsbBrailleDisplay(in UsbDevice usbDevice, in IBrailleDisplayController controller); + + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY)") + void setTestBrailleDisplayData(in List<Bundle> brailleDisplays); }
\ No newline at end of file diff --git a/core/java/android/accessibilityservice/IBrailleDisplayConnection.aidl b/core/java/android/accessibilityservice/IBrailleDisplayConnection.aidl new file mode 100644 index 000000000000..ec4d7b17ed01 --- /dev/null +++ b/core/java/android/accessibilityservice/IBrailleDisplayConnection.aidl @@ -0,0 +1,12 @@ +package android.accessibilityservice; + +/** + * Interface given to a BrailleDisplayController to talk to a BrailleDisplayConnection + * in system_server. + * + * @hide + */ +interface IBrailleDisplayConnection { + oneway void disconnect(); + oneway void write(in byte[] output); +}
\ No newline at end of file diff --git a/core/java/android/accessibilityservice/IBrailleDisplayController.aidl b/core/java/android/accessibilityservice/IBrailleDisplayController.aidl new file mode 100644 index 000000000000..7a5d83eeccb5 --- /dev/null +++ b/core/java/android/accessibilityservice/IBrailleDisplayController.aidl @@ -0,0 +1,17 @@ +package android.accessibilityservice; + +import android.accessibilityservice.IBrailleDisplayConnection; + +/** + * Interface given to a BrailleDisplayConnection to talk to a BrailleDisplayController + * in an accessibility service. + * + * IPCs from system_server to apps must be oneway, so designate this entire interface as oneway. + * @hide + */ +oneway interface IBrailleDisplayController { + void onConnected(in IBrailleDisplayConnection connection, in byte[] hidDescriptor); + void onConnectionFailed(int error); + void onInput(in byte[] input); + void onDisconnected(); +}
\ No newline at end of file diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2c00c99cec91..b25d5ebf61a0 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -146,6 +146,8 @@ import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PersistableBundle; import android.os.Process; +import android.os.ProfilingFrameworkInitializer; +import android.os.ProfilingServiceManager; import android.os.RemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; @@ -1232,6 +1234,15 @@ public final class ActivityThread extends ClientTransactionHandler } @Override + public final void scheduleTimeoutServiceForType(IBinder token, int startId, int fgsType) { + if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { + Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, + "scheduleTimeoutServiceForType. token=" + token); + } + sendMessage(H.TIMEOUT_SERVICE_FOR_TYPE, token, startId, fgsType); + } + + @Override public final void bindApplication( String processName, ApplicationInfo appInfo, @@ -2288,6 +2299,8 @@ public final class ActivityThread extends ClientTransactionHandler public static final int INSTRUMENT_WITHOUT_RESTART = 170; public static final int FINISH_INSTRUMENTATION_WITHOUT_RESTART = 171; + public static final int TIMEOUT_SERVICE_FOR_TYPE = 172; + String codeToString(int code) { if (DEBUG_MESSAGES) { switch (code) { @@ -2341,6 +2354,7 @@ public final class ActivityThread extends ClientTransactionHandler case DUMP_RESOURCES: return "DUMP_RESOURCES"; case TIMEOUT_SERVICE: return "TIMEOUT_SERVICE"; case PING: return "PING"; + case TIMEOUT_SERVICE_FOR_TYPE: return "TIMEOUT_SERVICE_FOR_TYPE"; } } return Integer.toString(code); @@ -2427,6 +2441,14 @@ public final class ActivityThread extends ClientTransactionHandler case PING: ((RemoteCallback) msg.obj).sendResult(null); break; + case TIMEOUT_SERVICE_FOR_TYPE: + if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, + "serviceTimeoutForType: " + msg.obj); + } + handleTimeoutServiceForType((IBinder) msg.obj, msg.arg1, msg.arg2); + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); + break; case CONFIGURATION_CHANGED: mConfigurationController.handleConfigurationChanged((Configuration) msg.obj); break; @@ -5136,6 +5158,26 @@ public final class ActivityThread extends ClientTransactionHandler Slog.wtf(TAG, "handleTimeoutService: token=" + token + " not found."); } } + + private void handleTimeoutServiceForType(IBinder token, int startId, int fgsType) { + Service s = mServices.get(token); + if (s != null) { + try { + if (localLOGV) Slog.v(TAG, "Timeout service " + s); + + s.callOnTimeLimitExceeded(startId, fgsType); + } catch (Exception e) { + if (!mInstrumentation.onException(s, e)) { + throw new RuntimeException( + "Unable to call onTimeLimitExceeded on service " + s + ": " + e, e); + } + Slog.i(TAG, "handleTimeoutServiceForType: exception for " + token, e); + } + } else { + Slog.wtf(TAG, "handleTimeoutServiceForType: token=" + token + " not found."); + } + } + /** * Resume the activity. * @param r Target activity record. @@ -8548,6 +8590,9 @@ public final class ActivityThread extends ClientTransactionHandler NfcFrameworkInitializer.setNfcServiceManager(new NfcServiceManager()); DeviceConfigInitializer.setDeviceConfigServiceManager(new DeviceConfigServiceManager()); SeFrameworkInitializer.setSeServiceManager(new SeServiceManager()); + if (android.server.Flags.telemetryApisService()) { + ProfilingFrameworkInitializer.setProfilingServiceManager(new ProfilingServiceManager()); + } } private void purgePendingResources() { diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java index d57a4e583a1a..f6373d690793 100644 --- a/core/java/android/app/AutomaticZenRule.java +++ b/core/java/android/app/AutomaticZenRule.java @@ -487,6 +487,9 @@ public final class AutomaticZenRule implements Parcelable { public void validate() { if (Flags.modesApi()) { checkValidType(mType); + if (mDeviceEffects != null) { + mDeviceEffects.validate(); + } } } diff --git a/core/java/android/app/ComponentCaller.java b/core/java/android/app/ComponentCaller.java index a440dbc48db6..44e8a0a3a20c 100644 --- a/core/java/android/app/ComponentCaller.java +++ b/core/java/android/app/ComponentCaller.java @@ -42,6 +42,9 @@ public final class ComponentCaller { private final IBinder mActivityToken; private final IBinder mCallerToken; + /** + * @hide + */ public ComponentCaller(@NonNull IBinder activityToken, @Nullable IBinder callerToken) { mActivityToken = activityToken; mCallerToken = callerToken; diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index ceeaf5dea7d3..cc0aafde1f5c 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -942,6 +942,8 @@ interface IActivityManager { /** Returns if the service is a short-service is still "alive" and past the timeout. */ boolean shouldServiceTimeOut(in ComponentName className, in IBinder token); + /** Returns if the service has a time-limit restricted type and is past the time limit. */ + boolean hasServiceTimeLimitExceeded(in ComponentName className, in IBinder token); void registerUidFrozenStateChangedCallback(in IUidFrozenStateChangedCallback callback); @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)") diff --git a/core/java/android/app/IApplicationThread.aidl b/core/java/android/app/IApplicationThread.aidl index 59e0e9962fac..a04620cafd75 100644 --- a/core/java/android/app/IApplicationThread.aidl +++ b/core/java/android/app/IApplicationThread.aidl @@ -178,5 +178,6 @@ oneway interface IApplicationThread { in TranslationSpec targetSpec, in List<AutofillId> viewIds, in UiTranslationSpec uiTranslationSpec); void scheduleTimeoutService(IBinder token, int startId); + void scheduleTimeoutServiceForType(IBinder token, int startId, int fgsType); void schedulePing(in RemoteCallback pong); } diff --git a/core/java/android/app/ICallNotificationEventCallback.aidl b/core/java/android/app/ICallNotificationEventCallback.aidl new file mode 100644 index 000000000000..ba348294b462 --- /dev/null +++ b/core/java/android/app/ICallNotificationEventCallback.aidl @@ -0,0 +1,29 @@ +/* + * 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 android.app; + +import android.os.UserHandle; + +/** + * Callback to be called when a call notification is posted or removed + * + * @hide + */ +oneway interface ICallNotificationEventCallback { + void onCallNotificationPosted(String packageName, in UserHandle userHandle); + void onCallNotificationRemoved(String packageName, in UserHandle userHandle); +} diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 578105f9f99e..b5e355638ae8 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -24,6 +24,7 @@ import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.NotificationHistory; import android.app.NotificationManager; +import android.app.ICallNotificationEventCallback; import android.content.AttributionSource; import android.content.ComponentName; import android.content.Intent; @@ -247,4 +248,10 @@ interface INotificationManager @EnforcePermission("MANAGE_TOAST_RATE_LIMITING") void setToastRateLimitingEnabled(boolean enable); + + @EnforcePermission(allOf={"INTERACT_ACROSS_USERS", "ACCESS_NOTIFICATIONS"}) + void registerCallNotificationEventListener(String packageName, in UserHandle userHandle, in ICallNotificationEventCallback listener); + @EnforcePermission(allOf={"INTERACT_ACROSS_USERS", "ACCESS_NOTIFICATIONS"}) + void unregisterCallNotificationEventListener(String packageName, in UserHandle userHandle, in ICallNotificationEventCallback listener); + } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index aa9de814b4c5..d6e8ae3e5dff 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3020,6 +3020,43 @@ public class Notification implements Parcelable } /** + * @hide + */ + public String loadHeaderAppName(Context context) { + CharSequence name = null; + // Check if there is a non-empty substitute app name and return that. + if (extras.containsKey(EXTRA_SUBSTITUTE_APP_NAME)) { + name = extras.getString(EXTRA_SUBSTITUTE_APP_NAME); + if (!TextUtils.isEmpty(name)) { + return name.toString(); + } + } + // If not, try getting the app info from extras. + if (context == null) { + return null; + } + final PackageManager pm = context.getPackageManager(); + if (TextUtils.isEmpty(name)) { + if (extras.containsKey(EXTRA_BUILDER_APPLICATION_INFO)) { + final ApplicationInfo info = extras.getParcelable(EXTRA_BUILDER_APPLICATION_INFO, + ApplicationInfo.class); + if (info != null) { + name = pm.getApplicationLabel(info); + } + } + } + // If that's still empty, use the one from the context directly. + if (TextUtils.isEmpty(name)) { + name = pm.getApplicationLabel(context.getApplicationInfo()); + } + // If there's still nothing, ¯\_(ツ)_/¯ + if (TextUtils.isEmpty(name)) { + return null; + } + return name.toString(); + } + + /** * Removes heavyweight parts of the Notification object for archival or for sending to * listeners when the full contents are not necessary. * @hide @@ -5769,34 +5806,7 @@ public class Notification implements Parcelable */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String loadHeaderAppName() { - CharSequence name = null; - final PackageManager pm = mContext.getPackageManager(); - if (mN.extras.containsKey(EXTRA_SUBSTITUTE_APP_NAME)) { - // only system packages which lump together a bunch of unrelated stuff - // may substitute a different name to make the purpose of the - // notification more clear. the correct package label should always - // be accessible via SystemUI. - final String pkg = mContext.getPackageName(); - final String subName = mN.extras.getString(EXTRA_SUBSTITUTE_APP_NAME); - if (PackageManager.PERMISSION_GRANTED == pm.checkPermission( - android.Manifest.permission.SUBSTITUTE_NOTIFICATION_APP_NAME, pkg)) { - name = subName; - } else { - Log.w(TAG, "warning: pkg " - + pkg + " attempting to substitute app name '" + subName - + "' without holding perm " - + android.Manifest.permission.SUBSTITUTE_NOTIFICATION_APP_NAME); - } - } - if (TextUtils.isEmpty(name)) { - name = pm.getApplicationLabel(mContext.getApplicationInfo()); - } - if (TextUtils.isEmpty(name)) { - // still nothing? - return null; - } - - return String.valueOf(name); + return mN.loadHeaderAppName(mContext); } /** diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index 8c886feedd0c..9dfb5b0dedbd 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -16,6 +16,7 @@ package android.app; +import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; @@ -69,6 +70,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.Executor; /** * Class to notify the user of events that happen. This is how you tell @@ -627,6 +629,9 @@ public class NotificationManager { */ public static int MAX_SERVICE_COMPONENT_NAME_LENGTH = 500; + private final Map<CallNotificationEventListener, CallNotificationEventCallbackStub> + mCallNotificationEventCallbacks = new HashMap<>(); + @UnsupportedAppUsage private static INotificationManager sService; @@ -2848,4 +2853,126 @@ public class NotificationManager { default: return defValue; } } + + /** + * Callback to receive updates when a call notification has been posted or removed + * @hide + */ + @SystemApi + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public interface CallNotificationEventListener { + /** + * Called when a call notification was posted by a package this listener + * has registered for. + * @param packageName package name of the app that posted the removed notification + */ + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + void onCallNotificationPosted(@NonNull String packageName, @NonNull UserHandle userHandle); + + /** + * Called when a call notification was removed by a package this listener + * has registered for. + * @param packageName package name of the app that removed notification + */ + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + void onCallNotificationRemoved(@NonNull String packageName, @NonNull UserHandle userHandle); + } + + private static class CallNotificationEventCallbackStub extends + ICallNotificationEventCallback.Stub { + final String mPackageName; + final UserHandle mUserHandle; + final Executor mExecutor; + final CallNotificationEventListener mListener; + + CallNotificationEventCallbackStub(@NonNull String packageName, + @NonNull UserHandle userHandle, @NonNull @CallbackExecutor Executor executor, + @NonNull CallNotificationEventListener listener) { + mPackageName = packageName; + mUserHandle = userHandle; + mExecutor = executor; + mListener = listener; + } + + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + @Override + public void onCallNotificationPosted(String packageName, UserHandle userHandle) { + mExecutor.execute(() -> mListener.onCallNotificationPosted(packageName, userHandle)); + } + + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + @Override + public void onCallNotificationRemoved(String packageName, UserHandle userHandle) { + mExecutor.execute(() -> mListener.onCallNotificationRemoved(packageName, userHandle)); + } + } + + /** + * Register a listener to be notified when a call notification is posted or removed + * for a specific package and user. + * + * @param packageName Which package to monitor + * @param userHandle Which user to monitor + * @param executor Callback will run on this executor + * @param listener Listener to register + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.INTERACT_ACROSS_USERS, + android.Manifest.permission.ACCESS_NOTIFICATIONS}) + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public void registerCallNotificationEventListener(@NonNull String packageName, + @NonNull UserHandle userHandle, @NonNull @CallbackExecutor Executor executor, + @NonNull CallNotificationEventListener listener) { + checkRequired("packageName", packageName); + checkRequired("userHandle", userHandle); + checkRequired("executor", executor); + checkRequired("listener", listener); + INotificationManager service = getService(); + try { + synchronized (mCallNotificationEventCallbacks) { + CallNotificationEventCallbackStub callbackStub = + new CallNotificationEventCallbackStub(packageName, userHandle, + executor, listener); + mCallNotificationEventCallbacks.put(listener, callbackStub); + + service.registerCallNotificationEventListener(packageName, userHandle, + callbackStub); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Unregister a listener that was previously + * registered with {@link #registerCallNotificationEventListener} + * + * @param listener Listener to unregister + * @hide + */ + @SystemApi + @FlaggedApi(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + @RequiresPermission(allOf = { + android.Manifest.permission.INTERACT_ACROSS_USERS, + android.Manifest.permission.ACCESS_NOTIFICATIONS}) + public void unregisterCallNotificationEventListener( + @NonNull CallNotificationEventListener listener) { + checkRequired("listener", listener); + INotificationManager service = getService(); + try { + synchronized (mCallNotificationEventCallbacks) { + CallNotificationEventCallbackStub callbackStub = + mCallNotificationEventCallbacks.remove(listener); + if (callbackStub != null) { + service.unregisterCallNotificationEventListener(callbackStub.mPackageName, + callbackStub.mUserHandle, callbackStub); + } + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index a1554572c7df..d4702998ce3e 100644 --- a/core/java/android/app/Service.java +++ b/core/java/android/app/Service.java @@ -20,6 +20,7 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; import static android.text.TextUtils.formatSimple; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -1161,4 +1162,37 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac */ public void onTimeout(int startId) { } + + /** @hide */ + public final void callOnTimeLimitExceeded(int startId, int fgsType) { + // Note, because all the service callbacks (and other similar callbacks, e.g. activity + // callbacks) are delivered using the main handler, it's possible the service is already + // stopped when before this method is called, so we do a double check here. + if (mToken == null) { + Log.w(TAG, "Service already destroyed, skipping onTimeLimitExceeded()"); + return; + } + try { + if (!mActivityManager.hasServiceTimeLimitExceeded( + new ComponentName(this, mClassName), mToken)) { + Log.w(TAG, "Service no longer relevant, skipping onTimeLimitExceeded()"); + return; + } + } catch (RemoteException ex) { + } + if (Flags.introduceNewServiceOntimeoutCallback()) { + onTimeout(startId, fgsType); + } + } + + /** + * Callback called when a particular foreground service type has timed out. + * + * @param startId the startId passed to {@link #onStartCommand(Intent, int, int)} when + * the service started. + * @param fgsType the foreground service type which caused the timeout. + */ + @FlaggedApi(Flags.FLAG_INTRODUCE_NEW_SERVICE_ONTIMEOUT_CALLBACK) + public void onTimeout(int startId, int fgsType) { + } } diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index ba9c8952892b..08c193f06286 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -186,6 +186,7 @@ import android.os.IncidentManager; import android.os.PerformanceHintManager; import android.os.PermissionEnforcer; import android.os.PowerManager; +import android.os.ProfilingFrameworkInitializer; import android.os.RecoverySystem; import android.os.SecurityStateManager; import android.os.ServiceManager; @@ -250,6 +251,7 @@ import android.view.textservice.TextServicesManager; import android.view.translation.ITranslationManager; import android.view.translation.TranslationManager; import android.view.translation.UiTranslationManager; +import android.webkit.WebViewBootstrapFrameworkInitializer; import com.android.internal.R; import com.android.internal.app.IAppOpsService; @@ -1659,9 +1661,17 @@ public final class SystemServiceRegistry { OnDevicePersonalizationFrameworkInitializer.registerServiceWrappers(); DeviceLockFrameworkInitializer.registerServiceWrappers(); VirtualizationFrameworkInitializer.registerServiceWrappers(); + // This code is executed on zygote during preload, where only read-only + // flags can be used. Do not use mutable flags. if (android.permission.flags.Flags.enhancedConfirmationModeApisEnabled()) { EnhancedConfirmationFrameworkInitializer.registerServiceWrappers(); } + if (android.server.Flags.telemetryApisService()) { + ProfilingFrameworkInitializer.registerServiceWrappers(); + } + if (android.webkit.Flags.updateServiceIpcWrapper()) { + WebViewBootstrapFrameworkInitializer.registerServiceWrappers(); + } } finally { // If any of the above code throws, we're in a pretty bad shape and the process // will likely crash, but we'll reset it just in case there's an exception handler... diff --git a/core/java/android/app/activity_manager.aconfig b/core/java/android/app/activity_manager.aconfig index c0b299b77806..ff23f09f78a5 100644 --- a/core/java/android/app/activity_manager.aconfig +++ b/core/java/android/app/activity_manager.aconfig @@ -27,3 +27,10 @@ flag { description: "API to add OnUidImportanceListener with targetted UIDs" bug: "286258140" } + +flag { + namespace: "backstage_power" + name: "introduce_new_service_ontimeout_callback" + description: "Add a new callback in Service to indicate a FGS has reached its timeout." + bug: "317799821" +} diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 14462b853c02..7d5d5c162271 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -16,8 +16,10 @@ package android.app.admin; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; +import android.app.admin.flags.Flags; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -176,7 +178,18 @@ public final class DeviceAdminInfo implements Parcelable { */ public static final int HEADLESS_DEVICE_OWNER_MODE_AFFILIATED = 1; - @IntDef({HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED, HEADLESS_DEVICE_OWNER_MODE_AFFILIATED}) + /** + * Value for {@link #getHeadlessDeviceOwnerMode} which indicates that this DPC should be + * provisioned into the first secondary user when on a Headless System User Mode device. + * + * <p>This mode only allows a single secondary user on the device blocking the creation of + * additional secondary users. + */ + @FlaggedApi(Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED) + public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; + + @IntDef({HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED, HEADLESS_DEVICE_OWNER_MODE_AFFILIATED, + HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER}) @Retention(RetentionPolicy.SOURCE) private @interface HeadlessDeviceOwnerMode {} @@ -373,6 +386,8 @@ public final class DeviceAdminInfo implements Parcelable { mHeadlessDeviceOwnerMode = HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED; } else if (deviceOwnerModeStringValue.equalsIgnoreCase("affiliated")) { mHeadlessDeviceOwnerMode = HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; + } else if (deviceOwnerModeStringValue.equalsIgnoreCase("single_user")) { + mHeadlessDeviceOwnerMode = HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; } else { throw new XmlPullParserException("headless-system-user mode must be valid"); } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index c8762c69eeca..9d50810425c6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -51,6 +51,7 @@ import static android.Manifest.permission.QUERY_ADMIN_POLICY; import static android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY; import static android.Manifest.permission.SET_TIME; import static android.Manifest.permission.SET_TIME_ZONE; +import static android.app.admin.flags.Flags.FLAG_ESIM_MANAGEMENT_ENABLED; import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled; import static android.content.Intent.LOCAL_FLAG_FROM_SYSTEM; import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1; @@ -84,6 +85,7 @@ import android.app.Activity; import android.app.IServiceConnection; import android.app.KeyguardManager; import android.app.admin.SecurityLog.SecurityEvent; +import android.app.admin.flags.Flags; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledSince; @@ -2863,6 +2865,19 @@ public class DevicePolicyManager { public static final int STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED = 16; /** + * Result code for {@link #checkProvisioningPrecondition}. + * + * <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when provisioning a DPC into the + * {@link DeviceAdminInfo#HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER} mode but only the system + * user exists on the device. + * + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED) + public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; + + /** * Result codes for {@link #checkProvisioningPrecondition} indicating all the provisioning pre * conditions. * @@ -2876,7 +2891,7 @@ public class DevicePolicyManager { STATUS_CANNOT_ADD_MANAGED_PROFILE, STATUS_DEVICE_ADMIN_NOT_SUPPORTED, STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER, STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS, - STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED + STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED, STATUS_HEADLESS_ONLY_SYSTEM_USER }) public @interface ProvisioningPrecondition {} @@ -9178,9 +9193,11 @@ public class DevicePolicyManager { * <p>Calling this after the setup phase of the device owner user has completed is allowed only * if the caller is the {@link Process#SHELL_UID Shell UID}, and there are no additional users * (except when the device runs on headless system user mode, in which case it could have exact - * one extra user, which is the current user - the device owner will be set in the - * {@link UserHandle#SYSTEM system} user and a profile owner will be set in the current user) - * and no accounts. + * one extra user, which is the current user. + * + * <p>On a headless devices, if it is in affiliated mode the device owner will be set in the + * {@link UserHandle#SYSTEM system} user. If the device is in single user mode, the device owner + * will be set in the first secondary user. * * @param who the component name to be registered as device owner. * @param userId ID of the user on which the device owner runs. @@ -11371,7 +11388,9 @@ public class DevicePolicyManager { * @see UserHandle * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the * user could not be created. - * @throws SecurityException if {@code admin} is not a device owner. + * @throws SecurityException if headless device is in + * {@link DeviceAdminInfo#HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER} mode. + * @throws SecurityException if {@code admin} is not a device owner * @throws UserOperationException if the user could not be created and the calling app is * targeting {@link android.os.Build.VERSION_CODES#P} and running on * {@link android.os.Build.VERSION_CODES#P}. @@ -16612,7 +16631,10 @@ public class DevicePolicyManager { * before calling this method. * * <p>Holders of {@link android.Manifest.permission#PROVISION_DEMO_DEVICE} can call this API - * only if {@link FullyManagedDeviceProvisioningParams#isDemoDevice()} is {@code true}.</p> + * only if {@link FullyManagedDeviceProvisioningParams#isDemoDevice()} is {@code true}. + * + * <p>If headless device is in {@link DeviceAdminInfo#HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER} + * mode then it sets the device owner on the first secondary user.</p> * * @param provisioningParams Params required to provision a fully managed device, * see {@link FullyManagedDeviceProvisioningParams}. @@ -17279,4 +17301,33 @@ public class DevicePolicyManager { public boolean isOnboardingBugreportV2FlagEnabled() { return onboardingBugreportV2Enabled(); } + + /** + * Returns the subscription ids of all subscriptions which was downloaded by the calling + * admin. + * + * <p> This returns only the subscriptions which were downloaded by the calling admin via + * {@link android.telephony.euicc.EuiccManager#downloadSubscription}. + * If a susbcription is returned by this method then in it subject to management controls + * and cannot be removed by users. + * + * <p> Callable by device owners and profile owners. + * + * @throws SecurityException if the caller is not authorized to call this method + * @return ids of all managed subscriptions currently downloaded by an admin on the device + */ + @FlaggedApi(FLAG_ESIM_MANAGEMENT_ENABLED) + @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS) + @NonNull + public Set<Integer> getSubscriptionsIds() { + throwIfParentInstance("getSubscriptionsIds"); + if (mService != null) { + try { + return intArrayToSet(mService.getSubscriptionIds(mContext.getPackageName())); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return new HashSet<>(); + } }
\ No newline at end of file diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index efcf5633515d..f72fdc069db5 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -613,4 +613,6 @@ interface IDevicePolicyManager { void setContentProtectionPolicy(in ComponentName who, String callerPackageName, int policy); int getContentProtectionPolicy(in ComponentName who, String callerPackageName); + + int[] getSubscriptionIds(String callerPackageName); } diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 6cc8af8c4b51..30cd1b72fd49 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -36,6 +36,48 @@ flag { } flag { + name: "dedicated_device_control_api_enabled" + namespace: "enterprise" + description: "(API) Allow the device management role holder to control which platform features are available on dedicated devices." + bug: "281964214" +} + +flag { + name: "permission_migration_for_zero_trust_api_enabled" + namespace: "enterprise" + description: "(API) Migrate existing APIs to permission based, and enable DMRH to call them to collect Zero Trust signals." + bug: "289520697" +} + +flag { + name: "permission_migration_for_zero_trust_impl_enabled" + namespace: "enterprise" + description: "(Implementation) Migrate existing APIs to permission based, and enable DMRH to call them to collect Zero Trust signals." + bug: "289520697" +} + +flag { + name: "device_theft_api_enabled" + namespace: "enterprise" + description: "Add new API for theft detection." + bug: "325073410" +} + +flag { + name: "device_theft_impl_enabled" + namespace: "enterprise" + description: "Implementing new API for theft detection." + bug: "325073410" +} + +flag { + name: "coexistence_migration_for_non_emm_management_enabled" + namespace: "enterprise" + description: "Migrate existing APIs to be coexistable, and enable DMRH to call them to support non-EMM device management." + bug: "289520697" +} + +flag { name: "security_log_v2_enabled" namespace: "enterprise" description: "Improve access to security logging in the context of Zero Trust." @@ -57,6 +99,13 @@ flag { } flag { + name: "assist_content_user_restriction_enabled" + namespace: "enterprise" + description: "Prevent work data leakage by sending assist content to privileged apps." + bug: "322975406" +} + +flag { name: "default_sms_personal_app_suspension_fix_enabled" namespace: "enterprise" description: "Exempt the default sms app of the context user for suspension when calling setPersonalAppsSuspended" @@ -76,3 +125,10 @@ flag { description: "Enable APIs to provision and manage eSIMs" bug: "295301164" } + +flag { + name: "headless_device_owner_single_user_enabled" + namespace: "enterprise" + description: "Add Headless DO support." + bug: "289515470" +} diff --git a/core/java/android/app/prediction/AppPredictor.java b/core/java/android/app/prediction/AppPredictor.java index d628b7f92c6c..0c1a28a9eee1 100644 --- a/core/java/android/app/prediction/AppPredictor.java +++ b/core/java/android/app/prediction/AppPredictor.java @@ -16,6 +16,7 @@ package android.app.prediction; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -24,9 +25,12 @@ import android.app.prediction.IPredictionCallback.Stub; import android.content.Context; import android.content.pm.ParceledListSlice; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; +import android.service.appprediction.flags.Flags; import android.util.ArrayMap; import android.util.Log; @@ -263,6 +267,34 @@ public final class AppPredictor { } /** + * Requests a Bundle which includes service features info or {@code null} if the service is not + * available. + * + * @param callbackExecutor The callback executor to use when calling the callback. It cannot be + * null. + * @param callback The callback to return the Bundle which includes service features info. It + * cannot be null. + * + * @throws IllegalStateException If this AppPredictor has already been destroyed. + * @throws RuntimeException If there is a failure communicating with the remote service. + */ + @FlaggedApi(Flags.FLAG_SERVICE_FEATURES_API) + public void requestServiceFeatures(@NonNull Executor callbackExecutor, + @NonNull Consumer<Bundle> callback) { + if (mIsClosed.get()) { + throw new IllegalStateException("This client has already been destroyed."); + } + + try { + mPredictionManager.requestServiceFeatures(mSessionId, + new RemoteCallbackWrapper(callbackExecutor, callback)); + } catch (RemoteException e) { + Log.e(TAG, "Failed to request service feature info", e); + e.rethrowAsRuntimeException(); + } + } + + /** * Destroys the client and unregisters the callback. Any method on this class after this call * with throw {@link IllegalStateException}. */ @@ -347,6 +379,28 @@ public final class AppPredictor { } } + static class RemoteCallbackWrapper extends IRemoteCallback.Stub { + + private final Consumer<Bundle> mCallback; + private final Executor mExecutor; + + RemoteCallbackWrapper(@NonNull Executor callbackExecutor, + @NonNull Consumer<Bundle> callback) { + mExecutor = callbackExecutor; + mCallback = callback; + } + + @Override + public void sendResult(Bundle result) { + final long identity = Binder.clearCallingIdentity(); + try { + mExecutor.execute(() -> mCallback.accept(result)); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + private static class Token { static final IBinder sBinder = new Binder(TAG); } diff --git a/core/java/android/app/prediction/IPredictionManager.aidl b/core/java/android/app/prediction/IPredictionManager.aidl index 863fc6f952dd..94b4f5b2f30e 100644 --- a/core/java/android/app/prediction/IPredictionManager.aidl +++ b/core/java/android/app/prediction/IPredictionManager.aidl @@ -22,6 +22,7 @@ import android.app.prediction.AppPredictionContext; import android.app.prediction.AppPredictionSessionId; import android.app.prediction.IPredictionCallback; import android.content.pm.ParceledListSlice; +import android.os.IRemoteCallback; /** * @hide @@ -48,4 +49,6 @@ interface IPredictionManager { void requestPredictionUpdate(in AppPredictionSessionId sessionId); void onDestroyPredictionSession(in AppPredictionSessionId sessionId); + + void requestServiceFeatures(in AppPredictionSessionId sessionId, in IRemoteCallback callback); } diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index a16e94a534a9..3304475df89f 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -26,6 +26,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; @@ -333,6 +334,8 @@ public final class VirtualDeviceManager { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public @VirtualDeviceParams.DevicePolicy int getDevicePolicy( int deviceId, @VirtualDeviceParams.PolicyType int policyType) { if (mService == null) { @@ -351,6 +354,8 @@ public final class VirtualDeviceManager { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getDeviceIdForDisplayId(int displayId) { if (mService == null) { Log.w(TAG, "Failed to retrieve virtual devices; no virtual device manager service."); @@ -446,6 +451,8 @@ public final class VirtualDeviceManager { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getAudioPlaybackSessionId(int deviceId) { if (mService == null) { return AUDIO_SESSION_ID_GENERATE; @@ -470,6 +477,8 @@ public final class VirtualDeviceManager { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getAudioRecordingSessionId(int deviceId) { if (mService == null) { return AUDIO_SESSION_ID_GENERATE; @@ -491,6 +500,8 @@ public final class VirtualDeviceManager { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public void playSoundEffect(int deviceId, @AudioManager.SystemSoundEffect int effectType) { if (mService == null) { Log.w(TAG, "Failed to dispatch sound effect; no virtual device manager service."); diff --git a/core/java/android/companion/virtual/camera/VirtualCamera.java b/core/java/android/companion/virtual/camera/VirtualCamera.java index 9d6c14b5b9a8..f7275894961c 100644 --- a/core/java/android/companion/virtual/camera/VirtualCamera.java +++ b/core/java/android/companion/virtual/camera/VirtualCamera.java @@ -18,7 +18,9 @@ package android.companion.virtual.camera; import android.annotation.FlaggedApi; import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.companion.virtual.IVirtualDevice; import android.companion.virtual.VirtualDeviceManager; import android.companion.virtual.VirtualDeviceParams; @@ -84,6 +86,8 @@ public final class VirtualCamera implements Closeable { * Returns the id of this virtual camera instance. * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi @NonNull public String getId() { return mCameraId; diff --git a/core/java/android/companion/virtual/sensor/VirtualSensor.java b/core/java/android/companion/virtual/sensor/VirtualSensor.java index 14c799763a96..37e494bd8efe 100644 --- a/core/java/android/companion/virtual/sensor/VirtualSensor.java +++ b/core/java/android/companion/virtual/sensor/VirtualSensor.java @@ -18,7 +18,9 @@ package android.companion.virtual.sensor; import android.annotation.NonNull; import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.companion.virtual.IVirtualDevice; import android.hardware.Sensor; import android.os.IBinder; @@ -54,6 +56,15 @@ public final class VirtualSensor implements Parcelable { mToken = token; } + /** + * @hide + */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi + public VirtualSensor(int handle, int type, @NonNull String name) { + this(handle, type, name, /*virtualDevice=*/null, /*token=*/null); + } + private VirtualSensor(Parcel parcel) { mHandle = parcel.readInt(); mType = parcel.readInt(); @@ -67,6 +78,8 @@ public final class VirtualSensor implements Parcelable { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getHandle() { return mHandle; } diff --git a/core/java/android/companion/virtual/sensor/VirtualSensorConfig.java b/core/java/android/companion/virtual/sensor/VirtualSensorConfig.java index 0dbe411a400e..21ad914bbc29 100644 --- a/core/java/android/companion/virtual/sensor/VirtualSensorConfig.java +++ b/core/java/android/companion/virtual/sensor/VirtualSensorConfig.java @@ -20,7 +20,9 @@ package android.companion.virtual.sensor; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.hardware.Sensor; import android.hardware.SensorDirectChannel; import android.os.Parcel; @@ -217,6 +219,8 @@ public final class VirtualSensorConfig implements Parcelable { * * @hide */ + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getFlags() { return mFlags; } diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java index 67759f4aa76d..eb357fe09a31 100644 --- a/core/java/android/content/ClipData.java +++ b/core/java/android/content/ClipData.java @@ -21,7 +21,13 @@ import static android.content.ContentResolver.SCHEME_ANDROID_RESOURCE; import static android.content.ContentResolver.SCHEME_CONTENT; import static android.content.ContentResolver.SCHEME_FILE; +import static com.android.window.flags.Flags.FLAG_DELEGATE_UNHANDLED_DRAGS; + +import android.annotation.FlaggedApi; +import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; +import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; import android.content.res.AssetFileDescriptor; @@ -207,6 +213,7 @@ public class ClipData implements Parcelable { final CharSequence mText; final String mHtmlText; final Intent mIntent; + final PendingIntent mPendingIntent; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) Uri mUri; private TextLinks mTextLinks; @@ -214,12 +221,91 @@ public class ClipData implements Parcelable { // if the data is obtained from {@link #copyForTransferWithActivityInfo} private ActivityInfo mActivityInfo; + /** + * A builder for a ClipData Item. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @SuppressLint("PackageLayering") + public static final class Builder { + private CharSequence mText; + private String mHtmlText; + private Intent mIntent; + private PendingIntent mPendingIntent; + private Uri mUri; + + /** + * Sets the text for the item to be constructed. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Builder setText(@Nullable CharSequence text) { + mText = text; + return this; + } + + /** + * Sets the HTML text for the item to be constructed. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Builder setHtmlText(@Nullable String htmlText) { + mHtmlText = htmlText; + return this; + } + + /** + * Sets the Intent for the item to be constructed. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Builder setIntent(@Nullable Intent intent) { + mIntent = intent; + return this; + } + + /** + * Sets the PendingIntent for the item to be constructed. To prevent receiving apps from + * improperly manipulating the intent to launch another activity as this caller, the + * provided PendingIntent must be immutable (see {@link PendingIntent#FLAG_IMMUTABLE}). + * The system will clean up the PendingIntent when it is no longer used. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Builder setPendingIntent(@Nullable PendingIntent pendingIntent) { + if (pendingIntent != null && !pendingIntent.isImmutable()) { + throw new IllegalArgumentException("Expected pending intent to be immutable"); + } + mPendingIntent = pendingIntent; + return this; + } + + /** + * Sets the URI for the item to be constructed. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Builder setUri(@Nullable Uri uri) { + mUri = uri; + return this; + } + + /** + * Constructs a new Item with the properties set on this builder. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @NonNull + public Item build() { + return new Item(mText, mHtmlText, mIntent, mPendingIntent, mUri); + } + } + /** @hide */ public Item(Item other) { mText = other.mText; mHtmlText = other.mHtmlText; mIntent = other.mIntent; + mPendingIntent = other.mPendingIntent; mUri = other.mUri; mActivityInfo = other.mActivityInfo; mTextLinks = other.mTextLinks; @@ -229,10 +315,7 @@ public class ClipData implements Parcelable { * Create an Item consisting of a single block of (possibly styled) text. */ public Item(CharSequence text) { - mText = text; - mHtmlText = null; - mIntent = null; - mUri = null; + this(text, null, null, null, null); } /** @@ -245,30 +328,21 @@ public class ClipData implements Parcelable { * </p> */ public Item(CharSequence text, String htmlText) { - mText = text; - mHtmlText = htmlText; - mIntent = null; - mUri = null; + this(text, htmlText, null, null, null); } /** * Create an Item consisting of an arbitrary Intent. */ public Item(Intent intent) { - mText = null; - mHtmlText = null; - mIntent = intent; - mUri = null; + this(null, null, intent, null, null); } /** * Create an Item consisting of an arbitrary URI. */ public Item(Uri uri) { - mText = null; - mHtmlText = null; - mIntent = null; - mUri = uri; + this(null, null, null, null, uri); } /** @@ -276,10 +350,7 @@ public class ClipData implements Parcelable { * text, Intent, and/or URI. */ public Item(CharSequence text, Intent intent, Uri uri) { - mText = text; - mHtmlText = null; - mIntent = intent; - mUri = uri; + this(text, null, intent, null, uri); } /** @@ -289,6 +360,14 @@ public class ClipData implements Parcelable { * will not be done from HTML formatted text into plain text. */ public Item(CharSequence text, String htmlText, Intent intent, Uri uri) { + this(text, htmlText, intent, null, uri); + } + + /** + * Builder ctor. + */ + private Item(CharSequence text, String htmlText, Intent intent, PendingIntent pendingIntent, + Uri uri) { if (htmlText != null && text == null) { throw new IllegalArgumentException( "Plain text must be supplied if HTML text is supplied"); @@ -296,6 +375,7 @@ public class ClipData implements Parcelable { mText = text; mHtmlText = htmlText; mIntent = intent; + mPendingIntent = pendingIntent; mUri = uri; } @@ -321,6 +401,15 @@ public class ClipData implements Parcelable { } /** + * Returns the pending intent in this Item. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + @Nullable + public PendingIntent getPendingIntent() { + return mPendingIntent; + } + + /** * Retrieve the raw URI contained in this Item. */ public Uri getUri() { @@ -777,7 +866,7 @@ public class ClipData implements Parcelable { throw new NullPointerException("item is null"); } mIcon = null; - mItems = new ArrayList<Item>(); + mItems = new ArrayList<>(); mItems.add(item); mClipDescription.setIsStyledText(isStyledText()); } @@ -794,7 +883,7 @@ public class ClipData implements Parcelable { throw new NullPointerException("item is null"); } mIcon = null; - mItems = new ArrayList<Item>(); + mItems = new ArrayList<>(); mItems.add(item); mClipDescription.setIsStyledText(isStyledText()); } @@ -826,7 +915,7 @@ public class ClipData implements Parcelable { public ClipData(ClipData other) { mClipDescription = other.mClipDescription; mIcon = other.mIcon; - mItems = new ArrayList<Item>(other.mItems); + mItems = new ArrayList<>(other.mItems); } /** @@ -1042,6 +1131,35 @@ public class ClipData implements Parcelable { } /** + * Checks if this clip data has a pending intent that is an activity type. + * @hide + */ + public boolean hasActivityPendingIntents() { + final int size = mItems.size(); + for (int i = 0; i < size; i++) { + final Item item = mItems.get(i); + if (item.mPendingIntent != null && item.mPendingIntent.isActivity()) { + return true; + } + } + return false; + } + + /** + * Cleans up all pending intents in the ClipData. + * @hide + */ + public void cleanUpPendingIntents() { + final int size = mItems.size(); + for (int i = 0; i < size; i++) { + final Item item = mItems.get(i); + if (item.mPendingIntent != null) { + item.mPendingIntent.cancel(); + } + } + } + + /** * Prepare this {@link ClipData} to leave an app process. * * @hide @@ -1243,6 +1361,7 @@ public class ClipData implements Parcelable { TextUtils.writeToParcel(item.mText, dest, flags); dest.writeString8(item.mHtmlText); dest.writeTypedObject(item.mIntent, flags); + dest.writeTypedObject(item.mPendingIntent, flags); dest.writeTypedObject(item.mUri, flags); dest.writeTypedObject(mParcelItemActivityInfos ? item.mActivityInfo : null, flags); dest.writeTypedObject(item.mTextLinks, flags); @@ -1262,10 +1381,11 @@ public class ClipData implements Parcelable { CharSequence text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in); String htmlText = in.readString8(); Intent intent = in.readTypedObject(Intent.CREATOR); + PendingIntent pendingIntent = in.readTypedObject(PendingIntent.CREATOR); Uri uri = in.readTypedObject(Uri.CREATOR); ActivityInfo info = in.readTypedObject(ActivityInfo.CREATOR); TextLinks textLinks = in.readTypedObject(TextLinks.CREATOR); - Item item = new Item(text, htmlText, intent, uri); + Item item = new Item(text, htmlText, intent, pendingIntent, uri); item.setActivityInfo(info); item.setTextLinks(textLinks); mItems.add(item); @@ -1273,7 +1393,7 @@ public class ClipData implements Parcelable { } public static final @android.annotation.NonNull Parcelable.Creator<ClipData> CREATOR = - new Parcelable.Creator<ClipData>() { + new Parcelable.Creator<>() { @Override public ClipData createFromParcel(Parcel source) { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index b8d754348211..9e192a06d404 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -6553,6 +6553,28 @@ public abstract class Context { public static final String CONTACT_KEYS_SERVICE = "contact_keys"; /** + * Use with {@link #getSystemService(String)} to retrieve an + * {@link android.os.ProfilingManager}. + * + * @see #getSystemService(String) + */ + @FlaggedApi(android.os.Flags.FLAG_TELEMETRY_APIS_FRAMEWORK_INITIALIZATION) + public static final String PROFILING_SERVICE = "profiling"; + + /** + * Use with {@link #getSystemService(String)} to retrieve a {@link + * android.webkit.WebViewUpdateManager} for accessing the WebView update service. + * + * @see #getSystemService(String) + * @see android.webkit.WebViewUpdateManager + * @hide + */ + @FlaggedApi(android.webkit.Flags.FLAG_UPDATE_SERVICE_IPC_WRAPPER) + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SuppressLint("ServiceName") + public static final String WEBVIEW_UPDATE_SERVICE = "webviewupdate"; + + /** * Determine whether the given permission is allowed for a particular * process and user ID running in the system. * @@ -7706,9 +7728,13 @@ public abstract class Context { } /** + * Updates the display association of this Context with the display with the given ID. + * * @hide */ @SuppressWarnings("HiddenAbstractMethod") + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public abstract void updateDisplay(int displayId); /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 08871d4644c0..e8031a374310 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -19,6 +19,7 @@ package android.content; import static android.app.sdksandbox.SdkSandboxManager.ACTION_START_SANDBOXED_ACTIVITY; import static android.content.ContentProvider.maybeAddUserId; import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE; +import static android.service.chooser.Flags.FLAG_ENABLE_SHARESHEET_METADATA_EXTRA; import android.Manifest; import android.accessibilityservice.AccessibilityService; @@ -55,6 +56,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.BundleMerger; +import android.os.CancellationSignal; import android.os.IBinder; import android.os.IncidentManager; import android.os.Parcel; @@ -72,7 +74,9 @@ import android.provider.DocumentsContract; import android.provider.DocumentsProvider; import android.provider.MediaStore; import android.provider.OpenableColumns; +import android.service.chooser.AdditionalContentContract; import android.service.chooser.ChooserAction; +import android.service.chooser.ChooserResult; import android.telecom.PhoneAccount; import android.telecom.TelecomManager; import android.text.TextUtils; @@ -1059,7 +1063,7 @@ public class Intent implements Parcelable, Cloneable { } if (sender != null) { - intent.putExtra(EXTRA_CHOSEN_COMPONENT_INTENT_SENDER, sender); + intent.putExtra(EXTRA_CHOOSER_RESULT_INTENT_SENDER, sender); } // Migrate any clip data and flags from target. @@ -6064,6 +6068,62 @@ public class Intent implements Parcelable, Cloneable { public static final int CHOOSER_CONTENT_TYPE_ALBUM = 1; /** + * Optional argument used to provide a {@link ContentProvider} {@link Uri} to an + * {@link #ACTION_CHOOSER} Intent which allows additional toggleable items to be included + * in the sharing UI. + * <p> + * For example, this could be used to show photos being shared in the context of the user's + * entire photo roll, with the option to change the set of photos being shared. + * <p> + * When this is provided in an {@link #ACTION_CHOOSER} Intent with an {@link #ACTION_SEND} or + * {@link #ACTION_SEND_MULTIPLE} target Intent, the sharesheet will query (see + * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}) this URI to + * retrieve a set of additional items available for selection. The set of items returned by the + * content provider is expected to contain all the items from the {@link #EXTRA_STREAM} + * argument, in their relative order, which will be marked as selected. The URI's authority + * must be different from any shared items URI provided in {@link #EXTRA_STREAM} or returned by + * the provider. + * + * <p>The {@link Bundle} argument of the + * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)} + * method will contains the original intent Chooser has been launched with under the + * {@link #EXTRA_INTENT} key as a context for the current sharing session. The returned + * {@link android.database.Cursor} should contain + * {@link android.service.chooser.AdditionalContentContract.Columns#URI} column for the item URI + * and, optionally, {@link AdditionalContentContract.CursorExtraKeys#POSITION} extra that + * specifies the cursor starting position; the item at this position is expected to match the + * item specified by {@link #EXTRA_CHOOSER_FOCUSED_ITEM_POSITION}.</p> + * + * <p>When the user makes a selection change, + * {@link ContentProvider#call(String, String, Bundle)} method will be invoked with the "method" + * argument set to + * {@link android.service.chooser.AdditionalContentContract.MethodNames#ON_SELECTION_CHANGED}, + * the "arg" argument set to this argument's value, and the "extras" {@link Bundle} argument + * containing {@link #EXTRA_INTENT} key containing the original intent Chooser has been launched + * with but with the modified target intent --Chooser will modify the target intent according to + * the selection changes made by the user. + * Applications may implement this method to change any of the following Chooser arguments by + * returning new values in the result bundle: + * {@link #EXTRA_CHOOSER_TARGETS}, {@link #EXTRA_ALTERNATE_INTENTS}, + * {@link #EXTRA_CHOOSER_CUSTOM_ACTIONS}, + * {@link #EXTRA_CHOOSER_MODIFY_SHARE_ACTION}, + * {@link #EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER}.</p> + */ + @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING) + public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = + "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI"; + + /** + * Optional argument to be used with {@link #EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI}, used in + * combination with {@link #EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI}. + * An integer, zero-based index into {@link #EXTRA_STREAM} argument indicating the item that + * should be focused by the Chooser in preview. + */ + @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING) + public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = + "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION"; + + /** * An {@code ArrayList} of {@code String} annotations describing content for * {@link #ACTION_CHOOSER}. * @@ -6156,6 +6216,17 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS"; /** + * A CharSequence of additional text describing the content being shared. This text will be + * displayed to the user as a part of the sharesheet when included in an + * {@link #ACTION_CHOOSER} {@link Intent}. + * + * <p>e.g. When sharing a photo, metadata could inform the user that location data is included + * in the photo they are sharing.</p> + */ + @FlaggedApi(FLAG_ENABLE_SHARESHEET_METADATA_EXTRA) + public static final String EXTRA_METADATA_TEXT = "android.intent.extra.METADATA_TEXT"; + + /** * A {@link IntentSender} to start after instant app installation success. * @hide */ @@ -6296,6 +6367,25 @@ public class Intent implements Parcelable, Cloneable { "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER"; /** + * An {@link IntentSender} that will be notified when a user successfully chooses a target + * component or initiates an action such as copy or edit within an {@link #ACTION_CHOOSER} + * activity. The IntentSender will have the extra {@link #EXTRA_CHOOSER_RESULT} describing + * the result. + */ + @FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT) + public static final String EXTRA_CHOOSER_RESULT_INTENT_SENDER = + "android.intent.extra.CHOOSER_RESULT_INTENT_SENDER"; + + /** + * A {@link ChooserResult} which describes how the sharing session completed. + * <p> + * An instance is supplied to the optional IntentSender provided to + * {@link #createChooser(Intent, CharSequence, IntentSender)} when the session completes. + */ + @FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT) + public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT"; + + /** * The {@link ComponentName} chosen by the user to complete an action. * * @see #EXTRA_CHOSEN_COMPONENT_INTENT_SENDER diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 79af65a3a3e5..e2907224d66e 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -559,6 +559,10 @@ public class IntentFilter implements Parcelable { sb.append(" sch="); sb.append(mDataSchemes.toString()); } + if (Flags.relativeReferenceIntentFilters() && countUriRelativeFilterGroups() > 0) { + sb.append(" grp="); + sb.append(mUriRelativeFilterGroups.toString()); + } sb.append(" }"); return sb.toString(); } @@ -673,7 +677,7 @@ public class IntentFilter implements Parcelable { * has at least one HTTP or HTTPS data URI pattern defined, and optionally * does not define any non-http/https data URI patterns. * - * This will check if if the Intent action is {@link android.content.Intent#ACTION_VIEW} and + * This will check if the Intent action is {@link android.content.Intent#ACTION_VIEW} and * the Intent category is {@link android.content.Intent#CATEGORY_BROWSABLE} and the Intent * data scheme is "http" or "https". * @@ -714,7 +718,7 @@ public class IntentFilter implements Parcelable { } // We get here if: - // 1) onlyWebSchemes and no non-web schemes were found, i.e success; or + // 1) onlyWebSchemes and no non-web schemes were found, i.e. success; or // 2) !onlyWebSchemes and no http/https schemes were found, i.e. failure. return onlyWebSchemes; } @@ -724,7 +728,7 @@ public class IntentFilter implements Parcelable { * * @return True if the filter needs to be automatically verified. False otherwise. * - * This will check if if the Intent action is {@link android.content.Intent#ACTION_VIEW} and + * This will check if the Intent action is {@link android.content.Intent#ACTION_VIEW} and * the Intent category is {@link android.content.Intent#CATEGORY_BROWSABLE} and the Intent * data scheme is "http" or "https". * @@ -1807,13 +1811,7 @@ public class IntentFilter implements Parcelable { if (mUriRelativeFilterGroups == null) { return false; } - for (int i = 0; i < mUriRelativeFilterGroups.size(); i++) { - UriRelativeFilterGroup group = mUriRelativeFilterGroups.get(i); - if (group.matchData(data)) { - return group.getAction() == UriRelativeFilterGroup.ACTION_ALLOW; - } - } - return false; + return UriRelativeFilterGroup.matchGroupsToUri(mUriRelativeFilterGroups, data); } /** diff --git a/core/java/android/content/UriRelativeFilter.java b/core/java/android/content/UriRelativeFilter.java index 9866cd0e992a..6d33246ae60d 100644 --- a/core/java/android/content/UriRelativeFilter.java +++ b/core/java/android/content/UriRelativeFilter.java @@ -217,6 +217,15 @@ public final class UriRelativeFilter { + " }"; } + /** @hide */ + public UriRelativeFilterParcel toParcel() { + UriRelativeFilterParcel parcel = new UriRelativeFilterParcel(); + parcel.uriPart = mUriPart; + parcel.patternType = mPatternType; + parcel.filter = mFilter; + return parcel; + } + @Override public boolean equals(@Nullable Object o) { if (this == o) return true; @@ -257,4 +266,11 @@ public final class UriRelativeFilter { mPatternType = Integer.parseInt(parser.getAttributeValue(null, PATTERN_STR)); mFilter = parser.getAttributeValue(null, FILTER_STR); } + + /** @hide */ + public UriRelativeFilter(UriRelativeFilterParcel parcel) { + mUriPart = parcel.uriPart; + mPatternType = parcel.patternType; + mFilter = parcel.filter; + } } diff --git a/core/java/android/content/UriRelativeFilterGroup.aidl b/core/java/android/content/UriRelativeFilterGroup.aidl new file mode 100644 index 000000000000..b251054c967f --- /dev/null +++ b/core/java/android/content/UriRelativeFilterGroup.aidl @@ -0,0 +1,19 @@ +/** + * 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.content; + +parcelable UriRelativeFilterGroup; diff --git a/core/java/android/content/UriRelativeFilterGroup.java b/core/java/android/content/UriRelativeFilterGroup.java index 72c396a73ec8..0e49b4fe427a 100644 --- a/core/java/android/content/UriRelativeFilterGroup.java +++ b/core/java/android/content/UriRelativeFilterGroup.java @@ -19,6 +19,7 @@ package android.content; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.pm.Flags; import android.net.Uri; import android.os.Parcel; @@ -36,9 +37,11 @@ import org.xmlpull.v1.XmlSerializer; import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; +import java.util.List; import java.util.Objects; /** @@ -83,6 +86,40 @@ public final class UriRelativeFilterGroup { private final @Action int mAction; private final ArraySet<UriRelativeFilter> mUriRelativeFilters = new ArraySet<>(); + /** @hide */ + public static boolean matchGroupsToUri(List<UriRelativeFilterGroup> groups, Uri uri) { + for (int i = 0; i < groups.size(); i++) { + if (groups.get(i).matchData(uri)) { + return groups.get(i).getAction() == UriRelativeFilterGroup.ACTION_ALLOW; + } + } + return false; + } + + /** @hide */ + public static List<UriRelativeFilterGroup> parcelsToGroups( + @Nullable List<UriRelativeFilterGroupParcel> parcels) { + List<UriRelativeFilterGroup> groups = new ArrayList<>(); + if (parcels != null) { + for (int i = 0; i < parcels.size(); i++) { + groups.add(new UriRelativeFilterGroup(parcels.get(i))); + } + } + return groups; + } + + /** @hide */ + public static List<UriRelativeFilterGroupParcel> groupsToParcels( + @Nullable List<UriRelativeFilterGroup> groups) { + List<UriRelativeFilterGroupParcel> parcels = new ArrayList<>(); + if (groups != null) { + for (int i = 0; i < groups.size(); i++) { + parcels.add(groups.get(i).toParcel()); + } + } + return parcels; + } + /** * New UriRelativeFilterGroup that matches a Intent data. * @@ -205,6 +242,35 @@ public final class UriRelativeFilterGroup { } } + @Override + public boolean equals(@Nullable Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + @SuppressWarnings("unchecked") + UriRelativeFilterGroup that = (UriRelativeFilterGroup) o; + if (mAction != that.mAction) return false; + return mUriRelativeFilters.equals(that.mUriRelativeFilters); + } + + @Override + public int hashCode() { + int _hash = 0; + _hash = 31 * _hash + mAction; + _hash = 31 * _hash + java.util.Objects.hashCode(mUriRelativeFilters); + return _hash; + } + + /** @hide */ + public UriRelativeFilterGroupParcel toParcel() { + UriRelativeFilterGroupParcel parcel = new UriRelativeFilterGroupParcel(); + parcel.action = mAction; + parcel.filters = new ArrayList<>(); + for (UriRelativeFilter filter : mUriRelativeFilters) { + parcel.filters.add(filter.toParcel()); + } + return parcel; + } + /** @hide */ UriRelativeFilterGroup(@NonNull Parcel src) { mAction = src.readInt(); @@ -213,4 +279,12 @@ public final class UriRelativeFilterGroup { mUriRelativeFilters.add(new UriRelativeFilter(src)); } } + + /** @hide */ + public UriRelativeFilterGroup(UriRelativeFilterGroupParcel parcel) { + mAction = parcel.action; + for (int i = 0; i < parcel.filters.size(); i++) { + mUriRelativeFilters.add(new UriRelativeFilter(parcel.filters.get(i))); + } + } } diff --git a/core/java/android/content/UriRelativeFilterGroupParcel.aidl b/core/java/android/content/UriRelativeFilterGroupParcel.aidl new file mode 100644 index 000000000000..3679e7f13aa3 --- /dev/null +++ b/core/java/android/content/UriRelativeFilterGroupParcel.aidl @@ -0,0 +1,28 @@ +/** + * 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.content; + +import android.content.UriRelativeFilterParcel; + +/** + * Class for holding UriRelativeFilterGroup data. + * @hide + */ +parcelable UriRelativeFilterGroupParcel { + int action; + List<UriRelativeFilterParcel> filters; +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/FakeSceneModule.kt b/core/java/android/content/UriRelativeFilterParcel.aidl index 5d22a6e10a26..4fb196d38714 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/FakeSceneModule.kt +++ b/core/java/android/content/UriRelativeFilterParcel.aidl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.scene -import com.android.systemui.scene.shared.flag.FakeSceneContainerFlagsModule -import com.android.systemui.scene.shared.model.FakeSceneContainerConfigModule -import dagger.Module +package android.content; -@Module(includes = [FakeSceneContainerConfigModule::class, FakeSceneContainerFlagsModule::class]) -object FakeSceneModule +/** + * Class for holding UriRelativeFilter data. + * @hide + */ +parcelable UriRelativeFilterParcel { + int uriPart; + int patternType; + String filter; +} diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS index fb9560889507..c6f52202834b 100644 --- a/core/java/android/content/pm/OWNERS +++ b/core/java/android/content/pm/OWNERS @@ -3,11 +3,22 @@ file:/PACKAGE_MANAGER_OWNERS per-file PackageParser.java = set noparent -per-file PackageParser.java = chiuwinson@google.com,patb@google.com +per-file PackageParser.java = file:/PACKAGE_MANAGER_OWNERS + +# Bug component: 166829 = per-file *Capability* per-file *Capability* = file:/core/java/android/content/pm/SHORTCUT_OWNERS +# Bug component: 166829 = per-file *Shortcut* per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS + +# Bug component: 860423 = per-file *Launcher* per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS + +# Bug component: 578329 = per-file *UserInfo* per-file UserInfo* = file:/MULTIUSER_OWNERS +# Bug component: 578329 = per-file *UserProperties* per-file *UserProperties* = file:/MULTIUSER_OWNERS +# Bug component: 578329 = per-file *multiuser* per-file *multiuser* = file:/MULTIUSER_OWNERS -per-file IBackgroundInstallControlService.aidl = file:/services/core/java/com/android/server/pm/BACKGROUND_INSTALL_OWNERS + +# Bug component: 1219020 = per-file *BackgroundInstallControl* +per-file *BackgroundInstallControl* = file:/services/core/java/com/android/server/pm/BACKGROUND_INSTALL_OWNERS diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 407ffbb7288f..49c8a7cad57a 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -16,6 +16,8 @@ package android.content.pm; +import static android.media.audio.Flags.FLAG_FEATURE_SPATIAL_AUDIO_HEADTRACKING_LOW_LATENCY; + import static com.android.internal.pm.pkg.parsing.ParsingPackageUtils.PARSE_COLLECT_CERTIFICATES; import android.Manifest; @@ -3065,6 +3067,17 @@ public abstract class PackageManager { public static final String FEATURE_AUDIO_PRO = "android.hardware.audio.pro"; /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature} + * which indicates whether head tracking for spatial audio operates with low-latency, + * as defined by the CDD criteria for the feature. + * + */ + @SdkConstant(SdkConstantType.FEATURE) + @FlaggedApi(FLAG_FEATURE_SPATIAL_AUDIO_HEADTRACKING_LOW_LATENCY) + public static final String FEATURE_AUDIO_SPATIAL_HEADTRACKING_LOW_LATENCY = + "android.hardware.audio.spatial.headtracking.low_latency"; + + /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device is capable of communicating with * other devices via Bluetooth. diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index 2b378b1f09d0..5b0cee75e591 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -142,6 +142,28 @@ public class ServiceInfo extends ComponentInfo * the {@link android.R.attr#foregroundServiceType} attribute. * Data(photo, file, account) upload/download, backup/restore, import/export, fetch, * transfer over network between device and cloud. + * + * <p>This type has time limit of 6 hours starting from Android version + * {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}. + * A foreground service of this type must be stopped within the timeout by + * {@link android.app.Service#stopSelf()}, + * {@link android.content.Context#stopService(android.content.Intent)} or their overloads). + * {@link android.app.Service#stopForeground(int)} will also work, which will demote the + * service to a "background" service, which will soon be stopped by the system. + * + * <p>If the service isn't stopped within the timeout, + * {@link android.app.Service#onTimeout(int, int)} will be called. + * + * <p>Also note, even though + * {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC} can be used on + * Android versions prior to {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, since + * {@link android.app.Service#onTimeout(int, int)} did not exist on such versions, it will + * never be called. + * + * Because of this, developers must make sure to stop the foreground service even if + * {@link android.app.Service#onTimeout(int, int)} is not called on such versions. + * + * @see android.app.Service#onTimeout(int, int) */ @RequiresPermission( value = Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, @@ -483,6 +505,27 @@ public class ServiceInfo extends ComponentInfo * Constant corresponding to {@code mediaProcessing} in * the {@link android.R.attr#foregroundServiceType} attribute. * Media processing use cases such as video or photo editing and processing. + * + * This type has time limit of 6 hours. + * A foreground service of this type must be stopped within the timeout by + * {@link android.app.Service#stopSelf()}, + * {@link android.content.Context#stopService(android.content.Intent)} or their overloads). + * {@link android.app.Service#stopForeground(int)} will also work, which will demote the + * service to a "background" service, which will soon be stopped by the system. + * + * <p>If the service isn't stopped within the timeout, + * {@link android.app.Service#onTimeout(int, int)} will be called. + * + * <p>Also note, even though + * {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING} was added in + * Android version {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, it can be also used + * on prior android versions (just like other new foreground service types can be used). + * However, because {@link android.app.Service#onTimeout(int, int)} did not exist on prior + * versions, it will never be called on such versions. + * Because of this, developers must make sure to stop the foreground service even if + * {@link android.app.Service#onTimeout(int, int)} is not called on such versions. + * + * @see android.app.Service#onTimeout(int, int) */ @RequiresPermission( value = Manifest.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig index 4b890faf527e..c7d93bfbb83d 100644 --- a/core/java/android/content/pm/multiuser.aconfig +++ b/core/java/android/content/pm/multiuser.aconfig @@ -135,3 +135,10 @@ flag { description: "Allow the use of a profileApiAvailability user property to exclude HIDDEN profiles in API results" bug: "316362775" } + +flag { + name: "enable_launcher_apps_hidden_profile_checks" + namespace: "profile_experiences" + description: "Enable extra check to limit access to hidden prfiles data in Launcher apps APIs." + bug: "321988638" +} diff --git a/core/java/android/content/pm/overlay/OverlayPaths.java b/core/java/android/content/pm/overlay/OverlayPaths.java index a4db733af013..bd74b0b9293c 100644 --- a/core/java/android/content/pm/overlay/OverlayPaths.java +++ b/core/java/android/content/pm/overlay/OverlayPaths.java @@ -49,6 +49,13 @@ public class OverlayPaths { public static class Builder { final OverlayPaths mPaths = new OverlayPaths(); + public Builder() {} + + public Builder(@NonNull OverlayPaths base) { + mPaths.mResourceDirs.addAll(base.getResourceDirs()); + mPaths.mOverlayPaths.addAll(base.getOverlayPaths()); + } + /** * Adds a non-APK path to the contents of {@link OverlayPaths#getOverlayPaths()}. */ diff --git a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java index 77bd14756637..4dcc51729a61 100644 --- a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java +++ b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java @@ -17,6 +17,7 @@ package android.content.pm.verify.domain; import android.annotation.CheckResult; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -25,15 +26,21 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.content.Context; import android.content.Intent; +import android.content.UriRelativeFilterGroup; +import android.content.UriRelativeFilterGroupParcel; import android.content.pm.PackageManager.NameNotFoundException; +import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceSpecificException; import android.os.UserHandle; +import android.util.ArrayMap; import com.android.internal.util.CollectionUtils; +import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.SortedSet; @@ -156,6 +163,74 @@ public final class DomainVerificationManager { } /** + * Update the URI relative filter groups for a package. All previously existing groups + * will be cleared before the new groups will be applied. + * + * @param packageName The name of the package. + * @param domainToGroupsMap A map of domains to a list of {@link UriRelativeFilterGroup}s that + * should apply to them. Groups for each domain will replace any groups + * provided for that domain in a prior call to this method. Groups will + * be evaluated in the order they are provided. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) + @FlaggedApi(android.content.pm.Flags.FLAG_RELATIVE_REFERENCE_INTENT_FILTERS) + public void setUriRelativeFilterGroups(@NonNull String packageName, + @NonNull Map<String, List<UriRelativeFilterGroup>> domainToGroupsMap) { + Objects.requireNonNull(packageName); + Objects.requireNonNull(domainToGroupsMap); + Bundle bundle = new Bundle(); + for (String domain : domainToGroupsMap.keySet()) { + List<UriRelativeFilterGroup> groups = domainToGroupsMap.get(domain); + bundle.putParcelableList(domain, UriRelativeFilterGroup.groupsToParcels(groups)); + } + try { + mDomainVerificationManager.setUriRelativeFilterGroups(packageName, bundle); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Retrieves a map of a package's verified domains to a list of {@link UriRelativeFilterGroup}s + * that applies to them. + * + * @param packageName The name of the package. + * @param domains List of domains for which to retrieve group matches. + * @return A map of domains to the lists of {@link UriRelativeFilterGroup}s that apply to them. + * @hide + */ + @NonNull + @SystemApi + @FlaggedApi(android.content.pm.Flags.FLAG_RELATIVE_REFERENCE_INTENT_FILTERS) + public Map<String, List<UriRelativeFilterGroup>> getUriRelativeFilterGroups( + @NonNull String packageName, + @NonNull List<String> domains) { + Objects.requireNonNull(packageName); + Objects.requireNonNull(domains); + if (domains.isEmpty()) { + return Collections.emptyMap(); + } + try { + Bundle bundle = mDomainVerificationManager.getUriRelativeFilterGroups(packageName, + domains); + ArrayMap<String, List<UriRelativeFilterGroup>> map = new ArrayMap<>(); + if (!bundle.isEmpty()) { + for (String domain : bundle.keySet()) { + List<UriRelativeFilterGroupParcel> parcels = + bundle.getParcelableArrayList(domain, + UriRelativeFilterGroupParcel.class); + map.put(domain, UriRelativeFilterGroup.parcelsToGroups(parcels)); + } + } + return map; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Used to iterate all {@link DomainVerificationInfo} values to do cleanup or retries. This is * usually a heavy workload and should be done infrequently. * diff --git a/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl index 53205f3ea470..f5af82d36d71 100644 --- a/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl +++ b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl @@ -20,6 +20,8 @@ import android.content.pm.verify.domain.DomainOwner; import android.content.pm.verify.domain.DomainSet; import android.content.pm.verify.domain.DomainVerificationInfo; import android.content.pm.verify.domain.DomainVerificationUserState; +import android.content.UriRelativeFilterGroup; +import android.os.Bundle; import java.util.List; /** @@ -46,4 +48,8 @@ interface IDomainVerificationManager { int setDomainVerificationUserSelection(String domainSetId, in DomainSet domains, boolean enabled, int userId); + + void setUriRelativeFilterGroups(String packageName, in Bundle domainToGroupsBundle); + + Bundle getUriRelativeFilterGroups(String packageName, in List<String> domains); } diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java index bdaf9d789960..d4c58b239c84 100644 --- a/core/java/android/hardware/biometrics/BiometricPrompt.java +++ b/core/java/android/hardware/biometrics/BiometricPrompt.java @@ -200,6 +200,25 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan return this; } + /** + * Optional: Sets logo description text that will be shown on the prompt. + * + * <p> Note that using this method is not recommended in most scenarios because the calling + * application's name will be used by default. Setting the logo description is intended for + * large bundled applications that perform a wide range of functions and need to show + * distinct description for each function. + * + * @param logoDescription The logo description text that will be shown on the prompt. + * @return This builder. + */ + @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT) + @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO) + @NonNull + public BiometricPrompt.Builder setLogoDescription(@NonNull String logoDescription) { + mPromptInfo.setLogoDescription(logoDescription); + return this; + } + /** * Required: Sets the title that will be shown on the prompt. @@ -743,7 +762,20 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan return mPromptInfo.getLogoBitmap(); } - + /** + * Gets the logo description for the prompt, as set by + * {@link Builder#setDescription(CharSequence)}. + * Currently for system applications use only. + * + * @return The logo description of the prompt, or null if the prompt has no logo description + * set. + */ + @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT) + @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO) + @Nullable + public String getLogoDescription() { + return mPromptInfo.getLogoDescription(); + } /** * Gets the title for the prompt, as set by {@link Builder#setTitle(CharSequence)}. diff --git a/core/java/android/hardware/biometrics/PromptInfo.java b/core/java/android/hardware/biometrics/PromptInfo.java index 0f9cadc52608..2236660ee388 100644 --- a/core/java/android/hardware/biometrics/PromptInfo.java +++ b/core/java/android/hardware/biometrics/PromptInfo.java @@ -34,6 +34,7 @@ public class PromptInfo implements Parcelable { @DrawableRes private int mLogoRes = -1; @Nullable private Bitmap mLogoBitmap; + @Nullable private String mLogoDescription; @NonNull private CharSequence mTitle; private boolean mUseDefaultTitle; @Nullable private CharSequence mSubtitle; @@ -62,6 +63,7 @@ public class PromptInfo implements Parcelable { PromptInfo(Parcel in) { mLogoRes = in.readInt(); mLogoBitmap = in.readTypedObject(Bitmap.CREATOR); + mLogoDescription = in.readString(); mTitle = in.readCharSequence(); mUseDefaultTitle = in.readBoolean(); mSubtitle = in.readCharSequence(); @@ -106,6 +108,7 @@ public class PromptInfo implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mLogoRes); dest.writeTypedObject(mLogoBitmap, 0); + dest.writeString(mLogoDescription); dest.writeCharSequence(mTitle); dest.writeBoolean(mUseDefaultTitle); dest.writeCharSequence(mSubtitle); @@ -173,6 +176,8 @@ public class PromptInfo implements Parcelable { return true; } else if (mLogoBitmap != null) { return true; + } else if (mLogoDescription != null) { + return true; } return false; } @@ -189,6 +194,10 @@ public class PromptInfo implements Parcelable { checkOnlyOneLogoSet(); } + public void setLogoDescription(@NonNull String logoDescription) { + mLogoDescription = logoDescription; + } + public void setTitle(CharSequence title) { mTitle = title; } @@ -282,6 +291,10 @@ public class PromptInfo implements Parcelable { return mLogoBitmap; } + public String getLogoDescription() { + return mLogoDescription; + } + public CharSequence getTitle() { return mTitle; } diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 3835c5201946..1d14169f8ade 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -16,10 +16,12 @@ package android.hardware.camera2; +import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.hardware.camera2.params.ExtensionSessionConfiguration; import android.hardware.camera2.params.InputConfiguration; @@ -35,6 +37,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Set; +import java.util.concurrent.Executor; /** * <p>The CameraDevice class is a representation of a single camera connected to an @@ -897,7 +900,7 @@ public abstract class CameraDevice implements AutoCloseable { * supported sizes. * Camera clients that register a Jpeg/R output within a stream combination that doesn't fit * in the mandatory stream table above can call - * {@link CameraManager#isSessionConfigurationWithParametersSupported} to ensure that this particular + * {@link #isSessionConfigurationSupported} to ensure that this particular * configuration is supported.</p> * * <h5>STREAM_USE_CASE capability additional guaranteed configurations</h5> @@ -970,7 +973,7 @@ public abstract class CameraDevice implements AutoCloseable { * * <p>Since the capabilities of camera devices vary greatly, a given camera device may support * target combinations with sizes outside of these guarantees, but this can only be tested for - * by calling {@link CameraManager#isSessionConfigurationWithParametersSupported} or attempting + * by calling {@link #isSessionConfigurationSupported} or attempting * to create a session with such targets.</p> * * <p>Exception on 176x144 (QCIF) resolution: @@ -1395,8 +1398,12 @@ public abstract class CameraDevice implements AutoCloseable { * {@link android.hardware.camera2.params.MandatoryStreamCombination} are better suited for this * purpose.</p> * - * <p>Note that session parameters will be ignored and calls to - * {@link SessionConfiguration#setSessionParameters} are not required.</p> + * <p><b>NOTE:</b> + * For apps targeting {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM} and above, + * this method will ensure session parameters set through calls to + * {@link SessionConfiguration#setSessionParameters} are also supported if the Camera Device + * supports it. For apps targeting {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and + * below, session parameters will be ignored.</p> * * @return {@code true} if the given session configuration is supported by the camera device * {@code false} otherwise. @@ -1406,10 +1413,8 @@ public abstract class CameraDevice implements AutoCloseable { * @throws CameraAccessException if the camera device is no longer connected or has * encountered a fatal error * @throws IllegalStateException if the camera device has been closed - * @deprecated Please use {@link CameraManager#isSessionConfigurationWithParametersSupported} - * to check whether a SessionConfiguration is supported by the device. + * */ - @Deprecated public boolean isSessionConfigurationSupported( @NonNull SessionConfiguration sessionConfig) throws CameraAccessException { throw new UnsupportedOperationException("Subclasses must override this method"); @@ -1627,6 +1632,155 @@ public abstract class CameraDevice implements AutoCloseable { } /** + * CameraDeviceSetup is a limited representation of {@link CameraDevice} that can be used to + * query device specific information which would otherwise need a CameraDevice instance. + * This class can be constructed without calling {@link CameraManager#openCamera} and paying + * the latency cost of CameraDevice creation. Use {@link CameraManager#getCameraDeviceSetup} + * to get an instance of this class. + * + * <p>Can only be instantiated for camera devices for which + * {@link CameraManager#isCameraDeviceSetupSupported} returns true.</p> + * + * @see CameraManager#isCameraDeviceSetupSupported(String) + * @see CameraManager#getCameraDeviceSetup(String) + */ + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public abstract static class CameraDeviceSetup { + /** + * Create a {@link CaptureRequest.Builder} for new capture requests, + * initialized with a template for target use case. + * + * <p>The settings are chosen to be the best options for the specific camera device, + * so it is not recommended to reuse the same request for a different camera device; + * create a builder specific for that device and template and override the + * settings as desired, instead.</p> + * + * <p>Supported if {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} + * is at least {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}. If less or equal to + * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE}, this function throws an + * {@link UnsupportedOperationException}.</p> + * + * @param templateType An enumeration selecting the use case for this request. Not all + * template types are supported on every device. See the documentation + * for each template type for details. + * + * @return a builder for a capture request, initialized with default settings for that + * template, and no output streams + * + * @throws CameraAccessException if the querying the camera device failed or there has been + * a fatal error + * @throws IllegalArgumentException if the templateType is not supported by this device + */ + @NonNull + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public abstract CaptureRequest.Builder createCaptureRequest( + @RequestTemplate int templateType) throws CameraAccessException; + + /** + * Checks whether a particular {@link SessionConfiguration} is supported by the camera + * device. + * + * <p>This method performs a runtime check of a given {@link SessionConfiguration}. The + * result confirms whether or not the {@code SessionConfiguration}, <b>including the + * parameters specified via {@link SessionConfiguration#setSessionParameters}</b>, can + * be used to create a camera capture session using + * {@link CameraDevice#createCaptureSession(SessionConfiguration)}.</p> + * + * <p>This method is supported if the + * {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} + * is at least {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}. If less or equal + * to {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE}, this function throws + * {@link UnsupportedOperationException}.</p> + * + * <p>Although this method is much faster than creating a new capture session, it can still + * take a few milliseconds per call. Applications should therefore not use this method to + * explore the entire space of supported session combinations.</p> + * + * <p>Instead, applications should use this method to query whether combinations of + * certain features are supported. {@link + * CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} provides the list of + * feature combinations the camera device will reliably report.</p> + * + * <p><b>IMPORTANT:</b></p> + * <ul> + * <li>If a feature support can be queried via + * {@link CameraCharacteristics#SCALER_MANDATORY_STREAM_COMBINATIONS} or + * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP}, applications should + * directly use it rather than calling this function as: (1) using + * {@code CameraCharacteristics} is more efficient, and (2) calling this function with on + * non-supported devices will throw a {@link UnsupportedOperationException}. + * + * <li>To minimize latency of {@link SessionConfiguration} creation, applications can + * use deferred surfaces for SurfaceView and SurfaceTexture to avoid waiting for UI + * creation before setting up the camera. For {@link android.media.MediaRecorder} and + * {@link android.media.MediaCodec} uses, applications can use {@code ImageReader} with + * {@link android.hardware.HardwareBuffer#USAGE_VIDEO_ENCODE}. The lightweight nature of + * {@code ImageReader} helps minimize the latency cost. + * </ul> + * + * @return {@code true} if the given session configuration is supported by the camera + * device, {@code false} otherwise. + * + * @throws CameraAccessException if the camera device is no longer connected or has + * encountered a fatal error + * @throws IllegalArgumentException if the session configuration is invalid + * + * @see CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION + * @see SessionConfiguration + * @see android.media.ImageReader + */ + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public abstract boolean isSessionConfigurationSupported( + @NonNull SessionConfiguration config) throws CameraAccessException; + + /** + * Utility function to forward the call to + * {@link CameraManager#openCamera(String, Executor, StateCallback)}. This function simply + * calls {@code CameraManager.openCamera} for the cameraId for which this class was + * constructed. All semantics are consistent with {@code CameraManager.openCamera}. + * + * @param executor The executor which will be used when invoking the callback. + * @param callback The callback which is invoked once the camera is opened + * + * @throws CameraAccessException if the camera is disabled by device policy, + * has been disconnected, or is being used by a higher-priority camera API client. + * + * @throws IllegalArgumentException if cameraId, the callback or the executor was null, + * or the cameraId does not match any currently or previously available + * camera device. + * + * @throws SecurityException if the application does not have permission to + * access the camera + * + * @see CameraManager#openCamera(String, Executor, StateCallback) + */ + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + @RequiresPermission(android.Manifest.permission.CAMERA) + public abstract void openCamera(@NonNull @CallbackExecutor Executor executor, + @NonNull StateCallback callback) throws CameraAccessException; + + /** + * Get the ID of this camera device. + * + * <p>This matches the ID given to {@link CameraManager#getCameraDeviceSetup} to instantiate + * this object.</p> + * + * @return the ID for this camera device + * + * @see CameraManager#getCameraIdList + */ + @NonNull + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public abstract String getId(); + + /** + * To be implemented by camera2 classes only. + * @hide + */ + public CameraDeviceSetup() {} + } + + /** * Set audio restriction mode when this CameraDevice is being used. * * <p>Some camera hardware (e.g. devices with optical image stabilization support) diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java index 7abe821b7013..3b10e0dd516a 100644 --- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java @@ -19,7 +19,9 @@ import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; @@ -40,6 +42,7 @@ import android.os.ConditionVariable; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemProperties; +import android.provider.Settings; import android.util.IntArray; import android.util.Log; import android.util.Pair; @@ -53,6 +56,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -243,16 +247,19 @@ public final class CameraExtensionCharacteristics { private static final String PROXY_SERVICE_NAME = "com.android.cameraextensions.CameraExtensionsProxyService"; + @FlaggedApi(Flags.FLAG_CONCERT_MODE) + private static final int FALLBACK_PACKAGE_NAME = + com.android.internal.R.string.config_extensionFallbackPackageName; + @FlaggedApi(Flags.FLAG_CONCERT_MODE) + private static final int FALLBACK_SERVICE_NAME = + com.android.internal.R.string.config_extensionFallbackServiceName; + // Singleton instance private static final CameraExtensionManagerGlobal GLOBAL_CAMERA_MANAGER = new CameraExtensionManagerGlobal(); private final Object mLock = new Object(); private final int PROXY_SERVICE_DELAY_MS = 2000; - private InitializerFuture mInitFuture = null; - private ServiceConnection mConnection = null; - private int mConnectionCount = 0; - private ICameraExtensionsProxyService mProxy = null; - private boolean mSupportsAdvancedExtensions = false; + private ExtensionConnectionManager mConnectionManager = new ExtensionConnectionManager(); // Singleton, don't allow construction private CameraExtensionManagerGlobal() {} @@ -261,17 +268,17 @@ public final class CameraExtensionCharacteristics { return GLOBAL_CAMERA_MANAGER; } - private void releaseProxyConnectionLocked(Context ctx) { - if (mConnection != null ) { - ctx.unbindService(mConnection); - mConnection = null; - mProxy = null; - mConnectionCount = 0; + private void releaseProxyConnectionLocked(Context ctx, int extension) { + if (mConnectionManager.getConnection(extension) != null) { + ctx.unbindService(mConnectionManager.getConnection(extension)); + mConnectionManager.setConnection(extension, null); + mConnectionManager.setProxy(extension, null); + mConnectionManager.resetConnectionCount(extension); } } - private void connectToProxyLocked(Context ctx) { - if (mConnection == null) { + private void connectToProxyLocked(Context ctx, int extension, boolean useFallback) { + if (mConnectionManager.getConnection(extension) == null) { Intent intent = new Intent(); intent.setClassName(PROXY_PACKAGE_NAME, PROXY_SERVICE_NAME); String vendorProxyPackage = SystemProperties.get( @@ -287,34 +294,55 @@ public final class CameraExtensionCharacteristics { + vendorProxyService); intent.setClassName(vendorProxyPackage, vendorProxyService); } - mInitFuture = new InitializerFuture(); - mConnection = new ServiceConnection() { + + if (Flags.concertMode() && useFallback) { + String packageName = ctx.getResources().getString(FALLBACK_PACKAGE_NAME); + String serviceName = ctx.getResources().getString(FALLBACK_SERVICE_NAME); + + if (!packageName.isEmpty() && !serviceName.isEmpty()) { + Log.v(TAG, + "Choosing the fallback software implementation package: " + + packageName); + Log.v(TAG, + "Choosing the fallback software implementation service: " + + serviceName); + intent.setClassName(packageName, serviceName); + } + } + + InitializerFuture initFuture = new InitializerFuture(); + ServiceConnection connection = new ServiceConnection() { @Override public void onServiceDisconnected(ComponentName component) { - mConnection = null; - mProxy = null; + mConnectionManager.setConnection(extension, null); + mConnectionManager.setProxy(extension, null); } @Override public void onServiceConnected(ComponentName component, IBinder binder) { - mProxy = ICameraExtensionsProxyService.Stub.asInterface(binder); - if (mProxy == null) { + ICameraExtensionsProxyService proxy = + ICameraExtensionsProxyService.Stub.asInterface(binder); + mConnectionManager.setProxy(extension, proxy); + if (mConnectionManager.getProxy(extension) == null) { throw new IllegalStateException("Camera Proxy service is null"); } try { - mSupportsAdvancedExtensions = mProxy.advancedExtensionsSupported(); + mConnectionManager.setAdvancedExtensionsSupported(extension, + mConnectionManager.getProxy(extension) + .advancedExtensionsSupported()); } catch (RemoteException e) { Log.e(TAG, "Remote IPC failed!"); } - mInitFuture.setStatus(true); + initFuture.setStatus(true); } }; ctx.bindService(intent, Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT | Context.BIND_ABOVE_CLIENT | Context.BIND_NOT_VISIBLE, - android.os.AsyncTask.THREAD_POOL_EXECUTOR, mConnection); + android.os.AsyncTask.THREAD_POOL_EXECUTOR, connection); + mConnectionManager.setConnection(extension, connection); try { - mInitFuture.get(PROXY_SERVICE_DELAY_MS, TimeUnit.MILLISECONDS); + initFuture.get(PROXY_SERVICE_DELAY_MS, TimeUnit.MILLISECONDS); } catch (TimeoutException e) { Log.e(TAG, "Timed out while initializing proxy service!"); } @@ -366,64 +394,102 @@ public final class CameraExtensionCharacteristics { } } - public boolean registerClient(Context ctx, IBinder token) { + public boolean registerClientHelper(Context ctx, IBinder token, int extension, + boolean useFallback) { synchronized (mLock) { boolean ret = false; - connectToProxyLocked(ctx); - if (mProxy == null) { + connectToProxyLocked(ctx, extension, useFallback); + if (mConnectionManager.getProxy(extension) == null) { return false; } - mConnectionCount++; + mConnectionManager.incrementConnectionCount(extension); try { - ret = mProxy.registerClient(token); + ret = mConnectionManager.getProxy(extension).registerClient(token); } catch (RemoteException e) { Log.e(TAG, "Failed to initialize extension! Extension service does " + " not respond!"); } if (!ret) { - mConnectionCount--; + mConnectionManager.decrementConnectionCount(extension); } - if (mConnectionCount <= 0) { - releaseProxyConnectionLocked(ctx); + if (mConnectionManager.getConnectionCount(extension) <= 0) { + releaseProxyConnectionLocked(ctx, extension); } return ret; } } - public void unregisterClient(Context ctx, IBinder token) { + @SuppressLint("NonUserGetterCalled") + public boolean registerClient(Context ctx, IBinder token, int extension, + String cameraId, Map<String, CameraMetadataNative> characteristicsMapNative) { + boolean ret = registerClientHelper(ctx, token, extension, false /*useFallback*/); + + if (Flags.concertMode()) { + // Check if user enabled fallback impl + ContentResolver resolver = ctx.getContentResolver(); + int userEnabled = Settings.Secure.getInt(resolver, + Settings.Secure.CAMERA_EXTENSIONS_FALLBACK, 1); + + boolean vendorImpl = true; + if (ret && (mConnectionManager.getProxy(extension) != null) && (userEnabled == 1)) { + // At this point, we are connected to either CameraExtensionsProxyService or + // the vendor extension proxy service. If the vendor does not support the + // extension, unregisterClient and re-register client with the proxy service + // containing the fallback impl + vendorImpl = isExtensionSupported(cameraId, extension, + characteristicsMapNative); + } + + if (!vendorImpl) { + unregisterClient(ctx, token, extension); + ret = registerClientHelper(ctx, token, extension, true /*useFallback*/); + + } + } + + return ret; + } + + public void unregisterClient(Context ctx, IBinder token, int extension) { synchronized (mLock) { - if (mProxy != null) { + if (mConnectionManager.getProxy(extension) != null) { try { - mProxy.unregisterClient(token); + mConnectionManager.getProxy(extension).unregisterClient(token); } catch (RemoteException e) { Log.e(TAG, "Failed to de-initialize extension! Extension service does" + " not respond!"); } finally { - mConnectionCount--; - if (mConnectionCount <= 0) { - releaseProxyConnectionLocked(ctx); + mConnectionManager.decrementConnectionCount(extension); + if (mConnectionManager.getConnectionCount(extension) <= 0) { + releaseProxyConnectionLocked(ctx, extension); } } } } } - public void initializeSession(IInitializeSessionCallback cb) throws RemoteException { + public void initializeSession(IInitializeSessionCallback cb, int extension) + throws RemoteException { synchronized (mLock) { - if (mProxy != null) { - mProxy.initializeSession(cb); + if (mConnectionManager.getProxy(extension) != null + && !mConnectionManager.isSessionInitialized()) { + mConnectionManager.getProxy(extension).initializeSession(cb); + mConnectionManager.setSessionInitialized(true); + } else { + cb.onFailure(); } } } - public void releaseSession() { + public void releaseSession(int extension) { synchronized (mLock) { - if (mProxy != null) { + if (mConnectionManager.getProxy(extension) != null) { try { - mProxy.releaseSession(); + mConnectionManager.getProxy(extension).releaseSession(); + mConnectionManager.setSessionInitialized(false); } catch (RemoteException e) { Log.e(TAG, "Failed to release session! Extension service does" + " not respond!"); @@ -432,77 +498,157 @@ public final class CameraExtensionCharacteristics { } } - public boolean areAdvancedExtensionsSupported() { - return mSupportsAdvancedExtensions; + public boolean areAdvancedExtensionsSupported(int extension) { + return mConnectionManager.areAdvancedExtensionsSupported(extension); } - public IPreviewExtenderImpl initializePreviewExtension(int extensionType) + public IPreviewExtenderImpl initializePreviewExtension(int extension) throws RemoteException { synchronized (mLock) { - if (mProxy != null) { - return mProxy.initializePreviewExtension(extensionType); + if (mConnectionManager.getProxy(extension) != null) { + return mConnectionManager.getProxy(extension) + .initializePreviewExtension(extension); } else { return null; } } } - public IImageCaptureExtenderImpl initializeImageExtension(int extensionType) + public IImageCaptureExtenderImpl initializeImageExtension(int extension) throws RemoteException { synchronized (mLock) { - if (mProxy != null) { - return mProxy.initializeImageExtension(extensionType); + if (mConnectionManager.getProxy(extension) != null) { + return mConnectionManager.getProxy(extension) + .initializeImageExtension(extension); } else { return null; } } } - public IAdvancedExtenderImpl initializeAdvancedExtension(int extensionType) + public IAdvancedExtenderImpl initializeAdvancedExtension(int extension) throws RemoteException { synchronized (mLock) { - if (mProxy != null) { - return mProxy.initializeAdvancedExtension(extensionType); + if (mConnectionManager.getProxy(extension) != null) { + return mConnectionManager.getProxy(extension) + .initializeAdvancedExtension(extension); } else { return null; } } } + + private class ExtensionConnectionManager { + // Maps extension to ExtensionConnection + private Map<Integer, ExtensionConnection> mConnections = new HashMap<>(); + private boolean mSessionInitialized = false; + + public ExtensionConnectionManager() { + IntArray extensionList = new IntArray(EXTENSION_LIST.length); + extensionList.addAll(EXTENSION_LIST); + if (Flags.concertMode()) { + extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY); + } + + for (int extensionType : extensionList.toArray()) { + mConnections.put(extensionType, new ExtensionConnection()); + } + } + + public ICameraExtensionsProxyService getProxy(@Extension int extension) { + return mConnections.get(extension).mProxy; + } + + public ServiceConnection getConnection(@Extension int extension) { + return mConnections.get(extension).mConnection; + } + + public int getConnectionCount(@Extension int extension) { + return mConnections.get(extension).mConnectionCount; + } + + public boolean areAdvancedExtensionsSupported(@Extension int extension) { + return mConnections.get(extension).mSupportsAdvancedExtensions; + } + + public boolean isSessionInitialized() { + return mSessionInitialized; + } + + public void setProxy(@Extension int extension, ICameraExtensionsProxyService proxy) { + mConnections.get(extension).mProxy = proxy; + } + + public void setConnection(@Extension int extension, ServiceConnection connection) { + mConnections.get(extension).mConnection = connection; + } + + public void incrementConnectionCount(@Extension int extension) { + mConnections.get(extension).mConnectionCount++; + } + + public void decrementConnectionCount(@Extension int extension) { + mConnections.get(extension).mConnectionCount--; + } + + public void resetConnectionCount(@Extension int extension) { + mConnections.get(extension).mConnectionCount = 0; + } + + public void setAdvancedExtensionsSupported(@Extension int extension, + boolean advancedExtSupported) { + mConnections.get(extension).mSupportsAdvancedExtensions = advancedExtSupported; + } + + public void setSessionInitialized(boolean initialized) { + mSessionInitialized = initialized; + } + + private class ExtensionConnection { + public ICameraExtensionsProxyService mProxy = null; + public ServiceConnection mConnection = null; + public int mConnectionCount = 0; + public boolean mSupportsAdvancedExtensions = false; + } + } } /** * @hide */ - public static boolean registerClient(Context ctx, IBinder token) { - return CameraExtensionManagerGlobal.get().registerClient(ctx, token); + public static boolean registerClient(Context ctx, IBinder token, int extension, + String cameraId, Map<String, CameraMetadataNative> characteristicsMapNative) { + return CameraExtensionManagerGlobal.get().registerClient(ctx, token, extension, cameraId, + characteristicsMapNative); } /** * @hide */ - public static void unregisterClient(Context ctx, IBinder token) { - CameraExtensionManagerGlobal.get().unregisterClient(ctx, token); + public static void unregisterClient(Context ctx, IBinder token, int extension) { + CameraExtensionManagerGlobal.get().unregisterClient(ctx, token, extension); } /** * @hide */ - public static void initializeSession(IInitializeSessionCallback cb) throws RemoteException { - CameraExtensionManagerGlobal.get().initializeSession(cb); + public static void initializeSession(IInitializeSessionCallback cb, int extension) + throws RemoteException { + CameraExtensionManagerGlobal.get().initializeSession(cb, extension); } /** * @hide */ - public static void releaseSession() { - CameraExtensionManagerGlobal.get().releaseSession(); + public static void releaseSession(int extension) { + CameraExtensionManagerGlobal.get().releaseSession(extension); } /** * @hide */ - public static boolean areAdvancedExtensionsSupported() { - return CameraExtensionManagerGlobal.get().areAdvancedExtensionsSupported(); + public static boolean areAdvancedExtensionsSupported(int extension) { + return CameraExtensionManagerGlobal.get().areAdvancedExtensionsSupported(extension); } /** @@ -510,7 +656,7 @@ public final class CameraExtensionCharacteristics { */ public static boolean isExtensionSupported(String cameraId, int extensionType, Map<String, CameraMetadataNative> characteristicsMap) { - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extensionType)) { try { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extensionType); return extender.isExtensionAvailable(cameraId, characteristicsMap); @@ -600,24 +746,24 @@ public final class CameraExtensionCharacteristics { public @NonNull List<Integer> getSupportedExtensions() { ArrayList<Integer> ret = new ArrayList<>(); final IBinder token = new Binder(TAG + "#getSupportedExtensions:" + mCameraId); - boolean success = registerClient(mContext, token); - if (!success) { - return Collections.unmodifiableList(ret); - } IntArray extensionList = new IntArray(EXTENSION_LIST.length); extensionList.addAll(EXTENSION_LIST); if (Flags.concertMode()) { extensionList.add(EXTENSION_EYES_FREE_VIDEOGRAPHY); } - try { - for (int extensionType : extensionList.toArray()) { - if (isExtensionSupported(mCameraId, extensionType, mCharacteristicsMapNative)) { + + for (int extensionType : extensionList.toArray()) { + try { + boolean success = registerClient(mContext, token, extensionType, mCameraId, + mCharacteristicsMapNative); + if (success && isExtensionSupported(mCameraId, extensionType, + mCharacteristicsMapNative)) { ret.add(extensionType); } + } finally { + unregisterClient(mContext, token, extensionType); } - } finally { - unregisterClient(mContext, token); } return Collections.unmodifiableList(ret); @@ -643,7 +789,8 @@ public final class CameraExtensionCharacteristics { public <T> @Nullable T get(@Extension int extension, @NonNull CameraCharacteristics.Key<T> key) { final IBinder token = new Binder(TAG + "#get:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -653,7 +800,7 @@ public final class CameraExtensionCharacteristics { throw new IllegalArgumentException("Unsupported extension"); } - if (areAdvancedExtensionsSupported() && getKeys(extension).contains(key)) { + if (areAdvancedExtensionsSupported(extension) && getKeys(extension).contains(key)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); CameraMetadataNative metadata = @@ -670,7 +817,7 @@ public final class CameraExtensionCharacteristics { Log.e(TAG, "Failed to query the extension for the specified key! Extension " + "service does not respond!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return null; } @@ -691,7 +838,8 @@ public final class CameraExtensionCharacteristics { public @NonNull Set<CameraCharacteristics.Key> getKeys(@Extension int extension) { final IBinder token = new Binder(TAG + "#getKeys:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -703,7 +851,7 @@ public final class CameraExtensionCharacteristics { throw new IllegalArgumentException("Unsupported extension"); } - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); CameraMetadataNative metadata = @@ -732,7 +880,7 @@ public final class CameraExtensionCharacteristics { Log.e(TAG, "Failed to query the extension for all available keys! Extension " + "service does not respond!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return Collections.unmodifiableSet(ret); } @@ -755,7 +903,8 @@ public final class CameraExtensionCharacteristics { */ public boolean isPostviewAvailable(@Extension int extension) { final IBinder token = new Binder(TAG + "#isPostviewAvailable:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -765,7 +914,7 @@ public final class CameraExtensionCharacteristics { throw new IllegalArgumentException("Unsupported extension"); } - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); return extender.isPostviewAvailable(); @@ -779,7 +928,7 @@ public final class CameraExtensionCharacteristics { Log.e(TAG, "Failed to query the extension for postview availability! Extension " + "service does not respond!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return false; @@ -813,7 +962,8 @@ public final class CameraExtensionCharacteristics { public List<Size> getPostviewSupportedSizes(@Extension int extension, @NonNull Size captureSize, int format) { final IBinder token = new Binder(TAG + "#getPostviewSupportedSizes:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -831,7 +981,7 @@ public final class CameraExtensionCharacteristics { StreamConfigurationMap streamMap = mCharacteristicsMap.get(mCameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { switch(format) { case ImageFormat.YUV_420_888: case ImageFormat.JPEG: @@ -879,7 +1029,7 @@ public final class CameraExtensionCharacteristics { + "service does not respond!"); return Collections.emptyList(); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } } @@ -917,7 +1067,8 @@ public final class CameraExtensionCharacteristics { // ambiguity is resolved in b/169799538. final IBinder token = new Binder(TAG + "#getExtensionSupportedSizes:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -929,7 +1080,7 @@ public final class CameraExtensionCharacteristics { StreamConfigurationMap streamMap = mCharacteristicsMap.get(mCameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); return generateSupportedSizes( @@ -948,7 +1099,7 @@ public final class CameraExtensionCharacteristics { + " not respond!"); return new ArrayList<>(); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } } @@ -978,7 +1129,8 @@ public final class CameraExtensionCharacteristics { List<Size> getExtensionSupportedSizes(@Extension int extension, int format) { try { final IBinder token = new Binder(TAG + "#getExtensionSupportedSizes:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -990,7 +1142,7 @@ public final class CameraExtensionCharacteristics { StreamConfigurationMap streamMap = mCharacteristicsMap.get(mCameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { switch(format) { case ImageFormat.YUV_420_888: case ImageFormat.JPEG: @@ -1035,7 +1187,7 @@ public final class CameraExtensionCharacteristics { } } } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } } catch (RemoteException e) { Log.e(TAG, "Failed to query the extension supported sizes! Extension service does" @@ -1073,7 +1225,8 @@ public final class CameraExtensionCharacteristics { } final IBinder token = new Binder(TAG + "#getEstimatedCaptureLatencyRangeMillis:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -1087,7 +1240,7 @@ public final class CameraExtensionCharacteristics { new android.hardware.camera2.extension.Size(); sz.width = captureOutputSize.getWidth(); sz.height = captureOutputSize.getHeight(); - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); LatencyRange latencyRange = extender.getEstimatedCaptureLatencyRange(mCameraId, @@ -1126,7 +1279,7 @@ public final class CameraExtensionCharacteristics { Log.e(TAG, "Failed to query the extension capture latency! Extension service does" + " not respond!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return null; @@ -1143,7 +1296,8 @@ public final class CameraExtensionCharacteristics { */ public boolean isCaptureProcessProgressAvailable(@Extension int extension) { final IBinder token = new Binder(TAG + "#isCaptureProcessProgressAvailable:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -1153,7 +1307,7 @@ public final class CameraExtensionCharacteristics { throw new IllegalArgumentException("Unsupported extension"); } - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); return extender.isCaptureProcessProgressAvailable(); @@ -1167,7 +1321,7 @@ public final class CameraExtensionCharacteristics { Log.e(TAG, "Failed to query the extension progress callbacks! Extension service does" + " not respond!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return false; @@ -1195,7 +1349,8 @@ public final class CameraExtensionCharacteristics { @NonNull public Set<CaptureRequest.Key> getAvailableCaptureRequestKeys(@Extension int extension) { final IBinder token = new Binder(TAG + "#getAvailableCaptureRequestKeys:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -1208,7 +1363,7 @@ public final class CameraExtensionCharacteristics { } CameraMetadataNative captureRequestMeta = null; - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); captureRequestMeta = extender.getAvailableCaptureRequestKeys(mCameraId); @@ -1250,7 +1405,7 @@ public final class CameraExtensionCharacteristics { } catch (RemoteException e) { throw new IllegalStateException("Failed to query the available capture request keys!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return Collections.unmodifiableSet(ret); @@ -1282,7 +1437,8 @@ public final class CameraExtensionCharacteristics { @NonNull public Set<CaptureResult.Key> getAvailableCaptureResultKeys(@Extension int extension) { final IBinder token = new Binder(TAG + "#getAvailableCaptureResultKeys:" + mCameraId); - boolean success = registerClient(mContext, token); + boolean success = registerClient(mContext, token, extension, mCameraId, + mCharacteristicsMapNative); if (!success) { throw new IllegalArgumentException("Unsupported extensions"); } @@ -1294,7 +1450,7 @@ public final class CameraExtensionCharacteristics { } CameraMetadataNative captureResultMeta = null; - if (areAdvancedExtensionsSupported()) { + if (areAdvancedExtensionsSupported(extension)) { IAdvancedExtenderImpl extender = initializeAdvancedExtension(extension); extender.init(mCameraId, mCharacteristicsMapNative); captureResultMeta = extender.getAvailableCaptureResultKeys(mCameraId); @@ -1336,7 +1492,7 @@ public final class CameraExtensionCharacteristics { } catch (RemoteException e) { throw new IllegalStateException("Failed to query the available capture result keys!"); } finally { - unregisterClient(mContext, token); + unregisterClient(mContext, token, extension); } return Collections.unmodifiableSet(ret); diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index bcce4b65be18..83b68a50d208 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -36,8 +36,9 @@ import android.hardware.CameraIdRemapping; import android.hardware.CameraStatus; import android.hardware.ICameraService; import android.hardware.ICameraServiceListener; -import android.hardware.camera2.CameraDevice.RequestTemplate; +import android.hardware.camera2.CameraDevice.StateCallback; import android.hardware.camera2.impl.CameraDeviceImpl; +import android.hardware.camera2.impl.CameraDeviceSetupImpl; import android.hardware.camera2.impl.CameraInjectionSessionImpl; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.params.ExtensionSessionConfiguration; @@ -45,10 +46,10 @@ import android.hardware.camera2.params.SessionConfiguration; import android.hardware.camera2.params.StreamConfiguration; import android.hardware.camera2.utils.CameraIdAndSessionConfiguration; import android.hardware.camera2.utils.ConcurrentCameraIdCombination; +import android.hardware.camera2.utils.ExceptionUtils; import android.hardware.devicestate.DeviceStateManager; import android.hardware.display.DisplayManager; import android.os.Binder; -import android.os.DeadObjectException; import android.os.Handler; import android.os.HandlerExecutor; import android.os.HandlerThread; @@ -352,71 +353,6 @@ public final class CameraManager { } /** - * Checks whether a particular {@link SessionConfiguration} is supported by a camera device. - * - * <p>This method performs a runtime check of a given {@link SessionConfiguration}. The result - * confirms whether or not the session configuration, including the - * {@link SessionConfiguration#setSessionParameters specified session parameters}, can - * be successfully used to create a camera capture session using - * {@link CameraDevice#createCaptureSession( - * android.hardware.camera2.params.SessionConfiguration)}. - * </p> - * - * <p>Supported if the {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} - * is at least {@code android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM}. If less or equal to - * {@code android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE}, this function throws - * {@code UnsupportedOperationException}.</p> - * - * <p>Although this method is much faster than creating a new capture session, it is not - * trivial cost: the latency is less than 5 milliseconds in most cases. As a result, the - * app should not use this to explore the entire space of supported session combinations.</p> - * - * <p>Instead, the application should use this method to query whether the - * combination of certain features are supported. See {@link - * CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} for the list of feature - * combinations the camera device will reliably report.</p> - * - * <p>IMPORTANT:</p> - * - * <ul> - * - * <li>If a feature support can be queried with {@code CameraCharacteristics}, - * the application must directly use {@code CameraCharacteristics} rather than - * calling this function. The reasons are: (1) using {@code CameraCharacteristics} is more - * efficient, and (2) calling this function with a non-supported feature will throw a {@code - * IllegalArgumentException}.</li> - * - * <li>To minimize latency for {@code SessionConfiguration} creation, the application should - * use deferred surfaces for SurfaceView and SurfaceTexture to avoid delays. Alternatively, - * the application can create {@code ImageReader} with {@code USAGE_COMPOSER_OVERLAY} and - * {@code USAGE_GPU_SAMPLED_IMAGE} usage respectively. For {@code MediaRecorder} and {@code - * MediaCodec}, the application can use {@code ImageReader} with {@code - * USAGE_VIDEO_ENCODE}. The lightweight nature of {@code ImageReader} helps minimize the - * latency cost.</li> - * - * </ul> - * - * - * @return {@code true} if the given session configuration is supported by the camera device - * {@code false} otherwise. - * @throws CameraAccessException if the camera device is no longer connected or has - * encountered a fatal error - * @throws IllegalArgumentException if the session configuration is invalid - * @throws UnsupportedOperationException if the query operation is not supported by the camera - * device - * - * @see CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION - */ - @RequiresPermission(android.Manifest.permission.CAMERA) - @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY) - public boolean isSessionConfigurationWithParametersSupported(@NonNull String cameraId, - @NonNull SessionConfiguration sessionConfig) throws CameraAccessException { - //TODO: b/298033056: restructure the OutputConfiguration API for better usability - return CameraManagerGlobal.get().isSessionConfigurationWithParametersSupported( - cameraId, sessionConfig); - } - - /** * Register a callback to be notified about camera device availability. * * <p>Registering the same callback again will replace the handler with the @@ -643,7 +579,7 @@ public final class CameraManager { ServiceSpecificException sse = new ServiceSpecificException( ICameraService.ERROR_DISCONNECTED, "Camera service is currently unavailable"); - throwAsPublicException(sse); + throw ExceptionUtils.throwAsPublicException(sse); } return multiResolutionStreamConfigurations; @@ -736,7 +672,7 @@ public final class CameraManager { characteristics = new CameraCharacteristics(info); } catch (ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { // Camera service died - act as if the camera was disconnected throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, @@ -785,6 +721,110 @@ public final class CameraManager { } /** + * Returns a {@link CameraDevice.CameraDeviceSetup} object for the given {@code cameraId}, + * which provides limited access to CameraDevice setup and query functionality without + * requiring an {@link #openCamera} call. The {@link CameraDevice} can later be obtained either + * by calling {@link #openCamera}, or {@link CameraDevice.CameraDeviceSetup#openCamera}. + * + * <p>Support for {@link CameraDevice.CameraDeviceSetup} for a given {@code cameraId} must be + * checked with {@link #isCameraDeviceSetupSupported}. If {@code isCameraDeviceSetupSupported} + * returns {@code false} for a {@code cameraId}, this method will throw an + * {@link UnsupportedOperationException}</p> + * + * @param cameraId The unique identifier of the camera device for which + * {@link CameraDevice.CameraDeviceSetup} object must be constructed. This + * identifier must be present in {@link #getCameraIdList()} + * + * @return {@link CameraDevice.CameraDeviceSetup} object corresponding to the provided + * {@code cameraId} + * + * @throws IllegalArgumentException If {@code cameraId} is null, or if {@code cameraId} does not + * match any device in {@link #getCameraIdList()}. + * @throws CameraAccessException if the camera device is not accessible + * @throws UnsupportedOperationException if {@link CameraDevice.CameraDeviceSetup} instance + * cannot be constructed for the given {@code cameraId}, i.e. + * {@link #isCameraDeviceSetupSupported} returns false. + * + * @see CameraDevice.CameraDeviceSetup + * @see #getCameraIdList() + * @see #openCamera + */ + @NonNull + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String cameraId) + throws CameraAccessException { + if (cameraId == null) { + throw new IllegalArgumentException("cameraId was null"); + } + + if (CameraManagerGlobal.sCameraServiceDisabled) { + throw new CameraAccessException(CameraAccessException.CAMERA_DISABLED, + "No cameras available on device"); + } + + if (!Arrays.asList(CameraManagerGlobal.get().getCameraIdList()).contains(cameraId)) { + throw new IllegalArgumentException( + "Camera ID '" + cameraId + "' not available on device."); + } + + if (!isCameraDeviceSetupSupported(cameraId)) { + throw new UnsupportedOperationException( + "CameraDeviceSetup is not supported for Camera ID: " + cameraId); + } + + return new CameraDeviceSetupImpl(cameraId, /*cameraManager=*/ this, + mContext.getApplicationInfo().targetSdkVersion); + } + + /** + * Checks a Camera Device's characteristics to ensure that a + * {@link CameraDevice.CameraDeviceSetup} instance can be constructed for a given + * {@code cameraId}. If this method returns false for a {@code cameraId}, calling + * {@link #getCameraDeviceSetup} for that {@code cameraId} will throw an + * {@link UnsupportedOperationException}. + * + * <p>{@link CameraDevice.CameraDeviceSetup} is supported for all devices that report + * {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} > + * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE}</p> + * + * @param cameraId The unique identifier of the camera device for which + * {@link CameraDevice.CameraDeviceSetup} support is being queried. This + * identifier must be present in {@link #getCameraIdList()}. + * + * @return {@code true} if {@link CameraDevice.CameraDeviceSetup} object can be constructed + * for the provided {@code cameraId}; {@code false} otherwise. + * + * @throws IllegalArgumentException If {@code cameraId} is null, or if {@code cameraId} does not + * match any device in {@link #getCameraIdList()}. + * @throws CameraAccessException if the camera device is not accessible + * + * @see CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION + * @see CameraDevice.CameraDeviceSetup + * @see #getCameraDeviceSetup(String) + * @see #getCameraIdList() + */ + @FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) + public boolean isCameraDeviceSetupSupported(@NonNull String cameraId) + throws CameraAccessException { + if (cameraId == null) { + throw new IllegalArgumentException("Camera ID was null"); + } + + if (CameraManagerGlobal.sCameraServiceDisabled) { + throw new CameraAccessException(CameraAccessException.CAMERA_DISABLED, + "No cameras available on device"); + } + + if (!Arrays.asList(CameraManagerGlobal.get().getCameraIdList()).contains(cameraId)) { + throw new IllegalArgumentException( + "Camera ID '" + cameraId + "' not available on device."); + } + + CameraCharacteristics chars = getCameraCharacteristics(cameraId); + return CameraDeviceSetupImpl.isCameraDeviceSetupSupported(chars); + } + + /** * Helper for opening a connection to a camera with the given ID. * * @param cameraId The unique identifier of the camera device to open @@ -817,6 +857,11 @@ public final class CameraManager { synchronized (mLock) { ICameraDeviceUser cameraUser = null; + CameraDevice.CameraDeviceSetup cameraDeviceSetup = null; + if (Flags.cameraDeviceSetup() && isCameraDeviceSetupSupported(cameraId)) { + cameraDeviceSetup = getCameraDeviceSetup(cameraId); + } + android.hardware.camera2.impl.CameraDeviceImpl deviceImpl = new android.hardware.camera2.impl.CameraDeviceImpl( cameraId, @@ -825,8 +870,7 @@ public final class CameraManager { characteristics, physicalIdsToChars, mContext.getApplicationInfo().targetSdkVersion, - mContext); - + mContext, cameraDeviceSetup); ICameraDeviceCallbacks callbacks = deviceImpl.getCallbacks(); try { @@ -858,11 +902,11 @@ public final class CameraManager { e.errorCode == ICameraService.ERROR_DISCONNECTED || e.errorCode == ICameraService.ERROR_CAMERA_IN_USE) { // Per API docs, these failures call onError and throw - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } } else { // Unexpected failure - rethrow - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } } catch (RemoteException e) { // Camera service died - act as if it's a CAMERA_DISCONNECTED case @@ -870,7 +914,7 @@ public final class CameraManager { ICameraService.ERROR_DISCONNECTED, "Camera service is currently unavailable"); deviceImpl.setRemoteFailure(sse); - throwAsPublicException(sse); + throw ExceptionUtils.throwAsPublicException(sse); } // TODO: factor out callback to be non-nested, then move setter to constructor @@ -1310,48 +1354,6 @@ public final class CameraManager { } /** - * Create a {@link CaptureRequest.Builder} for new capture requests, - * initialized with template for a target use case. - * - * <p>The settings are chosen to be the best options for the specific camera device, - * so it is not recommended to reuse the same request for a different camera device; - * create a builder specific for that device and template and override the - * settings as desired, instead.</p> - * - * <p>Supported if the {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} - * is at least {@code android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM}. If less or equal to - * {@code android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE}, this function throws a - * {@code UnsupportedOperationException}. - * - * @param cameraId The camera ID to create capture request for. - * @param templateType An enumeration selecting the use case for this request. Not all template - * types are supported on every device. See the documentation for each template type for - * details. - * @return a builder for a capture request, initialized with default - * settings for that template, and no output streams - * - * @throws CameraAccessException if the camera device is no longer connected or has - * encountered a fatal error - * @throws IllegalArgumentException if the cameraId is not valid, or the templateType is - * not supported by this device. - * @throws UnsupportedOperationException if this method is not supported by the camera device, - * for example, if {@link CameraCharacteristics#INFO_SESSION_CONFIGURATION_QUERY_VERSION} - * is less than {@code android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM}. - */ - @NonNull - @RequiresPermission(android.Manifest.permission.CAMERA) - @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY) - public CaptureRequest.Builder createCaptureRequest(@NonNull String cameraId, - @RequestTemplate int templateType) throws CameraAccessException { - if (CameraManagerGlobal.sCameraServiceDisabled) { - throw new IllegalArgumentException("No camera available on device."); - } - - return CameraManagerGlobal.get().createCaptureRequest(cameraId, templateType, - mContext.getApplicationInfo().targetSdkVersion); - } - - /** * @hide */ public static boolean shouldOverrideToPortrait(@Nullable Context context) { @@ -1705,56 +1707,6 @@ public final class CameraManager { } /** - * Convert ServiceSpecificExceptions and Binder RemoteExceptions from camera binder interfaces - * into the correct public exceptions. - * - * @hide - */ - public static void throwAsPublicException(Throwable t) throws CameraAccessException { - if (t instanceof ServiceSpecificException) { - ServiceSpecificException e = (ServiceSpecificException) t; - int reason = CameraAccessException.CAMERA_ERROR; - switch(e.errorCode) { - case ICameraService.ERROR_DISCONNECTED: - reason = CameraAccessException.CAMERA_DISCONNECTED; - break; - case ICameraService.ERROR_DISABLED: - reason = CameraAccessException.CAMERA_DISABLED; - break; - case ICameraService.ERROR_CAMERA_IN_USE: - reason = CameraAccessException.CAMERA_IN_USE; - break; - case ICameraService.ERROR_MAX_CAMERAS_IN_USE: - reason = CameraAccessException.MAX_CAMERAS_IN_USE; - break; - case ICameraService.ERROR_DEPRECATED_HAL: - reason = CameraAccessException.CAMERA_DEPRECATED_HAL; - break; - case ICameraService.ERROR_ILLEGAL_ARGUMENT: - case ICameraService.ERROR_ALREADY_EXISTS: - throw new IllegalArgumentException(e.getMessage(), e); - case ICameraService.ERROR_PERMISSION_DENIED: - throw new SecurityException(e.getMessage(), e); - case ICameraService.ERROR_TIMED_OUT: - case ICameraService.ERROR_INVALID_OPERATION: - default: - reason = CameraAccessException.CAMERA_ERROR; - } - throw new CameraAccessException(reason, e.getMessage(), e); - } else if (t instanceof DeadObjectException) { - throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, - "Camera service has died unexpectedly", - t); - } else if (t instanceof RemoteException) { - throw new UnsupportedOperationException("An unknown RemoteException was thrown" + - " which should never happen.", t); - } else if (t instanceof RuntimeException) { - RuntimeException e = (RuntimeException) t; - throw e; - } - } - - /** * Queries the camera service if a cameraId is a hidden physical camera that belongs to a * logical camera device. * @@ -1829,13 +1781,13 @@ public final class CameraManager { internalCamId, externalCamId, cameraInjectionCallback); injectionSessionImpl.setRemoteInjectionSession(injectionSession); } catch (ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { // Camera service died - act as if it's a CAMERA_DISCONNECTED case ServiceSpecificException sse = new ServiceSpecificException( ICameraService.ERROR_DISCONNECTED, "Camera service is currently unavailable"); - throwAsPublicException(sse); + throw ExceptionUtils.throwAsPublicException(sse); } } } @@ -1875,6 +1827,23 @@ public final class CameraManager { } /** + * Returns the current CameraService instance connected to Global + * @hide + */ + public ICameraService getCameraService() { + return CameraManagerGlobal.get().getCameraService(); + } + + /** + * Returns true if cameraservice is currently disabled. If true, {@link #getCameraService()} + * will definitely return null. + * @hide + */ + public boolean isCameraServiceDisabled() { + return CameraManagerGlobal.sCameraServiceDisabled; + } + + /** * Reports {@link CameraExtensionSessionStats} to the {@link ICameraService} to be logged for * currently active session. Validation is done downstream. * @@ -2124,7 +2093,7 @@ public final class CameraManager { cameraService.remapCameraIds(cameraIdRemapping); mActiveCameraIdRemapping = cameraIdRemapping; } catch (ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { throw new CameraAccessException( CameraAccessException.CAMERA_DISCONNECTED, @@ -2148,7 +2117,7 @@ public final class CameraManager { try { cameraService.injectSessionParams(cameraId, sessionParams.getNativeMetadata()); } catch (ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { throw new CameraAccessException( CameraAccessException.CAMERA_DISCONNECTED, @@ -2391,35 +2360,13 @@ public final class CameraManager { return mCameraService.isConcurrentSessionConfigurationSupported( cameraIdsAndConfigs, targetSdkVersion); } catch (ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { // Camera service died - act as if the camera was disconnected throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, "Camera service is currently unavailable", e); } } - - return false; - } - - public boolean isSessionConfigurationWithParametersSupported( - @NonNull String cameraId, @NonNull SessionConfiguration sessionConfiguration) - throws CameraAccessException { - - synchronized (mLock) { - try { - return mCameraService.isSessionConfigurationWithParametersSupported( - cameraId, sessionConfiguration); - } catch (ServiceSpecificException e) { - throwAsPublicException(e); - } catch (RemoteException e) { - // Camera service died - act as if the camera was disconnected - throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, - "Camera service is currently unavailable", e); - } - } - - return false; } /** @@ -2462,7 +2409,7 @@ public final class CameraManager { try { cameraService.setTorchMode(cameraId, enabled, mTorchClientBinder); } catch(ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, "Camera service is currently unavailable"); @@ -2488,7 +2435,7 @@ public final class CameraManager { cameraService.turnOnTorchWithStrengthLevel(cameraId, torchStrength, mTorchClientBinder); } catch(ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, "Camera service is currently unavailable."); @@ -2512,7 +2459,7 @@ public final class CameraManager { try { torchStrength = cameraService.getTorchStrengthLevel(cameraId); } catch(ServiceSpecificException e) { - throwAsPublicException(e); + throw ExceptionUtils.throwAsPublicException(e); } catch (RemoteException e) { throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, "Camera service is currently unavailable."); @@ -2521,45 +2468,6 @@ public final class CameraManager { return torchStrength; } - public CaptureRequest.Builder createCaptureRequest(@NonNull String cameraId, - @RequestTemplate int templateType, int targetSdkVersion) - throws CameraAccessException { - CaptureRequest.Builder builder = null; - synchronized (mLock) { - if (cameraId == null) { - throw new IllegalArgumentException("cameraId was null"); - } - - ICameraService cameraService = getCameraService(); - if (cameraService == null) { - throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, - "Camera service is currently unavailable."); - } - - try { - CameraMetadataNative defaultRequest = - cameraService.createDefaultRequest(cameraId, templateType); - - CameraDeviceImpl.disableZslIfNeeded(defaultRequest, - targetSdkVersion, templateType); - - builder = new CaptureRequest.Builder(defaultRequest, /*reprocess*/false, - CameraCaptureSession.SESSION_ID_NONE, cameraId, - /*physicalCameraIdSet*/null); - } catch (ServiceSpecificException e) { - if (e.errorCode == ICameraService.ERROR_INVALID_OPERATION) { - throw new UnsupportedOperationException(e.getMessage()); - } - - throwAsPublicException(e); - } catch (RemoteException e) { - throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, - "Camera service is currently unavailable."); - } - } - return builder; - } - private void handleRecoverableSetupErrors(ServiceSpecificException e) { switch (e.errorCode) { case ICameraService.ERROR_DISCONNECTED: diff --git a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java index f6c8f36a1b01..b2032fa3db81 100644 --- a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java @@ -102,6 +102,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes private boolean mInitialized; private boolean mSessionClosed; + private int mExtensionType; + private final Context mContext; @@ -205,7 +207,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes CameraAdvancedExtensionSessionImpl ret = new CameraAdvancedExtensionSessionImpl(ctx, extender, cameraDevice, characteristicsMapNative, repeatingRequestSurface, burstCaptureSurface, postviewSurface, config.getStateCallback(), - config.getExecutor(), sessionId, token); + config.getExecutor(), sessionId, token, config.getExtension()); ret.mStatsAggregator.setClientName(ctx.getOpPackageName()); ret.mStatsAggregator.setExtensionType(config.getExtension()); @@ -223,7 +225,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes @Nullable Surface postviewSurface, @NonNull StateCallback callback, @NonNull Executor executor, int sessionId, - @NonNull IBinder token) { + @NonNull IBinder token, + int extension) { mContext = ctx; mAdvancedExtender = extender; mCameraDevice = cameraDevice; @@ -242,6 +245,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes mSessionId = sessionId; mToken = token; mInterfaceLock = cameraDevice.mInterfaceLock; + mExtensionType = extension; mStatsAggregator = new ExtensionSessionStatsAggregator(mCameraDevice.getId(), /*isAdvanced=*/true); @@ -583,9 +587,9 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes if (mToken != null) { if (mInitialized || (mCaptureSession != null)) { notifyClose = true; - CameraExtensionCharacteristics.releaseSession(); + CameraExtensionCharacteristics.releaseSession(mExtensionType); } - CameraExtensionCharacteristics.unregisterClient(mContext, mToken); + CameraExtensionCharacteristics.unregisterClient(mContext, mToken, mExtensionType); } mInitialized = false; mToken = null; @@ -654,7 +658,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes } try { - CameraExtensionCharacteristics.initializeSession(mInitializeHandler); + CameraExtensionCharacteristics.initializeSession( + mInitializeHandler, mExtensionType); } catch (RemoteException e) { Log.e(TAG, "Failed to initialize session! Extension service does" + " not respond!"); diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index ccb24e7d2457..98a44ee446b9 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -19,6 +19,10 @@ package android.hardware.camera2.impl; import static com.android.internal.util.function.pooled.PooledLambda.obtainRunnable; import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.compat.CompatChanges; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledSince; import android.content.Context; import android.graphics.ImageFormat; import android.hardware.ICameraService; @@ -59,6 +63,8 @@ import android.util.Size; import android.util.SparseArray; import android.view.Surface; +import com.android.internal.camera.flags.Flags; + import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Arrays; @@ -85,10 +91,23 @@ public class CameraDeviceImpl extends CameraDevice private static final int REQUEST_ID_NONE = -1; + /** + * Starting {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, + * {@link #isSessionConfigurationSupported} also checks for compatibility of session parameters + * when supported by the HAL. This ChangeId guards enabling that functionality for apps + * that target {@link Build.VERSION_CODES#VANILLA_ICE_CREAM} and above. + */ + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + static final long CHECK_PARAMS_IN_IS_SESSION_CONFIGURATION_SUPPORTED = 320741775; + // TODO: guard every function with if (!mRemoteDevice) check (if it was closed) private ICameraDeviceUserWrapper mRemoteDevice; private boolean mRemoteDeviceInit = false; + // CameraDeviceSetup object to delegate some of the newer calls to. + @Nullable private final CameraDeviceSetup mCameraDeviceSetup; + // Lock to synchronize cross-thread access to device public interface final Object mInterfaceLock = new Object(); // access from this class and Session only! private final CameraDeviceCallbacks mCallbacks = new CameraDeviceCallbacks(); @@ -275,7 +294,8 @@ public class CameraDeviceImpl extends CameraDevice CameraCharacteristics characteristics, Map<String, CameraCharacteristics> physicalIdsToChars, int appTargetSdkVersion, - Context ctx) { + Context ctx, + @Nullable CameraDevice.CameraDeviceSetup cameraDeviceSetup) { if (cameraId == null || callback == null || executor == null || characteristics == null) { throw new IllegalArgumentException("Null argument given"); } @@ -286,6 +306,7 @@ public class CameraDeviceImpl extends CameraDevice mPhysicalIdsToChars = physicalIdsToChars; mAppTargetSdkVersion = appTargetSdkVersion; mContext = ctx; + mCameraDeviceSetup = cameraDeviceSetup; final int MAX_TAG_LEN = 23; String tag = String.format("CameraDevice-JV-%s", mCameraId); @@ -781,7 +802,11 @@ public class CameraDeviceImpl extends CameraDevice UnsupportedOperationException, IllegalArgumentException { synchronized (mInterfaceLock) { checkIfCameraClosedOrInError(); - + if (CompatChanges.isChangeEnabled(CHECK_PARAMS_IN_IS_SESSION_CONFIGURATION_SUPPORTED) + && Flags.cameraDeviceSetup() + && mCameraDeviceSetup != null) { + return mCameraDeviceSetup.isSessionConfigurationSupported(sessionConfig); + } return mRemoteDevice.isSessionConfigurationSupported(sessionConfig); } } @@ -2559,13 +2584,16 @@ public class CameraDeviceImpl extends CameraDevice boolean initializationFailed = true; IBinder token = new Binder(TAG + " : " + mNextSessionId++); try { - boolean ret = CameraExtensionCharacteristics.registerClient(mContext, token); + boolean ret = CameraExtensionCharacteristics.registerClient(mContext, token, + extensionConfiguration.getExtension(), mCameraId, + CameraExtensionUtils.getCharacteristicsMapNative(characteristicsMap)); if (!ret) { token = null; throw new UnsupportedOperationException("Unsupported extension!"); } - if (CameraExtensionCharacteristics.areAdvancedExtensionsSupported()) { + if (CameraExtensionCharacteristics.areAdvancedExtensionsSupported( + extensionConfiguration.getExtension())) { mCurrentAdvancedExtensionSession = CameraAdvancedExtensionSessionImpl.createCameraAdvancedExtensionSession( this, characteristicsMap, mContext, extensionConfiguration, @@ -2580,7 +2608,8 @@ public class CameraDeviceImpl extends CameraDevice throw new CameraAccessException(CameraAccessException.CAMERA_ERROR); } finally { if (initializationFailed && (token != null)) { - CameraExtensionCharacteristics.unregisterClient(mContext, token); + CameraExtensionCharacteristics.unregisterClient(mContext, token, + extensionConfiguration.getExtension()); } } } diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceSetupImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceSetupImpl.java new file mode 100644 index 000000000000..fa2f519fee0d --- /dev/null +++ b/core/java/android/hardware/camera2/impl/CameraDeviceSetupImpl.java @@ -0,0 +1,162 @@ +/* + * 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.hardware.camera2.impl; + +import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; +import android.hardware.ICameraService; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCaptureSession; +import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraDevice; +import android.hardware.camera2.CameraManager; +import android.hardware.camera2.CaptureRequest; +import android.hardware.camera2.params.SessionConfiguration; +import android.hardware.camera2.utils.ExceptionUtils; +import android.os.Build; +import android.os.RemoteException; +import android.os.ServiceSpecificException; + +import androidx.annotation.NonNull; + +import com.android.internal.camera.flags.Flags; + +import java.util.concurrent.Executor; + +@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP) +public class CameraDeviceSetupImpl extends CameraDevice.CameraDeviceSetup { + private final String mCameraId; + private final CameraManager mCameraManager; + private final int mTargetSdkVersion; + + private final Object mInterfaceLock = new Object(); + + public CameraDeviceSetupImpl(@NonNull String cameraId, @NonNull CameraManager cameraManager, + int targetSdkVersion) { + mCameraId = cameraId; + mCameraManager = cameraManager; + mTargetSdkVersion = targetSdkVersion; + } + + @NonNull + @Override + public CaptureRequest.Builder createCaptureRequest(int templateType) + throws CameraAccessException { + synchronized (mInterfaceLock) { + if (mCameraManager.isCameraServiceDisabled()) { + throw new IllegalArgumentException("No cameras available on device"); + } + + ICameraService cameraService = mCameraManager.getCameraService(); + if (cameraService == null) { + throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, + "Camera service is currently unavailable."); + } + + try { + CameraMetadataNative defaultRequest = cameraService.createDefaultRequest(mCameraId, + templateType); + CameraDeviceImpl.disableZslIfNeeded(defaultRequest, mTargetSdkVersion, + templateType); + + return new CaptureRequest.Builder( + defaultRequest, /*reprocess=*/ false, + CameraCaptureSession.SESSION_ID_NONE, mCameraId, + /*physicalCameraIdSet=*/ null); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); + } + } + } + + @Override + public boolean isSessionConfigurationSupported(@NonNull SessionConfiguration config) + throws CameraAccessException { + // TODO(b/298033056): restructure the OutputConfiguration API for better usability + synchronized (mInterfaceLock) { + if (mCameraManager.isCameraServiceDisabled()) { + throw new IllegalArgumentException("No cameras available on device"); + } + + ICameraService cameraService = mCameraManager.getCameraService(); + if (cameraService == null) { + throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, + "Camera service is currently unavailable."); + } + + try { + return cameraService.isSessionConfigurationWithParametersSupported( + mCameraId, config); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); + } + } + } + + @Override + public void openCamera(@NonNull @CallbackExecutor Executor executor, + @NonNull CameraDevice.StateCallback callback) throws CameraAccessException { + mCameraManager.openCamera(mCameraId, executor, callback); + } + + @NonNull + @Override + public String getId() { + return mCameraId; + } + + @Override + public int hashCode() { + return mCameraId.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof CameraDeviceSetupImpl other) { + return mCameraId.equals(other.mCameraId); + } + return false; + } + + @Override + public String toString() { + return "CameraDeviceSetup(cameraId='" + mCameraId + "')"; + } + + /** + * Returns true if HAL supports calls to {@code isSessionConfigurationWithParametersSupported}; + * false otherwise. + * <p> + * Suppressing AndroidFrameworkCompatChange because we are querying HAL support here + * and HAL's return value happens to follow the same scheme as SDK version. + * AndroidFrameworkCompatChange incorrectly flags this as an SDK version check. + * @hide + */ + @SuppressWarnings("AndroidFrameworkCompatChange") + public static boolean isCameraDeviceSetupSupported(CameraCharacteristics chars) { + if (!Flags.featureCombinationQuery()) { + return false; + } + + Integer queryVersion = chars.get( + CameraCharacteristics.INFO_SESSION_CONFIGURATION_QUERY_VERSION); + return queryVersion != null && queryVersion > Build.VERSION_CODES.UPSIDE_DOWN_CAKE; + } +} diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index db7055b1756d..725b4139bb95 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java @@ -118,6 +118,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { // In case the client doesn't explicitly enable repeating requests, the framework // will do so internally. private boolean mInternalRepeatingRequestEnabled = true; + private int mExtensionType; private final Context mContext; @@ -244,7 +245,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { sessionId, token, extensionChars.getAvailableCaptureRequestKeys(config.getExtension()), - extensionChars.getAvailableCaptureResultKeys(config.getExtension())); + extensionChars.getAvailableCaptureResultKeys(config.getExtension()), + config.getExtension()); session.mStatsAggregator.setClientName(ctx.getOpPackageName()); session.mStatsAggregator.setExtensionType(config.getExtension()); @@ -266,7 +268,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { int sessionId, @NonNull IBinder token, @NonNull Set<CaptureRequest.Key> requestKeys, - @Nullable Set<CaptureResult.Key> resultKeys) { + @Nullable Set<CaptureResult.Key> resultKeys, + int extension) { mContext = ctx; mImageExtender = imageExtender; mPreviewExtender = previewExtender; @@ -289,6 +292,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { mSupportedResultKeys = resultKeys; mCaptureResultsSupported = !resultKeys.isEmpty(); mInterfaceLock = cameraDevice.mInterfaceLock; + mExtensionType = extension; mStatsAggregator = new ExtensionSessionStatsAggregator(mCameraDevice.getId(), /*isAdvanced=*/false); @@ -881,9 +885,9 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { if (mToken != null) { if (mInitialized || (mCaptureSession != null)) { notifyClose = true; - CameraExtensionCharacteristics.releaseSession(); + CameraExtensionCharacteristics.releaseSession(mExtensionType); } - CameraExtensionCharacteristics.unregisterClient(mContext, mToken); + CameraExtensionCharacteristics.unregisterClient(mContext, mToken, mExtensionType); } mInitialized = false; mToken = null; @@ -1000,7 +1004,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { mStatsAggregator.commit(/*isFinal*/false); try { finishPipelineInitialization(); - CameraExtensionCharacteristics.initializeSession(mInitializeHandler); + CameraExtensionCharacteristics.initializeSession( + mInitializeHandler, mExtensionType); } catch (RemoteException e) { Log.e(TAG, "Failed to initialize session! Extension service does" + " not respond!"); diff --git a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java index 2129260b0ae8..241268d866a4 100644 --- a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java +++ b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java @@ -18,14 +18,13 @@ package android.hardware.camera2.impl; import android.hardware.ICameraService; import android.hardware.camera2.CameraAccessException; -import android.hardware.camera2.CameraManager; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.ICameraDeviceCallbacks; import android.hardware.camera2.ICameraDeviceUser; import android.hardware.camera2.ICameraOfflineSession; -import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.params.SessionConfiguration; +import android.hardware.camera2.utils.ExceptionUtils; import android.hardware.camera2.utils.SubmitInfo; import android.os.IBinder; import android.os.RemoteException; @@ -69,9 +68,10 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { return mRemoteDevice.submitRequest(request, streaming); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -79,27 +79,30 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { return mRemoteDevice.submitRequestList(requestList, streaming); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public long cancelRequest(int requestId) throws CameraAccessException { try { return mRemoteDevice.cancelRequest(requestId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void beginConfigure() throws CameraAccessException { try { mRemoteDevice.beginConfigure(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -108,18 +111,20 @@ public class ICameraDeviceUserWrapper { try { return mRemoteDevice.endConfigure(operatingMode, (sessionParams == null) ? new CameraMetadataNative() : sessionParams, startTimeMs); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void deleteStream(int streamId) throws CameraAccessException { try { mRemoteDevice.deleteStream(streamId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -127,9 +132,10 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { return mRemoteDevice.createStream(outputConfiguration); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -137,45 +143,50 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { return mRemoteDevice.createInputStream(width, height, format, isMultiResolution); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public Surface getInputSurface() throws CameraAccessException { try { return mRemoteDevice.getInputSurface(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public CameraMetadataNative createDefaultRequest(int templateId) throws CameraAccessException { try { return mRemoteDevice.createDefaultRequest(templateId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public CameraMetadataNative getCameraInfo() throws CameraAccessException { try { return mRemoteDevice.getCameraInfo(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void waitUntilIdle() throws CameraAccessException { try { mRemoteDevice.waitUntilIdle(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -191,10 +202,9 @@ public class ICameraDeviceUserWrapper { throw new IllegalArgumentException("Invalid session configuration"); } - throw e; - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -213,46 +223,49 @@ public class ICameraDeviceUserWrapper { throw new IllegalArgumentException("Invalid session configuration"); } - throw e; - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public long flush() throws CameraAccessException { try { return mRemoteDevice.flush(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void prepare(int streamId) throws CameraAccessException { try { mRemoteDevice.prepare(streamId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void tearDown(int streamId) throws CameraAccessException { try { mRemoteDevice.tearDown(streamId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void prepare2(int maxCount, int streamId) throws CameraAccessException { try { mRemoteDevice.prepare2(maxCount, streamId); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -260,9 +273,10 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { mRemoteDevice.updateOutputConfiguration(streamId, config); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -270,9 +284,10 @@ public class ICameraDeviceUserWrapper { int[] offlineOutputIds) throws CameraAccessException { try { return mRemoteDevice.switchToOffline(cbs, offlineOutputIds); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } @@ -280,27 +295,30 @@ public class ICameraDeviceUserWrapper { throws CameraAccessException { try { mRemoteDevice.finalizeOutputConfigurations(streamId, deferredConfig); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public void setCameraAudioRestriction(int mode) throws CameraAccessException { try { mRemoteDevice.setCameraAudioRestriction(mode); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } public int getGlobalAudioRestriction() throws CameraAccessException { try { return mRemoteDevice.getGlobalAudioRestriction(); - } catch (Throwable t) { - CameraManager.throwAsPublicException(t); - throw new UnsupportedOperationException("Unexpected exception", t); + } catch (ServiceSpecificException e) { + throw ExceptionUtils.throwAsPublicException(e); + } catch (RemoteException e) { + throw ExceptionUtils.throwAsPublicException(e); } } diff --git a/core/java/android/hardware/camera2/utils/ExceptionUtils.java b/core/java/android/hardware/camera2/utils/ExceptionUtils.java new file mode 100644 index 000000000000..bfa96f26fa18 --- /dev/null +++ b/core/java/android/hardware/camera2/utils/ExceptionUtils.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.camera2.utils; + +import android.hardware.ICameraService; +import android.hardware.camera2.CameraAccessException; +import android.os.DeadObjectException; +import android.os.RemoteException; +import android.os.ServiceSpecificException; + +/** + * @hide + */ +public class ExceptionUtils { + /** + * Converts and throws {@link ServiceSpecificException} from camera binder interfaces as + * {@link CameraAccessException}, {@link IllegalArgumentException}, or {@link SecurityException} + * based on {@link ServiceSpecificException#errorCode} + * <p> + * Usage: {@code throw ExceptionUtils.throwAsPublicException(e)} + * <p> + * Notice the preceding `throw` before calling this method. The throw is essentially + * useless but lets the compiler know that execution will terminate at that statement + * preventing false "missing return statement" errors. + * <p> + * The return type is set to the only checked exception this method throws to ensure + * that the caller knows exactly which checked exception to declare/handle. + * + * @hide + */ + public static CameraAccessException throwAsPublicException(ServiceSpecificException e) + throws CameraAccessException { + int reason; + switch(e.errorCode) { + case ICameraService.ERROR_DISCONNECTED: + reason = CameraAccessException.CAMERA_DISCONNECTED; + break; + case ICameraService.ERROR_DISABLED: + reason = CameraAccessException.CAMERA_DISABLED; + break; + case ICameraService.ERROR_CAMERA_IN_USE: + reason = CameraAccessException.CAMERA_IN_USE; + break; + case ICameraService.ERROR_MAX_CAMERAS_IN_USE: + reason = CameraAccessException.MAX_CAMERAS_IN_USE; + break; + case ICameraService.ERROR_DEPRECATED_HAL: + reason = CameraAccessException.CAMERA_DEPRECATED_HAL; + break; + case ICameraService.ERROR_ILLEGAL_ARGUMENT: + case ICameraService.ERROR_ALREADY_EXISTS: + throw new IllegalArgumentException(e.getMessage(), e); + case ICameraService.ERROR_PERMISSION_DENIED: + throw new SecurityException(e.getMessage(), e); + case ICameraService.ERROR_TIMED_OUT: + case ICameraService.ERROR_INVALID_OPERATION: + default: + reason = CameraAccessException.CAMERA_ERROR; + } + + throw new CameraAccessException(reason, e.getMessage(), e); + } + + /** + * Converts and throws Binder {@link DeadObjectException} and {@link RemoteException} from + * camera binder interfaces as {@link CameraAccessException} or + * {@link UnsupportedOperationException} + * <p> + * Usage: {@code throw ExceptionUtils.throwAsPublicException(e)} + * <p> + * Notice the preceding `throw` before calling this method. The throw is essentially + * useless but lets the compiler know that execution will terminate at that statement + * preventing false "missing return statement" errors. + * <p> + * The return type is set to the only checked exception this method throws to ensure + * that the caller knows exactly which checked exception to declare/handle. + * + * @hide + */ + public static CameraAccessException throwAsPublicException(RemoteException e) + throws CameraAccessException { + if (e instanceof DeadObjectException) { + throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED, + "Camera service has died unexpectedly", e); + } + + throw new UnsupportedOperationException("An unknown RemoteException was thrown" + + " which should never happen.", e); + } + + /** + * Static methods only. Do not initialize. + * @hide + */ + private ExceptionUtils() {} +} diff --git a/services/core/java/com/android/server/devicestate/DeviceState.java b/core/java/android/hardware/devicestate/DeviceState.java index 2ba59b0d659a..5a349050a28f 100644 --- a/services/core/java/com/android/server/devicestate/DeviceState.java +++ b/core/java/android/hardware/devicestate/DeviceState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.devicestate; +package android.hardware.devicestate; import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE; import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE; @@ -22,7 +22,6 @@ import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STA import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.hardware.devicestate.DeviceStateManager; import com.android.internal.util.Preconditions; @@ -38,9 +37,9 @@ import java.util.Objects; * state of the system. This is useful for variable-state devices, like foldable or rollable * devices, that can be configured by users into differing hardware states, which each may have a * different expected use case. + * @hide * - * @see DeviceStateProvider - * @see DeviceStateManagerService + * @see DeviceStateManager */ public final class DeviceState { /** diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java index 4a5c4c8acd25..8616b6b15de6 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -16,13 +16,11 @@ package android.hardware.usb; -import android.Manifest; import android.annotation.CheckResult; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.hardware.usb.flags.Flags; import android.os.Parcel; @@ -30,7 +28,6 @@ import android.os.Parcelable; import com.android.internal.annotations.Immutable; -import java.lang.StringBuilder; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -580,6 +577,21 @@ public final class UsbPortStatus implements Parcelable { } /** + * This function checks if the port is USB Power Delivery (PD) compliant - + * https://www.usb.org/usb-charger-pd. All of the power and data roles must be supported for a + * port to be PD compliant. + * + * @return true if the port is PD compliant. + */ + @FlaggedApi(Flags.FLAG_ENABLE_IS_PD_COMPLIANT_API) + public boolean isPdCompliant() { + return isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_DEVICE) + && isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_HOST) + && isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_DEVICE) + && isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_HOST); + } + + /** * Get the supported role combinations. */ public int getSupportedRoleCombinations() { diff --git a/core/java/android/hardware/usb/flags/usb_framework_flags.aconfig b/core/java/android/hardware/usb/flags/usb_framework_flags.aconfig new file mode 100644 index 000000000000..cc56a311e9a4 --- /dev/null +++ b/core/java/android/hardware/usb/flags/usb_framework_flags.aconfig @@ -0,0 +1,8 @@ +package: "android.hardware.usb.flags" + +flag { + name: "enable_is_pd_compliant_api" + namespace: "usb" + description: "Feature flag for the api to check if a port is PD compliant" + bug: "323470419" +} diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b68b94d5bf2d..e09094203ad4 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -31,6 +31,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.location.GnssSignalQuality; +import android.net.NetworkCapabilities; import android.os.BatteryStatsManager.WifiState; import android.os.BatteryStatsManager.WifiSupplState; import android.server.ServerProtoEnums; @@ -59,6 +60,7 @@ import com.android.internal.os.BatteryStatsHistoryIterator; import com.android.internal.os.CpuScalingPolicies; import com.android.internal.os.MonotonicClock; import com.android.internal.os.PowerStats; +import com.android.net.module.util.NetworkCapabilitiesUtils; import com.google.android.collect.Lists; @@ -1897,7 +1899,7 @@ public abstract class BatteryStats { public short batteryTemperature; // Battery voltage in millivolts (mV). @UnsupportedAppUsage - public char batteryVoltage; + public short batteryVoltage; // The charge of the battery in micro-Ampere-hours. public int batteryChargeUah; @@ -2159,7 +2161,7 @@ public abstract class BatteryStats { batteryPlugType = (byte)((bat>>24)&0xf); int bat2 = src.readInt(); batteryTemperature = (short)(bat2&0xffff); - batteryVoltage = (char)((bat2>>16)&0xffff); + batteryVoltage = (short) ((bat2 >> 16) & 0xffff); batteryChargeUah = src.readInt(); modemRailChargeMah = src.readDouble(); wifiRailChargeMah = src.readDouble(); @@ -2734,26 +2736,28 @@ public abstract class BatteryStats { "emngcy", "other" }; + public static final int NUM_ALL_NETWORK_TYPES = getAllNetworkTypesCount(); public static final int DATA_CONNECTION_OUT_OF_SERVICE = 0; - public static final int DATA_CONNECTION_EMERGENCY_SERVICE = getEmergencyNetworkConnectionType(); - public static final int DATA_CONNECTION_OTHER = DATA_CONNECTION_EMERGENCY_SERVICE + 1; + public static final int DATA_CONNECTION_EMERGENCY_SERVICE = NUM_ALL_NETWORK_TYPES + 1; + public static final int DATA_CONNECTION_OTHER = NUM_ALL_NETWORK_TYPES + 2; @UnsupportedAppUsage - public static final int NUM_DATA_CONNECTION_TYPES = DATA_CONNECTION_OTHER + 1; + public static final int NUM_DATA_CONNECTION_TYPES = NUM_ALL_NETWORK_TYPES + 3; + @android.ravenwood.annotation.RavenwoodReplace - private static int getEmergencyNetworkConnectionType() { + public static int getAllNetworkTypesCount() { int count = TelephonyManager.getAllNetworkTypes().length; if (DATA_CONNECTION_NAMES.length != count + 3) { // oos, emngcy, other throw new IllegalStateException( "DATA_CONNECTION_NAMES length does not match network type count. " + "Expected: " + (count + 3) + ", actual:" + DATA_CONNECTION_NAMES.length); } - return count + 1; + return count; } - private static int getEmergencyNetworkConnectionType$ravenwood() { - return DATA_CONNECTION_NAMES.length - 2; + public static int getAllNetworkTypesCount$ravenwood() { + return DATA_CONNECTION_NAMES.length - 3; // oos, emngcy, other } /** @@ -9071,4 +9075,31 @@ public abstract class BatteryStats { protected static boolean isKernelStatsAvailable$ravenwood() { return false; } + + @android.ravenwood.annotation.RavenwoodReplace + protected static int getDisplayTransport(int[] transports) { + return NetworkCapabilitiesUtils.getDisplayTransport(transports); + } + + // See NetworkCapabilitiesUtils + private static final int[] DISPLAY_TRANSPORT_PRIORITIES = new int[] { + NetworkCapabilities.TRANSPORT_VPN, + NetworkCapabilities.TRANSPORT_CELLULAR, + NetworkCapabilities.TRANSPORT_WIFI_AWARE, + NetworkCapabilities.TRANSPORT_BLUETOOTH, + NetworkCapabilities.TRANSPORT_WIFI, + NetworkCapabilities.TRANSPORT_ETHERNET, + NetworkCapabilities.TRANSPORT_USB + }; + + protected static int getDisplayTransport$ravenwood(int[] transports) { + for (int transport : DISPLAY_TRANSPORT_PRIORITIES) { + for (int t : transports) { + if (t == transport) { + return transport; + } + } + } + return transports[0]; + } } diff --git a/core/java/android/os/BluetoothBatteryStats.java b/core/java/android/os/BluetoothBatteryStats.java index 3d99a08a59c5..fa8f39d1642b 100644 --- a/core/java/android/os/BluetoothBatteryStats.java +++ b/core/java/android/os/BluetoothBatteryStats.java @@ -26,6 +26,7 @@ import java.util.List; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class BluetoothBatteryStats implements Parcelable { /** @hide */ diff --git a/core/java/android/os/ProfilingServiceManager.java b/core/java/android/os/ProfilingServiceManager.java new file mode 100644 index 000000000000..cc77f5b82c90 --- /dev/null +++ b/core/java/android/os/ProfilingServiceManager.java @@ -0,0 +1,97 @@ +/* + * 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.os; + +import android.annotation.FlaggedApi; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.annotation.SystemApi.Client; + +/** + * Provides a way to register and obtain the system service binder objects managed by the profiling + * service. + * + * <p> Only the profiling mainline module will be able to access an instance of this class. + * @hide + */ +@FlaggedApi(Flags.FLAG_TELEMETRY_APIS_FRAMEWORK_INITIALIZATION) +@SystemApi(client = Client.MODULE_LIBRARIES) +public class ProfilingServiceManager { + + /** @hide */ + public ProfilingServiceManager() {} + + /** + * A class that exposes the methods to register and obtain each system service. + */ + public static final class ServiceRegisterer { + private final String mServiceName; + + /** @hide */ + public ServiceRegisterer(String serviceName) { + mServiceName = serviceName; + } + + /** + * Get the system server binding object for ProfilingService. + * + * <p> This blocks until the service instance is ready. + * or a timeout happens, in which case it returns null. + */ + @Nullable + public IBinder get() { + return ServiceManager.getService(mServiceName); + } + + /** + * Get the system server binding object for a service. + * + * <p>This blocks until the service instance is ready, + * or a timeout happens, in which case it throws {@link ServiceNotFoundException}. + */ + @Nullable + public IBinder getOrThrow() throws ServiceNotFoundException { + try { + return ServiceManager.getServiceOrThrow(mServiceName); + } catch (ServiceManager.ServiceNotFoundException e) { + throw new ServiceNotFoundException(mServiceName); + } + } + } + + /** + * See {@link ServiceRegisterer#getOrThrow()} + */ + public static class ServiceNotFoundException extends ServiceManager.ServiceNotFoundException { + /** + * Constructor + * + * @param name the name of the binder service that cannot be found. + */ + public ServiceNotFoundException(@NonNull String name) { + super(name); + } + } + + /** + * Returns {@link ServiceRegisterer} for the "profiling" service. + */ + @NonNull + public ServiceRegisterer getProfilingServiceRegisterer() { + return new ServiceRegisterer("profiling_service"); + } +} diff --git a/core/java/android/os/UserBatteryConsumer.java b/core/java/android/os/UserBatteryConsumer.java index a2ff078263ca..23ba0c635eca 100644 --- a/core/java/android/os/UserBatteryConsumer.java +++ b/core/java/android/os/UserBatteryConsumer.java @@ -34,6 +34,7 @@ import java.util.List; * * {@hide} */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class UserBatteryConsumer extends BatteryConsumer { static final int CONSUMER_TYPE_USER = 2; diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 0fbdbc48fd99..89576ed62afe 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -180,11 +180,14 @@ public class UserManager { /** - * User type representing a private profile. + * User type representing a private profile. Private profile is a user profile that can be used + * as an alternative user-space to install and use sensitive apps. + * UI surfaces can adopt an alternative strategy to show apps belonging to this profile, in line + * with their sensitive nature. * @hide */ @FlaggedApi(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE) - @TestApi + @SystemApi public static final String USER_TYPE_PROFILE_PRIVATE = "android.os.usertype.profile.PRIVATE"; /** @@ -1424,8 +1427,8 @@ public class UserManager { public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** - * Specifies if a user is not allowed to run in the background and should be stopped during - * user switch. The default value is <code>false</code>. + * Specifies if a user is not allowed to run in the background and should be stopped and locked + * during user switch. The default value is <code>false</code>. * * <p>This restriction can be set by device owners and profile owners. * @@ -1952,6 +1955,26 @@ public class UserManager { "no_sim_globally"; /** + * This user restriction specifies if assist content is disallowed from being sent to + * a privileged app such as the Assistant app. Assist content includes screenshots and + * information about an app, such as package name. + * + * <p>This restriction can only be set by a device owner or a profile owner. When it is set + * by a device owner, it disables the assist contextual data on the entire device. When it is + * set by a profile owner, it disables assist content on the profile. + * + * <p>Default is <code>false</code>. + * + * <p>Key for user restrictions. + * <p>Type: Boolean + * @see DevicePolicyManager#addUserRestriction(ComponentName, String) + * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) + * @see #getUserRestrictions() + */ + @FlaggedApi(android.app.admin.flags.Flags.FLAG_ASSIST_CONTENT_USER_RESTRICTION_ENABLED) + public static final String DISALLOW_ASSIST_CONTENT = "no_assist_content"; + + /** * List of key values that can be passed into the various user restriction related methods * in {@link UserManager} & {@link DevicePolicyManager}. * Note: This is slightly different from the real set of user restrictions listed in {@link @@ -2039,6 +2062,7 @@ public class UserManager { DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO, DISALLOW_THREAD_NETWORK, DISALLOW_SIM_GLOBALLY, + DISALLOW_ASSIST_CONTENT, }) @Retention(RetentionPolicy.SOURCE) public @interface UserRestrictionKey {} diff --git a/core/java/android/os/WakeLockStats.java b/core/java/android/os/WakeLockStats.java index 05a7313d1600..69e70a0a8b07 100644 --- a/core/java/android/os/WakeLockStats.java +++ b/core/java/android/os/WakeLockStats.java @@ -25,6 +25,7 @@ import java.util.List; * Snapshot of wake lock stats. * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class WakeLockStats implements Parcelable { /** @hide */ diff --git a/core/java/android/os/storage/OWNERS b/core/java/android/os/storage/OWNERS index 6941857e8fef..2cb16d337bba 100644 --- a/core/java/android/os/storage/OWNERS +++ b/core/java/android/os/storage/OWNERS @@ -10,7 +10,6 @@ gargshivam@google.com krishang@google.com riyaghai@google.com sahanas@google.com -sergeynv@google.com shikhamalhotra@google.com shubhisaxena@google.com tylersaunders@google.com diff --git a/core/java/android/os/vibrator/flags.aconfig b/core/java/android/os/vibrator/flags.aconfig index ea9375ef323c..d485eca7375b 100644 --- a/core/java/android/os/vibrator/flags.aconfig +++ b/core/java/android/os/vibrator/flags.aconfig @@ -16,13 +16,6 @@ flag { flag { namespace: "haptics" - name: "enable_vibration_serialization_apis" - description: "Enables the APIs for vibration serialization/deserialization." - bug: "245129509" -} - -flag { - namespace: "haptics" name: "haptic_feedback_vibration_oem_customization_enabled" description: "Enables OEMs/devices to customize vibrations for haptic feedback" # Make read only. This is because the flag is used only once, and this could happen before diff --git a/core/java/android/os/vibrator/persistence/ParsedVibration.java b/core/java/android/os/vibrator/persistence/ParsedVibration.java index 3d1deea57f14..a16d21eb87a3 100644 --- a/core/java/android/os/vibrator/persistence/ParsedVibration.java +++ b/core/java/android/os/vibrator/persistence/ParsedVibration.java @@ -16,9 +16,9 @@ package android.os.vibrator.persistence; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.TestApi; import android.os.VibrationEffect; import android.os.Vibrator; @@ -35,8 +35,8 @@ import java.util.List; * * @hide */ -@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS) @TestApi +@SuppressLint("UnflaggedApi") // @TestApi without associated feature. public class ParsedVibration { private final List<VibrationEffect> mEffects; diff --git a/core/java/android/os/vibrator/persistence/VibrationXmlParser.java b/core/java/android/os/vibrator/persistence/VibrationXmlParser.java index 3d711a7b69d5..7202d9a19c30 100644 --- a/core/java/android/os/vibrator/persistence/VibrationXmlParser.java +++ b/core/java/android/os/vibrator/persistence/VibrationXmlParser.java @@ -16,10 +16,10 @@ package android.os.vibrator.persistence; -import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.TestApi; import android.os.VibrationEffect; import android.util.Slog; @@ -116,8 +116,8 @@ import java.util.List; * * @hide */ -@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS) @TestApi +@SuppressLint("UnflaggedApi") // @TestApi without associated feature. public final class VibrationXmlParser { private static final String TAG = "VibrationXmlParser"; diff --git a/core/java/android/os/vibrator/persistence/VibrationXmlSerializer.java b/core/java/android/os/vibrator/persistence/VibrationXmlSerializer.java index 28804544edaf..2065d5d0a5a7 100644 --- a/core/java/android/os/vibrator/persistence/VibrationXmlSerializer.java +++ b/core/java/android/os/vibrator/persistence/VibrationXmlSerializer.java @@ -16,9 +16,9 @@ package android.os.vibrator.persistence; -import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.SuppressLint; import android.annotation.TestApi; import android.os.CombinedVibration; import android.os.VibrationEffect; @@ -43,8 +43,8 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS) @TestApi +@SuppressLint("UnflaggedApi") // @TestApi without associated feature. public final class VibrationXmlSerializer { /** diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index 8c7050176506..9d7fb7018d52 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -94,3 +94,11 @@ flag { description: "Enable signature permission allowlist" bug: "308573169" } + +flag { + name: "device_aware_permissions_enabled" + is_fixed_read_only: true + namespace: "permissions" + description: "When the flag is off no permissions can be device aware" + bug: "274852670" +}
\ No newline at end of file diff --git a/core/java/android/provider/BlockedNumberContract.java b/core/java/android/provider/BlockedNumberContract.java index 5d00b29eb3c8..4075e9009acd 100644 --- a/core/java/android/provider/BlockedNumberContract.java +++ b/core/java/android/provider/BlockedNumberContract.java @@ -15,12 +15,20 @@ */ package android.provider; +import android.Manifest; +import android.annotation.FlaggedApi; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.RequiresPermission; +import android.annotation.SystemApi; import android.annotation.WorkerThread; import android.content.Context; import android.net.Uri; import android.os.Bundle; import android.telecom.Log; +import android.telecom.TelecomManager; + +import com.android.server.telecom.flags.Flags; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -214,6 +222,333 @@ public class BlockedNumberContract { * <p>TYPE: String</p> */ public static final String COLUMN_E164_NUMBER = "e164_number"; + + /** + * A protected broadcast intent action for letting components with + * {@link android.Manifest.permission#READ_BLOCKED_NUMBERS} know that the block suppression + * status as returned by {@link #getBlockSuppressionStatus(Context)} has been updated. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ACTION_BLOCK_SUPPRESSION_STATE_CHANGED = + "android.provider.action.BLOCK_SUPPRESSION_STATE_CHANGED"; + + /** + * Preference key of block numbers not in contacts setting. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED = + "block_numbers_not_in_contacts_setting"; + + /** + * Preference key of block private number calls setting. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_BLOCK_PRIVATE = + "block_private_number_calls_setting"; + + /** + * Preference key of block payphone calls setting. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_BLOCK_PAYPHONE = + "block_payphone_calls_setting"; + + /** + * Preference key of block unknown calls setting. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_BLOCK_UNKNOWN = + "block_unknown_calls_setting"; + + /** + * Preference key for whether should show an emergency call notification. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION = + "show_emergency_call_notification"; + + /** + * Preference key of block unavailable calls setting. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final String ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE = + "block_unavailable_calls_setting"; + + /** + * Notifies the provider that emergency services were contacted by the user. + * <p> This results in {@link #shouldSystemBlockNumber} returning {@code false} independent + * of the contents of the provider for a duration defined by + * {@link android.telephony.CarrierConfigManager#KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT} + * the provider unless {@link #endBlockSuppression(Context)} is called. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static void notifyEmergencyContact(@NonNull Context context) { + verifyBlockedNumbersPermission(context); + try { + Log.i(LOG_TAG, "notifyEmergencyContact; caller=%s", context.getOpPackageName()); + context.getContentResolver().call( + AUTHORITY_URI, SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT, null, null); + } catch (NullPointerException | IllegalArgumentException ex) { + // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if + // either of these happen. + Log.w(null, "notifyEmergencyContact: provider not ready."); + } + } + + /** + * Notifies the provider to disable suppressing blocking. If emergency services were not + * contacted recently at all, calling this method is a no-op. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static void endBlockSuppression(@NonNull Context context) { + verifyBlockedNumbersPermission(context); + String caller = context.getOpPackageName(); + Log.i(LOG_TAG, "endBlockSuppression: caller=%s", caller); + context.getContentResolver().call( + AUTHORITY_URI, SystemContract.METHOD_END_BLOCK_SUPPRESSION, null, null); + } + + /** + * Returns {@code true} if {@code phoneNumber} is blocked taking + * {@link #notifyEmergencyContact(Context)} into consideration. If emergency services + * have not been contacted recently and enhanced call blocking not been enabled, this + * method is equivalent to {@link #isBlocked(Context, String)}. + * + * @param context the context of the caller. + * @param phoneNumber the number to check. + * @param numberPresentation the presentation code associated with the call. + * @param isNumberInContacts indicates if the provided number exists as a contact. + * @return result code indicating if the number should be blocked, and if so why. + * Valid values are: {@link #STATUS_NOT_BLOCKED}, {@link #STATUS_BLOCKED_IN_LIST}, + * {@link #STATUS_BLOCKED_NOT_IN_CONTACTS}, {@link #STATUS_BLOCKED_PAYPHONE}, + * {@link #STATUS_BLOCKED_RESTRICTED}, {@link #STATUS_BLOCKED_UNKNOWN_NUMBER}. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static int shouldSystemBlockNumber(@NonNull Context context, + @NonNull String phoneNumber, @TelecomManager.Presentation int numberPresentation, + boolean isNumberInContacts) { + verifyBlockedNumbersPermission(context); + try { + String caller = context.getOpPackageName(); + Bundle extras = new Bundle(); + extras.putInt(BlockedNumberContract.EXTRA_CALL_PRESENTATION, numberPresentation); + extras.putBoolean(BlockedNumberContract.EXTRA_CONTACT_EXIST, isNumberInContacts); + final Bundle res = context.getContentResolver().call(AUTHORITY_URI, + SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER, phoneNumber, extras); + int blockResult = res != null ? res.getInt(RES_BLOCK_STATUS, STATUS_NOT_BLOCKED) : + BlockedNumberContract.STATUS_NOT_BLOCKED; + Log.d(LOG_TAG, "shouldSystemBlockNumber: number=%s, caller=%s, result=%s", + Log.piiHandle(phoneNumber), caller, + SystemContract.blockStatusToString(blockResult)); + return blockResult; + } catch (NullPointerException | IllegalArgumentException ex) { + // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if + // either of these happen. + Log.w(null, "shouldSystemBlockNumber: provider not ready."); + return BlockedNumberContract.STATUS_NOT_BLOCKED; + } + } + + /** + * Returns the current status of block suppression. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static @NonNull BlockSuppressionStatus getBlockSuppressionStatus( + @NonNull Context context) { + verifyBlockedNumbersPermission(context); + final Bundle res = context.getContentResolver().call( + AUTHORITY_URI, SystemContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS, null, null); + BlockSuppressionStatus blockSuppressionStatus = new BlockSuppressionStatus( + res.getBoolean(SystemContract.RES_IS_BLOCKING_SUPPRESSED, false), + res.getLong(SystemContract.RES_BLOCKING_SUPPRESSED_UNTIL_TIMESTAMP, 0)); + Log.d(LOG_TAG, "getBlockSuppressionStatus: caller=%s, status=%s", + context.getOpPackageName(), blockSuppressionStatus); + return blockSuppressionStatus; + } + + /** + * Check whether should show the emergency call notification. + * + * @param context the context of the caller. + * @return {@code true} if should show emergency call notification. {@code false} otherwise. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static boolean shouldShowEmergencyCallNotification(@NonNull Context context) { + verifyBlockedNumbersPermission(context); + try { + final Bundle res = context.getContentResolver().call(AUTHORITY_URI, + SystemContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION, null, null); + return res != null && res.getBoolean(RES_SHOW_EMERGENCY_CALL_NOTIFICATION, false); + } catch (NullPointerException | IllegalArgumentException ex) { + // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if + // either of these happen. + Log.w(null, "shouldShowEmergencyCallNotification: provider not ready."); + return false; + } + } + + /** + * Check whether the enhanced block setting is enabled. + * + * @param context the context of the caller. + * @param key the key of the setting to check, can be + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_PRIVATE} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_PAYPHONE} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNKNOWN} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE} + * {@link SystemContract#ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION} + * @return {@code true} if the setting is enabled. {@code false} otherwise. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static boolean getBlockedNumberSetting( + @NonNull Context context, @NonNull String key) { + verifyBlockedNumbersPermission(context); + Bundle extras = new Bundle(); + extras.putString(EXTRA_ENHANCED_SETTING_KEY, key); + try { + final Bundle res = context.getContentResolver().call(AUTHORITY_URI, + SystemContract.METHOD_GET_ENHANCED_BLOCK_SETTING, null, extras); + return res != null && res.getBoolean(RES_ENHANCED_SETTING_IS_ENABLED, false); + } catch (NullPointerException | IllegalArgumentException ex) { + // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if + // either of these happen. + Log.w(null, "getEnhancedBlockSetting: provider not ready."); + return false; + } + } + + /** + * Set the enhanced block setting enabled status. + * + * @param context the context of the caller. + * @param key the key of the setting to set, can be + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_PRIVATE} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_PAYPHONE} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNKNOWN} + * {@link SystemContract#ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE} + * {@link SystemContract#ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION} + * @param value the enabled statue of the setting to set. + * @hide + */ + @SystemApi + @RequiresPermission(allOf = { + android.Manifest.permission.READ_BLOCKED_NUMBERS, + android.Manifest.permission.WRITE_BLOCKED_NUMBERS + }) + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static void setBlockedNumberSetting(@NonNull Context context, + @NonNull String key, boolean value) { + verifyBlockedNumbersPermission(context); + Bundle extras = new Bundle(); + extras.putString(EXTRA_ENHANCED_SETTING_KEY, key); + extras.putBoolean(EXTRA_ENHANCED_SETTING_VALUE, value); + context.getContentResolver().call(AUTHORITY_URI, + SystemContract.METHOD_SET_ENHANCED_BLOCK_SETTING, null, extras); + } + + /** + * Represents the current status of + * {@link #shouldSystemBlockNumber(Context, String, int, boolean)}. If emergency services + * have been contacted recently, {@link #mIsSuppressed} is {@code true}, and blocking + * is disabled until the timestamp {@link #mUntilTimestampMillis}. + * @hide + */ + @SystemApi + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public static final class BlockSuppressionStatus { + private boolean mIsSuppressed; + + /** + * Timestamp in milliseconds from epoch. + */ + private long mUntilTimestampMillis; + + public BlockSuppressionStatus(boolean isSuppressed, long untilTimestampMillis) { + this.mIsSuppressed = isSuppressed; + this.mUntilTimestampMillis = untilTimestampMillis; + } + + @Override + public String toString() { + return "[BlockSuppressionStatus; isSuppressed=" + mIsSuppressed + ", until=" + + mUntilTimestampMillis + "]"; + } + + public boolean getIsSuppressed() { + return mIsSuppressed; + } + + public long getUntilTimestampMillis() { + return mUntilTimestampMillis; + } + } + + /** + * Verifies that the caller holds both the + * {@link android.Manifest.permission#READ_BLOCKED_NUMBERS} permission and the + * {@link android.Manifest.permission#WRITE_BLOCKED_NUMBERS} permission. + * + * @param context + * @throws SecurityException if the caller is missing the necessary permissions + */ + private static void verifyBlockedNumbersPermission(Context context) { + context.enforceCallingOrSelfPermission(Manifest.permission.READ_BLOCKED_NUMBERS, + "Caller does not have the android.permission.READ_BLOCKED_NUMBERS permission"); + context.enforceCallingOrSelfPermission(Manifest.permission.WRITE_BLOCKED_NUMBERS, + "Caller does not have the android.permission.WRITE_BLOCKED_NUMBERS permission"); + } } /** @hide */ @@ -558,7 +893,7 @@ public class BlockedNumberContract { * {@link #ENHANCED_SETTING_KEY_BLOCK_PAYPHONE} * {@link #ENHANCED_SETTING_KEY_BLOCK_UNKNOWN} * {@link #ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE} - * {@link #ENHANCED_SETTING_KEY_EMERGENCY_CALL_NOTIFICATION_SHOWING} + * {@link #ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION} * @return {@code true} if the setting is enabled. {@code false} otherwise. */ public static boolean getEnhancedBlockSetting(Context context, String key) { @@ -586,7 +921,7 @@ public class BlockedNumberContract { * {@link #ENHANCED_SETTING_KEY_BLOCK_PAYPHONE} * {@link #ENHANCED_SETTING_KEY_BLOCK_UNKNOWN} * {@link #ENHANCED_SETTING_KEY_BLOCK_UNAVAILABLE} - * {@link #ENHANCED_SETTING_KEY_EMERGENCY_CALL_NOTIFICATION_SHOWING} + * {@link #ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION} * @param value the enabled statue of the setting to set. */ public static void setEnhancedBlockSetting(Context context, String key, boolean value) { diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 7d127ad660c5..c13dd363d79e 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -19,6 +19,7 @@ package android.provider; import android.Manifest; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.LongDef; import android.annotation.NonNull; @@ -55,6 +56,8 @@ import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.util.Log; +import com.android.server.telecom.flags.Flags; + import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -427,6 +430,8 @@ public class CallLog { private double mLongitude = Double.NaN; private Uri mPictureUri; private int mIsPhoneAccountMigrationPending; + private boolean mIsBusinessCall; + private String mBusinessName; /** * @param callerInfo the CallerInfo object to get the target contact from. @@ -645,15 +650,44 @@ public class CallLog { } /** + * @param isBusinessCall should be set if the caller is a business call + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public @NonNull AddCallParametersBuilder setIsBusinessCall(boolean isBusinessCall) { + mIsBusinessCall = isBusinessCall; + return this; + } + + /** + * @param businessName should be set if the caller is a business call + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public @NonNull AddCallParametersBuilder setBusinessName(String businessName) { + mBusinessName = businessName; + return this; + } + + /** * Builds the object */ public @NonNull AddCallParams build() { - return new AddCallParams(mCallerInfo, mNumber, mPostDialDigits, mViaNumber, - mPresentation, mCallType, mFeatures, mAccountHandle, mStart, mDuration, - mDataUsage, mAddForAllUsers, mUserToBeInsertedTo, mIsRead, mCallBlockReason, - mCallScreeningAppName, mCallScreeningComponentName, mMissedReason, - mPriority, mSubject, mLatitude, mLongitude, mPictureUri, - mIsPhoneAccountMigrationPending); + if (Flags.businessCallComposer()) { + return new AddCallParams(mCallerInfo, mNumber, mPostDialDigits, mViaNumber, + mPresentation, mCallType, mFeatures, mAccountHandle, mStart, mDuration, + mDataUsage, mAddForAllUsers, mUserToBeInsertedTo, mIsRead, + mCallBlockReason, + mCallScreeningAppName, mCallScreeningComponentName, mMissedReason, + mPriority, mSubject, mLatitude, mLongitude, mPictureUri, + mIsPhoneAccountMigrationPending, mIsBusinessCall, mBusinessName); + } else { + return new AddCallParams(mCallerInfo, mNumber, mPostDialDigits, mViaNumber, + mPresentation, mCallType, mFeatures, mAccountHandle, mStart, mDuration, + mDataUsage, mAddForAllUsers, mUserToBeInsertedTo, mIsRead, + mCallBlockReason, + mCallScreeningAppName, mCallScreeningComponentName, mMissedReason, + mPriority, mSubject, mLatitude, mLongitude, mPictureUri, + mIsPhoneAccountMigrationPending); + } } } @@ -681,6 +715,8 @@ public class CallLog { private double mLongitude = Double.NaN; private Uri mPictureUri; private int mIsPhoneAccountMigrationPending; + private boolean mIsBusinessCall; + private String mBusinessName; private AddCallParams(CallerInfo callerInfo, String number, String postDialDigits, String viaNumber, int presentation, int callType, int features, @@ -717,6 +753,43 @@ public class CallLog { mIsPhoneAccountMigrationPending = isPhoneAccountMigrationPending; } + private AddCallParams(CallerInfo callerInfo, String number, String postDialDigits, + String viaNumber, int presentation, int callType, int features, + PhoneAccountHandle accountHandle, long start, int duration, long dataUsage, + boolean addForAllUsers, UserHandle userToBeInsertedTo, boolean isRead, + int callBlockReason, + CharSequence callScreeningAppName, String callScreeningComponentName, + long missedReason, + int priority, String subject, double latitude, double longitude, Uri pictureUri, + int isPhoneAccountMigrationPending, boolean isBusinessCall, String businessName) { + mCallerInfo = callerInfo; + mNumber = number; + mPostDialDigits = postDialDigits; + mViaNumber = viaNumber; + mPresentation = presentation; + mCallType = callType; + mFeatures = features; + mAccountHandle = accountHandle; + mStart = start; + mDuration = duration; + mDataUsage = dataUsage; + mAddForAllUsers = addForAllUsers; + mUserToBeInsertedTo = userToBeInsertedTo; + mIsRead = isRead; + mCallBlockReason = callBlockReason; + mCallScreeningAppName = callScreeningAppName; + mCallScreeningComponentName = callScreeningComponentName; + mMissedReason = missedReason; + mPriority = priority; + mSubject = subject; + mLatitude = latitude; + mLongitude = longitude; + mPictureUri = pictureUri; + mIsPhoneAccountMigrationPending = isPhoneAccountMigrationPending; + mIsBusinessCall = isBusinessCall; + mBusinessName = businessName; + } + } /** @@ -915,6 +988,19 @@ public class CallLog { */ public static final String NUMBER = "number"; + + /** + * Boolean indicating whether the call is a business call. + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String IS_BUSINESS_CALL = "is_business_call"; + + /** + * String that stores the asserted display name associated with business call. + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String ASSERTED_DISPLAY_NAME = "asserted_display_name"; + /** * The number presenting rules set by the network. * @@ -1713,7 +1799,6 @@ public class CallLog { } ContentValues values = new ContentValues(14); - values.put(NUMBER, params.mNumber); values.put(POST_DIAL_DIGITS, params.mPostDialDigits); values.put(VIA_NUMBER, params.mViaNumber); @@ -1746,7 +1831,10 @@ public class CallLog { values.put(COMPOSER_PHOTO_URI, params.mPictureUri.toString()); } values.put(IS_PHONE_ACCOUNT_MIGRATION_PENDING, params.mIsPhoneAccountMigrationPending); - + if (Flags.businessCallComposer()) { + values.put(IS_BUSINESS_CALL, Integer.valueOf(params.mIsBusinessCall ? 1 : 0)); + values.put(ASSERTED_DISPLAY_NAME, params.mBusinessName); + } if ((params.mCallerInfo != null) && (params.mCallerInfo.getContactId() > 0)) { // Update usage information for the number associated with the contact ID. // We need to use both the number and the ID for obtaining a data ID since other diff --git a/core/java/android/provider/ContactKeysManager.java b/core/java/android/provider/ContactKeysManager.java index bef645698b4a..01aaa3d9647e 100644 --- a/core/java/android/provider/ContactKeysManager.java +++ b/core/java/android/provider/ContactKeysManager.java @@ -39,18 +39,19 @@ import java.util.List; import java.util.Objects; /** - * ContactKeysManager provides the access to the E2EE contact keys provider. - * It manages two types of keys - {@link ContactKey} of other users' and the owner's keys - - * {@link SelfKey}. + * ContactKeysManager provides access to the provider of end-to-end encryption contact keys. + * It manages two types of keys - {@link ContactKey} and {@link SelfKey}. * <ul> * <li> - * For {@link ContactKey} this API allows the insert/update, removal, changing of the - * verification state, retrieving the keys (either created by or visible to the caller app) - * operations. + * A {@link ContactKey} is a public key associated with a contact. It's used to end-to-end + * encrypt the communications between a user and the contact. This API allows operations on + * {@link ContactKey}s to insert/update, remove, change the verification state, and retrieving + * keys (either created by or visible to the caller app). * </li> * <li> - * For {@link SelfKey} this API allows the insert/update, removal, retrieving the self keys - * (either created by or visible to the caller app) operations. + * A {@link SelfKey} is a key for this device, so the key represents the owner of the device. + * This API allows operations on {@link SelfKey}s to insert/update, remove, and retrieving + * self keys (either created by or visible to the caller app). * </li> * </ul> * Keys are uniquely identified by: @@ -71,7 +72,7 @@ import java.util.Objects; * ContactsProvider. */ @FlaggedApi(Flags.FLAG_USER_KEYS) -public class ContactKeysManager { +public final class ContactKeysManager { /** * The authority for the contact keys provider. * @hide @@ -354,9 +355,9 @@ public class ContactKeysManager { private static void validateVerificationState(int verificationState) { - if (verificationState != UNVERIFIED - && verificationState != VERIFICATION_FAILED - && verificationState != VERIFIED) { + if (verificationState != VERIFICATION_STATE_UNVERIFIED + && verificationState != VERIFICATION_STATE_VERIFICATION_FAILED + && verificationState != VERIFICATION_STATE_VERIFIED) { throw new IllegalArgumentException("Verification state value " + verificationState + " is not supported"); } @@ -600,25 +601,25 @@ public class ContactKeysManager { * @hide */ @IntDef(prefix = {"VERIFICATION_STATE_"}, value = { - UNVERIFIED, - VERIFICATION_FAILED, - VERIFIED + VERIFICATION_STATE_UNVERIFIED, + VERIFICATION_STATE_VERIFICATION_FAILED, + VERIFICATION_STATE_VERIFIED }) @Retention(RetentionPolicy.SOURCE) public @interface VerificationState {} /** - * Unverified state of a contact E2EE key. + * Unverified state of a contact end to end encrypted key. */ - public static final int UNVERIFIED = 0; + public static final int VERIFICATION_STATE_UNVERIFIED = 0; /** - * Failed verification state of a contact E2EE key. + * Failed verification state of a contact end to end encrypted key. */ - public static final int VERIFICATION_FAILED = 1; + public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1; /** - * Verified state of a contact E2EE key. + * Verified state of a contact end to end encrypted key. */ - public static final int VERIFIED = 2; + public static final int VERIFICATION_STATE_VERIFIED = 2; /** @hide */ public static final class ContactKeys { @@ -791,7 +792,7 @@ public class ContactKeysManager { } /** - * A parcelable class encapsulating other users' E2EE contact key. + * A parcelable class encapsulating other users' end to end encrypted contact key. */ public static final class ContactKey implements Parcelable { /** @@ -1056,7 +1057,7 @@ public class ContactKeysManager { } /** - * A parcelable class encapsulating self E2EE contact key. + * A parcelable class encapsulating self end to end encrypted contact key. */ public static final class SelfKey implements Parcelable { /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 26f46cfe85c7..ecf193739627 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -668,6 +668,23 @@ public final class Settings { "android.settings.MANAGE_APP_LONG_RUNNING_JOBS"; /** + * Activity Action: Show settings to allow configuration of + * {@link Manifest.permission#RUN_BACKUP_JOBS} permission. + * + * Input: Optionally, the Intent's data URI can specify the application package name to + * directly invoke the management GUI specific to the package name. For example + * "package:com.my.app". + * <p> + * Output: When a package data uri is passed as input, the activity result is set to + * {@link android.app.Activity#RESULT_OK} if the permission was granted to the app. Otherwise, + * the result is set to {@link android.app.Activity#RESULT_CANCELED}. + */ + @FlaggedApi(Flags.FLAG_BACKUP_TASKS_SETTINGS_SCREEN) + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_REQUEST_RUN_BACKUP_JOBS = + "android.settings.REQUEST_RUN_BACKUP_JOBS"; + + /** * Activity Action: Show settings to allow configuration of cross-profile access for apps * * Input: Optionally, the Intent's data URI can specify the application package name to @@ -11044,6 +11061,15 @@ public final class Settings { public static final String SEARCH_LONG_PRESS_HOME_ENABLED = "search_long_press_home_enabled"; + + /** + * Whether or not the accessibility data streaming is enbled for the + * {@link VisualQueryDetectedResult#setAccessibilityDetectionData}. + * @hide + */ + public static final String VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED = + "visual_query_accessibility_detection_enabled"; + /** * Control whether Night display is currently activated. * @hide @@ -11833,6 +11859,7 @@ public final class Settings { * Whether to enable camera extensions software fallback. * @hide */ + @Readable public static final String CAMERA_EXTENSIONS_FALLBACK = "camera_extensions_fallback"; /** @@ -12268,6 +12295,14 @@ public final class Settings { "extra_automatic_power_save_mode"; /** + * Whether contextual screen timeout is enabled. + * + * @hide + */ + public static final String CONTEXTUAL_SCREEN_TIMEOUT_ENABLED = + "contextual_screen_timeout_enabled"; + + /** * Whether lockscreen weather is enabled. * * @hide diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 658cec86f7d5..88bd87e6c27c 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4956,6 +4956,26 @@ public final class Telephony { */ public static final String COLUMN_SERVICE_CAPABILITIES = "service_capabilities"; + /** + * TelephonyProvider column name for satellite entitlement status. The value of this column + * is set based on entitlement query result for satellite configuration. + * By default, it's disabled. + * + * @hide + */ + public static final String COLUMN_SATELLITE_ENTITLEMENT_STATUS = + "satellite_entitlement_status"; + + /** + * TelephonyProvider column name for satellite entitlement plmns. The value of this + * column is set based on entitlement query result for satellite configuration. + * By default, it's empty. + * + * @hide + */ + public static final String COLUMN_SATELLITE_ENTITLEMENT_PLMNS = + "satellite_entitlement_plmns"; + /** All columns in {@link SimInfo} table. */ private static final List<String> ALL_COLUMNS = List.of( COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID, @@ -5029,7 +5049,9 @@ public final class Telephony { COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER, COLUMN_IS_NTN, COLUMN_SERVICE_CAPABILITIES, - COLUMN_TRANSFER_STATUS + COLUMN_TRANSFER_STATUS, + COLUMN_SATELLITE_ENTITLEMENT_STATUS, + COLUMN_SATELLITE_ENTITLEMENT_PLMNS ); /** diff --git a/core/java/android/provider/flags.aconfig b/core/java/android/provider/flags.aconfig index 0f12b1397c5b..ea1ac2793a11 100644 --- a/core/java/android/provider/flags.aconfig +++ b/core/java/android/provider/flags.aconfig @@ -13,3 +13,10 @@ flag { description: "This flag controls new E2EE contact keys API" bug: "290696572" } + +flag { + name: "backup_tasks_settings_screen" + namespace: "backstage_power" + description: "Add a new settings page for the RUN_BACKUP_JOBS permission." + bug: "320563660" +} diff --git a/core/java/android/service/appprediction/AppPredictionService.java b/core/java/android/service/appprediction/AppPredictionService.java index a2ffa5d34219..2402cfda3fe1 100644 --- a/core/java/android/service/appprediction/AppPredictionService.java +++ b/core/java/android/service/appprediction/AppPredictionService.java @@ -18,6 +18,7 @@ package android.service.appprediction; import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; import android.annotation.CallSuper; +import android.annotation.FlaggedApi; import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; @@ -31,12 +32,15 @@ import android.app.prediction.AppTargetId; import android.app.prediction.IPredictionCallback; import android.content.Intent; import android.content.pm.ParceledListSlice; +import android.os.Bundle; import android.os.CancellationSignal; import android.os.Handler; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.Looper; import android.os.RemoteException; import android.service.appprediction.IPredictionService.Stub; +import android.service.appprediction.flags.Flags; import android.util.ArrayMap; import android.util.Log; import android.util.Slog; @@ -134,6 +138,16 @@ public abstract class AppPredictionService extends Service { obtainMessage(AppPredictionService::doDestroyPredictionSession, AppPredictionService.this, sessionId)); } + + @FlaggedApi(Flags.FLAG_SERVICE_FEATURES_API) + @Override + public void requestServiceFeatures(AppPredictionSessionId sessionId, + IRemoteCallback callback) { + mHandler.sendMessage( + obtainMessage(AppPredictionService::onRequestServiceFeatures, + AppPredictionService.this, sessionId, + new RemoteCallbackWrapper(callback, null))); + } }; @CallSuper @@ -277,6 +291,18 @@ public abstract class AppPredictionService extends Service { public void onDestroyPredictionSession(@NonNull AppPredictionSessionId sessionId) {} /** + * Called by the client app to request {@link AppPredictionService} features info. + * + * @param sessionId the session's Id. It is @NonNull. + * @param callback the callback to return the Bundle which includes service features info. It + * is @NonNull. + */ + @FlaggedApi(Flags.FLAG_SERVICE_FEATURES_API) + @MainThread + public void onRequestServiceFeatures(@NonNull AppPredictionSessionId sessionId, + @NonNull Consumer<Bundle> callback) {} + + /** * Used by the prediction factory to send back results the client app. The can be called * in response to {@link #onRequestPredictionUpdate(AppPredictionSessionId)} or proactively as * a result of changes in predictions. @@ -357,4 +383,50 @@ public abstract class AppPredictionService extends Service { } } } + + private static final class RemoteCallbackWrapper implements Consumer<Bundle>, + IBinder.DeathRecipient { + + private IRemoteCallback mCallback; + private final Consumer<RemoteCallbackWrapper> mOnBinderDied; + + RemoteCallbackWrapper(IRemoteCallback callback, + @Nullable Consumer<RemoteCallbackWrapper> onBinderDied) { + mCallback = callback; + mOnBinderDied = onBinderDied; + if (mOnBinderDied != null) { + try { + mCallback.asBinder().linkToDeath(this, 0); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to link to death: " + e); + } + } + } + + public void destroy() { + if (mCallback != null && mOnBinderDied != null) { + mCallback.asBinder().unlinkToDeath(this, 0); + } + } + + @Override + public void accept(Bundle bundle) { + try { + if (mCallback != null) { + mCallback.sendResult(bundle); + } + } catch (RemoteException e) { + Slog.e(TAG, "Error sending result:" + e); + } + } + + @Override + public void binderDied() { + destroy(); + mCallback = null; + if (mOnBinderDied != null) { + mOnBinderDied.accept(this); + } + } + } } diff --git a/core/java/android/service/appprediction/IPredictionService.aidl b/core/java/android/service/appprediction/IPredictionService.aidl index 0f3df8561743..e144dfa4b22c 100644 --- a/core/java/android/service/appprediction/IPredictionService.aidl +++ b/core/java/android/service/appprediction/IPredictionService.aidl @@ -22,6 +22,7 @@ import android.app.prediction.AppPredictionContext; import android.app.prediction.AppPredictionSessionId; import android.app.prediction.IPredictionCallback; import android.content.pm.ParceledListSlice; +import android.os.IRemoteCallback; /** * Interface from the system to a prediction service. @@ -50,4 +51,6 @@ oneway interface IPredictionService { void requestPredictionUpdate(in AppPredictionSessionId sessionId); void onDestroyPredictionSession(in AppPredictionSessionId sessionId); + + void requestServiceFeatures(in AppPredictionSessionId sessionId, in IRemoteCallback callback); } diff --git a/core/java/android/service/appprediction/flags/flags.aconfig b/core/java/android/service/appprediction/flags/flags.aconfig new file mode 100644 index 000000000000..c7e47d4b3627 --- /dev/null +++ b/core/java/android/service/appprediction/flags/flags.aconfig @@ -0,0 +1,8 @@ +package: "android.service.appprediction.flags" + +flag { + name: "service_features_api" + namespace: "systemui" + description: "Guards the new requestServiceFeatures api" + bug: "292565550" +}
\ No newline at end of file diff --git a/core/java/android/service/chooser/AdditionalContentContract.java b/core/java/android/service/chooser/AdditionalContentContract.java new file mode 100644 index 000000000000..f679e8a6ff6b --- /dev/null +++ b/core/java/android/service/chooser/AdditionalContentContract.java @@ -0,0 +1,60 @@ +/* + * 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 android.service.chooser; + +import android.annotation.FlaggedApi; + +/** + * Specifies constants used by Chooser when interacting with the additional content provider, + * see {@link android.content.Intent#EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI}. + */ +@FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING) +public interface AdditionalContentContract { + + interface Columns { + /** + * Content URI for this item. + * <p> + * Note that this content URI must have a different authority from the content provided + * given in {@link android.content.Intent#EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI}. + */ + String URI = "uri"; + } + + /** + * Constants for {@link android.database.Cursor#getExtras} keys. + */ + interface CursorExtraKeys { + /** + * An integer, zero-based cursor position that corresponds to the URI specified + * with the {@link android.content.Intent#EXTRA_CHOOSER_FOCUSED_ITEM_POSITION} index into + * the @link android.content.Intent#EXTRA_STREAM} array. + */ + String POSITION = "position"; + } + + /** + * Constants for method names used with {@link android.content.ContentResolver#call} method. + */ + interface MethodNames { + /** + * A method name Chooser is using to notify the sharing app about a shared items selection + * change. + */ + String ON_SELECTION_CHANGED = "onSelectionChanged"; + } +} diff --git a/core/java/android/service/chooser/ChooserResult.java b/core/java/android/service/chooser/ChooserResult.java new file mode 100644 index 000000000000..4603be114508 --- /dev/null +++ b/core/java/android/service/chooser/ChooserResult.java @@ -0,0 +1,173 @@ +/* + * 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.service.chooser; + +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledSince; +import android.compat.annotation.Overridable; +import android.content.ComponentName; +import android.content.Intent; +import android.content.IntentSender; +import android.os.Build; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Objects; + +/** + * An event reported to a supplied [IntentSender] by the system chooser when an activity is selected + * or other actions are taken to complete the session. + * + * @see Intent#EXTRA_CHOOSER_RESULT_INTENT_SENDER + */ +@FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT) +public final class ChooserResult implements Parcelable { + + /** + * Controls whether to send ChooserResult to the optional IntentSender supplied to the Chooser. + * <p> + * When enabled, ChooserResult is added to the provided Intent as + * {@link Intent#EXTRA_CHOOSER_RESULT}, and sent for actions such as copy and edit, in addition + * to activity selection. When disabled, only the selected component + * is provided in {@link Intent#EXTRA_CHOSEN_COMPONENT}. + * <p> + * See: {@link Intent#createChooser(Intent, CharSequence, IntentSender)} + * + * @hide + */ + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + @Overridable + public static final long SEND_CHOOSER_RESULT = 263474465L; + + /** @hide */ + @IntDef({ + CHOOSER_RESULT_UNKNOWN, + CHOOSER_RESULT_SELECTED_COMPONENT, + CHOOSER_RESULT_COPY, + CHOOSER_RESULT_EDIT + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ResultType { } + + /** An unknown action was taken to complete the session. */ + public static final int CHOOSER_RESULT_UNKNOWN = -1; + /** The session was completed by selecting an activity to launch. */ + public static final int CHOOSER_RESULT_SELECTED_COMPONENT = 0; + /** The session was completed by invoking the copy action. */ + public static final int CHOOSER_RESULT_COPY = 1; + /** The session was completed by invoking the edit action. */ + public static final int CHOOSER_RESULT_EDIT = 2; + + @ResultType + private final int mType; + private final ComponentName mSelectedComponent; + private final boolean mIsShortcut; + + private ChooserResult(@NonNull Parcel source) { + mType = source.readInt(); + mSelectedComponent = ComponentName.readFromParcel(source); + mIsShortcut = source.readBoolean(); + } + + /** @hide */ + public ChooserResult(@ResultType int type, @Nullable ComponentName componentName, + boolean isShortcut) { + mType = type; + mSelectedComponent = componentName; + mIsShortcut = isShortcut; + } + + /** + * The type of the result. + * + * @return the type of the result + */ + @ResultType + public int getType() { + return mType; + } + + /** + * Provides the component of the Activity selected for results with type + * when type is {@link ChooserResult#CHOOSER_RESULT_SELECTED_COMPONENT}. + * <p> + * For all other types, this value is null. + * + * @return the component name selected + */ + @Nullable + public ComponentName getSelectedComponent() { + return mSelectedComponent; + } + + /** + * Whether the selected component was provided by the app from as a shortcut. + * + * @return true if the selected component is a shortcut, false otherwise + */ + public boolean isShortcut() { + return mIsShortcut; + } + + @Override + public int describeContents() { + return 0; + } + + @NonNull + public static final Parcelable.Creator<ChooserResult> CREATOR = + new Creator<>() { + @Override + public ChooserResult createFromParcel(Parcel source) { + return new ChooserResult(source); + } + + @Override + public ChooserResult[] newArray(int size) { + return new ChooserResult[0]; + } + }; + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeInt(mType); + ComponentName.writeToParcel(mSelectedComponent, dest); + dest.writeBoolean(mIsShortcut); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ChooserResult that = (ChooserResult) o; + return mType == that.mType + && mIsShortcut == that.mIsShortcut + && Objects.equals(mSelectedComponent, that.mSelectedComponent); + } + + @Override + public int hashCode() { + return Objects.hash(mType, mSelectedComponent, mIsShortcut); + } +} diff --git a/core/java/android/service/chooser/flags.aconfig b/core/java/android/service/chooser/flags.aconfig index 3cc7f5a6ee04..add575b23792 100644 --- a/core/java/android/service/chooser/flags.aconfig +++ b/core/java/android/service/chooser/flags.aconfig @@ -8,6 +8,13 @@ flag { } flag { + name: "enable_sharesheet_metadata_extra" + namespace: "intentresolver" + description: "This flag enables sharesheet metadata to be displayed to users." + bug: "318942069" +} + +flag { name: "support_nfc_resolver" namespace: "systemui" description: "This flag controls the new NFC 'resolver' activity" @@ -20,3 +27,10 @@ flag { description: "This flag controls content toggling in Chooser" bug: "302691505" } + +flag { + name: "enable_chooser_result" + namespace: "intentresolver" + description: "Provides additional callbacks with information about user actions in ChooserResult" + bug: "263474465" +} diff --git a/core/java/android/service/notification/ZenDeviceEffects.java b/core/java/android/service/notification/ZenDeviceEffects.java index 90049e6a934a..22b1be08e1db 100644 --- a/core/java/android/service/notification/ZenDeviceEffects.java +++ b/core/java/android/service/notification/ZenDeviceEffects.java @@ -20,6 +20,7 @@ import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.TestApi; import android.app.Flags; import android.os.Parcel; import android.os.Parcelable; @@ -27,7 +28,10 @@ import android.os.Parcelable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; import java.util.Objects; +import java.util.Set; /** * Represents the set of device effects (affecting display and device behavior in general) that @@ -51,6 +55,7 @@ public final class ZenDeviceEffects implements Parcelable { FIELD_DISABLE_TOUCH, FIELD_MINIMIZE_RADIO_USAGE, FIELD_MAXIMIZE_DOZE, + FIELD_EXTRA_EFFECTS }) @Retention(RetentionPolicy.SOURCE) public @interface ModifiableField {} @@ -95,6 +100,12 @@ public final class ZenDeviceEffects implements Parcelable { * @hide */ public static final int FIELD_MAXIMIZE_DOZE = 1 << 9; + /** + * @hide + */ + public static final int FIELD_EXTRA_EFFECTS = 1 << 10; + + private static final int MAX_EFFECTS_LENGTH = 2_000; // characters private final boolean mGrayscale; private final boolean mSuppressAmbientDisplay; @@ -107,11 +118,12 @@ public final class ZenDeviceEffects implements Parcelable { private final boolean mDisableTouch; private final boolean mMinimizeRadioUsage; private final boolean mMaximizeDoze; + private final Set<String> mExtraEffects; private ZenDeviceEffects(boolean grayscale, boolean suppressAmbientDisplay, boolean dimWallpaper, boolean nightMode, boolean disableAutoBrightness, boolean disableTapToWake, boolean disableTiltToWake, boolean disableTouch, - boolean minimizeRadioUsage, boolean maximizeDoze) { + boolean minimizeRadioUsage, boolean maximizeDoze, Set<String> extraEffects) { mGrayscale = grayscale; mSuppressAmbientDisplay = suppressAmbientDisplay; mDimWallpaper = dimWallpaper; @@ -122,6 +134,21 @@ public final class ZenDeviceEffects implements Parcelable { mDisableTouch = disableTouch; mMinimizeRadioUsage = minimizeRadioUsage; mMaximizeDoze = maximizeDoze; + mExtraEffects = Collections.unmodifiableSet(extraEffects); + } + + /** @hide */ + @FlaggedApi(Flags.FLAG_MODES_API) + public void validate() { + int extraEffectsLength = 0; + for (String extraEffect : mExtraEffects) { + extraEffectsLength += extraEffect.length(); + } + if (extraEffectsLength > MAX_EFFECTS_LENGTH) { + throw new IllegalArgumentException( + "Total size of extra effects must be at most " + MAX_EFFECTS_LENGTH + + " characters"); + } } @Override @@ -138,19 +165,20 @@ public final class ZenDeviceEffects implements Parcelable { && this.mDisableTiltToWake == that.mDisableTiltToWake && this.mDisableTouch == that.mDisableTouch && this.mMinimizeRadioUsage == that.mMinimizeRadioUsage - && this.mMaximizeDoze == that.mMaximizeDoze; + && this.mMaximizeDoze == that.mMaximizeDoze + && Objects.equals(this.mExtraEffects, that.mExtraEffects); } @Override public int hashCode() { return Objects.hash(mGrayscale, mSuppressAmbientDisplay, mDimWallpaper, mNightMode, mDisableAutoBrightness, mDisableTapToWake, mDisableTiltToWake, mDisableTouch, - mMinimizeRadioUsage, mMaximizeDoze); + mMinimizeRadioUsage, mMaximizeDoze, mExtraEffects); } @Override public String toString() { - ArrayList<String> effects = new ArrayList<>(10); + ArrayList<String> effects = new ArrayList<>(11); if (mGrayscale) effects.add("grayscale"); if (mSuppressAmbientDisplay) effects.add("suppressAmbientDisplay"); if (mDimWallpaper) effects.add("dimWallpaper"); @@ -161,6 +189,9 @@ public final class ZenDeviceEffects implements Parcelable { if (mDisableTouch) effects.add("disableTouch"); if (mMinimizeRadioUsage) effects.add("minimizeRadioUsage"); if (mMaximizeDoze) effects.add("maximizeDoze"); + if (mExtraEffects.size() > 0) { + effects.add("extraEffects=[" + String.join(",", mExtraEffects) + "]"); + } return "[" + String.join(", ", effects) + "]"; } @@ -197,6 +228,9 @@ public final class ZenDeviceEffects implements Parcelable { if ((bitmask & FIELD_MAXIMIZE_DOZE) != 0) { modified.add("FIELD_MAXIMIZE_DOZE"); } + if ((bitmask & FIELD_EXTRA_EFFECTS) != 0) { + modified.add("FIELD_EXTRA_EFFECTS"); + } return "{" + String.join(",", modified) + "}"; } @@ -270,7 +304,7 @@ public final class ZenDeviceEffects implements Parcelable { } /** - * Whether Doze should be enhanced (e.g. with more aggresive activation, or less frequent + * Whether Doze should be enhanced (e.g. with more aggressive activation, or less frequent * maintenance windows) while the rule is active. * @hide */ @@ -279,13 +313,26 @@ public final class ZenDeviceEffects implements Parcelable { } /** + * (Immutable) set of extra effects to be applied while the rule is active. Extra effects are + * not used in AOSP, but OEMs may add support for them by providing a custom + * {@link DeviceEffectsApplier}. + * @hide + */ + @TestApi + @NonNull + public Set<String> getExtraEffects() { + return mExtraEffects; + } + + /** * Whether any of the effects are set up. * @hide */ public boolean hasEffects() { return mGrayscale || mSuppressAmbientDisplay || mDimWallpaper || mNightMode || mDisableAutoBrightness || mDisableTapToWake || mDisableTiltToWake - || mDisableTouch || mMinimizeRadioUsage || mMaximizeDoze; + || mDisableTouch || mMinimizeRadioUsage || mMaximizeDoze + || mExtraEffects.size() > 0; } /** {@link Parcelable.Creator} that instantiates {@link ZenDeviceEffects} objects. */ @@ -296,7 +343,8 @@ public final class ZenDeviceEffects implements Parcelable { return new ZenDeviceEffects(in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), in.readBoolean(), - in.readBoolean()); + in.readBoolean(), + Set.of(in.readArray(String.class.getClassLoader(), String.class))); } @Override @@ -322,6 +370,7 @@ public final class ZenDeviceEffects implements Parcelable { dest.writeBoolean(mDisableTouch); dest.writeBoolean(mMinimizeRadioUsage); dest.writeBoolean(mMaximizeDoze); + dest.writeArray(mExtraEffects.toArray(new String[0])); } /** Builder class for {@link ZenDeviceEffects} objects. */ @@ -338,6 +387,7 @@ public final class ZenDeviceEffects implements Parcelable { private boolean mDisableTouch; private boolean mMinimizeRadioUsage; private boolean mMaximizeDoze; + private final HashSet<String> mExtraEffects = new HashSet<>(); /** * Instantiates a new {@link ZenPolicy.Builder} with all effects set to default (disabled). @@ -360,6 +410,7 @@ public final class ZenDeviceEffects implements Parcelable { mDisableTouch = zenDeviceEffects.shouldDisableTouch(); mMinimizeRadioUsage = zenDeviceEffects.shouldMinimizeRadioUsage(); mMaximizeDoze = zenDeviceEffects.shouldMaximizeDoze(); + mExtraEffects.addAll(zenDeviceEffects.getExtraEffects()); } /** @@ -450,7 +501,7 @@ public final class ZenDeviceEffects implements Parcelable { } /** - * Sets whether Doze should be enhanced (e.g. with more aggresive activation, or less + * Sets whether Doze should be enhanced (e.g. with more aggressive activation, or less * frequent maintenance windows) while the rule is active. * @hide */ @@ -461,6 +512,54 @@ public final class ZenDeviceEffects implements Parcelable { } /** + * Sets the extra effects to be applied while the rule is active. Extra effects are not + * used in AOSP, but OEMs may add support for them by providing a custom + * {@link DeviceEffectsApplier}. + * + * @apiNote The total size of the extra effects (concatenation of strings) is limited. + * + * @hide + */ + @TestApi + @NonNull + public Builder setExtraEffects(@NonNull Set<String> extraEffects) { + Objects.requireNonNull(extraEffects); + mExtraEffects.clear(); + mExtraEffects.addAll(extraEffects); + return this; + } + + /** + * Adds the supplied extra effects to the set to be applied while the rule is active. + * Extra effects are not used in AOSP, but OEMs may add support for them by providing a + * custom {@link DeviceEffectsApplier}. + * + * @apiNote The total size of the extra effects (concatenation of strings) is limited. + * + * @hide + */ + @NonNull + public Builder addExtraEffects(@NonNull Set<String> extraEffects) { + mExtraEffects.addAll(Objects.requireNonNull(extraEffects)); + return this; + } + + /** + * Adds the supplied extra effect to the set to be applied while the rule is active. + * Extra effects are not used in AOSP, but OEMs may add support for them by providing a + * custom {@link DeviceEffectsApplier}. + * + * @apiNote The total size of the extra effects (concatenation of strings) is limited. + * + * @hide + */ + @NonNull + public Builder addExtraEffect(@NonNull String extraEffect) { + mExtraEffects.add(Objects.requireNonNull(extraEffect)); + return this; + } + + /** * Applies the effects that are {@code true} on the supplied {@link ZenDeviceEffects} to * this builder (essentially logically-ORing the effect set). * @hide @@ -478,6 +577,7 @@ public final class ZenDeviceEffects implements Parcelable { if (effects.shouldDisableTouch()) setShouldDisableTouch(true); if (effects.shouldMinimizeRadioUsage()) setShouldMinimizeRadioUsage(true); if (effects.shouldMaximizeDoze()) setShouldMaximizeDoze(true); + addExtraEffects(effects.getExtraEffects()); return this; } @@ -487,7 +587,7 @@ public final class ZenDeviceEffects implements Parcelable { return new ZenDeviceEffects(mGrayscale, mSuppressAmbientDisplay, mDimWallpaper, mNightMode, mDisableAutoBrightness, mDisableTapToWake, mDisableTiltToWake, mDisableTouch, mMinimizeRadioUsage, - mMaximizeDoze); + mMaximizeDoze, mExtraEffects); } } } diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index d4a5356d99c6..f169ecd1a4e5 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -27,6 +27,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OF import android.annotation.FlaggedApi; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.AlarmManager; @@ -65,17 +66,21 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.time.Instant; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.TimeZone; import java.util.UUID; +import java.util.regex.Pattern; /** * Persisted configuration for zen mode. @@ -272,8 +277,13 @@ public class ZenModeConfig implements Parcelable { private static final String DEVICE_EFFECT_DISABLE_TOUCH = "zdeDisableTouch"; private static final String DEVICE_EFFECT_MINIMIZE_RADIO_USAGE = "zdeMinimizeRadioUsage"; private static final String DEVICE_EFFECT_MAXIMIZE_DOZE = "zdeMaximizeDoze"; + private static final String DEVICE_EFFECT_EXTRAS = "zdeExtraEffects"; private static final String DEVICE_EFFECT_USER_MODIFIED_FIELDS = "zdeUserModifiedFields"; + private static final String ITEM_SEPARATOR = ","; + private static final String ITEM_SEPARATOR_ESCAPE = "\\"; + private static final Pattern ITEM_SPLITTER_REGEX = Pattern.compile("(?<!\\\\),"); + @UnsupportedAppUsage public boolean allowAlarms = DEFAULT_ALLOW_ALARMS; public boolean allowMedia = DEFAULT_ALLOW_MEDIA; @@ -1099,6 +1109,7 @@ public class ZenModeConfig implements Parcelable { .setShouldMinimizeRadioUsage( safeBoolean(parser, DEVICE_EFFECT_MINIMIZE_RADIO_USAGE, false)) .setShouldMaximizeDoze(safeBoolean(parser, DEVICE_EFFECT_MAXIMIZE_DOZE, false)) + .setExtraEffects(safeStringSet(parser, DEVICE_EFFECT_EXTRAS)) .build(); return deviceEffects.hasEffects() ? deviceEffects : null; @@ -1123,6 +1134,7 @@ public class ZenModeConfig implements Parcelable { writeBooleanIfTrue(out, DEVICE_EFFECT_MINIMIZE_RADIO_USAGE, deviceEffects.shouldMinimizeRadioUsage()); writeBooleanIfTrue(out, DEVICE_EFFECT_MAXIMIZE_DOZE, deviceEffects.shouldMaximizeDoze()); + writeStringSet(out, DEVICE_EFFECT_EXTRAS, deviceEffects.getExtraEffects()); } private static void writeBooleanIfTrue(TypedXmlSerializer out, String att, boolean value) @@ -1132,6 +1144,26 @@ public class ZenModeConfig implements Parcelable { } } + private static void writeStringSet(TypedXmlSerializer out, String att, Set<String> values) + throws IOException { + if (values.isEmpty()) { + return; + } + // We escape each item by replacing "\" by "\\" and "," by "\,". Then we concatenate with + // "," as separator. Reading performs the same operations in the opposite order. + List<String> escapedItems = new ArrayList<>(); + for (String item : values) { + escapedItems.add( + item + .replace(ITEM_SEPARATOR_ESCAPE, + ITEM_SEPARATOR_ESCAPE + ITEM_SEPARATOR_ESCAPE) + .replace(ITEM_SEPARATOR, + ITEM_SEPARATOR_ESCAPE + ITEM_SEPARATOR)); + } + String serialized = String.join(ITEM_SEPARATOR, escapedItems); + out.attribute(null, att, serialized); + } + public static boolean isValidHour(int val) { return val >= 0 && val < 24; } @@ -1182,6 +1214,26 @@ public class ZenModeConfig implements Parcelable { return tryParseLong(val, defValue); } + @NonNull + private static Set<String> safeStringSet(TypedXmlPullParser parser, String att) { + Set<String> values = new HashSet<>(); + + String serialized = parser.getAttributeValue(null, att); + if (!TextUtils.isEmpty(serialized)) { + // We split on every "," that is *not preceded* by the escape character "\". + // Then we reverse the escaping done on each individual item. + String[] escapedItems = ITEM_SPLITTER_REGEX.split(serialized); + for (String escapedItem : escapedItems) { + values.add(escapedItem + .replace(ITEM_SEPARATOR_ESCAPE + ITEM_SEPARATOR_ESCAPE, + ITEM_SEPARATOR_ESCAPE) + .replace(ITEM_SEPARATOR_ESCAPE + ITEM_SEPARATOR, + ITEM_SEPARATOR)); + } + } + return values; + } + @Override public int describeContents() { return 0; diff --git a/core/java/android/service/voice/IDetectorSessionVisualQueryDetectionCallback.aidl b/core/java/android/service/voice/IDetectorSessionVisualQueryDetectionCallback.aidl index 4f6eb88e34e9..c2036a44181b 100644 --- a/core/java/android/service/voice/IDetectorSessionVisualQueryDetectionCallback.aidl +++ b/core/java/android/service/voice/IDetectorSessionVisualQueryDetectionCallback.aidl @@ -16,6 +16,7 @@ package android.service.voice; +import android.service.voice.VisualQueryAttentionResult; import android.service.voice.VisualQueryDetectedResult; /** @@ -31,12 +32,12 @@ oneway interface IDetectorSessionVisualQueryDetectionCallback { /** * Called when the user attention is gained and intent to show the assistant icon in SysUI. */ - void onAttentionGained(); + void onAttentionGained(in VisualQueryAttentionResult attentionResult); /** * Called when the user attention is lost and intent to hide the assistant icon in SysUI. */ - void onAttentionLost(); + void onAttentionLost(int interactionIntention); /** * Called when the detected query is streamed. diff --git a/core/java/android/service/voice/VisualQueryAttentionResult.aidl b/core/java/android/service/voice/VisualQueryAttentionResult.aidl new file mode 100644 index 000000000000..38c8f07df76a --- /dev/null +++ b/core/java/android/service/voice/VisualQueryAttentionResult.aidl @@ -0,0 +1,19 @@ +/* + * 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.service.voice; + +parcelable VisualQueryAttentionResult;
\ No newline at end of file diff --git a/core/java/android/service/voice/VisualQueryAttentionResult.java b/core/java/android/service/voice/VisualQueryAttentionResult.java new file mode 100644 index 000000000000..690990b46ed6 --- /dev/null +++ b/core/java/android/service/voice/VisualQueryAttentionResult.java @@ -0,0 +1,365 @@ +/* + * 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.service.voice; + +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.IntRange; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.os.Parcel; +import android.os.Parcelable; +import android.service.voice.flags.Flags; + +import com.android.internal.util.DataClass; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Represents a result supporting the visual query attention. + * + * @hide + */ +@DataClass( + genConstructor = false, + genBuilder = true, + genEqualsHashCode = true, + genHiddenConstDefs = true, + genParcelable = true, + genToString = true +) +@SystemApi +@FlaggedApi(Flags.FLAG_ALLOW_VARIOUS_ATTENTION_TYPES) +public final class VisualQueryAttentionResult implements Parcelable { + + /** Intention type to allow the system to listen to audio-visual query interactions. */ + public static final int INTERACTION_INTENTION_AUDIO_VISUAL = 0; + + /** Intention type to allow the system to listen to visual accessibility query interactions. */ + public static final int INTERACTION_INTENTION_VISUAL_ACCESSIBILITY = 1; + + /** + * Intention of interaction associated with the attention result that the device should listen + * to after the attention signal is gained. + */ + private final @InteractionIntention int mInteractionIntention; + + private static @InteractionIntention int defaultInteractionIntention() { + return INTERACTION_INTENTION_AUDIO_VISUAL; + } + + /** + * Integer value denoting the level of user engagement of the attention. System will + * also use this to adjust the intensity of UI indicators. + * + * The value can be between 1 and 100 (inclusive). The default value is set to be 100 which is + * defined as a complete engagement, which leads to the same UI result as the legacy + * {@link VisualQueryDetectionService#gainedAttention()}. + * + * Different values of engagement level corresponds to various SysUI effects. Within the same + * interaction intention, higher value of engagement level will lead to stronger visual + * presentation of the device attention UI. + */ + @IntRange(from = 1, to = 100) + private final int mEngagementLevel; + + private static int defaultEngagementLevel() { + return 100; + } + + /** + * Provides an instance of {@link Builder} with state corresponding to this instance. + * + * @hide + */ + public Builder buildUpon() { + return new Builder() + .setInteractionIntention(mInteractionIntention) + .setEngagementLevel(mEngagementLevel); + } + + + + + // Code below generated by codegen v1.0.23. + // + // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code + // + // To regenerate run: + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/service/voice/VisualQueryAttentionResult.java + // + // To exclude the generated code from IntelliJ auto-formatting enable (one-time): + // Settings > Editor > Code Style > Formatter Control + //@formatter:off + + + /** @hide */ + @IntDef(prefix = "INTERACTION_INTENTION_", value = { + INTERACTION_INTENTION_AUDIO_VISUAL, + INTERACTION_INTENTION_VISUAL_ACCESSIBILITY + }) + @Retention(RetentionPolicy.SOURCE) + @DataClass.Generated.Member + public @interface InteractionIntention {} + + /** @hide */ + @DataClass.Generated.Member + public static String interactionIntentionToString(@InteractionIntention int value) { + switch (value) { + case INTERACTION_INTENTION_AUDIO_VISUAL: + return "INTERACTION_INTENTION_AUDIO_VISUAL"; + case INTERACTION_INTENTION_VISUAL_ACCESSIBILITY: + return "INTERACTION_INTENTION_VISUAL_ACCESSIBILITY"; + default: return Integer.toHexString(value); + } + } + + @DataClass.Generated.Member + /* package-private */ VisualQueryAttentionResult( + @InteractionIntention int interactionIntention, + @IntRange(from = 1, to = 100) int engagementLevel) { + this.mInteractionIntention = interactionIntention; + + if (!(mInteractionIntention == INTERACTION_INTENTION_AUDIO_VISUAL) + && !(mInteractionIntention == INTERACTION_INTENTION_VISUAL_ACCESSIBILITY)) { + throw new java.lang.IllegalArgumentException( + "interactionIntention was " + mInteractionIntention + " but must be one of: " + + "INTERACTION_INTENTION_AUDIO_VISUAL(" + INTERACTION_INTENTION_AUDIO_VISUAL + "), " + + "INTERACTION_INTENTION_VISUAL_ACCESSIBILITY(" + INTERACTION_INTENTION_VISUAL_ACCESSIBILITY + ")"); + } + + this.mEngagementLevel = engagementLevel; + com.android.internal.util.AnnotationValidations.validate( + IntRange.class, null, mEngagementLevel, + "from", 1, + "to", 100); + + // onConstructed(); // You can define this method to get a callback + } + + /** + * Intention of interaction associated with the attention result that the device should listen + * to after the attention signal is gained. + */ + @DataClass.Generated.Member + public @InteractionIntention int getInteractionIntention() { + return mInteractionIntention; + } + + /** + * Integer value denoting the level of user engagement of the attention. System will + * also use this to adjust the intensity of UI indicators. + * + * The value can be between 1 and 100 (inclusive). The default value is set to be 100 which is + * defined as a complete engagement, which leads to the same UI result as the legacy + * {@link VisualQueryDetectionService#gainedAttention()}. + * + * Different values of engagement level corresponds to various SysUI effects. Within the same + * interaction intention, higher value of engagement level will lead to stronger visual + * presentation of the device attention UI. + */ + @DataClass.Generated.Member + public @IntRange(from = 1, to = 100) int getEngagementLevel() { + return mEngagementLevel; + } + + @Override + @DataClass.Generated.Member + public String toString() { + // You can override field toString logic by defining methods like: + // String fieldNameToString() { ... } + + return "VisualQueryAttentionResult { " + + "interactionIntention = " + interactionIntentionToString(mInteractionIntention) + ", " + + "engagementLevel = " + mEngagementLevel + + " }"; + } + + @Override + @DataClass.Generated.Member + public boolean equals(@Nullable Object o) { + // You can override field equality logic by defining either of the methods like: + // boolean fieldNameEquals(VisualQueryAttentionResult other) { ... } + // boolean fieldNameEquals(FieldType otherValue) { ... } + + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + @SuppressWarnings("unchecked") + VisualQueryAttentionResult that = (VisualQueryAttentionResult) o; + //noinspection PointlessBooleanExpression + return true + && mInteractionIntention == that.mInteractionIntention + && mEngagementLevel == that.mEngagementLevel; + } + + @Override + @DataClass.Generated.Member + public int hashCode() { + // You can override field hashCode logic by defining methods like: + // int fieldNameHashCode() { ... } + + int _hash = 1; + _hash = 31 * _hash + mInteractionIntention; + _hash = 31 * _hash + mEngagementLevel; + return _hash; + } + + @Override + @DataClass.Generated.Member + public void writeToParcel(@NonNull Parcel dest, int flags) { + // You can override field parcelling by defining methods like: + // void parcelFieldName(Parcel dest, int flags) { ... } + + dest.writeInt(mInteractionIntention); + dest.writeInt(mEngagementLevel); + } + + @Override + @DataClass.Generated.Member + public int describeContents() { return 0; } + + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + /* package-private */ VisualQueryAttentionResult(@NonNull Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + int interactionIntention = in.readInt(); + int engagementLevel = in.readInt(); + + this.mInteractionIntention = interactionIntention; + + if (!(mInteractionIntention == INTERACTION_INTENTION_AUDIO_VISUAL) + && !(mInteractionIntention == INTERACTION_INTENTION_VISUAL_ACCESSIBILITY)) { + throw new java.lang.IllegalArgumentException( + "interactionIntention was " + mInteractionIntention + " but must be one of: " + + "INTERACTION_INTENTION_AUDIO_VISUAL(" + INTERACTION_INTENTION_AUDIO_VISUAL + "), " + + "INTERACTION_INTENTION_VISUAL_ACCESSIBILITY(" + INTERACTION_INTENTION_VISUAL_ACCESSIBILITY + ")"); + } + + this.mEngagementLevel = engagementLevel; + com.android.internal.util.AnnotationValidations.validate( + IntRange.class, null, mEngagementLevel, + "from", 1, + "to", 100); + + // onConstructed(); // You can define this method to get a callback + } + + @DataClass.Generated.Member + public static final @NonNull Parcelable.Creator<VisualQueryAttentionResult> CREATOR + = new Parcelable.Creator<VisualQueryAttentionResult>() { + @Override + public VisualQueryAttentionResult[] newArray(int size) { + return new VisualQueryAttentionResult[size]; + } + + @Override + public VisualQueryAttentionResult createFromParcel(@NonNull Parcel in) { + return new VisualQueryAttentionResult(in); + } + }; + + /** + * A builder for {@link VisualQueryAttentionResult} + */ + @SuppressWarnings("WeakerAccess") + @DataClass.Generated.Member + public static final class Builder { + + private @InteractionIntention int mInteractionIntention; + private @IntRange(from = 1, to = 100) int mEngagementLevel; + + private long mBuilderFieldsSet = 0L; + + public Builder() { + } + + /** + * Intention of interaction associated with the attention result that the device should listen + * to after the attention signal is gained. + */ + @DataClass.Generated.Member + public @NonNull Builder setInteractionIntention(@InteractionIntention int value) { + checkNotUsed(); + mBuilderFieldsSet |= 0x1; + mInteractionIntention = value; + return this; + } + + /** + * Integer value denoting the level of user engagement of the attention. System will + * also use this to adjust the intensity of UI indicators. + * + * The value can be between 1 and 100 (inclusive). The default value is set to be 100 which is + * defined as a complete engagement, which leads to the same UI result as the legacy + * {@link VisualQueryDetectionService#gainedAttention()}. + * + * Different values of engagement level corresponds to various SysUI effects. Within the same + * interaction intention, higher value of engagement level will lead to stronger visual + * presentation of the device attention UI. + */ + @DataClass.Generated.Member + public @NonNull Builder setEngagementLevel(@IntRange(from = 1, to = 100) int value) { + checkNotUsed(); + mBuilderFieldsSet |= 0x2; + mEngagementLevel = value; + return this; + } + + /** Builds the instance. This builder should not be touched after calling this! */ + public @NonNull VisualQueryAttentionResult build() { + checkNotUsed(); + mBuilderFieldsSet |= 0x4; // Mark builder used + + if ((mBuilderFieldsSet & 0x1) == 0) { + mInteractionIntention = defaultInteractionIntention(); + } + if ((mBuilderFieldsSet & 0x2) == 0) { + mEngagementLevel = defaultEngagementLevel(); + } + VisualQueryAttentionResult o = new VisualQueryAttentionResult( + mInteractionIntention, + mEngagementLevel); + return o; + } + + private void checkNotUsed() { + if ((mBuilderFieldsSet & 0x4) != 0) { + throw new IllegalStateException( + "This Builder should not be reused. Use a new Builder instance instead"); + } + } + } + + @DataClass.Generated( + time = 1707773691880L, + codegenVersion = "1.0.23", + sourceFile = "frameworks/base/core/java/android/service/voice/VisualQueryAttentionResult.java", + inputSignatures = "public static final int INTERACTION_INTENTION_AUDIO_VISUAL\npublic static final int INTERACTION_INTENTION_VISUAL_ACCESSIBILITY\nprivate final @android.service.voice.VisualQueryAttentionResult.InteractionIntention int mInteractionIntention\nprivate final @android.annotation.IntRange int mEngagementLevel\nprivate static @android.service.voice.VisualQueryAttentionResult.InteractionIntention int defaultInteractionIntention()\nprivate static int defaultEngagementLevel()\npublic android.service.voice.VisualQueryAttentionResult.Builder buildUpon()\nclass VisualQueryAttentionResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)") + @Deprecated + private void __metadata() {} + + + //@formatter:on + // End of generated code + +} diff --git a/core/java/android/service/voice/VisualQueryDetectedResult.java b/core/java/android/service/voice/VisualQueryDetectedResult.java index 13cdfdebc86a..322148acdca5 100644 --- a/core/java/android/service/voice/VisualQueryDetectedResult.java +++ b/core/java/android/service/voice/VisualQueryDetectedResult.java @@ -82,8 +82,6 @@ public final class VisualQueryDetectedResult implements Parcelable { } - - // Code below generated by codegen v1.0.23. // // DO NOT MODIFY! diff --git a/core/java/android/service/voice/VisualQueryDetectionService.java b/core/java/android/service/voice/VisualQueryDetectionService.java index b60c77502247..887b5751ffc8 100644 --- a/core/java/android/service/voice/VisualQueryDetectionService.java +++ b/core/java/android/service/voice/VisualQueryDetectionService.java @@ -262,23 +262,82 @@ public abstract class VisualQueryDetectionService extends Service public void onStopDetection() { } + // TODO(b/324341724): Properly deprecate this API. /** - * Informs the system that the user attention is gained so queries can be streamed. + * Informs the system that the attention is gained for the interaction intention + * {@link VisualQueryAttentionResult#INTERACTION_INTENTION_AUDIO_VISUAL} with + * engagement level equals to the maximum value possible so queries can be streamed. + * + * Usage of this method is not recommended, please use + * {@link VisualQueryDetectionService#gainedAttention(VisualQueryAttentionResult)} instead. + * */ public final void gainedAttention() { + if (Flags.allowVariousAttentionTypes()) { + gainedAttention(new VisualQueryAttentionResult.Builder().build()); + } else { + try { + mRemoteCallback.onAttentionGained(null); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Puts the device into an attention state that will listen to certain interaction intention + * based on the {@link VisualQueryAttentionResult} provided. + * + * Different type and levels of engagement will lead to corresponding UI icons showing. See + * {@link VisualQueryAttentionResult#setInteractionIntention(int)} for details. + * + * Exactly one {@link VisualQueryAttentionResult} can be set at a time with this method at + * the moment. Multiple attention results will be supported to set the device into with this + * API before {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM} is finalized. + * + * Latest call will override the {@link VisualQueryAttentionResult} of previous calls. Queries + * streamed are independent of the attention interactionIntention. + * + * @param attentionResult Attention result of type {@link VisualQueryAttentionResult}. + */ + @FlaggedApi(Flags.FLAG_ALLOW_VARIOUS_ATTENTION_TYPES) + public final void gainedAttention(@NonNull VisualQueryAttentionResult attentionResult) { try { - mRemoteCallback.onAttentionGained(); + mRemoteCallback.onAttentionGained(attentionResult); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Informs the system that the user attention is lost to stop streaming. + * Informs the system that all attention has lost to stop streaming. */ public final void lostAttention() { + if (Flags.allowVariousAttentionTypes()) { + lostAttention(VisualQueryAttentionResult.INTERACTION_INTENTION_AUDIO_VISUAL); + lostAttention(VisualQueryAttentionResult.INTERACTION_INTENTION_VISUAL_ACCESSIBILITY); + } else { + try { + mRemoteCallback.onAttentionLost(0); // placeholder + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * This will cancel the corresponding attention if the provided interaction intention is the + * same as which of the object called with + * {@link VisualQueryDetectionService#gainedAttention(VisualQueryAttentionResult)}. + * + * @param interactionIntention Interaction intention, one of + * {@link VisualQueryAttentionResult#InteractionIntention}. + */ + @FlaggedApi(Flags.FLAG_ALLOW_VARIOUS_ATTENTION_TYPES) + public final void lostAttention( + @VisualQueryAttentionResult.InteractionIntention int interactionIntention) { try { - mRemoteCallback.onAttentionLost(); + mRemoteCallback.onAttentionLost(interactionIntention); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/text/BoringLayout.java b/core/java/android/text/BoringLayout.java index a6d3bb47d9c8..2028c4057c01 100644 --- a/core/java/android/text/BoringLayout.java +++ b/core/java/android/text/BoringLayout.java @@ -585,9 +585,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback } if (ClientFlags.fixLineHeightForLocale()) { - if (minimumFontMetrics == null) { - paint.getFontMetricsIntForLocale(fm); - } else { + if (minimumFontMetrics != null) { fm.set(minimumFontMetrics); // Because the font metrics is provided by public APIs, adjust the top/bottom with // ascent/descent: top must be smaller than ascent, bottom must be larger than @@ -713,18 +711,21 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback public void draw(Canvas c, Path highlight, Paint highlightpaint, int cursorOffset) { if (mDirect != null && highlight == null) { + float leftShift = 0; if (getUseBoundsForWidth()) { - c.save(); RectF drawingRect = computeDrawingBoundingBox(); if (drawingRect.left < 0) { - c.translate(-drawingRect.left, 0); + leftShift = -drawingRect.left; + c.translate(leftShift, 0); } } c.drawText(mDirect, 0, mBottom - mDesc, mPaint); - if (getUseBoundsForWidth()) { - c.restore(); + if (leftShift != 0) { + // Manually translate back to the original position because of b/324498002, using + // save/restore disappears the toggle switch drawables. + c.translate(-leftShift, 0); } } else { super.draw(c, highlight, highlightpaint, cursorOffset); diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 8ddb42d6b3be..e5d199ad8e46 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -464,11 +464,12 @@ public abstract class Layout { @Nullable Path selectionPath, @Nullable Paint selectionPaint, int cursorOffsetVertical) { + float leftShift = 0; if (mUseBoundsForWidth) { - canvas.save(); RectF drawingRect = computeDrawingBoundingBox(); if (drawingRect.left < 0) { - canvas.translate(-drawingRect.left, 0); + leftShift = -drawingRect.left; + canvas.translate(leftShift, 0); } } final long lineRange = getLineRangeForDraw(canvas); @@ -479,8 +480,10 @@ public abstract class Layout { drawWithoutText(canvas, highlightPaths, highlightPaints, selectionPath, selectionPaint, cursorOffsetVertical, firstLine, lastLine); drawText(canvas, firstLine, lastLine); - if (mUseBoundsForWidth) { - canvas.restore(); + if (leftShift != 0) { + // Manually translate back to the original position because of b/324498002, using + // save/restore disappears the toggle switch drawables. + canvas.translate(-leftShift, 0); } } diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 99bd2ff7134c..5986238d3035 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -767,22 +767,14 @@ public class StaticLayout extends Layout { } int defaultTop; - int defaultAscent; - int defaultDescent; + final int defaultAscent; + final int defaultDescent; int defaultBottom; - if (ClientFlags.fixLineHeightForLocale()) { - if (b.mMinimumFontMetrics != null) { - defaultTop = (int) Math.floor(b.mMinimumFontMetrics.top); - defaultAscent = Math.round(b.mMinimumFontMetrics.ascent); - defaultDescent = Math.round(b.mMinimumFontMetrics.descent); - defaultBottom = (int) Math.ceil(b.mMinimumFontMetrics.bottom); - } else { - paint.getFontMetricsIntForLocale(fm); - defaultTop = fm.top; - defaultAscent = fm.ascent; - defaultDescent = fm.descent; - defaultBottom = fm.bottom; - } + if (ClientFlags.fixLineHeightForLocale() && b.mMinimumFontMetrics != null) { + defaultTop = (int) Math.floor(b.mMinimumFontMetrics.top); + defaultAscent = Math.round(b.mMinimumFontMetrics.ascent); + defaultDescent = Math.round(b.mMinimumFontMetrics.descent); + defaultBottom = (int) Math.ceil(b.mMinimumFontMetrics.bottom); // Because the font metrics is provided by public APIs, adjust the top/bottom with // ascent/descent: top must be smaller than ascent, bottom must be larger than descent. @@ -1043,10 +1035,10 @@ public class StaticLayout extends Layout { if (endPos < spanEnd) { // preserve metrics for current span - fmTop = fm.top; - fmBottom = fm.bottom; - fmAscent = fm.ascent; - fmDescent = fm.descent; + fmTop = Math.min(defaultTop, fm.top); + fmBottom = Math.max(defaultBottom, fm.bottom); + fmAscent = Math.min(defaultAscent, fm.ascent); + fmDescent = Math.max(defaultDescent, fm.descent); } else { fmTop = fmBottom = fmAscent = fmDescent = 0; } @@ -1069,7 +1061,7 @@ public class StaticLayout extends Layout { && mLineCount < mMaximumVisibleLineCount) { final MeasuredParagraph measuredPara = MeasuredParagraph.buildForBidi(source, bufEnd, bufEnd, textDir, null); - if (ClientFlags.fixLineHeightForLocale()) { + if (defaultAscent != 0 && defaultDescent != 0) { fm.top = defaultTop; fm.ascent = defaultAscent; fm.descent = defaultDescent; diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index f37c4c2a060c..f68fcab94952 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -110,3 +110,12 @@ flag { description: "A flag for replacing AndroidBidi with android.icu.text.Bidi." bug: "317144801" } + +flag { + name: "lazy_variation_instance" + namespace: "text" + description: "A flag for enabling lazy variation instance creation." + # Make read only, as it could be used before the Settings provider is initialized. + is_fixed_read_only: true + bug: "324676775" +} diff --git a/core/java/android/tracing/OWNERS b/core/java/android/tracing/OWNERS index 2ebe2e9e2761..f67844de44ea 100644 --- a/core/java/android/tracing/OWNERS +++ b/core/java/android/tracing/OWNERS @@ -1,6 +1,4 @@ carmenjackson@google.com kevinjeon@google.com -pablogamito@google.com -natanieljr@google.com -keanmariotti@google.com +include platform/development:/tools/winscope/OWNERS include platform/external/perfetto:/OWNERS diff --git a/core/java/android/tracing/perfetto/TracingContext.java b/core/java/android/tracing/perfetto/TracingContext.java index 0bce26e007a1..c1a61a7c2c34 100644 --- a/core/java/android/tracing/perfetto/TracingContext.java +++ b/core/java/android/tracing/perfetto/TracingContext.java @@ -105,6 +105,5 @@ public class TracingContext<DataSourceInstanceType extends DataSourceInstance, return res; } - // private static native void nativeFlush(long nativeDataSourcePointer); private static native void nativeFlush(TracingContext thiz, long ctxPointer); } diff --git a/core/java/android/util/Xml.java b/core/java/android/util/Xml.java index ec6e90b4153e..50d419f75a09 100644 --- a/core/java/android/util/Xml.java +++ b/core/java/android/util/Xml.java @@ -53,9 +53,12 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import javax.xml.parsers.SAXParserFactory; + /** * XML utility methods. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class Xml { private Xml() {} @@ -73,8 +76,33 @@ public class Xml { * * @hide */ - public static final boolean ENABLE_BINARY_DEFAULT = SystemProperties - .getBoolean("persist.sys.binary_xml", true); + public static final boolean ENABLE_BINARY_DEFAULT = shouldEnableBinaryDefault(); + + @android.ravenwood.annotation.RavenwoodReplace + private static boolean shouldEnableBinaryDefault() { + return SystemProperties.getBoolean("persist.sys.binary_xml", true); + } + + private static boolean shouldEnableBinaryDefault$ravenwood() { + return true; + } + + /** + * Feature flag: when set, {@link #resolvePullParser(InputStream)}} will attempt to sniff + * using {@code pread} optimization. + * + * @hide + */ + public static final boolean ENABLE_RESOLVE_OPTIMIZATIONS = shouldEnableResolveOptimizations(); + + @android.ravenwood.annotation.RavenwoodReplace + private static boolean shouldEnableResolveOptimizations() { + return true; + } + + private static boolean shouldEnableResolveOptimizations$ravenwood() { + return false; + } /** * Parses the given xml string and fires events on the given SAX handler. @@ -82,7 +110,7 @@ public class Xml { public static void parse(String xml, ContentHandler contentHandler) throws SAXException { try { - XMLReader reader = XmlObjectFactory.newXMLReader(); + XMLReader reader = newXMLReader(); reader.setContentHandler(contentHandler); reader.parse(new InputSource(new StringReader(xml))); } catch (IOException e) { @@ -96,7 +124,7 @@ public class Xml { */ public static void parse(Reader in, ContentHandler contentHandler) throws IOException, SAXException { - XMLReader reader = XmlObjectFactory.newXMLReader(); + XMLReader reader = newXMLReader(); reader.setContentHandler(contentHandler); reader.parse(new InputSource(in)); } @@ -107,7 +135,7 @@ public class Xml { */ public static void parse(InputStream in, Encoding encoding, ContentHandler contentHandler) throws IOException, SAXException { - XMLReader reader = XmlObjectFactory.newXMLReader(); + XMLReader reader = newXMLReader(); reader.setContentHandler(contentHandler); InputSource source = new InputSource(in); source.setEncoding(encoding.expatName); @@ -120,19 +148,26 @@ public class Xml { @android.ravenwood.annotation.RavenwoodReplace public static XmlPullParser newPullParser() { try { - XmlPullParser parser = XmlObjectFactory.newXmlPullParser(); + XmlPullParser parser = newXmlPullParser(); parser.setFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL, true); parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); return parser; } catch (XmlPullParserException e) { - throw new AssertionError(); + throw new AssertionError(e); } } /** @hide */ public static XmlPullParser newPullParser$ravenwood() { - // TODO: remove once we're linking against libcore - return new BinaryXmlPullParser(); + try { + // Prebuilt kxml2-android does not support FEATURE_PROCESS_DOCDECL, so omit here; + // it's quite rare and all tests are passing + XmlPullParser parser = newXmlPullParser(); + parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); + return parser; + } catch (XmlPullParserException e) { + throw new AssertionError(e); + } } /** @@ -145,17 +180,10 @@ public class Xml { * @hide */ @SuppressWarnings("AndroidFrameworkEfficientXml") - @android.ravenwood.annotation.RavenwoodReplace public static @NonNull TypedXmlPullParser newFastPullParser() { return XmlUtils.makeTyped(newPullParser()); } - /** @hide */ - public static TypedXmlPullParser newFastPullParser$ravenwood() { - // TODO: remove once we're linking against libcore - return new BinaryXmlPullParser(); - } - /** * Creates a new {@link XmlPullParser} that reads XML documents using a * custom binary wire protocol which benchmarking has shown to be 8.5x @@ -189,11 +217,10 @@ public class Xml { * * @hide */ - @android.ravenwood.annotation.RavenwoodReplace public static @NonNull TypedXmlPullParser resolvePullParser(@NonNull InputStream in) throws IOException { final byte[] magic = new byte[4]; - if (in instanceof FileInputStream) { + if (ENABLE_RESOLVE_OPTIMIZATIONS && in instanceof FileInputStream) { try { Os.pread(((FileInputStream) in).getFD(), magic, 0, magic.length, 0); } catch (ErrnoException e) { @@ -222,31 +249,11 @@ public class Xml { return xml; } - /** @hide */ - public static @NonNull TypedXmlPullParser resolvePullParser$ravenwood(@NonNull InputStream in) - throws IOException { - // TODO: remove once we're linking against libcore - final TypedXmlPullParser xml = new BinaryXmlPullParser(); - try { - xml.setInput(in, StandardCharsets.UTF_8.name()); - } catch (XmlPullParserException e) { - throw new IOException(e); - } - return xml; - } - /** * Creates a new xml serializer. */ - @android.ravenwood.annotation.RavenwoodReplace public static XmlSerializer newSerializer() { - return XmlObjectFactory.newXmlSerializer(); - } - - /** @hide */ - public static XmlSerializer newSerializer$ravenwood() { - // TODO: remove once we're linking against libcore - return new BinaryXmlSerializer(); + return newXmlSerializer(); } /** @@ -259,17 +266,10 @@ public class Xml { * @hide */ @SuppressWarnings("AndroidFrameworkEfficientXml") - @android.ravenwood.annotation.RavenwoodReplace public static @NonNull TypedXmlSerializer newFastSerializer() { return XmlUtils.makeTyped(new FastXmlSerializer()); } - /** @hide */ - public static @NonNull TypedXmlSerializer newFastSerializer$ravenwood() { - // TODO: remove once we're linking against libcore - return new BinaryXmlSerializer(); - } - /** * Creates a new {@link XmlSerializer} that writes XML documents using a * custom binary wire protocol which benchmarking has shown to be 4.4x @@ -334,7 +334,6 @@ public class Xml { * * @hide */ - @android.ravenwood.annotation.RavenwoodKeep public static void copy(@NonNull XmlPullParser in, @NonNull XmlSerializer out) throws XmlPullParserException, IOException { // Some parsers may have already consumed the event that starts the @@ -394,7 +393,6 @@ public class Xml { * unsupported, which can confuse serializers. This method normalizes empty * strings to be {@code null}. */ - @android.ravenwood.annotation.RavenwoodKeep private static @Nullable String normalizeNamespace(@Nullable String namespace) { if (namespace == null || namespace.isEmpty()) { return null; @@ -457,4 +455,45 @@ public class Xml { ? (AttributeSet) parser : new XmlPullAttributes(parser); } + + @android.ravenwood.annotation.RavenwoodReplace + private static @NonNull XmlSerializer newXmlSerializer() { + return XmlObjectFactory.newXmlSerializer(); + } + + private static @NonNull XmlSerializer newXmlSerializer$ravenwood() { + try { + return XmlPullParserFactory.newInstance().newSerializer(); + } catch (XmlPullParserException e) { + throw new UnsupportedOperationException(e); + } + } + + @android.ravenwood.annotation.RavenwoodReplace + private static @NonNull XmlPullParser newXmlPullParser() { + return XmlObjectFactory.newXmlPullParser(); + } + + private static @NonNull XmlPullParser newXmlPullParser$ravenwood() { + try { + return XmlPullParserFactory.newInstance().newPullParser(); + } catch (XmlPullParserException e) { + throw new UnsupportedOperationException(e); + } + } + + @android.ravenwood.annotation.RavenwoodReplace + private static @NonNull XMLReader newXMLReader() { + return XmlObjectFactory.newXMLReader(); + } + + private static @NonNull XMLReader newXMLReader$ravenwood() { + try { + final SAXParserFactory factory = SAXParserFactory.newInstance(); + factory.setNamespaceAware(true); + return factory.newSAXParser().getXMLReader(); + } catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } } diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index fbadef3d19ef..1f2b4faacc10 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -86,6 +86,7 @@ import java.util.function.Consumer; * that are currently attached and whether mirroring has been enabled. * </p> */ +@android.ravenwood.annotation.RavenwoodKeepPartialClass public final class Display { private static final String TAG = "Display"; private static final boolean DEBUG = false; @@ -1210,6 +1211,8 @@ public final class Display { * @see #REMOVE_MODE_DESTROY_CONTENT */ // TODO (b/114338689): Remove the method and use IWindowManager#getRemoveContentMode + @SuppressLint("UnflaggedApi") // @TestApi without associated feature. + @TestApi public int getRemoveMode() { return mDisplayInfo.removeMode; } @@ -1998,6 +2001,7 @@ public final class Display { * display power state. In SUSPEND states, updates are absolutely forbidden. * @hide */ + @android.ravenwood.annotation.RavenwoodKeep public static boolean isSuspendedState(int state) { return state == STATE_OFF || state == STATE_DOZE_SUSPEND || state == STATE_ON_SUSPEND; } @@ -2007,6 +2011,7 @@ public final class Display { * specified display power state. * @hide */ + @android.ravenwood.annotation.RavenwoodKeep public static boolean isDozeState(int state) { return state == STATE_DOZE || state == STATE_DOZE_SUSPEND; } @@ -2016,6 +2021,7 @@ public final class Display { * or {@link #STATE_VR}. * @hide */ + @android.ravenwood.annotation.RavenwoodKeep public static boolean isActiveState(int state) { return state == STATE_ON || state == STATE_VR; } @@ -2024,6 +2030,7 @@ public final class Display { * Returns true if the display is in an off state such as {@link #STATE_OFF}. * @hide */ + @android.ravenwood.annotation.RavenwoodKeep public static boolean isOffState(int state) { return state == STATE_OFF; } @@ -2033,6 +2040,7 @@ public final class Display { * or {@link #STATE_VR} or {@link #STATE_ON_SUSPEND}. * @hide */ + @android.ravenwood.annotation.RavenwoodKeep public static boolean isOnState(int state) { return state == STATE_ON || state == STATE_VR || state == STATE_ON_SUSPEND; } diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java index 0ce1d4711c6d..eb289204e481 100644 --- a/core/java/android/view/HandwritingInitiator.java +++ b/core/java/android/view/HandwritingInitiator.java @@ -23,8 +23,10 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; +import android.view.inputmethod.Flags; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; +import android.widget.Editor; import android.widget.TextView; import com.android.internal.annotations.VisibleForTesting; @@ -80,6 +82,16 @@ public class HandwritingInitiator { * connections and only set mConnectedView to null when mConnectionCount is zero. */ private int mConnectionCount = 0; + + /** + * The reference to the View that currently has focus. + * This replaces mConnecteView when {@code Flags#intitiationWithoutInputConnection()} is + * enabled. + */ + @Nullable + @VisibleForTesting + public WeakReference<View> mFocusedView = null; + private final InputMethodManager mImm; private final int[] mTempLocation = new int[2]; @@ -112,9 +124,15 @@ public class HandwritingInitiator { * * If the stylus is hovering on an unconnected editor that supports handwriting, we always show * the hover icon. + * TODO(b/308827131): Rename to FocusedView after Flag is flipped. */ private boolean mShowHoverIconForConnectedView = true; + /** When flag is enabled, touched editors don't wait for InputConnection for initiation. + * However, delegation still waits for InputConnection. + */ + private final boolean mInitiateWithoutConnection = Flags.initiationWithoutInputConnection(); + @VisibleForTesting public HandwritingInitiator(@NonNull ViewConfiguration viewConfiguration, @NonNull InputMethodManager inputMethodManager) { @@ -201,8 +219,8 @@ public class HandwritingInitiator { View candidateView = findBestCandidateView(mState.mStylusDownX, mState.mStylusDownY, /* isHover */ false); if (candidateView != null) { - if (candidateView == getConnectedView()) { - if (!candidateView.hasFocus()) { + if (candidateView == getConnectedOrFocusedView()) { + if (!mInitiateWithoutConnection && !candidateView.hasFocus()) { requestFocusWithoutReveal(candidateView); } startHandwriting(candidateView); @@ -217,8 +235,17 @@ public class HandwritingInitiator { candidateView.getHandwritingDelegatorCallback().run(); mState.mHasPreparedHandwritingDelegation = true; } else { - mState.mPendingConnectedView = new WeakReference<>(candidateView); - requestFocusWithoutReveal(candidateView); + if (!mInitiateWithoutConnection) { + mState.mPendingConnectedView = new WeakReference<>(candidateView); + } + if (!candidateView.hasFocus()) { + requestFocusWithoutReveal(candidateView); + } + if (mInitiateWithoutConnection + && updateFocusedView(candidateView, + /* fromTouchEvent */ true)) { + startHandwriting(candidateView); + } } } } @@ -244,11 +271,7 @@ public class HandwritingInitiator { */ public void onDelegateViewFocused(@NonNull View view) { if (view == getConnectedView()) { - if (tryAcceptStylusHandwritingDelegation(view)) { - // A handwriting delegate view is accepted and handwriting starts; hide the - // hover icon. - mShowHoverIconForConnectedView = false; - } + tryAcceptStylusHandwritingDelegation(view); } } @@ -260,6 +283,10 @@ public class HandwritingInitiator { * @see #onInputConnectionClosed(View) */ public void onInputConnectionCreated(@NonNull View view) { + if (mInitiateWithoutConnection && !view.isHandwritingDelegate()) { + // When flag is enabled, only delegation continues to wait for InputConnection. + return; + } if (!view.isAutoHandwritingEnabled()) { clearConnectedView(); return; @@ -274,12 +301,15 @@ public class HandwritingInitiator { // A new view just gain focus. By default, we should show hover icon for it. mShowHoverIconForConnectedView = true; if (view.isHandwritingDelegate() && tryAcceptStylusHandwritingDelegation(view)) { - // A handwriting delegate view is accepted and handwriting starts; hide the - // hover icon. + // tryAcceptStylusHandwritingDelegation should set boolean below, however, we + // cannot mock IMM to return true for acceptStylusDelegation(). + // TODO(b/324670412): we should move any dependent tests to integration and remove + // the assignment below. mShowHoverIconForConnectedView = false; return; } - if (mState != null && mState.mPendingConnectedView != null + if (!mInitiateWithoutConnection && mState != null + && mState.mPendingConnectedView != null && mState.mPendingConnectedView.get() == view) { startHandwriting(view); } @@ -293,6 +323,9 @@ public class HandwritingInitiator { * @param view the view that closed the InputConnection. */ public void onInputConnectionClosed(@NonNull View view) { + if (mInitiateWithoutConnection && !view.isHandwritingDelegate()) { + return; + } final View connectedView = getConnectedView(); if (connectedView == null) return; if (connectedView == view) { @@ -306,6 +339,48 @@ public class HandwritingInitiator { } } + @Nullable + private View getFocusedView() { + if (mFocusedView == null) return null; + return mFocusedView.get(); + } + + /** + * Clear the tracked focused view tracked for handwriting initiation. + * @param view the focused view. + */ + public void clearFocusedView(View view) { + if (view == null || mFocusedView == null) { + return; + } + if (mFocusedView.get() == view) { + mFocusedView = null; + } + } + + /** + * Called when new {@link Editor} is focused. + * @return {@code true} if handwriting can initiate for given view. + */ + @VisibleForTesting + public boolean updateFocusedView(@NonNull View view, boolean fromTouchEvent) { + if (!view.shouldInitiateHandwriting()) { + mFocusedView = null; + return false; + } + + final View focusedView = getFocusedView(); + if (focusedView != view) { + mFocusedView = new WeakReference<>(view); + // A new view just gain focus. By default, we should show hover icon for it. + mShowHoverIconForConnectedView = true; + } + if (!fromTouchEvent) { + tryAcceptStylusHandwritingDelegation(view); + } + return true; + } + /** Starts a stylus handwriting session for the view. */ @VisibleForTesting public void startHandwriting(@NonNull View view) { @@ -324,6 +399,9 @@ public class HandwritingInitiator { */ @VisibleForTesting public boolean tryAcceptStylusHandwritingDelegation(@NonNull View view) { + if (!view.isHandwritingDelegate() || (mState != null && mState.mHasInitiatedHandwriting)) { + return false; + } String delegatorPackageName = view.getAllowedHandwritingDelegatorPackageName(); if (delegatorPackageName == null) { @@ -337,6 +415,9 @@ public class HandwritingInitiator { if (view instanceof TextView) { ((TextView) view).hideHint(); } + // A handwriting delegate view is accepted and handwriting starts; hide the + // hover icon. + mShowHoverIconForConnectedView = false; return true; } return false; @@ -377,16 +458,25 @@ public class HandwritingInitiator { return PointerIcon.getSystemIcon(context, PointerIcon.TYPE_HANDWRITING); } - if (hoverView != getConnectedView()) { + if (hoverView != getConnectedOrFocusedView()) { // The stylus is hovering on another view that supports handwriting. We should show - // hover icon. Also reset the mShowHoverIconForConnectedView so that hover - // icon is displayed again next time when the stylus hovers on connected view. + // hover icon. Also reset the mShowHoverIconForFocusedView so that hover + // icon is displayed again next time when the stylus hovers on focused view. mShowHoverIconForConnectedView = true; return PointerIcon.getSystemIcon(context, PointerIcon.TYPE_HANDWRITING); } return null; } + // TODO(b/308827131): Remove once Flag is flipped. + private View getConnectedOrFocusedView() { + if (mInitiateWithoutConnection) { + return mFocusedView == null ? null : mFocusedView.get(); + } else { + return mConnectedView == null ? null : mConnectedView.get(); + } + } + private View getCachedHoverTarget() { if (mCachedHoverTarget == null) { return null; @@ -458,20 +548,21 @@ public class HandwritingInitiator { */ @Nullable private View findBestCandidateView(float x, float y, boolean isHover) { + // TODO(b/308827131): Rename to FocusedView after Flag is flipped. // If the connectedView is not null and do not set any handwriting area, it will check // whether the connectedView's boundary contains the initial stylus position. If true, // directly return the connectedView. - final View connectedView = getConnectedView(); - if (connectedView != null) { + final View connectedOrFocusedView = getConnectedOrFocusedView(); + if (connectedOrFocusedView != null) { Rect handwritingArea = mTempRect; - if (getViewHandwritingArea(connectedView, handwritingArea) - && isInHandwritingArea(handwritingArea, x, y, connectedView, isHover) - && shouldTriggerStylusHandwritingForView(connectedView)) { + if (getViewHandwritingArea(connectedOrFocusedView, handwritingArea) + && isInHandwritingArea(handwritingArea, x, y, connectedOrFocusedView, isHover) + && shouldTriggerStylusHandwritingForView(connectedOrFocusedView)) { if (!isHover && mState != null) { mState.mStylusDownWithinEditorBounds = contains(handwritingArea, x, y, 0f, 0f, 0f, 0f); } - return connectedView; + return connectedOrFocusedView; } } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index b5b81d17013a..29cc8594deec 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -73,6 +73,7 @@ import android.window.IScreenRecordingCallback; import android.window.ISurfaceSyncGroupCompletedListener; import android.window.ITaskFpsCallback; import android.window.ITrustedPresentationListener; +import android.window.IUnhandledDragListener; import android.window.InputTransferToken; import android.window.ScreenCapture; import android.window.TrustedPresentationThresholds; @@ -1091,4 +1092,10 @@ interface IWindowManager @EnforcePermission("DETECT_SCREEN_RECORDING") void unregisterScreenRecordingCallback(IScreenRecordingCallback callback); + + /** + * Sets the listener to be called back when a cross-window drag and drop operation is unhandled + * (ie. not handled by any window which can handle the drag). + */ + void setUnhandledDragListener(IUnhandledDragListener listener); } diff --git a/core/java/android/view/InsetsFrameProvider.java b/core/java/android/view/InsetsFrameProvider.java index 83bdb087a539..fe98faba98c3 100644 --- a/core/java/android/view/InsetsFrameProvider.java +++ b/core/java/android/view/InsetsFrameProvider.java @@ -18,6 +18,7 @@ package android.view; import android.annotation.IntRange; import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.Insets; import android.graphics.Rect; import android.os.IBinder; @@ -110,6 +111,12 @@ public class InsetsFrameProvider implements Parcelable { private Insets mMinimalInsetsSizeInDisplayCutoutSafe = null; /** + * Indicates the bounding rectangles within the provided insets frame, in relative coordinates + * to the source frame. + */ + private Rect[] mBoundingRects = null; + + /** * Creates an InsetsFrameProvider which describes what frame an insets source should have. * * @param owner the owner of this provider. We might have multiple sources with the same type on @@ -205,6 +212,22 @@ public class InsetsFrameProvider implements Parcelable { return mMinimalInsetsSizeInDisplayCutoutSafe; } + /** + * Sets the bounding rectangles within and relative to the source frame. + */ + public InsetsFrameProvider setBoundingRects(@Nullable Rect[] boundingRects) { + mBoundingRects = boundingRects == null ? null : boundingRects.clone(); + return this; + } + + /** + * Returns the arbitrary bounding rects, or null if none were set. + */ + @Nullable + public Rect[] getBoundingRects() { + return mBoundingRects; + } + @Override public int describeContents() { return 0; @@ -231,6 +254,9 @@ public class InsetsFrameProvider implements Parcelable { sb.append(", mMinimalInsetsSizeInDisplayCutoutSafe=") .append(mMinimalInsetsSizeInDisplayCutoutSafe); } + if (mBoundingRects != null) { + sb.append(", mBoundingRects=").append(Arrays.toString(mBoundingRects)); + } sb.append("}"); return sb.toString(); } @@ -257,6 +283,7 @@ public class InsetsFrameProvider implements Parcelable { mInsetsSizeOverrides = in.createTypedArray(InsetsSizeOverride.CREATOR); mArbitraryRectangle = in.readTypedObject(Rect.CREATOR); mMinimalInsetsSizeInDisplayCutoutSafe = in.readTypedObject(Insets.CREATOR); + mBoundingRects = in.createTypedArray(Rect.CREATOR); } @Override @@ -268,6 +295,7 @@ public class InsetsFrameProvider implements Parcelable { out.writeTypedArray(mInsetsSizeOverrides, flags); out.writeTypedObject(mArbitraryRectangle, flags); out.writeTypedObject(mMinimalInsetsSizeInDisplayCutoutSafe, flags); + out.writeTypedArray(mBoundingRects, flags); } public boolean idEquals(InsetsFrameProvider o) { @@ -288,14 +316,15 @@ public class InsetsFrameProvider implements Parcelable { && Arrays.equals(mInsetsSizeOverrides, other.mInsetsSizeOverrides) && Objects.equals(mArbitraryRectangle, other.mArbitraryRectangle) && Objects.equals(mMinimalInsetsSizeInDisplayCutoutSafe, - other.mMinimalInsetsSizeInDisplayCutoutSafe); + other.mMinimalInsetsSizeInDisplayCutoutSafe) + && Arrays.equals(mBoundingRects, other.mBoundingRects); } @Override public int hashCode() { return Objects.hash(mId, mSource, mFlags, mInsetsSize, Arrays.hashCode(mInsetsSizeOverrides), mArbitraryRectangle, - mMinimalInsetsSizeInDisplayCutoutSafe); + mMinimalInsetsSizeInDisplayCutoutSafe, Arrays.hashCode(mBoundingRects)); } public static final @NonNull Parcelable.Creator<InsetsFrameProvider> CREATOR = diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java index bc33d5e2f6b1..f9eba2948913 100644 --- a/core/java/android/view/InsetsSource.java +++ b/core/java/android/view/InsetsSource.java @@ -38,6 +38,8 @@ import android.view.WindowInsets.Type.InsetsType; import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Objects; import java.util.StringJoiner; @@ -105,6 +107,12 @@ public class InsetsSource implements Parcelable { }) public @interface Flags {} + /** + * Used when there are no bounding rects to describe an inset, which is only possible when the + * insets itself is {@link Insets#NONE}. + */ + private static final Rect[] NO_BOUNDING_RECTS = new Rect[0]; + private @Flags int mFlags; /** @@ -117,6 +125,7 @@ public class InsetsSource implements Parcelable { /** Frame of the source in screen coordinate space */ private final Rect mFrame; private @Nullable Rect mVisibleFrame; + private @Nullable Rect[] mBoundingRects; private boolean mVisible; @@ -127,6 +136,7 @@ public class InsetsSource implements Parcelable { private @InternalInsetsSide int mSideHint = SIDE_NONE; private final Rect mTmpFrame = new Rect(); + private final Rect mTmpBoundingRect = new Rect(); public InsetsSource(int id, @InsetsType int type) { mId = id; @@ -145,6 +155,9 @@ public class InsetsSource implements Parcelable { : null; mFlags = other.mFlags; mSideHint = other.mSideHint; + mBoundingRects = other.mBoundingRects != null + ? other.mBoundingRects.clone() + : null; } public void set(InsetsSource other) { @@ -155,6 +168,9 @@ public class InsetsSource implements Parcelable { : null; mFlags = other.mFlags; mSideHint = other.mSideHint; + mBoundingRects = other.mBoundingRects != null + ? other.mBoundingRects.clone() + : null; } public InsetsSource setFrame(int left, int top, int right, int bottom) { @@ -199,6 +215,15 @@ public class InsetsSource implements Parcelable { return this; } + /** + * Set the bounding rectangles of this source. They are expected to be relative to the source + * frame. + */ + public InsetsSource setBoundingRects(@Nullable Rect[] rects) { + mBoundingRects = rects != null ? rects.clone() : null; + return this; + } + public int getId() { return mId; } @@ -228,6 +253,13 @@ public class InsetsSource implements Parcelable { } /** + * Returns the bounding rectangles of this source. + */ + public @Nullable Rect[] getBoundingRects() { + return mBoundingRects; + } + + /** * Calculates the insets this source will cause to a client window. * * @param relativeFrame The frame to calculate the insets relative to. @@ -313,6 +345,82 @@ public class InsetsSource implements Parcelable { } /** + * Calculates the bounding rects the source will cause to a client window. + */ + public @NonNull Rect[] calculateBoundingRects(Rect relativeFrame, boolean ignoreVisibility) { + if (!ignoreVisibility && !mVisible) { + return NO_BOUNDING_RECTS; + } + + final Rect frame = getFrame(); + if (mBoundingRects == null) { + // No bounding rects set, make a single bounding rect that covers the intersection of + // the |frame| and the |relativeFrame|. + return mTmpBoundingRect.setIntersect(frame, relativeFrame) + ? new Rect[]{ new Rect(mTmpBoundingRect) } + : NO_BOUNDING_RECTS; + + } + + // Special treatment for captionBar inset type. During drag-resizing, the |frame| and + // |boundingRects| may not get updated as quickly as |relativeFrame|, so just assume the + // |frame| will always be either at the top or bottom of |relativeFrame|. This means some + // calculations to make |boundingRects| relative to |relativeFrame| can be skipped or + // simplified. + // TODO(b/254128050): remove special treatment. + if (getType() == WindowInsets.Type.captionBar()) { + final ArrayList<Rect> validBoundingRects = new ArrayList<>(); + for (final Rect boundingRect : mBoundingRects) { + // Assume that the caption |frame| and |relativeFrame| perfectly align at the top + // or bottom, meaning that the provided |boundingRect|, which is relative to the + // |frame| either is already relative to |relativeFrame| (for top captionBar()), or + // just needs to be made relative to |relativeFrame| for bottom bars. + final int frameHeight = frame.height(); + mTmpBoundingRect.set(boundingRect); + if (getId() == ID_IME_CAPTION_BAR) { + mTmpBoundingRect.offset(0, relativeFrame.height() - frameHeight); + } + validBoundingRects.add(new Rect(mTmpBoundingRect)); + } + return validBoundingRects.toArray(new Rect[validBoundingRects.size()]); + } + + // Regular treatment for non-captionBar inset types. + final ArrayList<Rect> validBoundingRects = new ArrayList<>(); + for (final Rect boundingRect : mBoundingRects) { + // |boundingRect| was provided relative to |frame|. Make it absolute to be in the same + // coordinate system as |frame|. + final Rect absBoundingRect = new Rect( + boundingRect.left + frame.left, + boundingRect.top + frame.top, + boundingRect.right + frame.left, + boundingRect.bottom + frame.top + ); + // Now find the intersection of that |absBoundingRect| with |relativeFrame|. In other + // words, whichever part of the bounding rect is inside the window frame. + if (!mTmpBoundingRect.setIntersect(absBoundingRect, relativeFrame)) { + // It's possible for this to be empty if the frame and bounding rects were larger + // than the |relativeFrame|, such as when a system window is wider than the app + // window width. Just ignore that rect since it will have no effect on the + // window insets. + continue; + } + // At this point, |mTmpBoundingRect| is a valid bounding rect located fully inside the + // window, convert it to be relative to the window so that apps don't need to know the + // location of the window to understand bounding rects. + validBoundingRects.add(new Rect( + mTmpBoundingRect.left - relativeFrame.left, + mTmpBoundingRect.top - relativeFrame.top, + mTmpBoundingRect.right - relativeFrame.left, + mTmpBoundingRect.bottom - relativeFrame.top)); + } + if (validBoundingRects.isEmpty()) { + return NO_BOUNDING_RECTS; + } + return validBoundingRects.toArray(new Rect[validBoundingRects.size()]); + } + + /** * Outputs the intersection of two rectangles. The shared edges will also be counted in the * intersection. * @@ -467,6 +575,7 @@ public class InsetsSource implements Parcelable { pw.print(" visible="); pw.print(mVisible); pw.print(" flags="); pw.print(flagsToString(mFlags)); pw.print(" sideHint="); pw.print(sideToString(mSideHint)); + pw.print(" boundingRects="); pw.print(Arrays.toString(mBoundingRects)); pw.println(); } @@ -492,12 +601,14 @@ public class InsetsSource implements Parcelable { if (mSideHint != that.mSideHint) return false; if (excludeInvisibleImeFrames && !mVisible && mType == WindowInsets.Type.ime()) return true; if (!Objects.equals(mVisibleFrame, that.mVisibleFrame)) return false; - return mFrame.equals(that.mFrame); + if (!mFrame.equals(that.mFrame)) return false; + return Arrays.equals(mBoundingRects, that.mBoundingRects); } @Override public int hashCode() { - return Objects.hash(mId, mType, mFrame, mVisibleFrame, mVisible, mFlags, mSideHint); + return Objects.hash(mId, mType, mFrame, mVisibleFrame, mVisible, mFlags, mSideHint, + Arrays.hashCode(mBoundingRects)); } public InsetsSource(Parcel in) { @@ -512,6 +623,7 @@ public class InsetsSource implements Parcelable { mVisible = in.readBoolean(); mFlags = in.readInt(); mSideHint = in.readInt(); + mBoundingRects = in.createTypedArray(Rect.CREATOR); } @Override @@ -533,6 +645,7 @@ public class InsetsSource implements Parcelable { dest.writeBoolean(mVisible); dest.writeInt(mFlags); dest.writeInt(mSideHint); + dest.writeTypedArray(mBoundingRects, flags); } @Override @@ -543,6 +656,7 @@ public class InsetsSource implements Parcelable { + " mVisible=" + mVisible + " mFlags=" + flagsToString(mFlags) + " mSideHint=" + sideToString(mSideHint) + + " mBoundingRects=" + Arrays.toString(mBoundingRects) + "}"; } diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index c88da9e2eb4f..21eec67bfe10 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -128,6 +128,8 @@ public class InsetsState implements Parcelable { final Rect relativeFrameMax = new Rect(frame); @InsetsType int forceConsumingTypes = 0; @InsetsType int suppressScrimTypes = 0; + final Rect[][] typeBoundingRectsMap = new Rect[Type.SIZE][]; + final Rect[][] typeMaxBoundingRectsMap = new Rect[Type.SIZE][]; for (int i = mSources.size() - 1; i >= 0; i--) { final InsetsSource source = mSources.valueAt(i); final @InsetsType int type = source.getType(); @@ -141,7 +143,7 @@ public class InsetsState implements Parcelable { } processSource(source, relativeFrame, false /* ignoreVisibility */, typeInsetsMap, - idSideMap, typeVisibilityMap); + idSideMap, typeVisibilityMap, typeBoundingRectsMap); // IME won't be reported in max insets as the size depends on the EditorInfo of the IME // target. @@ -154,7 +156,7 @@ public class InsetsState implements Parcelable { } processSource(ignoringVisibilitySource, relativeFrameMax, true /* ignoreVisibility */, typeMaxInsetsMap, null /* idSideMap */, - null /* typeVisibilityMap */); + null /* typeVisibilityMap */, typeMaxBoundingRectsMap); } } final int softInputAdjustMode = legacySoftInputMode & SOFT_INPUT_MASK_ADJUST; @@ -175,7 +177,8 @@ public class InsetsState implements Parcelable { calculateRelativeRoundedCorners(frame), calculateRelativePrivacyIndicatorBounds(frame), calculateRelativeDisplayShape(frame), - compatInsetsTypes, (legacySystemUiFlags & SYSTEM_UI_FLAG_LAYOUT_STABLE) != 0); + compatInsetsTypes, (legacySystemUiFlags & SYSTEM_UI_FLAG_LAYOUT_STABLE) != 0, + typeBoundingRectsMap, typeMaxBoundingRectsMap, frame.width(), frame.height()); } private DisplayCutout calculateRelativeCutout(Rect frame) { @@ -328,12 +331,13 @@ public class InsetsState implements Parcelable { private void processSource(InsetsSource source, Rect relativeFrame, boolean ignoreVisibility, Insets[] typeInsetsMap, @Nullable @InternalInsetsSide SparseIntArray idSideMap, - @Nullable boolean[] typeVisibilityMap) { + @Nullable boolean[] typeVisibilityMap, Rect[][] typeBoundingRectsMap) { Insets insets = source.calculateInsets(relativeFrame, ignoreVisibility); + final Rect[] boundingRects = source.calculateBoundingRects(relativeFrame, ignoreVisibility); final int type = source.getType(); processSourceAsPublicType(source, typeInsetsMap, idSideMap, typeVisibilityMap, - insets, type); + typeBoundingRectsMap, insets, boundingRects, type); if (type == Type.MANDATORY_SYSTEM_GESTURES) { // Mandatory system gestures are also system gestures. @@ -342,24 +346,25 @@ public class InsetsState implements Parcelable { // ability to set systemGestureInsets() independently from // mandatorySystemGestureInsets() in the Builder. processSourceAsPublicType(source, typeInsetsMap, idSideMap, typeVisibilityMap, - insets, Type.SYSTEM_GESTURES); + typeBoundingRectsMap, insets, boundingRects, Type.SYSTEM_GESTURES); } if (type == Type.CAPTION_BAR) { // Caption should also be gesture and tappable elements. This should not be needed when // the caption is added from the shell, as the shell can add other types at the same // time. processSourceAsPublicType(source, typeInsetsMap, idSideMap, typeVisibilityMap, - insets, Type.SYSTEM_GESTURES); + typeBoundingRectsMap, insets, boundingRects, Type.SYSTEM_GESTURES); processSourceAsPublicType(source, typeInsetsMap, idSideMap, typeVisibilityMap, - insets, Type.MANDATORY_SYSTEM_GESTURES); + typeBoundingRectsMap, insets, boundingRects, Type.MANDATORY_SYSTEM_GESTURES); processSourceAsPublicType(source, typeInsetsMap, idSideMap, typeVisibilityMap, - insets, Type.TAPPABLE_ELEMENT); + typeBoundingRectsMap, insets, boundingRects, Type.TAPPABLE_ELEMENT); } } private void processSourceAsPublicType(InsetsSource source, Insets[] typeInsetsMap, @InternalInsetsSide @Nullable SparseIntArray idSideMap, - @Nullable boolean[] typeVisibilityMap, Insets insets, int type) { + @Nullable boolean[] typeVisibilityMap, Rect[][] typeBoundingRectsMap, + Insets insets, Rect[] boundingRects, int type) { int index = indexOf(type); // Don't put Insets.NONE into typeInsetsMap. Otherwise, two WindowInsets can be considered @@ -384,6 +389,22 @@ public class InsetsState implements Parcelable { idSideMap.put(source.getId(), insetSide); } } + + if (typeBoundingRectsMap != null && boundingRects.length > 0) { + final Rect[] existing = typeBoundingRectsMap[index]; + if (existing == null) { + typeBoundingRectsMap[index] = boundingRects; + } else { + typeBoundingRectsMap[index] = concatenate(existing, boundingRects); + } + } + } + + private static Rect[] concatenate(Rect[] a, Rect[] b) { + final Rect[] c = new Rect[a.length + b.length]; + System.arraycopy(a, 0, c, 0, a.length); + System.arraycopy(b, 0, c, a.length, b.length); + return c; } /** diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index a9f189700789..dc0b1a77de80 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -30,6 +30,7 @@ import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ER import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_UNKNOWN; import static android.view.displayhash.DisplayHashResultCallback.EXTRA_DISPLAY_HASH; import static android.view.displayhash.DisplayHashResultCallback.EXTRA_DISPLAY_HASH_ERROR_CODE; +import static android.view.flags.Flags.FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API; import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY; import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API; import static android.view.flags.Flags.enableUseMeasureCacheDuringForceLayout; @@ -42,6 +43,7 @@ import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFI import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS; import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; +import static com.android.window.flags.Flags.FLAG_DELEGATE_UNHANDLED_DRAGS; import static java.lang.Math.max; @@ -67,6 +69,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UiContext; import android.annotation.UiThread; +import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; import android.content.AutofillOptions; import android.content.ClipData; @@ -1946,6 +1949,41 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static final int TOOLTIP = 0x40000000; /** @hide */ + @IntDef(prefix = { "CONTENT_SENSITIVITY_" }, value = { + CONTENT_SENSITIVITY_AUTO, + CONTENT_SENSITIVITY_SENSITIVE, + CONTENT_SENSITIVITY_NOT_SENSITIVE + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ContentSensitivity {} + + /** + * Automatically determine whether a view displays sensitive content. For example, available + * autofill hints (or some other signal) can be used to determine if this view + * displays sensitive content. + * + * @see #getContentSensitivity() + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public static final int CONTENT_SENSITIVITY_AUTO = 0x0; + + /** + * The view displays sensitive content. + * + * @see #getContentSensitivity() + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public static final int CONTENT_SENSITIVITY_SENSITIVE = 0x1; + + /** + * The view doesn't display sensitive content. + * + * @see #getContentSensitivity() + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public static final int CONTENT_SENSITIVITY_NOT_SENSITIVE = 0x2; + + /** @hide */ @IntDef(flag = true, prefix = { "FOCUSABLES_" }, value = { FOCUSABLES_ALL, FOCUSABLES_TOUCH_MODE @@ -3646,6 +3684,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * 1 PFLAG4_ROTARY_HAPTICS_ENABLED * 1 PFLAG4_ROTARY_HAPTICS_SCROLL_SINCE_LAST_ROTARY_INPUT * 1 PFLAG4_ROTARY_HAPTICS_WAITING_FOR_SCROLL_EVENT + * 11 PFLAG4_CONTENT_SENSITIVITY_MASK * |-------|-------|-------|-------| */ @@ -3762,6 +3801,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ private static final int PFLAG4_ROTARY_HAPTICS_WAITING_FOR_SCROLL_EVENT = 0x800000; + private static final int PFLAG4_CONTENT_SENSITIVITY_SHIFT = 24; + + /** + * Mask for obtaining the bits which specify how to determine whether a view + * displays sensitive content or not. + */ + private static final int PFLAG4_CONTENT_SENSITIVITY_MASK = + (CONTENT_SENSITIVITY_AUTO | CONTENT_SENSITIVITY_SENSITIVE + | CONTENT_SENSITIVITY_NOT_SENSITIVE) << PFLAG4_CONTENT_SENSITIVITY_SHIFT; /* End of masks for mPrivateFlags4 */ /** @hide */ @@ -5283,6 +5331,34 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int DRAG_FLAG_REQUEST_SURFACE_FOR_RETURN_ANIMATION = 1 << 11; /** + * Flag indicating that a drag can cross window boundaries (within the same application). When + * {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)} is called + * with this flag set, only visible windows belonging to the same application (ie. share the + * same UID) with targetSdkVersion >= {@link android.os.Build.VERSION_CODES#N API 24} will be + * able to participate in the drag operation and receive the dragged content. + * + * If both DRAG_FLAG_GLOBAL_SAME_APPLICATION and DRAG_FLAG_GLOBAL are set, then + * DRAG_FLAG_GLOBAL_SAME_APPLICATION takes precedence and the drag will only go to visible + * windows from the same application. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + public static final int DRAG_FLAG_GLOBAL_SAME_APPLICATION = 1 << 12; + + /** + * Flag indicating that an unhandled drag should be delegated to the system to be started if no + * visible window wishes to handle the drop. When using this flag, the caller must provide + * ClipData with an Item that contains an immutable PendingIntent to an activity to be launched + * (not a broadcast, service, etc). See + * {@link ClipData.Item.Builder#setPendingIntent(PendingIntent)}. + * + * The system can decide to launch the intent or not based on factors like the current screen + * size or windowing mode. If the system does not launch the intent, it will be canceled via the + * normal drag and drop flow. + */ + @FlaggedApi(FLAG_DELEGATE_UNHANDLED_DRAGS) + public static final int DRAG_FLAG_START_PENDING_INTENT_ON_UNHANDLED_DRAG = 1 << 13; + + /** * Vertical scroll factor cached by {@link #getVerticalScrollFactor}. */ private float mVerticalScrollFactor; @@ -6318,6 +6394,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, case R.styleable.View_handwritingBoundsOffsetBottom: mHandwritingBoundsOffsetBottom = a.getDimension(attr, 0); break; + case R.styleable.View_contentSensitivity: + setContentSensitivity(a.getInt(attr, CONTENT_SENSITIVITY_AUTO)); + break; } } @@ -10150,6 +10229,54 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** + * Sets content sensitivity mode to determine whether this view displays sensitive content. + * + * @param mode {@link #CONTENT_SENSITIVITY_AUTO}, {@link #CONTENT_SENSITIVITY_NOT_SENSITIVE} + * or {@link #CONTENT_SENSITIVITY_SENSITIVE} + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public final void setContentSensitivity(@ContentSensitivity int mode) { + mPrivateFlags4 &= ~PFLAG4_CONTENT_SENSITIVITY_MASK; + mPrivateFlags4 |= ((mode << PFLAG4_CONTENT_SENSITIVITY_SHIFT) + & PFLAG4_CONTENT_SENSITIVITY_MASK); + } + + /** + * Gets content sensitivity mode to determine whether this view displays sensitive content. + * + * <p>See {@link #setContentSensitivity(int)} and + * {@link #isContentSensitive()} for more info about this mode. + * + * @return {@link #CONTENT_SENSITIVITY_AUTO} by default, or value passed to + * {@link #setContentSensitivity(int)}. + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public @ContentSensitivity + final int getContentSensitivity() { + return (mPrivateFlags4 & PFLAG4_CONTENT_SENSITIVITY_MASK) + >> PFLAG4_CONTENT_SENSITIVITY_SHIFT; + } + + /** + * Returns whether this view displays sensitive content, based + * on the value explicitly set by {@link #setContentSensitivity(int)}. + * + * @return whether the view displays sensitive content. + * + * @see #setContentSensitivity(int) + * @see #CONTENT_SENSITIVITY_AUTO + * @see #CONTENT_SENSITIVITY_SENSITIVE + * @see #CONTENT_SENSITIVITY_NOT_SENSITIVE + */ + @FlaggedApi(FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API) + public final boolean isContentSensitive() { + if (getContentSensitivity() == CONTENT_SENSITIVITY_SENSITIVE) { + return true; + } + return false; + } + + /** * Gets the mode for determining whether this view is important for content capture. * * <p>See {@link #setImportantForContentCapture(int)} and @@ -22175,6 +22302,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Retrieve a unique token identifying the window this view is attached to. * @return Return the window's token for use in * {@link WindowManager.LayoutParams#token WindowManager.LayoutParams.token}. + * This token maybe null if this view is not attached to a window. + * @see #isAttachedToWindow() for current window attach state + * @see OnAttachStateChangeListener to listen to window attach/detach state changes */ public IBinder getWindowToken() { return mAttachInfo != null ? mAttachInfo.mWindowToken : null; @@ -28402,9 +28532,29 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Log.w(VIEW_LOG_TAG, "startDragAndDrop called with an invalid surface."); return false; } + if ((flags & DRAG_FLAG_GLOBAL) != 0 && ((flags & DRAG_FLAG_GLOBAL_SAME_APPLICATION) != 0)) { + Log.w(VIEW_LOG_TAG, "startDragAndDrop called with both DRAG_FLAG_GLOBAL " + + "and DRAG_FLAG_GLOBAL_SAME_APPLICATION, the drag will default to " + + "DRAG_FLAG_GLOBAL_SAME_APPLICATION"); + flags &= ~DRAG_FLAG_GLOBAL; + } if (data != null) { - data.prepareToLeaveProcess((flags & View.DRAG_FLAG_GLOBAL) != 0); + if (com.android.window.flags.Flags.delegateUnhandledDrags()) { + data.prepareToLeaveProcess( + (flags & (DRAG_FLAG_GLOBAL_SAME_APPLICATION | DRAG_FLAG_GLOBAL)) != 0); + if ((flags & DRAG_FLAG_START_PENDING_INTENT_ON_UNHANDLED_DRAG) != 0) { + if (!data.hasActivityPendingIntents()) { + // Reset the flag if there is no launchable activity intent + flags &= ~DRAG_FLAG_START_PENDING_INTENT_ON_UNHANDLED_DRAG; + Log.w(VIEW_LOG_TAG, "startDragAndDrop called with " + + "DRAG_FLAG_START_INTENT_ON_UNHANDLED_DRAG but the clip data " + + "contains non-activity PendingIntents"); + } + } + } else { + data.prepareToLeaveProcess((flags & DRAG_FLAG_GLOBAL) != 0); + } } Rect bounds = new Rect(); @@ -28430,6 +28580,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (token != null) { root.setLocalDragState(myLocalState); mAttachInfo.mDragToken = token; + mAttachInfo.mDragData = data; mAttachInfo.mViewRootImpl.setDragStartedViewForAccessibility(this); setAccessibilityDragStarted(true); } @@ -28507,8 +28658,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (mAttachInfo.mDragSurface != null) { mAttachInfo.mDragSurface.release(); } + if (mAttachInfo.mDragData != null) { + mAttachInfo.mDragData.cleanUpPendingIntents(); + } mAttachInfo.mDragSurface = surface; mAttachInfo.mDragToken = token; + mAttachInfo.mDragData = data; // Cache the local state object for delivery with DragEvents root.setLocalDragState(myLocalState); if (a11yEnabled) { @@ -31422,11 +31577,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, IBinder mDragToken; /** + * Used to track the data of the current drag operation for cleanup later. + */ + ClipData mDragData; + + /** * The drag shadow surface for the current drag operation. */ public Surface mDragSurface; - /** * The view that currently has a tooltip displayed. */ diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 07c97950e9bb..28a73344b731 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -8599,6 +8599,10 @@ public final class ViewRootImpl implements ViewParent, mAttachInfo.mDragSurface.release(); mAttachInfo.mDragSurface = null; } + if (mAttachInfo.mDragData != null) { + mAttachInfo.mDragData.cleanUpPendingIntents(); + mAttachInfo.mDragData = null; + } } } } diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 921afaa99277..fbebe1e726b7 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -34,6 +34,7 @@ import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.indexOf; import static android.view.WindowInsets.Type.systemBars; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; @@ -44,8 +45,10 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.graphics.Insets; import android.graphics.Rect; +import android.util.Size; import android.view.View.OnApplyWindowInsetsListener; import android.view.WindowInsets.Type.InsetsType; +import android.view.flags.Flags; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethod; @@ -54,7 +57,10 @@ import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.Objects; /** @@ -78,6 +84,8 @@ public final class WindowInsets { private final Insets[] mTypeInsetsMap; private final Insets[] mTypeMaxInsetsMap; private final boolean[] mTypeVisibilityMap; + private final Rect[][] mTypeBoundingRectsMap; + private final Rect[][] mTypeMaxBoundingRectsMap; @Nullable private Rect mTempRect; private final boolean mIsRound; @@ -85,6 +93,8 @@ public final class WindowInsets { @Nullable private final RoundedCorners mRoundedCorners; @Nullable private final PrivacyIndicatorBounds mPrivacyIndicatorBounds; @Nullable private final DisplayShape mDisplayShape; + private final int mFrameWidth; + private final int mFrameHeight; private final @InsetsType int mForceConsumingTypes; private final @InsetsType int mSuppressScrimTypes; @@ -114,7 +124,7 @@ public final class WindowInsets { static { CONSUMED = new WindowInsets(createCompatTypeMap(null), createCompatTypeMap(null), createCompatVisibilityMap(createCompatTypeMap(null)), false, 0, 0, null, - null, null, null, systemBars(), false); + null, null, null, systemBars(), false, null, null, 0, 0); } /** @@ -139,7 +149,10 @@ public final class WindowInsets { RoundedCorners roundedCorners, PrivacyIndicatorBounds privacyIndicatorBounds, DisplayShape displayShape, - @InsetsType int compatInsetsTypes, boolean compatIgnoreVisibility) { + @InsetsType int compatInsetsTypes, boolean compatIgnoreVisibility, + Rect[][] typeBoundingRectsMap, + Rect[][] typeMaxBoundingRectsMap, + int frameWidth, int frameHeight) { mSystemWindowInsetsConsumed = typeInsetsMap == null; mTypeInsetsMap = mSystemWindowInsetsConsumed ? new Insets[SIZE] @@ -164,6 +177,14 @@ public final class WindowInsets { mRoundedCorners = roundedCorners; mPrivacyIndicatorBounds = privacyIndicatorBounds; mDisplayShape = displayShape; + mTypeBoundingRectsMap = (mSystemWindowInsetsConsumed || typeBoundingRectsMap == null) + ? new Rect[SIZE][] + : typeBoundingRectsMap.clone(); + mTypeMaxBoundingRectsMap = (mStableInsetsConsumed || typeMaxBoundingRectsMap == null) + ? new Rect[SIZE][] + : typeMaxBoundingRectsMap.clone(); + mFrameWidth = frameWidth; + mFrameHeight = frameHeight; } /** @@ -181,7 +202,11 @@ public final class WindowInsets { src.mPrivacyIndicatorBounds, src.mDisplayShape, src.mCompatInsetsTypes, - src.mCompatIgnoreVisibility); + src.mCompatIgnoreVisibility, + src.mSystemWindowInsetsConsumed ? null : src.mTypeBoundingRectsMap, + src.mStableInsetsConsumed ? null : src.mTypeMaxBoundingRectsMap, + src.mFrameWidth, + src.mFrameHeight); } private static DisplayCutout displayCutoutCopyConstructorArgument(WindowInsets w) { @@ -233,7 +258,8 @@ public final class WindowInsets { @UnsupportedAppUsage public WindowInsets(Rect systemWindowInsets) { this(createCompatTypeMap(systemWindowInsets), null, new boolean[SIZE], false, 0, 0, - null, null, null, null, systemBars(), false /* compatIgnoreVisibility */); + null, null, null, null, systemBars(), false /* compatIgnoreVisibility */, + new Rect[SIZE][], null, 0, 0); } /** @@ -475,6 +501,111 @@ public final class WindowInsets { } /** + * Returns a list of {@link Rect}s, each of which is the bounding rectangle for an area + * that is being partially or fully obscured inside the window. + * + * <p> + * May be used with or instead of {@link Insets} for finer avoidance of regions that may be + * partially obscuring the window but may be smaller than those provided by + * {@link #getInsets(int)}. + * </p> + * + * <p> + * The {@link Rect}s returned are always cropped to the bounds of the window frame and their + * coordinate values are relative to the {@link #getFrame()}, regardless of the window's + * position on screen. + * </p> + * + * <p> + * If inset by {@link #inset(Insets)}, bounding rects that intersect with the provided insets + * will be resized to only include the intersection with the remaining frame. Bounding rects + * may be completely removed if they no longer intersect with the new instance. + * </p> + * + * @param typeMask the insets type for which to obtain the bounding rectangles + * @return the bounding rectangles + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public List<Rect> getBoundingRects(@InsetsType int typeMask) { + Rect[] allRects = null; + for (int i = FIRST; i <= LAST; i = i << 1) { + if ((typeMask & i) == 0) { + continue; + } + final Rect[] rects = mTypeBoundingRectsMap[indexOf(i)]; + if (rects == null) { + continue; + } + if (allRects == null) { + allRects = rects; + } else { + final Rect[] concat = new Rect[allRects.length + rects.length]; + System.arraycopy(allRects, 0, concat, 0, allRects.length); + System.arraycopy(rects, 0, concat, allRects.length, rects.length); + allRects = concat; + } + } + if (allRects == null) { + return Collections.emptyList(); + } + return Arrays.asList(allRects); + } + + /** + * Returns a list of {@link Rect}s, each of which is the bounding rectangle for an area that + * can be partially or fully obscured inside the window, regardless of whether + * that type is currently visible or not. + * + * <p> The bounding rects represent areas of a window that <b>may</b> be partially or fully + * obscured by the {@code type}. This value does not change based on the visibility state of + * those elements. For example, if the status bar is normally shown, but temporarily hidden, + * the bounding rects returned here will provide the rects associated with the status bar being + * shown.</p> + * + * <p> + * May be used with or instead of {@link Insets} for finer avoidance of regions that may be + * partially obscuring the window but may be smaller than those provided by + * {@link #getInsetsIgnoringVisibility(int)}. + * </p> + * + * <p> + * The {@link Rect}s returned are always cropped to the bounds of the window frame and their + * coordinate values are relative to the {@link #getFrame()}, regardless of the window's + * position on screen. + * </p> + * + * @param typeMask the insets type for which to obtain the bounding rectangles + * @return the bounding rectangles + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public List<Rect> getBoundingRectsIgnoringVisibility(@InsetsType int typeMask) { + Rect[] allRects = null; + for (int i = FIRST; i <= LAST; i = i << 1) { + if ((typeMask & i) == 0) { + continue; + } + final Rect[] rects = mTypeMaxBoundingRectsMap[indexOf(i)]; + if (rects == null) { + continue; + } + if (allRects == null) { + allRects = rects; + } else { + final Rect[] concat = new Rect[allRects.length + rects.length]; + System.arraycopy(allRects, 0, concat, 0, allRects.length); + System.arraycopy(rects, 0, concat, allRects.length, rects.length); + allRects = concat; + } + } + if (allRects == null) { + return Collections.emptyList(); + } + return Arrays.asList(allRects); + } + + /** * Returns the display cutout if there is one. * * <p>Note: the display cutout will already be {@link #consumeDisplayCutout consumed} during @@ -555,7 +686,10 @@ public final class WindowInsets { mTypeVisibilityMap, mIsRound, mForceConsumingTypes, mSuppressScrimTypes, null /* displayCutout */, mRoundedCorners, mPrivacyIndicatorBounds, mDisplayShape, - mCompatInsetsTypes, mCompatIgnoreVisibility); + mCompatInsetsTypes, mCompatIgnoreVisibility, + mSystemWindowInsetsConsumed ? null : mTypeBoundingRectsMap, + mStableInsetsConsumed ? null : mTypeMaxBoundingRectsMap, + mFrameWidth, mFrameHeight); } @@ -610,7 +744,7 @@ public final class WindowInsets { (mCompatInsetsTypes & displayCutout()) != 0 ? null : displayCutoutCopyConstructorArgument(this), mRoundedCorners, mPrivacyIndicatorBounds, mDisplayShape, mCompatInsetsTypes, - mCompatIgnoreVisibility); + mCompatIgnoreVisibility, null, null, mFrameWidth, mFrameHeight); } // TODO(b/119190588): replace @code with @link below @@ -914,6 +1048,10 @@ public final class WindowInsets { result.append(Type.toString(1 << i)).append("=").append(insets) .append(" max=").append(maxInsets) .append(" vis=").append(visible) + .append(" boundingRects=") + .append(Arrays.toString(mTypeBoundingRectsMap[i])) + .append(" maxBoundingRects=") + .append(Arrays.toString(mTypeMaxBoundingRectsMap[i])) .append("\n "); } } @@ -942,6 +1080,10 @@ public final class WindowInsets { result.append("displayCutoutConsumed=" + mDisplayCutoutConsumed); result.append("\n "); result.append(isRound() ? "round" : ""); + result.append("\n "); + result.append("frameWidth=" + mFrameWidth); + result.append("\n "); + result.append("frameHeight=" + mFrameHeight); result.append("}"); return result.toString(); } @@ -1013,6 +1155,27 @@ public final class WindowInsets { } /** + * Returns the assumed size of the window, relative to which the {@link #getInsets} and + * {@link #getBoundingRects} have been calculated. + * + * <p> May be used with {@link #getBoundingRects} to better understand their position within + * the window, such as the area between the edge of a bounding rect and the edge of the window. + * + * <p>Note: the size may not match the actual size of the window, which is determined during + * the layout pass - as {@link WindowInsets} are dispatched before layout. + * + * <p>Caution: using this value in determining the actual window size may make the result of + * layout passes unstable and should be avoided. + * + * @return the assumed size of the window during the inset calculation + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public Size getFrame() { + return new Size(mFrameWidth, mFrameHeight); + } + + /** * @see #inset(int, int, int, int) * @hide */ @@ -1039,7 +1202,17 @@ public final class WindowInsets { ? null : mPrivacyIndicatorBounds.inset(left, top, right, bottom), mDisplayShape, - mCompatInsetsTypes, mCompatIgnoreVisibility); + mCompatInsetsTypes, mCompatIgnoreVisibility, + mSystemWindowInsetsConsumed + ? null + : insetBoundingRects(mTypeBoundingRectsMap, left, top, right, bottom, + mFrameWidth, mFrameHeight), + mStableInsetsConsumed + ? null + : insetBoundingRects(mTypeMaxBoundingRectsMap, left, top, right, bottom, + mFrameWidth, mFrameHeight), + Math.max(0, mFrameWidth - left - right), + Math.max(0, mFrameHeight - top - bottom)); } @Override @@ -1060,7 +1233,11 @@ public final class WindowInsets { && Objects.equals(mDisplayCutout, that.mDisplayCutout) && Objects.equals(mRoundedCorners, that.mRoundedCorners) && Objects.equals(mPrivacyIndicatorBounds, that.mPrivacyIndicatorBounds) - && Objects.equals(mDisplayShape, that.mDisplayShape); + && Objects.equals(mDisplayShape, that.mDisplayShape) + && Arrays.deepEquals(mTypeBoundingRectsMap, that.mTypeBoundingRectsMap) + && Arrays.deepEquals(mTypeMaxBoundingRectsMap, that.mTypeMaxBoundingRectsMap) + && mFrameWidth == that.mFrameWidth + && mFrameHeight == that.mFrameHeight; } @Override @@ -1069,7 +1246,8 @@ public final class WindowInsets { Arrays.hashCode(mTypeVisibilityMap), mIsRound, mDisplayCutout, mRoundedCorners, mForceConsumingTypes, mSuppressScrimTypes, mSystemWindowInsetsConsumed, mStableInsetsConsumed, mDisplayCutoutConsumed, mPrivacyIndicatorBounds, - mDisplayShape); + mDisplayShape, Arrays.deepHashCode(mTypeBoundingRectsMap), + Arrays.deepHashCode(mTypeMaxBoundingRectsMap), mFrameWidth, mFrameHeight); } @@ -1110,6 +1288,68 @@ public final class WindowInsets { return Insets.of(newLeft, newTop, newRight, newBottom); } + static Rect[][] insetBoundingRects(Rect[][] typeBoundingRectsMap, + int insetLeft, int insetTop, int insetRight, int insetBottom, int frameWidth, + int frameHeight) { + if (insetLeft == 0 && insetTop == 0 && insetRight == 0 && insetBottom == 0) { + return typeBoundingRectsMap; + } + boolean cloned = false; + for (int i = 0; i < SIZE; i++) { + final Rect[] boundingRects = typeBoundingRectsMap[i]; + if (boundingRects == null) { + continue; + } + final Rect[] insetBoundingRects = insetBoundingRects(boundingRects, + insetLeft, insetTop, insetRight, insetBottom, frameWidth, frameHeight); + if (!Arrays.equals(insetBoundingRects, boundingRects)) { + if (!cloned) { + typeBoundingRectsMap = typeBoundingRectsMap.clone(); + cloned = true; + } + typeBoundingRectsMap[i] = insetBoundingRects; + } + } + return typeBoundingRectsMap; + } + + static Rect[] insetBoundingRects(Rect[] boundingRects, + int left, int top, int right, int bottom, int frameWidth, int frameHeight) { + final List<Rect> insetBoundingRectsList = new ArrayList<>(); + for (int i = 0; i < boundingRects.length; i++) { + final Rect insetRect = insetRect(boundingRects[i], left, top, right, bottom, + frameWidth, frameHeight); + if (insetRect != null) { + insetBoundingRectsList.add(insetRect); + } + } + return insetBoundingRectsList.toArray(new Rect[0]); + } + + private static Rect insetRect(Rect orig, int insetLeft, int insetTop, int insetRight, + int insetBottom, int frameWidth, int frameHeight) { + if (orig == null) { + return null; + } + + // Calculate the inset frame, and leave it in that coordinate space for easier comparison + // against the |orig| rect. + final Rect insetFrame = new Rect(insetLeft, insetTop, frameWidth - insetRight, + frameHeight - insetBottom); + // Then the intersecting portion of |orig| with the inset |insetFrame|. + final Rect insetRect = new Rect(); + if (insetRect.setIntersect(insetFrame, orig)) { + // The intersection is the inset rect, but its position must be shifted to be relative + // to the frame. Since the new frame will start at left=|insetLeft| and top=|insetTop|, + // just offset that much back in the direction of the origin of the frame. + insetRect.offset(-insetLeft, -insetTop); + return insetRect; + } else { + // The |orig| rect does not intersect with the new frame at all, so don't report it. + return null; + } + } + /** * @return whether system window insets have been consumed. */ @@ -1125,6 +1365,8 @@ public final class WindowInsets { private final Insets[] mTypeInsetsMap; private final Insets[] mTypeMaxInsetsMap; private final boolean[] mTypeVisibilityMap; + private final Rect[][] mTypeBoundingRectsMap; + private final Rect[][] mTypeMaxBoundingRectsMap; private boolean mSystemInsetsConsumed = true; private boolean mStableInsetsConsumed = true; @@ -1137,6 +1379,8 @@ public final class WindowInsets { private @InsetsType int mSuppressScrimTypes; private PrivacyIndicatorBounds mPrivacyIndicatorBounds = new PrivacyIndicatorBounds(); + private int mFrameWidth; + private int mFrameHeight; /** * Creates a builder where all insets are initially consumed. @@ -1145,6 +1389,8 @@ public final class WindowInsets { mTypeInsetsMap = new Insets[SIZE]; mTypeMaxInsetsMap = new Insets[SIZE]; mTypeVisibilityMap = new boolean[SIZE]; + mTypeBoundingRectsMap = new Rect[SIZE][]; + mTypeMaxBoundingRectsMap = new Rect[SIZE][]; } /** @@ -1165,6 +1411,10 @@ public final class WindowInsets { mSuppressScrimTypes = insets.mSuppressScrimTypes; mPrivacyIndicatorBounds = insets.mPrivacyIndicatorBounds; mDisplayShape = insets.mDisplayShape; + mTypeBoundingRectsMap = insets.mTypeBoundingRectsMap.clone(); + mTypeMaxBoundingRectsMap = insets.mTypeMaxBoundingRectsMap.clone(); + mFrameWidth = insets.mFrameWidth; + mFrameHeight = insets.mFrameHeight; } /** @@ -1452,6 +1702,68 @@ public final class WindowInsets { } /** + * Sets the bounding rects. + * + * @param typeMask the inset types to which these rects apply. + * @param rects the bounding rects. + * @return itself. + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public Builder setBoundingRects(@InsetsType int typeMask, @NonNull List<Rect> rects) { + for (int i = FIRST; i <= LAST; i = i << 1) { + if ((typeMask & i) == 0) { + continue; + } + mTypeBoundingRectsMap[indexOf(i)] = rects.toArray(new Rect[0]); + } + return this; + } + + /** + * Sets the bounding rects while ignoring their visibility state. + * + * @param typeMask the inset types to which these rects apply. + * @param rects the bounding rects. + * @return itself. + * + * @throws IllegalArgumentException If {@code typeMask} contains {@link Type#ime()}. + * Maximum bounding rects are not available for this type as the height of the IME is + * dynamic depending on the {@link EditorInfo} of the currently focused view, as well as + * the UI state of the IME. + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public Builder setBoundingRectsIgnoringVisibility(@InsetsType int typeMask, + @NonNull List<Rect> rects) { + if (typeMask == IME) { + throw new IllegalArgumentException("Maximum bounding rects not available for IME"); + } + for (int i = FIRST; i <= LAST; i = i << 1) { + if ((typeMask & i) == 0) { + continue; + } + mTypeMaxBoundingRectsMap[indexOf(i)] = rects.toArray(new Rect[0]); + } + return this; + } + + /** + * Set the frame size. + * + * @param width the width of the frame. + * @param height the height of the frame. + * @return itself. + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + @NonNull + public Builder setFrame(int width, int height) { + mFrameWidth = width; + mFrameHeight = height; + return this; + } + + /** * Builds a {@link WindowInsets} instance. * * @return the {@link WindowInsets} instance. @@ -1462,7 +1774,10 @@ public final class WindowInsets { mStableInsetsConsumed ? null : mTypeMaxInsetsMap, mTypeVisibilityMap, mIsRound, mForceConsumingTypes, mSuppressScrimTypes, mDisplayCutout, mRoundedCorners, mPrivacyIndicatorBounds, mDisplayShape, systemBars(), - false /* compatIgnoreVisibility */); + false /* compatIgnoreVisibility */, + mSystemInsetsConsumed ? null : mTypeBoundingRectsMap, + mStableInsetsConsumed ? null : mTypeMaxBoundingRectsMap, + mFrameWidth, mFrameHeight); } } diff --git a/core/java/android/view/WindowInsetsController.java b/core/java/android/view/WindowInsetsController.java index cc2cd7982841..b7542dcd55e2 100644 --- a/core/java/android/view/WindowInsetsController.java +++ b/core/java/android/view/WindowInsetsController.java @@ -16,6 +16,7 @@ package android.view; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -26,6 +27,7 @@ import android.os.CancellationSignal; import android.view.WindowInsets.Type; import android.view.WindowInsets.Type.InsetsType; import android.view.animation.Interpolator; +import android.view.flags.Flags; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -78,6 +80,20 @@ public interface WindowInsetsController { int APPEARANCE_SEMI_TRANSPARENT_NAVIGATION_BARS = 1 << 6; /** + * Makes the caption bar transparent. + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + int APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND = 1 << 7; + + /** + * When {@link WindowInsetsController#APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND} is set, + * changes the foreground color of the caption bars so that the items on the bar can be read + * clearly on light backgrounds. + */ + @FlaggedApi(Flags.FLAG_CUSTOMIZABLE_WINDOW_HEADERS) + int APPEARANCE_LIGHT_CAPTION_BARS = 1 << 8; + + /** * Determines the appearance of system bars. * @hide */ @@ -85,7 +101,8 @@ public interface WindowInsetsController { @IntDef(flag = true, value = {APPEARANCE_OPAQUE_STATUS_BARS, APPEARANCE_OPAQUE_NAVIGATION_BARS, APPEARANCE_LOW_PROFILE_BARS, APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_NAVIGATION_BARS, APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS, - APPEARANCE_SEMI_TRANSPARENT_NAVIGATION_BARS}) + APPEARANCE_SEMI_TRANSPARENT_NAVIGATION_BARS, + APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND, APPEARANCE_LIGHT_CAPTION_BARS}) @interface Appearance { } diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index ae00b7072684..2fb5213279a6 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -520,11 +520,16 @@ public final class WindowManagerImpl implements WindowManager { public void registerTrustedPresentationListener(@NonNull IBinder window, @NonNull TrustedPresentationThresholds thresholds, @NonNull Executor executor, @NonNull Consumer<Boolean> listener) { + Objects.requireNonNull(window, "window must not be null"); + Objects.requireNonNull(thresholds, "thresholds must not be null"); + Objects.requireNonNull(executor, "executor must not be null"); + Objects.requireNonNull(listener, "listener must not be null"); mGlobal.registerTrustedPresentationListener(window, thresholds, executor, listener); } @Override public void unregisterTrustedPresentationListener(@NonNull Consumer<Boolean> listener) { + Objects.requireNonNull(listener, "listener must not be null"); mGlobal.unregisterTrustedPresentationListener(listener); } diff --git a/core/java/android/view/inputmethod/ConnectionlessHandwritingCallback.java b/core/java/android/view/inputmethod/ConnectionlessHandwritingCallback.java new file mode 100644 index 000000000000..d985732840fd --- /dev/null +++ b/core/java/android/view/inputmethod/ConnectionlessHandwritingCallback.java @@ -0,0 +1,77 @@ +/* + * 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.view.inputmethod; + +import android.annotation.FlaggedApi; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.view.View; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.concurrent.Executor; + +/** + * Interface to receive the result of starting a connectionless stylus handwriting session using + * one of {@link InputMethodManager#startConnectionlessStylusHandwriting(View, CursorAnchorInfo, + * Executor,ConnectionlessHandwritingCallback)}, {@link + * InputMethodManager#startConnectionlessStylusHandwritingForDelegation(View, CursorAnchorInfo, + * Executor, ConnectionlessHandwritingCallback)}, or {@link + * InputMethodManager#startConnectionlessStylusHandwritingForDelegation(View, CursorAnchorInfo, + * String, Executor, ConnectionlessHandwritingCallback)}. + */ +@FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) +public interface ConnectionlessHandwritingCallback { + + /** @hide */ + @IntDef(prefix = {"CONNECTIONLESS_HANDWRITING_ERROR_"}, value = { + CONNECTIONLESS_HANDWRITING_ERROR_NO_TEXT_RECOGNIZED, + CONNECTIONLESS_HANDWRITING_ERROR_UNSUPPORTED, + CONNECTIONLESS_HANDWRITING_ERROR_OTHER + }) + @Retention(RetentionPolicy.SOURCE) + @interface ConnectionlessHandwritingError { + } + + /** + * Error code indicating that the connectionless handwriting session started and completed + * but no text was recognized. + */ + int CONNECTIONLESS_HANDWRITING_ERROR_NO_TEXT_RECOGNIZED = 0; + + /** + * Error code indicating that the connectionless handwriting session was not started as the + * current IME does not support it. + */ + int CONNECTIONLESS_HANDWRITING_ERROR_UNSUPPORTED = 1; + + /** + * Error code for any other reason that the connectionless handwriting session did not complete + * successfully. Either the session could not start, or the session started but did not complete + * successfully. + */ + int CONNECTIONLESS_HANDWRITING_ERROR_OTHER = 2; + + /** + * Callback when the connectionless handwriting session completed successfully and + * recognized text. + */ + void onResult(@NonNull CharSequence text); + + /** Callback when the connectionless handwriting session did not complete successfully. */ + void onError(@ConnectionlessHandwritingError int errorCode); +} diff --git a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java index 89da04128bc8..dc5e0e5c62aa 100644 --- a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java +++ b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java @@ -34,6 +34,7 @@ import android.view.WindowManager; import android.window.ImeOnBackInvokedDispatcher; import com.android.internal.inputmethod.DirectBootAwareness; +import com.android.internal.inputmethod.IConnectionlessHandwritingCallback; import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; @@ -492,6 +493,27 @@ final class IInputMethodManagerGlobalInvoker { } @AnyThread + static boolean startConnectionlessStylusHandwriting( + @NonNull IInputMethodClient client, + @UserIdInt int userId, + @Nullable CursorAnchorInfo cursorAnchorInfo, + @Nullable String delegatePackageName, + @Nullable String delegatorPackageName, + @NonNull IConnectionlessHandwritingCallback callback) { + final IInputMethodManager service = getService(); + if (service == null) { + return false; + } + try { + service.startConnectionlessStylusHandwriting(client, userId, cursorAnchorInfo, + delegatePackageName, delegatorPackageName, callback); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + return true; + } + + @AnyThread static void prepareStylusHandwritingDelegation( @NonNull IInputMethodClient client, @UserIdInt int userId, @@ -530,13 +552,14 @@ final class IInputMethodManagerGlobalInvoker { @AnyThread @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true) - static boolean isStylusHandwritingAvailableAsUser(@UserIdInt int userId) { + static boolean isStylusHandwritingAvailableAsUser( + @UserIdInt int userId, boolean connectionless) { final IInputMethodManager service = getService(); if (service == null) { return false; } try { - return service.isStylusHandwritingAvailableAsUser(userId); + return service.isStylusHandwritingAvailableAsUser(userId, connectionless); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java index b60efc1ee508..7c9678f11e0e 100644 --- a/core/java/android/view/inputmethod/InputMethodInfo.java +++ b/core/java/android/view/inputmethod/InputMethodInfo.java @@ -204,6 +204,9 @@ public final class InputMethodInfo implements Parcelable { */ private final boolean mSupportsStylusHandwriting; + /** The flag whether this IME supports connectionless stylus handwriting sessions. */ + private final boolean mSupportsConnectionlessStylusHandwriting; + /** * The stylus handwriting setting activity's name, used by the system settings to * launch the stylus handwriting specific setting activity of this input method. @@ -330,6 +333,9 @@ public final class InputMethodInfo implements Parcelable { com.android.internal.R.styleable.InputMethod_configChanges, 0); mSupportsStylusHandwriting = sa.getBoolean( com.android.internal.R.styleable.InputMethod_supportsStylusHandwriting, false); + mSupportsConnectionlessStylusHandwriting = sa.getBoolean( + com.android.internal.R.styleable + .InputMethod_supportsConnectionlessStylusHandwriting, false); stylusHandwritingSettingsActivity = sa.getString( com.android.internal.R.styleable.InputMethod_stylusHandwritingSettingsActivity); sa.recycle(); @@ -442,6 +448,7 @@ public final class InputMethodInfo implements Parcelable { mSubtypes = source.mSubtypes; mHandledConfigChanges = source.mHandledConfigChanges; mSupportsStylusHandwriting = source.mSupportsStylusHandwriting; + mSupportsConnectionlessStylusHandwriting = source.mSupportsConnectionlessStylusHandwriting; mForceDefault = source.mForceDefault; mStylusHandwritingSettingsActivityAttr = source.mStylusHandwritingSettingsActivityAttr; } @@ -463,6 +470,7 @@ public final class InputMethodInfo implements Parcelable { mSubtypes = new InputMethodSubtypeArray(source); mHandledConfigChanges = source.readInt(); mSupportsStylusHandwriting = source.readBoolean(); + mSupportsConnectionlessStylusHandwriting = source.readBoolean(); mStylusHandwritingSettingsActivityAttr = source.readString8(); mForceDefault = false; } @@ -479,6 +487,7 @@ public final class InputMethodInfo implements Parcelable { false /* inlineSuggestionsEnabled */, false /* isVrOnly */, false /* isVirtualDeviceOnly */, 0 /* handledConfigChanges */, false /* supportsStylusHandwriting */, + false /* supportConnectionlessStylusHandwriting */, null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -488,9 +497,11 @@ public final class InputMethodInfo implements Parcelable { * @hide */ @TestApi + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) public InputMethodInfo(@NonNull String packageName, @NonNull String className, @NonNull CharSequence label, @NonNull String settingsActivity, @NonNull String languageSettingsActivity, boolean supportStylusHandwriting, + boolean supportConnectionlessStylusHandwriting, @NonNull String stylusHandwritingSettingsActivityAttr) { this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */, settingsActivity, languageSettingsActivity, null /* subtypes */, @@ -498,8 +509,8 @@ public final class InputMethodInfo implements Parcelable { true /* supportsSwitchingToNextInputMethod */, false /* inlineSuggestionsEnabled */, false /* isVrOnly */, false /* isVirtualDeviceOnly */, 0 /* handledConfigChanges */, - supportStylusHandwriting, stylusHandwritingSettingsActivityAttr, - false /* inlineSuggestionsEnabled */); + supportStylusHandwriting, supportConnectionlessStylusHandwriting, + stylusHandwritingSettingsActivityAttr, false /* inlineSuggestionsEnabled */); } /** @@ -517,6 +528,7 @@ public final class InputMethodInfo implements Parcelable { false /* inlineSuggestionsEnabled */, false /* isVrOnly */, false /* isVirtualDeviceOnly */, handledConfigChanges, false /* supportsStylusHandwriting */, + false /* supportConnectionlessStylusHandwriting */, null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -533,6 +545,7 @@ public final class InputMethodInfo implements Parcelable { true /* supportsSwitchingToNextInputMethod */, false /* inlineSuggestionsEnabled */, false /* isVrOnly */, false /* isVirtualDeviceOnly */, 0 /* handledconfigChanges */, false /* supportsStylusHandwriting */, + false /* supportConnectionlessStylusHandwriting */, null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -549,6 +562,7 @@ public final class InputMethodInfo implements Parcelable { supportsSwitchingToNextInputMethod, false /* inlineSuggestionsEnabled */, isVrOnly, false /* isVirtualDeviceOnly */, 0 /* handledConfigChanges */, false /* supportsStylusHandwriting */, + false /* supportConnectionlessStylusHandwriting */, null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -562,7 +576,8 @@ public final class InputMethodInfo implements Parcelable { int isDefaultResId, boolean forceDefault, boolean supportsSwitchingToNextInputMethod, boolean inlineSuggestionsEnabled, boolean isVrOnly, boolean isVirtualDeviceOnly, int handledConfigChanges, - boolean supportsStylusHandwriting, String stylusHandwritingSettingsActivityAttr, + boolean supportsStylusHandwriting, boolean supportsConnectionlessStylusHandwriting, + String stylusHandwritingSettingsActivityAttr, boolean supportsInlineSuggestionsWithTouchExploration) { final ServiceInfo si = ri.serviceInfo; mService = ri; @@ -583,6 +598,7 @@ public final class InputMethodInfo implements Parcelable { mIsVirtualDeviceOnly = isVirtualDeviceOnly; mHandledConfigChanges = handledConfigChanges; mSupportsStylusHandwriting = supportsStylusHandwriting; + mSupportsConnectionlessStylusHandwriting = supportsConnectionlessStylusHandwriting; mStylusHandwritingSettingsActivityAttr = stylusHandwritingSettingsActivityAttr; } @@ -763,6 +779,16 @@ public final class InputMethodInfo implements Parcelable { } /** + * Returns whether the IME supports connectionless stylus handwriting sessions. + * + * @attr ref android.R.styleable#InputMethod_supportsConnectionlessStylusHandwriting + */ + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) + public boolean supportsConnectionlessStylusHandwriting() { + return mSupportsConnectionlessStylusHandwriting; + } + + /** * Returns {@link Intent} for stylus handwriting settings activity with * {@link Intent#getAction() Intent action} {@link #ACTION_STYLUS_HANDWRITING_SETTINGS} * if IME {@link #supportsStylusHandwriting() supports stylus handwriting}, else @@ -828,6 +854,8 @@ public final class InputMethodInfo implements Parcelable { + " mSuppressesSpellChecker=" + mSuppressesSpellChecker + " mShowInInputMethodPicker=" + mShowInInputMethodPicker + " mSupportsStylusHandwriting=" + mSupportsStylusHandwriting + + " mSupportsConnectionlessStylusHandwriting=" + + mSupportsConnectionlessStylusHandwriting + " mStylusHandwritingSettingsActivityAttr=" + mStylusHandwritingSettingsActivityAttr); pw.println(prefix + "mIsDefaultResId=0x" @@ -947,6 +975,7 @@ public final class InputMethodInfo implements Parcelable { mSubtypes.writeToParcel(dest); dest.writeInt(mHandledConfigChanges); dest.writeBoolean(mSupportsStylusHandwriting); + dest.writeBoolean(mSupportsConnectionlessStylusHandwriting); dest.writeString8(mStylusHandwritingSettingsActivityAttr); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 3d70c5ba0715..f4b09df35705 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -18,6 +18,7 @@ package android.view.inputmethod; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.inputmethod.Flags.FLAG_HOME_SCREEN_HANDWRITING_DELEGATOR; +import static android.view.inputmethod.Flags.initiationWithoutInputConnection; import static android.view.inputmethod.InputConnection.CURSOR_UPDATE_IMMEDIATE; import static android.view.inputmethod.InputConnection.CURSOR_UPDATE_MONITOR; import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodClientsTraceProto.ClientSideProto.DISPLAY_ID; @@ -37,6 +38,7 @@ import static android.view.inputmethod.InputMethodManagerProto.SERVED_VIEW; import static com.android.internal.inputmethod.StartInputReason.BOUND_TO_IMMS; import android.Manifest; +import android.annotation.CallbackExecutor; import android.annotation.DisplayContext; import android.annotation.DrawableRes; import android.annotation.DurationMillisLong; @@ -107,6 +109,7 @@ import android.window.WindowOnBackInvokedDispatcher; import com.android.internal.annotations.GuardedBy; import com.android.internal.inputmethod.DirectBootAwareness; +import com.android.internal.inputmethod.IConnectionlessHandwritingCallback; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IInputMethodSession; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; @@ -133,6 +136,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; @@ -565,8 +569,15 @@ public final class InputMethodManager { @GuardedBy("mH") private PropertyInvalidatedCache<Integer, Boolean> mStylusHandwritingAvailableCache; + /** Cached value for {@link #isConnectionlessStylusHandwritingAvailable} for userId. */ + @GuardedBy("mH") + private PropertyInvalidatedCache<Integer, Boolean> + mConnectionlessStylusHandwritingAvailableCache; + private static final String CACHE_KEY_STYLUS_HANDWRITING_PROPERTY = "cache_key.system_server.stylus_handwriting"; + private static final String CACHE_KEY_CONNECTIONLESS_STYLUS_HANDWRITING_PROPERTY = + "cache_key.system_server.connectionless_stylus_handwriting"; @GuardedBy("mH") private int mCursorSelStart; @@ -690,6 +701,17 @@ public final class InputMethodManager { PropertyInvalidatedCache.invalidateCache(CACHE_KEY_STYLUS_HANDWRITING_PROPERTY); } + /** + * Calling this will invalidate the local connectionless stylus handwriting availability cache, + * which forces the next query in any process to recompute the cache. + * + * @hide + */ + public static void invalidateLocalConnectionlessStylusHandwritingAvailabilityCaches() { + PropertyInvalidatedCache.invalidateCache( + CACHE_KEY_CONNECTIONLESS_STYLUS_HANDWRITING_PROPERTY); + } + private static boolean isAutofillUIShowing(View servedView) { AutofillManager afm = servedView.getContext().getSystemService(AutofillManager.class); return afm != null && afm.isAutofillUiShowing(); @@ -1583,7 +1605,7 @@ public final class InputMethodManager { @Override public Boolean recompute(Integer userId) { return IInputMethodManagerGlobalInvoker.isStylusHandwritingAvailableAsUser( - userId); + userId, /* connectionless= */ false); } }; } @@ -1593,6 +1615,30 @@ public final class InputMethodManager { } /** + * Returns {@code true} if the currently selected IME supports connectionless stylus handwriting + * sessions and is enabled. + */ + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) + public boolean isConnectionlessStylusHandwritingAvailable() { + if (ActivityThread.currentApplication() == null) { + return false; + } + synchronized (mH) { + if (mConnectionlessStylusHandwritingAvailableCache == null) { + mConnectionlessStylusHandwritingAvailableCache = new PropertyInvalidatedCache<>( + /* maxEntries= */ 4, CACHE_KEY_CONNECTIONLESS_STYLUS_HANDWRITING_PROPERTY) { + @Override + public Boolean recompute(@NonNull Integer userId) { + return IInputMethodManagerGlobalInvoker.isStylusHandwritingAvailableAsUser( + userId, /* connectionless= */ true); + } + }; + } + return mConnectionlessStylusHandwritingAvailableCache.query(UserHandle.myUserId()); + } + } + + /** * Returns the list of installed input methods for the specified user. * * <p>{@link Manifest.permission#INTERACT_ACROSS_USERS_FULL} is required when and only when @@ -1950,6 +1996,10 @@ public final class InputMethodManager { if (mServedView != null) { clearedView = mServedView; mServedView = null; + if (initiationWithoutInputConnection() && clearedView.getViewRootImpl() != null) { + clearedView.getViewRootImpl().getHandwritingInitiator() + .clearFocusedView(clearedView); + } } if (clearedView != null) { if (DEBUG) { @@ -2428,6 +2478,127 @@ public final class InputMethodManager { } /** + * Starts a connectionless stylus handwriting session. A connectionless session differs from a + * regular stylus handwriting session in that the IME does not use an input connection to + * communicate with a text editor. Instead, the IME directly returns recognised handwritten text + * via a callback. + * + * <p>The {code cursorAnchorInfo} may be used by the IME to improve the handwriting recognition + * accuracy and user experience of the handwriting session. Usually connectionless handwriting + * is used for a view which appears like a text editor but does not really support text editing. + * For best results, the {code cursorAnchorInfo} should be populated as it would be for a real + * text editor (for example, the insertion marker location can be set to where the user would + * expect it to be, even if there is no visible cursor). + * + * @param view the view receiving stylus events + * @param cursorAnchorInfo positional information about the view receiving stylus events + * @param callbackExecutor the executor to run the callback on + * @param callback the callback to receive the result + */ + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) + public void startConnectionlessStylusHandwriting(@NonNull View view, + @Nullable CursorAnchorInfo cursorAnchorInfo, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull ConnectionlessHandwritingCallback callback) { + startConnectionlessStylusHandwritingInternal( + view, cursorAnchorInfo, null, null, callbackExecutor, callback); + } + + /** + * Starts a connectionless stylus handwriting session (see {@link + * #startConnectionlessStylusHandwriting}) and additionally enables the recognised handwritten + * text to be later committed to a text editor using {@link + * #acceptStylusHandwritingDelegation(View)}. + * + * <p>After a connectionless session started using this method completes successfully, a text + * editor view, called the delegate view, may call {@link + * #acceptStylusHandwritingDelegation(View)} which will request the IME to commit the recognised + * handwritten text from the connectionless session to the delegate view. + * + * <p>The delegate view must belong to the same package as the delegator view for the delegation + * to succeed. If the delegate view belongs to a different package, use {@link + * #startConnectionlessStylusHandwritingForDelegation(View, CursorAnchorInfo, String, Executor, + * ConnectionlessHandwritingCallback)} instead. + * + * @param delegatorView the view receiving stylus events + * @param cursorAnchorInfo positional information about the view receiving stylus events + * @param callbackExecutor the executor to run the callback on + * @param callback the callback to receive the result + */ + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) + public void startConnectionlessStylusHandwritingForDelegation(@NonNull View delegatorView, + @Nullable CursorAnchorInfo cursorAnchorInfo, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull ConnectionlessHandwritingCallback callback) { + String delegatorPackageName = delegatorView.getContext().getOpPackageName(); + startConnectionlessStylusHandwritingInternal(delegatorView, cursorAnchorInfo, + delegatorPackageName, delegatorPackageName, callbackExecutor, callback); + } + + /** + * Starts a connectionless stylus handwriting session (see {@link + * #startConnectionlessStylusHandwriting}) and additionally enables the recognised handwritten + * text to be later committed to a text editor using {@link + * #acceptStylusHandwritingDelegation(View, String)}. + * + * <p>After a connectionless session started using this method completes successfully, a text + * editor view, called the delegate view, may call {@link + * #acceptStylusHandwritingDelegation(View, String)} which will request the IME to commit the + * recognised handwritten text from the connectionless session to the delegate view. + * + * <p>The delegate view must belong to {@code delegatePackageName} for the delegation to + * succeed. + * + * @param delegatorView the view receiving stylus events + * @param cursorAnchorInfo positional information about the view receiving stylus events + * @param delegatePackageName name of the package containing the delegate view which will accept + * the delegation + * @param callbackExecutor the executor to run the callback on + * @param callback the callback to receive the result + */ + @FlaggedApi(Flags.FLAG_CONNECTIONLESS_HANDWRITING) + public void startConnectionlessStylusHandwritingForDelegation(@NonNull View delegatorView, + @Nullable CursorAnchorInfo cursorAnchorInfo, + @NonNull String delegatePackageName, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull ConnectionlessHandwritingCallback callback) { + Objects.requireNonNull(delegatePackageName); + String delegatorPackageName = delegatorView.getContext().getOpPackageName(); + startConnectionlessStylusHandwritingInternal(delegatorView, cursorAnchorInfo, + delegatorPackageName, delegatePackageName, callbackExecutor, callback); + } + + private void startConnectionlessStylusHandwritingInternal(@NonNull View view, + @Nullable CursorAnchorInfo cursorAnchorInfo, + @Nullable String delegatorPackageName, + @Nullable String delegatePackageName, + @NonNull @CallbackExecutor Executor callbackExecutor, + @NonNull ConnectionlessHandwritingCallback callback) { + Objects.requireNonNull(view); + Objects.requireNonNull(callbackExecutor); + Objects.requireNonNull(callback); + // Re-dispatch if there is a context mismatch. + final InputMethodManager fallbackImm = getFallbackInputMethodManagerIfNecessary(view); + if (fallbackImm != null) { + fallbackImm.startConnectionlessStylusHandwritingInternal(view, cursorAnchorInfo, + delegatorPackageName, delegatePackageName, callbackExecutor, callback); + } + + checkFocus(); + synchronized (mH) { + if (view.getViewRootImpl() != mCurRootView) { + Log.w(TAG, "Ignoring startConnectionlessStylusHandwriting: " + + "View's window does not have focus."); + return; + } + IInputMethodManagerGlobalInvoker.startConnectionlessStylusHandwriting( + mClient, UserHandle.myUserId(), cursorAnchorInfo, + delegatePackageName, delegatorPackageName, + new ConnectionlessHandwritingCallbackProxy(callbackExecutor, callback)); + } + } + + /** * Prepares delegation of starting stylus handwriting session to a different editor in same * or different window than the view on which initial handwriting stroke was detected. * @@ -2506,12 +2677,18 @@ public final class InputMethodManager { * {@link #acceptStylusHandwritingDelegation(View, String)} instead.</p> * * @param delegateView delegate view capable of receiving input via {@link InputConnection} - * on which {@link #startStylusHandwriting(View)} will be called. * @return {@code true} if view belongs to same application package as used in - * {@link #prepareStylusHandwritingDelegation(View)} and handwriting session can start. - * @see #acceptStylusHandwritingDelegation(View, String) + * {@link #prepareStylusHandwritingDelegation(View)} and delegation is accepted * @see #prepareStylusHandwritingDelegation(View) + * @see #acceptStylusHandwritingDelegation(View, String) */ + // TODO(b/300979854): Once connectionless APIs are finalised, update documentation to add: + // <p>Otherwise, if the delegator view previously started delegation using {@link + // #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, CursorAnchorInfo)}, + // requests the IME to commit the recognised handwritten text from the connectionless session to + // the delegate view. + // @see #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, + // CursorAnchorInfo) public boolean acceptStylusHandwritingDelegation(@NonNull View delegateView) { return startStylusHandwritingInternal( delegateView, delegateView.getContext().getOpPackageName(), @@ -2528,13 +2705,19 @@ public final class InputMethodManager { * {@link #acceptStylusHandwritingDelegation(View)} instead.</p> * * @param delegateView delegate view capable of receiving input via {@link InputConnection} - * on which {@link #startStylusHandwriting(View)} will be called. * @param delegatorPackageName package name of the delegator that handled initial stylus stroke. - * @return {@code true} if view belongs to allowed delegate package declared in - * {@link #prepareStylusHandwritingDelegation(View, String)} and handwriting session can start. + * @return {@code true} if view belongs to allowed delegate package declared in {@link + * #prepareStylusHandwritingDelegation(View, String)} and delegation is accepted * @see #prepareStylusHandwritingDelegation(View, String) * @see #acceptStylusHandwritingDelegation(View) */ + // TODO(b/300979854): Once connectionless APIs are finalised, update documentation to add: + // <p>Otherwise, if the delegator view previously started delegation using {@link + // #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, CursorAnchorInfo, + // String)}, requests the IME to commit the recognised handwritten text from the connectionless + // session to the delegate view. + // @see #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, + // CursorAnchorInfo, String) public boolean acceptStylusHandwritingDelegation( @NonNull View delegateView, @NonNull String delegatorPackageName) { Objects.requireNonNull(delegatorPackageName); @@ -2551,15 +2734,21 @@ public final class InputMethodManager { * <p>Note: If delegator and delegate are in the same application package, use {@link * #acceptStylusHandwritingDelegation(View)} instead. * - * @param delegateView delegate view capable of receiving input via {@link InputConnection} on - * which {@link #startStylusHandwriting(View)} will be called. + * @param delegateView delegate view capable of receiving input via {@link InputConnection} * @param delegatorPackageName package name of the delegator that handled initial stylus stroke. * @param flags {@link #HANDWRITING_DELEGATE_FLAG_HOME_DELEGATOR_ALLOWED} or {@code 0} * @return {@code true} if view belongs to allowed delegate package declared in {@link - * #prepareStylusHandwritingDelegation(View, String)} and handwriting session can start. + * #prepareStylusHandwritingDelegation(View, String)} and delegation is accepted * @see #prepareStylusHandwritingDelegation(View, String) * @see #acceptStylusHandwritingDelegation(View) */ + // TODO(b/300979854): Once connectionless APIs are finalised, update documentation to add: + // <p>Otherwise, if the delegator view previously started delegation using {@link + // #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, CursorAnchorInfo, + // String)}, requests the IME to commit the recognised handwritten text from the connectionless + // session to the delegate view. + // @see #startConnectionlessStylusHandwritingForDelegation(View, ResultReceiver, + // CursorAnchorInfo, String) @FlaggedApi(FLAG_HOME_SCREEN_HANDWRITING_DELEGATOR) public boolean acceptStylusHandwritingDelegation( @NonNull View delegateView, @NonNull String delegatorPackageName, @@ -2932,6 +3121,10 @@ public final class InputMethodManager { switch (res.result) { case InputBindResult.ResultCode.ERROR_NOT_IME_TARGET_WINDOW: mRestartOnNextWindowFocus = true; + if (initiationWithoutInputConnection()) { + mServedView.getViewRootImpl().getHandwritingInitiator().clearFocusedView( + mServedView); + } mServedView = null; break; } @@ -3094,6 +3287,11 @@ public final class InputMethodManager { return false; } mServedView = mNextServedView; + if (initiationWithoutInputConnection() && mServedView.onCheckIsTextEditor() + && mServedView.isHandwritingDelegate()) { + mServedView.getViewRootImpl().getHandwritingInitiator().onDelegateViewFocused( + mServedView); + } if (mServedInputConnection != null) { mServedInputConnection.finishComposingTextFromImm(); } @@ -4301,6 +4499,73 @@ public final class InputMethodManager { public void onFinishedInputEvent(Object token, boolean handled); } + private static class ConnectionlessHandwritingCallbackProxy + extends IConnectionlessHandwritingCallback.Stub { + private final Object mLock = new Object(); + + @Nullable + @GuardedBy("mLock") + private Executor mExecutor; + + @Nullable + @GuardedBy("mLock") + private ConnectionlessHandwritingCallback mCallback; + + ConnectionlessHandwritingCallbackProxy( + @NonNull Executor executor, @NonNull ConnectionlessHandwritingCallback callback) { + mExecutor = executor; + mCallback = callback; + } + + @Override + public void onResult(CharSequence text) { + Executor executor; + ConnectionlessHandwritingCallback callback; + synchronized (mLock) { + if (mExecutor == null || mCallback == null) { + return; + } + executor = mExecutor; + callback = mCallback; + mExecutor = null; + mCallback = null; + } + final long identity = Binder.clearCallingIdentity(); + try { + if (TextUtils.isEmpty(text)) { + executor.execute(() -> callback.onError( + ConnectionlessHandwritingCallback + .CONNECTIONLESS_HANDWRITING_ERROR_NO_TEXT_RECOGNIZED)); + } else { + executor.execute(() -> callback.onResult(text)); + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + @Override + public void onError(int errorCode) { + Executor executor; + ConnectionlessHandwritingCallback callback; + synchronized (mLock) { + if (mExecutor == null || mCallback == null) { + return; + } + executor = mExecutor; + callback = mCallback; + mExecutor = null; + mCallback = null; + } + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> callback.onError(errorCode)); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + private final class ImeInputEventSender extends InputEventSender { public ImeInputEventSender(InputChannel inputChannel, Looper looper) { super(inputChannel, looper); diff --git a/core/java/android/view/inputmethod/flags.aconfig b/core/java/android/view/inputmethod/flags.aconfig index 7f1cc8e46d3c..55986e7ada47 100644 --- a/core/java/android/view/inputmethod/flags.aconfig +++ b/core/java/android/view/inputmethod/flags.aconfig @@ -62,3 +62,19 @@ flag { bug: "311791923" is_fixed_read_only: true } + +flag { + name: "initiation_without_input_connection" + namespace: "input_method" + description: "Feature flag for initiating handwriting without InputConnection" + bug: "308827131" + is_fixed_read_only: true +} + +flag { + name: "connectionless_handwriting" + namespace: "input_method" + description: "Feature flag for connectionless stylus handwriting APIs" + bug: "300979854" + is_fixed_read_only: true +} diff --git a/core/java/android/webkit/IWebViewUpdateService.aidl b/core/java/android/webkit/IWebViewUpdateService.aidl index c6bd20cec07d..aeb746cbbe5e 100644 --- a/core/java/android/webkit/IWebViewUpdateService.aidl +++ b/core/java/android/webkit/IWebViewUpdateService.aidl @@ -45,6 +45,7 @@ interface IWebViewUpdateService { * it would then try to update the provider to such a package while in reality the update * service would switch to another one. */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)") String changeProviderAndSetting(String newProvider); /** diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f5b81b027134..f336b5d8a727 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3087,14 +3087,22 @@ public class WebView extends AbsoluteLayout return webviewPackage; } - IWebViewUpdateService service = WebViewFactory.getUpdateService(); - if (service == null) { - return null; - } - try { - return service.getCurrentWebViewPackage(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager manager = WebViewUpdateManager.getInstance(); + if (manager == null) { + return null; + } + return manager.getCurrentWebViewPackage(); + } else { + IWebViewUpdateService service = WebViewFactory.getUpdateService(); + if (service == null) { + return null; + } + try { + return service.getCurrentWebViewPackage(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } diff --git a/core/java/android/webkit/WebViewBootstrapFrameworkInitializer.java b/core/java/android/webkit/WebViewBootstrapFrameworkInitializer.java new file mode 100644 index 000000000000..9b15ab391032 --- /dev/null +++ b/core/java/android/webkit/WebViewBootstrapFrameworkInitializer.java @@ -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 android.webkit; + +import android.annotation.FlaggedApi; +import android.annotation.SystemApi; +import android.app.SystemServiceRegistry; +import android.content.Context; + +/** + * Class for performing registration for webviewupdate service. + * + * @hide + */ +@FlaggedApi(Flags.FLAG_UPDATE_SERVICE_IPC_WRAPPER) +@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) +public class WebViewBootstrapFrameworkInitializer { + private WebViewBootstrapFrameworkInitializer() {} + + /** + * Called by {@link SystemServiceRegistry}'s static initializer and registers webviewupdate + * service to {@link Context}, so that {@link Context#getSystemService} can return them. + * + * @throws IllegalStateException if this is called from anywhere besides + * {@link SystemServiceRegistry} + */ + public static void registerServiceWrappers() { + SystemServiceRegistry.registerForeverStaticService(Context.WEBVIEW_UPDATE_SERVICE, + WebViewUpdateManager.class, + (b) -> new WebViewUpdateManager(IWebViewUpdateService.Stub.asInterface(b))); + } +} diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java index 8e89541647c3..3fc0a305c8e6 100644 --- a/core/java/android/webkit/WebViewDelegate.java +++ b/core/java/android/webkit/WebViewDelegate.java @@ -16,8 +16,6 @@ package android.webkit; -import static android.webkit.Flags.updateServiceV2; - import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -207,7 +205,12 @@ public final class WebViewDelegate { * Returns whether WebView should run in multiprocess mode. */ public boolean isMultiProcessEnabled() { - if (updateServiceV2()) { + if (Flags.updateServiceV2()) { + return true; + } else if (Flags.updateServiceIpcWrapper()) { + // We don't want to support this method in the new wrapper because updateServiceV2 is + // intended to ship in the same release (or sooner). It's only possible to disable it + // with an obscure adb command, so just return true here too. return true; } try { diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 53b047a17f6d..c748a57dce74 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -285,10 +285,16 @@ public final class WebViewFactory { return LIBLOAD_WRONG_PACKAGE_NAME; } + Application initialApplication = AppGlobals.getInitialApplication(); WebViewProviderResponse response = null; try { - response = getUpdateService().waitForAndGetProvider(); - } catch (RemoteException e) { + if (Flags.updateServiceIpcWrapper()) { + response = initialApplication.getSystemService(WebViewUpdateManager.class) + .waitForAndGetProvider(); + } else { + response = getUpdateService().waitForAndGetProvider(); + } + } catch (Exception e) { Log.e(LOGTAG, "error waiting for relro creation", e); return LIBLOAD_FAILED_WAITING_FOR_WEBVIEW_REASON_UNKNOWN; } @@ -302,7 +308,7 @@ public final class WebViewFactory { return LIBLOAD_WRONG_PACKAGE_NAME; } - PackageManager packageManager = AppGlobals.getInitialApplication().getPackageManager(); + PackageManager packageManager = initialApplication.getPackageManager(); String libraryFileName; try { PackageInfo packageInfo = packageManager.getPackageInfo(packageName, @@ -436,7 +442,12 @@ public final class WebViewFactory { Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewUpdateService.waitForAndGetProvider()"); try { - response = getUpdateService().waitForAndGetProvider(); + if (Flags.updateServiceIpcWrapper()) { + response = initialApplication.getSystemService(WebViewUpdateManager.class) + .waitForAndGetProvider(); + } else { + response = getUpdateService().waitForAndGetProvider(); + } } finally { Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); } diff --git a/core/java/android/webkit/WebViewLibraryLoader.java b/core/java/android/webkit/WebViewLibraryLoader.java index 91412d7e8631..a68a5778de82 100644 --- a/core/java/android/webkit/WebViewLibraryLoader.java +++ b/core/java/android/webkit/WebViewLibraryLoader.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.Build; import android.os.Process; -import android.os.RemoteException; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -87,8 +86,12 @@ public class WebViewLibraryLoader { } finally { // We must do our best to always notify the update service, even if something fails. try { - WebViewFactory.getUpdateServiceUnchecked().notifyRelroCreationCompleted(); - } catch (RemoteException e) { + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager.getInstance().notifyRelroCreationCompleted(); + } else { + WebViewFactory.getUpdateServiceUnchecked().notifyRelroCreationCompleted(); + } + } catch (Exception e) { Log.e(LOGTAG, "error notifying update service", e); } @@ -114,8 +117,12 @@ public class WebViewLibraryLoader { public void run() { try { Log.e(LOGTAG, "relro file creator for " + abi + " crashed. Proceeding without"); - WebViewFactory.getUpdateService().notifyRelroCreationCompleted(); - } catch (RemoteException e) { + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager.getInstance().notifyRelroCreationCompleted(); + } else { + WebViewFactory.getUpdateService().notifyRelroCreationCompleted(); + } + } catch (Exception e) { Log.e(LOGTAG, "Cannot reach WebViewUpdateService. " + e.getMessage()); } } diff --git a/core/java/android/webkit/WebViewProviderResponse.java b/core/java/android/webkit/WebViewProviderResponse.java index 02e48ddb6638..84e34a34f7f7 100644 --- a/core/java/android/webkit/WebViewProviderResponse.java +++ b/core/java/android/webkit/WebViewProviderResponse.java @@ -16,17 +16,42 @@ package android.webkit; +import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.PackageInfo; import android.os.Parcel; import android.os.Parcelable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** @hide */ +@FlaggedApi(Flags.FLAG_UPDATE_SERVICE_IPC_WRAPPER) +@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public final class WebViewProviderResponse implements Parcelable { - public WebViewProviderResponse(PackageInfo packageInfo, int status) { + @IntDef( + prefix = {"STATUS_"}, + value = { + STATUS_SUCCESS, + STATUS_FAILED_WAITING_FOR_RELRO, + STATUS_FAILED_LISTING_WEBVIEW_PACKAGES, + }) + @Retention(RetentionPolicy.SOURCE) + private @interface WebViewProviderStatus {} + + public static final int STATUS_SUCCESS = WebViewFactory.LIBLOAD_SUCCESS; + public static final int STATUS_FAILED_WAITING_FOR_RELRO = + WebViewFactory.LIBLOAD_FAILED_WAITING_FOR_RELRO; + public static final int STATUS_FAILED_LISTING_WEBVIEW_PACKAGES = + WebViewFactory.LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES; + + public WebViewProviderResponse( + @Nullable PackageInfo packageInfo, @WebViewProviderStatus int status) { this.packageInfo = packageInfo; this.status = status; } @@ -54,13 +79,11 @@ public final class WebViewProviderResponse implements Parcelable { } @Override - public void writeToParcel(Parcel out, int flags) { + public void writeToParcel(@NonNull Parcel out, int flags) { out.writeTypedObject(packageInfo, flags); out.writeInt(status); } - @UnsupportedAppUsage - @Nullable - public final PackageInfo packageInfo; - public final int status; + @UnsupportedAppUsage public final @Nullable PackageInfo packageInfo; + public final @WebViewProviderStatus int status; } diff --git a/core/java/android/webkit/WebViewUpdateManager.java b/core/java/android/webkit/WebViewUpdateManager.java new file mode 100644 index 000000000000..8ada598d8a76 --- /dev/null +++ b/core/java/android/webkit/WebViewUpdateManager.java @@ -0,0 +1,170 @@ +/* + * 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.webkit; + +import android.annotation.FlaggedApi; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; +import android.annotation.SystemApi; +import android.app.SystemServiceRegistry; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.os.RemoteException; + +/** @hide */ +@FlaggedApi(Flags.FLAG_UPDATE_SERVICE_IPC_WRAPPER) +@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) +public final class WebViewUpdateManager { + private final IWebViewUpdateService mService; + + /** @hide */ + public WebViewUpdateManager(@NonNull IWebViewUpdateService service) { + mService = service; + } + + /** + * Get the singleton instance of the manager. + * + * This exists for the benefit of callsites without a {@link Context}; prefer + * {@link Context#getSystemService(Class)} otherwise. + */ + @SuppressLint("ManagerLookup") // service opts in to getSystemServiceWithNoContext() + public static @Nullable WebViewUpdateManager getInstance() { + return (WebViewUpdateManager) SystemServiceRegistry.getSystemServiceWithNoContext( + Context.WEBVIEW_UPDATE_SERVICE); + } + + /** + * Block until system-level WebView preparations are complete. + * + * This also makes the current WebView provider package visible to the caller. + * + * @return the status of WebView preparation and the current provider package. + */ + public @NonNull WebViewProviderResponse waitForAndGetProvider() { + try { + return mService.waitForAndGetProvider(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get the package that is the system's current WebView implementation. + * + * @return the package, or null if no valid implementation is present. + */ + public @Nullable PackageInfo getCurrentWebViewPackage() { + try { + return mService.getCurrentWebViewPackage(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get the complete list of supported WebView providers for this device. + * + * This includes all configured providers, regardless of whether they are currently available + * or valid. + */ + @SuppressLint({"ParcelableList", "ArrayReturn"}) + public @NonNull WebViewProviderInfo[] getAllWebViewPackages() { + try { + return mService.getAllWebViewPackages(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get the list of currently-valid WebView providers for this device. + * + * This only includes providers that are currently present on the device and meet the validity + * criteria (signature, version, etc), but does not check if the provider is installed and + * enabled for all users. + */ + @SuppressLint({"ParcelableList", "ArrayReturn"}) + public @NonNull WebViewProviderInfo[] getValidWebViewPackages() { + try { + return mService.getValidWebViewPackages(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get the package name of the current WebView implementation. + * + * @return the package name, or null if no valid implementation is present. + */ + public @Nullable String getCurrentWebViewPackageName() { + try { + return mService.getCurrentWebViewPackageName(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Ask the system to switch to a specific WebView implementation if possible. + * + * This choice will be stored persistently. + * + * @param newProvider the package name to use, or null to reset to default. + * @return the package name which is now in use, which may not be the + * requested one if it was not usable. + */ + @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) + public @Nullable String changeProviderAndSetting(@NonNull String newProvider) { + try { + return mService.changeProviderAndSetting(newProvider); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Used by the relro file creator to notify the service that it's done. + * @hide + */ + void notifyRelroCreationCompleted() { + try { + mService.notifyRelroCreationCompleted(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Get the WebView provider which will be used if no explicit choice has been made. + * + * The default provider is not guaranteed to be currently valid/usable. + * + * @return the default WebView provider. + */ + @FlaggedApi(Flags.FLAG_UPDATE_SERVICE_V2) + public @NonNull WebViewProviderInfo getDefaultWebViewPackage() { + try { + return mService.getDefaultWebViewPackage(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } +} diff --git a/core/java/android/webkit/WebViewUpdateService.java b/core/java/android/webkit/WebViewUpdateService.java index 9152b438618f..6f53ddeafef1 100644 --- a/core/java/android/webkit/WebViewUpdateService.java +++ b/core/java/android/webkit/WebViewUpdateService.java @@ -33,14 +33,22 @@ public final class WebViewUpdateService { * Fetch all packages that could potentially implement WebView. */ public static WebViewProviderInfo[] getAllWebViewPackages() { - IWebViewUpdateService service = getUpdateService(); - if (service == null) { - return new WebViewProviderInfo[0]; - } - try { - return service.getAllWebViewPackages(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager manager = WebViewUpdateManager.getInstance(); + if (manager == null) { + return new WebViewProviderInfo[0]; + } + return manager.getAllWebViewPackages(); + } else { + IWebViewUpdateService service = getUpdateService(); + if (service == null) { + return new WebViewProviderInfo[0]; + } + try { + return service.getAllWebViewPackages(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } @@ -48,14 +56,22 @@ public final class WebViewUpdateService { * Fetch all packages that could potentially implement WebView and are currently valid. */ public static WebViewProviderInfo[] getValidWebViewPackages() { - IWebViewUpdateService service = getUpdateService(); - if (service == null) { - return new WebViewProviderInfo[0]; - } - try { - return service.getValidWebViewPackages(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager manager = WebViewUpdateManager.getInstance(); + if (manager == null) { + return new WebViewProviderInfo[0]; + } + return manager.getValidWebViewPackages(); + } else { + IWebViewUpdateService service = getUpdateService(); + if (service == null) { + return new WebViewProviderInfo[0]; + } + try { + return service.getValidWebViewPackages(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } @@ -63,14 +79,22 @@ public final class WebViewUpdateService { * Used by DevelopmentSetting to get the name of the WebView provider currently in use. */ public static String getCurrentWebViewPackageName() { - IWebViewUpdateService service = getUpdateService(); - if (service == null) { - return null; - } - try { - return service.getCurrentWebViewPackageName(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + if (Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager manager = WebViewUpdateManager.getInstance(); + if (manager == null) { + return null; + } + return manager.getCurrentWebViewPackageName(); + } else { + IWebViewUpdateService service = getUpdateService(); + if (service == null) { + return null; + } + try { + return service.getCurrentWebViewPackageName(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java index aa2474d7903e..3e0161a9b791 100644 --- a/core/java/android/widget/EditText.java +++ b/core/java/android/widget/EditText.java @@ -16,9 +16,13 @@ package android.widget; +import android.app.compat.CompatChanges; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledSince; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; +import android.os.Build; import android.text.Editable; import android.text.Selection; import android.text.Spannable; @@ -29,6 +33,8 @@ import android.text.style.SpanUtils; import android.util.AttributeSet; import android.view.KeyEvent; +import com.android.internal.R; + /* * This is supposed to be a *very* thin veneer over TextView. * Do not make any changes here that do anything that a TextView @@ -85,6 +91,11 @@ public class EditText extends TextView { private static final int ID_ITALIC = android.R.id.italic; private static final int ID_UNDERLINE = android.R.id.underline; + /** @hide */ + @ChangeId + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + public static final long LINE_HEIGHT_FOR_LOCALE = 303326708L; + public EditText(Context context) { this(context, null); } @@ -104,15 +115,39 @@ public class EditText extends TextView { final TypedArray a = theme.obtainStyledAttributes(attrs, com.android.internal.R.styleable.EditText, defStyleAttr, defStyleRes); - final int n = a.getIndexCount(); - for (int i = 0; i < n; ++i) { - int attr = a.getIndex(i); - switch (attr) { - case com.android.internal.R.styleable.EditText_enableTextStylingShortcuts: - mStyleShortcutsEnabled = a.getBoolean(attr, false); - break; + try { + final int n = a.getIndexCount(); + for (int i = 0; i < n; ++i) { + int attr = a.getIndex(i); + switch (attr) { + case com.android.internal.R.styleable.EditText_enableTextStylingShortcuts: + mStyleShortcutsEnabled = a.getBoolean(attr, false); + break; + } } + } finally { + a.recycle(); + } + + boolean hasUseLocalePreferredLineHeightForMinimumInt = false; + boolean useLocalePreferredLineHeightForMinimumInt = false; + TypedArray tvArray = theme.obtainStyledAttributes(attrs, + com.android.internal.R.styleable.TextView, defStyleAttr, defStyleRes); + try { + hasUseLocalePreferredLineHeightForMinimumInt = + tvArray.hasValue(R.styleable.TextView_useLocalePreferredLineHeightForMinimum); + if (hasUseLocalePreferredLineHeightForMinimumInt) { + useLocalePreferredLineHeightForMinimumInt = tvArray.getBoolean( + R.styleable.TextView_useLocalePreferredLineHeightForMinimum, false); + } + } finally { + tvArray.recycle(); + } + if (!hasUseLocalePreferredLineHeightForMinimumInt) { + useLocalePreferredLineHeightForMinimumInt = + CompatChanges.isChangeEnabled(LINE_HEIGHT_FOR_LOCALE); } + setLocalePreferredLineHeightForMinimumUsed(useLocalePreferredLineHeightForMinimumInt); } @Override diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 9a4106d930b4..57e4e6a2fa5b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -867,6 +867,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private boolean mUseBoundsForWidth; @Nullable private Paint.FontMetrics mMinimumFontMetrics; + @Nullable private Paint.FontMetrics mLocalePreferredFontMetrics; + private boolean mUseLocalePreferredLineHeightForMinimum; @ViewDebug.ExportedProperty(category = "text") @UnsupportedAppUsage @@ -1617,6 +1619,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener case com.android.internal.R.styleable.TextView_useBoundsForWidth: mUseBoundsForWidth = a.getBoolean(attr, false); hasUseBoundForWidthValue = true; + break; + case com.android.internal.R.styleable + .TextView_useLocalePreferredLineHeightForMinimum: + mUseLocalePreferredLineHeightForMinimum = a.getBoolean(attr, false); + break; } } @@ -4992,6 +4999,41 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** + * Returns true if the locale preferred line height is used for the minimum line height. + * + * @return true if using locale preferred line height for the minimum line height. Otherwise + * false. + * + * @see #setLocalePreferredLineHeightForMinimumUsed(boolean) + * @see #setMinimumFontMetrics(Paint.FontMetrics) + * @see #getMinimumFontMetrics() + */ + @FlaggedApi(FLAG_FIX_LINE_HEIGHT_FOR_LOCALE) + public boolean isLocalePreferredLineHeightForMinimumUsed() { + return mUseLocalePreferredLineHeightForMinimum; + } + + /** + * Set true if the locale preferred line height is used for the minimum line height. + * + * By setting this flag to true is equivalenet to call + * {@link #setMinimumFontMetrics(Paint.FontMetrics)} with the one obtained by + * {@link Paint#getFontMetricsForLocale(Paint.FontMetrics)}. + * + * If custom minimum line height was specified by + * {@link #setMinimumFontMetrics(Paint.FontMetrics)}, this flag will be ignored. + * + * @param flag true for using locale preferred line height for the minimum line height. + * @see #isLocalePreferredLineHeightForMinimumUsed() + * @see #setMinimumFontMetrics(Paint.FontMetrics) + * @see #getMinimumFontMetrics() + */ + @FlaggedApi(FLAG_FIX_LINE_HEIGHT_FOR_LOCALE) + public void setLocalePreferredLineHeightForMinimumUsed(boolean flag) { + mUseLocalePreferredLineHeightForMinimum = flag; + } + + /** * @return whether fallback line spacing is enabled, {@code true} by default * * @see #setFallbackLineSpacing(boolean) @@ -10728,6 +10770,21 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return alignment; } + private Paint.FontMetrics getResolvedMinimumFontMetrics() { + if (mMinimumFontMetrics != null) { + return mMinimumFontMetrics; + } + if (!mUseLocalePreferredLineHeightForMinimum) { + return null; + } + + if (mLocalePreferredFontMetrics == null) { + mLocalePreferredFontMetrics = new Paint.FontMetrics(); + } + mTextPaint.getFontMetricsForLocale(mLocalePreferredFontMetrics); + return mLocalePreferredFontMetrics; + } + /** * The width passed in is now the desired layout width, * not the full view width with padding. @@ -10792,7 +10849,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (hintBoring == UNKNOWN_BORING) { hintBoring = BoringLayout.isBoring(mHint, mTextPaint, mTextDir, isFallbackLineSpacingForBoringLayout(), - mMinimumFontMetrics, mHintBoring); + getResolvedMinimumFontMetrics(), mHintBoring); + if (hintBoring != null) { mHintBoring = hintBoring; } @@ -10842,7 +10900,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setLineBreakConfig(LineBreakConfig.getLineBreakConfig( mLineBreakStyle, mLineBreakWordStyle)) .setUseBoundsForWidth(mUseBoundsForWidth) - .setMinimumFontMetrics(mMinimumFontMetrics); + .setMinimumFontMetrics(getResolvedMinimumFontMetrics()); + if (shouldEllipsize) { builder.setEllipsize(mEllipsize) .setEllipsizedWidth(ellipsisWidth); @@ -10907,12 +10966,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setUseBoundsForWidth(mUseBoundsForWidth) .setEllipsize(getKeyListener() == null ? effectiveEllipsize : null) .setEllipsizedWidth(ellipsisWidth) - .setMinimumFontMetrics(mMinimumFontMetrics); + .setMinimumFontMetrics(getResolvedMinimumFontMetrics()); result = builder.build(); } else { if (boring == UNKNOWN_BORING) { boring = BoringLayout.isBoring(mTransformed, mTextPaint, mTextDir, - isFallbackLineSpacingForBoringLayout(), mMinimumFontMetrics, mBoring); + isFallbackLineSpacingForBoringLayout(), getResolvedMinimumFontMetrics(), + mBoring); if (boring != null) { mBoring = boring; } @@ -10926,7 +10986,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener wantWidth, alignment, mSpacingMult, mSpacingAdd, boring, mIncludePad, null, wantWidth, isFallbackLineSpacingForBoringLayout(), - mUseBoundsForWidth, mMinimumFontMetrics); + mUseBoundsForWidth, getResolvedMinimumFontMetrics()); } else { result = new BoringLayout( mTransformed, @@ -10941,7 +11001,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener null, boring, mUseBoundsForWidth, - mMinimumFontMetrics); + getResolvedMinimumFontMetrics()); } if (useSaved) { @@ -10953,7 +11013,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener wantWidth, alignment, mSpacingMult, mSpacingAdd, boring, mIncludePad, effectiveEllipsize, ellipsisWidth, isFallbackLineSpacingForBoringLayout(), - mUseBoundsForWidth, mMinimumFontMetrics); + mUseBoundsForWidth, getResolvedMinimumFontMetrics()); } else { result = new BoringLayout( mTransformed, @@ -10968,7 +11028,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener effectiveEllipsize, boring, mUseBoundsForWidth, - mMinimumFontMetrics); + getResolvedMinimumFontMetrics()); } } } @@ -10988,7 +11048,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setLineBreakConfig(LineBreakConfig.getLineBreakConfig( mLineBreakStyle, mLineBreakWordStyle)) .setUseBoundsForWidth(mUseBoundsForWidth) - .setMinimumFontMetrics(mMinimumFontMetrics); + .setMinimumFontMetrics(getResolvedMinimumFontMetrics()); if (shouldEllipsize) { builder.setEllipsize(effectiveEllipsize) .setEllipsizedWidth(ellipsisWidth); @@ -11116,7 +11176,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (des < 0) { boring = BoringLayout.isBoring(mTransformed, mTextPaint, mTextDir, - isFallbackLineSpacingForBoringLayout(), mMinimumFontMetrics, mBoring); + isFallbackLineSpacingForBoringLayout(), getResolvedMinimumFontMetrics(), + mBoring); if (boring != null) { mBoring = boring; } @@ -11156,7 +11217,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (hintDes < 0) { hintBoring = BoringLayout.isBoring(mHint, mTextPaint, mTextDir, - isFallbackLineSpacingForBoringLayout(), mMinimumFontMetrics, + isFallbackLineSpacingForBoringLayout(), getResolvedMinimumFontMetrics(), mHintBoring); if (hintBoring != null) { mHintBoring = hintBoring; @@ -11370,7 +11431,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setLineBreakConfig(LineBreakConfig.getLineBreakConfig( mLineBreakStyle, mLineBreakWordStyle)) .setUseBoundsForWidth(mUseBoundsForWidth) - .setMinimumFontMetrics(mMinimumFontMetrics); + .setMinimumFontMetrics(getResolvedMinimumFontMetrics()); final StaticLayout layout = layoutBuilder.build(); diff --git a/core/java/android/widget/flags/notification_widget_flags.aconfig b/core/java/android/widget/flags/notification_widget_flags.aconfig index 9f0b7c3dfb02..bfe3d052479b 100644 --- a/core/java/android/widget/flags/notification_widget_flags.aconfig +++ b/core/java/android/widget/flags/notification_widget_flags.aconfig @@ -5,4 +5,14 @@ flag { namespace: "systemui" description: "Enables notification specific LinearLayout optimization" bug: "316110233" +} + +flag { + name: "call_style_set_data_async" + namespace: "systemui" + description: "Offloads caller icon drawable loading to the background thread" + bug: "293961072" + metadata { + purpose: PURPOSE_BUGFIX + } }
\ No newline at end of file diff --git a/core/java/android/window/BackProgressAnimator.java b/core/java/android/window/BackProgressAnimator.java index e7280d0e7867..40e28cbbbd05 100644 --- a/core/java/android/window/BackProgressAnimator.java +++ b/core/java/android/window/BackProgressAnimator.java @@ -17,6 +17,7 @@ package android.window; import android.annotation.NonNull; +import android.annotation.Nullable; import android.util.FloatProperty; import com.android.internal.dynamicanimation.animation.DynamicAnimation; @@ -44,6 +45,14 @@ public class BackProgressAnimator { private float mProgress = 0; private BackMotionEvent mLastBackEvent; private boolean mBackAnimationInProgress = false; + @Nullable + private Runnable mBackCancelledFinishRunnable; + private final DynamicAnimation.OnAnimationEndListener mOnAnimationEndListener = + (animation, canceled, value, velocity) -> { + invokeBackCancelledRunnable(); + reset(); + }; + private void setProgress(float progress) { mProgress = progress; @@ -116,6 +125,11 @@ public class BackProgressAnimator { * Resets the back progress animation. This should be called when back is invoked or cancelled. */ public void reset() { + if (mBackCancelledFinishRunnable != null) { + // Ensure that last progress value that apps see is 0 + updateProgressValue(0); + invokeBackCancelledRunnable(); + } mSpring.animateToFinalPosition(0); if (mSpring.canSkipToEnd()) { mSpring.skipToEnd(); @@ -136,17 +150,8 @@ public class BackProgressAnimator { * @param finishCallback the callback to be invoked when the progress is reach to 0. */ public void onBackCancelled(@NonNull Runnable finishCallback) { - final DynamicAnimation.OnAnimationEndListener listener = - new DynamicAnimation.OnAnimationEndListener() { - @Override - public void onAnimationEnd(DynamicAnimation animation, boolean canceled, float value, - float velocity) { - mSpring.removeEndListener(this); - finishCallback.run(); - reset(); - } - }; - mSpring.addEndListener(listener); + mBackCancelledFinishRunnable = finishCallback; + mSpring.addEndListener(mOnAnimationEndListener); mSpring.animateToFinalPosition(0); } @@ -164,4 +169,10 @@ public class BackProgressAnimator { progress / SCALE_FACTOR, mLastBackEvent.getSwipeEdge())); } -} + private void invokeBackCancelledRunnable() { + mSpring.removeEndListener(mOnAnimationEndListener); + mBackCancelledFinishRunnable.run(); + mBackCancelledFinishRunnable = null; + } + +}
\ No newline at end of file diff --git a/core/java/android/window/IUnhandledDragCallback.aidl b/core/java/android/window/IUnhandledDragCallback.aidl new file mode 100644 index 000000000000..7806b1fe771a --- /dev/null +++ b/core/java/android/window/IUnhandledDragCallback.aidl @@ -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 android.window; + +import android.view.DragEvent; + +/** + * A callback for notifying the system when the unhandled drop is complete. + * {@hide} + */ +oneway interface IUnhandledDragCallback { + /** + * Called when the IUnhandledDropListener has fully handled the drop, and the drag can be + * cleaned up. If handled is `true`, then cleanup of the drag and drag surface will be + * immediate, otherwise, the system will treat the drag as a cancel back to the start of the + * drag. + */ + void notifyUnhandledDropComplete(boolean handled); +} diff --git a/core/java/android/window/IUnhandledDragListener.aidl b/core/java/android/window/IUnhandledDragListener.aidl new file mode 100644 index 000000000000..52e98952971d --- /dev/null +++ b/core/java/android/window/IUnhandledDragListener.aidl @@ -0,0 +1,35 @@ +/* + * 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.window; + +import android.view.DragEvent; +import android.window.IUnhandledDragCallback; + +/** + * An interface to a handler for global drags that are not consumed (ie. not handled by any window). + * {@hide} + */ +oneway interface IUnhandledDragListener { + /** + * Called when the user finishes the drag gesture but no windows have reported handling the + * drop. The DragEvent is populated with the drag surface for the listener to animate. The + * listener *MUST* call the provided callback exactly once when it has finished handling the + * drop. If the listener calls the callback with `true` then it is responsible for removing + * and releasing the drag surface passed through the DragEvent. + */ + void onUnhandledDrop(in DragEvent event, in IUnhandledDragCallback callback); +} diff --git a/core/java/android/window/TransitionInfo.java b/core/java/android/window/TransitionInfo.java index feae173f3e61..15b9b788bca9 100644 --- a/core/java/android/window/TransitionInfo.java +++ b/core/java/android/window/TransitionInfo.java @@ -159,8 +159,11 @@ public final class TransitionInfo implements Parcelable { */ public static final int FLAG_SYNC = 1 << 21; + /** This change represents its start configuration for the duration of the animation. */ + public static final int FLAG_CONFIG_AT_END = 1 << 22; + /** The first unused bit. This can be used by remotes to attach custom flags to this change. */ - public static final int FLAG_FIRST_CUSTOM = 1 << 22; + public static final int FLAG_FIRST_CUSTOM = 1 << 23; /** The change belongs to a window that won't contain activities. */ public static final int FLAGS_IS_NON_APP_WINDOW = @@ -193,6 +196,7 @@ public final class TransitionInfo implements Parcelable { FLAG_TASK_LAUNCHING_BEHIND, FLAG_MOVED_TO_TOP, FLAG_SYNC, + FLAG_CONFIG_AT_END, FLAG_FIRST_CUSTOM }) public @interface ChangeFlags {} diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index d9b5b2d725e2..76a34aec7e58 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -676,18 +676,20 @@ public final class WindowContainerTransaction implements Parcelable { * This identifies them. * @param type The {@link InsetsType} of the insets source. * @param frame The rectangle area of the insets source. + * @param boundingRects The bounding rects within this inset, relative to the |frame|. * @hide */ @NonNull public WindowContainerTransaction addInsetsSource( @NonNull WindowContainerToken receiver, - IBinder owner, int index, @InsetsType int type, Rect frame) { + IBinder owner, int index, @InsetsType int type, Rect frame, Rect[] boundingRects) { final HierarchyOp hierarchyOp = new HierarchyOp.Builder(HierarchyOp.HIERARCHY_OP_TYPE_ADD_INSETS_FRAME_PROVIDER) .setContainer(receiver.asBinder()) .setInsetsFrameProvider(new InsetsFrameProvider(owner, index, type) .setSource(InsetsFrameProvider.SOURCE_ARBITRARY_RECTANGLE) - .setArbitraryRectangle(frame)) + .setArbitraryRectangle(frame) + .setBoundingRects(boundingRects)) .setInsetsFrameOwner(owner) .build(); mHierarchyOps.add(hierarchyOp); @@ -914,6 +916,23 @@ public final class WindowContainerTransaction implements Parcelable { } /** + * Defers client-facing configuration changes for activities in `container` until the end of + * the transition animation. The configuration will still be applied to the WMCore hierarchy + * at the normal time (beginning); so, special consideration must be made for this in the + * animation. + * + * @param container WindowContainerToken who's children should defer config notification. + * @hide + */ + @NonNull + public WindowContainerTransaction deferConfigToTransitionEnd( + @NonNull WindowContainerToken container) { + final Change change = getOrCreateChange(container.asBinder()); + change.mConfigAtTransitionEnd = true; + return this; + } + + /** * Merges another WCT into this one. * @param transfer When true, this will transfer everything from other potentially leaving * other in an unusable state. When false, other is left alone, but @@ -1050,6 +1069,7 @@ public final class WindowContainerTransaction implements Parcelable { private Rect mBoundsChangeSurfaceBounds = null; @Nullable private Rect mRelativeBounds = null; + private boolean mConfigAtTransitionEnd = false; private int mActivityWindowingMode = -1; private int mWindowingMode = -1; @@ -1082,6 +1102,7 @@ public final class WindowContainerTransaction implements Parcelable { mRelativeBounds = new Rect(); mRelativeBounds.readFromParcel(in); } + mConfigAtTransitionEnd = in.readBoolean(); mWindowingMode = in.readInt(); mActivityWindowingMode = in.readInt(); @@ -1134,6 +1155,8 @@ public final class WindowContainerTransaction implements Parcelable { ? other.mRelativeBounds : new Rect(other.mRelativeBounds); } + mConfigAtTransitionEnd = mConfigAtTransitionEnd + || other.mConfigAtTransitionEnd; } public int getWindowingMode() { @@ -1191,6 +1214,11 @@ public final class WindowContainerTransaction implements Parcelable { return mDragResizing; } + /** Gets whether the config should be sent to the client at the end of the transition. */ + public boolean getConfigAtTransitionEnd() { + return mConfigAtTransitionEnd; + } + public int getChangeMask() { return mChangeMask; } @@ -1269,6 +1297,9 @@ public final class WindowContainerTransaction implements Parcelable { if ((mChangeMask & CHANGE_RELATIVE_BOUNDS) != 0) { sb.append("relativeBounds:").append(mRelativeBounds).append(","); } + if (mConfigAtTransitionEnd) { + sb.append("configAtTransitionEnd").append(","); + } sb.append("}"); return sb.toString(); } @@ -1297,6 +1328,7 @@ public final class WindowContainerTransaction implements Parcelable { if (mRelativeBounds != null) { mRelativeBounds.writeToParcel(dest, flags); } + dest.writeBoolean(mConfigAtTransitionEnd); dest.writeInt(mWindowingMode); dest.writeInt(mActivityWindowingMode); diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java index 5c911f4a632a..45d7767380a1 100644 --- a/core/java/android/window/WindowOnBackInvokedDispatcher.java +++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java @@ -371,11 +371,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { } final OnBackAnimationCallback callback = getBackAnimationCallback(); if (callback != null) { + mProgressAnimator.reset(); callback.onBackStarted(new BackEvent( backEvent.getTouchX(), backEvent.getTouchY(), backEvent.getProgress(), backEvent.getSwipeEdge())); - mProgressAnimator.onBackStarted(backEvent, event -> - callback.onBackProgressed(event)); + mProgressAnimator.onBackStarted(backEvent, callback::onBackProgressed); } }); } diff --git a/core/java/com/android/internal/app/IVisualQueryDetectionAttentionListener.aidl b/core/java/com/android/internal/app/IVisualQueryDetectionAttentionListener.aidl index 3e48da72c131..eeaa3efa1014 100644 --- a/core/java/com/android/internal/app/IVisualQueryDetectionAttentionListener.aidl +++ b/core/java/com/android/internal/app/IVisualQueryDetectionAttentionListener.aidl @@ -16,6 +16,8 @@ package com.android.internal.app; +import android.service.voice.VisualQueryAttentionResult; + /** * Allows sysui to notify users the assistant is ready to take a query without notifying the * assistant app. @@ -24,10 +26,10 @@ oneway interface IVisualQueryDetectionAttentionListener { /** * Called when attention signal is sent. */ - void onAttentionGained(); + void onAttentionGained(in VisualQueryAttentionResult attentionResult); /** - * Called when a attention signal is lost. + * Called when a attention signal is lost for a certain interaction intention. */ - void onAttentionLost(); + void onAttentionLost(int interactionIntention); }
\ No newline at end of file diff --git a/core/java/com/android/internal/inputmethod/IConnectionlessHandwritingCallback.aidl b/core/java/com/android/internal/inputmethod/IConnectionlessHandwritingCallback.aidl new file mode 100644 index 000000000000..e564599e046f --- /dev/null +++ b/core/java/com/android/internal/inputmethod/IConnectionlessHandwritingCallback.aidl @@ -0,0 +1,23 @@ +/* + * 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.internal.inputmethod; + +/** Binder interface to receive a result from a connectionless stylus handwriting session. */ +oneway interface IConnectionlessHandwritingCallback { + void onResult(in CharSequence text); + void onError(int errorCode); +} diff --git a/core/java/com/android/internal/os/BackgroundThread.java b/core/java/com/android/internal/os/BackgroundThread.java index 72da819bb736..b75daeda480c 100644 --- a/core/java/com/android/internal/os/BackgroundThread.java +++ b/core/java/com/android/internal/os/BackgroundThread.java @@ -27,6 +27,7 @@ import java.util.concurrent.Executor; /** * Shared singleton background thread for each process. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public final class BackgroundThread extends HandlerThread { private static final long SLOW_DISPATCH_THRESHOLD_MS = 10_000; private static final long SLOW_DELIVERY_THRESHOLD_MS = 30_000; diff --git a/core/java/com/android/internal/os/BatteryStatsHistory.java b/core/java/com/android/internal/os/BatteryStatsHistory.java index aa60cc9e672c..c5c17cffa48b 100644 --- a/core/java/com/android/internal/os/BatteryStatsHistory.java +++ b/core/java/com/android/internal/os/BatteryStatsHistory.java @@ -297,9 +297,20 @@ public class BatteryStatsHistory { } } + public static class EventLogger { + /** + * Records a statsd event when the batterystats config file is written to disk. + */ + public void writeCommitSysConfigFile(long startTimeMs) { + com.android.internal.logging.EventLogTags.writeCommitSysConfigFile( + "batterystats", SystemClock.uptimeMillis() - startTimeMs); + } + } + private TraceDelegate mTracer; private int mTraceLastState = 0; private int mTraceLastState2 = 0; + private final EventLogger mEventLogger; /** * Constructor @@ -311,8 +322,16 @@ public class BatteryStatsHistory { public BatteryStatsHistory(File systemDir, int maxHistoryFiles, int maxHistoryBufferSize, HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, MonotonicClock monotonicClock) { + this(systemDir, maxHistoryFiles, maxHistoryBufferSize, + stepDetailsCalculator, clock, monotonicClock, new TraceDelegate(), + new EventLogger()); + } + + public BatteryStatsHistory(File systemDir, int maxHistoryFiles, int maxHistoryBufferSize, + HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, + MonotonicClock monotonicClock, TraceDelegate tracer, EventLogger eventLogger) { this(Parcel.obtain(), systemDir, maxHistoryFiles, maxHistoryBufferSize, - stepDetailsCalculator, clock, monotonicClock, new TraceDelegate()); + stepDetailsCalculator, clock, monotonicClock, tracer, eventLogger); initHistoryBuffer(); } @@ -320,15 +339,15 @@ public class BatteryStatsHistory { public BatteryStatsHistory(Parcel historyBuffer, File systemDir, int maxHistoryFiles, int maxHistoryBufferSize, HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, - MonotonicClock monotonicClock, TraceDelegate tracer) { + MonotonicClock monotonicClock, TraceDelegate tracer, EventLogger eventLogger) { this(historyBuffer, systemDir, maxHistoryFiles, maxHistoryBufferSize, stepDetailsCalculator, - clock, monotonicClock, tracer, null); + clock, monotonicClock, tracer, eventLogger, null); } private BatteryStatsHistory(Parcel historyBuffer, File systemDir, int maxHistoryFiles, int maxHistoryBufferSize, HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, - MonotonicClock monotonicClock, TraceDelegate tracer, + MonotonicClock monotonicClock, TraceDelegate tracer, EventLogger eventLogger, BatteryStatsHistory writableHistory) { mHistoryBuffer = historyBuffer; mSystemDir = systemDir; @@ -338,6 +357,7 @@ public class BatteryStatsHistory { mTracer = tracer; mClock = clock; mMonotonicClock = monotonicClock; + mEventLogger = eventLogger; mWritableHistory = writableHistory; if (mWritableHistory != null) { mMutable = false; @@ -394,19 +414,21 @@ public class BatteryStatsHistory { HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, MonotonicClock monotonicClock) { this(maxHistoryFiles, maxHistoryBufferSize, stepDetailsCalculator, clock, monotonicClock, - new TraceDelegate()); + new TraceDelegate(), new EventLogger()); } @VisibleForTesting public BatteryStatsHistory(int maxHistoryFiles, int maxHistoryBufferSize, HistoryStepDetailsCalculator stepDetailsCalculator, Clock clock, - MonotonicClock monotonicClock, TraceDelegate traceDelegate) { + MonotonicClock monotonicClock, TraceDelegate traceDelegate, + EventLogger eventLogger) { mMaxHistoryFiles = maxHistoryFiles; mMaxHistoryBufferSize = maxHistoryBufferSize; mStepDetailsCalculator = stepDetailsCalculator; mTracer = traceDelegate; mClock = clock; mMonotonicClock = monotonicClock; + mEventLogger = eventLogger; mHistoryBuffer = Parcel.obtain(); mSystemDir = null; @@ -425,6 +447,7 @@ public class BatteryStatsHistory { mSystemDir = null; mHistoryDir = null; mStepDetailsCalculator = null; + mEventLogger = new EventLogger(); mWritableHistory = null; mMutable = false; @@ -482,7 +505,7 @@ public class BatteryStatsHistory { historyBufferCopy.appendFrom(mHistoryBuffer, 0, mHistoryBuffer.dataSize()); return new BatteryStatsHistory(historyBufferCopy, mSystemDir, 0, 0, null, null, null, - null, this); + null, mEventLogger, this); } } @@ -1123,7 +1146,7 @@ public class BatteryStatsHistory { mHistoryCur.batteryHealth = (byte) health; mHistoryCur.batteryPlugType = (byte) plugType; mHistoryCur.batteryTemperature = (short) temperature; - mHistoryCur.batteryVoltage = (char) voltageMv; + mHistoryCur.batteryVoltage = (short) voltageMv; mHistoryCur.batteryChargeUah = chargeUah; } } @@ -1987,7 +2010,11 @@ public class BatteryStatsHistory { int bits = 0; bits = setBitField(bits, h.batteryLevel, 25, 0xfe000000 /* 7F << 25 */); bits = setBitField(bits, h.batteryTemperature, 15, 0x01ff8000 /* 3FF << 15 */); - bits = setBitField(bits, h.batteryVoltage, 1, 0x00007ffe /* 3FFF << 1 */); + short voltage = (short) h.batteryVoltage; + if (voltage == -1) { + voltage = 0x3FFF; + } + bits = setBitField(bits, voltage, 1, 0x00007ffe /* 3FFF << 1 */); return bits; } @@ -2154,8 +2181,7 @@ public class BatteryStatsHistory { + " duration ms:" + (SystemClock.uptimeMillis() - startTimeMs) + " bytes:" + p.dataSize()); } - com.android.internal.logging.EventLogTags.writeCommitSysConfigFile( - "batterystats", SystemClock.uptimeMillis() - startTimeMs); + mEventLogger.writeCommitSysConfigFile(startTimeMs); } catch (IOException e) { Slog.w(TAG, "Error writing battery statistics", e); file.failWrite(fos); @@ -2164,6 +2190,7 @@ public class BatteryStatsHistory { } } + /** * Returns the total number of history tags in the tag pool. */ diff --git a/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java b/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java index 739ee48295a9..b2a6a934ba3f 100644 --- a/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java +++ b/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java @@ -309,7 +309,12 @@ public class BatteryStatsHistoryIterator implements Iterator<BatteryStats.Histor private static void readBatteryLevelInt(int batteryLevelInt, BatteryStats.HistoryItem out) { out.batteryLevel = (byte) ((batteryLevelInt & 0xfe000000) >>> 25); out.batteryTemperature = (short) ((batteryLevelInt & 0x01ff8000) >>> 15); - out.batteryVoltage = (char) ((batteryLevelInt & 0x00007ffe) >>> 1); + int voltage = ((batteryLevelInt & 0x00007ffe) >>> 1); + if (voltage == 0x3FFF) { + voltage = -1; + } + + out.batteryVoltage = (short) voltage; } /** diff --git a/core/java/com/android/internal/os/LongMultiStateCounter.java b/core/java/com/android/internal/os/LongMultiStateCounter.java index 33a9d547be78..064609f9dfe4 100644 --- a/core/java/com/android/internal/os/LongMultiStateCounter.java +++ b/core/java/com/android/internal/os/LongMultiStateCounter.java @@ -55,11 +55,12 @@ import libcore.util.NativeAllocationRegistry; * * @hide */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass +@android.ravenwood.annotation.RavenwoodNativeSubstitutionClass( + "com.android.hoststubgen.nativesubstitution.LongMultiStateCounter_host") public final class LongMultiStateCounter implements Parcelable { - private static final NativeAllocationRegistry sRegistry = - NativeAllocationRegistry.createMalloced( - LongMultiStateCounter.class.getClassLoader(), native_getReleaseFunc()); + private static NativeAllocationRegistry sRegistry; private final int mStateCount; @@ -71,16 +72,33 @@ public final class LongMultiStateCounter implements Parcelable { Preconditions.checkArgumentPositive(stateCount, "stateCount must be greater than 0"); mStateCount = stateCount; mNativeObject = native_init(stateCount); - sRegistry.registerNativeAllocation(this, mNativeObject); + registerNativeAllocation(); } private LongMultiStateCounter(Parcel in) { mNativeObject = native_initFromParcel(in); - sRegistry.registerNativeAllocation(this, mNativeObject); + registerNativeAllocation(); mStateCount = native_getStateCount(mNativeObject); } + @android.ravenwood.annotation.RavenwoodReplace + private void registerNativeAllocation() { + if (sRegistry == null) { + synchronized (LongMultiStateCounter.class) { + if (sRegistry == null) { + sRegistry = NativeAllocationRegistry.createMalloced( + LongMultiStateCounter.class.getClassLoader(), native_getReleaseFunc()); + } + } + } + sRegistry.registerNativeAllocation(this, mNativeObject); + } + + private void registerNativeAllocation$ravenwood() { + // No-op under ravenwood + } + public int getStateCount() { return mStateCount; } @@ -221,10 +239,10 @@ public final class LongMultiStateCounter implements Parcelable { private static native long native_getCount(long nativeObject, int state); @FastNative - private native String native_toString(long nativeObject); + private static native String native_toString(long nativeObject); @FastNative - private native void native_writeToParcel(long nativeObject, Parcel dest, int flags); + private static native void native_writeToParcel(long nativeObject, Parcel dest, int flags); @FastNative private static native long native_initFromParcel(Parcel parcel); diff --git a/core/java/com/android/internal/os/TimeoutRecord.java b/core/java/com/android/internal/os/TimeoutRecord.java index e9a8d4b75f16..1f4abc19571a 100644 --- a/core/java/com/android/internal/os/TimeoutRecord.java +++ b/core/java/com/android/internal/os/TimeoutRecord.java @@ -45,6 +45,7 @@ public class TimeoutRecord { TimeoutKind.APP_REGISTERED, TimeoutKind.SHORT_FGS_TIMEOUT, TimeoutKind.JOB_SERVICE, + TimeoutKind.FGS_TIMEOUT, }) @Retention(RetentionPolicy.SOURCE) @@ -59,6 +60,7 @@ public class TimeoutRecord { int SHORT_FGS_TIMEOUT = 8; int JOB_SERVICE = 9; int APP_START = 10; + int FGS_TIMEOUT = 11; } /** Kind of timeout, e.g. BROADCAST_RECEIVER, etc. */ @@ -186,6 +188,12 @@ public class TimeoutRecord { return TimeoutRecord.endingNow(TimeoutKind.SHORT_FGS_TIMEOUT, reason); } + /** Record for a "foreground service" timeout. */ + @NonNull + public static TimeoutRecord forFgsTimeout(String reason) { + return TimeoutRecord.endingNow(TimeoutKind.FGS_TIMEOUT, reason); + } + /** Record for a job related timeout. */ @NonNull public static TimeoutRecord forJobService(String reason) { diff --git a/core/java/com/android/internal/os/anr/AnrLatencyTracker.java b/core/java/com/android/internal/os/anr/AnrLatencyTracker.java index f62ff38528f7..e11067dbd722 100644 --- a/core/java/com/android/internal/os/anr/AnrLatencyTracker.java +++ b/core/java/com/android/internal/os/anr/AnrLatencyTracker.java @@ -22,6 +22,7 @@ import static com.android.internal.os.TimeoutRecord.TimeoutKind; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__BROADCAST_OF_INTENT; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__CONTENT_PROVIDER_NOT_RESPONDING; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__EXECUTING_SERVICE; +import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__FGS_TIMEOUT; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__INPUT_DISPATCHING_TIMEOUT; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__INPUT_DISPATCHING_TIMEOUT_NO_FOCUSED_WINDOW; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__JOB_SERVICE; @@ -548,6 +549,8 @@ public class AnrLatencyTracker implements AutoCloseable { return ANRLATENCY_REPORTED__ANR_TYPE__SHORT_FGS_TIMEOUT; case TimeoutKind.JOB_SERVICE: return ANRLATENCY_REPORTED__ANR_TYPE__JOB_SERVICE; + case TimeoutKind.FGS_TIMEOUT: + return ANRLATENCY_REPORTED__ANR_TYPE__FGS_TIMEOUT; default: return ANRLATENCY_REPORTED__ANR_TYPE__UNKNOWN_ANR_TYPE; } diff --git a/core/java/com/android/internal/power/EnergyConsumerStats.java b/core/java/com/android/internal/power/EnergyConsumerStats.java index e2098dd11531..764908d65b17 100644 --- a/core/java/com/android/internal/power/EnergyConsumerStats.java +++ b/core/java/com/android/internal/power/EnergyConsumerStats.java @@ -44,6 +44,7 @@ import java.util.Arrays; * This class doesn't use a TimeBase, and instead requires manual decisions about when to * accumulate since it is trivial. However, in the future, a TimeBase could be used instead. */ +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class EnergyConsumerStats { private static final String TAG = "MeasuredEnergyStats"; diff --git a/core/java/com/android/internal/protolog/OWNERS b/core/java/com/android/internal/protolog/OWNERS new file mode 100644 index 000000000000..18cf2be9f7df --- /dev/null +++ b/core/java/com/android/internal/protolog/OWNERS @@ -0,0 +1,3 @@ +# ProtoLog owners +# Bug component: 1157642 +include platform/development:/tools/winscope/OWNERS diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 595bf3b8eb97..e95127be8543 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -17,12 +17,14 @@ package com.android.internal.view; import android.os.ResultReceiver; +import android.view.inputmethod.CursorAnchorInfo; import android.view.inputmethod.ImeTracker; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.EditorInfo; import android.window.ImeOnBackInvokedDispatcher; +import com.android.internal.inputmethod.IConnectionlessHandwritingCallback; import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInputMethodClient; import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection; @@ -144,6 +146,9 @@ interface IInputMethodManager { /** Start Stylus handwriting session **/ void startStylusHandwriting(in IInputMethodClient client); + oneway void startConnectionlessStylusHandwriting(in IInputMethodClient client, int userId, + in CursorAnchorInfo cursorAnchorInfo, in String delegatePackageName, + in String delegatorPackageName, in IConnectionlessHandwritingCallback callback); /** Prepares delegation of starting stylus handwriting session to a different editor **/ void prepareStylusHandwritingDelegation(in IInputMethodClient client, @@ -158,7 +163,7 @@ interface IInputMethodManager { /** Returns {@code true} if currently selected IME supports Stylus handwriting. */ @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = " + "android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)") - boolean isStylusHandwritingAvailableAsUser(int userId); + boolean isStylusHandwritingAvailableAsUser(int userId, boolean connectionless); /** add virtual stylus id for test Stylus handwriting session **/ @EnforcePermission("TEST_INPUT_METHOD") diff --git a/core/java/com/android/internal/widget/NotificationOptimizedLinearLayout.java b/core/java/com/android/internal/widget/NotificationOptimizedLinearLayout.java index b5e9b8f537e4..0ceba25ede2c 100644 --- a/core/java/com/android/internal/widget/NotificationOptimizedLinearLayout.java +++ b/core/java/com/android/internal/widget/NotificationOptimizedLinearLayout.java @@ -53,6 +53,7 @@ import java.util.List; * - LinearLayout doesn't have <code>weightSum</code>. * - Horizontal LinearLayout's width should be measured EXACTLY. * - Horizontal LinearLayout shouldn't need baseLineAlignment. + * - Horizontal LinearLayout shouldn't have any child that has negative left or right margin. * - Vertical LinearLayout shouldn't have MATCH_PARENT children when it is not measured EXACTLY. * * @hide @@ -88,7 +89,7 @@ public class NotificationOptimizedLinearLayout extends LinearLayout { final View weightedChildView = getSingleWeightedChild(); mShouldUseOptimizedLayout = isUseOptimizedLinearLayoutFlagEnabled() && weightedChildView != null - && isLinearLayoutUsable(widthMeasureSpec, heightMeasureSpec); + && isOptimizationPossible(widthMeasureSpec, heightMeasureSpec); if (mShouldUseOptimizedLayout) { onMeasureOptimized(weightedChildView, widthMeasureSpec, heightMeasureSpec); @@ -118,7 +119,7 @@ public class NotificationOptimizedLinearLayout extends LinearLayout { * @param heightMeasureSpec The height measurement specification. * @return `true` if optimization is possible, `false` otherwise. */ - private boolean isLinearLayoutUsable(int widthMeasureSpec, int heightMeasureSpec) { + private boolean isOptimizationPossible(int widthMeasureSpec, int heightMeasureSpec) { final boolean hasWeightSum = getWeightSum() > 0.0f; if (hasWeightSum) { logSkipOptimizedOnMeasure("Has weightSum."); @@ -142,10 +143,36 @@ public class NotificationOptimizedLinearLayout extends LinearLayout { logSkipOptimizedOnMeasure("Need to apply baseline."); return false; } + + if (requiresNegativeMarginHandlingForHorizontalLinearLayout()) { + logSkipOptimizedOnMeasure("Need to handle negative margins."); + return false; + } return true; } /** + * @return if the horizontal linearlayout requires to handle negative margins in its children. + * In that case, we can't use excessSpace because LinearLayout negative margin handling for + * excess space and WRAP_CONTENT is different. + */ + private boolean requiresNegativeMarginHandlingForHorizontalLinearLayout() { + if (getOrientation() == VERTICAL) { + return false; + } + + final List<View> activeChildren = getActiveChildren(); + for (int i = 0; i < activeChildren.size(); i++) { + final View child = activeChildren.get(i); + final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); + if (lp.leftMargin < 0 || lp.rightMargin < 0) { + return true; + } + } + return false; + } + + /** * @return if the vertical linearlayout requires match_parent children remeasure */ private boolean requiresMatchParentRemeasureForVerticalLinearLayout(int widthMeasureSpec) { @@ -337,94 +364,81 @@ public class NotificationOptimizedLinearLayout extends LinearLayout { */ private void measureVerticalOptimized(@NonNull View weightedChildView, int widthMeasureSpec, int heightMeasureSpec) { - final int widthMode = MeasureSpec.getMode(widthMeasureSpec); - final int heightMode = MeasureSpec.getMode(heightMeasureSpec); + int totalLength = 0; int maxWidth = 0; - int usedHeight = 0; - final List<View> activeChildren = getActiveChildren(); - final int activeChildCount = activeChildren.size(); - - final boolean isContentFirstItem = !activeChildren.isEmpty() && activeChildren.get(0) - == weightedChildView; - - final boolean isContentLastItem = !activeChildren.isEmpty() && activeChildren.get( - activeChildCount - 1) == weightedChildView; - - final int horizontalPaddings = getPaddingLeft() + getPaddingRight(); + final int availableHeight = MeasureSpec.getSize(heightMeasureSpec); + final int heightMode = MeasureSpec.getMode(heightMeasureSpec); - // 1. Measure other child views. - for (int i = 0; i < activeChildCount; i++) { - final View child = activeChildren.get(i); - if (child == weightedChildView) { + // 1. Measure all unweighted children + for (int i = 0; i < getChildCount(); i++) { + final View child = getChildAt(i); + if (child == null || child.getVisibility() == GONE) { continue; } + final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); - int requiredVerticalPadding = lp.topMargin + lp.bottomMargin; - if (!isContentFirstItem && i == 0) { - requiredVerticalPadding += getPaddingTop(); - } - if (!isContentLastItem && i == activeChildCount - 1) { - requiredVerticalPadding += getPaddingBottom(); + if (child == weightedChildView) { + // In excessMode, LinearLayout add weighted child top and bottom margins to + // totalLength when their sum is positive. + if (lp.height == 0 && heightMode == MeasureSpec.EXACTLY) { + totalLength = Math.max(totalLength, totalLength + lp.topMargin + + lp.bottomMargin); + } + continue; } - child.measure(ViewGroup.getChildMeasureSpec(widthMeasureSpec, - horizontalPaddings + lp.leftMargin + lp.rightMargin, - child.getLayoutParams().width), - ViewGroup.getChildMeasureSpec(heightMeasureSpec, requiredVerticalPadding, - lp.height)); + measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0); + // LinearLayout only adds measured children heights and its top and bottom margins + // to totalLength when their sum is positive. + totalLength = Math.max(totalLength, + totalLength + child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin); maxWidth = Math.max(maxWidth, child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin); - usedHeight += child.getMeasuredHeight() + requiredVerticalPadding; } - // measure content - final MarginLayoutParams lp = (MarginLayoutParams) weightedChildView.getLayoutParams(); + // Add padding to totalLength that we are going to use for remaining space. + totalLength += mPaddingTop + mPaddingBottom; - int usedSpace = usedHeight + lp.topMargin + lp.bottomMargin; - if (isContentFirstItem) { - usedSpace += getPaddingTop(); - } - if (isContentLastItem) { - usedSpace += getPaddingBottom(); + // 2. generate measure spec for weightedChildView. + final MarginLayoutParams lp = (MarginLayoutParams) weightedChildView.getLayoutParams(); + // height should be AT_MOST for non EXACT cases. + final int childHeightMeasureMode = + heightMode == MeasureSpec.EXACTLY ? MeasureSpec.EXACTLY : MeasureSpec.AT_MOST; + final int childHeightMeasureSpec; + + // In excess mode, LinearLayout measures weighted children with remaining space. Otherwise, + // it is measured with remaining space just like other children. + if (lp.height == 0 && heightMode == MeasureSpec.EXACTLY) { + childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( + Math.max(0, availableHeight - totalLength), childHeightMeasureMode); + } else { + final int usedHeight = lp.topMargin + lp.bottomMargin + totalLength; + childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( + Math.max(0, availableHeight - usedHeight), childHeightMeasureMode); } + final int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, + mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin, lp.width); - final int availableWidth = MeasureSpec.getSize(widthMeasureSpec); - final int availableHeight = MeasureSpec.getSize(heightMeasureSpec); - - final int childWidthMeasureSpec = ViewGroup.getChildMeasureSpec(widthMeasureSpec, - horizontalPaddings + lp.leftMargin + lp.rightMargin, lp.width); + // 3. Measure weightedChildView with the remaining space. + weightedChildView.measure(childWidthMeasureSpec, childHeightMeasureSpec); - // 2. Calculate remaining height for weightedChildView. - final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( - Math.max(0, availableHeight - usedSpace), MeasureSpec.AT_MOST); + totalLength = Math.max(totalLength, + totalLength + weightedChildView.getMeasuredHeight() + lp.topMargin + + lp.bottomMargin); - // 3. Measure weightedChildView with the remaining remaining space. - weightedChildView.measure(childWidthMeasureSpec, childHeightMeasureSpec); maxWidth = Math.max(maxWidth, weightedChildView.getMeasuredWidth() + lp.leftMargin + lp.rightMargin); - final int totalUsedHeight = usedSpace + weightedChildView.getMeasuredHeight(); - - final int measuredWidth; - if (widthMode == MeasureSpec.EXACTLY) { - measuredWidth = availableWidth; - } else { - measuredWidth = maxWidth + getPaddingStart() + getPaddingEnd(); - } - - final int measuredHeight; - if (heightMode == MeasureSpec.EXACTLY) { - measuredHeight = availableHeight; - } else { - measuredHeight = totalUsedHeight; - } + // Add padding to width + maxWidth += getPaddingLeft() + getPaddingRight(); - // 4. Set the container size - setMeasuredDimension( - resolveSize(Math.max(getSuggestedMinimumWidth(), measuredWidth), - widthMeasureSpec), - Math.max(getSuggestedMinimumHeight(), measuredHeight)); + // Resolve final dimensions + final int finalWidth = resolveSizeAndState(Math.max(maxWidth, getSuggestedMinimumWidth()), + widthMeasureSpec, 0); + final int finalHeight = resolveSizeAndState( + Math.max(totalLength, getSuggestedMinimumHeight()), heightMeasureSpec, 0); + setMeasuredDimension(finalWidth, finalHeight); } @NonNull diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp index 200ddefc3bbc..01e9f437a79f 100644 --- a/core/jni/LayoutlibLoader.cpp +++ b/core/jni/LayoutlibLoader.cpp @@ -416,11 +416,17 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { env->NewStringUTF("icu.data.path"), env->NewStringUTF("")); const char* path = env->GetStringUTFChars(stringPath, 0); - bool icuInitialized = init_icu(path); - env->ReleaseStringUTFChars(stringPath, path); - if (!icuInitialized) { - return JNI_ERR; + + if (strcmp(path, "**n/a**") != 0) { + bool icuInitialized = init_icu(path); + if (!icuInitialized) { + fprintf(stderr, "Failed to initialize ICU\n"); + return JNI_ERR; + } + } else { + fprintf(stderr, "Skip initializing ICU\n"); } + env->ReleaseStringUTFChars(stringPath, path); jstring useJniProperty = (jstring)env->CallStaticObjectMethod(system, getPropertyMethod, @@ -449,12 +455,18 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { // Use English locale for number format to ensure correct parsing of floats when using strtof setlocale(LC_NUMERIC, "en_US.UTF-8"); - auto keyboardPathsString = + auto keyboardPathsJString = (jstring)env->CallStaticObjectMethod(system, getPropertyMethod, env->NewStringUTF("keyboard_paths"), env->NewStringUTF("")); - vector<string> keyboardPaths = parseCsv(env, keyboardPathsString); - init_keyboard(env, keyboardPaths); + const char* keyboardPathsString = env->GetStringUTFChars(keyboardPathsJString, 0); + if (strcmp(keyboardPathsString, "**n/a**") != 0) { + vector<string> keyboardPaths = parseCsv(env, keyboardPathsJString); + init_keyboard(env, keyboardPaths); + } else { + fprintf(stderr, "Skip initializing keyboard\n"); + } + env->ReleaseStringUTFChars(keyboardPathsJString, keyboardPathsString); return JNI_VERSION_1_6; } diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index ce4a33735c6d..8dc9d0aa578e 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -39,6 +39,7 @@ using vintf::CompatibilityMatrix; using vintf::HalManifest; using vintf::Level; using vintf::SchemaType; +using vintf::SepolicyVersion; using vintf::to_string; using vintf::toXml; using vintf::Version; @@ -139,7 +140,7 @@ static jstring android_os_VintfObject_getPlatformSepolicyVersion(JNIEnv* env, jc return nullptr; } - Version latest; + SepolicyVersion latest; for (const auto& range : versions) { latest = std::max(latest, range.maxVer()); } diff --git a/core/jni/com_android_internal_os_LongMultiStateCounter.cpp b/core/jni/com_android_internal_os_LongMultiStateCounter.cpp index ddf7a67e00ce..56d3fbba9458 100644 --- a/core/jni/com_android_internal_os_LongMultiStateCounter.cpp +++ b/core/jni/com_android_internal_os_LongMultiStateCounter.cpp @@ -100,7 +100,7 @@ static jlong native_getCount(jlong nativePtr, jint state) { return asLongMultiStateCounter(nativePtr)->getCount(state); } -static jobject native_toString(JNIEnv *env, jobject self, jlong nativePtr) { +static jobject native_toString(JNIEnv *env, jclass, jlong nativePtr) { return env->NewStringUTF(asLongMultiStateCounter(nativePtr)->toString().c_str()); } @@ -118,7 +118,7 @@ static void throwWriteRE(JNIEnv *env, binder_status_t status) { } \ } -static void native_writeToParcel(JNIEnv *env, jobject self, jlong nativePtr, jobject jParcel, +static void native_writeToParcel(JNIEnv *env, jclass, jlong nativePtr, jobject jParcel, jint flags) { battery::LongMultiStateCounter *counter = asLongMultiStateCounter(nativePtr); ndk::ScopedAParcel parcel(AParcel_fromJavaParcel(env, jParcel)); diff --git a/core/proto/OWNERS b/core/proto/OWNERS index c65794e01ceb..b900fa60ff70 100644 --- a/core/proto/OWNERS +++ b/core/proto/OWNERS @@ -22,7 +22,6 @@ per-file android/content/intent.proto = file:/PACKAGE_MANAGER_OWNERS per-file android/hardware/location/context_hub_info.proto = file:/services/core/java/com/android/server/location/contexthub/OWNERS # Biometrics -jaggies@google.com jbolinger@google.com # Launcher diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index c62e53646aa7..4fc9b40465ee 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -144,6 +144,7 @@ message SecureSettingsProto { optional SettingProto long_press_home_enabled = 11 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto visual_query_accessibility_detection_enabled = 14 [ (android.privacy).dest = DEST_AUTOMATIC ]; } optional Assist assist = 7; diff --git a/core/res/Android.bp b/core/res/Android.bp index 34c404520a2b..277824cbb4c8 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -154,6 +154,14 @@ android_app { }, generate_product_characteristics_rro: true, + + flags_packages: [ + "android.content.pm.flags-aconfig", + "android.provider.flags-aconfig", + "camera_platform_flags", + "com.android.net.flags-aconfig", + "com.android.window.flags.window-aconfig", + ], } java_genrule { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a425bb0e7461..04367e7d0534 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -835,6 +835,7 @@ <!-- Added in V --> <protected-broadcast android:name="android.intent.action.PROFILE_AVAILABLE" /> <protected-broadcast android:name="android.intent.action.PROFILE_UNAVAILABLE" /> + <protected-broadcast android:name="android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED" /> <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> @@ -892,7 +893,8 @@ android:permissionGroup="android.permission-group.UNDEFINED" android:label="@string/permlab_writeVerificationStateE2eeContactKeys" android:description="@string/permdesc_writeVerificationStateE2eeContactKeys" - android:protectionLevel="signature|privileged" /> + android:protectionLevel="signature|privileged" + android:featureFlag="android.provider.user_keys" /> <!-- Allows an application to set default account for new contacts. <p> This permission is only granted to system applications fulfilling the Contacts app role. @@ -1728,7 +1730,8 @@ android:permissionGroup="android.permission-group.UNDEFINED" android:label="@string/permlab_cameraHeadlessSystemUser" android:description="@string/permdesc_cameraHeadlessSystemUser" - android:protectionLevel="signature" /> + android:protectionLevel="signature" + android:featureFlag="com.android.internal.camera.flags.camera_hsum_permission" /> <!-- ====================================================================== --> <!-- Permissions for accessing the device sensors --> @@ -2321,7 +2324,8 @@ @hide This should only be used by system apps. --> <permission android:name="android.permission.REGISTER_NSD_OFFLOAD_ENGINE" - android:protectionLevel="signature" /> + android:protectionLevel="signature" + android:featureFlag="com.android.net.flags.register_nsd_offload_engine" /> <!-- ======================================= --> <!-- Permissions for short range, peripheral networks --> @@ -2390,7 +2394,8 @@ them from running without explicit user action. --> <permission android:name="android.permission.QUARANTINE_APPS" - android:protectionLevel="signature|verifier" /> + android:protectionLevel="signature|verifier" + android:featureFlag="android.content.pm.quarantined_enabled" /> <!-- Allows applications to discover and pair bluetooth devices. <p>Protection level: normal @@ -2650,7 +2655,8 @@ @FlaggedApi("com.android.window.flags.screen_recording_callbacks") --> <permission android:name="android.permission.DETECT_SCREEN_RECORDING" - android:protectionLevel="normal" /> + android:protectionLevel="normal" + android:featureFlag="com.android.window.flags.screen_recording_callbacks" /> <!-- ======================================== --> <!-- Permissions for factory reset protection --> @@ -3617,6 +3623,13 @@ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK" android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to sending assist content to a + privileged app such as the Assistant app. + @FlaggedApi("android.app.admin.flags.assist_content_user_restriction_enabled") + --> + <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT" + android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to windows. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. @@ -3799,6 +3812,13 @@ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION" android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to subscriptions downloaded by an admin. + <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call + APIs protected by this permission on users different to the calling user. + @FlaggedApi("android.app.admin.flags.esim_management_enabled") --> + <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS" + android:protectionLevel="internal|role" /> + <!-- Allows an application to set device policies outside the current user that are critical for securing data within the current user. <p>Holding this permission allows the use of other held MANAGE_DEVICE_POLICY_* @@ -3829,6 +3849,7 @@ @hide This is not a third-party API (intended for OEMs and system apps). --> <permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" android:protectionLevel="signature|installer" /> + <uses-permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" /> <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.--> <permission android:name="android.permission.PROVISION_DEMO_DEVICE" @@ -5921,7 +5942,7 @@ <permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" android:protectionLevel="signature|privileged" /> - <!-- Allows an application to collect usage infomation about brightness slider changes. + <!-- Allows an application to collect usage information about brightness slider changes. <p>Not for use by third-party applications.</p> @hide @SystemApi @@ -7033,12 +7054,16 @@ <!-- Allows the holder to read blocked numbers. See {@link android.provider.BlockedNumberContract}. + @SystemApi + @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @hide --> <permission android:name="android.permission.READ_BLOCKED_NUMBERS" android:protectionLevel="signature" /> <!-- Allows the holder to write blocked numbers. See {@link android.provider.BlockedNumberContract}. + @SystemApi + @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @hide --> <permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" android:protectionLevel="signature" /> diff --git a/core/res/OWNERS b/core/res/OWNERS index 332ad2a82d38..6924248b33cf 100644 --- a/core/res/OWNERS +++ b/core/res/OWNERS @@ -8,7 +8,6 @@ dupin@google.com hackbod@android.com hackbod@google.com ilyamaty@google.com -jaggies@google.com jbolinger@google.com jsharkey@android.com jsharkey@google.com diff --git a/core/res/res/color/system_on_surface_disabled.xml b/core/res/res/color/system_on_surface_disabled.xml new file mode 100644 index 000000000000..aba87f543c44 --- /dev/null +++ b/core/res/res/color/system_on_surface_disabled.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="?attr/materialColorOnSurface" + android:alpha="?attr/disabledAlpha" /> +</selector> diff --git a/core/res/res/color/system_outline_disabled.xml b/core/res/res/color/system_outline_disabled.xml new file mode 100644 index 000000000000..0a67ce3bf186 --- /dev/null +++ b/core/res/res/color/system_outline_disabled.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="?attr/materialColorOutline" + android:alpha="?attr/disabledAlpha" /> +</selector> diff --git a/core/res/res/color/system_surface_disabled.xml b/core/res/res/color/system_surface_disabled.xml new file mode 100644 index 000000000000..2d7fe7d727be --- /dev/null +++ b/core/res/res/color/system_surface_disabled.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="?attr/materialColorSurface" + android:alpha="?attr/disabledAlpha" /> +</selector> diff --git a/core/res/res/drawable/ic_private_profile_badge.xml b/core/res/res/drawable/ic_private_profile_badge.xml index 28c0f8aba6f1..b042c39aea8b 100644 --- a/core/res/res/drawable/ic_private_profile_badge.xml +++ b/core/res/res/drawable/ic_private_profile_badge.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:pathData="M10.5,15H13.5L12.925,11.775C13.258,11.608 13.517,11.367 13.7,11.05C13.9,10.733 14,10.383 14,10C14,9.45 13.8,8.983 13.4,8.6C13.017,8.2 12.55,8 12,8C11.45,8 10.975,8.2 10.575,8.6C10.192,8.983 10,9.45 10,10C10,10.383 10.092,10.733 10.275,11.05C10.475,11.367 10.742,11.608 11.075,11.775L10.5,15ZM12,22C9.683,21.417 7.767,20.092 6.25,18.025C4.75,15.942 4,13.633 4,11.1V5L12,2L20,5V11.1C20,13.633 19.242,15.942 17.725,18.025C16.225,20.092 14.317,21.417 12,22ZM12,19.9C13.733,19.35 15.167,18.25 16.3,16.6C17.433,14.95 18,13.117 18,11.1V6.375L12,4.125L6,6.375V11.1C6,13.117 6.567,14.95 7.7,16.6C8.833,18.25 10.267,19.35 12,19.9Z" - android:fillColor="@android:color/system_accent1_900"/> + android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z" + android:fillColor="#3C4043"/> </vector>
\ No newline at end of file diff --git a/core/res/res/drawable/ic_private_profile_icon_badge.xml b/core/res/res/drawable/ic_private_profile_icon_badge.xml index 5cb6a9dc118f..5f1f1b72b5ee 100644 --- a/core/res/res/drawable/ic_private_profile_icon_badge.xml +++ b/core/res/res/drawable/ic_private_profile_icon_badge.xml @@ -25,7 +25,7 @@ android:translateX="42" android:translateY="42"> <path - android:pathData="M10.5,15H13.5L12.925,11.775C13.258,11.608 13.517,11.367 13.7,11.05C13.9,10.733 14,10.383 14,10C14,9.45 13.8,8.983 13.4,8.6C13.017,8.2 12.55,8 12,8C11.45,8 10.975,8.2 10.575,8.6C10.192,8.983 10,9.45 10,10C10,10.383 10.092,10.733 10.275,11.05C10.475,11.367 10.742,11.608 11.075,11.775L10.5,15ZM12,22C9.683,21.417 7.767,20.092 6.25,18.025C4.75,15.942 4,13.633 4,11.1V5L12,2L20,5V11.1C20,13.633 19.242,15.942 17.725,18.025C16.225,20.092 14.317,21.417 12,22ZM12,19.9C13.733,19.35 15.167,18.25 16.3,16.6C17.433,14.95 18,13.117 18,11.1V6.375L12,4.125L6,6.375V11.1C6,13.117 6.567,14.95 7.7,16.6C8.833,18.25 10.267,19.35 12,19.9Z" - android:fillColor="@android:color/system_accent1_900"/> + android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z" + android:fillColor="#3C4043"/> </group> </vector>
\ No newline at end of file diff --git a/core/res/res/drawable/stat_sys_private_profile_status.xml b/core/res/res/drawable/stat_sys_private_profile_status.xml index 98cc88d86ef3..429070efa8d8 100644 --- a/core/res/res/drawable/stat_sys_private_profile_status.xml +++ b/core/res/res/drawable/stat_sys_private_profile_status.xml @@ -21,5 +21,5 @@ android:viewportHeight="24"> <path android:fillColor="@android:color/white" - android:pathData="M10.5,15H13.5L12.925,11.775C13.258,11.608 13.517,11.367 13.7,11.05C13.9,10.733 14,10.383 14,10C14,9.45 13.8,8.983 13.4,8.6C13.017,8.2 12.55,8 12,8C11.45,8 10.975,8.2 10.575,8.6C10.192,8.983 10,9.45 10,10C10,10.383 10.092,10.733 10.275,11.05C10.475,11.367 10.742,11.608 11.075,11.775L10.5,15ZM12,22C9.683,21.417 7.767,20.092 6.25,18.025C4.75,15.942 4,13.633 4,11.1V5L12,2L20,5V11.1C20,13.633 19.242,15.942 17.725,18.025C16.225,20.092 14.317,21.417 12,22ZM12,19.9C13.733,19.35 15.167,18.25 16.3,16.6C17.433,14.95 18,13.117 18,11.1V6.375L12,4.125L6,6.375V11.1C6,13.117 6.567,14.95 7.7,16.6C8.833,18.25 10.267,19.35 12,19.9Z"/> + android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z"/> </vector>
\ No newline at end of file diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml index b8d93aca755b..509b98829883 100644 --- a/core/res/res/layout/app_perms_summary.xml +++ b/core/res/res/layout/app_perms_summary.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<!-- Describes permission item consisting of a group name and the list of permisisons under the group --> +<!-- Describes permission item consisting of a group name and the list of permissions under the group --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/core/res/res/values-watch/colors.xml b/core/res/res/values-watch/colors.xml new file mode 100644 index 000000000000..0b00bd8ea686 --- /dev/null +++ b/core/res/res/values-watch/colors.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<!-- Watch specific system colors. --> +<resources> + <color name="system_error_light">#B3261E</color> + <color name="system_on_error_light">#FFFFFF</color> + <color name="system_error_container_light">#F9DEDC</color> + <color name="system_on_error_container_light">#410E0B</color> + + <color name="system_error_dark">#EC928E</color> + <color name="system_on_error_dark">#410E0B</color> + <color name="system_error_container_dark">#F2B8B5</color> + <color name="system_on_error_container_dark">#601410</color> +</resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 45861a3e8893..4ee03deab6c2 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1344,6 +1344,8 @@ <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of tertiary. @hide --> <attr name="materialColorTertiary" format="color"/> + <!-- The error color for the app, intended to draw attention to error conditions. @hide --> + <attr name="materialColorError" format="color"/> </declare-styleable> <!-- **************************************************************** --> @@ -3641,6 +3643,18 @@ <p> The default value is 40dp for {@link android.widget.TextView} and {@link android.widget.EditText}, and 0dp for all other views. --> <attr name="handwritingBoundsOffsetBottom" format="dimension" /> + + <!-- Sets whether this view renders sensitive content. --> + <!-- @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") --> + <attr name="contentSensitivity"> + <!-- Let the Android System use its heuristics to determine if the view renders + sensitive content. --> + <enum name="auto" value="0" /> + <!-- This view renders sensitive content. --> + <enum name="sensitive" value="0x1" /> + <!-- This view doesn't render sensitive content. --> + <enum name="notSensitive" value="0x2" /> + </attr> </declare-styleable> <!-- Attributes that can be assigned to a tag for a particular View. --> @@ -3966,6 +3980,26 @@ {@link android.inputmethodservice.InputMethodService#onFinishInput()}. --> <attr name="supportsStylusHandwriting" format="boolean" /> + <!-- Specifies whether the IME supports connectionless stylus handwriting sessions. A + connectionless session differs from a regular session in that the IME does not use an + input connection to communicate with a text editor. Instead, the IME directly returns + recognised handwritten text via an {@link + android.inputmethodservice.InputMethodService} handwriting lifecycle API. + + <p>If the IME supports connectionless sessions, apps or framework may start a + connectionless session when a stylus motion event sequence begins. {@link + android.inputmethodservice.InputMethodService#onStartConnectionlessStylusHandwriting} + is called. If the IME is ready for stylus input, it should return {code true} to start + the basic mode session. As in the regular session, the IME will receive stylus motion + events to the stylus handwriting window and should render ink to a view in this window. + When the user has stopped handwriting, the IME should end the session and deliver the + result by calling {@link + android.inputmethodservice.InputMethodService#finishConnectionlessStylusHandwriting}. + + The default value is {code false}. If {code true}, {@link + android.R.attr#supportsStylusHandwriting} should also be {code true}. + --> + <attr name="supportsConnectionlessStylusHandwriting" format="boolean" /> <!-- Class name of an activity that allows the user to modify the stylus handwriting settings for this service --> <attr name="stylusHandwritingSettingsActivity" format="string" /> @@ -5857,6 +5891,23 @@ use glyph bound's as a source of text width. --> <!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") --> <attr name="useBoundsForWidth" format="boolean" /> + <!-- Whether to use the locale preferred line height for the minimum line height. + + This flag is useful for preventing jitter of entering letters into empty EditText. + The line height of the text is determined by the font files used for drawing text in a + line. However, in case of the empty text case, the line height cannot be determined and + the default line height: usually it is came from a font of Latin script. By making this + attribute to true, the TextView/EditText uses a line height that is likely used for the + locale associated with the widget. For example, if the system locale is Japanese, the + height of the EditText will be adjusted to meet the height of the Japanese font even if + the text is empty. + + The default value for EditText is true if targetSdkVersion is + {@link android.os.Build.VERSION_CODE#VANILLA_ICE_CREAM} or later, otherwise false. + For other TextViews, the default value is false. + --> + <!-- @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") --> + <attr name="useLocalePreferredLineHeightForMinimum" format="boolean" /> </declare-styleable> <declare-styleable name="TextViewAppearance"> <!-- Base text color, typeface, size, and style. --> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 53a6270ed0e4..b879c9794f39 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -438,7 +438,47 @@ This value can be overlaid at runtime by OverlayManager RROs. --> <color name="system_neutral2_1000">#000000</color> - <!-- Colors used in Android system, from Material design system. + <!-- Lightest shade of the error color used by the system. White. + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_0">#ffffff</color> + <!-- Shade of the error system color at 99% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_10">#FFFBF9</color> + <!-- Shade of the error system color at 95% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_50">#FCEEEE</color> + <!-- Shade of the error system color at 90% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_100">#F9DEDC</color> + <!-- Shade of the error system color at 80% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_200">#F2B8B5</color> + <!-- Shade of the error system color at 70% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_300">#EC928E</color> + <!-- Shade of the error system color at 60% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_400">#E46962</color> + <!-- Shade of the error system color at 49% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_500">#DC362E</color> + <!-- Shade of the error system color at 40% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_600">#B3261E</color> + <!-- Shade of the error system color at 30% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_700">#8C1D18</color> + <!-- Shade of the error system color at 20% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_800">#601410</color> + <!-- Shade of the error system color at 10% perceptual luminance (L* in L*a*b* color space). + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_900">#410E0B</color> + <!-- Darkest shade of the error color used by the system. Black. + This value can be overlaid at runtime by OverlayManager RROs. --> + <color name="system_error_1000">#000000</color> + + <!-- Colors used in Android system, from design system. These values can be overlaid at runtime by OverlayManager RROs. --> <color name="system_primary_container_light">#D8E2FF</color> <color name="system_on_primary_container_light">#001A41</color> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d4e727ea0afb..c6bc589cffcb 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2141,6 +2141,12 @@ <item>com.android.location.fused</item> </string-array> + <!-- Package name of the extension software fallback. --> + <string name="config_extensionFallbackPackageName" translatable="false"></string> + + <!-- Service name of the extension software fallback. --> + <string name="config_extensionFallbackServiceName" translatable="false"></string> + <!-- Package name(s) of Advanced Driver Assistance applications. These packages have additional management of access to location, specific to driving assistance use-cases. They must be system packages. This configuration is only applicable to devices that declare diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml index d0216b308a4c..104b7cd5450b 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -58,6 +58,12 @@ <integer name="auto_data_switch_availability_stability_time_threshold_millis">10000</integer> <java-symbol type="integer" name="auto_data_switch_availability_stability_time_threshold_millis" /> + <!-- Define the bar of considering the RAT and signal strength advantage of a subscription to be + stable in milliseconds, where 0 means immediate switch, and negative milliseconds indicates the + switch base on RAT and signal strength feature is disabled.--> + <integer name="auto_data_switch_performance_stability_time_threshold_millis">120000</integer> + <java-symbol type="integer" name="auto_data_switch_performance_stability_time_threshold_millis" /> + <!-- Define the maximum retry times when a validation for switching failed.--> <integer name="auto_data_switch_validation_max_retry">7</integer> <java-symbol type="integer" name="auto_data_switch_validation_max_retry" /> @@ -82,6 +88,13 @@ <bool name="config_wlan_data_service_conn_persistence_on_restart">true</bool> <java-symbol type="bool" name="config_wlan_data_service_conn_persistence_on_restart" /> + <!-- Indicating whether the retry timer from setup data call response for data throttling should + be honored for emergency network request. By default this is off, meaning for emergency + network requests, the data frameworks will ignore the previous retry timer passed in from + setup data call response. --> + <bool name="config_honor_data_retry_timer_for_emergency_network">false</bool> + <java-symbol type="bool" name="config_honor_data_retry_timer_for_emergency_network" /> + <!-- Cellular data service package name to bind to by default. If none is specified in an overlay, an empty string is passed in --> <string name="config_wwan_data_service_package" translatable="false">com.android.phone</string> @@ -172,6 +185,35 @@ <integer name="config_satellite_nb_iot_inactivity_timeout_millis">180000</integer> <java-symbol type="integer" name="config_satellite_nb_iot_inactivity_timeout_millis" /> + <!-- The time duration in millis needed to switch the modem image from TN to NTN. --> + <integer name="config_satellite_modem_image_switching_duration_millis">20000</integer> + <java-symbol type="integer" name="config_satellite_modem_image_switching_duration_millis" /> + + <!-- The time duration in millis after which Telephony will abort the datagram sending requests. + Telephony starts a timer when receiving a datagram sending request in either OFF, IDLE, or + NOT_CONNECTED state. In NOT_CONNECTED, the duration of the timer is given by this config. + In OFF or IDLE state, the duration of the timer is the sum of this config and the + config_satellite_modem_image_switching_duration_millis. + --> + <integer name="config_datagram_wait_for_connected_state_timeout_millis">60000</integer> + <java-symbol type="integer" name="config_datagram_wait_for_connected_state_timeout_millis" /> + + <!-- The time duration in millis after which Telephony will stop waiting for the response of the + satellite enable request from modem, and send failure response to the client that has + requested Telephony to enable satellite. + --> + <integer name="config_wait_for_satellite_enabling_response_timeout_millis">180000</integer> + <java-symbol type="integer" name="config_wait_for_satellite_enabling_response_timeout_millis" /> + + <!-- The time duration in millis after which Telephony will abort the datagram sending requests + and send failure response to the client that has requested sending the datagrams. Telephony + starts a timer after pushing down the datagram sending request to modem. Before expiry, the + timer will be stopped when Telephony receives the response for the sending request from + modem. + --> + <integer name="config_wait_for_datagram_sending_response_timeout_millis">180000</integer> + <java-symbol type="integer" name="config_wait_for_datagram_sending_response_timeout_millis" /> + <!-- The timeout duration in milliseconds to determine whether to recommend Dialer to show the emergency messaging option to users. @@ -183,6 +225,11 @@ <integer name="config_emergency_call_wait_for_connection_timeout_millis">20000</integer> <java-symbol type="integer" name="config_emergency_call_wait_for_connection_timeout_millis" /> + <!-- Indicates the data limit in bytes that can be used for bootstrap sim until factory reset. + -1 means unlimited. --> + <integer name="config_esim_bootstrap_data_limit_bytes">-1</integer> + <java-symbol type="integer" name="config_esim_bootstrap_data_limit_bytes" /> + <!-- Telephony config for the PLMNs of all satellite providers. This is used by satellite modem to identify providers that should be ignored if the carrier config carrier_supported_satellite_services_per_provider_bundle does not support them. diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 0acccee998a8..291a5936330a 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -65,7 +65,7 @@ <!-- Width of the navigation bar when it is placed vertically on the screen --> <dimen name="navigation_bar_width">48dp</dimen> <!-- Height of the bottom taskbar not including decorations like rounded corners. --> - <dimen name="taskbar_frame_height">60dp</dimen> + <dimen name="taskbar_frame_height">56dp</dimen> <!-- How much we expand the touchable region of the status bar below the notch to catch touches that just start below the notch. --> <dimen name="display_cutout_touchable_region_size">12dp</dimen> diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml index 972fe7ed91de..fa15c3fa4cff 100644 --- a/core/res/res/values/dimens_material.xml +++ b/core/res/res/values/dimens_material.xml @@ -204,4 +204,11 @@ <dimen name="progress_bar_size_small">16dip</dimen> <dimen name="progress_bar_size_medium">48dp</dimen> <dimen name="progress_bar_size_large">76dp</dimen> + + <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes--> + <dimen name="system_corner_radius_xsmall">4dp</dimen> + <dimen name="system_corner_radius_small">8dp</dimen> + <dimen name="system_corner_radius_medium">16dp</dimen> + <dimen name="system_corner_radius_large">26dp</dimen> + <dimen name="system_corner_radius_xlarge">36dp</dimen> </resources> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 0a6779a9bd8b..dcb6bb0cd743 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -153,6 +153,12 @@ <public name="requireContentUriPermissionFromCaller" /> <!-- @FlaggedApi("android.view.inputmethod.ime_switcher_revamp") --> <public name="languageSettingsActivity"/> + <!-- @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") --> + <public name="useLocalePreferredLineHeightForMinimum"/> + <!-- @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") --> + <public name="contentSensitivity" /> + <!-- @FlaggedApi("android.view.inputmethod.connectionless_handwriting") --> + <public name="supportsConnectionlessStylusHandwriting" /> </staging-public-group> <staging-public-group type="id" first-id="0x01bc0000"> @@ -169,9 +175,31 @@ </staging-public-group> <staging-public-group type="dimen" first-id="0x01b90000"> + <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes--> + <public name="system_corner_radius_xsmall" /> + <public name="system_corner_radius_small" /> + <public name="system_corner_radius_medium" /> + <public name="system_corner_radius_large" /> + <public name="system_corner_radius_xlarge" /> </staging-public-group> <staging-public-group type="color" first-id="0x01b80000"> + <public name="system_surface_disabled"/> + <public name="system_on_surface_disabled"/> + <public name="system_outline_disabled"/> + <public name="system_error_0"/> + <public name="system_error_10"/> + <public name="system_error_50"/> + <public name="system_error_100"/> + <public name="system_error_200"/> + <public name="system_error_300"/> + <public name="system_error_400"/> + <public name="system_error_500"/> + <public name="system_error_600"/> + <public name="system_error_700"/> + <public name="system_error_800"/> + <public name="system_error_900"/> + <public name="system_error_1000"/> </staging-public-group> <staging-public-group type="array" first-id="0x01b70000"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 3df7570c818e..7c290b1ba3e1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2154,6 +2154,8 @@ <java-symbol type="string" name="config_systemImageEditor" /> <java-symbol type="string" name="config_datause_iface" /> <java-symbol type="string" name="config_activityRecognitionHardwarePackageName" /> + <java-symbol type="string" name="config_extensionFallbackPackageName" /> + <java-symbol type="string" name="config_extensionFallbackServiceName" /> <java-symbol type="string" name="config_fusedLocationProviderPackageName" /> <java-symbol type="string" name="config_gnssLocationProviderPackageName" /> <java-symbol type="string" name="config_geocoderProviderPackageName" /> @@ -5242,6 +5244,7 @@ <java-symbol name="materialColorPrimary" type="attr"/> <java-symbol name="materialColorSecondary" type="attr"/> <java-symbol name="materialColorTertiary" type="attr"/> + <java-symbol name="materialColorError" type="attr"/> <java-symbol type="attr" name="actionModeUndoDrawable" /> <java-symbol type="attr" name="actionModeRedoDrawable" /> @@ -5353,4 +5356,11 @@ <java-symbol type="drawable" name="ic_satellite_alt_24px" /> <java-symbol type="bool" name="config_watchlistUseFileHashesCache" /> + + <!-- System corner radius baseline sizes. Used by Material styling of rounded corner shapes--> + <java-symbol type="dimen" name="system_corner_radius_xsmall" /> + <java-symbol type="dimen" name="system_corner_radius_small" /> + <java-symbol type="dimen" name="system_corner_radius_medium" /> + <java-symbol type="dimen" name="system_corner_radius_large" /> + <java-symbol type="dimen" name="system_corner_radius_xlarge" /> </resources> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 84f1d6e3071a..ee191449ac35 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -283,6 +283,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" /> @@ -378,6 +379,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar. This theme @@ -472,6 +474,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar and @@ -568,6 +571,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} that has no title bar and translucent @@ -663,6 +667,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for dialog windows and activities. This changes the window to be @@ -766,6 +771,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a @@ -860,6 +866,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar --> @@ -953,6 +960,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog_NoActionBar} that has a nice minimum width @@ -1047,6 +1055,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. --> @@ -1157,6 +1166,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for a window without an action bar that will be displayed either @@ -1252,6 +1262,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for a presentation window on a secondary display. --> @@ -1345,6 +1356,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for panel windows. This removes all extraneous window @@ -1440,6 +1452,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear @@ -1534,6 +1547,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear @@ -1628,6 +1642,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- DeviceDefault style for input methods, which is used by the @@ -1722,6 +1737,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault style for input methods, which is used by the @@ -1816,6 +1832,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> @@ -1910,6 +1927,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Theme for the dialog shown when an app crashes or ANRs. --> @@ -2009,6 +2027,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame"> @@ -2101,6 +2120,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with a light-colored style --> @@ -2331,6 +2351,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an @@ -2425,6 +2446,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar --> @@ -2518,6 +2540,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar. @@ -2612,6 +2635,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar @@ -2708,6 +2732,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent @@ -2803,6 +2828,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be @@ -2904,6 +2930,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a @@ -3001,6 +3028,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar --> @@ -3097,6 +3125,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum @@ -3194,6 +3223,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. --> @@ -3272,6 +3302,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. --> @@ -3350,6 +3381,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller @@ -3447,6 +3479,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault light theme for a window without an action bar that will be displayed either @@ -3545,6 +3578,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault light theme for a presentation window on a secondary display. --> @@ -3641,6 +3675,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault light theme for panel windows. This removes all extraneous window @@ -3736,6 +3771,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.Alert"> @@ -3830,6 +3866,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="Theme.DeviceDefault.Light.Dialog.Alert" /> @@ -3924,6 +3961,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice"> @@ -4016,6 +4054,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- DeviceDefault theme for a window that should look like the Settings app. --> @@ -4116,6 +4155,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.SystemUI" parent="Theme.DeviceDefault.Light"> @@ -4197,6 +4237,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Light.Dialog"> @@ -4270,6 +4311,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar --> @@ -4364,6 +4406,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.Light.BaseDialog"> @@ -4442,6 +4485,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.DeviceDefault.Settings.DialogBase"> @@ -4560,6 +4604,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.Alert"> @@ -4656,6 +4701,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="Theme.DeviceDefault.Light.Dialog.NoActionBar" /> @@ -4778,6 +4824,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="ThemeOverlay.DeviceDefault.Accent.Light"> @@ -4830,6 +4877,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <!-- Theme overlay that replaces colorAccent with the colorAccent from {@link #Theme_DeviceDefault_DayNight}. --> @@ -4886,6 +4934,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" parent="Theme.DeviceDefault.NoActionBar.Fullscreen"> @@ -4938,6 +4987,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> + <item name="materialColorError">@color/system_error_light</item> </style> <style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification"> @@ -5001,6 +5051,7 @@ easier. <item name="materialColorPrimary">@color/system_primary_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> + <item name="materialColorError">@color/system_error_dark</item> </style> <style name="Theme.DeviceDefault.AutofillHalfScreenDialogList" parent="Theme.DeviceDefault.DayNight"> <item name="colorListDivider">@color/list_divider_opacity_device_default_light</item> diff --git a/core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java b/core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java index 5aace81696cf..e4cf7ac7e7cd 100644 --- a/core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java +++ b/core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java @@ -286,7 +286,7 @@ public final class TunerAdapterTest { int scanStatus = mRadioTuner.scan(RadioTuner.DIRECTION_DOWN, /* skipSubChannel= */ false); verify(mTunerMock).seek(/* directionDown= */ true, /* skipSubChannel= */ false); - assertWithMessage("Status for scaning") + assertWithMessage("Status for scanning") .that(scanStatus).isEqualTo(RadioManager.STATUS_OK); verify(mCallbackMock, timeout(CALLBACK_TIMEOUT_MS)).onProgramInfoChanged(FM_PROGRAM_INFO); } diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java index 0806fa0b9879..db95d7af5d52 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java @@ -99,7 +99,7 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn } } - public int getSoftApInterations() { + public int getSoftApIterations() { return mSoftApIterations; } diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index ee1a4acb3839..861f71992f54 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -217,6 +217,7 @@ android_ravenwood_test { "src/android/os/**/*.java", "src/android/telephony/PinResultTest.java", "src/android/util/**/*.java", + "src/android/view/DisplayTest.java", "src/android/view/DisplayInfoTest.java", "src/com/android/internal/logging/**/*.java", "src/com/android/internal/os/**/*.java", diff --git a/core/tests/coretests/src/android/os/BluetoothBatteryStatsTest.java b/core/tests/coretests/src/android/os/BluetoothBatteryStatsTest.java new file mode 100644 index 000000000000..e12ca24acb85 --- /dev/null +++ b/core/tests/coretests/src/android/os/BluetoothBatteryStatsTest.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +import static com.google.common.truth.Truth.assertThat; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.List; + +@RunWith(AndroidJUnit4.class) +public class BluetoothBatteryStatsTest { + + @Test + public void parcelability() { + BluetoothBatteryStats stats = new BluetoothBatteryStats(List.of( + new BluetoothBatteryStats.UidStats(42, 100, 200, 300, 400, 500), + new BluetoothBatteryStats.UidStats(99, 600, 700, 800, 900, 999) + )); + + Parcel parcel = Parcel.obtain(); + stats.writeToParcel(parcel, 0); + byte[] bytes = parcel.marshall(); + parcel.recycle(); + + parcel = Parcel.obtain(); + parcel.unmarshall(bytes, 0, bytes.length); + parcel.setDataPosition(0); + + BluetoothBatteryStats actual = new BluetoothBatteryStats(parcel); + + assertThat(actual.getUidStats()).hasSize(2); + + BluetoothBatteryStats.UidStats uid1 = actual.getUidStats().stream() + .filter(s->s.uid == 42).findFirst().get(); + + assertThat(uid1.scanTimeMs).isEqualTo(100); + assertThat(uid1.unoptimizedScanTimeMs).isEqualTo(200); + assertThat(uid1.scanResultCount).isEqualTo(300); + assertThat(uid1.rxTimeMs).isEqualTo(400); + assertThat(uid1.txTimeMs).isEqualTo(500); + + BluetoothBatteryStats.UidStats uid2 = actual.getUidStats().stream() + .filter(s->s.uid == 99).findFirst().get(); + assertThat(uid2.scanTimeMs).isEqualTo(600); + } +} diff --git a/core/tests/coretests/src/android/os/WakeLockStatsTest.java b/core/tests/coretests/src/android/os/WakeLockStatsTest.java new file mode 100644 index 000000000000..2675ba07d2f7 --- /dev/null +++ b/core/tests/coretests/src/android/os/WakeLockStatsTest.java @@ -0,0 +1,58 @@ +/* + * 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.os; + +import static com.google.common.truth.Truth.assertThat; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.List; + +@RunWith(AndroidJUnit4.class) +public class WakeLockStatsTest { + + @Test + public void parcelablity() { + WakeLockStats wakeLockStats = new WakeLockStats( + List.of(new WakeLockStats.WakeLock(1, "foo", 200, 3000, 40000), + new WakeLockStats.WakeLock(2, "bar", 500, 6000, 70000))); + + Parcel parcel = Parcel.obtain(); + wakeLockStats.writeToParcel(parcel, 0); + byte[] bytes = parcel.marshall(); + parcel.recycle(); + + parcel = Parcel.obtain(); + parcel.unmarshall(bytes, 0, bytes.length); + parcel.setDataPosition(0); + + WakeLockStats actual = WakeLockStats.CREATOR.createFromParcel(parcel); + assertThat(actual.getWakeLocks()).hasSize(2); + WakeLockStats.WakeLock wl1 = actual.getWakeLocks().get(0); + assertThat(wl1.uid).isEqualTo(1); + assertThat(wl1.name).isEqualTo("foo"); + assertThat(wl1.timesAcquired).isEqualTo(200); + assertThat(wl1.totalTimeHeldMs).isEqualTo(3000); + assertThat(wl1.timeHeldMs).isEqualTo(40000); + + WakeLockStats.WakeLock wl2 = actual.getWakeLocks().get(1); + assertThat(wl2.uid).isEqualTo(2); + } +} diff --git a/core/tests/coretests/src/android/view/DisplayTest.java b/core/tests/coretests/src/android/view/DisplayTest.java new file mode 100644 index 000000000000..4d2a1c45e6da --- /dev/null +++ b/core/tests/coretests/src/android/view/DisplayTest.java @@ -0,0 +1,98 @@ +/* + * 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.view; + +import static com.google.common.truth.Truth.assertWithMessage; + +import android.util.DebugUtils; + +import androidx.test.filters.SmallTest; + +import com.android.internal.util.ArrayUtils; + +import org.junit.Test; + +import java.util.function.IntFunction; + +@SmallTest +public class DisplayTest { + private static final int[] DISPLAY_STATES = { + Display.STATE_UNKNOWN, + Display.STATE_OFF, + Display.STATE_ON, + Display.STATE_DOZE, + Display.STATE_DOZE_SUSPEND, + Display.STATE_VR, + Display.STATE_ON_SUSPEND + }; + + @Test + public void isSuspendedState() { + assertOnlyTrueForStates( + Display::isSuspendedState, + Display.STATE_OFF, + Display.STATE_DOZE_SUSPEND, + Display.STATE_ON_SUSPEND + ); + } + + @Test + public void isDozeState() { + assertOnlyTrueForStates( + Display::isDozeState, + Display.STATE_DOZE, + Display.STATE_DOZE_SUSPEND + ); + } + + @Test + public void isActiveState() { + assertOnlyTrueForStates( + Display::isActiveState, + Display.STATE_ON, + Display.STATE_VR + ); + } + + @Test + public void isOffState() { + assertOnlyTrueForStates( + Display::isOffState, + Display.STATE_OFF + ); + } + + @Test + public void isOnState() { + assertOnlyTrueForStates( + Display::isOnState, + Display.STATE_ON, + Display.STATE_VR, + Display.STATE_ON_SUSPEND + ); + } + + private void assertOnlyTrueForStates(IntFunction<Boolean> function, int... trueStates) { + for (int state : DISPLAY_STATES) { + boolean actual = function.apply(state); + boolean expected = ArrayUtils.contains(trueStates, state); + assertWithMessage("Unexpected return for Display.STATE_" + + DebugUtils.constantToString(Display.class, "STATE_", state)) + .that(actual).isEqualTo(expected); + } + } +} diff --git a/core/tests/coretests/src/android/view/InsetsSourceTest.java b/core/tests/coretests/src/android/view/InsetsSourceTest.java index e1bcd4a0727b..936f4d7d5152 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceTest.java @@ -279,5 +279,204 @@ public class InsetsSourceTest { } } + @Test + public void testCalculateBoundingRects_noBoundingRects_createsSingleRect() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(null); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 1000, 1000), false); + + assertEquals(1, rects.length); + assertEquals(new Rect(0, 0, 1000, 100), rects[0]); + } + + @Test + public void testCalculateBoundingRects_noBoundingRectsAndLargerFrame_singleRectFitsRelFrame() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(null); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 500, 1000), false); + + assertEquals(1, rects.length); + assertEquals(new Rect(0, 0, 500, 100), rects[0]); + } + + @Test + public void testCalculateBoundingRects_frameAtOrigin_resultRelativeToRelFrame() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 300, 100), + new Rect(800, 0, 1000, 100), + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 1000, 1000), false); + + assertEquals(2, rects.length); + assertEquals(new Rect(0, 0, 300, 100), rects[0]); + assertEquals(new Rect(800, 0, 1000, 100), rects[1]); + } + + @Test + public void testCalculateBoundingRects_notAtOrigin_resultRelativeToRelFrame() { + mSource.setFrame(new Rect(100, 100, 1100, 200)); + mSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 300, 100), // 300x100, aligned left + new Rect(800, 0, 1000, 100), // 200x100, aligned right + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(100, 100, 1100, 1100), false); + + assertEquals(2, rects.length); + assertEquals(new Rect(0, 0, 300, 100), rects[0]); + assertEquals(new Rect(800, 0, 1000, 100), rects[1]); + } + + @Test + public void testCalculateBoundingRects_boundingRectFullyInsideFrameInWindow() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(100, 0, 400, 100), // Inside |frame| and |relativeFrame|. + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 500, 100), false); + + assertEquals(1, rects.length); + assertEquals(new Rect(100, 0, 400, 100), rects[0]); + } + + @Test + public void testCalculateBoundingRects_boundingRectOutsideFrameInWindow_dropped() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(700, 0, 1000, 100), // Inside |frame|, but outside |relativeFrame|. + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 500, 100), false); + + assertEquals(0, rects.length); + } + + @Test + public void testCalculateBoundingRects_boundingRectPartlyOutsideFrameInWindow_cropped() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(400, 0, 600, 100), // Inside |frame|, and only half inside |relativeFrame|. + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 500, 100), false); + + assertEquals(1, rects.length); + assertEquals(new Rect(400, 0, 500, 100), rects[0]); + } + + @Test + public void testCalculateBoundingRects_framesNotAtOrigin_resultRelativeToWindowFrame() { + mSource.setFrame(new Rect(100, 100, 1100, 200)); + mSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 300, 100), // 300x100 aligned to left. + new Rect(800, 0, 1000, 100) // 200x100 align to right. + }); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(100, 100, 1100, 1100), false); + + assertEquals(2, rects.length); + assertEquals(new Rect(0, 0, 300, 100), rects[0]); + assertEquals(new Rect(800, 0, 1000, 100), rects[1]); + } + + @Test + public void testCalculateBoundingRects_captionBar() { + mCaptionSource.setFrame(new Rect(0, 0, 1000, 100)); + mCaptionSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 200, 100), // 200x100, aligned left. + new Rect(800, 0, 1000, 100) // 200x100, aligned right. + }); + + final Rect[] rects = mCaptionSource.calculateBoundingRects( + new Rect(0, 0, 1000, 1000), false); + + assertEquals(2, rects.length); + assertEquals(new Rect(0, 0, 200, 100), rects[0]); + assertEquals(new Rect(800, 0, 1000, 100), rects[1]); + } + + @Test + public void testCalculateBoundingRects_captionBarFrameMisaligned_rectsFixedToTop() { + mCaptionSource.setFrame(new Rect(500, 500, 1500, 600)); + mCaptionSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 100, 100), // 100x100, aligned to left/top of frame + }); + + final Rect[] rects = mCaptionSource.calculateBoundingRects( + new Rect(495, 495, 1500, 1500), false); + + assertEquals(1, rects.length); + // rect should be aligned to the top of relative frame, as if the caption frame had been + // corrected to be aligned at the top. + assertEquals(new Rect(0, 0, 100, 100), rects[0]); + } + + @Test + public void testCalculateBoundingRects_imeCaptionBarFrameMisaligned_rectsFixedToBottom() { + mImeCaptionSource.setFrame(new Rect(500, 1400, 1500, 1500)); + mImeCaptionSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 100, 100), // 100x100, aligned to left/top of frame + }); + + final Rect[] rects = mImeCaptionSource.calculateBoundingRects( + new Rect(495, 495, 1500, 1500), false); + + assertEquals(1, rects.length); + // rect should be aligned to the bottom of relative frame, as if the ime caption frame had + // been corrected to be aligned at the top. + assertEquals(new Rect(0, 905, 100, 1005), rects[0]); + } + + @Test + public void testCalculateBoundingRects_imeCaptionBar() { + mImeCaptionSource.setFrame(new Rect(0, 900, 1000, 1000)); // Frame at the bottom. + mImeCaptionSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 200, 100), // 200x100, aligned left. + }); + + final Rect[] rects = mImeCaptionSource.calculateBoundingRects( + new Rect(0, 0, 1000, 1000), false); + + assertEquals(1, rects.length); + assertEquals(new Rect(0, 900, 200, 1000), rects[0]); + } + + @Test + public void testCalculateBoundingRects_invisible() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 300, 100), + new Rect(800, 0, 1000, 100), + }); + mSource.setVisible(false); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 1000, 1000), + false /* ignoreVisibility */); + + assertEquals(0, rects.length); + } + + @Test + public void testCalculateBoundingRects_ignoreVisibility() { + mSource.setFrame(new Rect(0, 0, 1000, 100)); + mSource.setBoundingRects(new Rect[]{ + new Rect(0, 0, 300, 100), + new Rect(800, 0, 1000, 100), + }); + mSource.setVisible(false); + + final Rect[] rects = mSource.calculateBoundingRects(new Rect(0, 0, 1000, 1000), + true /* ignoreVisibility */); + + assertEquals(2, rects.length); + assertEquals(new Rect(0, 0, 300, 100), rects[0]); + assertEquals(new Rect(800, 0, 1000, 100), rects[1]); + } + // Parcel and equals already tested via InsetsStateTest } diff --git a/core/tests/coretests/src/android/view/InsetsStateTest.java b/core/tests/coretests/src/android/view/InsetsStateTest.java index 672875a19f9f..16bd20a42b2a 100644 --- a/core/tests/coretests/src/android/view/InsetsStateTest.java +++ b/core/tests/coretests/src/android/view/InsetsStateTest.java @@ -63,6 +63,8 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.List; + /** * Tests for {@link InsetsState}. * @@ -88,6 +90,8 @@ public class InsetsStateTest { null /* owner */, 1 /* index */, navigationBars()); private static final int ID_BOTTOM_GESTURES = InsetsSource.createId( null /* owner */, 0 /* index */, systemGestures()); + private static final int ID_EXTRA_CAPTION_BAR = InsetsSource.createId( + null /* owner */, 2 /* index */, captionBar()); private final InsetsState mState = new InsetsState(); private final InsetsState mState2 = new InsetsState(); @@ -420,9 +424,11 @@ public class InsetsStateTest { public void testEquals_visibility() { mState.getOrCreateSource(ID_IME, ime()) .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 10, 10) }) .setVisible(true); mState2.getOrCreateSource(ID_IME, ime()) - .setFrame(new Rect(0, 0, 100, 100)); + .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 10, 10) }); assertNotEqualsAndHashCode(); } @@ -441,6 +447,30 @@ public class InsetsStateTest { } @Test + public void testEquals_sameBoundingRects() { + mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 10, 10) }) + .setVisible(true); + mState2.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 10, 10) }); + assertEqualsAndHashCode(); + } + + @Test + public void testEquals_differentBoundingRects() { + mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 10, 10) }) + .setVisible(true); + mState2.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 100, 100)) + .setBoundingRects(new Rect[]{ new Rect(0, 0, 20, 20) }); + assertNotEqualsAndHashCode(); + } + + @Test public void testEquals_samePrivacyIndicator() { Rect one = new Rect(0, 1, 2, 3); Rect two = new Rect(4, 5, 6, 7); @@ -734,4 +764,94 @@ public class InsetsStateTest { assertEquals(1, onIdNotFoundInState2Called[0]); // 1000. assertEquals(1, onFinishCalled[0]); } + + @Test + public void testCalculateBoundingRects() { + mState.getOrCreateSource(ID_STATUS_BAR, statusBars()) + .setFrame(new Rect(0, 0, 1000, 100)) + .setBoundingRects(null) + .setVisible(true); + mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 1000, 100)) + .setBoundingRects(new Rect[]{ + new Rect(0, 0, 200, 100), + new Rect(800, 0, 1000, 100) + }) + .setVisible(true); + SparseIntArray typeSideMap = new SparseIntArray(); + + WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 1000, 1000), null, false, + SOFT_INPUT_ADJUST_RESIZE, 0, 0, TYPE_APPLICATION, ACTIVITY_TYPE_UNDEFINED, + typeSideMap); + + assertEquals( + List.of(new Rect(0, 0, 1000, 100)), + insets.getBoundingRects(Type.statusBars()) + ); + assertEquals( + List.of( + new Rect(0, 0, 200, 100), + new Rect(800, 0, 1000, 100) + ), + insets.getBoundingRects(Type.captionBar()) + ); + } + + @Test + public void testCalculateBoundingRects_multipleSourcesOfSameType_concatenated() { + mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 1000, 100)) + .setBoundingRects(new Rect[]{new Rect(0, 0, 200, 100)}) + .setVisible(true); + mState.getOrCreateSource(ID_EXTRA_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 1000, 100)) + .setBoundingRects(new Rect[]{new Rect(800, 0, 1000, 100)}) + .setVisible(true); + SparseIntArray typeSideMap = new SparseIntArray(); + + WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 1000, 1000), null, false, + SOFT_INPUT_ADJUST_RESIZE, 0, 0, TYPE_APPLICATION, ACTIVITY_TYPE_UNDEFINED, + typeSideMap); + + final List<Rect> expected = List.of( + new Rect(0, 0, 200, 100), + new Rect(800, 0, 1000, 100) + ); + final List<Rect> actual = insets.getBoundingRects(captionBar()); + assertEquals(expected.size(), actual.size()); + + // Order does not matter. + assertTrue(actual.containsAll(expected)); + } + + @Test + public void testCalculateBoundingRects_captionBar_reportedAsSysGesturesAndTappableElement() { + mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) + .setFrame(new Rect(0, 0, 1000, 100)) + .setBoundingRects(new Rect[]{new Rect(0, 0, 200, 100)}) + .setVisible(true); + SparseIntArray typeSideMap = new SparseIntArray(); + + WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 1000, 1000), null, false, + SOFT_INPUT_ADJUST_RESIZE, 0, 0, TYPE_APPLICATION, ACTIVITY_TYPE_UNDEFINED, + typeSideMap); + + assertEquals( + List.of(new Rect(0, 0, 200, 100)), + insets.getBoundingRects(Type.captionBar()) + ); + assertEquals( + List.of(new Rect(0, 0, 200, 100)), + insets.getBoundingRects(Type.systemGestures()) + ); + assertEquals( + List.of(new Rect(0, 0, 200, 100)), + insets.getBoundingRects(Type.mandatorySystemGestures()) + ); + assertEquals( + List.of(new Rect(0, 0, 200, 100)), + insets.getBoundingRects(Type.tappableElement()) + ); + + } } diff --git a/core/tests/coretests/src/android/view/WindowInsetsTest.java b/core/tests/coretests/src/android/view/WindowInsetsTest.java index 69abf5f3204f..ab4543cb8001 100644 --- a/core/tests/coretests/src/android/view/WindowInsetsTest.java +++ b/core/tests/coretests/src/android/view/WindowInsetsTest.java @@ -41,14 +41,14 @@ public class WindowInsetsTest { public void systemWindowInsets_afterConsuming_isConsumed() { assertTrue(new WindowInsets(WindowInsets.createCompatTypeMap(new Rect(1, 2, 3, 4)), null, null, false, 0, 0, null, null, null, null, - WindowInsets.Type.systemBars(), false) + WindowInsets.Type.systemBars(), false, null, null, 0, 0) .consumeSystemWindowInsets().isConsumed()); } @Test public void multiNullConstructor_isConsumed() { assertTrue(new WindowInsets(null, null, null, false, 0, 0, null, null, null, null, - WindowInsets.Type.systemBars(), false).isConsumed()); + WindowInsets.Type.systemBars(), false, null, null, 0, 0).isConsumed()); } @Test @@ -65,7 +65,7 @@ public class WindowInsetsTest { WindowInsets.assignCompatInsets(insets, new Rect(0, 0, 0, 0)); WindowInsets windowInsets = new WindowInsets(insets, maxInsets, visible, false, 0, 0, null, null, null, DisplayShape.NONE, systemBars(), - true /* compatIgnoreVisibility */); + true /* compatIgnoreVisibility */, null, null, 0, 0); assertEquals(Insets.of(0, 10, 0, 0), windowInsets.getSystemWindowInsets()); } } diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java index 610b8aedc983..0b0fd66f0744 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java @@ -19,10 +19,12 @@ package android.view.accessibility; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.IAccessibilityServiceConnection; +import android.accessibilityservice.IBrailleDisplayController; import android.accessibilityservice.MagnificationConfig; import android.annotation.NonNull; import android.content.pm.ParceledListSlice; import android.graphics.Region; +import android.hardware.usb.UsbDevice; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteCallback; @@ -237,4 +239,15 @@ public class AccessibilityServiceConnectionImpl extends IAccessibilityServiceCon int accessibilityWindowId, SurfaceControl sc, IAccessibilityInteractionConnectionCallback callback) {} + + @Override + public void connectBluetoothBrailleDisplay(String bluetoothAddress, + IBrailleDisplayController controller) {} + + @Override + public void connectUsbBrailleDisplay(UsbDevice usbDevice, + IBrailleDisplayController controller) {} + + @Override + public void setTestBrailleDisplayData(List<Bundle> brailleDisplays) {} } diff --git a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java index f39bddd7f032..51eb41c5a271 100644 --- a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java +++ b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java @@ -20,10 +20,12 @@ import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_HOVER_MOVE; import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; +import static android.view.inputmethod.Flags.initiationWithoutInputConnection; import static android.view.stylus.HandwritingTestUtil.createView; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assume.assumeFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; @@ -91,6 +93,7 @@ public class HandwritingInitiatorTest { private EditText mTestView1; private EditText mTestView2; private Context mContext; + private boolean mInitiateWithoutConnection; @Before public void setup() throws Exception { @@ -119,6 +122,7 @@ public class HandwritingInitiatorTest { mHandwritingInitiator.updateHandwritingAreasForView(mTestView1); mHandwritingInitiator.updateHandwritingAreasForView(mTestView2); doReturn(true).when(mHandwritingInitiator).tryAcceptStylusHandwritingDelegation(any()); + mInitiateWithoutConnection = initiationWithoutInputConnection(); } @Test @@ -194,7 +198,9 @@ public class HandwritingInitiatorTest { mTestView1.setText("hello"); when(mTestView1.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(4); - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + if (!mInitiateWithoutConnection) { + mHandwritingInitiator.onInputConnectionCreated(mTestView1); + } final int x1 = sHwArea1.left - HW_BOUNDS_OFFSETS_LEFT_PX / 2; final int y1 = sHwArea1.top - HW_BOUNDS_OFFSETS_TOP_PX / 2; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -214,7 +220,7 @@ public class HandwritingInitiatorTest { } @Test - public void onTouchEvent_startHandwriting_inputConnectionBuiltAfterStylusMove() { + public void onTouchEvent_startHandwriting_servedViewUpdateAfterStylusMove() { final int x1 = (sHwArea1.left + sHwArea1.right) / 2; final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -225,14 +231,19 @@ public class HandwritingInitiatorTest { MotionEvent stylusEvent2 = createStylusEvent(ACTION_MOVE, x2, y2, 0); mHandwritingInitiator.onTouchEvent(stylusEvent2); - // InputConnection is created after stylus movement. - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + if (mInitiateWithoutConnection) { + // Focus is changed after stylus movement. + mHandwritingInitiator.updateFocusedView(mTestView1, /*fromTouchEvent*/ true); + } else { + // InputConnection is created after stylus movement. + mHandwritingInitiator.onInputConnectionCreated(mTestView1); + } verify(mHandwritingInitiator, times(1)).startHandwriting(mTestView1); } @Test - public void onTouchEvent_startHandwriting_inputConnectionBuilt_stylusMoveInExtendedHWArea() { + public void onTouchEvent_startHandwriting_servedViewUpdate_stylusMoveInExtendedHWArea() { mTestView1.setText("hello"); when(mTestView1.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(4); // The stylus down point is between mTestView1 and mTestView2, but it is within the @@ -247,21 +258,35 @@ public class HandwritingInitiatorTest { MotionEvent stylusEvent2 = createStylusEvent(ACTION_MOVE, x2, y2, 0); mHandwritingInitiator.onTouchEvent(stylusEvent2); - // First create InputConnection for mTestView2 and verify that handwriting is not started. - mHandwritingInitiator.onInputConnectionCreated(mTestView2); - verify(mHandwritingInitiator, never()).startHandwriting(mTestView2); + if (!mInitiateWithoutConnection) { + // First create InputConnection for mTestView2 and verify that handwriting is not + // started. + mHandwritingInitiator.onInputConnectionCreated(mTestView2); + } - // Next create InputConnection for mTextView1. Handwriting is started for this view since - // the stylus down point is closest to this view. - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + // Note: mTestView2 receives focus when initiationWithoutInputConnection() is enabled. + // verify that handwriting is not started. + verify(mHandwritingInitiator, never()).startHandwriting(mTestView2); + if (mInitiateWithoutConnection) { + // Focus is changed after stylus movement. + mHandwritingInitiator.updateFocusedView(mTestView1, /*fromTouchEvent*/ true); + } else { + // Next create InputConnection for mTextView1. Handwriting is started for this view + // since the stylus down point is closest to this view. + mHandwritingInitiator.onInputConnectionCreated(mTestView1); + } + // Handwriting is started for this view since the stylus down point is closest to this + // view. verify(mHandwritingInitiator).startHandwriting(mTestView1); // Since the stylus down point was outside the TextView's bounds, the handwriting initiator // sets the cursor position. verify(mTestView1).setSelection(4); } + @Test public void onTouchEvent_tryAcceptDelegation_delegatorCallbackCreatesInputConnection() { + assumeFalse(mInitiateWithoutConnection); View delegateView = new EditText(mContext); delegateView.setIsHandwritingDelegate(true); @@ -281,6 +306,7 @@ public class HandwritingInitiatorTest { verify(mHandwritingInitiator, times(1)).tryAcceptStylusHandwritingDelegation(delegateView); } + @Test public void onTouchEvent_tryAcceptDelegation_delegatorCallbackFocusesDelegate() { View delegateView = new EditText(mContext); @@ -288,8 +314,14 @@ public class HandwritingInitiatorTest { mHandwritingInitiator.onInputConnectionCreated(delegateView); reset(mHandwritingInitiator); - mTestView1.setHandwritingDelegatorCallback( - () -> mHandwritingInitiator.onDelegateViewFocused(delegateView)); + if (mInitiateWithoutConnection) { + mTestView1.setHandwritingDelegatorCallback( + () -> mHandwritingInitiator.updateFocusedView( + delegateView, /*fromTouchEvent*/ false)); + } else { + mTestView1.setHandwritingDelegatorCallback( + () -> mHandwritingInitiator.onDelegateViewFocused(delegateView)); + } final int x1 = (sHwArea1.left + sHwArea1.right) / 2; final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2; @@ -339,6 +371,14 @@ public class HandwritingInitiatorTest { assertThat(onTouchEventResult4).isTrue(); } + private void callOnInputConnectionOrUpdateViewFocus(View view) { + if (mInitiateWithoutConnection) { + mHandwritingInitiator.updateFocusedView(view, /*fromTouchEvent*/ true); + } else { + mHandwritingInitiator.onInputConnectionCreated(view); + } + } + @Test public void onTouchEvent_notStartHandwriting_whenHandwritingNotAvailable() { final Rect rect = new Rect(600, 600, 900, 900); @@ -346,7 +386,7 @@ public class HandwritingInitiatorTest { false /* isStylusHandwritingAvailable */); mHandwritingInitiator.updateHandwritingAreasForView(testView); - mHandwritingInitiator.onInputConnectionCreated(testView); + callOnInputConnectionOrUpdateViewFocus(testView); final int x1 = (rect.left + rect.right) / 2; final int y1 = (rect.top + rect.bottom) / 2; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -365,7 +405,7 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_notStartHandwriting_when_stylusTap_withinHWArea() { - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + callOnInputConnectionOrUpdateViewFocus(mTestView1); final int x1 = 200; final int y1 = 200; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -381,7 +421,7 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_notStartHandwriting_when_stylusMove_outOfHWArea() { - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + callOnInputConnectionOrUpdateViewFocus(mTestView1); final int x1 = 10; final int y1 = 10; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -397,7 +437,7 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_notStartHandwriting_when_stylusMove_afterTimeOut() { - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + callOnInputConnectionOrUpdateViewFocus(mTestView1); final int x1 = 10; final int y1 = 10; final long time1 = 10L; @@ -433,8 +473,9 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_focusView_inputConnectionAlreadyBuilt_stylusMoveOnce_withinHWArea() { - mHandwritingInitiator.onInputConnectionCreated(mTestView1); - + if (!mInitiateWithoutConnection) { + mHandwritingInitiator.onInputConnectionCreated(mTestView1); + } final int x1 = (sHwArea1.left + sHwArea1.right) / 2; final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -487,14 +528,14 @@ public class HandwritingInitiatorTest { verify(mTestView2, times(1)).requestFocus(); - mHandwritingInitiator.onInputConnectionCreated(mTestView2); + callOnInputConnectionOrUpdateViewFocus(mTestView2); verify(mHandwritingInitiator, times(1)).startHandwriting(mTestView2); } @Test public void onTouchEvent_handwritingAreaOverlapped_focusedViewHasPriority() { // Simulate the case where mTestView1 is focused. - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + callOnInputConnectionOrUpdateViewFocus(mTestView1); // The ACTION_DOWN location is within the handwriting bounds of both mTestView1 and // mTestView2. Although it's closer to mTestView2's handwriting bounds, handwriting is // initiated for mTestView1 because it's focused. @@ -559,9 +600,14 @@ public class HandwritingInitiatorTest { // Set mTextView2 to be the delegate of mTestView1. mTestView2.setIsHandwritingDelegate(true); - mTestView1.setHandwritingDelegatorCallback( - () -> mHandwritingInitiator.onInputConnectionCreated(mTestView2)); - + if (mInitiateWithoutConnection) { + mTestView1.setHandwritingDelegatorCallback( + () -> mHandwritingInitiator.updateFocusedView( + mTestView2, /*fromTouchEvent*/ false)); + } else { + mTestView1.setHandwritingDelegatorCallback( + () -> mHandwritingInitiator.onInputConnectionCreated(mTestView2)); + } injectStylusEvent(mHandwritingInitiator, sHwArea1.centerX(), sHwArea1.centerY(), /* exceedsHWSlop */ true); // Prerequisite check, verify that handwriting started for delegateView. @@ -610,8 +656,13 @@ public class HandwritingInitiatorTest { assertThat(icon1).isNull(); // Simulate that focus is switched to mTestView2 first and then switched back. - mHandwritingInitiator.onInputConnectionCreated(mTestView2); - mHandwritingInitiator.onInputConnectionCreated(mTestView1); + if (mInitiateWithoutConnection) { + mHandwritingInitiator.updateFocusedView(mTestView2, /*fromTouchEvent*/ true); + mHandwritingInitiator.updateFocusedView(mTestView1, /*fromTouchEvent*/ true); + } else { + mHandwritingInitiator.onInputConnectionCreated(mTestView2); + mHandwritingInitiator.onInputConnectionCreated(mTestView1); + } PointerIcon icon2 = mHandwritingInitiator.onResolvePointerIcon(mContext, hoverEvent1); // After the change of focus, hover icon shows again. @@ -620,9 +671,15 @@ public class HandwritingInitiatorTest { @Test public void autoHandwriting_whenDisabled_wontStartHW() { - View mockView = createView(sHwArea1, false /* autoHandwritingEnabled */, - true /* isStylusHandwritingAvailable */); - mHandwritingInitiator.onInputConnectionCreated(mockView); + if (mInitiateWithoutConnection) { + mTestView1.setAutoHandwritingEnabled(false); + mTestView1.setHandwritingDelegatorCallback(null); + mHandwritingInitiator.updateFocusedView(mTestView1, /*fromTouchEvent*/ true); + } else { + View mockView = createView(sHwArea1, false /* autoHandwritingEnabled */, + true /* isStylusHandwritingAvailable */); + mHandwritingInitiator.onInputConnectionCreated(mockView); + } final int x1 = (sHwArea1.left + sHwArea1.right) / 2; final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2; MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0); @@ -639,6 +696,7 @@ public class HandwritingInitiatorTest { @Test public void onInputConnectionCreated() { + assumeFalse(mInitiateWithoutConnection); mHandwritingInitiator.onInputConnectionCreated(mTestView1); assertThat(mHandwritingInitiator.mConnectedView).isNotNull(); assertThat(mHandwritingInitiator.mConnectedView.get()).isEqualTo(mTestView1); @@ -646,6 +704,7 @@ public class HandwritingInitiatorTest { @Test public void onInputConnectionCreated_whenAutoHandwritingIsDisabled() { + assumeFalse(mInitiateWithoutConnection); View view = new View(mContext); view.setAutoHandwritingEnabled(false); assertThat(view.isAutoHandwritingEnabled()).isFalse(); @@ -656,6 +715,7 @@ public class HandwritingInitiatorTest { @Test public void onInputConnectionClosed() { + assumeFalse(mInitiateWithoutConnection); mHandwritingInitiator.onInputConnectionCreated(mTestView1); mHandwritingInitiator.onInputConnectionClosed(mTestView1); @@ -664,6 +724,7 @@ public class HandwritingInitiatorTest { @Test public void onInputConnectionClosed_whenAutoHandwritingIsDisabled() { + assumeFalse(mInitiateWithoutConnection); View view = new View(mContext); view.setAutoHandwritingEnabled(false); mHandwritingInitiator.onInputConnectionCreated(view); @@ -674,6 +735,7 @@ public class HandwritingInitiatorTest { @Test public void onInputConnectionCreated_inputConnectionRestarted() { + assumeFalse(mInitiateWithoutConnection); // When IMM restarts input connection, View#onInputConnectionCreatedInternal might be // called before View#onInputConnectionClosedInternal. As a result, we need to handle the // case where "one view "2 InputConnections". diff --git a/core/tests/coretests/src/com/android/internal/os/BackgroundThreadTest.java b/core/tests/coretests/src/com/android/internal/os/BackgroundThreadTest.java new file mode 100644 index 000000000000..8bdf4c6192ba --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/os/BackgroundThreadTest.java @@ -0,0 +1,60 @@ +/* + * 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.internal.os; + +import static com.google.common.truth.Truth.assertThat; + +import android.os.ConditionVariable; +import android.os.Handler; +import android.os.Looper; +import android.platform.test.ravenwood.RavenwoodRule; + +import org.junit.Rule; +import org.junit.Test; + +import java.util.concurrent.Executor; + +public class BackgroundThreadTest { + + @Rule + public final RavenwoodRule mRavenwood = + new RavenwoodRule.Builder().setProvideMainThread(true).build(); + + @Test + public void test_get() { + BackgroundThread thread = BackgroundThread.get(); + assertThat(thread.getLooper()).isNotEqualTo(Looper.getMainLooper()); + } + + @Test + public void test_getHandler() { + Handler handler = BackgroundThread.getHandler(); + ConditionVariable done = new ConditionVariable(); + handler.post(done::open); + boolean success = done.block(5000); + assertThat(success).isTrue(); + } + + @Test + public void test_getExecutor() { + Executor executor = BackgroundThread.getExecutor(); + ConditionVariable done = new ConditionVariable(); + executor.execute(done::open); + boolean success = done.block(5000); + assertThat(success).isTrue(); + } +} diff --git a/core/tests/coretests/src/com/android/internal/os/LongMultiStateCounterTest.java b/core/tests/coretests/src/com/android/internal/os/LongMultiStateCounterTest.java index e064e7483bfa..78ef92baa441 100644 --- a/core/tests/coretests/src/com/android/internal/os/LongMultiStateCounterTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LongMultiStateCounterTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertThrows; import android.os.BadParcelableException; import android.os.Parcel; -import android.platform.test.annotations.IgnoreUnderRavenwood; import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; @@ -34,7 +33,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest -@IgnoreUnderRavenwood(blockedBy = LongMultiStateCounterTest.class) public class LongMultiStateCounterTest { @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); diff --git a/core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java b/core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java index ae2ef0cb4e51..9c337d788c5c 100644 --- a/core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java @@ -34,7 +34,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.platform.test.annotations.IgnoreUnderRavenwood; import android.platform.test.ravenwood.RavenwoodRule; import android.view.Display; @@ -49,7 +48,6 @@ import java.util.Arrays; * Test class for {@link EnergyConsumerStats}. */ @SmallTest -@IgnoreUnderRavenwood(reason = "Needs kernel support") public class EnergyConsumerStatsTest { @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); diff --git a/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java index 84dd2740e8b7..8d66cfc7a3dc 100644 --- a/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/ActionBarOverlayLayoutTest.java @@ -169,7 +169,8 @@ public class ActionBarOverlayLayoutTest { private WindowInsets insetsWith(Insets content, DisplayCutout cutout) { return new WindowInsets(WindowInsets.createCompatTypeMap(content.toRect()), null, null, - false, 0, 0, cutout, null, null, null, WindowInsets.Type.systemBars(), false); + false, 0, 0, cutout, null, null, null, WindowInsets.Type.systemBars(), false, + null, null, 0, 0); } private ViewGroup createViewGroupWithId(int id) { diff --git a/core/tests/coretests/src/com/android/internal/widget/NotificationOptimizedLinearLayoutComparisonTest.java b/core/tests/coretests/src/com/android/internal/widget/NotificationOptimizedLinearLayoutComparisonTest.java index 08333ecd99a3..bf9221a27e74 100644 --- a/core/tests/coretests/src/com/android/internal/widget/NotificationOptimizedLinearLayoutComparisonTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/NotificationOptimizedLinearLayoutComparisonTest.java @@ -31,6 +31,7 @@ import android.view.View; import android.view.View.MeasureSpec; import android.view.ViewGroup; import android.widget.LinearLayout; +import android.widget.TextView; import android.widget.flags.Flags; import androidx.test.InstrumentationRegistry; @@ -73,7 +74,7 @@ public class NotificationOptimizedLinearLayoutComparisonTest { private static final int[] LAYOUT_PARAMS = {MATCH_PARENT, WRAP_CONTENT, 0, 50}; private static final int[] CHILD_WEIGHTS = {0, 1}; - + private static final int[] CHILD_MARGINS = {0, 10, -10}; @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @@ -84,35 +85,96 @@ public class NotificationOptimizedLinearLayoutComparisonTest { mContext = InstrumentationRegistry.getTargetContext(); } + @Test public void test() throws Throwable { + final List<View> controlChildren = + new ArrayList<>(); + final List<View> testChildren = + new ArrayList<>(); + + final View controlChild1 = buildChildView(); + final View controlChild2 = buildChildView(); + controlChildren.add(controlChild1); + controlChildren.add(controlChild2); + + final View testChild1 = buildChildView(); + final View testChild2 = buildChildView(); + testChildren.add(testChild1); + testChildren.add(testChild2); + + final LinearLayout controlContainer = buildLayout(false, controlChildren); + + final LinearLayout testContainer = buildLayout(true, testChildren); + + final LinearLayout.LayoutParams firstChildLayoutParams = new LinearLayout.LayoutParams(0, + 0); + final LinearLayout.LayoutParams secondChildLayoutParams = new LinearLayout.LayoutParams(0, + 0); + controlChild1.setLayoutParams(firstChildLayoutParams); + controlChild2.setLayoutParams(secondChildLayoutParams); + testChild1.setLayoutParams(firstChildLayoutParams); + testChild2.setLayoutParams(secondChildLayoutParams); + for (int orientation : ORIENTATIONS) { - for (int widthSpec : MEASURE_SPECS) { - for (int heightSpec : MEASURE_SPECS) { - for (int firstChildGravity : GRAVITIES) { - for (int secondChildGravity : GRAVITIES) { - for (int firstChildLayoutWidth : LAYOUT_PARAMS) { - for (int firstChildLayoutHeight : LAYOUT_PARAMS) { - for (int secondChildLayoutWidth : LAYOUT_PARAMS) { - for (int secondChildLayoutHeight : LAYOUT_PARAMS) { + controlContainer.setOrientation(orientation); + testContainer.setOrientation(orientation); + + for (int firstChildLayoutWidth : LAYOUT_PARAMS) { + firstChildLayoutParams.width = firstChildLayoutWidth; + for (int firstChildLayoutHeight : LAYOUT_PARAMS) { + firstChildLayoutParams.height = firstChildLayoutHeight; + + for (int secondChildLayoutWidth : LAYOUT_PARAMS) { + secondChildLayoutParams.width = secondChildLayoutWidth; + for (int secondChildLayoutHeight : LAYOUT_PARAMS) { + secondChildLayoutParams.height = secondChildLayoutHeight; + + for (int firstChildMargin : CHILD_MARGINS) { + firstChildLayoutParams.setMargins(firstChildMargin, + firstChildMargin, firstChildMargin, firstChildMargin); + for (int secondChildMargin : CHILD_MARGINS) { + secondChildLayoutParams.setMargins(secondChildMargin, + secondChildMargin, secondChildMargin, + secondChildMargin); + + for (int firstChildGravity : GRAVITIES) { + firstChildLayoutParams.gravity = firstChildGravity; + for (int secondChildGravity : GRAVITIES) { + secondChildLayoutParams.gravity = secondChildGravity; + for (int firstChildWeight : CHILD_WEIGHTS) { + firstChildLayoutParams.weight = firstChildWeight; for (int secondChildWeight : CHILD_WEIGHTS) { - executeTest(/*testSpec =*/createTestSpec( - orientation, - widthSpec, heightSpec, - firstChildLayoutWidth, - firstChildLayoutHeight, - secondChildLayoutWidth, - secondChildLayoutHeight, - firstChildGravity, - secondChildGravity, - firstChildWeight, - secondChildWeight)); + secondChildLayoutParams.weight = + secondChildWeight; + + for (int widthSpec : MEASURE_SPECS) { + for (int heightSpec : MEASURE_SPECS) { + executeTest(controlContainer, + testContainer, + createTestSpec( + orientation, + widthSpec, heightSpec, + firstChildLayoutWidth, + firstChildLayoutHeight, + secondChildLayoutWidth, + secondChildLayoutHeight, + firstChildGravity, + secondChildGravity, + firstChildWeight, + secondChildWeight, + firstChildMargin, + secondChildMargin) + ); + } + } } } } } } + } } } @@ -121,47 +183,8 @@ public class NotificationOptimizedLinearLayoutComparisonTest { } } - private void executeTest(TestSpec testSpec) { - // GIVEN - final List<View> controlChildren = - new ArrayList<>(); - final List<View> testChildren = - new ArrayList<>(); - - controlChildren.add( - buildChildView( - testSpec.mFirstChildLayoutWidth, - testSpec.mFirstChildLayoutHeight, - testSpec.mFirstChildGravity, - testSpec.mFirstChildWeight)); - controlChildren.add( - buildChildView( - testSpec.mSecondChildLayoutWidth, - testSpec.mSecondChildLayoutHeight, - testSpec.mSecondChildGravity, - testSpec.mSecondChildWeight)); - - testChildren.add( - buildChildView( - testSpec.mFirstChildLayoutWidth, - testSpec.mFirstChildLayoutHeight, - testSpec.mFirstChildGravity, - testSpec.mFirstChildWeight)); - testChildren.add( - buildChildView( - testSpec.mSecondChildLayoutWidth, - testSpec.mSecondChildLayoutHeight, - testSpec.mSecondChildGravity, - testSpec.mSecondChildWeight)); - - final LinearLayout controlContainer = buildLayout(false, - testSpec.mOrientation, - controlChildren); - - final LinearLayout testContainer = buildLayout(true, - testSpec.mOrientation, - testChildren); - + private void executeTest(LinearLayout controlContainer, LinearLayout testContainer, + TestSpec testSpec) { // WHEN controlContainer.measure(testSpec.mWidthSpec, testSpec.mHeightSpec); testContainer.measure(testSpec.mWidthSpec, testSpec.mHeightSpec); @@ -171,6 +194,7 @@ public class NotificationOptimizedLinearLayoutComparisonTest { assertLayoutsEqual("Test Case:" + testSpec, controlContainer, testContainer); } + private static class TestSpec { private final int mOrientation; private final int mWidthSpec; @@ -183,6 +207,8 @@ public class NotificationOptimizedLinearLayoutComparisonTest { private final int mSecondChildGravity; private final int mFirstChildWeight; private final int mSecondChildWeight; + private final int mFirstChildMargin; + private final int mSecondChildMargin; TestSpec( int orientation, @@ -195,7 +221,9 @@ public class NotificationOptimizedLinearLayoutComparisonTest { int firstChildGravity, int secondChildGravity, int firstChildWeight, - int secondChildWeight) { + int secondChildWeight, + int firstChildMargin, + int secondChildMargin) { mOrientation = orientation; mWidthSpec = widthSpec; mHeightSpec = heightSpec; @@ -207,6 +235,8 @@ public class NotificationOptimizedLinearLayoutComparisonTest { mSecondChildGravity = secondChildGravity; mFirstChildWeight = firstChildWeight; mSecondChildWeight = secondChildWeight; + mFirstChildMargin = firstChildMargin; + mSecondChildMargin = secondChildMargin; } @Override @@ -223,6 +253,8 @@ public class NotificationOptimizedLinearLayoutComparisonTest { + ", mSecondChildGravity=" + mSecondChildGravity + ", mFirstChildWeight=" + mFirstChildWeight + ", mSecondChildWeight=" + mSecondChildWeight + + ", mFirstChildMargin=" + mFirstChildMargin + + ", mSecondChildMargin=" + mSecondChildMargin + '}'; } @@ -246,15 +278,13 @@ public class NotificationOptimizedLinearLayoutComparisonTest { } } - private LinearLayout buildLayout(boolean isNotificationOptimized, - @LinearLayout.OrientationMode int orientation, List<View> children) { + private LinearLayout buildLayout(boolean isNotificationOptimized, List<View> children) { final LinearLayout linearLayout; if (isNotificationOptimized) { linearLayout = new NotificationOptimizedLinearLayout(mContext); } else { linearLayout = new LinearLayout(mContext); } - linearLayout.setOrientation(orientation); for (int i = 0; i < children.size(); i++) { linearLayout.addView(children.get(i)); } @@ -262,7 +292,8 @@ public class NotificationOptimizedLinearLayoutComparisonTest { } private void assertLayoutsEqual(String testCase, View controlView, View testView) { - mExpect.withMessage("MeasuredWidths are not equal. Test Case:" + testCase) + mExpect.withMessage( + "MeasuredWidths are not equal. Test Case:" + testCase) .that(testView.getMeasuredWidth()).isEqualTo(controlView.getMeasuredWidth()); mExpect.withMessage("MeasuredHeights are not equal. Test Case:" + testCase) .that(testView.getMeasuredHeight()).isEqualTo(controlView.getMeasuredHeight()); @@ -286,23 +317,12 @@ public class NotificationOptimizedLinearLayoutComparisonTest { } } - private static class TestView extends View { - TestView(Context context) { - super(context); - } - - @Override - public int getBaseline() { - return 5; - } - } - - private TestSpec createTestSpec(int orientation, int widthSpec, int heightSpec, int firstChildLayoutWidth, int firstChildLayoutHeight, int secondChildLayoutWidth, int secondChildLayoutHeight, int firstChildGravity, int secondChildGravity, - int firstChildWeight, int secondChildWeight) { + int firstChildWeight, int secondChildWeight, int firstChildMargin, + int secondChildMargin) { return new TestSpec( orientation, @@ -314,16 +334,16 @@ public class NotificationOptimizedLinearLayoutComparisonTest { firstChildGravity, secondChildGravity, firstChildWeight, - secondChildWeight); + secondChildWeight, + firstChildMargin, + secondChildMargin); } - private View buildChildView(int childLayoutWidth, int childLayoutHeight, - int childGravity, int childWeight) { - final View childView = new TestView(mContext); - // Set desired size using LayoutParams - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(childLayoutWidth, - childLayoutHeight, childWeight); - params.gravity = childGravity; + private View buildChildView() { + final View childView = new TextView(mContext); + // this is initial value. We are going to mutate this layout params during the test. + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(MATCH_PARENT, + WRAP_CONTENT); childView.setLayoutParams(params); return childView; } diff --git a/core/tests/devicestatetests/Android.bp b/core/tests/devicestatetests/Android.bp index 7748de57c2bc..60848b31eaec 100644 --- a/core/tests/devicestatetests/Android.bp +++ b/core/tests/devicestatetests/Android.bp @@ -29,6 +29,8 @@ android_test { "androidx.test.rules", "frameworks-base-testutils", "mockito-target-minus-junit4", + "platform-test-annotations", + "testng", ], libs: ["android.test.runner"], platform_apis: true, diff --git a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateTest.java b/core/tests/devicestatetests/src/android/hardware/devicestate/DeviceStateTest.java index d54524e94139..396d403a1ada 100644 --- a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateTest.java +++ b/core/tests/devicestatetests/src/android/hardware/devicestate/DeviceStateTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.devicestate; +package android.hardware.devicestate; import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE; import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE; @@ -25,18 +25,17 @@ import static org.testng.Assert.assertThrows; import android.platform.test.annotations.Presubmit; -import androidx.test.runner.AndroidJUnit4; - import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** - * Unit tests for {@link DeviceState}. + * Unit tests for {@link android.hardware.devicestate.DeviceState}. * <p/> * Run with <code>atest DeviceStateTest</code>. */ @Presubmit -@RunWith(AndroidJUnit4.class) +@RunWith(JUnit4.class) public final class DeviceStateTest { @Test public void testConstruct() { diff --git a/core/tests/utiltests/src/com/android/internal/util/FastXmlSerializerTest.java b/core/tests/utiltests/src/com/android/internal/util/FastXmlSerializerTest.java index 7723d589a723..f91172df4f74 100644 --- a/core/tests/utiltests/src/com/android/internal/util/FastXmlSerializerTest.java +++ b/core/tests/utiltests/src/com/android/internal/util/FastXmlSerializerTest.java @@ -45,7 +45,6 @@ import java.nio.charset.StandardCharsets; */ @SmallTest @RunWith(AndroidJUnit4.class) -@IgnoreUnderRavenwood(blockedBy = Xml.class) public class FastXmlSerializerTest { private static final String TAG = "FastXmlSerializerTest"; @@ -146,6 +145,7 @@ public class FastXmlSerializerTest { @Test @LargeTest + @IgnoreUnderRavenwood(reason = "Long test runtime") public void testAllCharacters() throws Exception { boolean ok = true; for (int i = 0; i < 0xffff; i++) { diff --git a/data/etc/com.android.launcher3.xml b/data/etc/com.android.launcher3.xml index 5616d1d3c189..47e2e3844bb9 100644 --- a/data/etc/com.android.launcher3.xml +++ b/data/etc/com.android.launcher3.xml @@ -26,5 +26,6 @@ <permission name="android.permission.STATUS_BAR"/> <permission name="android.permission.STOP_APP_SWITCHES"/> <permission name="android.permission.ACCESS_SHORTCUTS"/> + <permission name="android.permission.ACCESS_HIDDEN_PROFILES_FULL"/> </privapp-permissions> </permissions> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 0baaff0bb2fc..8e2c415f6383 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -316,6 +316,8 @@ applications that come with the platform <permission name="android.permission.SET_LOW_POWER_STANDBY_PORTS" /> <permission name="android.permission.MANAGE_ROLLBACKS"/> <permission name="android.permission.MANAGE_USB"/> + <!-- Permission required to test Launcher Apps APIs for hidden profiles --> + <permission name="android.permission.ACCESS_HIDDEN_PROFILES_FULL" /> <!-- Needed for tests only --> <permission name="android.permission.MANAGE_CLOUDSEARCH" /> <permission name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION" /> @@ -575,6 +577,11 @@ applications that come with the platform <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/> <!-- Permissions required for CTS test - CtsContactKeysProviderPrivilegedApp --> <permission name="android.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS"/> + <!-- Permission required for CTS test BlockedNumberContractTest --> + <permission name="android.permission.WRITE_BLOCKED_NUMBERS" /> + <permission name="android.permission.READ_BLOCKED_NUMBERS" /> + <!-- Permission required for CTS test - PackageManagerTest --> + <permission name="android.permission.DOMAIN_VERIFICATION_AGENT"/> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index 1da8e189d768..d915b746e0cc 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -25,10 +25,13 @@ import android.content.res.AssetManager; import android.content.res.Resources; import android.os.Build; import android.os.Trace; +import android.system.OsConstants; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; +import libcore.io.IoBridge; + import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.IOException; @@ -523,19 +526,19 @@ public class BitmapFactory { public static Bitmap decodeFile(String pathName, Options opts) { validate(opts); Bitmap bm = null; - InputStream stream = null; + FileDescriptor fd = null; try { - stream = new FileInputStream(pathName); - bm = decodeStream(stream, null, opts); + fd = IoBridge.open(pathName, OsConstants.O_RDONLY); + bm = decodeFileDescriptor(fd, null, opts); } catch (Exception e) { /* do nothing. If the exception happened on open, bm will be null. */ - Log.e("BitmapFactory", "Unable to decode stream: " + e); + Log.e("BitmapFactory", "Unable to decode file: " + e); } finally { - if (stream != null) { + if (fd != null) { try { - stream.close(); + IoBridge.closeAndSignalBlockedThreads(fd); } catch (IOException e) { // do nothing here } diff --git a/graphics/java/android/view/PixelCopy.java b/graphics/java/android/view/PixelCopy.java index e6de5978ceb0..9159a00152dd 100644 --- a/graphics/java/android/view/PixelCopy.java +++ b/graphics/java/android/view/PixelCopy.java @@ -96,7 +96,7 @@ public final class PixelCopy { * * The contents of the source will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the SurfaceView's Surface will be used as the source of the copy. * * @param source The source from which to copy @@ -117,7 +117,7 @@ public final class PixelCopy { * * The contents of the source will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the SurfaceView's Surface will be used as the source of the copy. * * @param source The source from which to copy @@ -143,7 +143,7 @@ public final class PixelCopy { * * The contents of the source will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the Surface will be used as the source of the copy. * * @param source The source from which to copy @@ -164,7 +164,7 @@ public final class PixelCopy { * * The contents of the source rect will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the Surface will be used as the source of the copy. * * @param source The source from which to copy @@ -201,7 +201,7 @@ public final class PixelCopy { * * The contents of the source will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the Window's Surface will be used as the source of the copy. * * Note: This is limited to being able to copy from Window's with a non-null @@ -231,7 +231,7 @@ public final class PixelCopy { * * The contents of the source rect will be scaled to fit exactly inside the bitmap. * The pixel format of the source buffer will be converted, as part of the copy, - * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer + * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer * in the Window's Surface will be used as the source of the copy. * * Note: This is limited to being able to copy from Window's with a non-null diff --git a/keystore/aaid/aidl/android/security/keystore/IKeyAttestationApplicationIdProvider.aidl b/keystore/aaid/aidl/android/security/keystore/IKeyAttestationApplicationIdProvider.aidl index c360cb8f281a..cfc5980e009a 100644 --- a/keystore/aaid/aidl/android/security/keystore/IKeyAttestationApplicationIdProvider.aidl +++ b/keystore/aaid/aidl/android/security/keystore/IKeyAttestationApplicationIdProvider.aidl @@ -20,8 +20,14 @@ import android.security.keystore.KeyAttestationApplicationId; /** @hide */ interface IKeyAttestationApplicationIdProvider { + const int ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED = 1; + /** * Provides information describing the possible applications identified by a UID. + * + * In case of not getting package ids from uid return + * {@link #ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED} to the caller. + * * @hide */ KeyAttestationApplicationId getKeyAttestationApplicationId(int uid); diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index a12fa5fe26ff..310300d2f32a 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -19,6 +19,7 @@ package { // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: ["frameworks_base_license"], + default_team: "trendy_team_multitasking_windowing", } // Begin ProtoLog diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt index ea7c6edd4b56..5825bbfbfefa 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt @@ -165,6 +165,25 @@ class BubblePositionerTest { } @Test + fun testGetRestingPosition_afterBoundsChange() { + positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, + windowBounds = Rect(0, 0, 2000, 1600))) + + // Set the resting position to the right side + var allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + val restingPosition = PointF(allowableStackRegion.right, allowableStackRegion.centerY()) + positioner.restingPosition = restingPosition + + // Now make the device smaller + positioner.update(defaultDeviceConfig.copy(isLargeScreen = false, + windowBounds = Rect(0, 0, 1000, 1600))) + + // Check the resting position is on the correct side + allowableStackRegion = positioner.getAllowableStackPositionRegion(1 /* bubbleCount */) + assertThat(positioner.restingPosition.x).isEqualTo(allowableStackRegion.right) + } + + @Test fun testHasUserModifiedDefaultPosition_false() { positioner.update(defaultDeviceConfig.copy(isLargeScreen = true, isRtl = true)) assertThat(positioner.hasUserModifiedDefaultPosition()).isFalse() diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 28e709845e88..a13de9f9743e 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -266,6 +266,10 @@ <dimen name="bubble_bar_manage_menu_item_height">52dp</dimen> <!-- Size of the icons in the bubble bar manage menu. --> <dimen name="bubble_bar_manage_menu_item_icon_size">20dp</dimen> + <!-- Corner radius for expanded view when bubble bar is used --> + <dimen name="bubble_bar_expanded_view_corner_radius">16dp</dimen> + <!-- Corner radius for expanded view while it is being dragged --> + <dimen name="bubble_bar_expanded_view_corner_radius_dragged">28dp</dimen> <!-- Bottom and end margin for compat buttons. --> <dimen name="compat_button_margin">24dp</dimen> @@ -435,6 +439,9 @@ Text varies in size, we will calculate that width separately. --> <dimen name="desktop_mode_app_details_width_minus_text">62dp</dimen> + <!-- 22dp padding + 24dp app icon + 16dp expand button + 86dp text (max) --> + <dimen name="desktop_mode_app_details_max_width">148dp</dimen> + <!-- The width of the maximize menu in desktop mode. --> <dimen name="desktop_mode_maximize_menu_width">287dp</dimen> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java index c03b6f805cf7..cda29c95281d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java @@ -120,6 +120,13 @@ public class BubblePositioner { @VisibleForTesting public void updateInternal(int rotation, Insets insets, Rect bounds) { + BubbleStackView.RelativeStackPosition prevStackPosition = null; + if (mRestingStackPosition != null && mScreenRect != null && !mScreenRect.equals(bounds)) { + // Save the resting position as a relative position with the previous bounds, at the + // end of the update we'll restore it based on the new bounds. + prevStackPosition = new BubbleStackView.RelativeStackPosition(getRestingPosition(), + getAllowableStackPositionRegion(1)); + } mRotation = rotation; mInsets = insets; @@ -182,6 +189,12 @@ public class BubblePositioner { R.dimen.bubbles_flyout_min_width_large_screen); mMaxBubbles = calculateMaxBubbles(); + + if (prevStackPosition != null) { + // Get the new resting position based on the updated values + mRestingStackPosition = prevStackPosition.getAbsolutePositionInRegion( + getAllowableStackPositionRegion(1)); + } } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index 35c1e8c2a047..b23fd5269eae 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -441,43 +441,42 @@ public class BubbleStackView extends FrameLayout /** Magnet listener that handles animating and dismissing individual dragged-out bubbles. */ private final MagnetizedObject.MagnetListener mIndividualBubbleMagnetListener = new MagnetizedObject.MagnetListener() { + @Override - public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) { - if (mExpandedAnimationController.getDraggedOutBubble() == null) { - return; + public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject draggedObject) { + if (draggedObject.getUnderlyingObject() instanceof View view) { + animateDismissBubble(view, true); } - animateDismissBubble( - mExpandedAnimationController.getDraggedOutBubble(), true); } @Override public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject draggedObject, float velX, float velY, boolean wasFlungOut) { - if (mExpandedAnimationController.getDraggedOutBubble() == null) { - return; - } - animateDismissBubble( - mExpandedAnimationController.getDraggedOutBubble(), false); + if (draggedObject.getUnderlyingObject() instanceof View view) { + animateDismissBubble(view, false); - if (wasFlungOut) { - mExpandedAnimationController.snapBubbleBack( - mExpandedAnimationController.getDraggedOutBubble(), velX, velY); - mDismissView.hide(); - } else { - mExpandedAnimationController.onUnstuckFromTarget(); + if (wasFlungOut) { + mExpandedAnimationController.snapBubbleBack(view, velX, velY); + mDismissView.hide(); + } else { + mExpandedAnimationController.onUnstuckFromTarget(); + } } } @Override - public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { - if (mExpandedAnimationController.getDraggedOutBubble() == null) { - return; + public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { + if (draggedObject.getUnderlyingObject() instanceof View view) { + mExpandedAnimationController.dismissDraggedOutBubble( + view /* bubble */, + mDismissView.getHeight() /* translationYBy */, + () -> dismissBubbleIfExists( + mBubbleData.getBubbleWithView(view)) /* after */); } - mExpandedAnimationController.dismissDraggedOutBubble( - mExpandedAnimationController.getDraggedOutBubble() /* bubble */, - mDismissView.getHeight() /* translationYBy */, - BubbleStackView.this::dismissMagnetizedObject /* after */); mDismissView.hide(); } }; @@ -487,12 +486,14 @@ public class BubbleStackView extends FrameLayout new MagnetizedObject.MagnetListener() { @Override public void onStuckToTarget( - @NonNull MagnetizedObject.MagneticTarget target) { + @NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { animateDismissBubble(mBubbleContainer, true); } @Override public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject, float velX, float velY, boolean wasFlungOut) { animateDismissBubble(mBubbleContainer, false); if (wasFlungOut) { @@ -505,14 +506,14 @@ public class BubbleStackView extends FrameLayout } @Override - public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { mStackAnimationController.animateStackDismissal( mDismissView.getHeight() /* translationYBy */, () -> { + mBubbleData.dismissAll(Bubbles.DISMISS_USER_GESTURE); resetDismissAnimator(); - dismissMagnetizedObject(); - } - ); + } /*after */); mDismissView.hide(); } }; @@ -2759,19 +2760,6 @@ public class BubbleStackView extends FrameLayout return mMagnetizedObject != null && mMagnetizedObject.maybeConsumeMotionEvent(event); } - /** - * Dismisses the magnetized object - either an individual bubble, if we're expanded, or the - * stack, if we're collapsed. - */ - private void dismissMagnetizedObject() { - if (mIsExpanded) { - final View draggedOutBubbleView = (View) mMagnetizedObject.getUnderlyingObject(); - dismissBubbleIfExists(mBubbleData.getBubbleWithView(draggedOutBubbleView)); - } else { - mBubbleData.dismissAll(Bubbles.DISMISS_USER_GESTURE); - } - } - private void dismissBubbleIfExists(@Nullable BubbleViewProvider bubble) { if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) { if (mIsExpanded && mBubbleData.getBubbles().size() > 1 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java index 84a616f1e1a0..4e995bc7c92e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java @@ -15,17 +15,28 @@ */ package com.android.wm.shell.bubbles.bar; +import static android.view.View.SCALE_X; +import static android.view.View.SCALE_Y; +import static android.view.View.TRANSLATION_X; +import static android.view.View.TRANSLATION_Y; import static android.view.View.VISIBLE; +import static android.view.View.X; +import static android.view.View.Y; + +import static com.android.wm.shell.animation.Interpolators.EMPHASIZED; +import static com.android.wm.shell.animation.Interpolators.EMPHASIZED_DECELERATE; +import static com.android.wm.shell.bubbles.bar.BubbleBarExpandedView.CORNER_RADIUS; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; import android.util.Log; import android.util.Size; -import android.view.View; import android.widget.FrameLayout; import androidx.annotation.Nullable; @@ -48,15 +59,16 @@ public class BubbleBarAnimationHelper { private static final float EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT = 0.1f; private static final float EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT = .75f; private static final int EXPANDED_VIEW_ALPHA_ANIMATION_DURATION = 150; - private static final int EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION = 100; - private static final int EXPANDED_VIEW_ANIMATE_POSITION_DURATION = 300; + private static final int EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION = 400; + private static final int EXPANDED_VIEW_ANIMATE_TO_REST_DURATION = 400; private static final int EXPANDED_VIEW_DISMISS_DURATION = 250; - private static final int EXPANDED_VIEW_DRAG_ANIMATION_DURATION = 150; + private static final int EXPANDED_VIEW_DRAG_ANIMATION_DURATION = 400; /** * Additional scale applied to expanded view when it is positioned inside a magnetic target. */ - private static final float EXPANDED_VIEW_IN_TARGET_SCALE = 0.6f; - private static final float EXPANDED_VIEW_DRAG_SCALE = 0.5f; + private static final float EXPANDED_VIEW_IN_TARGET_SCALE = 0.2f; + private static final float EXPANDED_VIEW_DRAG_SCALE = 0.4f; + private static final float DISMISS_VIEW_SCALE = 1.25f; /** Spring config for the expanded view scale-in animation. */ private final PhysicsAnimator.SpringConfig mScaleInSpringConfig = @@ -72,6 +84,9 @@ public class BubbleBarAnimationHelper { /** Animator for animating the expanded view's alpha (including the TaskView inside it). */ private final ValueAnimator mExpandedViewAlphaAnimator = ValueAnimator.ofFloat(0f, 1f); + @Nullable + private Animator mRunningDragAnimator; + private final Context mContext; private final BubbleBarLayerView mLayerView; private final BubblePositioner mPositioner; @@ -232,14 +247,18 @@ public class BubbleBarAnimationHelper { Log.w(TAG, "Trying to animate start drag without a bubble"); return; } - bbev.setPivotX(bbev.getWidth() / 2f); - bbev.setPivotY(0f); - bbev.animate() - .scaleX(EXPANDED_VIEW_DRAG_SCALE) - .scaleY(EXPANDED_VIEW_DRAG_SCALE) - .setInterpolator(Interpolators.EMPHASIZED) - .setDuration(EXPANDED_VIEW_DRAG_ANIMATION_DURATION) - .start(); + setDragPivot(bbev); + AnimatorSet animatorSet = new AnimatorSet(); + // Corner radius gets scaled, apply the reverse scale to ensure we have the desired radius + final float cornerRadius = bbev.getDraggedCornerRadius() / EXPANDED_VIEW_DRAG_SCALE; + animatorSet.playTogether( + ObjectAnimator.ofFloat(bbev, SCALE_X, EXPANDED_VIEW_DRAG_SCALE), + ObjectAnimator.ofFloat(bbev, SCALE_Y, EXPANDED_VIEW_DRAG_SCALE), + ObjectAnimator.ofFloat(bbev, CORNER_RADIUS, cornerRadius) + ); + animatorSet.setDuration(EXPANDED_VIEW_DRAG_ANIMATION_DURATION).setInterpolator(EMPHASIZED); + animatorSet.addListener(new DragAnimatorListenerAdapter(bbev)); + startNewDragAnimation(animatorSet); } /** @@ -258,6 +277,7 @@ public class BubbleBarAnimationHelper { int[] location = bbev.getLocationOnScreen(); int diffFromBottom = mPositioner.getScreenRect().bottom - location[1]; + cancelAnimations(); bbev.animate() // 2x distance from bottom so the view flies out .translationYBy(diffFromBottom * 2) @@ -276,19 +296,24 @@ public class BubbleBarAnimationHelper { return; } Point restPoint = getExpandedViewRestPosition(getExpandedViewSize()); - bbev.animate() - .x(restPoint.x) - .y(restPoint.y) - .scaleX(1f) - .scaleY(1f) - .setDuration(EXPANDED_VIEW_ANIMATE_POSITION_DURATION) - .setInterpolator(Interpolators.EMPHASIZED_DECELERATE) - .withStartAction(() -> bbev.setAnimating(true)) - .withEndAction(() -> { - bbev.setAnimating(false); - bbev.resetPivot(); - }) - .start(); + + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.playTogether( + ObjectAnimator.ofFloat(bbev, X, restPoint.x), + ObjectAnimator.ofFloat(bbev, Y, restPoint.y), + ObjectAnimator.ofFloat(bbev, SCALE_X, 1f), + ObjectAnimator.ofFloat(bbev, SCALE_Y, 1f), + ObjectAnimator.ofFloat(bbev, CORNER_RADIUS, bbev.getRestingCornerRadius()) + ); + animatorSet.setDuration(EXPANDED_VIEW_ANIMATE_TO_REST_DURATION).setInterpolator(EMPHASIZED); + animatorSet.addListener(new DragAnimatorListenerAdapter(bbev) { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + bbev.resetPivot(); + } + }); + startNewDragAnimation(animatorSet); } /** @@ -304,17 +329,7 @@ public class BubbleBarAnimationHelper { return; } - // Calculate scale of expanded view so it fits inside the magnetic target - float bbevMaxSide = Math.max(bbev.getWidth(), bbev.getHeight()); - View targetView = target.getTargetView(); - float targetMaxSide = Math.max(targetView.getWidth(), targetView.getHeight()); - // Reduce target size to have some padding between the target and expanded view - targetMaxSide *= EXPANDED_VIEW_IN_TARGET_SCALE; - float scaleInTarget = targetMaxSide / bbevMaxSide; - - // Scale around the top center of the expanded view. Same as when dragging. - bbev.setPivotX(bbev.getWidth() / 2f); - bbev.setPivotY(0); + setDragPivot(bbev); // When the view animates into the target, it is scaled down with the pivot at center top. // Find the point on the view that would be the center of the view at its final scale. @@ -330,13 +345,13 @@ public class BubbleBarAnimationHelper { // Get scaled width of the view and adjust mTmpLocation so that point on x-axis is at the // center of the view at its current size. float currentWidth = bbev.getWidth() * bbev.getScaleX(); - mTmpLocation[0] += currentWidth / 2; + mTmpLocation[0] += (int) (currentWidth / 2f); // Since pivotY is at the top of the view, at final scale, top coordinate of the view // remains the same. // Get height of the view at final scale and adjust mTmpLocation so that point on y-axis is // moved down by half of the height at final scale. - float targetHeight = bbev.getHeight() * scaleInTarget; - mTmpLocation[1] += targetHeight / 2; + float targetHeight = bbev.getHeight() * EXPANDED_VIEW_IN_TARGET_SCALE; + mTmpLocation[1] += (int) (targetHeight / 2f); // mTmpLocation is now set to the point on the view that will be the center of the view once // scale is applied. @@ -344,41 +359,61 @@ public class BubbleBarAnimationHelper { float xDiff = target.getCenterOnScreen().x - mTmpLocation[0]; float yDiff = target.getCenterOnScreen().y - mTmpLocation[1]; - bbev.animate() - .translationX(bbev.getTranslationX() + xDiff) - .translationY(bbev.getTranslationY() + yDiff) - .scaleX(scaleInTarget) - .scaleY(scaleInTarget) - .setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION) - .setInterpolator(Interpolators.EMPHASIZED) - .withStartAction(() -> bbev.setAnimating(true)) - .withEndAction(() -> { - bbev.setAnimating(false); - if (endRunnable != null) { - endRunnable.run(); - } - }) - .start(); + // Corner radius gets scaled, apply the reverse scale to ensure we have the desired radius + final float cornerRadius = bbev.getDraggedCornerRadius() / EXPANDED_VIEW_IN_TARGET_SCALE; + + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.playTogether( + // Move expanded view to the center of dismiss view + ObjectAnimator.ofFloat(bbev, TRANSLATION_X, bbev.getTranslationX() + xDiff), + ObjectAnimator.ofFloat(bbev, TRANSLATION_Y, bbev.getTranslationY() + yDiff), + // Scale expanded view down + ObjectAnimator.ofFloat(bbev, SCALE_X, EXPANDED_VIEW_IN_TARGET_SCALE), + ObjectAnimator.ofFloat(bbev, SCALE_Y, EXPANDED_VIEW_IN_TARGET_SCALE), + // Update corner radius for expanded view + ObjectAnimator.ofFloat(bbev, CORNER_RADIUS, cornerRadius), + // Scale dismiss view up + ObjectAnimator.ofFloat(target.getTargetView(), SCALE_X, DISMISS_VIEW_SCALE), + ObjectAnimator.ofFloat(target.getTargetView(), SCALE_Y, DISMISS_VIEW_SCALE) + ); + animatorSet.setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION).setInterpolator( + EMPHASIZED_DECELERATE); + animatorSet.addListener(new DragAnimatorListenerAdapter(bbev) { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + if (endRunnable != null) { + endRunnable.run(); + } + } + }); + startNewDragAnimation(animatorSet); } /** * Animate currently expanded view when it is released from dismiss view */ - public void animateUnstuckFromDismissView() { - BubbleBarExpandedView expandedView = getExpandedView(); - if (expandedView == null) { + public void animateUnstuckFromDismissView(MagneticTarget target) { + BubbleBarExpandedView bbev = getExpandedView(); + if (bbev == null) { Log.w(TAG, "Trying to unsnap the expanded view from dismiss without a bubble"); return; } - expandedView - .animate() - .scaleX(EXPANDED_VIEW_DRAG_SCALE) - .scaleY(EXPANDED_VIEW_DRAG_SCALE) - .setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION) - .setInterpolator(Interpolators.EMPHASIZED) - .withStartAction(() -> expandedView.setAnimating(true)) - .withEndAction(() -> expandedView.setAnimating(false)) - .start(); + setDragPivot(bbev); + // Corner radius gets scaled, apply the reverse scale to ensure we have the desired radius + final float cornerRadius = bbev.getDraggedCornerRadius() / EXPANDED_VIEW_DRAG_SCALE; + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.playTogether( + ObjectAnimator.ofFloat(bbev, SCALE_X, EXPANDED_VIEW_DRAG_SCALE), + ObjectAnimator.ofFloat(bbev, SCALE_Y, EXPANDED_VIEW_DRAG_SCALE), + ObjectAnimator.ofFloat(bbev, CORNER_RADIUS, cornerRadius), + ObjectAnimator.ofFloat(target.getTargetView(), SCALE_X, 1f), + ObjectAnimator.ofFloat(target.getTargetView(), SCALE_Y, 1f) + ); + animatorSet.setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION).setInterpolator( + EMPHASIZED_DECELERATE); + animatorSet.addListener(new DragAnimatorListenerAdapter(bbev)); + startNewDragAnimation(animatorSet); } /** @@ -391,6 +426,10 @@ public class BubbleBarAnimationHelper { if (bbev != null) { bbev.animate().cancel(); } + if (mRunningDragAnimator != null) { + mRunningDragAnimator.cancel(); + mRunningDragAnimator = null; + } } private @Nullable BubbleBarExpandedView getExpandedView() { @@ -438,4 +477,35 @@ public class BubbleBarAnimationHelper { final int height = mPositioner.getExpandedViewHeightForBubbleBar(isOverflowExpanded); return new Size(width, height); } + + private void startNewDragAnimation(Animator animator) { + cancelAnimations(); + mRunningDragAnimator = animator; + animator.start(); + } + + private static void setDragPivot(BubbleBarExpandedView bbev) { + bbev.setPivotX(bbev.getWidth() / 2f); + bbev.setPivotY(0f); + } + + private class DragAnimatorListenerAdapter extends AnimatorListenerAdapter { + + private final BubbleBarExpandedView mBubbleBarExpandedView; + + DragAnimatorListenerAdapter(BubbleBarExpandedView bbev) { + mBubbleBarExpandedView = bbev; + } + + @Override + public void onAnimationStart(Animator animation) { + mBubbleBarExpandedView.setAnimating(true); + } + + @Override + public void onAnimationEnd(Animator animation) { + mBubbleBarExpandedView.setAnimating(false); + mRunningDragAnimator = null; + } + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index ebb8e3e2d207..eddd43f263d9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -27,13 +27,13 @@ import android.graphics.Insets; import android.graphics.Outline; import android.graphics.Rect; import android.util.AttributeSet; +import android.util.FloatProperty; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; import android.widget.FrameLayout; -import com.android.internal.policy.ScreenDecorationsUtils; import com.android.wm.shell.R; import com.android.wm.shell.bubbles.Bubble; import com.android.wm.shell.bubbles.BubbleExpandedViewManager; @@ -61,6 +61,23 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView void onBackPressed(); } + /** + * A property wrapper around corner radius for the expanded view, handled by + * {@link #setCornerRadius(float)} and {@link #getCornerRadius()} methods. + */ + public static final FloatProperty<BubbleBarExpandedView> CORNER_RADIUS = new FloatProperty<>( + "cornerRadius") { + @Override + public void setValue(BubbleBarExpandedView bbev, float radius) { + bbev.setCornerRadius(radius); + } + + @Override + public Float get(BubbleBarExpandedView bbev) { + return bbev.getCornerRadius(); + } + }; + private static final String TAG = BubbleBarExpandedView.class.getSimpleName(); private static final int INVALID_TASK_ID = -1; @@ -78,7 +95,12 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView private int mCaptionHeight; private int mBackgroundColor; - private float mCornerRadius = 0f; + /** Corner radius used when view is resting */ + private float mRestingCornerRadius = 0f; + /** Corner radius applied while dragging */ + private float mDraggedCornerRadius = 0f; + /** Current corner radius */ + private float mCurrentCornerRadius = 0f; /** * Whether we want the {@code TaskView}'s content to be visible (alpha = 1f). If @@ -118,7 +140,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView setOutlineProvider(new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mCornerRadius); + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mCurrentCornerRadius); } }); } @@ -155,7 +177,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT); addView(mTaskView, lp); mTaskView.setEnableSurfaceClipping(true); - mTaskView.setCornerRadius(mCornerRadius); + mTaskView.setCornerRadius(mCurrentCornerRadius); mTaskView.setVisibility(VISIBLE); // Handle view needs to draw on top of task view. @@ -198,22 +220,24 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView // TODO (b/275087636): call this when theme/config changes /** Updates the view based on the current theme. */ public void applyThemeAttrs() { - boolean supportsRoundedCorners = ScreenDecorationsUtils.supportsRoundedCornersOnWindows( - mContext.getResources()); + mRestingCornerRadius = getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_corner_radius + ); + mDraggedCornerRadius = getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_corner_radius_dragged + ); + + mCurrentCornerRadius = mRestingCornerRadius; + final TypedArray ta = mContext.obtainStyledAttributes(new int[]{ - android.R.attr.dialogCornerRadius, android.R.attr.colorBackgroundFloating}); - mCornerRadius = supportsRoundedCorners ? ta.getDimensionPixelSize(0, 0) : 0; - mCornerRadius = mCornerRadius / 2f; - mBackgroundColor = ta.getColor(1, Color.WHITE); - + mBackgroundColor = ta.getColor(0, Color.WHITE); ta.recycle(); - mCaptionHeight = getResources().getDimensionPixelSize( R.dimen.bubble_bar_expanded_view_caption_height); if (mTaskView != null) { - mTaskView.setCornerRadius(mCornerRadius); + mTaskView.setCornerRadius(mCurrentCornerRadius); updateHandleColor(true /* animated */); } } @@ -396,4 +420,30 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView public boolean isAnimating() { return mIsAnimating; } + + /** @return corner radius that should be applied while view is in rest */ + public float getRestingCornerRadius() { + return mRestingCornerRadius; + } + + /** @return corner radius that should be applied while view is being dragged */ + public float getDraggedCornerRadius() { + return mDraggedCornerRadius; + } + + /** @return current corner radius */ + public float getCornerRadius() { + return mCurrentCornerRadius; + } + + /** Update corner radius */ + public void setCornerRadius(float cornerRadius) { + if (mCurrentCornerRadius != cornerRadius) { + mCurrentCornerRadius = cornerRadius; + if (mTaskView != null) { + mTaskView.setCornerRadius(cornerRadius); + } + invalidateOutline(); + } + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt index 5e634a23955a..7d37d6068dfb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewDragController.kt @@ -126,21 +126,28 @@ class BubbleBarExpandedViewDragController( } private inner class MagnetListener : MagnetizedObject.MagnetListener { - override fun onStuckToTarget(target: MagnetizedObject.MagneticTarget) { + override fun onStuckToTarget( + target: MagnetizedObject.MagneticTarget, + draggedObject: MagnetizedObject<*> + ) { isStuckToDismiss = true } override fun onUnstuckFromTarget( - target: MagnetizedObject.MagneticTarget, - velX: Float, - velY: Float, - wasFlungOut: Boolean + target: MagnetizedObject.MagneticTarget, + draggedObject: MagnetizedObject<*>, + velX: Float, + velY: Float, + wasFlungOut: Boolean ) { isStuckToDismiss = false - animationHelper.animateUnstuckFromDismissView() + animationHelper.animateUnstuckFromDismissView(target) } - override fun onReleasedInTarget(target: MagnetizedObject.MagneticTarget) { + override fun onReleasedInTarget( + target: MagnetizedObject.MagneticTarget, + draggedObject: MagnetizedObject<*> + ) { onDismissed() dismissView.hide() } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt index 7c931df35d7b..11e477716eb0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/magnetictarget/MagnetizedObject.kt @@ -91,8 +91,9 @@ abstract class MagnetizedObject<T : Any>( * to [onUnstuckFromTarget] or [onReleasedInTarget]. * * @param target The target that the object is now stuck to. + * @param draggedObject The object that is stuck to the target. */ - fun onStuckToTarget(target: MagneticTarget) + fun onStuckToTarget(target: MagneticTarget, draggedObject: MagnetizedObject<*>) /** * Called when the object is no longer stuck to a target. This means that either touch @@ -110,6 +111,7 @@ abstract class MagnetizedObject<T : Any>( * and [maybeConsumeMotionEvent] is now returning false. * * @param target The target that this object was just unstuck from. + * @param draggedObject The object being unstuck from the target. * @param velX The X velocity of the touch gesture when it exited the magnetic field. * @param velY The Y velocity of the touch gesture when it exited the magnetic field. * @param wasFlungOut Whether the object was unstuck via a fling gesture. This means that @@ -119,6 +121,7 @@ abstract class MagnetizedObject<T : Any>( */ fun onUnstuckFromTarget( target: MagneticTarget, + draggedObject: MagnetizedObject<*>, velX: Float, velY: Float, wasFlungOut: Boolean @@ -129,8 +132,9 @@ abstract class MagnetizedObject<T : Any>( * velocity to reach it. * * @param target The target that the object was released in. + * @param draggedObject The object released in the target. */ - fun onReleasedInTarget(target: MagneticTarget) + fun onReleasedInTarget(target: MagneticTarget, draggedObject: MagnetizedObject<*>) } private val animator: PhysicsAnimator<T> = PhysicsAnimator.getInstance(underlyingObject) @@ -386,7 +390,7 @@ abstract class MagnetizedObject<T : Any>( // animate sticking to the magnet. targetObjectIsStuckTo = targetObjectIsInMagneticFieldOf cancelAnimations() - magnetListener.onStuckToTarget(targetObjectIsInMagneticFieldOf!!) + magnetListener.onStuckToTarget(targetObjectIsInMagneticFieldOf!!, this) animateStuckToTarget(targetObjectIsInMagneticFieldOf, velX, velY, false, null) vibrateIfEnabled(VibrationEffect.EFFECT_HEAVY_CLICK) @@ -397,7 +401,8 @@ abstract class MagnetizedObject<T : Any>( // move the object out of the target using its own movement logic. cancelAnimations() magnetListener.onUnstuckFromTarget( - targetObjectIsStuckTo!!, velocityTracker.xVelocity, velocityTracker.yVelocity, + targetObjectIsStuckTo!!, this, + velocityTracker.xVelocity, velocityTracker.yVelocity, wasFlungOut = false) targetObjectIsStuckTo = null @@ -420,10 +425,11 @@ abstract class MagnetizedObject<T : Any>( // the upward direction, tell the listener so the object can be animated out of // the target. magnetListener.onUnstuckFromTarget( - targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true) + targetObjectIsStuckTo!!, this, + velX, velY, wasFlungOut = true) } else { // If the object is stuck and not flung away, it was released inside the target. - magnetListener.onReleasedInTarget(targetObjectIsStuckTo!!) + magnetListener.onReleasedInTarget(targetObjectIsStuckTo!!, this) vibrateIfEnabled(VibrationEffect.EFFECT_HEAVY_CLICK) } @@ -440,11 +446,11 @@ abstract class MagnetizedObject<T : Any>( if (flungToTarget != null) { // If this is a fling-to-target, animate the object to the magnet and then release // it. - magnetListener.onStuckToTarget(flungToTarget) + magnetListener.onStuckToTarget(flungToTarget, this) targetObjectIsStuckTo = flungToTarget animateStuckToTarget(flungToTarget, velX, velY, true) { - magnetListener.onReleasedInTarget(flungToTarget) + magnetListener.onReleasedInTarget(flungToTarget, this) targetObjectIsStuckTo = null vibrateIfEnabled(VibrationEffect.EFFECT_HEAVY_CLICK) } 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 ead5ad23c8f3..bd9d89c9892e 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 @@ -64,6 +64,7 @@ import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler; import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler; import com.android.wm.shell.desktopmode.ToggleResizeDesktopTaskTransitionHandler; import com.android.wm.shell.draganddrop.DragAndDropController; +import com.android.wm.shell.draganddrop.UnhandledDragController; import com.android.wm.shell.freeform.FreeformComponents; import com.android.wm.shell.freeform.FreeformTaskListener; import com.android.wm.shell.freeform.FreeformTaskTransitionHandler; @@ -558,6 +559,14 @@ public abstract class WMShellModule { @WMSingleton @Provides + static UnhandledDragController provideUnhandledDragController( + IWindowManager wmService, + @ShellMainThread ShellExecutor mainExecutor) { + return new UnhandledDragController(wmService, mainExecutor); + } + + @WMSingleton + @Provides static DragAndDropController provideDragAndDropController(Context context, ShellInit shellInit, ShellController shellController, 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 e8728498ad64..42c8d7417611 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 @@ -70,8 +70,8 @@ import com.android.wm.shell.sysui.ShellSharedConstants import com.android.wm.shell.transition.OneShotRemoteHandler import com.android.wm.shell.transition.Transitions import com.android.wm.shell.util.KtProtoLog -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration import com.android.wm.shell.windowdecor.MoveToDesktopAnimator +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.io.PrintWriter import java.util.concurrent.Executor import java.util.function.Consumer @@ -175,6 +175,12 @@ class DesktopTasksController( ) } + fun setOnTaskResizeAnimationListener(listener: OnTaskResizeAnimationListener) { + toggleResizeDesktopTaskTransitionHandler.setOnTaskResizeAnimationListener(listener) + enterDesktopTaskTransitionHandler.setOnTaskResizeAnimationListener(listener) + dragToDesktopTransitionHandler.setOnTaskResizeAnimatorListener(listener) + } + /** Setter needed to avoid cyclic dependency. */ fun setSplitScreenController(controller: SplitScreenController) { splitScreenController = controller @@ -236,12 +242,11 @@ class DesktopTasksController( /** Move a task with given `taskId` to desktop */ fun moveToDesktop( - decor: DesktopModeWindowDecoration, taskId: Int, wct: WindowContainerTransaction = WindowContainerTransaction() ) { shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { - task -> moveToDesktop(decor, task, wct) + task -> moveToDesktop(task, wct) } } @@ -283,7 +288,6 @@ class DesktopTasksController( * Move a task to desktop */ fun moveToDesktop( - decor: DesktopModeWindowDecoration, task: RunningTaskInfo, wct: WindowContainerTransaction = WindowContainerTransaction() ) { @@ -298,7 +302,7 @@ class DesktopTasksController( addMoveToDesktopChanges(wct, task) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - enterDesktopTaskTransitionHandler.moveToDesktop(wct, decor) + enterDesktopTaskTransitionHandler.moveToDesktop(wct) } else { shellTaskOrganizer.applyTransaction(wct) } @@ -311,7 +315,6 @@ class DesktopTasksController( fun startDragToDesktop( taskInfo: RunningTaskInfo, dragToDesktopValueAnimator: MoveToDesktopAnimator, - windowDecor: DesktopModeWindowDecoration ) { KtProtoLog.v( WM_SHELL_DESKTOP_MODE, @@ -320,8 +323,7 @@ class DesktopTasksController( ) dragToDesktopTransitionHandler.startDragToDesktopTransition( taskInfo.taskId, - dragToDesktopValueAnimator, - windowDecor + dragToDesktopValueAnimator ) } @@ -522,7 +524,7 @@ class DesktopTasksController( } /** Quick-resizes a desktop task, toggling between the stable bounds and the default bounds. */ - fun toggleDesktopTaskSize(taskInfo: RunningTaskInfo, windowDecor: DesktopModeWindowDecoration) { + fun toggleDesktopTaskSize(taskInfo: RunningTaskInfo) { val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return val stableBounds = Rect() @@ -543,11 +545,7 @@ class DesktopTasksController( val wct = WindowContainerTransaction().setBounds(taskInfo.token, destinationBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - toggleResizeDesktopTaskTransitionHandler.startTransition( - wct, - taskInfo.taskId, - windowDecor - ) + toggleResizeDesktopTaskTransitionHandler.startTransition(wct) } else { shellTaskOrganizer.applyTransaction(wct) } @@ -558,11 +556,7 @@ class DesktopTasksController( * * @param position the portion of the screen (RIGHT or LEFT) we want to snap the task to. */ - fun snapToHalfScreen( - taskInfo: RunningTaskInfo, - windowDecor: DesktopModeWindowDecoration, - position: SnapPosition - ) { + fun snapToHalfScreen(taskInfo: RunningTaskInfo, position: SnapPosition) { val displayLayout = displayController.getDisplayLayout(taskInfo.displayId) ?: return val stableBounds = Rect() @@ -592,11 +586,7 @@ class DesktopTasksController( val wct = WindowContainerTransaction().setBounds(taskInfo.token, destinationBounds) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - toggleResizeDesktopTaskTransitionHandler.startTransition( - wct, - taskInfo.taskId, - windowDecor - ) + toggleResizeDesktopTaskTransitionHandler.startTransition(wct) } else { shellTaskOrganizer.applyTransaction(wct) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt index 39610e3c5c80..af26e2980afe 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt @@ -34,9 +34,9 @@ import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_END_DRAG import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP import com.android.wm.shell.transition.Transitions.TransitionHandler import com.android.wm.shell.util.KtProtoLog -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration import com.android.wm.shell.windowdecor.MoveToDesktopAnimator import com.android.wm.shell.windowdecor.MoveToDesktopAnimator.Companion.DRAG_FREEFORM_SCALE +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.util.function.Supplier /** @@ -69,6 +69,7 @@ class DragToDesktopTransitionHandler( private var dragToDesktopStateListener: DragToDesktopStateListener? = null private var splitScreenController: SplitScreenController? = null private var transitionState: TransitionState? = null + private lateinit var onTaskResizeAnimationListener: OnTaskResizeAnimationListener /** Whether a drag-to-desktop transition is in progress. */ val inProgress: Boolean @@ -84,6 +85,10 @@ class DragToDesktopTransitionHandler( splitScreenController = controller } + fun setOnTaskResizeAnimatorListener(listener: OnTaskResizeAnimationListener) { + onTaskResizeAnimationListener = listener + } + /** * Starts a transition that performs a transient launch of Home so that Home is brought to the * front while still keeping the currently focused task that is being dragged resumed. This @@ -96,7 +101,6 @@ class DragToDesktopTransitionHandler( fun startDragToDesktopTransition( taskId: Int, dragToDesktopAnimator: MoveToDesktopAnimator, - windowDecoration: DesktopModeWindowDecoration ) { if (inProgress) { KtProtoLog.v( @@ -128,14 +132,12 @@ class DragToDesktopTransitionHandler( TransitionState.FromSplit( draggedTaskId = taskId, dragAnimator = dragToDesktopAnimator, - windowDecoration = windowDecoration, startTransitionToken = startTransitionToken ) } else { TransitionState.FromFullscreen( draggedTaskId = taskId, dragAnimator = dragToDesktopAnimator, - windowDecoration = windowDecoration, startTransitionToken = startTransitionToken ) } @@ -405,7 +407,7 @@ class DragToDesktopTransitionHandler( // Accept the merge by applying the merging transaction (applied by #showResizeVeil) // and finish callback. Show the veil and position the task at the first frame before // starting the final animation. - state.windowDecoration.showResizeVeil(t, animStartBounds) + onTaskResizeAnimationListener.onAnimationStart(state.draggedTaskId, t, animStartBounds) finishCallback.onTransitionFinished(null /* wct */) // Because the task surface was scaled down during the drag, we must use the animated @@ -429,11 +431,15 @@ class DragToDesktopTransitionHandler( animBounds.height() ) } - state.windowDecoration.updateResizeVeil(tx, animBounds) + onTaskResizeAnimationListener.onBoundsChange( + state.draggedTaskId, + tx, + animBounds + ) } addListener(object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { - state.windowDecoration.hideResizeVeil() + onTaskResizeAnimationListener.onAnimationEnd(state.draggedTaskId) startTransitionFinishCb.onTransitionFinished(null /* null */) clearState() } @@ -576,7 +582,6 @@ class DragToDesktopTransitionHandler( sealed class TransitionState { abstract val draggedTaskId: Int abstract val dragAnimator: MoveToDesktopAnimator - abstract val windowDecoration: DesktopModeWindowDecoration abstract val startTransitionToken: IBinder abstract var startTransitionFinishCb: Transitions.TransitionFinishCallback? abstract var startTransitionFinishTransaction: SurfaceControl.Transaction? @@ -589,7 +594,6 @@ class DragToDesktopTransitionHandler( data class FromFullscreen( override val draggedTaskId: Int, override val dragAnimator: MoveToDesktopAnimator, - override val windowDecoration: DesktopModeWindowDecoration, override val startTransitionToken: IBinder, override var startTransitionFinishCb: Transitions.TransitionFinishCallback? = null, override var startTransitionFinishTransaction: SurfaceControl.Transaction? = null, @@ -603,7 +607,6 @@ class DragToDesktopTransitionHandler( data class FromSplit( override val draggedTaskId: Int, override val dragAnimator: MoveToDesktopAnimator, - override val windowDecoration: DesktopModeWindowDecoration, override val startTransitionToken: IBinder, override var startTransitionFinishCb: Transitions.TransitionFinishCallback? = null, override var startTransitionFinishTransaction: SurfaceControl.Transaction? = null, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java index 605600f54823..07cf202ddfac 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java @@ -38,7 +38,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.wm.shell.transition.Transitions; -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration; +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener; import java.util.ArrayList; import java.util.List; @@ -59,8 +59,8 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition public static final int FREEFORM_ANIMATION_DURATION = 336; private final List<IBinder> mPendingTransitionTokens = new ArrayList<>(); - private DesktopModeWindowDecoration mDesktopModeWindowDecoration; + private OnTaskResizeAnimationListener mOnTaskResizeAnimationListener; public EnterDesktopTaskTransitionHandler( Transitions transitions) { this(transitions, SurfaceControl.Transaction::new); @@ -73,14 +73,15 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition mTransactionSupplier = supplier; } + void setOnTaskResizeAnimationListener(OnTaskResizeAnimationListener listener) { + mOnTaskResizeAnimationListener = listener; + } + /** * Starts Transition of type TRANSIT_MOVE_TO_DESKTOP * @param wct WindowContainerTransaction for transition - * @param decor {@link DesktopModeWindowDecoration} of task being animated */ - public void moveToDesktop(@NonNull WindowContainerTransaction wct, - DesktopModeWindowDecoration decor) { - mDesktopModeWindowDecoration = decor; + public void moveToDesktop(@NonNull WindowContainerTransaction wct) { final IBinder token = mTransitions.startTransition(TRANSIT_MOVE_TO_DESKTOP, wct, this); mPendingTransitionTokens.add(token); } @@ -136,33 +137,33 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition @NonNull TransitionInfo.Change change, @NonNull SurfaceControl.Transaction startT, @NonNull Transitions.TransitionFinishCallback finishCallback) { - if (mDesktopModeWindowDecoration == null) { - Slog.e(TAG, "Window Decoration is not available for this transition"); + final SurfaceControl leash = change.getLeash(); + final Rect startBounds = change.getStartAbsBounds(); + final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); + if (mOnTaskResizeAnimationListener == null) { + Slog.e(TAG, "onTaskResizeAnimationListener is not available for this transition"); return false; } - final SurfaceControl leash = change.getLeash(); - final Rect startBounds = change.getStartAbsBounds(); - startT.setPosition(leash, startBounds.left, startBounds.right) + startT.setPosition(leash, startBounds.left, startBounds.top) .setWindowCrop(leash, startBounds.width(), startBounds.height()) .show(leash); - mDesktopModeWindowDecoration.showResizeVeil(startT, startBounds); - + mOnTaskResizeAnimationListener.onAnimationStart(taskInfo.taskId, startT, startBounds); final ValueAnimator animator = ValueAnimator.ofObject(new RectEvaluator(), change.getStartAbsBounds(), change.getEndAbsBounds()); animator.setDuration(FREEFORM_ANIMATION_DURATION); SurfaceControl.Transaction t = mTransactionSupplier.get(); animator.addUpdateListener(animation -> { final Rect animationValue = (Rect) animator.getAnimatedValue(); - t.setPosition(leash, animationValue.left, animationValue.right) + t.setPosition(leash, animationValue.left, animationValue.top) .setWindowCrop(leash, animationValue.width(), animationValue.height()) .show(leash); - mDesktopModeWindowDecoration.updateResizeVeil(t, animationValue); + mOnTaskResizeAnimationListener.onBoundsChange(taskInfo.taskId, t, animationValue); }); animator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - mDesktopModeWindowDecoration.hideResizeVeil(); + mOnTaskResizeAnimationListener.onAnimationEnd(taskInfo.taskId); mTransitions.getMainExecutor().execute( () -> finishCallback.onTransitionFinished(null)); } 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 0218493589b0..c469e652b117 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 @@ -21,7 +21,6 @@ import android.animation.RectEvaluator import android.animation.ValueAnimator import android.graphics.Rect import android.os.IBinder -import android.util.SparseArray import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_CHANGE import android.window.TransitionInfo @@ -30,7 +29,7 @@ import android.window.WindowContainerTransaction import androidx.core.animation.addListener import com.android.wm.shell.transition.Transitions import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE -import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration +import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener import java.util.function.Supplier /** Handles the animation of quick resizing of desktop tasks. */ @@ -40,7 +39,7 @@ class ToggleResizeDesktopTaskTransitionHandler( ) : Transitions.TransitionHandler { private val rectEvaluator = RectEvaluator(Rect()) - private val taskToDecorationMap = SparseArray<DesktopModeWindowDecoration>() + private lateinit var onTaskResizeAnimationListener: OnTaskResizeAnimationListener private var boundsAnimator: Animator? = null @@ -49,13 +48,12 @@ class ToggleResizeDesktopTaskTransitionHandler( ) : this(transitions, Supplier { SurfaceControl.Transaction() }) /** Starts a quick resize transition. */ - fun startTransition( - wct: WindowContainerTransaction, - taskId: Int, - windowDecoration: DesktopModeWindowDecoration - ) { + fun startTransition(wct: WindowContainerTransaction) { transitions.startTransition(TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE, wct, this) - taskToDecorationMap.put(taskId, windowDecoration) + } + + fun setOnTaskResizeAnimationListener(listener: OnTaskResizeAnimationListener) { + onTaskResizeAnimationListener = listener } override fun startAnimation( @@ -70,9 +68,6 @@ class ToggleResizeDesktopTaskTransitionHandler( val taskId = checkNotNull(change.taskInfo).taskId val startBounds = change.startAbsBounds val endBounds = change.endAbsBounds - val windowDecor = - taskToDecorationMap.removeReturnOld(taskId) - ?: throw IllegalStateException("Window decoration not found for task $taskId") val tx = transactionSupplier.get() boundsAnimator?.cancel() @@ -90,7 +85,11 @@ class ToggleResizeDesktopTaskTransitionHandler( ) .setWindowCrop(leash, startBounds.width(), startBounds.height()) .show(leash) - windowDecor.showResizeVeil(startTransaction, startBounds) + onTaskResizeAnimationListener.onAnimationStart( + taskId, + startTransaction, + startBounds + ) }, onEnd = { finishTransaction @@ -101,7 +100,7 @@ class ToggleResizeDesktopTaskTransitionHandler( ) .setWindowCrop(leash, endBounds.width(), endBounds.height()) .show(leash) - windowDecor.hideResizeVeil() + onTaskResizeAnimationListener.onAnimationEnd(taskId) finishCallback.onTransitionFinished(null) boundsAnimator = null } @@ -111,7 +110,7 @@ class ToggleResizeDesktopTaskTransitionHandler( tx.setPosition(leash, rect.left.toFloat(), rect.top.toFloat()) .setWindowCrop(leash, rect.width(), rect.height()) .show(leash) - windowDecor.updateResizeVeil(tx, rect) + onTaskResizeAnimationListener.onBoundsChange(taskId, tx, rect) } start() } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt new file mode 100644 index 000000000000..ccf48d0de9ed --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/UnhandledDragController.kt @@ -0,0 +1,100 @@ +/* + * 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.draganddrop + +import android.os.RemoteException +import android.util.Log +import android.view.DragEvent +import android.view.IWindowManager +import android.window.IUnhandledDragCallback +import android.window.IUnhandledDragListener +import androidx.annotation.VisibleForTesting +import com.android.internal.protolog.common.ProtoLog +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.protolog.ShellProtoLogGroup +import java.util.function.Consumer + +/** + * Manages the listener and callbacks for unhandled global drags. + */ +class UnhandledDragController( + val wmService: IWindowManager, + mainExecutor: ShellExecutor +) { + private var callback: UnhandledDragAndDropCallback? = null + + private val unhandledDragListener: IUnhandledDragListener = + object : IUnhandledDragListener.Stub() { + override fun onUnhandledDrop(event: DragEvent, callback: IUnhandledDragCallback) { + mainExecutor.execute() { + this@UnhandledDragController.onUnhandledDrop(event, callback) + } + } + } + + /** + * Listener called when an unhandled drag is started. + */ + interface UnhandledDragAndDropCallback { + /** + * Called when a global drag is unhandled (ie. dropped outside of all visible windows, or + * dropped on a window that does not want to handle it). + * + * The implementer _must_ call onFinishedCallback, and if it consumes the drop, then it is + * also responsible for releasing up the drag surface provided via the drag event. + */ + fun onUnhandledDrop(dragEvent: DragEvent, onFinishedCallback: Consumer<Boolean>) {} + } + + /** + * Sets a listener for callbacks when an unhandled drag happens. + */ + fun setListener(listener: UnhandledDragAndDropCallback?) { + val updateWm = (callback == null && listener != null) + || (callback != null && listener == null) + callback = listener + if (updateWm) { + try { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "%s unhandled drag listener", + if (callback != null) "Registering" else "Unregistering") + wmService.setUnhandledDragListener( + if (callback != null) unhandledDragListener else null) + } catch (e: RemoteException) { + Log.e(TAG, "Failed to set unhandled drag listener") + } + } + } + + @VisibleForTesting + fun onUnhandledDrop(dragEvent: DragEvent, wmCallback: IUnhandledDragCallback) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "onUnhandledDrop: %s", dragEvent) + if (callback == null) { + wmCallback.notifyUnhandledDropComplete(false) + } + + callback?.onUnhandledDrop(dragEvent) { + ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, + "Notifying onUnhandledDrop complete: %b", it) + wmCallback.notifyUnhandledDropComplete(it) + } + } + + companion object { + private val TAG = UnhandledDragController::class.java.simpleName + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java index a80241e0ac5c..f2bdcae31956 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java @@ -16,6 +16,8 @@ package com.android.wm.shell.freeform; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; + import static com.android.wm.shell.ShellTaskOrganizer.TASK_LISTENER_TYPE_FREEFORM; import android.app.ActivityManager.RunningTaskInfo; @@ -151,6 +153,9 @@ public class FreeformTaskListener implements ShellTaskOrganizer.TaskListener, @Override public void onFocusTaskChanged(RunningTaskInfo taskInfo) { + if (taskInfo.getWindowingMode() != WINDOWING_MODE_FREEFORM) { + return; + } ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TASK_ORG, "Freeform Task Focus Changed: #%d focused=%b", taskInfo.taskId, taskInfo.isFocused); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java index 4e75847b6bc0..f92938989637 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java @@ -131,7 +131,8 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen }); mMagnetizedPip.setMagnetListener(new MagnetizedObject.MagnetListener() { @Override - public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { // Show the dismiss target, in case the initial touch event occurred within // the magnetic field radius. if (mEnableDismissDragToEdge) { @@ -141,6 +142,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen @Override public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject, float velX, float velY, boolean wasFlungOut) { if (wasFlungOut) { mMotionHelper.flingToSnapTarget(velX, velY, null /* endAction */); @@ -151,7 +153,8 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen } @Override - public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { if (mEnableDismissDragToEdge) { mMainExecutor.executeDelayed(() -> { mMotionHelper.notifyDismissalPending(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index 97d3457aaa38..dffcc6df79d8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -19,6 +19,7 @@ package com.android.wm.shell.recents; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; +import static android.view.WindowManager.KEYGUARD_VISIBILITY_TRANSIT_FLAGS; import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_LOCKED; import static android.view.WindowManager.TRANSIT_SLEEP; @@ -591,7 +592,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { cancel("transit_sleep"); return; } - if (mKeyguardLocked || (info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) { + if (mKeyguardLocked || (info.getFlags() & KEYGUARD_VISIBILITY_TRANSIT_FLAGS) != 0) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, "[%d] RecentsController.merge: keyguard is locked", mInstanceId); // We will not accept new changes if we are swiping over the keyguard. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index e5045aea189b..70b2f211d943 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -2959,13 +2959,17 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, } public void goToFullscreenFromSplit() { - boolean leftOrTop; - if (mSideStage.isFocused()) { - leftOrTop = (mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT); + // If main stage is focused, toEnd = true if + // mSideStagePosition = SPLIT_POSITION_BOTTOM_OR_RIGHT. Otherwise toEnd = false + // If side stage is focused, toEnd = true if + // mSideStagePosition = SPLIT_POSITION_TOP_OR_LEFT. Otherwise toEnd = false + final boolean toEnd; + if (mMainStage.isFocused()) { + toEnd = (mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT); } else { - leftOrTop = (mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT); + toEnd = (mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT); } - mSplitLayout.flingDividerToDismiss(!leftOrTop, EXIT_REASON_FULLSCREEN_SHORTCUT); + mSplitLayout.flingDividerToDismiss(toEnd, EXIT_REASON_FULLSCREEN_SHORTCUT); } /** Move the specified task to fullscreen, regardless of focus state. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index 93d763608b5f..196e04edbb10 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -480,7 +480,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { WindowContainerTransaction wct = new WindowContainerTransaction(); if (mCaptionInsets != null) { wct.addInsetsSource(mTaskToken, mCaptionInsetsOwner, 0, - WindowInsets.Type.captionBar(), mCaptionInsets); + WindowInsets.Type.captionBar(), mCaptionInsets, null /* boundingRects */); } else { wct.removeInsetsSource(mTaskToken, mCaptionInsetsOwner, 0, WindowInsets.Type.captionBar()); 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 891eea072c0d..7db3d382ed8e 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 @@ -211,6 +211,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { mShellCommandHandler.addDumpCallback(this::dump, this); mDisplayInsetsController.addInsetsChangedListener(mContext.getDisplayId(), new DesktopModeOnInsetsChangedListener()); + mDesktopTasksController.ifPresent(c -> c.setOnTaskResizeAnimationListener( + new DeskopModeOnTaskResizeAnimationListener())); } @Override @@ -356,7 +358,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { // App sometimes draws before the insets from WindowDecoration#relayout have // been added, so they must be added here mWindowDecorByTaskId.get(mTaskId).addCaptionInset(wct); - mDesktopTasksController.get().moveToDesktop(decoration, mTaskId, wct); + mDesktopTasksController.get().moveToDesktop(mTaskId, wct); closeOtherSplitTask(mTaskId); } decoration.closeHandleMenu(); @@ -387,25 +389,23 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { return; } final RunningTaskInfo taskInfo = decoration.mTaskInfo; - mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize( - taskInfo, decoration)); + mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize(taskInfo)); decoration.closeHandleMenu(); } else if (id == R.id.maximize_menu_maximize_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; - mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId))); + mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize(taskInfo)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } else if (id == R.id.maximize_menu_snap_left_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; mDesktopTasksController.ifPresent(c -> c.snapToHalfScreen( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId), SnapPosition.LEFT)); + taskInfo, SnapPosition.LEFT)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } else if (id == R.id.maximize_menu_snap_right_button) { final RunningTaskInfo taskInfo = decoration.mTaskInfo; mDesktopTasksController.ifPresent(c -> c.snapToHalfScreen( - taskInfo, mWindowDecorByTaskId.get(taskInfo.taskId), SnapPosition.RIGHT)); + taskInfo, SnapPosition.RIGHT)); decoration.closeHandleMenu(); decoration.closeMaximizeMenu(); } @@ -558,7 +558,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { } mDesktopTasksController.ifPresent(c -> { final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId); - c.toggleDesktopTaskSize(decoration.mTaskInfo, decoration); + c.toggleDesktopTaskSize(decoration.mTaskInfo); }); return true; } @@ -761,7 +761,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { relevantDecor.mTaskInfo, relevantDecor.mTaskSurface); mDesktopTasksController.ifPresent( c -> c.startDragToDesktop(relevantDecor.mTaskInfo, - mMoveToDesktopAnimator, relevantDecor)); + mMoveToDesktopAnimator)); } } if (mMoveToDesktopAnimator != null) { @@ -1020,6 +1020,34 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { pw.println(innerPrefix + "mWindowDecorByTaskId=" + mWindowDecorByTaskId); } + private class DeskopModeOnTaskResizeAnimationListener + implements OnTaskResizeAnimationListener { + @Override + public void onAnimationStart(int taskId, Transaction t, Rect bounds) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) { + t.apply(); + return; + } + decoration.showResizeVeil(t, bounds); + } + + @Override + public void onBoundsChange(int taskId, Transaction t, Rect bounds) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) return; + decoration.updateResizeVeil(t, bounds); + } + + @Override + public void onAnimationEnd(int taskId) { + final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskId); + if (decoration == null) return; + decoration.hideResizeVeil(); + } + } + + private class DragStartListenerImpl implements DragPositioningCallbackUtility.DragStartListener { @Override 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 3f0a28118597..185365b2a501 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 @@ -299,12 +299,34 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin ActivityManager.RunningTaskInfo taskInfo, boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) { + final int captionLayoutId = getDesktopModeWindowDecorLayoutId(taskInfo.getWindowingMode()); relayoutParams.reset(); relayoutParams.mRunningTaskInfo = taskInfo; - relayoutParams.mLayoutResId = - getDesktopModeWindowDecorLayoutId(taskInfo.getWindowingMode()); + relayoutParams.mLayoutResId = captionLayoutId; relayoutParams.mCaptionHeightId = getCaptionHeightIdStatic(taskInfo.getWindowingMode()); relayoutParams.mCaptionWidthId = getCaptionWidthId(relayoutParams.mLayoutResId); + + // The "app controls" type caption bar should report the occluding elements as bounding + // rects to the insets system so that apps can draw in the empty space left in the center. + if (captionLayoutId == R.layout.desktop_mode_app_controls_window_decor) { + // The "app chip" section of the caption bar, it's aligned to the left and its width + // varies depending on the length of the app name, but we'll report its max width for + // now. + // TODO(b/316387515): consider reporting the true width after it's been laid out. + final RelayoutParams.OccludingCaptionElement appChipElement = + new RelayoutParams.OccludingCaptionElement(); + appChipElement.mWidthResId = R.dimen.desktop_mode_app_details_max_width; + appChipElement.mAlignment = RelayoutParams.OccludingCaptionElement.Alignment.START; + relayoutParams.mOccludingCaptionElements.add(appChipElement); + // The "controls" section of the caption bar (maximize, close btns). These are aligned + // to the right of the caption bar and have a fixed width. + // TODO(b/316387515): add additional padding for an exclusive drag-move region. + final RelayoutParams.OccludingCaptionElement controlsElement = + new RelayoutParams.OccludingCaptionElement(); + controlsElement.mWidthResId = R.dimen.desktop_mode_right_edge_buttons_width; + controlsElement.mAlignment = RelayoutParams.OccludingCaptionElement.Alignment.END; + relayoutParams.mOccludingCaptionElements.add(controlsElement); + } if (DesktopModeStatus.useWindowShadow(/* isFocusedWindow= */ taskInfo.isFocused)) { relayoutParams.mShadowRadiusId = taskInfo.isFocused ? R.dimen.freeform_decor_shadow_focused_thickness diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt new file mode 100644 index 000000000000..09c62bfc9da2 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/OnTaskResizeAnimationListener.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.windowdecor + +import android.graphics.Rect +import android.view.SurfaceControl + +import com.android.wm.shell.transition.Transitions.TransitionHandler +/** + * Listener that allows implementations of [TransitionHandler] to notify when an + * animation that is resizing a task is starting, updating, and finishing the animation. + */ +interface OnTaskResizeAnimationListener { + /** + * Notifies that a transition animation is about to be started with the given bounds. + */ + fun onAnimationStart(taskId: Int, t: SurfaceControl.Transaction, bounds: Rect) + + /** + * Notifies that a transition animation is expanding or shrinking the task to the given bounds. + */ + fun onBoundsChange(taskId: Int, t: SurfaceControl.Transaction, bounds: Rect) + + /** + * Notifies that a transition animation is about to be finished. + */ + fun onAnimationEnd(taskId: Int) +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index afe837e834f0..dc65855646ea 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -50,7 +50,10 @@ import android.window.WindowContainerTransaction; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.desktopmode.DesktopModeStatus; +import com.android.wm.shell.windowdecor.WindowDecoration.RelayoutParams.OccludingCaptionElement; +import java.util.ArrayList; +import java.util.List; import java.util.function.Supplier; /** @@ -293,15 +296,39 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> outResult.mRootView.setTaskFocusState(mTaskInfo.isFocused); // Caption insets - mCaptionInsetsRect.set(taskBounds); if (mIsCaptionVisible) { - mCaptionInsetsRect.bottom = - mCaptionInsetsRect.top + outResult.mCaptionHeight; + // Caption inset is the full width of the task with the |captionHeight| and + // positioned at the top of the task bounds, also in absolute coordinates. + // So just reuse the task bounds and adjust the bottom coordinate. + mCaptionInsetsRect.set(taskBounds); + mCaptionInsetsRect.bottom = mCaptionInsetsRect.top + outResult.mCaptionHeight; + + // Caption bounding rectangles: these are optional, and are used to present finer + // insets than traditional |Insets| to apps about where their content is occluded. + // These are also in absolute coordinates. + final Rect[] boundingRects; + final int numOfElements = params.mOccludingCaptionElements.size(); + if (numOfElements == 0) { + boundingRects = null; + } else { + boundingRects = new Rect[numOfElements]; + for (int i = 0; i < numOfElements; i++) { + final OccludingCaptionElement element = + params.mOccludingCaptionElements.get(i); + final int elementWidthPx = + resources.getDimensionPixelSize(element.mWidthResId); + boundingRects[i] = + calculateBoundingRect(element, elementWidthPx, mCaptionInsetsRect); + } + } + + // Add this caption as an inset source. wct.addInsetsSource(mTaskInfo.token, - mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect); + mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect, + boundingRects); wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures(), - mCaptionInsetsRect); + mCaptionInsetsRect, null /* boundingRects */); } else { wct.removeInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar()); @@ -377,6 +404,20 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } } + private Rect calculateBoundingRect(@NonNull OccludingCaptionElement element, + int elementWidthPx, @NonNull Rect captionRect) { + switch (element.mAlignment) { + case START -> { + return new Rect(0, 0, elementWidthPx, captionRect.height()); + } + case END -> { + return new Rect(captionRect.width() - elementWidthPx, 0, + captionRect.width(), captionRect.height()); + } + } + throw new IllegalArgumentException("Unexpected alignment " + element.mAlignment); + } + /** * Checks if task has entered/exited immersive mode and requires a change in caption visibility. */ @@ -546,7 +587,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> final int captionHeight = loadDimensionPixelSize(mContext.getResources(), captionHeightId); final Rect captionInsets = new Rect(0, 0, 0, captionHeight); wct.addInsetsSource(mTaskInfo.token, mOwner, 0 /* index */, WindowInsets.Type.captionBar(), - captionInsets); + captionInsets, null /* boundingRects */); } static class RelayoutParams { @@ -554,8 +595,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> int mLayoutResId; int mCaptionHeightId; int mCaptionWidthId; - int mShadowRadiusId; + final List<OccludingCaptionElement> mOccludingCaptionElements = new ArrayList<>(); + int mShadowRadiusId; int mCornerRadius; Configuration mWindowDecorConfig; @@ -567,14 +609,28 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mLayoutResId = Resources.ID_NULL; mCaptionHeightId = Resources.ID_NULL; mCaptionWidthId = Resources.ID_NULL; - mShadowRadiusId = Resources.ID_NULL; + mOccludingCaptionElements.clear(); + mShadowRadiusId = Resources.ID_NULL; mCornerRadius = 0; mApplyStartTransactionOnDraw = false; mSetTaskPositionAndCrop = false; mWindowDecorConfig = null; } + + /** + * Describes elements within the caption bar that could occlude app content, and should be + * sent as bounding rectangles to the insets system. + */ + static class OccludingCaptionElement { + int mWidthResId; + Alignment mAlignment; + + enum Alignment { + START, END + } + } } static class RelayoutResult<T extends View & TaskFocusStateConsumer> { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt index 144373f3550e..2309c54b6591 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeAppControlsWindowDecorationViewHolder.kt @@ -8,6 +8,8 @@ import android.graphics.Bitmap import android.graphics.Color import android.view.View import android.view.View.OnLongClickListener +import android.view.WindowInsetsController.APPEARANCE_LIGHT_CAPTION_BARS +import android.view.WindowInsetsController.APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND import android.widget.ImageButton import android.widget.ImageView import android.widget.TextView @@ -79,6 +81,9 @@ internal class DesktopModeAppControlsWindowDecorationViewHolder( @ColorInt private fun getCaptionBackgroundColor(taskInfo: RunningTaskInfo): Int { + if (isTransparentBackgroundRequested(taskInfo)) { + return Color.TRANSPARENT + } val materialColorAttr: Int = if (isDarkMode()) { if (!taskInfo.isFocused) { @@ -102,6 +107,10 @@ internal class DesktopModeAppControlsWindowDecorationViewHolder( @ColorInt private fun getAppNameAndButtonColor(taskInfo: RunningTaskInfo): Int { val materialColorAttr = when { + isTransparentBackgroundRequested(taskInfo) && + isLightCaptionBar(taskInfo) -> materialColorOnSecondaryContainer + isTransparentBackgroundRequested(taskInfo) && + !isLightCaptionBar(taskInfo) -> materialColorOnSurface isDarkMode() -> materialColorOnSurface else -> materialColorOnSecondaryContainer } @@ -132,6 +141,16 @@ internal class DesktopModeAppControlsWindowDecorationViewHolder( Configuration.UI_MODE_NIGHT_YES } + private fun isTransparentBackgroundRequested(taskInfo: RunningTaskInfo): Boolean { + val appearance = taskInfo.taskDescription?.statusBarAppearance ?: 0 + return (appearance and APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND) != 0 + } + + private fun isLightCaptionBar(taskInfo: RunningTaskInfo): Boolean { + val appearance = taskInfo.taskDescription?.statusBarAppearance ?: 0 + return (appearance and APPEARANCE_LIGHT_CAPTION_BARS) != 0 + } + companion object { private const val TAG = "DesktopModeAppControlsWindowDecorationViewHolder" private const val DARK_THEME_UNFOCUSED_OPACITY = 140 // 55% diff --git a/libs/WindowManager/Shell/tests/unittest/Android.bp b/libs/WindowManager/Shell/tests/unittest/Android.bp index aadadd604d3e..8c4711603904 100644 --- a/libs/WindowManager/Shell/tests/unittest/Android.bp +++ b/libs/WindowManager/Shell/tests/unittest/Android.bp @@ -19,6 +19,7 @@ package { // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: ["frameworks_base_license"], + default_team: "trendy_team_multitasking_windowing", } android_test { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java index 91503b1c3619..7e26577e96d4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java @@ -18,6 +18,7 @@ package com.android.wm.shell.back; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import android.os.Handler; import android.os.Looper; @@ -28,6 +29,7 @@ import android.window.BackMotionEvent; import android.window.BackProgressAnimator; import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; @@ -102,6 +104,36 @@ public class BackProgressAnimatorTest { assertEquals(mReceivedBackEvent.getProgress(), mTargetProgress, 0 /* delta */); } + @Test + public void testResetCallsCancelCallbackImmediately() throws InterruptedException { + // Give the animator some progress. + final BackMotionEvent backEvent = backMotionEventFrom(100, mTargetProgress); + mMainThreadHandler.post( + () -> mProgressAnimator.onBackProgressed(backEvent)); + mTargetProgressCalled.await(1, TimeUnit.SECONDS); + assertNotNull(mReceivedBackEvent); + + mTargetProgress = 0; + mReceivedBackEvent = null; + mTargetProgressCalled = new CountDownLatch(1); + + CountDownLatch cancelCallbackCalled = new CountDownLatch(1); + InstrumentationRegistry.getInstrumentation().runOnMainSync( + () -> mProgressAnimator.onBackCancelled(cancelCallbackCalled::countDown)); + + // verify onBackProgressed and onBackCancelled not yet called + assertNull(mReceivedBackEvent); + assertEquals(1, cancelCallbackCalled.getCount()); + + // call reset + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> mProgressAnimator.reset()); + + // verify that back event with progress 0 is sent and cancel callback is invoked + assertNotNull(mReceivedBackEvent); + assertEquals(mReceivedBackEvent.getProgress(), mTargetProgress, 0 /* delta */); + assertEquals(0, cancelCallbackCalled.getCount()); + } + private void onGestureProgress(BackEvent backEvent) { if (mTargetProgress == backEvent.getProgress()) { mReceivedBackEvent = backEvent; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt index a9f054ec2b2f..a4fb3504f31d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/magnetictarget/MagnetizedObjectTest.kt @@ -201,9 +201,11 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent(x = 200, y = 200)) // You can't become unstuck if you were never stuck in the first place. - verify(magnetListener, never()).onStuckToTarget(magneticTarget) + verify(magnetListener, never()).onStuckToTarget(magneticTarget, + magnetizedObject) verify(magnetListener, never()).onUnstuckFromTarget( - eq(magneticTarget), ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), + eq(magneticTarget), eq(magnetizedObject), + ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), eq(false)) // Move into and then around inside the magnetic field. @@ -213,9 +215,10 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent(x = targetCenterX + 100, y = targetCenterY + 100)) // We should only have received one call to onStuckToTarget and none to unstuck. - verify(magnetListener, times(1)).onStuckToTarget(magneticTarget) + verify(magnetListener, times(1)).onStuckToTarget(magneticTarget, magnetizedObject) verify(magnetListener, never()).onUnstuckFromTarget( - eq(magneticTarget), ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), + eq(magneticTarget), eq(magnetizedObject), + ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), eq(false)) // Move out of the field and then release. @@ -226,7 +229,8 @@ class MagnetizedObjectTest : ShellTestCase() { // We should have received one unstuck call and no more stuck calls. We also should never // have received an onReleasedInTarget call. verify(magnetListener, times(1)).onUnstuckFromTarget( - eq(magneticTarget), ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), + eq(magneticTarget), eq(magnetizedObject), + ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), eq(false)) verifyNoMoreInteractions(magnetListener) } @@ -242,8 +246,8 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent( x = targetCenterX, y = targetCenterY)) - verify(magnetListener, times(1)).onStuckToTarget(magneticTarget) - verify(magnetListener, never()).onReleasedInTarget(magneticTarget) + verify(magnetListener, times(1)).onStuckToTarget(magneticTarget, magnetizedObject) + verify(magnetListener, never()).onReleasedInTarget(magneticTarget, magnetizedObject) // Move back out. dispatchMotionEvents( @@ -252,9 +256,11 @@ class MagnetizedObjectTest : ShellTestCase() { y = targetCenterY - magneticFieldRadius)) verify(magnetListener, times(1)).onUnstuckFromTarget( - eq(magneticTarget), ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), + eq(magneticTarget), + eq(magnetizedObject), + ArgumentMatchers.anyFloat(), ArgumentMatchers.anyFloat(), eq(false)) - verify(magnetListener, never()).onReleasedInTarget(magneticTarget) + verify(magnetListener, never()).onReleasedInTarget(magneticTarget, magnetizedObject) // Move in again and release in the magnetic field. dispatchMotionEvents( @@ -264,8 +270,8 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent( x = targetCenterX, y = targetCenterY, action = MotionEvent.ACTION_UP)) - verify(magnetListener, times(2)).onStuckToTarget(magneticTarget) - verify(magnetListener).onReleasedInTarget(magneticTarget) + verify(magnetListener, times(2)).onStuckToTarget(magneticTarget, magnetizedObject) + verify(magnetListener).onReleasedInTarget(magneticTarget, magnetizedObject) verifyNoMoreInteractions(magnetListener) } @@ -288,7 +294,7 @@ class MagnetizedObjectTest : ShellTestCase() { action = MotionEvent.ACTION_UP)) // Nevertheless it should have ended up stuck to the target. - verify(magnetListener, times(1)).onStuckToTarget(magneticTarget) + verify(magnetListener, times(1)).onStuckToTarget(magneticTarget, magnetizedObject) } @Test @@ -366,7 +372,7 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent(x = 100, y = 900)) // Verify that we received an onStuck for the second target, and no others. - verify(magnetListener).onStuckToTarget(secondMagneticTarget) + verify(magnetListener).onStuckToTarget(secondMagneticTarget, magnetizedObject) verifyNoMoreInteractions(magnetListener) // Drag into the original target. @@ -376,8 +382,9 @@ class MagnetizedObjectTest : ShellTestCase() { // We should have unstuck from the second one and stuck into the original one. verify(magnetListener).onUnstuckFromTarget( - eq(secondMagneticTarget), anyFloat(), anyFloat(), eq(false)) - verify(magnetListener).onStuckToTarget(magneticTarget) + eq(secondMagneticTarget), eq(magnetizedObject), + anyFloat(), anyFloat(), eq(false)) + verify(magnetListener).onStuckToTarget(magneticTarget, magnetizedObject) verifyNoMoreInteractions(magnetListener) } @@ -394,7 +401,7 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent(x = 100, y = 650, action = MotionEvent.ACTION_UP)) // Verify that we received an onStuck for the second target. - verify(magnetListener).onStuckToTarget(secondMagneticTarget) + verify(magnetListener).onStuckToTarget(secondMagneticTarget, magnetizedObject) // Fling towards the first target. dispatchMotionEvents( @@ -403,7 +410,7 @@ class MagnetizedObjectTest : ShellTestCase() { getMotionEvent(x = 500, y = 650, action = MotionEvent.ACTION_UP)) // Verify that we received onStuck for the original target. - verify(magnetListener).onStuckToTarget(magneticTarget) + verify(magnetListener).onStuckToTarget(magneticTarget, magnetizedObject) } @Test @@ -413,10 +420,10 @@ class MagnetizedObjectTest : ShellTestCase() { dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY)) // Moved into the target location, but it should be shifted due to screen offset. // Should not get stuck. - verify(magnetListener, never()).onStuckToTarget(magneticTarget) + verify(magnetListener, never()).onStuckToTarget(magneticTarget, magnetizedObject) dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY + 500)) - verify(magnetListener).onStuckToTarget(magneticTarget) + verify(magnetListener).onStuckToTarget(magneticTarget, magnetizedObject) dispatchMotionEvents( getMotionEvent( @@ -426,7 +433,7 @@ class MagnetizedObjectTest : ShellTestCase() { ) ) - verify(magnetListener).onReleasedInTarget(magneticTarget) + verify(magnetListener).onReleasedInTarget(magneticTarget, magnetizedObject) verifyNoMoreInteractions(magnetListener) } @@ -437,14 +444,15 @@ class MagnetizedObjectTest : ShellTestCase() { dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = adjustedTargetCenter)) dispatchMotionEvents(getMotionEvent(x = 0, y = 0)) - verify(magnetListener).onStuckToTarget(magneticTarget) + verify(magnetListener).onStuckToTarget(magneticTarget, magnetizedObject) verify(magnetListener) - .onUnstuckFromTarget(eq(magneticTarget), anyFloat(), anyFloat(), anyBoolean()) + .onUnstuckFromTarget(eq(magneticTarget), eq(magnetizedObject), + anyFloat(), anyFloat(), anyBoolean()) // Offset if removed, we should now get stuck at the target location magneticTarget.screenVerticalOffset = 0 dispatchMotionEvents(getMotionEvent(x = targetCenterX, y = targetCenterY)) - verify(magnetListener, times(2)).onStuckToTarget(magneticTarget) + verify(magnetListener, times(2)).onStuckToTarget(magneticTarget, magnetizedObject) } @Test @@ -466,7 +474,7 @@ class MagnetizedObjectTest : ShellTestCase() { ) // Nevertheless it should have ended up stuck to the target. - verify(magnetListener, times(1)).onStuckToTarget(magneticTarget) + verify(magnetListener, times(1)).onStuckToTarget(magneticTarget, magnetizedObject) } private fun getSecondMagneticTarget(): MagnetizedObject.MagneticTarget { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index 9249b0a0dfda..79634e6040c4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -303,7 +303,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToDesktop_displayFullscreen_windowingModeSetToFreeform() { val task = setUpFullscreenTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -313,7 +313,7 @@ class DesktopTasksControllerTest : ShellTestCase() { fun moveToDesktop_displayFreeform_windowingModeSetToUndefined() { val task = setUpFullscreenTask() task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_UNDEFINED) @@ -321,7 +321,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_nonExistentTask_doesNothing() { - controller.moveToDesktop(desktopModeWindowDecoration, 999) + controller.moveToDesktop(999) verifyWCTNotExecuted() } @@ -332,7 +332,7 @@ class DesktopTasksControllerTest : ShellTestCase() { val fullscreenTask = setUpFullscreenTask() markTaskHidden(freeformTask) - controller.moveToDesktop(desktopModeWindowDecoration, fullscreenTask) + controller.moveToDesktop(fullscreenTask) with(getLatestMoveToDesktopWct()) { // Operations should include home task, freeform task @@ -354,7 +354,7 @@ class DesktopTasksControllerTest : ShellTestCase() { val freeformTaskSecond = setUpFreeformTask(displayId = SECOND_DISPLAY) markTaskHidden(freeformTaskSecond) - controller.moveToDesktop(desktopModeWindowDecoration, fullscreenTaskDefault) + controller.moveToDesktop(fullscreenTaskDefault) with(getLatestMoveToDesktopWct()) { // Check that hierarchy operations do not include tasks from second display @@ -368,7 +368,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_splitTaskExitsSplit() { val task = setUpSplitScreenTask() - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -380,7 +380,7 @@ class DesktopTasksControllerTest : ShellTestCase() { @Test fun moveToDesktop_fullscreenTaskDoesNotExitSplit() { val task = setUpFullscreenTask() - controller.moveToDesktop(desktopModeWindowDecoration, task) + controller.moveToDesktop(task) val wct = getLatestMoveToDesktopWct() assertThat(wct.changes[task.token.asBinder()]?.windowingMode) .isEqualTo(WINDOWING_MODE_FREEFORM) @@ -802,7 +802,7 @@ class DesktopTasksControllerTest : ShellTestCase() { private fun getLatestMoveToDesktopWct(): WindowContainerTransaction { val arg = ArgumentCaptor.forClass(WindowContainerTransaction::class.java) if (ENABLE_SHELL_TRANSITIONS) { - verify(enterDesktopTransitionHandler).moveToDesktop(arg.capture(), any()) + verify(enterDesktopTransitionHandler).moveToDesktop(arg.capture()) } else { verify(shellTaskOrganizer).applyTransaction(arg.capture()) } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt index be639e867e0b..98e90d60b3b6 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt @@ -24,7 +24,6 @@ import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_CANCEL_D import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP import com.android.wm.shell.transition.Transitions.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP import com.android.wm.shell.windowdecor.MoveToDesktopAnimator -import java.util.function.Supplier import junit.framework.Assert.assertFalse import org.junit.Before import org.junit.Test @@ -38,6 +37,7 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.verifyZeroInteractions import org.mockito.kotlin.whenever +import java.util.function.Supplier /** Tests of [DragToDesktopTransitionHandler]. */ @SmallTest @@ -246,7 +246,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { ) ) .thenReturn(token) - handler.startDragToDesktopTransition(task.taskId, dragAnimator, mock()) + handler.startDragToDesktopTransition(task.taskId, dragAnimator) return token } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.kt new file mode 100644 index 000000000000..522f05233f3a --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/UnhandledDragControllerTest.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.wm.shell.draganddrop + +import android.os.RemoteException +import android.view.DragEvent +import android.view.DragEvent.ACTION_DROP +import android.view.IWindowManager +import android.view.SurfaceControl +import android.window.IUnhandledDragCallback +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.draganddrop.UnhandledDragController.UnhandledDragAndDropCallback +import java.util.function.Consumer +import junit.framework.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.mock +import org.mockito.Mockito.reset +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations + +/** + * Tests for the unhandled drag controller. + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class UnhandledDragControllerTest : ShellTestCase() { + @Mock + private lateinit var mIWindowManager: IWindowManager + + @Mock + private lateinit var mMainExecutor: ShellExecutor + + private lateinit var mController: UnhandledDragController + + @Before + @Throws(RemoteException::class) + fun setUp() { + MockitoAnnotations.initMocks(this) + mController = UnhandledDragController(mIWindowManager, mMainExecutor) + } + + @Test + fun setListener_registersUnregistersWithWM() { + mController.setListener(object : UnhandledDragAndDropCallback {}) + mController.setListener(object : UnhandledDragAndDropCallback {}) + mController.setListener(object : UnhandledDragAndDropCallback {}) + verify(mIWindowManager, Mockito.times(1)) + .setUnhandledDragListener(ArgumentMatchers.any()) + + reset(mIWindowManager) + mController.setListener(null) + mController.setListener(null) + mController.setListener(null) + verify(mIWindowManager, Mockito.times(1)) + .setUnhandledDragListener(ArgumentMatchers.isNull()) + } + + @Test + fun onUnhandledDrop_noListener_expectNotifyUnhandled() { + // Simulate an unhandled drop + val dropEvent = DragEvent.obtain(ACTION_DROP, 0f, 0f, 0f, 0f, null, null, null, + null, null, false) + val wmCallback = mock(IUnhandledDragCallback::class.java) + mController.onUnhandledDrop(dropEvent, wmCallback) + + verify(wmCallback).notifyUnhandledDropComplete(ArgumentMatchers.eq(false)) + } + + @Test + fun onUnhandledDrop_withListener_expectNotifyHandled() { + val lastDragEvent = arrayOfNulls<DragEvent>(1) + + // Set a listener to listen for unhandled drops + mController.setListener(object : UnhandledDragAndDropCallback { + override fun onUnhandledDrop(dragEvent: DragEvent, + onFinishedCallback: Consumer<Boolean>) { + lastDragEvent[0] = dragEvent + onFinishedCallback.accept(true) + dragEvent.dragSurface.release() + } + }) + + // Simulate an unhandled drop + val dragSurface = mock(SurfaceControl::class.java) + val dropEvent = DragEvent.obtain(ACTION_DROP, 0f, 0f, 0f, 0f, null, null, null, + dragSurface, null, false) + val wmCallback = mock(IUnhandledDragCallback::class.java) + mController.onUnhandledDrop(dropEvent, wmCallback) + + verify(wmCallback).notifyUnhandledDropComplete(ArgumentMatchers.eq(true)) + verify(dragSurface).release() + assertEquals(lastDragEvent.get(0), dropEvent) + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java new file mode 100644 index 000000000000..71eea4bb59b1 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.freeform; + +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; + +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.ActivityManager; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.dx.mockito.inline.extended.StaticMockitoSession; +import com.android.wm.shell.ShellTaskOrganizer; +import com.android.wm.shell.ShellTestCase; +import com.android.wm.shell.TestRunningTaskInfoBuilder; +import com.android.wm.shell.desktopmode.DesktopModeStatus; +import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; +import com.android.wm.shell.sysui.ShellInit; +import com.android.wm.shell.windowdecor.WindowDecorViewModel; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.quality.Strictness; + +import java.util.Optional; + +/** + * Tests for {@link FreeformTaskListener} + * Build/Install/Run: + * atest WMShellUnitTests:FreeformTaskListenerTests + */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public final class FreeformTaskListenerTests extends ShellTestCase { + + @Mock + private ShellTaskOrganizer mTaskOrganizer; + @Mock + private ShellInit mShellInit; + @Mock + private WindowDecorViewModel mWindowDecorViewModel; + @Mock + private DesktopModeTaskRepository mDesktopModeTaskRepository; + private FreeformTaskListener mFreeformTaskListener; + private StaticMockitoSession mMockitoSession; + + @Before + public void setup() { + mMockitoSession = mockitoSession().initMocks(this) + .strictness(Strictness.LENIENT).mockStatic(DesktopModeStatus.class).startMocking(); + when(DesktopModeStatus.isEnabled()).thenReturn(true); + mFreeformTaskListener = new FreeformTaskListener( + mShellInit, + mTaskOrganizer, + Optional.of(mDesktopModeTaskRepository), + mWindowDecorViewModel); + } + + @Test + public void testFocusTaskChanged_freeformTaskIsAddedToRepo() { + ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder() + .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); + task.isFocused = true; + + mFreeformTaskListener.onFocusTaskChanged(task); + + verify(mDesktopModeTaskRepository).addOrMoveFreeformTaskToTop(task.taskId); + } + + @Test + public void testFocusTaskChanged_fullscreenTaskIsNotAddedToRepo() { + ActivityManager.RunningTaskInfo fullscreenTask = new TestRunningTaskInfoBuilder() + .setWindowingMode(WINDOWING_MODE_FULLSCREEN).build(); + fullscreenTask.isFocused = true; + + mFreeformTaskListener.onFocusTaskChanged(fullscreenTask); + + verify(mDesktopModeTaskRepository, never()) + .addOrMoveFreeformTaskToTop(fullscreenTask.taskId); + } + + @After + public void tearDown() { + mMockitoSession.finishMocking(); + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 7b53f70a771c..228b25ccb1ba 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -259,7 +259,8 @@ public class WindowDecorationTests extends ShellTestCase { any(), eq(0 /* index */), eq(WindowInsets.Type.captionBar()), - eq(new Rect(100, 300, 400, 364))); + eq(new Rect(100, 300, 400, 364)), + any()); } verify(mMockSurfaceControlStartT).setCornerRadius(mMockTaskSurface, CORNER_RADIUS); @@ -569,9 +570,9 @@ public class WindowDecorationTests extends ShellTestCase { windowDecor.relayout(taskInfo); verify(mMockWindowContainerTransaction).addInsetsSource(eq(taskInfo.token), any(), - eq(0) /* index */, eq(captionBar()), any()); + eq(0) /* index */, eq(captionBar()), any(), any()); verify(mMockWindowContainerTransaction).addInsetsSource(eq(taskInfo.token), any(), - eq(0) /* index */, eq(mandatorySystemGestures()), any()); + eq(0) /* index */, eq(mandatorySystemGestures()), any(), any()); } @Test diff --git a/libs/input/SpriteIcon.h b/libs/input/SpriteIcon.h index 9e6cc81f0bb4..0939af46c258 100644 --- a/libs/input/SpriteIcon.h +++ b/libs/input/SpriteIcon.h @@ -27,33 +27,20 @@ namespace android { * Icon that a sprite displays, including its hotspot. */ struct SpriteIcon { - inline SpriteIcon() : style(PointerIconStyle::TYPE_NULL), hotSpotX(0), hotSpotY(0) {} - inline SpriteIcon(const graphics::Bitmap& bitmap, PointerIconStyle style, float hotSpotX, - float hotSpotY, bool drawNativeDropShadow) + explicit SpriteIcon() = default; + explicit SpriteIcon(const graphics::Bitmap& bitmap, PointerIconStyle style, float hotSpotX, + float hotSpotY, bool drawNativeDropShadow) : bitmap(bitmap), style(style), hotSpotX(hotSpotX), hotSpotY(hotSpotY), drawNativeDropShadow(drawNativeDropShadow) {} - graphics::Bitmap bitmap; - PointerIconStyle style; - float hotSpotX; - float hotSpotY; - bool drawNativeDropShadow; - - inline SpriteIcon copy() const { - return SpriteIcon(bitmap.copy(ANDROID_BITMAP_FORMAT_RGBA_8888), style, hotSpotX, hotSpotY, - drawNativeDropShadow); - } - - inline void reset() { - bitmap.reset(); - style = PointerIconStyle::TYPE_NULL; - hotSpotX = 0; - hotSpotY = 0; - drawNativeDropShadow = false; - } + graphics::Bitmap bitmap{}; + PointerIconStyle style{PointerIconStyle::TYPE_NULL}; + float hotSpotX{}; + float hotSpotY{}; + bool drawNativeDropShadow{false}; inline bool isValid() const { return bitmap.isValid() && !bitmap.isEmpty(); } diff --git a/media/java/android/media/AudioDevicePort.java b/media/java/android/media/AudioDevicePort.java index 2de8eefc4e78..ab5c54b5cd7e 100644 --- a/media/java/android/media/AudioDevicePort.java +++ b/media/java/android/media/AudioDevicePort.java @@ -33,7 +33,7 @@ import java.util.List; * device at the boundary of the audio system. * In addition to base audio port attributes, the device descriptor contains: * - the device type (e.g AudioManager.DEVICE_OUT_SPEAKER) - * - the device address (e.g MAC adddress for AD2P sink). + * - the device address (e.g MAC address for AD2P sink). * @see AudioPort * @hide */ diff --git a/media/java/android/media/AudioHalVersionInfo.java b/media/java/android/media/AudioHalVersionInfo.java index 4cdfc515fe9a..2b6f72eabeec 100644 --- a/media/java/android/media/AudioHalVersionInfo.java +++ b/media/java/android/media/AudioHalVersionInfo.java @@ -79,6 +79,9 @@ public final class AudioHalVersionInfo implements Parcelable, Comparable<AudioHa /** * List of all valid Audio HAL versions. This list need to be in sync with sAudioHALVersions * defined in frameworks/av/media/libaudiohal/FactoryHal.cpp. + * + * Note: update {@link android.media.audio.cts.AudioHalVersionInfoTest} CTS accordingly if + * there is a change to supported versions. */ public static final @NonNull List<AudioHalVersionInfo> VERSIONS = List.of(AIDL_1_0, HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0); diff --git a/media/java/android/media/OWNERS b/media/java/android/media/OWNERS index 49890c150971..8cc42e0bd9b5 100644 --- a/media/java/android/media/OWNERS +++ b/media/java/android/media/OWNERS @@ -11,3 +11,8 @@ per-file *Image* = file:/graphics/java/android/graphics/OWNERS per-file ExifInterface.java,ExifInterfaceUtils.java,IMediaHTTPConnection.aidl,IMediaHTTPService.aidl,JetPlayer.java,MediaDataSource.java,MediaExtractor.java,MediaHTTPConnection.java,MediaHTTPService.java,MediaPlayer.java=set noparent per-file ExifInterface.java,ExifInterfaceUtils.java,IMediaHTTPConnection.aidl,IMediaHTTPService.aidl,JetPlayer.java,MediaDataSource.java,MediaExtractor.java,MediaHTTPConnection.java,MediaHTTPService.java,MediaPlayer.java=file:platform/frameworks/av:/media/janitors/media_solutions_OWNERS + +# Haptics team also works on Ringtone +per-file *Ringtone* = file:/services/core/java/com/android/server/vibrator/OWNERS + +per-file flags/projection.aconfig = file:projection/OWNERS diff --git a/media/java/android/media/flags/projection.aconfig b/media/java/android/media/flags/projection.aconfig new file mode 100644 index 000000000000..c4b38c725ea4 --- /dev/null +++ b/media/java/android/media/flags/projection.aconfig @@ -0,0 +1,11 @@ +package: "com.android.media.flags" + +# Project link: https://gantry.corp.google.com/projects/android_platform_window_surfaces/changes + +flag { + name: "limit_manage_media_projection" + namespace: "lse_desktop_experience" + description: "Limit signature permission manage_media_projection to the SystemUI role" + bug: "323008518" + is_fixed_read_only: true +} diff --git a/media/java/android/media/metrics/EditingEndedEvent.java b/media/java/android/media/metrics/EditingEndedEvent.java index 5ed8d40af63e..9b3477f4bd69 100644 --- a/media/java/android/media/metrics/EditingEndedEvent.java +++ b/media/java/android/media/metrics/EditingEndedEvent.java @@ -18,8 +18,10 @@ package android.media.metrics; import static com.android.media.editing.flags.Flags.FLAG_ADD_MEDIA_METRICS_EDITING; import android.annotation.FlaggedApi; +import android.annotation.FloatRange; import android.annotation.IntDef; import android.annotation.IntRange; +import android.annotation.LongDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Bundle; @@ -27,6 +29,8 @@ import android.os.Parcel; import android.os.Parcelable; import java.lang.annotation.Retention; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; /** Event for an editing operation having ended. */ @@ -57,6 +61,8 @@ public final class EditingEndedEvent extends Event implements Parcelable { private final @FinalState int mFinalState; + private final float mFinalProgressPercent; + // The special value 0 is reserved for the field being unspecified in the proto. /** Special value representing that no error occurred. */ @@ -152,18 +158,81 @@ public final class EditingEndedEvent extends Event implements Parcelable { /** Special value for unknown {@linkplain #getTimeSinceCreatedMillis() time since creation}. */ public static final int TIME_SINCE_CREATED_UNKNOWN = -1; + /** Special value for unknown {@linkplain #getFinalProgressPercent() final progress}. */ + public static final int PROGRESS_PERCENT_UNKNOWN = -1; + private final @ErrorCode int mErrorCode; @SuppressWarnings("HidingField") // Hiding field from superclass as for playback events. private final long mTimeSinceCreatedMillis; + @Nullable private final String mExporterName; + @Nullable private final String mMuxerName; + private final ArrayList<MediaItemInfo> mInputMediaItemInfos; + @Nullable private final MediaItemInfo mOutputMediaItemInfo; + + /** @hide */ + @LongDef( + prefix = {"OPERATION_TYPE_"}, + flag = true, + value = { + OPERATION_TYPE_VIDEO_TRANSCODE, + OPERATION_TYPE_AUDIO_TRANSCODE, + OPERATION_TYPE_VIDEO_EDIT, + OPERATION_TYPE_AUDIO_EDIT, + OPERATION_TYPE_VIDEO_TRANSMUX, + OPERATION_TYPE_AUDIO_TRANSMUX, + OPERATION_TYPE_PAUSED, + OPERATION_TYPE_RESUMED, + }) + @Retention(java.lang.annotation.RetentionPolicy.SOURCE) + public @interface OperationType {} + + /** Input video was decoded and re-encoded. */ + public static final long OPERATION_TYPE_VIDEO_TRANSCODE = 1; + + /** Input audio was decoded and re-encoded. */ + public static final long OPERATION_TYPE_AUDIO_TRANSCODE = 1L << 1; + + /** Input video was edited. */ + public static final long OPERATION_TYPE_VIDEO_EDIT = 1L << 2; + + /** Input audio was edited. */ + public static final long OPERATION_TYPE_AUDIO_EDIT = 1L << 3; + + /** Input video samples were writted (muxed) directly to the output file without transcoding. */ + public static final long OPERATION_TYPE_VIDEO_TRANSMUX = 1L << 4; + + /** Input audio samples were written (muxed) directly to the output file without transcoding. */ + public static final long OPERATION_TYPE_AUDIO_TRANSMUX = 1L << 5; + + /** The editing operation was paused before it completed. */ + public static final long OPERATION_TYPE_PAUSED = 1L << 6; + + /** The editing operation resumed a previous (paused) operation. */ + public static final long OPERATION_TYPE_RESUMED = 1L << 7; + + private final @OperationType long mOperationTypes; + private EditingEndedEvent( @FinalState int finalState, + float finalProgressPercent, @ErrorCode int errorCode, long timeSinceCreatedMillis, + @Nullable String exporterName, + @Nullable String muxerName, + ArrayList<MediaItemInfo> inputMediaItemInfos, + @Nullable MediaItemInfo outputMediaItemInfo, + @OperationType long operationTypes, @NonNull Bundle extras) { mFinalState = finalState; + mFinalProgressPercent = finalProgressPercent; mErrorCode = errorCode; mTimeSinceCreatedMillis = timeSinceCreatedMillis; + mExporterName = exporterName; + mMuxerName = muxerName; + mInputMediaItemInfos = inputMediaItemInfos; + mOutputMediaItemInfo = outputMediaItemInfo; + mOperationTypes = operationTypes; mMetricsBundle = extras.deepCopy(); } @@ -173,6 +242,14 @@ public final class EditingEndedEvent extends Event implements Parcelable { return mFinalState; } + /** + * Returns the progress of the editing operation in percent at the moment that it ended, or + * {@link #PROGRESS_PERCENT_UNKNOWN} if unknown. + */ + public float getFinalProgressPercent() { + return mFinalProgressPercent; + } + /** Returns the error code for a {@linkplain #FINAL_STATE_ERROR failed} editing session. */ @ErrorCode public int getErrorCode() { @@ -195,6 +272,41 @@ public final class EditingEndedEvent extends Event implements Parcelable { } /** + * Returns the name of the library implementing the exporting operation, or {@code null} if + * unknown. + */ + @Nullable + public String getExporterName() { + return mExporterName; + } + + /** + * Returns the name of the library implementing the media muxing operation, or {@code null} if + * unknown. + */ + @Nullable + public String getMuxerName() { + return mMuxerName; + } + + /** Gets information about the input media items, or an empty list if unspecified. */ + @NonNull + public List<MediaItemInfo> getInputMediaItemInfos() { + return new ArrayList<>(mInputMediaItemInfos); + } + + /** Gets information about the output media item, or {@code null} if unspecified. */ + @Nullable + public MediaItemInfo getOutputMediaItemInfo() { + return mOutputMediaItemInfo; + } + + /** Gets a set of flags describing the types of operations performed. */ + public @OperationType long getOperationTypes() { + return mOperationTypes; + } + + /** * Gets metrics-related information that is not supported by dedicated methods. * * <p>It is intended to be used for backwards compatibility by the metrics infrastructure. @@ -208,15 +320,33 @@ public final class EditingEndedEvent extends Event implements Parcelable { @Override @NonNull public String toString() { - return "PlaybackErrorEvent { " + return "EditingEndedEvent { " + "finalState = " + mFinalState + ", " + + "finalProgressPercent = " + + mFinalProgressPercent + + ", " + "errorCode = " + mErrorCode + ", " + "timeSinceCreatedMillis = " + mTimeSinceCreatedMillis + + ", " + + "exporterName = " + + mExporterName + + ", " + + "muxerName = " + + mMuxerName + + ", " + + "inputMediaItemInfos = " + + mInputMediaItemInfos + + ", " + + "outputMediaItemInfo = " + + mOutputMediaItemInfo + + ", " + + "operationTypes = " + + mOperationTypes + " }"; } @@ -226,20 +356,41 @@ public final class EditingEndedEvent extends Event implements Parcelable { if (o == null || getClass() != o.getClass()) return false; EditingEndedEvent that = (EditingEndedEvent) o; return mFinalState == that.mFinalState + && mFinalProgressPercent == that.mFinalProgressPercent && mErrorCode == that.mErrorCode - && mTimeSinceCreatedMillis == that.mTimeSinceCreatedMillis; + && Objects.equals(mInputMediaItemInfos, that.mInputMediaItemInfos) + && Objects.equals(mOutputMediaItemInfo, that.mOutputMediaItemInfo) + && mOperationTypes == that.mOperationTypes + && mTimeSinceCreatedMillis == that.mTimeSinceCreatedMillis + && Objects.equals(mExporterName, that.mExporterName) + && Objects.equals(mMuxerName, that.mMuxerName); } @Override public int hashCode() { - return Objects.hash(mFinalState, mErrorCode, mTimeSinceCreatedMillis); + return Objects.hash( + mFinalState, + mFinalProgressPercent, + mErrorCode, + mInputMediaItemInfos, + mOutputMediaItemInfo, + mOperationTypes, + mTimeSinceCreatedMillis, + mExporterName, + mMuxerName); } @Override public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeInt(mFinalState); + dest.writeFloat(mFinalProgressPercent); dest.writeInt(mErrorCode); dest.writeLong(mTimeSinceCreatedMillis); + dest.writeString(mExporterName); + dest.writeString(mMuxerName); + dest.writeTypedList(mInputMediaItemInfos); + dest.writeTypedObject(mOutputMediaItemInfo, /* parcelableFlags= */ 0); + dest.writeLong(mOperationTypes); dest.writeBundle(mMetricsBundle); } @@ -249,15 +400,17 @@ public final class EditingEndedEvent extends Event implements Parcelable { } private EditingEndedEvent(@NonNull Parcel in) { - int finalState = in.readInt(); - int errorCode = in.readInt(); - long timeSinceCreatedMillis = in.readLong(); - Bundle metricsBundle = in.readBundle(); - - mFinalState = finalState; - mErrorCode = errorCode; - mTimeSinceCreatedMillis = timeSinceCreatedMillis; - mMetricsBundle = metricsBundle; + mFinalState = in.readInt(); + mFinalProgressPercent = in.readFloat(); + mErrorCode = in.readInt(); + mTimeSinceCreatedMillis = in.readLong(); + mExporterName = in.readString(); + mMuxerName = in.readString(); + mInputMediaItemInfos = new ArrayList<>(); + in.readTypedList(mInputMediaItemInfos, MediaItemInfo.CREATOR); + mOutputMediaItemInfo = in.readTypedObject(MediaItemInfo.CREATOR); + mOperationTypes = in.readLong(); + mMetricsBundle = in.readBundle(); } public static final @NonNull Creator<EditingEndedEvent> CREATOR = @@ -277,8 +430,14 @@ public final class EditingEndedEvent extends Event implements Parcelable { @FlaggedApi(FLAG_ADD_MEDIA_METRICS_EDITING) public static final class Builder { private final @FinalState int mFinalState; + private final ArrayList<MediaItemInfo> mInputMediaItemInfos; + private float mFinalProgressPercent; private @ErrorCode int mErrorCode; private long mTimeSinceCreatedMillis; + @Nullable private String mExporterName; + @Nullable private String mMuxerName; + @Nullable private MediaItemInfo mOutputMediaItemInfo; + private @OperationType long mOperationTypes; private Bundle mMetricsBundle; /** @@ -288,12 +447,27 @@ public final class EditingEndedEvent extends Event implements Parcelable { */ public Builder(@FinalState int finalState) { mFinalState = finalState; + mFinalProgressPercent = PROGRESS_PERCENT_UNKNOWN; mErrorCode = ERROR_CODE_NONE; mTimeSinceCreatedMillis = TIME_SINCE_CREATED_UNKNOWN; + mInputMediaItemInfos = new ArrayList<>(); mMetricsBundle = new Bundle(); } /** + * Sets the progress of the editing operation in percent at the moment that it ended. + * + * @param finalProgressPercent The progress of the editing operation in percent at the + * moment that it ended. + * @see #getFinalProgressPercent() + */ + public @NonNull Builder setFinalProgressPercent( + @FloatRange(from = 0, to = 100) float finalProgressPercent) { + mFinalProgressPercent = finalProgressPercent; + return this; + } + + /** * Sets the elapsed time since creating the editing session, in milliseconds. * * @param timeSinceCreatedMillis The elapsed time since creating the editing session, in @@ -306,26 +480,82 @@ public final class EditingEndedEvent extends Event implements Parcelable { return this; } + /** + * The name of the library implementing the exporting operation. For example, a Maven + * artifact ID like "androidx.media3.media3-transformer:1.3.0-beta01". + * + * @param exporterName The name of the library implementing the export operation. + * @see #getExporterName() + */ + public @NonNull Builder setExporterName(@NonNull String exporterName) { + mExporterName = Objects.requireNonNull(exporterName); + return this; + } + + /** + * The name of the library implementing the media muxing operation. For example, a Maven + * artifact ID like "androidx.media3.media3-muxer:1.3.0-beta01". + * + * @param muxerName The name of the library implementing the media muxing operation. + * @see #getMuxerName() + */ + public @NonNull Builder setMuxerName(@NonNull String muxerName) { + mMuxerName = Objects.requireNonNull(muxerName); + return this; + } + /** Sets the error code for a {@linkplain #FINAL_STATE_ERROR failed} editing session. */ public @NonNull Builder setErrorCode(@ErrorCode int value) { mErrorCode = value; return this; } + /** Adds information about a media item that was input to the editing operation. */ + public @NonNull Builder addInputMediaItemInfo(@NonNull MediaItemInfo mediaItemInfo) { + mInputMediaItemInfos.add(Objects.requireNonNull(mediaItemInfo)); + return this; + } + + /** Sets information about the output media item. */ + public @NonNull Builder setOutputMediaItemInfo(@NonNull MediaItemInfo mediaItemInfo) { + mOutputMediaItemInfo = Objects.requireNonNull(mediaItemInfo); + return this; + } + + /** + * Adds an operation type to the set of operations performed. + * + * @param operationType A type of operation performed as part of this editing operation. + */ + public @NonNull Builder addOperationType(@OperationType long operationType) { + mOperationTypes |= operationType; + return this; + } + /** * Sets metrics-related information that is not supported by dedicated methods. * * <p>Used for backwards compatibility by the metrics infrastructure. */ public @NonNull Builder setMetricsBundle(@NonNull Bundle metricsBundle) { - mMetricsBundle = metricsBundle; + mMetricsBundle = Objects.requireNonNull(metricsBundle); return this; } /** Builds an instance. */ public @NonNull EditingEndedEvent build() { return new EditingEndedEvent( - mFinalState, mErrorCode, mTimeSinceCreatedMillis, mMetricsBundle); + mFinalState, + mFinalProgressPercent, + mErrorCode, + mTimeSinceCreatedMillis, + mExporterName, + mMuxerName, + mInputMediaItemInfos, + mOutputMediaItemInfo, + mOperationTypes, + mMetricsBundle); } } + } diff --git a/media/java/android/media/metrics/MediaItemInfo.java b/media/java/android/media/metrics/MediaItemInfo.java new file mode 100644 index 000000000000..63dd3ccd3b33 --- /dev/null +++ b/media/java/android/media/metrics/MediaItemInfo.java @@ -0,0 +1,565 @@ +/* + * 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.media.metrics; + +import static com.android.media.editing.flags.Flags.FLAG_ADD_MEDIA_METRICS_EDITING; + +import android.annotation.FlaggedApi; +import android.annotation.FloatRange; +import android.annotation.IntDef; +import android.annotation.IntRange; +import android.annotation.LongDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SuppressLint; +import android.hardware.DataSpace; +import android.media.MediaCodec; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Size; + +import java.lang.annotation.Retention; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** Represents information about a piece of media (for example, an audio or video file). */ +@FlaggedApi(FLAG_ADD_MEDIA_METRICS_EDITING) +public final class MediaItemInfo implements Parcelable { + + /** @hide */ + @IntDef( + prefix = {"SOURCE_TYPE_"}, + value = { + SOURCE_TYPE_UNSPECIFIED, + SOURCE_TYPE_GALLERY, + SOURCE_TYPE_CAMERA, + SOURCE_TYPE_EDITING_SESSION, + SOURCE_TYPE_LOCAL_FILE, + SOURCE_TYPE_REMOTE_FILE, + SOURCE_TYPE_REMOTE_LIVE_STREAM, + SOURCE_TYPE_GENERATED, + }) + @Retention(java.lang.annotation.RetentionPolicy.SOURCE) + public @interface SourceType {} + + /** The media item's source is not known. */ + public static final int SOURCE_TYPE_UNSPECIFIED = 0; + + /** The media item came from the device gallery. */ + public static final int SOURCE_TYPE_GALLERY = 1; + + /** The media item came directly from camera capture. */ + public static final int SOURCE_TYPE_CAMERA = 2; + + /** The media item was output by a previous editing session. */ + public static final int SOURCE_TYPE_EDITING_SESSION = 3; + + /** The media item is stored on the local device's file system. */ + public static final int SOURCE_TYPE_LOCAL_FILE = 4; + + /** The media item is a remote file (for example, it's loaded from an HTTP server). */ + public static final int SOURCE_TYPE_REMOTE_FILE = 5; + + /** The media item is a remotely-served live stream. */ + public static final int SOURCE_TYPE_REMOTE_LIVE_STREAM = 6; + + /** The media item was generated by another system. */ + public static final int SOURCE_TYPE_GENERATED = 7; + + /** @hide */ + @LongDef( + prefix = {"DATA_TYPE_"}, + flag = true, + value = { + DATA_TYPE_IMAGE, + DATA_TYPE_VIDEO, + DATA_TYPE_AUDIO, + DATA_TYPE_METADATA, + DATA_TYPE_DEPTH, + DATA_TYPE_GAIN_MAP, + DATA_TYPE_HIGH_FRAME_RATE, + DATA_TYPE_CUE_POINTS, + DATA_TYPE_GAPLESS, + DATA_TYPE_SPATIAL_AUDIO, + DATA_TYPE_HIGH_DYNAMIC_RANGE_VIDEO, + }) + @Retention(java.lang.annotation.RetentionPolicy.SOURCE) + public @interface DataType {} + + /** The media item includes image data. */ + public static final long DATA_TYPE_IMAGE = 1L; + + /** The media item includes video data. */ + public static final long DATA_TYPE_VIDEO = 1L << 1; + + /** The media item includes audio data. */ + public static final long DATA_TYPE_AUDIO = 1L << 2; + + /** The media item includes metadata. */ + public static final long DATA_TYPE_METADATA = 1L << 3; + + /** The media item includes depth (z-distance) information. */ + public static final long DATA_TYPE_DEPTH = 1L << 4; + + /** The media item includes gain map information (for example, an Ultra HDR gain map). */ + public static final long DATA_TYPE_GAIN_MAP = 1L << 5; + + /** The media item includes high frame rate video data. */ + public static final long DATA_TYPE_HIGH_FRAME_RATE = 1L << 6; + + /** The media item includes time-dependent speed setting metadata. */ + public static final long DATA_TYPE_CUE_POINTS = 1L << 7; + + /** The media item includes gapless audio metadata. */ + public static final long DATA_TYPE_GAPLESS = 1L << 8; + + /** The media item includes spatial audio data. */ + public static final long DATA_TYPE_SPATIAL_AUDIO = 1L << 9; + + /** The media item includes high dynamic range (HDR) video. */ + public static final long DATA_TYPE_HIGH_DYNAMIC_RANGE_VIDEO = 1L << 10; + + /** Special value for numerical fields where the value was not specified. */ + public static final int VALUE_UNSPECIFIED = -1; + + private final @SourceType int mSourceType; + private final @DataType long mDataTypes; + private final long mDurationMillis; + private final long mClipDurationMillis; + @Nullable private final String mContainerMimeType; + private final List<String> mSampleMimeTypes; + private final List<String> mCodecNames; + private final int mAudioSampleRateHz; + private final int mAudioChannelCount; + private final long mAudioSampleCount; + private final Size mVideoSize; + private final int mVideoDataSpace; + private final float mVideoFrameRate; + private final long mVideoSampleCount; + + private MediaItemInfo( + @SourceType int sourceType, + @DataType long dataTypes, + long durationMillis, + long clipDurationMillis, + @Nullable String containerMimeType, + List<String> sampleMimeTypes, + List<String> codecNames, + int audioSampleRateHz, + int audioChannelCount, + long audioSampleCount, + Size videoSize, + int videoDataSpace, + float videoFrameRate, + long videoSampleCount) { + mSourceType = sourceType; + mDataTypes = dataTypes; + mDurationMillis = durationMillis; + mClipDurationMillis = clipDurationMillis; + mContainerMimeType = containerMimeType; + mSampleMimeTypes = sampleMimeTypes; + mCodecNames = codecNames; + mAudioSampleRateHz = audioSampleRateHz; + mAudioChannelCount = audioChannelCount; + mAudioSampleCount = audioSampleCount; + mVideoSize = videoSize; + mVideoDataSpace = videoDataSpace; + mVideoFrameRate = videoFrameRate; + mVideoSampleCount = videoSampleCount; + } + + /** + * Returns where the media item came from, or {@link #SOURCE_TYPE_UNSPECIFIED} if not specified. + */ + public @SourceType int getSourceType() { + return mSourceType; + } + + /** Returns the data types that are present in the media item. */ + public @DataType long getDataTypes() { + return mDataTypes; + } + + /** + * Returns the duration of the media item, in milliseconds, or {@link #VALUE_UNSPECIFIED} if not + * specified. + */ + public long getDurationMillis() { + return mDurationMillis; + } + + /** + * Returns the duration of the clip taken from the media item, in milliseconds, or {@link + * #VALUE_UNSPECIFIED} if not specified. + */ + public long getClipDurationMillis() { + return mClipDurationMillis; + } + + /** Returns the MIME type of the media container, or {@code null} if unspecified. */ + @Nullable + public String getContainerMimeType() { + return mContainerMimeType; + } + + /** + * Returns the MIME types of samples stored in the media container, or an empty list if not + * known. + */ + @NonNull + public List<String> getSampleMimeTypes() { + return new ArrayList<>(mSampleMimeTypes); + } + + /** + * Returns the {@linkplain MediaCodec#getName() media codec names} for codecs that were used as + * part of encoding/decoding this media item, or an empty list if not known or not applicable. + */ + @NonNull + public List<String> getCodecNames() { + return new ArrayList<>(mCodecNames); + } + + /** + * Returns the sample rate of audio, in Hertz, or {@link #VALUE_UNSPECIFIED} if not specified. + */ + public int getAudioSampleRateHz() { + return mAudioSampleRateHz; + } + + /** Returns the number of audio channels, or {@link #VALUE_UNSPECIFIED} if not specified. */ + public int getAudioChannelCount() { + return mAudioChannelCount; + } + + /** + * Returns the number of audio frames in the item, after clipping (if applicable), or {@link + * #VALUE_UNSPECIFIED} if not specified. + */ + public long getAudioSampleCount() { + return mAudioSampleCount; + } + + /** + * Returns the video size, in pixels, or a {@link Size} with width and height set to {@link + * #VALUE_UNSPECIFIED} if not specified. + */ + @NonNull + public Size getVideoSize() { + return mVideoSize; + } + + /** Returns the {@linkplain DataSpace data space} for video, as a packed integer. */ + @SuppressLint("MethodNameUnits") // Packed integer for an android.hardware.DataSpace. + public int getVideoDataSpace() { + return mVideoDataSpace; + } + + /** + * Returns the average video frame rate, in frames per second, or {@link #VALUE_UNSPECIFIED} if + * not specified. + */ + public float getVideoFrameRate() { + return mVideoFrameRate; + } + + /** + * Returns the number of video frames, aftrer clipping (if applicable), or {@link + * #VALUE_UNSPECIFIED} if not specified. + */ + public long getVideoSampleCount() { + return mVideoSampleCount; + } + + /** Builder for {@link MediaItemInfo}. */ + @FlaggedApi(FLAG_ADD_MEDIA_METRICS_EDITING) + public static final class Builder { + + private @SourceType int mSourceType; + private @DataType long mDataTypes; + private long mDurationMillis; + private long mClipDurationMillis; + @Nullable private String mContainerMimeType; + private final ArrayList<String> mSampleMimeTypes; + private final ArrayList<String> mCodecNames; + private int mAudioSampleRateHz; + private int mAudioChannelCount; + private long mAudioSampleCount; + @Nullable private Size mVideoSize; + private int mVideoDataSpace; + private float mVideoFrameRate; + private long mVideoSampleCount; + + /** Creates a new builder. */ + public Builder() { + mSourceType = SOURCE_TYPE_UNSPECIFIED; + mDurationMillis = VALUE_UNSPECIFIED; + mClipDurationMillis = VALUE_UNSPECIFIED; + mSampleMimeTypes = new ArrayList<>(); + mCodecNames = new ArrayList<>(); + mAudioSampleRateHz = VALUE_UNSPECIFIED; + mAudioChannelCount = VALUE_UNSPECIFIED; + mAudioSampleCount = VALUE_UNSPECIFIED; + mVideoSize = new Size(VALUE_UNSPECIFIED, VALUE_UNSPECIFIED); + mVideoFrameRate = VALUE_UNSPECIFIED; + mVideoSampleCount = VALUE_UNSPECIFIED; + } + + /** Sets where the media item came from. */ + public @NonNull Builder setSourceType(@SourceType int sourceType) { + mSourceType = sourceType; + return this; + } + + /** Adds an additional data type represented as part of the media item. */ + public @NonNull Builder addDataType(@DataType long dataType) { + mDataTypes |= dataType; + return this; + } + + /** Sets the duration of the media item, in milliseconds. */ + public @NonNull Builder setDurationMillis(long durationMillis) { + mDurationMillis = durationMillis; + return this; + } + + /** Sets the duration of the clip taken from the media item, in milliseconds. */ + public @NonNull Builder setClipDurationMillis(long clipDurationMillis) { + mClipDurationMillis = clipDurationMillis; + return this; + } + + /** Sets the MIME type of the media container. */ + public @NonNull Builder setContainerMimeType(@NonNull String containerMimeType) { + mContainerMimeType = Objects.requireNonNull(containerMimeType); + return this; + } + + /** Adds a sample MIME type stored in the media container. */ + public @NonNull Builder addSampleMimeType(@NonNull String mimeType) { + mSampleMimeTypes.add(Objects.requireNonNull(mimeType)); + return this; + } + + /** + * Adds an {@linkplain MediaCodec#getName() media codec name} that was used as part of + * decoding/encoding this media item. + */ + public @NonNull Builder addCodecName(@NonNull String codecName) { + mCodecNames.add(Objects.requireNonNull(codecName)); + return this; + } + + /** Sets the sample rate of audio, in Hertz. */ + public @NonNull Builder setAudioSampleRateHz(@IntRange(from = 0) int audioSampleRateHz) { + mAudioSampleRateHz = audioSampleRateHz; + return this; + } + + /** Sets the number of audio channels. */ + public @NonNull Builder setAudioChannelCount(@IntRange(from = 0) int audioChannelCount) { + mAudioChannelCount = audioChannelCount; + return this; + } + + /** Sets the number of audio frames in the item, after clipping (if applicable). */ + public @NonNull Builder setAudioSampleCount(@IntRange(from = 0) long audioSampleCount) { + mAudioSampleCount = audioSampleCount; + return this; + } + + /** Sets the video size, in pixels. */ + public @NonNull Builder setVideoSize(@NonNull Size videoSize) { + mVideoSize = Objects.requireNonNull(videoSize); + return this; + } + + /** + * Sets the {@link DataSpace} of video frames. + * + * @param videoDataSpace The data space, returned by {@link DataSpace#pack(int, int, int)}. + */ + public @NonNull Builder setVideoDataSpace(int videoDataSpace) { + mVideoDataSpace = videoDataSpace; + return this; + } + + /** Sets the average video frame rate, in frames per second. */ + public @NonNull Builder setVideoFrameRate(@FloatRange(from = 0) float videoFrameRate) { + mVideoFrameRate = videoFrameRate; + return this; + } + + /** Sets the number of video frames, after clipping (if applicable). */ + public @NonNull Builder setVideoSampleCount(@IntRange(from = 0) long videoSampleCount) { + mVideoSampleCount = videoSampleCount; + return this; + } + + /** Builds an instance. */ + @NonNull + public MediaItemInfo build() { + return new MediaItemInfo( + mSourceType, + mDataTypes, + mDurationMillis, + mClipDurationMillis, + mContainerMimeType, + mSampleMimeTypes, + mCodecNames, + mAudioSampleRateHz, + mAudioChannelCount, + mAudioSampleCount, + mVideoSize, + mVideoDataSpace, + mVideoFrameRate, + mVideoSampleCount); + } + } + + @Override + @NonNull + public String toString() { + return "MediaItemInfo { " + + "sourceType = " + + mSourceType + + ", " + + "dataTypes = " + + mDataTypes + + ", " + + "durationMillis = " + + mDurationMillis + + ", " + + "clipDurationMillis = " + + mClipDurationMillis + + ", " + + "containerMimeType = " + + mContainerMimeType + + ", " + + "sampleMimeTypes = " + + mSampleMimeTypes + + ", " + + "codecNames = " + + mCodecNames + + ", " + + "audioSampleRateHz = " + + mAudioSampleRateHz + + ", " + + "audioChannelCount = " + + mAudioChannelCount + + ", " + + "audioSampleCount = " + + mAudioSampleCount + + ", " + + "videoSize = " + + mVideoSize + + ", " + + "videoDataSpace = " + + mVideoDataSpace + + ", " + + "videoFrameRate = " + + mVideoFrameRate + + ", " + + "videoSampleCount = " + + mVideoSampleCount + + " }"; + } + + @Override + public boolean equals(@Nullable Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + MediaItemInfo that = (MediaItemInfo) o; + return mSourceType == that.mSourceType + && mDataTypes == that.mDataTypes + && mDurationMillis == that.mDurationMillis + && mClipDurationMillis == that.mClipDurationMillis + && Objects.equals(mContainerMimeType, that.mContainerMimeType) + && mSampleMimeTypes.equals(that.mSampleMimeTypes) + && mCodecNames.equals(that.mCodecNames) + && mAudioSampleRateHz == that.mAudioSampleRateHz + && mAudioChannelCount == that.mAudioChannelCount + && mAudioSampleCount == that.mAudioSampleCount + && Objects.equals(mVideoSize, that.mVideoSize) + && Objects.equals(mVideoDataSpace, that.mVideoDataSpace) + && mVideoFrameRate == that.mVideoFrameRate + && mVideoSampleCount == that.mVideoSampleCount; + } + + @Override + public int hashCode() { + return Objects.hash(mSourceType, mDataTypes); + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeInt(mSourceType); + dest.writeLong(mDataTypes); + dest.writeLong(mDurationMillis); + dest.writeLong(mClipDurationMillis); + dest.writeString(mContainerMimeType); + dest.writeStringList(mSampleMimeTypes); + dest.writeStringList(mCodecNames); + dest.writeInt(mAudioSampleRateHz); + dest.writeInt(mAudioChannelCount); + dest.writeLong(mAudioSampleCount); + dest.writeInt(mVideoSize.getWidth()); + dest.writeInt(mVideoSize.getHeight()); + dest.writeInt(mVideoDataSpace); + dest.writeFloat(mVideoFrameRate); + dest.writeLong(mVideoSampleCount); + } + + @Override + public int describeContents() { + return 0; + } + + private MediaItemInfo(@NonNull Parcel in) { + mSourceType = in.readInt(); + mDataTypes = in.readLong(); + mDurationMillis = in.readLong(); + mClipDurationMillis = in.readLong(); + mContainerMimeType = in.readString(); + mSampleMimeTypes = new ArrayList<>(); + in.readStringList(mSampleMimeTypes); + mCodecNames = new ArrayList<>(); + in.readStringList(mCodecNames); + mAudioSampleRateHz = in.readInt(); + mAudioChannelCount = in.readInt(); + mAudioSampleCount = in.readLong(); + int videoSizeWidth = in.readInt(); + int videoSizeHeight = in.readInt(); + mVideoSize = new Size(videoSizeWidth, videoSizeHeight); + mVideoDataSpace = in.readInt(); + mVideoFrameRate = in.readFloat(); + mVideoSampleCount = in.readLong(); + } + + public static final @NonNull Creator<MediaItemInfo> CREATOR = + new Creator<>() { + @Override + public MediaItemInfo[] newArray(int size) { + return new MediaItemInfo[size]; + } + + @Override + public MediaItemInfo createFromParcel(@NonNull Parcel in) { + return new MediaItemInfo(in); + } + }; +} diff --git a/media/java/android/media/projection/MediaProjectionManager.java b/media/java/android/media/projection/MediaProjectionManager.java index e3290d604794..2a0648d87c85 100644 --- a/media/java/android/media/projection/MediaProjectionManager.java +++ b/media/java/android/media/projection/MediaProjectionManager.java @@ -180,7 +180,7 @@ public final class MediaProjectionManager { @SuppressLint("UnflaggedApi") @TestApi @NonNull - public Intent createScreenCaptureIntent(@Nullable LaunchCookie launchCookie) { + public Intent createScreenCaptureIntent(@NonNull LaunchCookie launchCookie) { Intent i = createScreenCaptureIntent(); i.putExtra(EXTRA_LAUNCH_COOKIE, launchCookie); return i; diff --git a/media/java/android/media/tv/ad/TvAdManager.java b/media/java/android/media/tv/ad/TvAdManager.java index 59b10c6bcd93..76664a66ad53 100644 --- a/media/java/android/media/tv/ad/TvAdManager.java +++ b/media/java/android/media/tv/ad/TvAdManager.java @@ -18,6 +18,7 @@ package android.media.tv.ad; import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringDef; @@ -59,7 +60,7 @@ import java.util.concurrent.Executor; */ @FlaggedApi(Flags.FLAG_ENABLE_AD_SERVICE_FW) @SystemService(Context.TV_AD_SERVICE) -public class TvAdManager { +public final class TvAdManager { // TODO: implement more methods and unhide APIs. private static final String TAG = "TvAdManager"; @@ -237,6 +238,76 @@ public class TvAdManager { */ public static final String SESSION_DATA_KEY_REQUEST_ID = "request_id"; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = false, prefix = "SESSION_STATE_", value = { + SESSION_STATE_STOPPED, + SESSION_STATE_RUNNING, + SESSION_STATE_ERROR}) + public @interface SessionState {} + + /** + * Stopped (or not started) state of AD service session. + */ + public static final int SESSION_STATE_STOPPED = 1; + /** + * Running state of AD service session. + */ + public static final int SESSION_STATE_RUNNING = 2; + /** + * Error state of AD service session. + */ + public static final int SESSION_STATE_ERROR = 3; + + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = false, prefix = "ERROR_", value = { + ERROR_NONE, + ERROR_UNKNOWN, + ERROR_NOT_SUPPORTED, + ERROR_WEAK_SIGNAL, + ERROR_RESOURCE_UNAVAILABLE, + ERROR_BLOCKED, + ERROR_ENCRYPTED, + ERROR_UNKNOWN_CHANNEL, + }) + public @interface ErrorCode {} + + /** + * No error. + */ + public static final int ERROR_NONE = 0; + /** + * Unknown error code. + */ + public static final int ERROR_UNKNOWN = 1; + /** + * Error code for an unsupported channel. + */ + public static final int ERROR_NOT_SUPPORTED = 2; + /** + * Error code for weak signal. + */ + public static final int ERROR_WEAK_SIGNAL = 3; + /** + * Error code when resource (e.g. tuner) is unavailable. + */ + public static final int ERROR_RESOURCE_UNAVAILABLE = 4; + /** + * Error code for blocked contents. + */ + public static final int ERROR_BLOCKED = 5; + /** + * Error code when the key or module is missing for the encrypted channel. + */ + public static final int ERROR_ENCRYPTED = 6; + /** + * Error code when the current channel is an unknown channel. + */ + public static final int ERROR_UNKNOWN_CHANNEL = 7; + private final ITvAdManager mService; private final int mUserId; diff --git a/media/java/android/media/tv/ad/TvAdService.java b/media/java/android/media/tv/ad/TvAdService.java index 6c8a8fd4f9e4..2bba0f395a7d 100644 --- a/media/java/android/media/tv/ad/TvAdService.java +++ b/media/java/android/media/tv/ad/TvAdService.java @@ -280,7 +280,6 @@ public abstract class TvAdService extends Service { /** * Requests the bounds of the current video. - * @hide */ @CallSuper public void requestCurrentVideoBounds() { @@ -304,7 +303,6 @@ public abstract class TvAdService extends Service { /** * Requests the URI of the current channel. - * @hide */ @CallSuper public void requestCurrentChannelUri() { @@ -328,7 +326,6 @@ public abstract class TvAdService extends Service { /** * Requests the list of {@link TvTrackInfo}. - * @hide */ @CallSuper public void requestTrackInfoList() { @@ -354,7 +351,6 @@ public abstract class TvAdService extends Service { * Requests current TV input ID. * * @see android.media.tv.TvInputInfo - * @hide */ @CallSuper public void requestCurrentTvInputId() { @@ -393,7 +389,6 @@ public abstract class TvAdService extends Service { * @param data the original bytes to be signed. * * @see #onSigningResult(String, byte[]) - * @hide */ @CallSuper public void requestSigning(@NonNull String signingId, @NonNull String algorithm, @@ -535,28 +530,24 @@ public abstract class TvAdService extends Service { * Receives current video bounds. * * @param bounds the rectangle area for rendering the current video. - * @hide */ public void onCurrentVideoBounds(@NonNull Rect bounds) { } /** * Receives current channel URI. - * @hide */ public void onCurrentChannelUri(@Nullable Uri channelUri) { } /** * Receives track list. - * @hide */ public void onTrackInfoList(@NonNull List<TvTrackInfo> tracks) { } /** * Receives current TV input ID. - * @hide */ public void onCurrentTvInputId(@Nullable String inputId) { } @@ -569,7 +560,6 @@ public abstract class TvAdService extends Service { * @param result the signed result. * * @see #requestSigning(String, String, String, byte[]) - * @hide */ public void onSigningResult(@NonNull String signingId, @NonNull byte[] result) { } @@ -584,7 +574,6 @@ public abstract class TvAdService extends Service { * "onRequestSigning" can also be added to the params. * * @see TvAdView#ERROR_KEY_METHOD_NAME - * @hide */ public void onError(@NonNull String errMsg, @NonNull Bundle params) { } @@ -601,7 +590,6 @@ public abstract class TvAdService extends Service { * {@link TvInputManager#TV_MESSAGE_KEY_RAW_DATA}. * See {@link TvInputManager#TV_MESSAGE_KEY_SUBTYPE} for more information on * how to parse this data. - * @hide */ public void onTvMessage(@TvInputManager.TvMessageType int type, @NonNull Bundle data) { @@ -671,6 +659,30 @@ public abstract class TvAdService extends Service { } /** + * Notifies when the session state is changed. + * + * @param state the current session state. + * @param err the error code for error state. {@link TvAdManager#ERROR_NONE} is + * used when the state is not {@link TvAdManager#SESSION_STATE_ERROR}. + */ + @CallSuper + public void notifySessionStateChanged( + @TvAdManager.SessionState int state, + @TvAdManager.ErrorCode int err) { + executeOrPostRunnableOnMainThread(new Runnable() { + @MainThread + @Override + public void run() { + if (DEBUG) { + Log.d(TAG, "notifySessionStateChanged (state=" + + state + "; err=" + err + ")"); + } + // TODO: handle session callback + } + }); + } + + /** * Takes care of dispatching incoming input events and tells whether the event was handled. */ int dispatchInputEvent(InputEvent event, InputEventReceiver receiver) { diff --git a/media/java/android/media/tv/ad/TvAdView.java b/media/java/android/media/tv/ad/TvAdView.java index ee01468b8f87..2fac8ce4950d 100644 --- a/media/java/android/media/tv/ad/TvAdView.java +++ b/media/java/android/media/tv/ad/TvAdView.java @@ -61,10 +61,19 @@ public class TvAdView extends ViewGroup { * The name of the method where the error happened, if applicable. For example, if there is an * error during signing, the request name is "onRequestSigning". * @see #notifyError(String, Bundle) - * @hide */ public static final String ERROR_KEY_METHOD_NAME = "method_name"; + /** + * The error code of an error. + * + * <p>It can be {@link TvAdManager#ERROR_WEAK_SIGNAL}, + * {@link TvAdManager#ERROR_RESOURCE_UNAVAILABLE}, etc. + * + * @see #notifyError(String, Bundle) + */ + public static final String ERROR_KEY_ERROR_CODE = "error_code"; + private final TvAdManager mTvAdManager; private final Handler mHandler = new Handler(); @@ -486,7 +495,6 @@ public class TvAdView extends ViewGroup { * Sends current video bounds to related TV AD service. * * @param bounds the rectangle area for rendering the current video. - * @hide */ public void sendCurrentVideoBounds(@NonNull Rect bounds) { if (DEBUG) { @@ -502,7 +510,6 @@ public class TvAdView extends ViewGroup { * * @param channelUri The current channel URI; {@code null} if there is no currently tuned * channel. - * @hide */ public void sendCurrentChannelUri(@Nullable Uri channelUri) { if (DEBUG) { @@ -515,7 +522,6 @@ public class TvAdView extends ViewGroup { /** * Sends track info list to related TV AD service. - * @hide */ public void sendTrackInfoList(@Nullable List<TvTrackInfo> tracks) { if (DEBUG) { @@ -532,7 +538,6 @@ public class TvAdView extends ViewGroup { * @param inputId The current TV input ID whose channel is tuned. {@code null} if no channel is * tuned. * @see android.media.tv.TvInputInfo - * @hide */ public void sendCurrentTvInputId(@Nullable String inputId) { if (DEBUG) { @@ -553,7 +558,6 @@ public class TvAdView extends ViewGroup { * @param signingId the ID to identify the request. It's the same as the corresponding ID in * {@link TvAdService.Session#requestSigning(String, String, String, byte[])} * @param result the signed result. - * @hide */ public void sendSigningResult(@NonNull String signingId, @NonNull byte[] result) { if (DEBUG) { @@ -574,7 +578,7 @@ public class TvAdView extends ViewGroup { * can also be added to the params. * * @see #ERROR_KEY_METHOD_NAME - * @hide + * @see #ERROR_KEY_ERROR_CODE */ public void notifyError(@NonNull String errMsg, @NonNull Bundle params) { if (DEBUG) { @@ -597,7 +601,6 @@ public class TvAdView extends ViewGroup { * {@link TvInputManager#TV_MESSAGE_KEY_RAW_DATA}. * See {@link TvInputManager#TV_MESSAGE_KEY_SUBTYPE} for more information on * how to parse this data. - * @hide */ public void notifyTvMessage(@NonNull @TvInputManager.TvMessageType int type, @NonNull Bundle data) { @@ -633,7 +636,6 @@ public class TvAdView extends ViewGroup { * @param callback the callback to receive events. MUST NOT be {@code null}. * * @see #clearCallback() - * @hide */ public void setCallback( @NonNull @CallbackExecutor Executor executor, @@ -649,7 +651,6 @@ public class TvAdView extends ViewGroup { * Clears the callback. * * @see #setCallback(Executor, TvAdCallback) - * @hide */ public void clearCallback() { synchronized (mCallbackLock) { @@ -845,7 +846,6 @@ public class TvAdView extends ViewGroup { /** * Callback used to receive various status updates on the {@link TvAdView}. - * @hide */ public abstract static class TvAdCallback { @@ -898,5 +898,20 @@ public class TvAdView extends ViewGroup { public void onRequestSigning(@NonNull String serviceId, @NonNull String signingId, @NonNull String algorithm, @NonNull String alias, @NonNull byte[] data) { } + + /** + * This is called when the state of corresponding AD service is changed. + * + * @param serviceId The ID of the AD service bound to this view. + * @param state the current state. + * @param err the error code for error state. {@link TvAdManager#ERROR_NONE} + * is used when the state is not + * {@link TvAdManager#SESSION_STATE_ERROR}. + */ + public void onStateChanged( + @NonNull String serviceId, + @TvAdManager.SessionState int state, + @TvAdManager.ErrorCode int err) { + } } } diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java index eba26d470737..f332f8102013 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppService.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java @@ -873,6 +873,9 @@ public abstract class TvInteractiveAppService extends Service { /** * Called when the corresponding TV input selected to a track. + * + * If the track is deselected and no track is currently selected, + * trackId is an empty string. */ public void onTrackSelected(@TvTrackInfo.Type int type, @NonNull String trackId) { } @@ -1845,6 +1848,10 @@ public abstract class TvInteractiveAppService extends Service { if (DEBUG) { Log.d(TAG, "notifyTrackSelected (type=" + type + "trackId=" + trackId + ")"); } + // TvInputService accepts a Null String, but onTrackSelected expects NonNull. + if (trackId == null) { + trackId = ""; + } onTrackSelected(type, trackId); } diff --git a/opengl/java/android/opengl/OWNERS b/opengl/java/android/opengl/OWNERS index 9c6c610de52a..e340bc62567a 100644 --- a/opengl/java/android/opengl/OWNERS +++ b/opengl/java/android/opengl/OWNERS @@ -2,3 +2,5 @@ sumir@google.com prahladk@google.com +ianelliott@google.com +lpy@google.com diff --git a/packages/CredentialManager/wear/res/values/strings.xml b/packages/CredentialManager/wear/res/values/strings.xml index be7e4487efde..4a92936db85f 100644 --- a/packages/CredentialManager/wear/res/values/strings.xml +++ b/packages/CredentialManager/wear/res/values/strings.xml @@ -33,4 +33,6 @@ <string name="dialog_continue_button">Continue</string> <!-- Content description for the sign in options button of a screen. [CHAR LIMIT=NONE] --> <string name="dialog_sign_in_options_button">Sign-in Options</string> + <!-- Title for multiple credentials flattened screen. [CHAR LIMIT=NONE] --> + <string name="choose_sign_in_title">Choose a sign in</string> </resources>
\ No newline at end of file diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/AccountRow.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/AccountRow.kt index b2812d3c245d..8b19e1b659d2 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/AccountRow.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/AccountRow.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * 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. diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/CredentialsScreenChip.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/CredentialsScreenChip.kt index 5590219bc011..7cd6bb3a6cef 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/CredentialsScreenChip.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/CredentialsScreenChip.kt @@ -48,8 +48,6 @@ fun CredentialsScreenChip( { Text( text = label, - modifier = Modifier.fillMaxWidth(), - textAlign = TextAlign.Center, overflow = TextOverflow.Ellipsis, maxLines = if (secondaryLabel != null) 1 else 2, ) diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/UiState.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/UiState.kt new file mode 100644 index 000000000000..98a9e93047ae --- /dev/null +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/UiState.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.credentialmanager.ui.screens + +import androidx.activity.result.IntentSenderRequest + +sealed class UiState { + data object CredentialScreen : UiState() + + data class CredentialSelected( + val intentSenderRequest: IntentSenderRequest? + ) : UiState() + + data object Cancel : UiState() +} diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt new file mode 100644 index 000000000000..6ba201116e62 --- /dev/null +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldScreen.kt @@ -0,0 +1,140 @@ +/* + * 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.credentialmanager.ui.screens.multiple + +import com.android.credentialmanager.ui.screens.UiState +import android.graphics.drawable.Drawable +import androidx.activity.compose.rememberLauncherForActivityResult +import com.android.credentialmanager.R +import androidx.compose.ui.res.stringResource +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.navigation.NavHostController +import androidx.navigation.compose.rememberNavController +import com.android.credentialmanager.CredentialSelectorUiState +import com.android.credentialmanager.activity.StartBalIntentSenderForResultContract +import com.android.credentialmanager.model.get.CredentialEntryInfo +import com.android.credentialmanager.ui.components.DismissChip +import com.android.credentialmanager.ui.components.CredentialsScreenChip +import com.android.credentialmanager.ui.components.SignInHeader +import com.android.credentialmanager.ui.components.SignInOptionsChip +import com.google.android.horologist.annotations.ExperimentalHorologistApi +import com.google.android.horologist.compose.layout.ScalingLazyColumn +import com.google.android.horologist.compose.layout.ScalingLazyColumnState + +/** + * Screen that shows multiple credentials to select from. + * + * @param credentialSelectorUiState The app bar view model. + * @param screenIcon The view model corresponding to the home page. + * @param columnState ScalingLazyColumn configuration to be be applied + * @param modifier styling for composable + * @param viewModel ViewModel that updates ui state for this screen + * @param navController handles navigation events from this screen + */ +@OptIn(ExperimentalHorologistApi::class) +@Composable +fun MultiCredentialsFoldScreen( + credentialSelectorUiState: CredentialSelectorUiState.Get.MultipleEntry, + screenIcon: Drawable?, + columnState: ScalingLazyColumnState, + modifier: Modifier = Modifier, + viewModel: MultiCredentialsFoldViewModel = hiltViewModel(), + navController: NavHostController = rememberNavController(), +) { + val uiState by viewModel.uiState.collectAsStateWithLifecycle() + + when (val state = uiState) { + UiState.CredentialScreen -> { + MultiCredentialsFoldScreen( + state = credentialSelectorUiState, + onSignInOptionsClicked = viewModel::onSignInOptionsClicked, + onCredentialClicked = viewModel::onCredentialClicked, + onCancelClicked = viewModel::onCancelClicked, + screenIcon = screenIcon, + columnState = columnState, + modifier = modifier + ) + } + + is UiState.CredentialSelected -> { + val launcher = rememberLauncherForActivityResult( + StartBalIntentSenderForResultContract() + ) { + viewModel.onInfoRetrieved(it.resultCode, null) + } + + SideEffect { + state.intentSenderRequest?.let { + launcher.launch(it) + } + } + } + + UiState.Cancel -> { + navController.popBackStack() + } + } +} + +@OptIn(ExperimentalHorologistApi::class) +@Composable +fun MultiCredentialsFoldScreen( + state: CredentialSelectorUiState.Get.MultipleEntry, + onSignInOptionsClicked: () -> Unit, + onCredentialClicked: (entryInfo: CredentialEntryInfo) -> Unit, + onCancelClicked: () -> Unit, + screenIcon: Drawable?, + columnState: ScalingLazyColumnState, + modifier: Modifier, +) { + ScalingLazyColumn( + columnState = columnState, + modifier = modifier.fillMaxSize(), + ) { + item { + SignInHeader( + icon = screenIcon, + title = stringResource(R.string.choose_sign_in_title), + modifier = Modifier + .padding(top = 6.dp), + ) + } + + state.accounts.forEach { + it.sortedCredentialEntryList.forEach { credential: CredentialEntryInfo -> + item { + CredentialsScreenChip( + label = credential.userName, + onClick = { onCredentialClicked(credential) }, + secondaryLabel = credential.credentialTypeDisplayName, + icon = credential.icon, + ) + } + } + } + item { SignInOptionsChip(onSignInOptionsClicked) } + item { DismissChip(onCancelClicked) } + } +} diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldViewModel.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldViewModel.kt new file mode 100644 index 000000000000..627a63de0934 --- /dev/null +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/multiple/MultiCredentialsFoldViewModel.kt @@ -0,0 +1,75 @@ +/* + * 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.credentialmanager.ui.screens.multiple + +import android.content.Intent +import android.credentials.selection.ProviderPendingIntentResponse +import android.credentials.selection.UserSelectionDialogResult +import androidx.lifecycle.ViewModel +import com.android.credentialmanager.client.CredentialManagerClient +import com.android.credentialmanager.ktx.getIntentSenderRequest +import com.android.credentialmanager.model.Request +import com.android.credentialmanager.model.get.CredentialEntryInfo +import com.android.credentialmanager.ui.screens.UiState +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import javax.inject.Inject + +/** ViewModel for [MultiCredentialsFoldScreen].*/ +@HiltViewModel +class MultiCredentialsFoldViewModel @Inject constructor( + private val credentialManagerClient: CredentialManagerClient, +) : ViewModel() { + + private lateinit var requestGet: Request.Get + private lateinit var entryInfo: CredentialEntryInfo + + private val _uiState = + MutableStateFlow<UiState>(UiState.CredentialScreen) + val uiState: StateFlow<UiState> = _uiState + + fun onCredentialClicked(entryInfo: CredentialEntryInfo) { + this.entryInfo = entryInfo + _uiState.value = UiState.CredentialSelected( + intentSenderRequest = entryInfo.getIntentSenderRequest() + ) + } + + fun onSignInOptionsClicked() { + // TODO(b/322797032) Implement navigation route for single credential screen to multiple + // credentials + } + + fun onCancelClicked() { + _uiState.value = UiState.Cancel + } + + fun onInfoRetrieved( + resultCode: Int? = null, + resultData: Intent? = null, + ) { + val userSelectionDialogResult = UserSelectionDialogResult( + requestGet.token, + entryInfo.providerId, + entryInfo.entryKey, + entryInfo.entrySubkey, + if (resultCode != null) ProviderPendingIntentResponse(resultCode, resultData) else null + ) + credentialManagerClient.sendResult(userSelectionDialogResult) + } +} diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt index 92d8a3993989..1697e0f7ce20 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt @@ -42,7 +42,7 @@ import com.android.credentialmanager.ui.components.DismissChip import com.android.credentialmanager.ui.components.SignInHeader import com.android.credentialmanager.ui.components.SignInOptionsChip import com.android.credentialmanager.ui.screens.single.SingleAccountScreen -import com.android.credentialmanager.ui.screens.single.UiState +import com.android.credentialmanager.ui.screens.UiState import com.google.android.horologist.annotations.ExperimentalHorologistApi import com.google.android.horologist.compose.layout.ScalingLazyColumnState diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreenViewModel.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreenViewModel.kt index 35c39f6179d9..37ffaca3cf45 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreenViewModel.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreenViewModel.kt @@ -26,7 +26,7 @@ import com.android.credentialmanager.model.Request import com.android.credentialmanager.client.CredentialManagerClient import com.android.credentialmanager.model.get.CredentialEntryInfo import dagger.hilt.android.lifecycle.HiltViewModel -import com.android.credentialmanager.ui.screens.single.UiState +import com.android.credentialmanager.ui.screens.UiState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import javax.inject.Inject diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt new file mode 100644 index 000000000000..8c2c0814e3ae --- /dev/null +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderScreen.kt @@ -0,0 +1,146 @@ +/* + * 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.credentialmanager.ui.screens.single.signInWithProvider + +import android.graphics.drawable.Drawable +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.navigation.NavHostController +import androidx.navigation.compose.rememberNavController +import com.android.credentialmanager.CredentialSelectorUiState +import com.android.credentialmanager.model.get.CredentialEntryInfo +import com.android.credentialmanager.R +import com.android.credentialmanager.activity.StartBalIntentSenderForResultContract +import com.android.credentialmanager.ui.components.AccountRow +import com.android.credentialmanager.ui.components.ContinueChip +import com.android.credentialmanager.ui.components.DismissChip +import com.android.credentialmanager.ui.components.SignInHeader +import com.android.credentialmanager.ui.components.SignInOptionsChip +import com.android.credentialmanager.ui.screens.single.SingleAccountScreen +import com.android.credentialmanager.ui.screens.UiState +import com.google.android.horologist.annotations.ExperimentalHorologistApi +import com.google.android.horologist.compose.layout.ScalingLazyColumnState + +/** + * Screen that shows sign in with provider credential. + * + * @param credentialSelectorUiState The app bar view model. + * @param screenIcon The view model corresponding to the home page. + * @param columnState ScalingLazyColumn configuration to be be applied to SingleAccountScreen + * @param modifier styling for composable + * @param viewModel ViewModel that updates ui state for this screen + * @param navController handles navigation events from this screen + */ +@OptIn(ExperimentalHorologistApi::class) +@Composable +fun SignInWithProviderScreen( + credentialSelectorUiState: CredentialSelectorUiState.Get.SingleEntry, + screenIcon: Drawable?, + columnState: ScalingLazyColumnState, + modifier: Modifier = Modifier, + viewModel: SignInWithProviderViewModel = hiltViewModel(), + navController: NavHostController = rememberNavController(), +) { + viewModel.initialize(credentialSelectorUiState.entry) + + val uiState by viewModel.uiState.collectAsStateWithLifecycle() + + when (uiState) { + UiState.CredentialScreen -> { + SignInWithProviderScreen( + credentialSelectorUiState.entry, + screenIcon, + columnState, + modifier, + viewModel + ) + } + + is UiState.CredentialSelected -> { + val launcher = rememberLauncherForActivityResult( + StartBalIntentSenderForResultContract() + ) { + viewModel.onInfoRetrieved(it.resultCode, null) + } + + SideEffect { + (uiState as UiState.CredentialSelected).intentSenderRequest?.let { + launcher.launch(it) + } + } + } + + UiState.Cancel -> { + // TODO(b/322797032) add valid navigation path here for going back + navController.popBackStack() + } + } +} + +@OptIn(ExperimentalHorologistApi::class) +@Composable +fun SignInWithProviderScreen( + entry: CredentialEntryInfo, + screenIcon: Drawable?, + columnState: ScalingLazyColumnState, + modifier: Modifier = Modifier, + viewModel: SignInWithProviderViewModel, +) { + SingleAccountScreen( + headerContent = { + SignInHeader( + icon = screenIcon, + title = stringResource(R.string.use_sign_in_with_provider_title, + entry.providerDisplayName), + ) + }, + accountContent = { + val displayName = entry.displayName + if (displayName != null) { + AccountRow( + primaryText = displayName, + secondaryText = entry.userName, + modifier = Modifier.padding(top = 10.dp), + ) + } else { + AccountRow( + primaryText = entry.userName, + modifier = Modifier.padding(top = 10.dp), + ) + } + }, + columnState = columnState, + modifier = modifier.padding(horizontal = 10.dp) + ) { + item { + Column { + ContinueChip(viewModel::onContinueClick) + SignInOptionsChip(viewModel::onSignInOptionsClick) + DismissChip(viewModel::onDismissClick) + } + } + } +}
\ No newline at end of file diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderViewModel.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderViewModel.kt new file mode 100644 index 000000000000..7ba45e5012e8 --- /dev/null +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/signInWithProvider/SignInWithProviderViewModel.kt @@ -0,0 +1,81 @@ +/* + * 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.credentialmanager.ui.screens.single.signInWithProvider + +import android.content.Intent +import android.credentials.selection.ProviderPendingIntentResponse +import android.credentials.selection.UserSelectionDialogResult +import androidx.annotation.MainThread +import androidx.lifecycle.ViewModel +import com.android.credentialmanager.ktx.getIntentSenderRequest +import com.android.credentialmanager.model.Request +import com.android.credentialmanager.client.CredentialManagerClient +import com.android.credentialmanager.model.get.CredentialEntryInfo +import dagger.hilt.android.lifecycle.HiltViewModel +import com.android.credentialmanager.ui.screens.UiState +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import javax.inject.Inject + +/** ViewModel for [SignInWithProviderScreen].*/ +@HiltViewModel +class SignInWithProviderViewModel @Inject constructor( + private val credentialManagerClient: CredentialManagerClient, +) : ViewModel() { + + private val _uiState = + MutableStateFlow<UiState>(UiState.CredentialScreen) + val uiState: StateFlow<UiState> = _uiState + + private lateinit var requestGet: Request.Get + private lateinit var entryInfo: CredentialEntryInfo + + @MainThread + fun initialize(entry: CredentialEntryInfo) { + this.entryInfo = entry + } + + fun onDismissClick() { + _uiState.value = UiState.Cancel + } + + fun onContinueClick() { + _uiState.value = UiState.CredentialSelected( + intentSenderRequest = entryInfo.getIntentSenderRequest() + ) + } + + fun onSignInOptionsClick() { + // TODO(b/322797032) Implement navigation route for single credential screen to multiple + // credentials + } + + fun onInfoRetrieved( + resultCode: Int? = null, + resultData: Intent? = null, + ) { + val userSelectionDialogResult = UserSelectionDialogResult( + requestGet.token, + entryInfo.providerId, + entryInfo.entryKey, + entryInfo.entrySubkey, + if (resultCode != null) ProviderPendingIntentResponse(resultCode, resultData) else null + ) + credentialManagerClient.sendResult(userSelectionDialogResult) + } +} + diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt index 7cc95c5d7299..0fc184506eaf 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt +++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt @@ -36,6 +36,7 @@ import android.content.pm.VersionedPackage import android.graphics.drawable.Icon import android.os.Build import android.os.Bundle +import android.os.Flags import android.os.Process import android.os.UserHandle import android.os.UserManager @@ -97,16 +98,17 @@ class UninstallRepository(private val context: Context) { } } - if (getMaxTargetSdkVersionForUid(context, callingUid) >= Build.VERSION_CODES.P - && !isPermissionGranted( + if (getMaxTargetSdkVersionForUid(context, callingUid) >= Build.VERSION_CODES.P && + !isPermissionGranted( context, Manifest.permission.REQUEST_DELETE_PACKAGES, callingUid - ) - && !isPermissionGranted(context, Manifest.permission.DELETE_PACKAGES, callingUid) + ) && + !isPermissionGranted(context, Manifest.permission.DELETE_PACKAGES, callingUid) ) { Log.e( - LOG_TAG, "Uid " + callingUid + " does not have " - + Manifest.permission.REQUEST_DELETE_PACKAGES + " or " - + Manifest.permission.DELETE_PACKAGES + LOG_TAG, + "Uid " + callingUid + " does not have " + + Manifest.permission.REQUEST_DELETE_PACKAGES + " or " + + Manifest.permission.DELETE_PACKAGES ) return UninstallAborted(UninstallAborted.ABORT_REASON_GENERIC_ERROR) } @@ -138,8 +140,9 @@ class UninstallRepository(private val context: Context) { val profiles = userManager!!.userProfiles if (!profiles.contains(uninstalledUser)) { Log.e( - LOG_TAG, "User " + Process.myUserHandle() + " can't request uninstall " - + "for user " + uninstalledUser + LOG_TAG, + "User " + Process.myUserHandle() + " can't request uninstall " + + "for user " + uninstalledUser ) return UninstallAborted(UninstallAborted.ABORT_REASON_USER_NOT_ALLOWED) } @@ -202,9 +205,13 @@ class UninstallRepository(private val context: Context) { val isSingleUser = isSingleUser() if (isUpdate) { - messageBuilder.append(context.getString( - if (isSingleUser) R.string.uninstall_update_text - else R.string.uninstall_update_text_multiuser + messageBuilder.append( + context.getString( + if (isSingleUser) { + R.string.uninstall_update_text + } else { + R.string.uninstall_update_text_multiuser + } ) ) } else if (uninstallFromAllUsers && !isSingleUser) { @@ -214,42 +221,42 @@ class UninstallRepository(private val context: Context) { val customUserManager = context.createContextAsUser(uninstalledUser!!, 0) .getSystemService(UserManager::class.java) val userName = customUserManager!!.userName - - val uninstalledUserType = getUninstalledUserType(myUserHandle, uninstalledUser!!) - val messageString: String - when (uninstalledUserType) { - UserManager.USER_TYPE_PROFILE_MANAGED -> { + var messageString = context.getString( + R.string.uninstall_application_text_user, + userName + ) + if (userManager!!.isSameProfileGroup(myUserHandle, uninstalledUser!!)) { + if (customUserManager!!.isManagedProfile()) { messageString = context.getString( - R.string.uninstall_application_text_current_user_work_profile, userName + R.string.uninstall_application_text_current_user_work_profile, userName ) - } - - UserManager.USER_TYPE_PROFILE_CLONE -> { + } else if (customUserManager!!.isCloneProfile()){ isClonedApp = true messageString = context.getString( - R.string.uninstall_application_text_current_user_clone_profile + R.string.uninstall_application_text_current_user_clone_profile ) - } - - else -> { + } else if (Flags.allowPrivateProfile() && customUserManager!!.isPrivateProfile()) { + // TODO(b/324244123): Get these Strings from a User Property API. messageString = context.getString( - R.string.uninstall_application_text_user, userName + R.string.uninstall_application_text_current_user_private_profile ) } - } messageBuilder.append(messageString) } else if (isCloneProfile(uninstalledUser!!)) { isClonedApp = true - messageBuilder.append(context.getString( + messageBuilder.append( + context.getString( R.string.uninstall_application_text_current_user_clone_profile ) ) - } else if (myUserHandle == UserHandle.SYSTEM - && hasClonedInstance(targetAppInfo!!.packageName) + } else if (myUserHandle == UserHandle.SYSTEM && + hasClonedInstance(targetAppInfo!!.packageName) ) { - messageBuilder.append(context.getString( - R.string.uninstall_application_text_with_clone_instance, targetAppLabel + messageBuilder.append( + context.getString( + R.string.uninstall_application_text_with_clone_instance, + targetAppLabel ) ) } else { @@ -296,31 +303,6 @@ class UninstallRepository(private val context: Context) { return userCount == 1 || (UserManager.isHeadlessSystemUserMode() && userCount == 2) } - /** - * Returns the type of the user from where an app is being uninstalled. We are concerned with - * only USER_TYPE_PROFILE_MANAGED and USER_TYPE_PROFILE_CLONE and whether the user and profile - * belong to the same profile group. - */ - private fun getUninstalledUserType( - myUserHandle: UserHandle, - uninstalledUserHandle: UserHandle - ): String? { - if (!userManager!!.isSameProfileGroup(myUserHandle, uninstalledUserHandle)) { - return null - } - val customUserManager = context.createContextAsUser(uninstalledUserHandle, 0) - .getSystemService(UserManager::class.java) - val userTypes = - arrayOf(UserManager.USER_TYPE_PROFILE_MANAGED, UserManager.USER_TYPE_PROFILE_CLONE) - - for (userType in userTypes) { - if (customUserManager!!.isUserOfType(userType)) { - return userType - } - } - return null - } - private fun hasClonedInstance(packageName: String): Boolean { // Check if clone user is present on the device. var cloneUser: UserHandle? = null @@ -334,8 +316,8 @@ class UninstallRepository(private val context: Context) { } // Check if another instance of given package exists in clone user profile. return try { - cloneUser != null - && packageManager.getPackageUidAsUser( + cloneUser != null && + packageManager.getPackageUidAsUser( packageName, PackageManager.PackageInfoFlags.of(0), cloneUser.identifier ) > 0 } catch (e: PackageManager.NameNotFoundException) { @@ -382,7 +364,9 @@ class UninstallRepository(private val context: Context) { val storageStatsManager = context.getSystemService(StorageStatsManager::class.java) try { val stats = storageStatsManager!!.queryStatsForPackage( - packageManager.getApplicationInfo(pkg, 0).storageUuid, pkg, user + packageManager.getApplicationInfo(pkg, 0).storageUuid, + pkg, + user ) return stats.getDataBytes() } catch (e: Exception) { @@ -423,17 +407,24 @@ class UninstallRepository(private val context: Context) { broadcastIntent.putExtra(EventResultPersister.EXTRA_ID, uninstallId) broadcastIntent.setPackage(context.packageName) val pendingIntent = PendingIntent.getBroadcast( - context, uninstallId, broadcastIntent, + context, + uninstallId, + broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE ) if (!startUninstall( - targetPackageName!!, uninstalledUser!!, pendingIntent, uninstallFromAllUsers, + targetPackageName!!, + uninstalledUser!!, + pendingIntent, + uninstallFromAllUsers, keepData ) ) { handleUninstallResult( PackageInstaller.STATUS_FAILURE, - PackageManager.DELETE_FAILED_INTERNAL_ERROR, null, 0 + PackageManager.DELETE_FAILED_INTERNAL_ERROR, + null, + 0 ) } } @@ -474,9 +465,14 @@ class UninstallRepository(private val context: Context) { // Caller did not want the result back. So, we either show a Toast, or a Notification. if (status == PackageInstaller.STATUS_SUCCESS) { - val statusMessage = if (isClonedApp) context.getString( - R.string.uninstall_done_clone_app, targetAppLabel - ) else context.getString(R.string.uninstall_done_app, targetAppLabel) + val statusMessage = if (isClonedApp) { + context.getString( + R.string.uninstall_done_clone_app, + targetAppLabel + ) + } else { + context.getString(R.string.uninstall_done_app, targetAppLabel) + } uninstallResult.setValue( UninstallSuccess(activityResultCode = legacyStatus, message = statusMessage) ) @@ -499,27 +495,32 @@ class UninstallRepository(private val context: Context) { findUserOfDeviceAdmin(myUserHandle, targetPackageName!!) if (otherBlockingUserHandle == null) { Log.d( - LOG_TAG, "Uninstall failed because $targetPackageName" - + " is a device admin" + LOG_TAG, + "Uninstall failed because $targetPackageName" + + " is a device admin" ) addDeviceManagerButton(context, uninstallFailedNotification) setBigText( - uninstallFailedNotification, context.getString( + uninstallFailedNotification, + context.getString( R.string.uninstall_failed_device_policy_manager ) ) } else { Log.d( - LOG_TAG, "Uninstall failed because $targetPackageName" - + " is a device admin of user $otherBlockingUserHandle" + LOG_TAG, + "Uninstall failed because $targetPackageName" + + " is a device admin of user $otherBlockingUserHandle" ) val userName = context.createContextAsUser(otherBlockingUserHandle, 0) .getSystemService(UserManager::class.java)!!.userName setBigText( - uninstallFailedNotification, String.format( + uninstallFailedNotification, + String.format( context.getString( R.string.uninstall_failed_device_policy_manager_of_user - ), userName + ), + userName ) ) } @@ -528,7 +529,9 @@ class UninstallRepository(private val context: Context) { PackageManager.DELETE_FAILED_OWNER_BLOCKED -> { val otherBlockingUserHandle = findBlockingUser(targetPackageName!!) val isProfileOfOrSame = isProfileOfOrSame( - userManager!!, myUserHandle, otherBlockingUserHandle + userManager!!, + myUserHandle, + otherBlockingUserHandle ) if (isProfileOfOrSame) { addDeviceManagerButton(context, uninstallFailedNotification) @@ -538,15 +541,19 @@ class UninstallRepository(private val context: Context) { var bigText: String? = null if (otherBlockingUserHandle == null) { Log.d( - LOG_TAG, "Uninstall failed for $targetPackageName " + + LOG_TAG, + "Uninstall failed for $targetPackageName " + "with code $status no blocking user" ) } else if (otherBlockingUserHandle === UserHandle.SYSTEM) { bigText = context.getString(R.string.uninstall_blocked_device_owner) } else { bigText = context.getString( - if (uninstallFromAllUsers) R.string.uninstall_all_blocked_profile_owner - else R.string.uninstall_blocked_profile_owner + if (uninstallFromAllUsers) { + R.string.uninstall_all_blocked_profile_owner + } else { + R.string.uninstall_blocked_profile_owner + } ) } bigText?.let { setBigText(uninstallFailedNotification, it) } @@ -554,8 +561,9 @@ class UninstallRepository(private val context: Context) { else -> { Log.d( - LOG_TAG, "Uninstall blocked for $targetPackageName" - + " with legacy code $legacyStatus" + LOG_TAG, + "Uninstall blocked for $targetPackageName" + + " with legacy code $legacyStatus" ) } } @@ -639,7 +647,9 @@ class UninstallRepository(private val context: Context) { Icon.createWithResource(context, R.drawable.ic_settings_multiuser), context.getString(R.string.manage_users), PendingIntent.getActivity( - context, 0, getUserSettingsIntent(), + context, + 0, + getUserSettingsIntent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) ) @@ -668,7 +678,9 @@ class UninstallRepository(private val context: Context) { Icon.createWithResource(context, R.drawable.ic_lock), context.getString(R.string.manage_device_administrators), PendingIntent.getActivity( - context, 0, getDeviceManagerIntent(), + context, + 0, + getDeviceManagerIntent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) ) @@ -706,7 +718,8 @@ class UninstallRepository(private val context: Context) { context.createContextAsUser(targetUser, 0) .packageManager.packageInstaller.uninstall( VersionedPackage(packageName, PackageManager.VERSION_CODE_HIGHEST), - flags, pendingIntent.intentSender + flags, + pendingIntent.intentSender ) true } catch (e: IllegalArgumentException) { @@ -719,7 +732,8 @@ class UninstallRepository(private val context: Context) { if (callback != null) { callback!!.onUninstallComplete( targetPackageName!!, - PackageManager.DELETE_FAILED_ABORTED, "Cancelled by user" + PackageManager.DELETE_FAILED_ABORTED, + "Cancelled by user" ) } } diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig index bab678178ebf..d622eb859cd1 100644 --- a/packages/SettingsLib/aconfig/settingslib.aconfig +++ b/packages/SettingsLib/aconfig/settingslib.aconfig @@ -17,3 +17,9 @@ flag { } } +flag { + name: "bluetooth_qs_tile_dialog_auto_on_toggle" + namespace: "bluetooth" + description: "Displays the auto on toggle in the bluetooth QS tile dialog" + bug: "316985153" +} diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 3252aad6262f..1b29e8367a78 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -526,7 +526,7 @@ </string-array> <!-- USB configuration values for Developer Settings. - These are lists of USB functions passed to the USB Manager to change USB configuraton. + These are lists of USB functions passed to the USB Manager to change USB configuration. This can be overridden by devices with additional USB configurations. Do not translate. --> <string-array name="usb_configuration_values" translatable="false"> diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 58e0a89d5387..1150ac10c063 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -50,6 +50,7 @@ import android.util.Log; import android.webkit.IWebViewUpdateService; import android.webkit.WebViewFactory; import android.webkit.WebViewProviderInfo; +import android.webkit.WebViewUpdateManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -495,16 +496,26 @@ public class Utils { return sDefaultWebViewPackageName; } - try { - IWebViewUpdateService service = WebViewFactory.getUpdateService(); - if (service != null) { - WebViewProviderInfo provider = service.getDefaultWebViewPackage(); - if (provider != null) { - sDefaultWebViewPackageName = provider.packageName; + WebViewProviderInfo provider = null; + + if (android.webkit.Flags.updateServiceIpcWrapper()) { + WebViewUpdateManager manager = WebViewUpdateManager.getInstance(); + if (manager != null) { + provider = manager.getDefaultWebViewPackage(); + } + } else { + try { + IWebViewUpdateService service = WebViewFactory.getUpdateService(); + if (service != null) { + provider = service.getDefaultWebViewPackage(); } + } catch (RemoteException e) { + Log.e(TAG, "RemoteException when trying to fetch default WebView package Name", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException when trying to fetch default WebView package Name", e); + } + + if (provider != null) { + sDefaultWebViewPackageName = provider.packageName; } return sDefaultWebViewPackageName; } diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index e3012cd3e6fd..249fa7f0df77 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -1621,6 +1621,7 @@ public class ApplicationsState { } public static class AppEntry extends SizeInfo { + @VisibleForTesting String mProfileType; @Nullable public final File apkFile; public final long id; public String label; @@ -1647,11 +1648,6 @@ public class ApplicationsState { */ public boolean isHomeApp; - /** - * Whether or not it's a cloned app . - */ - public boolean isCloned; - public String getNormalizedLabel() { if (normalizedLabel != null) { return normalizedLabel; @@ -1692,11 +1688,21 @@ public class ApplicationsState { () -> this.ensureLabelDescriptionLocked(context)); } UserManager um = UserManager.get(context); - this.showInPersonalTab = shouldShowInPersonalTab(um, info.uid); UserInfo userInfo = um.getUserInfo(UserHandle.getUserId(info.uid)); - if (userInfo != null) { - this.isCloned = userInfo.isCloneProfile(); - } + mProfileType = userInfo.userType; + this.showInPersonalTab = shouldShowInPersonalTab(um, info.uid); + } + + public boolean isClonedProfile() { + return UserManager.USER_TYPE_PROFILE_CLONE.equals(mProfileType); + } + + public boolean isManagedProfile() { + return UserManager.USER_TYPE_PROFILE_MANAGED.equals(mProfileType); + } + + public boolean isPrivateProfile() { + return UserManager.USER_TYPE_PROFILE_PRIVATE.equals(mProfileType); } /** @@ -1890,16 +1896,24 @@ public class ApplicationsState { }; public static final AppFilter FILTER_WORK = new AppFilter() { - private int mCurrentUser; @Override - public void init() { - mCurrentUser = ActivityManager.getCurrentUser(); + public void init() {} + + @Override + public boolean filterApp(AppEntry entry) { + return !entry.showInPersonalTab && entry.isManagedProfile(); } + }; + + public static final AppFilter FILTER_PRIVATE_PROFILE = new AppFilter() { + + @Override + public void init() {} @Override public boolean filterApp(AppEntry entry) { - return !entry.showInPersonalTab; + return !entry.showInPersonalTab && entry.isPrivateProfile(); } }; diff --git a/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/model/ZenMode.kt b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/model/ZenMode.kt new file mode 100644 index 000000000000..a696f8c9c9c9 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/model/ZenMode.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settingslib.statusbar.notification.data.model + +import android.provider.Settings.Global + +/** Validating wrapper for [android.app.NotificationManager.getZenMode] values. */ +@JvmInline +value class ZenMode(val zenMode: Int) { + + init { + require(zenMode in supportedModes) { "Unsupported zenMode=$zenMode" } + } + + private companion object { + + val supportedModes = + listOf( + Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, + Global.ZEN_MODE_NO_INTERRUPTIONS, + Global.ZEN_MODE_ALARMS, + Global.ZEN_MODE_OFF, + ) + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/FakeNotificationsSoundPolicyRepository.kt b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/FakeNotificationsSoundPolicyRepository.kt new file mode 100644 index 000000000000..60983070b1cf --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/FakeNotificationsSoundPolicyRepository.kt @@ -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.settingslib.statusbar.notification.data.repository + +import android.app.NotificationManager +import com.android.settingslib.statusbar.notification.data.model.ZenMode +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +class FakeNotificationsSoundPolicyRepository : NotificationsSoundPolicyRepository { + + private val mutableNotificationPolicy = MutableStateFlow<NotificationManager.Policy?>(null) + override val notificationPolicy: StateFlow<NotificationManager.Policy?> + get() = mutableNotificationPolicy.asStateFlow() + + private val mutableZenMode = MutableStateFlow<ZenMode?>(null) + override val zenMode: StateFlow<ZenMode?> + get() = mutableZenMode.asStateFlow() + + fun updateNotificationPolicy(policy: NotificationManager.Policy?) { + mutableNotificationPolicy.value = policy + } + + fun updateZenMode(zenMode: ZenMode?) { + mutableZenMode.value = zenMode + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepository.kt b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepository.kt new file mode 100644 index 000000000000..0fb8c3f8bc6d --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepository.kt @@ -0,0 +1,95 @@ +/* + * 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.statusbar.notification.data.repository + +import android.app.NotificationManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import com.android.settingslib.statusbar.notification.data.model.ZenMode +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch + +/** Provides state of volume policy and restrictions imposed by notifications. */ +interface NotificationsSoundPolicyRepository { + + /** @see NotificationManager.getNotificationPolicy */ + val notificationPolicy: StateFlow<NotificationManager.Policy?> + + /** @see NotificationManager.getZenMode */ + val zenMode: StateFlow<ZenMode?> +} + +class NotificationsSoundPolicyRepositoryImpl( + private val context: Context, + private val notificationManager: NotificationManager, + scope: CoroutineScope, + backgroundCoroutineContext: CoroutineContext, +) : NotificationsSoundPolicyRepository { + + private val notificationBroadcasts = + callbackFlow { + val receiver = + object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.action?.let { action -> launch { send(action) } } + } + } + + context.registerReceiver( + receiver, + IntentFilter().apply { + addAction(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED) + addAction(NotificationManager.ACTION_NOTIFICATION_POLICY_CHANGED) + } + ) + + awaitClose { context.unregisterReceiver(receiver) } + } + .shareIn( + started = SharingStarted.WhileSubscribed(), + scope = scope, + ) + + override val notificationPolicy: StateFlow<NotificationManager.Policy?> = + notificationBroadcasts + .filter { NotificationManager.ACTION_NOTIFICATION_POLICY_CHANGED == it } + .map { notificationManager.consolidatedNotificationPolicy } + .onStart { emit(notificationManager.consolidatedNotificationPolicy) } + .flowOn(backgroundCoroutineContext) + .stateIn(scope, SharingStarted.WhileSubscribed(), null) + + override val zenMode: StateFlow<ZenMode?> = + notificationBroadcasts + .filter { NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED == it } + .map { ZenMode(notificationManager.zenMode) } + .onStart { emit(ZenMode(notificationManager.zenMode)) } + .flowOn(backgroundCoroutineContext) + .stateIn(scope, SharingStarted.WhileSubscribed(), null) +} diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java index c5598bfa9438..213a66e546ab 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.pm.ApplicationInfo; +import android.os.UserManager; import org.junit.Before; import org.junit.Test; @@ -297,11 +298,26 @@ public class ApplicationsStateTest { @Test public void testPersonalAndWorkFiltersDisplaysCorrectApps() { mEntry.showInPersonalTab = true; + mEntry.mProfileType = UserManager.USER_TYPE_FULL_SYSTEM; assertThat(ApplicationsState.FILTER_PERSONAL.filterApp(mEntry)).isTrue(); assertThat(ApplicationsState.FILTER_WORK.filterApp(mEntry)).isFalse(); mEntry.showInPersonalTab = false; + mEntry.mProfileType = UserManager.USER_TYPE_PROFILE_MANAGED; assertThat(ApplicationsState.FILTER_PERSONAL.filterApp(mEntry)).isFalse(); assertThat(ApplicationsState.FILTER_WORK.filterApp(mEntry)).isTrue(); } + + @Test + public void testPrivateProfileFilterDisplaysCorrectApps() { + mEntry.showInPersonalTab = true; + mEntry.mProfileType = UserManager.USER_TYPE_FULL_SYSTEM; + assertThat(ApplicationsState.FILTER_PERSONAL.filterApp(mEntry)).isTrue(); + assertThat(ApplicationsState.FILTER_PRIVATE_PROFILE.filterApp(mEntry)).isFalse(); + + mEntry.showInPersonalTab = false; + mEntry.mProfileType = UserManager.USER_TYPE_PROFILE_PRIVATE; + assertThat(ApplicationsState.FILTER_PERSONAL.filterApp(mEntry)).isFalse(); + assertThat(ApplicationsState.FILTER_PRIVATE_PROFILE.filterApp(mEntry)).isTrue(); + } } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepositoryTest.kt b/packages/SettingsLib/tests/integ/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepositoryTest.kt new file mode 100644 index 000000000000..dfc4c0a847c0 --- /dev/null +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/statusbar/notification/data/repository/NotificationsSoundPolicyRepositoryTest.kt @@ -0,0 +1,128 @@ +/* + * 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.statusbar.notification.data.repository + +import android.app.NotificationManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.provider.Settings.Global +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.settingslib.statusbar.notification.data.model.ZenMode +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) +@SmallTest +class NotificationsSoundPolicyRepositoryTest { + + @Mock private lateinit var context: Context + @Mock private lateinit var notificationManager: NotificationManager + @Captor private lateinit var receiverCaptor: ArgumentCaptor<BroadcastReceiver> + + private lateinit var underTest: NotificationsSoundPolicyRepository + + private val testScope: TestScope = TestScope() + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + + underTest = + NotificationsSoundPolicyRepositoryImpl( + context, + notificationManager, + testScope.backgroundScope, + testScope.testScheduler, + ) + } + + @Test + fun policyChanges_repositoryEmits() { + testScope.runTest { + val values = mutableListOf<NotificationManager.Policy?>() + `when`(notificationManager.notificationPolicy).thenReturn(testPolicy1) + underTest.notificationPolicy.onEach { values.add(it) }.launchIn(backgroundScope) + runCurrent() + + `when`(notificationManager.notificationPolicy).thenReturn(testPolicy2) + triggerIntent(NotificationManager.ACTION_NOTIFICATION_POLICY_CHANGED) + runCurrent() + + assertThat(values) + .containsExactlyElementsIn(listOf(null, testPolicy1, testPolicy2)) + .inOrder() + } + } + + @Test + fun zenModeChanges_repositoryEmits() { + testScope.runTest { + val values = mutableListOf<ZenMode?>() + `when`(notificationManager.zenMode).thenReturn(Global.ZEN_MODE_OFF) + underTest.zenMode.onEach { values.add(it) }.launchIn(backgroundScope) + runCurrent() + + `when`(notificationManager.zenMode).thenReturn(Global.ZEN_MODE_ALARMS) + triggerIntent(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED) + runCurrent() + + assertThat(values) + .containsExactlyElementsIn( + listOf(null, ZenMode(Global.ZEN_MODE_OFF), ZenMode(Global.ZEN_MODE_ALARMS)) + ) + .inOrder() + } + } + + private fun triggerIntent(action: String) { + verify(context).registerReceiver(receiverCaptor.capture(), any()) + receiverCaptor.value.onReceive(context, Intent(action)) + } + + private companion object { + val testPolicy1 = + NotificationManager.Policy( + /* priorityCategories = */ 1, + /* priorityCallSenders =*/ 1, + /* priorityMessageSenders = */ 1, + ) + val testPolicy2 = + NotificationManager.Policy( + /* priorityCategories = */ 2, + /* priorityCallSenders =*/ 2, + /* priorityMessageSenders = */ 2, + ) + } +} diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 8ae117e4143c..e424797c664e 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -247,6 +247,7 @@ public class SecureSettings { Settings.Secure.BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS, Settings.Secure.CUSTOM_BUGREPORT_HANDLER_APP, Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER, + Settings.Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED, Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED, Settings.Secure.HEARING_AID_RINGTONE_ROUTING, Settings.Secure.HEARING_AID_CALL_ROUTING, @@ -264,6 +265,7 @@ public class SecureSettings { Settings.Secure.EVEN_DIMMER_ACTIVATED, Settings.Secure.EVEN_DIMMER_MIN_NITS, Settings.Secure.STYLUS_POINTER_ICON_ENABLED, - Settings.Secure.CAMERA_EXTENSIONS_FALLBACK + Settings.Secure.CAMERA_EXTENSIONS_FALLBACK, + Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 5adae37533ff..a32eeadc2982 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -207,6 +207,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_TOUCH_GESTURE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SEARCH_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"})); @@ -397,6 +398,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR); VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.HEARING_AID_RINGTONE_ROUTING, new DiscreteValueValidator(new String[] {"0", "1", "2"})); VALIDATORS.put(Secure.HEARING_AID_CALL_ROUTING, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 612badd9e363..d27ff175ca25 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1951,6 +1951,9 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED, SecureSettingsProto.Assist.SEARCH_LONG_PRESS_HOME_ENABLED); + dumpSetting(s, p, + Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED, + SecureSettingsProto.Assist.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED); p.end(assistToken); final long assistHandlesToken = p.start(SecureSettingsProto.ASSIST_HANDLES); diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java index e55bbecb67d7..9ecbd50fc566 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java @@ -31,6 +31,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.PrintStream; import java.util.HashMap; +import java.util.List; import java.util.Map; public class SettingsStateTest extends AndroidTestCase { @@ -626,4 +627,121 @@ public class SettingsStateTest extends AndroidTestCase { assertEquals(VALUE2, settingsState.getSettingLocked(INVALID_STAGED_FLAG_1).getValue()); } } + + public void testsetSettingsLockedKeepTrunkDefault() throws Exception { + final PrintStream os = new PrintStream(new FileOutputStream(mSettingsFile)); + os.print( + "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" + + "<settings version=\"120\">" + + " <setting id=\"0\" name=\"test_namespace/flag0\" " + + "value=\"false\" package=\"com.android.flags\" />" + + " <setting id=\"1\" name=\"test_namespace/flag1\" " + + "value=\"false\" package=\"com.android.flags\" />" + + " <setting id=\"2\" name=\"test_namespace/com.android.flags.flag3\" " + + "value=\"false\" package=\"com.android.flags\" />" + + " <setting id=\"3\" " + + "name=\"test_another_namespace/com.android.another.flags.flag0\" " + + "value=\"false\" package=\"com.android.another.flags\" />" + + "</settings>"); + os.close(); + + int configKey = SettingsState.makeKey(SettingsState.SETTINGS_TYPE_CONFIG, 0); + + SettingsState settingsState = new SettingsState( + getContext(), mLock, mSettingsFile, configKey, + SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper()); + + String prefix = "test_namespace"; + Map<String, String> keyValues = + Map.of("test_namespace/flag0", "true", "test_namespace/flag2", "false"); + String packageName = "com.android.flags"; + + parsed_flags flags = parsed_flags + .newBuilder() + .addParsedFlag(parsed_flag + .newBuilder() + .setPackage(packageName) + .setName("flag3") + .setNamespace(prefix) + .setDescription("test flag") + .addBug("12345678") + .setState(Aconfig.flag_state.DISABLED) + .setPermission(Aconfig.flag_permission.READ_WRITE)) + .addParsedFlag(parsed_flag + .newBuilder() + .setPackage("com.android.another.flags") + .setName("flag0") + .setNamespace("test_another_namespace") + .setDescription("test flag") + .addBug("12345678") + .setState(Aconfig.flag_state.DISABLED) + .setPermission(Aconfig.flag_permission.READ_WRITE)) + .build(); + + synchronized (mLock) { + settingsState.loadAconfigDefaultValues( + flags.toByteArray(), settingsState.getAconfigDefaultValues()); + List<String> updates = + settingsState.setSettingsLocked("test_namespace/", keyValues, packageName); + assertEquals(3, updates.size()); + + SettingsState.Setting s; + + s = settingsState.getSettingLocked("test_namespace/flag0"); + assertEquals("true", s.getValue()); + + s = settingsState.getSettingLocked("test_namespace/flag1"); + assertNull(s.getValue()); + + s = settingsState.getSettingLocked("test_namespace/flag2"); + assertEquals("false", s.getValue()); + + s = settingsState.getSettingLocked("test_namespace/com.android.flags.flag3"); + assertEquals("false", s.getValue()); + + s = settingsState.getSettingLocked( + "test_another_namespace/com.android.another.flags.flag0"); + assertEquals("false", s.getValue()); + } + } + + public void testsetSettingsLockedNoTrunkDefault() throws Exception { + final PrintStream os = new PrintStream(new FileOutputStream(mSettingsFile)); + os.print( + "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" + + "<settings version=\"120\">" + + " <setting id=\"0\" name=\"test_namespace/flag0\" " + + "value=\"false\" package=\"com.android.flags\" />" + + " <setting id=\"1\" name=\"test_namespace/flag1\" " + + "value=\"false\" package=\"com.android.flags\" />" + + "</settings>"); + os.close(); + + int configKey = SettingsState.makeKey(SettingsState.SETTINGS_TYPE_CONFIG, 0); + + SettingsState settingsState = new SettingsState( + getContext(), mLock, mSettingsFile, configKey, + SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper()); + + Map<String, String> keyValues = + Map.of("test_namespace/flag0", "true", "test_namespace/flag2", "false"); + String packageName = "com.android.flags"; + + synchronized (mLock) { + List<String> updates = + settingsState.setSettingsLocked("test_namespace/", keyValues, packageName); + assertEquals(3, updates.size()); + + SettingsState.Setting s; + + s = settingsState.getSettingLocked("test_namespace/flag0"); + assertEquals("true", s.getValue()); + + s = settingsState.getSettingLocked("test_namespace/flag1"); + assertNull(s.getValue()); + + s = settingsState.getSettingLocked("test_namespace/flag2"); + assertEquals("false", s.getValue()); + } + } } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 84ef6e51a00b..9e5e7a2474cb 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -250,6 +250,8 @@ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" /> + <!-- Permission required to test LauncherApps APIs for hidden profiles --> + <uses-permission android:name="android.permission.ACCESS_HIDDEN_PROFILES_FULL" /> <!-- Shell only holds android.permission.NETWORK_SCAN in order to to enable CTS testing --> <uses-permission android:name="android.permission.NETWORK_SCAN" /> <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" /> @@ -862,6 +864,8 @@ <!-- Permission required for CTS test - CtsTelephonyProviderTestCases --> <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" /> + <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" /> + <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" /> <uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE" /> @@ -917,6 +921,9 @@ <!-- Permissions required for CTS test - GrammaticalInflectionManagerTest --> <uses-permission android:name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER" /> + <!-- Permission required for CTS test - CtsPackageManagerTestCases--> + <uses-permission android:name="android.permission.DOMAIN_VERIFICATION_AGENT" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index 967a36b38090..78cacec6d4db 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -39,7 +39,6 @@ hwwang@google.com hyunyoungs@google.com ikateryna@google.com iyz@google.com -jaggies@google.com jamesoleary@google.com jbolinger@google.com jdemeulenaere@google.com diff --git a/packages/SystemUI/accessibility/accessibilitymenu/TEST_MAPPING b/packages/SystemUI/accessibility/accessibilitymenu/TEST_MAPPING index 2bd52b552698..29a25ad04cbe 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/TEST_MAPPING +++ b/packages/SystemUI/accessibility/accessibilitymenu/TEST_MAPPING @@ -4,8 +4,15 @@ "name": "AccessibilityMenuServiceTests", "options": [ { - "include-annotation": "android.platform.test.annotations.Presubmit" - }, + "exclude-annotation": "android.support.test.filters.FlakyTest" + } + ] + } + ], + "postsubmit": [ + { + "name": "AccessibilityMenuServiceTests", + "options": [ { "exclude-annotation": "android.support.test.filters.FlakyTest" } 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 9d1af0e2375a..72c1092b92d6 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 @@ -36,6 +36,7 @@ import android.app.Instrumentation; import android.app.KeyguardManager; import android.app.UiAutomation; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -57,6 +58,7 @@ import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortc import org.junit.After; import org.junit.AfterClass; +import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -330,8 +332,10 @@ public class AccessibilityMenuServiceTest { AccessibilityNodeInfo assistantButton = findGridButtonInfo(getGridButtonList(), String.valueOf(ShortcutId.ID_ASSISTANT_VALUE.ordinal())); Intent expectedIntent = new Intent(Intent.ACTION_VOICE_COMMAND); - String expectedPackage = expectedIntent.resolveActivity( - sInstrumentation.getContext().getPackageManager()).getPackageName(); + ComponentName componentName = expectedIntent.resolveActivity( + sInstrumentation.getContext().getPackageManager()); + Assume.assumeNotNull(componentName); + String expectedPackage = componentName.getPackageName(); sUiAutomation.executeAndWaitForEvent( () -> assistantButton.performAction(CLICK_ID), diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 7a4e60a45137..c2072ac8770d 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -354,13 +354,6 @@ flag { } flag { - name: "bluetooth_qs_tile_dialog_auto_on_toggle" - namespace: "systemui" - description: "Displays the auto on toggle in the bluetooth QS tile dialog" - bug: "316985153" -} - -flag { name: "smartspace_relocate_to_bottom" namespace: "systemui" description: "Relocate Smartspace to bottom of the Lock Screen" @@ -427,3 +420,23 @@ flag { } } +flag { + name: "get_connected_device_name_unsynchronized" + namespace: "systemui" + description: "Decide whether to fetch the connected bluetooth device name outside a synchronized block." + bug: "323995015" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "update_user_switcher_background" + namespace: "systemui" + description: "Decide whether to update user switcher in background thread." + bug: "322745650" + metadata { + purpose: PURPOSE_BUGFIX + } +} + diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt new file mode 100644 index 000000000000..abe1e3de8eea --- /dev/null +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffect.kt @@ -0,0 +1,377 @@ +/* + * 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.surfaceeffects.loadingeffect + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.graphics.Paint +import android.graphics.RenderEffect +import android.view.View +import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseAnimationConfig +import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader + +/** + * Plays loading effect with the given configuration. + * + * @param baseType immutable base shader type. This is used for constructing the shader. Reconstruct + * the [LoadingEffect] if the base type needs to be changed. + * @param config immutable parameters that are used for drawing the effect. + * @param paintCallback triggered every frame when animation is playing. Use this to draw the effect + * with [Canvas.drawPaint]. + * @param renderEffectCallback triggered every frame when animation is playing. Use this to draw the + * effect with [RenderEffect]. + * @param animationStateChangedCallback triggered when the [AnimationState] changes. Optional. + * + * The client is responsible to actually draw the [Paint] or [RenderEffect] returned in the + * callback. Note that [View.invalidate] must be called on each callback. There are a few ways to + * render the effect: + * 1) Use [Canvas.drawPaint]. (Preferred. Significantly cheaper!) + * 2) Set [RenderEffect] to the [View]. (Good for chaining effects.) + * 3) Use [RenderNode.setRenderEffect]. (This may be least preferred, as 2 should do what you want.) + * + * <p>First approach is more performant than other ones because [RenderEffect] forces an + * intermediate render pass of the View to a texture to feed into it. + * + * <p>If going with the first approach, your custom [View] would look like as follow: + * <pre>{@code + * private var paint: Paint? = null + * // Override [View.onDraw]. + * override fun onDraw(canvas: Canvas) { + * // RuntimeShader requires hardwareAcceleration. + * if (!canvas.isHardwareAccelerated) return + * + * paint?.let { canvas.drawPaint(it) } + * } + * + * // This is called [Callback.onDraw] + * fun draw(paint: Paint) { + * this.paint = paint + * + * // Must call invalidate to trigger View#onDraw + * invalidate() + * } + * }</pre> + * + * <p>If going with the second approach, it doesn't require an extra custom [View], and it is as + * simple as calling [View.setRenderEffect] followed by [View.invalidate]. You can also chain the + * effect with other [RenderEffect]. + * + * <p>Third approach is an option, but it's more of a boilerplate so you would like to stick with + * the second option. If you want to go with this option for some reason, below is the example: + * <pre>{@code + * // Initialize the shader and paint to use to pass into the [Canvas]. + * private val renderNode = RenderNode("LoadingEffect") + * + * // Override [View.onDraw]. + * override fun onDraw(canvas: Canvas) { + * // RuntimeShader requires hardwareAcceleration. + * if (!canvas.isHardwareAccelerated) return + * + * if (renderNode.hasDisplayList()) { + * canvas.drawRenderNode(renderNode) + * } + * } + * + * // This is called [Callback.onDraw] + * fun draw(renderEffect: RenderEffect) { + * renderNode.setPosition(0, 0, width, height) + * renderNode.setRenderEffect(renderEffect) + * + * val recordingCanvas = renderNode.beginRecording() + * // We need at least 1 drawing instruction. + * recordingCanvas.drawColor(Color.TRANSPARENT) + * renderNode.endRecording() + * + * // Must call invalidate to trigger View#onDraw + * invalidate() + * } + * }</pre> + */ +class LoadingEffect +private constructor( + baseType: TurbulenceNoiseShader.Companion.Type, + private val config: TurbulenceNoiseAnimationConfig, + private val paintCallback: PaintDrawCallback?, + private val renderEffectCallback: RenderEffectDrawCallback?, + private val animationStateChangedCallback: AnimationStateChangedCallback? = null +) { + constructor( + baseType: TurbulenceNoiseShader.Companion.Type, + config: TurbulenceNoiseAnimationConfig, + paintCallback: PaintDrawCallback, + animationStateChangedCallback: AnimationStateChangedCallback? = null + ) : this( + baseType, + config, + paintCallback, + renderEffectCallback = null, + animationStateChangedCallback + ) + constructor( + baseType: TurbulenceNoiseShader.Companion.Type, + config: TurbulenceNoiseAnimationConfig, + renderEffectCallback: RenderEffectDrawCallback, + animationStateChangedCallback: AnimationStateChangedCallback? = null + ) : this( + baseType, + config, + paintCallback = null, + renderEffectCallback, + animationStateChangedCallback + ) + + private val turbulenceNoiseShader: TurbulenceNoiseShader = + TurbulenceNoiseShader(baseType).apply { applyConfig(config) } + private var currentAnimator: ValueAnimator? = null + private var state: AnimationState = AnimationState.NOT_PLAYING + set(value) { + if (field != value) { + animationStateChangedCallback?.onStateChanged(field, value) + field = value + } + } + + // We create a paint instance only if the client renders it with Paint. + private val paint = + if (paintCallback != null) { + Paint().apply { this.shader = turbulenceNoiseShader } + } else { + null + } + + /** Plays LoadingEffect. */ + fun play() { + if (state != AnimationState.NOT_PLAYING) { + return // Ignore if any of the animation is playing. + } + + playEaseIn() + } + + // TODO(b/237282226): Support force finish. + /** Finishes the main animation, which triggers the ease-out animation. */ + fun finish() { + if (state == AnimationState.MAIN) { + // Calling Animator#end sets the animation state back to the initial state. Using pause + // to avoid visual artifacts. + currentAnimator?.pause() + currentAnimator = null + + playEaseOut() + } + } + + /** Updates the noise color dynamically. */ + fun updateColor(newColor: Int) { + turbulenceNoiseShader.setColor(newColor) + } + + /** + * Retrieves the noise offset x, y, z values. This is useful for replaying the animation + * smoothly from the last animation, by passing in the last values to the next animation. + */ + fun getNoiseOffset(): Array<Float> { + return arrayOf( + turbulenceNoiseShader.noiseOffsetX, + turbulenceNoiseShader.noiseOffsetY, + turbulenceNoiseShader.noiseOffsetZ + ) + } + + private fun playEaseIn() { + if (state != AnimationState.NOT_PLAYING) { + return + } + state = AnimationState.EASE_IN + + val animator = ValueAnimator.ofFloat(0f, 1f) + animator.duration = config.easeInDuration.toLong() + + // Animation should start from the initial position to avoid abrupt transition. + val initialX = turbulenceNoiseShader.noiseOffsetX + val initialY = turbulenceNoiseShader.noiseOffsetY + val initialZ = turbulenceNoiseShader.noiseOffsetZ + + animator.addUpdateListener { updateListener -> + val timeInSec = updateListener.currentPlayTime * MS_TO_SEC + val progress = updateListener.animatedValue as Float + + turbulenceNoiseShader.setNoiseMove( + initialX + timeInSec * config.noiseMoveSpeedX, + initialY + timeInSec * config.noiseMoveSpeedY, + initialZ + timeInSec * config.noiseMoveSpeedZ + ) + + // TODO: Replace it with a better curve. + turbulenceNoiseShader.setOpacity(progress * config.luminosityMultiplier) + + draw() + } + + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + currentAnimator = null + playMain() + } + } + ) + + animator.start() + this.currentAnimator = animator + } + + private fun playMain() { + if (state != AnimationState.EASE_IN) { + return + } + state = AnimationState.MAIN + + val animator = ValueAnimator.ofFloat(0f, 1f) + animator.duration = config.maxDuration.toLong() + + // Animation should start from the initial position to avoid abrupt transition. + val initialX = turbulenceNoiseShader.noiseOffsetX + val initialY = turbulenceNoiseShader.noiseOffsetY + val initialZ = turbulenceNoiseShader.noiseOffsetZ + + turbulenceNoiseShader.setOpacity(config.luminosityMultiplier) + + animator.addUpdateListener { updateListener -> + val timeInSec = updateListener.currentPlayTime * MS_TO_SEC + turbulenceNoiseShader.setNoiseMove( + initialX + timeInSec * config.noiseMoveSpeedX, + initialY + timeInSec * config.noiseMoveSpeedY, + initialZ + timeInSec * config.noiseMoveSpeedZ + ) + + draw() + } + + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + currentAnimator = null + playEaseOut() + } + } + ) + + animator.start() + this.currentAnimator = animator + } + + private fun playEaseOut() { + if (state != AnimationState.MAIN) { + return + } + state = AnimationState.EASE_OUT + + val animator = ValueAnimator.ofFloat(0f, 1f) + animator.duration = config.easeOutDuration.toLong() + + // Animation should start from the initial position to avoid abrupt transition. + val initialX = turbulenceNoiseShader.noiseOffsetX + val initialY = turbulenceNoiseShader.noiseOffsetY + val initialZ = turbulenceNoiseShader.noiseOffsetZ + + animator.addUpdateListener { updateListener -> + val timeInSec = updateListener.currentPlayTime * MS_TO_SEC + val progress = updateListener.animatedValue as Float + + turbulenceNoiseShader.setNoiseMove( + initialX + timeInSec * config.noiseMoveSpeedX, + initialY + timeInSec * config.noiseMoveSpeedY, + initialZ + timeInSec * config.noiseMoveSpeedZ + ) + + // TODO: Replace it with a better curve. + turbulenceNoiseShader.setOpacity((1f - progress) * config.luminosityMultiplier) + + draw() + } + + animator.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + currentAnimator = null + state = AnimationState.NOT_PLAYING + } + } + ) + + animator.start() + this.currentAnimator = animator + } + + private fun draw() { + paintCallback?.onDraw(paint!!) + renderEffectCallback?.onDraw( + RenderEffect.createRuntimeShaderEffect(turbulenceNoiseShader, "in_src") + ) + } + + companion object { + /** + * States of the loading effect animation. + * + * <p>The state is designed to be follow the order below: [AnimationState.EASE_IN], + * [AnimationState.MAIN], [AnimationState.EASE_OUT]. Note that ease in and out don't + * necessarily mean the acceleration and deceleration in the animation curve. They simply + * mean each stage of the animation. (i.e. Intro, core, and rest) + */ + enum class AnimationState { + EASE_IN, + MAIN, + EASE_OUT, + NOT_PLAYING + } + + /** Client must implement one of the draw callbacks. */ + interface PaintDrawCallback { + /** + * A callback with a [Paint] object that contains shader info, which is triggered every + * frame while animation is playing. Note that the [Paint] object here is always the + * same instance. + */ + fun onDraw(loadingPaint: Paint) + } + + interface RenderEffectDrawCallback { + /** + * A callback with a [RenderEffect] object that contains shader info, which is triggered + * every frame while animation is playing. Note that the [RenderEffect] instance is + * different each time to update shader uniforms. + */ + fun onDraw(loadingRenderEffect: RenderEffect) + } + + /** Optional callback that is triggered when the animation state changes. */ + interface AnimationStateChangedCallback { + /** + * A callback that's triggered when the [AnimationState] changes. Example usage is + * performing a cleanup when [AnimationState] becomes [NOT_PLAYING]. + */ + fun onStateChanged(oldState: AnimationState, newState: AnimationState) {} + } + + private const val MS_TO_SEC = 0.001f + + private val TAG = LoadingEffect::class.java.simpleName + } +} diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt index 30108ac779f2..8dd90a8ffe9f 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseShader.kt @@ -30,6 +30,7 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : companion object { private const val UNIFORMS = """ + uniform shader in_src; // Needed to support RenderEffect. uniform float in_gridNum; uniform vec3 in_noiseMove; uniform vec2 in_size; @@ -114,6 +115,7 @@ class TurbulenceNoiseShader(val baseType: Type = Type.SIMPLEX_NOISE) : setSize(config.width, config.height) setLumaMatteFactors(config.lumaMatteBlendFactor, config.lumaMatteOverallBrightness) setInverseNoiseLuminosity(config.shouldInverseNoiseLuminosity) + setNoiseMove(config.noiseOffsetX, config.noiseOffsetY, config.noiseOffsetZ) } /** Sets the number of grid for generating noise. */ diff --git a/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt new file mode 100644 index 000000000000..b8c4fae975af --- /dev/null +++ b/packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt @@ -0,0 +1,321 @@ +/* + * 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. + */ + +@file:OptIn(ExperimentalMaterial3Api::class) + +package com.android.compose + +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.interaction.DragInteraction +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.width +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.RoundRect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.drawscope.clipPath +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalLayoutDirection +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.LayoutDirection +import androidx.compose.ui.unit.dp +import com.android.compose.modifiers.padding +import com.android.compose.theme.LocalAndroidColorScheme + +/** Indicator corner radius used when the user drags the [PlatformSlider]. */ +private val DefaultPlatformSliderDraggingCornerRadius = 8.dp + +/** + * Platform slider implementation that displays a slider with an [icon] and a [label] at the start. + * + * @param onValueChangeFinished is called when the slider settles on a [value]. This callback + * shouldn't be used to react to value changes. Use [onValueChange] instead + * @param interactionSource - the [MutableInteractionSource] representing the stream of Interactions + * for this slider. You can create and pass in your own remembered instance to observe + * Interactions and customize the appearance / behavior of this slider in different states. + * @param colors - slider color scheme. + * @param draggingCornersRadius - radius of the slider indicator when the user drags it + * @param icon - icon at the start of the slider. Icon is limited to a square space at the start of + * the slider + * @param label - control shown next to the icon. + */ +@Composable +fun PlatformSlider( + value: Float, + onValueChange: (Float) -> Unit, + modifier: Modifier = Modifier, + onValueChangeFinished: (() -> Unit)? = null, + valueRange: ClosedFloatingPointRange<Float> = 0f..1f, + enabled: Boolean = true, + interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, + colors: PlatformSliderColors = + if (isSystemInDarkTheme()) darkThemePlatformSliderColors() + else lightThemePlatformSliderColors(), + draggingCornersRadius: Dp = DefaultPlatformSliderDraggingCornerRadius, + icon: (@Composable (isDragging: Boolean) -> Unit)? = null, + label: (@Composable (isDragging: Boolean) -> Unit)? = null, +) { + val sliderHeight: Dp = 64.dp + val iconWidth: Dp = sliderHeight + var isDragging by remember { mutableStateOf(false) } + LaunchedEffect(interactionSource) { + interactionSource.interactions.collect { interaction -> + when (interaction) { + is DragInteraction.Start -> { + isDragging = true + } + is DragInteraction.Cancel, + is DragInteraction.Stop -> { + isDragging = false + } + } + } + } + val paddingStart by + animateDpAsState( + targetValue = + if ((!isDragging && value == 0f) || icon == null) { + 16.dp + } else { + 0.dp + }, + label = "LabelIconSpacingAnimation" + ) + + Box(modifier = modifier.height(sliderHeight)) { + Slider( + modifier = Modifier.fillMaxSize(), + value = value, + onValueChange = onValueChange, + valueRange = valueRange, + onValueChangeFinished = onValueChangeFinished, + interactionSource = interactionSource, + track = { + Track( + sliderState = it, + enabled = enabled, + colors = colors, + iconWidth = iconWidth, + draggingCornersRadius = draggingCornersRadius, + sliderHeight = sliderHeight, + isDragging = isDragging, + modifier = Modifier, + ) + }, + thumb = { Spacer(Modifier.width(iconWidth).height(sliderHeight)) }, + ) + + if (icon != null || label != null) { + Row(modifier = Modifier.fillMaxSize()) { + icon?.let { iconComposable -> + Box( + modifier = Modifier.fillMaxHeight().aspectRatio(1f), + contentAlignment = Alignment.Center, + ) { + iconComposable(isDragging) + } + } + + label?.let { labelComposable -> + Box( + modifier = + Modifier.fillMaxHeight() + .weight(1f) + .padding(start = { paddingStart.roundToPx() }), + contentAlignment = Alignment.CenterStart, + ) { + labelComposable(isDragging) + } + } + } + } + } +} + +@Composable +private fun Track( + sliderState: SliderState, + enabled: Boolean, + colors: PlatformSliderColors, + iconWidth: Dp, + draggingCornersRadius: Dp, + sliderHeight: Dp, + isDragging: Boolean, + modifier: Modifier = Modifier, +) { + val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl + val iconWidthPx: Float + val halfIconWidthPx: Float + val targetIndicatorRadiusPx: Float + val halfSliderHeightPx: Float + with(LocalDensity.current) { + halfSliderHeightPx = sliderHeight.toPx() / 2 + iconWidthPx = iconWidth.toPx() + halfIconWidthPx = iconWidthPx / 2 + targetIndicatorRadiusPx = + if (isDragging) draggingCornersRadius.toPx() else halfSliderHeightPx + } + + val indicatorRadiusPx: Float by + animateFloatAsState( + targetValue = targetIndicatorRadiusPx, + label = "PlatformSliderCornersAnimation", + ) + + val trackColor = colors.getTrackColor(enabled) + val indicatorColor = colors.getIndicatorColor(enabled) + val trackCornerRadius = CornerRadius(halfSliderHeightPx, halfSliderHeightPx) + val indicatorCornerRadius = CornerRadius(indicatorRadiusPx, indicatorRadiusPx) + Canvas(modifier.fillMaxSize()) { + val trackPath = Path() + trackPath.addRoundRect( + RoundRect( + left = -halfIconWidthPx, + top = 0f, + right = size.width + halfIconWidthPx, + bottom = size.height, + cornerRadius = trackCornerRadius, + ) + ) + drawPath(path = trackPath, color = trackColor) + + clipPath(trackPath) { + val indicatorPath = Path() + if (isRtl) { + indicatorPath.addRoundRect( + RoundRect( + left = + size.width - + size.width * sliderState.coercedNormalizedValue - + halfIconWidthPx, + top = 0f, + right = size.width + iconWidthPx, + bottom = size.height, + topLeftCornerRadius = indicatorCornerRadius, + topRightCornerRadius = trackCornerRadius, + bottomRightCornerRadius = trackCornerRadius, + bottomLeftCornerRadius = indicatorCornerRadius, + ) + ) + } else { + indicatorPath.addRoundRect( + RoundRect( + left = -halfIconWidthPx, + top = 0f, + right = size.width * sliderState.coercedNormalizedValue + halfIconWidthPx, + bottom = size.height, + topLeftCornerRadius = trackCornerRadius, + topRightCornerRadius = indicatorCornerRadius, + bottomRightCornerRadius = indicatorCornerRadius, + bottomLeftCornerRadius = trackCornerRadius, + ) + ) + } + drawPath(path = indicatorPath, color = indicatorColor) + } + } +} + +/** [SliderState.value] normalized using [SliderState.valueRange]. The result belongs to [0, 1] */ +private val SliderState.coercedNormalizedValue: Float + get() { + val dif = valueRange.endInclusive - valueRange.start + return if (dif == 0f) { + 0f + } else { + val coercedValue = value.coerceIn(valueRange.start, valueRange.endInclusive) + (coercedValue - valueRange.start) / dif + } + } + +/** + * [PlatformSlider] color scheme. + * + * @param trackColor fills the track of the slider. This is a "background" of the slider + * @param indicatorColor fills the slider from the start to the value + * @param iconColor is the default icon color + * @param labelColor is the default icon color + * @param disabledTrackColor is the [trackColor] when the PlatformSlider#enabled == false + * @param disabledIndicatorColor is the [indicatorColor] when the PlatformSlider#enabled == false + * @param disabledIconColor is the [iconColor] when the PlatformSlider#enabled == false + * @param disabledLabelColor is the [labelColor] when the PlatformSlider#enabled == false + */ +data class PlatformSliderColors( + val trackColor: Color, + val indicatorColor: Color, + val iconColor: Color, + val labelColor: Color, + val disabledTrackColor: Color, + val disabledIndicatorColor: Color, + val disabledIconColor: Color, + val disabledLabelColor: Color, +) + +/** [PlatformSliderColors] for the light theme */ +@Composable +private fun lightThemePlatformSliderColors() = + PlatformSliderColors( + trackColor = MaterialTheme.colorScheme.tertiaryContainer, + indicatorColor = LocalAndroidColorScheme.current.tertiaryFixedDim, + iconColor = MaterialTheme.colorScheme.onTertiaryContainer, + labelColor = MaterialTheme.colorScheme.onTertiaryContainer, + disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIconColor = MaterialTheme.colorScheme.outline, + disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant, + ) + +/** [PlatformSliderColors] for the dark theme */ +@Composable +private fun darkThemePlatformSliderColors() = + PlatformSliderColors( + trackColor = MaterialTheme.colorScheme.onTertiary, + indicatorColor = LocalAndroidColorScheme.current.onTertiaryFixedVariant, + iconColor = MaterialTheme.colorScheme.onTertiaryContainer, + labelColor = MaterialTheme.colorScheme.onTertiaryContainer, + disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest, + disabledIconColor = MaterialTheme.colorScheme.outline, + disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant, + ) + +private fun PlatformSliderColors.getTrackColor(isEnabled: Boolean): Color = + if (isEnabled) trackColor else disabledTrackColor + +private fun PlatformSliderColors.getIndicatorColor(isEnabled: Boolean): Color = + if (isEnabled) indicatorColor else disabledIndicatorColor diff --git a/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt b/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt index 9a34d6f25551..e6424345da39 100644 --- a/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt +++ b/packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt @@ -25,6 +25,7 @@ import androidx.lifecycle.LifecycleOwner import com.android.systemui.bouncer.ui.BouncerDialogFactory import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.communal.widgets.WidgetConfigurator import com.android.systemui.keyboard.stickykeys.ui.viewmodel.StickyKeysIndicatorViewModel import com.android.systemui.keyguard.shared.model.LockscreenSceneBlueprint @@ -86,6 +87,7 @@ object ComposeFacade : BaseComposeFacade { viewModel: SceneContainerViewModel, windowInsets: StateFlow<WindowInsets?>, sceneByKey: Map<SceneKey, Scene>, + dataSourceDelegator: SceneDataSourceBinder, ): View { throwComposeUnavailableError() } @@ -104,7 +106,7 @@ object ComposeFacade : BaseComposeFacade { throwComposeUnavailableError() } - override fun createCommunalContainer(context: Context, viewModel: BaseCommunalViewModel): View { + override fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View { throwComposeUnavailableError() } diff --git a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt index 51d2a03342b7..a1bbc7d7bfb8 100644 --- a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt +++ b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt @@ -40,6 +40,7 @@ import com.android.systemui.common.ui.compose.windowinsets.ScreenDecorProvider import com.android.systemui.communal.ui.compose.CommunalContainer import com.android.systemui.communal.ui.compose.CommunalHub import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.communal.widgets.WidgetConfigurator import com.android.systemui.keyboard.stickykeys.ui.view.createStickyKeyIndicatorView import com.android.systemui.keyboard.stickykeys.ui.viewmodel.StickyKeysIndicatorViewModel @@ -52,6 +53,7 @@ import com.android.systemui.people.ui.viewmodel.PeopleViewModel import com.android.systemui.qs.footer.ui.compose.FooterActions import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel import com.android.systemui.scene.shared.model.Scene +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.ui.composable.ComposableScene import com.android.systemui.scene.ui.composable.SceneContainer @@ -126,6 +128,7 @@ object ComposeFacade : BaseComposeFacade { viewModel: SceneContainerViewModel, windowInsets: StateFlow<WindowInsets?>, sceneByKey: Map<SceneKey, Scene>, + dataSourceDelegator: SceneDataSourceDelegator, ): View { return ComposeView(context).apply { setContent { @@ -138,6 +141,7 @@ object ComposeFacade : BaseComposeFacade { viewModel = viewModel, sceneByKey = sceneByKey.mapValues { (_, scene) -> scene as ComposableScene }, + dataSourceDelegator = dataSourceDelegator, ) } } @@ -161,7 +165,7 @@ object ComposeFacade : BaseComposeFacade { } } - override fun createCommunalContainer(context: Context, viewModel: BaseCommunalViewModel): View { + override fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View { return ComposeView(context).apply { setContent { PlatformTheme { CommunalContainer(viewModel = viewModel) } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt index 428bc39c7632..0469cbe519ea 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt @@ -29,8 +29,8 @@ import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel import com.android.systemui.dagger.SysUISingleton import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.scene.ui.composable.ComposableScene import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -54,11 +54,11 @@ constructor( ) : ComposableScene { override val key = SceneKey.Bouncer - override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> = + override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> = MutableStateFlow( mapOf( - UserAction.Back to SceneModel(SceneKey.Lockscreen), - UserAction.Swipe(Direction.DOWN) to SceneModel(SceneKey.Lockscreen), + UserAction.Back to UserActionResult(SceneKey.Lockscreen), + UserAction.Swipe(Direction.DOWN) to UserActionResult(SceneKey.Lockscreen), ) ) .asStateFlow() diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt index 92bc1f18a6c5..bc85513ae296 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -23,7 +23,9 @@ import com.android.compose.animation.scene.transitions import com.android.compose.animation.scene.updateSceneTransitionLayoutState import com.android.systemui.communal.shared.model.CommunalSceneKey import com.android.systemui.communal.shared.model.ObservableCommunalTransitionState +import com.android.systemui.communal.ui.compose.extensions.allowGestures import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.transform @@ -51,7 +53,7 @@ val sceneTransitions = transitions { @Composable fun CommunalContainer( modifier: Modifier = Modifier, - viewModel: BaseCommunalViewModel, + viewModel: CommunalViewModel, ) { val currentScene: SceneKey by viewModel.currentScene @@ -63,6 +65,7 @@ fun CommunalContainer( onChangeScene = { viewModel.onSceneChanged(it.toCommunalSceneKey()) }, transitions = sceneTransitions, ) + val touchesAllowed by viewModel.touchesAllowed.collectAsState(initial = false) // This effect exposes the SceneTransitionLayout's observable transition state to the rest of // the system, and unsets it when the view is disposed to avoid a memory leak. @@ -75,7 +78,7 @@ fun CommunalContainer( SceneTransitionLayout( state = sceneTransitionLayoutState, - modifier = modifier.fillMaxSize(), + modifier = modifier.fillMaxSize().allowGestures(allowed = touchesAllowed), swipeSourceDetector = FixedSizeEdgeDetector(ContainerDimensions.EdgeSwipeSize), ) { scene( diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt index f3bef7bf47da..11a38f92c234 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt @@ -23,8 +23,8 @@ import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.dagger.SysUISingleton import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.scene.ui.composable.ComposableScene import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -40,10 +40,10 @@ constructor( ) : ComposableScene { override val key = SceneKey.Communal - override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> = - MutableStateFlow<Map<UserAction, SceneModel>>( + override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> = + MutableStateFlow<Map<UserAction, UserActionResult>>( mapOf( - UserAction.Swipe(Direction.RIGHT) to SceneModel(SceneKey.Lockscreen), + UserAction.Swipe(Direction.RIGHT) to UserActionResult(SceneKey.Lockscreen), ) ) .asStateFlow() diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt index 378a1e4858e8..7b21d091d451 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt @@ -26,8 +26,8 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneViewModel import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.Edge import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.scene.ui.composable.ComposableScene import dagger.Lazy import javax.inject.Inject @@ -49,7 +49,7 @@ constructor( ) : ComposableScene { override val key = SceneKey.Lockscreen - override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> = + override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> = combine(viewModel.upDestinationSceneKey, viewModel.leftDestinationSceneKey, ::Pair) .map { (upKey, leftKey) -> destinationScenes(up = upKey, left = leftKey) } .stateIn( @@ -75,13 +75,13 @@ constructor( private fun destinationScenes( up: SceneKey?, left: SceneKey?, - ): Map<UserAction, SceneModel> { + ): Map<UserAction, UserActionResult> { return buildMap { - up?.let { this[UserAction.Swipe(Direction.UP)] = SceneModel(up) } - left?.let { this[UserAction.Swipe(Direction.LEFT)] = SceneModel(left) } + up?.let { this[UserAction.Swipe(Direction.UP)] = UserActionResult(up) } + left?.let { this[UserAction.Swipe(Direction.LEFT)] = UserActionResult(left) } this[UserAction.Swipe(fromEdge = Edge.TOP, direction = Direction.DOWN)] = - SceneModel(SceneKey.QuickSettings) - this[UserAction.Swipe(direction = Direction.DOWN)] = SceneModel(SceneKey.Shade) + UserActionResult(SceneKey.QuickSettings) + this[UserAction.Swipe(direction = Direction.DOWN)] = UserActionResult(SceneKey.Shade) } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt index 46554a41891d..d36345a310d3 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt @@ -63,7 +63,7 @@ import com.android.systemui.qs.footer.ui.compose.FooterActions import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.ui.composable.ComposableScene -import com.android.systemui.scene.ui.composable.toTransitionSceneKey +import com.android.systemui.scene.ui.composable.asComposeAware import com.android.systemui.shade.ui.composable.CollapsedShadeHeader import com.android.systemui.shade.ui.composable.ExpandedShadeHeader import com.android.systemui.shade.ui.composable.Shade @@ -138,7 +138,7 @@ private fun SceneScope.QuickSettingsScene( when (val state = layoutState.transitionState) { is TransitionState.Idle -> true is TransitionState.Transition -> { - state.fromScene == SceneKey.QuickSettings.toTransitionSceneKey() + state.fromScene == SceneKey.QuickSettings.asComposeAware() } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeAwareExtensions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeAwareExtensions.kt new file mode 100644 index 000000000000..a7de1eede1f4 --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeAwareExtensions.kt @@ -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.systemui.scene.ui.composable + +import androidx.compose.foundation.gestures.Orientation +import androidx.compose.ui.unit.Density +import androidx.compose.ui.unit.IntSize +import com.android.compose.animation.scene.Back +import com.android.compose.animation.scene.Edge as ComposeAwareEdge +import com.android.compose.animation.scene.SceneKey as ComposeAwareSceneKey +import com.android.compose.animation.scene.Swipe +import com.android.compose.animation.scene.SwipeDirection +import com.android.compose.animation.scene.TransitionKey as ComposeAwareTransitionKey +import com.android.compose.animation.scene.UserAction as ComposeAwareUserAction +import com.android.compose.animation.scene.UserActionDistance as ComposeAwareUserActionDistance +import com.android.compose.animation.scene.UserActionResult as ComposeAwareUserActionResult +import com.android.systemui.scene.shared.model.Direction +import com.android.systemui.scene.shared.model.Edge +import com.android.systemui.scene.shared.model.SceneKey +import com.android.systemui.scene.shared.model.TransitionKey +import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionDistance +import com.android.systemui.scene.shared.model.UserActionResult + +// TODO(b/293899074): remove this file once we can use the types from SceneTransitionLayout. + +fun SceneKey.asComposeAware(): ComposeAwareSceneKey { + return ComposeAwareSceneKey( + debugName = toString(), + identity = this, + ) +} + +fun TransitionKey.asComposeAware(): ComposeAwareTransitionKey { + return ComposeAwareTransitionKey( + debugName = debugName, + identity = this, + ) +} + +fun UserAction.asComposeAware(): ComposeAwareUserAction { + return when (this) { + is UserAction.Swipe -> + Swipe( + pointerCount = pointerCount, + fromSource = + when (this.fromEdge) { + null -> null + Edge.LEFT -> ComposeAwareEdge.Left + Edge.TOP -> ComposeAwareEdge.Top + Edge.RIGHT -> ComposeAwareEdge.Right + Edge.BOTTOM -> ComposeAwareEdge.Bottom + }, + direction = + when (this.direction) { + Direction.LEFT -> SwipeDirection.Left + Direction.UP -> SwipeDirection.Up + Direction.RIGHT -> SwipeDirection.Right + Direction.DOWN -> SwipeDirection.Down + } + ) + is UserAction.Back -> Back + } +} + +fun UserActionResult.asComposeAware(): ComposeAwareUserActionResult { + val composeUnaware = this + return ComposeAwareUserActionResult( + toScene = composeUnaware.toScene.asComposeAware(), + transitionKey = composeUnaware.transitionKey?.asComposeAware(), + distance = composeUnaware.distance?.asComposeAware(), + ) +} + +fun UserActionDistance.asComposeAware(): ComposeAwareUserActionDistance { + val composeUnware = this + return object : ComposeAwareUserActionDistance { + override fun Density.absoluteDistance( + fromSceneSize: IntSize, + orientation: Orientation, + ): Float { + return composeUnware.absoluteDistance( + fromSceneWidth = fromSceneSize.width, + fromSceneHeight = fromSceneSize.height, + isHorizontal = orientation == Orientation.Horizontal, + ) + } + } +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeUnawareExtensions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeUnawareExtensions.kt new file mode 100644 index 000000000000..4c03664fc244 --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeUnawareExtensions.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.ui.composable + +import com.android.compose.animation.scene.ObservableTransitionState as ComposeAwareObservableTransitionState +import com.android.compose.animation.scene.SceneKey as ComposeAwareSceneKey +import com.android.systemui.scene.shared.model.ObservableTransitionState +import com.android.systemui.scene.shared.model.SceneKey + +fun ComposeAwareSceneKey.asComposeUnaware(): SceneKey { + return this.identity as SceneKey +} + +fun ComposeAwareObservableTransitionState.asComposeUnaware(): ObservableTransitionState { + return when (this) { + is ComposeAwareObservableTransitionState.Idle -> + ObservableTransitionState.Idle(scene.asComposeUnaware()) + is ComposeAwareObservableTransitionState.Transition -> + ObservableTransitionState.Transition( + fromScene = fromScene.asComposeUnaware(), + toScene = toScene.asComposeUnaware(), + progress = progress, + isInitiatedByUserInput = isInitiatedByUserInput, + isUserInputOngoing = isUserInputOngoing, + ) + } +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt index 736ee1f235c6..f90f29d8b9dd 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt @@ -25,9 +25,8 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.Edge import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction -import com.android.systemui.shade.ui.composable.Shade +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -46,15 +45,16 @@ constructor( ) : ComposableScene { override val key = SceneKey.Gone - override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> = - MutableStateFlow<Map<UserAction, SceneModel>>( + override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> = + MutableStateFlow<Map<UserAction, UserActionResult>>( mapOf( UserAction.Swipe( pointerCount = 2, fromEdge = Edge.TOP, direction = Direction.DOWN, - ) to SceneModel(SceneKey.QuickSettings), - UserAction.Swipe(direction = Direction.DOWN) to SceneModel(SceneKey.Shade), + ) to UserActionResult(SceneKey.QuickSettings), + UserAction.Swipe(direction = Direction.DOWN) to + UserActionResult(SceneKey.Shade), ) ) .asStateFlow() diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt index da1b417ae190..5006beb01fb4 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt @@ -25,6 +25,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier @@ -32,24 +34,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.PointerEventPass import androidx.compose.ui.input.pointer.motionEventSpy import androidx.compose.ui.input.pointer.pointerInput -import com.android.compose.animation.scene.Back -import com.android.compose.animation.scene.Edge as SceneTransitionEdge -import com.android.compose.animation.scene.ObservableTransitionState as SceneTransitionObservableTransitionState -import com.android.compose.animation.scene.SceneKey as SceneTransitionSceneKey +import com.android.compose.animation.scene.MutableSceneTransitionLayoutState import com.android.compose.animation.scene.SceneTransitionLayout -import com.android.compose.animation.scene.Swipe -import com.android.compose.animation.scene.SwipeDirection -import com.android.compose.animation.scene.UserAction as SceneTransitionUserAction -import com.android.compose.animation.scene.UserActionResult import com.android.compose.animation.scene.observableTransitionState -import com.android.compose.animation.scene.updateSceneTransitionLayoutState import com.android.systemui.ribbon.ui.composable.BottomRightCornerRibbon -import com.android.systemui.scene.shared.model.Direction -import com.android.systemui.scene.shared.model.Edge -import com.android.systemui.scene.shared.model.ObservableTransitionState +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import kotlinx.coroutines.flow.map @@ -75,22 +67,31 @@ import kotlinx.coroutines.flow.map fun SceneContainer( viewModel: SceneContainerViewModel, sceneByKey: Map<SceneKey, ComposableScene>, + dataSourceDelegator: SceneDataSourceDelegator, modifier: Modifier = Modifier, ) { - val currentSceneModel: SceneModel by viewModel.currentScene.collectAsState() - val currentSceneKey = currentSceneModel.key + val coroutineScope = rememberCoroutineScope() + val currentSceneKey: SceneKey by viewModel.currentScene.collectAsState() val currentScene = checkNotNull(sceneByKey[currentSceneKey]) - val currentDestinations: Map<UserAction, SceneModel> by + val currentDestinations: Map<UserAction, UserActionResult> by currentScene.destinationScenes.collectAsState() - val state = - updateSceneTransitionLayoutState( - currentSceneKey.toTransitionSceneKey(), - onChangeScene = viewModel::onSceneChanged, + val state: MutableSceneTransitionLayoutState = remember { + MutableSceneTransitionLayoutState( + initialScene = currentSceneKey.asComposeAware(), transitions = SceneContainerTransitions, ) + } + + DisposableEffect(state) { + val dataSource = SceneTransitionLayoutDataSource(state, coroutineScope) + dataSourceDelegator.setDelegate(dataSource) + onDispose { dataSourceDelegator.setDelegate(null) } + } DisposableEffect(viewModel, state) { - viewModel.setTransitionState(state.observableTransitionState().map { it.toModel() }) + viewModel.setTransitionState( + state.observableTransitionState().map { it.asComposeUnaware() } + ) onDispose { viewModel.setTransitionState(null) } } @@ -114,22 +115,22 @@ fun SceneContainer( ) { sceneByKey.forEach { (sceneKey, composableScene) -> scene( - key = sceneKey.toTransitionSceneKey(), + key = sceneKey.asComposeAware(), userActions = if (sceneKey == currentSceneKey) { currentDestinations } else { composableScene.destinationScenes.value } - .map { (userAction, destinationSceneModel) -> - toTransitionModels(userAction, destinationSceneModel) + .map { (userAction, userActionResult) -> + userAction.asComposeAware() to userActionResult.asComposeAware() } .toMap(), ) { with(composableScene) { this@scene.Content( modifier = - Modifier.element(sceneKey.toTransitionSceneKey().rootElementKey) + Modifier.element(sceneKey.asComposeAware().rootElementKey) .fillMaxSize(), ) } @@ -148,62 +149,3 @@ fun SceneContainer( ) } } - -// TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. -private fun SceneTransitionObservableTransitionState.toModel(): ObservableTransitionState { - return when (this) { - is SceneTransitionObservableTransitionState.Idle -> - ObservableTransitionState.Idle(scene.toModel().key) - is SceneTransitionObservableTransitionState.Transition -> - ObservableTransitionState.Transition( - fromScene = fromScene.toModel().key, - toScene = toScene.toModel().key, - progress = progress, - isInitiatedByUserInput = isInitiatedByUserInput, - isUserInputOngoing = isUserInputOngoing, - ) - } -} - -// TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. -private fun toTransitionModels( - userAction: UserAction, - sceneModel: SceneModel, -): Pair<SceneTransitionUserAction, UserActionResult> { - return userAction.toTransitionUserAction() to sceneModel.key.toTransitionSceneKey() -} - -// TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. -private fun SceneTransitionSceneKey.toModel(): SceneModel { - return SceneModel(key = identity as SceneKey) -} - -// TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. -private fun UserAction.toTransitionUserAction(): SceneTransitionUserAction { - return when (this) { - is UserAction.Swipe -> - Swipe( - pointerCount = pointerCount, - fromSource = - when (this.fromEdge) { - null -> null - Edge.LEFT -> SceneTransitionEdge.Left - Edge.TOP -> SceneTransitionEdge.Top - Edge.RIGHT -> SceneTransitionEdge.Right - Edge.BOTTOM -> SceneTransitionEdge.Bottom - }, - direction = - when (this.direction) { - Direction.LEFT -> SwipeDirection.Left - Direction.UP -> SwipeDirection.Up - Direction.RIGHT -> SwipeDirection.Right - Direction.DOWN -> SwipeDirection.Down - } - ) - is UserAction.Back -> Back - } -} - -private fun SceneContainerViewModel.onSceneChanged(sceneKey: SceneTransitionSceneKey) { - onSceneChanged(sceneKey.toModel()) -} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt index 2848245c42b1..61f81209ad7e 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt @@ -1,6 +1,8 @@ package com.android.systemui.scene.ui.composable import com.android.compose.animation.scene.transitions +import com.android.systemui.scene.shared.model.TransitionKeys.CollapseShadeInstantly +import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShadeCollapse import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsTransition import com.android.systemui.scene.ui.composable.transitions.goneToShadeTransition @@ -26,10 +28,38 @@ import com.android.systemui.scene.ui.composable.transitions.shadeToQuickSettings val SceneContainerTransitions = transitions { from(Bouncer, to = Gone) { bouncerToGoneTransition() } from(Gone, to = Shade) { goneToShadeTransition() } + from( + Gone, + to = Shade, + key = CollapseShadeInstantly.asComposeAware(), + ) { + goneToShadeTransition(durationScale = 0.0) + } + from( + Gone, + to = Shade, + key = SlightlyFasterShadeCollapse.asComposeAware(), + ) { + goneToShadeTransition(durationScale = 0.9) + } from(Gone, to = QuickSettings) { goneToQuickSettingsTransition() } from(Lockscreen, to = Bouncer) { lockscreenToBouncerTransition() } from(Lockscreen, to = Communal) { lockscreenToCommunalTransition() } from(Lockscreen, to = Shade) { lockscreenToShadeTransition() } + from( + Lockscreen, + to = Shade, + key = CollapseShadeInstantly.asComposeAware(), + ) { + lockscreenToShadeTransition(durationScale = 0.0) + } + from( + Lockscreen, + to = Shade, + key = SlightlyFasterShadeCollapse.asComposeAware(), + ) { + lockscreenToShadeTransition(durationScale = 0.9) + } from(Lockscreen, to = QuickSettings) { lockscreenToQuickSettingsTransition() } from(Lockscreen, to = Gone) { lockscreenToGoneTransition() } from(Shade, to = QuickSettings) { shadeToQuickSettingsTransition() } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneTransitionLayoutDataSource.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneTransitionLayoutDataSource.kt new file mode 100644 index 000000000000..60c0b7719a25 --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneTransitionLayoutDataSource.kt @@ -0,0 +1,81 @@ +/* + * 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. + */ + +@file:OptIn(ExperimentalCoroutinesApi::class) + +package com.android.systemui.scene.ui.composable + +import com.android.compose.animation.scene.MutableSceneTransitionLayoutState +import com.android.compose.animation.scene.ObservableTransitionState +import com.android.compose.animation.scene.observableTransitionState +import com.android.systemui.scene.shared.model.SceneDataSource +import com.android.systemui.scene.shared.model.SceneKey +import com.android.systemui.scene.shared.model.TransitionKey +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn + +/** + * An implementation of [SceneDataSource] that's backed by a [MutableSceneTransitionLayoutState]. + */ +class SceneTransitionLayoutDataSource( + private val state: MutableSceneTransitionLayoutState, + + /** + * The [CoroutineScope] of the @Composable that's using this, it's critical that this is *not* + * the application scope. + */ + private val coroutineScope: CoroutineScope, +) : SceneDataSource { + override val currentScene: StateFlow<SceneKey> = + state + .observableTransitionState() + .flatMapLatest { observableTransitionState -> + when (observableTransitionState) { + is ObservableTransitionState.Idle -> flowOf(observableTransitionState.scene) + is ObservableTransitionState.Transition -> + observableTransitionState.isUserInputOngoing.map { isUserInputOngoing -> + if (isUserInputOngoing) { + observableTransitionState.fromScene + } else { + observableTransitionState.toScene + } + } + } + } + .map { it.asComposeUnaware() } + .stateIn( + scope = coroutineScope, + started = SharingStarted.WhileSubscribed(), + initialValue = state.transitionState.currentScene.asComposeUnaware(), + ) + + override fun changeScene( + toScene: SceneKey, + transitionKey: TransitionKey?, + ) { + state.setTargetScene( + targetScene = toScene.asComposeAware(), + transitionKey = transitionKey?.asComposeAware(), + coroutineScope = coroutineScope, + ) + } +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/TransitionSceneKeys.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/TransitionSceneKeys.kt index 0c66701de61c..5a9add1ad587 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/TransitionSceneKeys.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/TransitionSceneKeys.kt @@ -1,16 +1,10 @@ package com.android.systemui.scene.ui.composable -import com.android.compose.animation.scene.SceneKey as SceneTransitionSceneKey import com.android.systemui.scene.shared.model.SceneKey -val Lockscreen = SceneKey.Lockscreen.toTransitionSceneKey() -val Bouncer = SceneKey.Bouncer.toTransitionSceneKey() -val Shade = SceneKey.Shade.toTransitionSceneKey() -val QuickSettings = SceneKey.QuickSettings.toTransitionSceneKey() -val Gone = SceneKey.Gone.toTransitionSceneKey() -val Communal = SceneKey.Communal.toTransitionSceneKey() - -// TODO(b/293899074): Remove this file once we can use the scene keys from SceneTransitionLayout. -fun SceneKey.toTransitionSceneKey(): SceneTransitionSceneKey { - return SceneTransitionSceneKey(debugName = toString(), identity = this) -} +val Lockscreen = SceneKey.Lockscreen.asComposeAware() +val Bouncer = SceneKey.Bouncer.asComposeAware() +val Shade = SceneKey.Shade.asComposeAware() +val QuickSettings = SceneKey.QuickSettings.asComposeAware() +val Gone = SceneKey.Gone.asComposeAware() +val Communal = SceneKey.Communal.asComposeAware() diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt index 1223ace6957b..6f115d88dbe2 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToShadeTransition.kt @@ -6,11 +6,16 @@ import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.notifications.ui.composable.Notifications import com.android.systemui.qs.ui.composable.QuickSettings import com.android.systemui.shade.ui.composable.ShadeHeader +import kotlin.time.Duration.Companion.milliseconds -fun TransitionBuilder.goneToShadeTransition() { - spec = tween(durationMillis = 500) +fun TransitionBuilder.goneToShadeTransition( + durationScale: Double = 1.0, +) { + spec = tween(durationMillis = DefaultDuration.times(durationScale).inWholeMilliseconds.toInt()) fractionRange(start = .58f) { fade(ShadeHeader.Elements.CollapsedContent) } translate(QuickSettings.Elements.Content, y = -ShadeHeader.Dimensions.CollapsedHeight * .66f) translate(Notifications.Elements.NotificationScrim, Edge.Top, false) } + +private val DefaultDuration = 500.milliseconds diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToShadeTransition.kt index 2d5cf5c752bf..e71f99669df2 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToShadeTransition.kt @@ -6,9 +6,12 @@ import com.android.compose.animation.scene.TransitionBuilder import com.android.systemui.notifications.ui.composable.Notifications import com.android.systemui.qs.ui.composable.QuickSettings import com.android.systemui.shade.ui.composable.Shade +import kotlin.time.Duration.Companion.milliseconds -fun TransitionBuilder.lockscreenToShadeTransition() { - spec = tween(durationMillis = 500) +fun TransitionBuilder.lockscreenToShadeTransition( + durationScale: Double = 1.0, +) { + spec = tween(durationMillis = DefaultDuration.times(durationScale).inWholeMilliseconds.toInt()) fractionRange(end = 0.5f) { fade(Shade.Elements.BackgroundScrim) @@ -20,3 +23,5 @@ fun TransitionBuilder.lockscreenToShadeTransition() { } fractionRange(start = 0.5f) { fade(Notifications.Elements.NotificationScrim) } } + +private val DefaultDuration = 500.milliseconds diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt index cac35cb9369f..25df3e49b618 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt @@ -54,8 +54,8 @@ import com.android.systemui.qs.ui.composable.QuickSettings import com.android.systemui.res.R import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.scene.ui.composable.ComposableScene import com.android.systemui.shade.ui.viewmodel.ShadeSceneViewModel import com.android.systemui.statusbar.phone.StatusBarIconController @@ -108,7 +108,7 @@ constructor( ) : ComposableScene { override val key = SceneKey.Shade - override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> = + override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> = viewModel.upDestinationSceneKey .map { sceneKey -> destinationScenes(up = sceneKey) } .stateIn( @@ -139,10 +139,10 @@ constructor( private fun destinationScenes( up: SceneKey, - ): Map<UserAction, SceneModel> { + ): Map<UserAction, UserActionResult> { return mapOf( - UserAction.Swipe(Direction.UP) to SceneModel(up), - UserAction.Swipe(Direction.DOWN) to SceneModel(SceneKey.QuickSettings), + UserAction.Swipe(Direction.UP) to UserActionResult(up), + UserAction.Swipe(Direction.DOWN) to UserActionResult(SceneKey.QuickSettings), ) } } diff --git a/packages/SystemUI/customization/src/com/android/systemui/util/ThreadAssert.kt b/packages/SystemUI/customization/src/com/android/systemui/util/ThreadAssert.kt new file mode 100644 index 000000000000..ccbf4ef68680 --- /dev/null +++ b/packages/SystemUI/customization/src/com/android/systemui/util/ThreadAssert.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.util + +/** Injectable helper providing thread assertions. */ +class ThreadAssert() { + fun isMainThread() = Assert.isMainThread() + fun isNotMainThread() = Assert.isNotMainThread() +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt index e8a43ac0ad6c..38dc24ed2f5f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt @@ -64,9 +64,10 @@ import com.android.systemui.res.R import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags +import com.android.systemui.scene.shared.model.FakeSceneDataSource import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.shared.Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.DevicePostureController @@ -170,6 +171,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { private lateinit var deviceEntryInteractor: DeviceEntryInteractor @Mock private lateinit var primaryBouncerInteractor: Lazy<PrimaryBouncerInteractor> private lateinit var sceneTransitionStateFlow: MutableStateFlow<ObservableTransitionState> + private lateinit var fakeSceneDataSource: FakeSceneDataSource private lateinit var underTest: KeyguardSecurityContainerController @@ -246,6 +248,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { sceneInteractor.setTransitionState(sceneTransitionStateFlow) deviceEntryInteractor = kosmos.deviceEntryInteractor + fakeSceneDataSource = kosmos.fakeSceneDataSource + underTest = KeyguardSecurityContainerController( view, @@ -810,7 +814,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { // is // not enough to trigger a dismissal of the keyguard. underTest.onViewAttached() - sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Bouncer, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Lockscreen, @@ -820,7 +825,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Bouncer) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Bouncer) runCurrent() verify(viewMediatorCallback, never()).keyguardDone(anyInt()) @@ -829,7 +834,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { // keyguard. kosmos.fakeDeviceEntryRepository.setUnlocked(true) runCurrent() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Gone, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Bouncer, @@ -839,7 +845,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Gone) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Gone) runCurrent() verify(viewMediatorCallback).keyguardDone(anyInt()) @@ -847,7 +853,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { // While listening, moving back to the bouncer scene does not dismiss the keyguard // again. clearInvocations(viewMediatorCallback) - sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Bouncer, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Gone, @@ -857,7 +864,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Bouncer) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Bouncer) runCurrent() verify(viewMediatorCallback, never()).keyguardDone(anyInt()) @@ -866,7 +873,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { // scene // does not dismiss the keyguard while we're not listening. underTest.onViewDetached() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Gone, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Bouncer, @@ -876,13 +884,14 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Gone) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Gone) runCurrent() verify(viewMediatorCallback, never()).keyguardDone(anyInt()) // While not listening, moving to the lockscreen does not dismiss the keyguard. - sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Lockscreen, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Gone, @@ -892,7 +901,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Lockscreen, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Lockscreen) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Lockscreen) runCurrent() verify(viewMediatorCallback, never()).keyguardDone(anyInt()) @@ -900,7 +909,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { // Reattaching the view starts listening again so moving from the bouncer scene to the // gone scene now does dismiss the keyguard again, this time from lockscreen. underTest.onViewAttached() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Gone, "reason") sceneTransitionStateFlow.value = ObservableTransitionState.Transition( SceneKey.Lockscreen, @@ -910,7 +920,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) runCurrent() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone, null), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Gone) sceneTransitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Gone) runCurrent() verify(viewMediatorCallback).keyguardDone(anyInt()) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/BiometricTestExtensions.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/BiometricTestExtensions.kt index 72e884e9e5d6..9c2791f5a257 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/BiometricTestExtensions.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/BiometricTestExtensions.kt @@ -120,6 +120,7 @@ internal fun Collection<SensorPropertiesInternal?>.extractAuthenticatorTypes(): internal fun promptInfo( logoRes: Int = -1, logoBitmap: Bitmap? = null, + logoDescription: String? = null, title: String = "title", subtitle: String = "sub", description: String = "desc", @@ -132,6 +133,7 @@ internal fun promptInfo( val info = PromptInfo() info.logoRes = logoRes info.logoBitmap = logoBitmap + info.logoDescription = logoDescription info.title = title info.subtitle = subtitle info.description = description diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt index fbb5415402db..ad29e68f1bbf 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt @@ -34,7 +34,6 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.res.R import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.android.systemui.user.data.model.SelectedUserModel import com.android.systemui.user.data.model.SelectionStatus @@ -87,14 +86,14 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { @Test fun onShown() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() assertThat(message?.text).isEqualTo(ENTER_YOUR_PASSWORD) assertThat(password).isEmpty() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) assertThat(underTest.authenticationMethod).isEqualTo(AuthenticationMethodModel.Password) } @@ -117,7 +116,7 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { @Test fun onPasswordInputChanged() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() @@ -126,7 +125,7 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { assertThat(message?.text).isEmpty() assertThat(password).isEqualTo("password") - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -201,7 +200,7 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { @Test fun onShown_againAfterSceneChange_resetsPassword() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val password by collectLastValue(underTest.password) lockDeviceAndOpenPasswordBouncer() @@ -217,7 +216,7 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { // Ensure the previously-entered password is not shown. assertThat(password).isEmpty() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -330,16 +329,15 @@ class PasswordBouncerViewModelTest : SysuiTestCase() { } private fun TestScope.switchToScene(toScene: SceneKey) { - val currentScene by collectLastValue(sceneInteractor.desiredScene) - val bouncerShown = currentScene?.key != SceneKey.Bouncer && toScene == SceneKey.Bouncer - val bouncerHidden = currentScene?.key == SceneKey.Bouncer && toScene != SceneKey.Bouncer - sceneInteractor.changeScene(SceneModel(toScene), "reason") - sceneInteractor.onSceneChanged(SceneModel(toScene), "reason") + val currentScene by collectLastValue(sceneInteractor.currentScene) + val bouncerShown = currentScene != SceneKey.Bouncer && toScene == SceneKey.Bouncer + val bouncerHidden = currentScene == SceneKey.Bouncer && toScene != SceneKey.Bouncer + sceneInteractor.changeScene(toScene, "reason") if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() - assertThat(currentScene).isEqualTo(SceneModel(toScene)) + assertThat(currentScene).isEqualTo(toScene) } private fun TestScope.lockDeviceAndOpenPasswordBouncer() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt index 725bdbd43445..32de1f2a892c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModelTest.kt @@ -32,7 +32,6 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.res.R import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage @@ -78,7 +77,7 @@ class PatternBouncerViewModelTest : SysuiTestCase() { @Test fun onShown() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) @@ -87,14 +86,14 @@ class PatternBouncerViewModelTest : SysuiTestCase() { assertThat(message?.text).isEqualTo(ENTER_YOUR_PATTERN) assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) assertThat(underTest.authenticationMethod).isEqualTo(AuthenticationMethodModel.Pattern) } @Test fun onDragStart() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) @@ -105,7 +104,7 @@ class PatternBouncerViewModelTest : SysuiTestCase() { assertThat(message?.text).isEmpty() assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -147,7 +146,7 @@ class PatternBouncerViewModelTest : SysuiTestCase() { @Test fun onDragEnd_whenWrong() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val selectedDots by collectLastValue(underTest.selectedDots) val currentDot by collectLastValue(underTest.currentDot) @@ -160,7 +159,7 @@ class PatternBouncerViewModelTest : SysuiTestCase() { assertThat(selectedDots).isEmpty() assertThat(currentDot).isNull() assertThat(message?.text).isEqualTo(WRONG_PATTERN) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -369,16 +368,15 @@ class PatternBouncerViewModelTest : SysuiTestCase() { } private fun TestScope.switchToScene(toScene: SceneKey) { - val currentScene by collectLastValue(sceneInteractor.desiredScene) - val bouncerShown = currentScene?.key != SceneKey.Bouncer && toScene == SceneKey.Bouncer - val bouncerHidden = currentScene?.key == SceneKey.Bouncer && toScene != SceneKey.Bouncer - sceneInteractor.changeScene(SceneModel(toScene), "reason") - sceneInteractor.onSceneChanged(SceneModel(toScene), "reason") + val currentScene by collectLastValue(sceneInteractor.currentScene) + val bouncerShown = currentScene != SceneKey.Bouncer && toScene == SceneKey.Bouncer + val bouncerHidden = currentScene == SceneKey.Bouncer && toScene != SceneKey.Bouncer + sceneInteractor.changeScene(toScene, "reason") if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() - assertThat(currentScene).isEqualTo(SceneModel(toScene)) + assertThat(currentScene).isEqualTo(toScene) } private fun TestScope.lockDeviceAndOpenPatternBouncer() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt index 06e12586d384..ccf7094e2bf7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt @@ -32,7 +32,6 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.res.R import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -63,12 +62,12 @@ class PinBouncerViewModelTest : SysuiTestCase() { fun setUp() { underTest = PinBouncerViewModel( - applicationContext = context, - viewModelScope = testScope.backgroundScope, - interactor = bouncerInteractor, - isInputEnabled = MutableStateFlow(true).asStateFlow(), - simBouncerInteractor = kosmos.simBouncerInteractor, - authenticationMethod = AuthenticationMethodModel.Pin, + applicationContext = context, + viewModelScope = testScope.backgroundScope, + interactor = bouncerInteractor, + isInputEnabled = MutableStateFlow(true).asStateFlow(), + simBouncerInteractor = kosmos.simBouncerInteractor, + authenticationMethod = AuthenticationMethodModel.Pin, ) overrideResource(R.string.keyguard_enter_your_pin, ENTER_YOUR_PIN) @@ -182,7 +181,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { @Test fun onBackspaceButtonLongPressed() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -197,7 +196,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { assertThat(message?.text).isEmpty() assertThat(pin).isEmpty() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -216,7 +215,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { @Test fun onAuthenticateButtonClicked_whenWrong() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) lockDeviceAndOpenPinBouncer() @@ -231,7 +230,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { assertThat(pin).isEmpty() assertThat(message?.text).ignoringCase().isEqualTo(WRONG_PIN) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -276,7 +275,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { @Test fun onAutoConfirm_whenWrong() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) val message by collectLastValue(bouncerViewModel.message) val pin by collectLastValue(underTest.pinInput.map { it.getPin() }) kosmos.fakeAuthenticationRepository.setAutoConfirmFeatureEnabled(true) @@ -291,7 +290,7 @@ class PinBouncerViewModelTest : SysuiTestCase() { assertThat(pin).isEmpty() assertThat(message?.text).ignoringCase().isEqualTo(WRONG_PIN) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test @@ -389,16 +388,15 @@ class PinBouncerViewModelTest : SysuiTestCase() { } private fun TestScope.switchToScene(toScene: SceneKey) { - val currentScene by collectLastValue(sceneInteractor.desiredScene) - val bouncerShown = currentScene?.key != SceneKey.Bouncer && toScene == SceneKey.Bouncer - val bouncerHidden = currentScene?.key == SceneKey.Bouncer && toScene != SceneKey.Bouncer - sceneInteractor.changeScene(SceneModel(toScene), "reason") - sceneInteractor.onSceneChanged(SceneModel(toScene), "reason") + val currentScene by collectLastValue(sceneInteractor.currentScene) + val bouncerShown = currentScene != SceneKey.Bouncer && toScene == SceneKey.Bouncer + val bouncerHidden = currentScene == SceneKey.Bouncer && toScene != SceneKey.Bouncer + sceneInteractor.changeScene(toScene, "reason") if (bouncerShown) underTest.onShown() if (bouncerHidden) underTest.onHidden() runCurrent() - assertThat(currentScene).isEqualTo(SceneModel(toScene)) + assertThat(currentScene).isEqualTo(toScene) } private fun TestScope.lockDeviceAndOpenPinBouncer() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalRepositoryImplTest.kt index b4e2eab22c88..5b20ae5131b2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalRepositoryImplTest.kt @@ -26,7 +26,6 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.scene.data.repository.sceneContainerRepository import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.flowOf @@ -80,7 +79,7 @@ class CommunalRepositoryImplTest : SysuiTestCase() { testScope.runTest { underTest = createRepositoryImpl(true) - sceneContainerRepository.setDesiredScene(SceneModel(key = SceneKey.Communal)) + sceneContainerRepository.changeScene(SceneKey.Communal) val isCommunalHubShowing by collectLastValue(underTest.isCommunalHubShowing) assertThat(isCommunalHubShowing).isTrue() @@ -91,7 +90,7 @@ class CommunalRepositoryImplTest : SysuiTestCase() { testScope.runTest { underTest = createRepositoryImpl(true) - sceneContainerRepository.setDesiredScene(SceneModel(key = SceneKey.Lockscreen)) + sceneContainerRepository.changeScene(SceneKey.Lockscreen) val isCommunalHubShowing by collectLastValue(underTest.isCommunalHubShowing) assertThat(isCommunalHubShowing).isFalse() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt index f70b6a5a170f..b299ca7ee804 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt @@ -45,6 +45,7 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.log.logcatLogBuffer import com.android.systemui.media.controls.ui.MediaHierarchyManager import com.android.systemui.media.controls.ui.MediaHost +import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository import com.android.systemui.testKosmos @@ -102,6 +103,7 @@ class CommunalViewModelTest : SysuiTestCase() { testScope, kosmos.communalInteractor, kosmos.communalTutorialInteractor, + kosmos.shadeInteractor, mediaHost, logcatLogBuffer("CommunalViewModelTest"), ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractorTest.kt new file mode 100644 index 000000000000..2e9ee5ca2851 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractorTest.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.deviceentry.domain.interactor + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.keyguard.data.repository.biometricSettingsRepository +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +class DeviceEntryBiometricSettingsInteractorTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val biometricSettingsRepository = kosmos.biometricSettingsRepository + private val underTest = kosmos.deviceEntryBiometricSettingsInteractor + + @Test + fun isCoex_true() = runTest { + val isCoex by collectLastValue(underTest.fingerprintAndFaceEnrolledAndEnabled) + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + assertThat(isCoex).isTrue() + } + + @Test + fun isCoex_faceOnly() = runTest { + val isCoex by collectLastValue(underTest.fingerprintAndFaceEnrolledAndEnabled) + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + assertThat(isCoex).isFalse() + } + + @Test + fun isCoex_fingerprintOnly() = runTest { + val isCoex by collectLastValue(underTest.fingerprintAndFaceEnrolledAndEnabled) + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(false) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + assertThat(isCoex).isFalse() + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractorTest.kt index 05b589126b08..98719dd32e5a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractorTest.kt @@ -32,7 +32,6 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -311,9 +310,9 @@ class DeviceEntryInteractorTest : SysuiTestCase() { @Test fun showOrUnlockDevice_notLocked_switchesToGoneScene() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) switchToScene(SceneKey.Lockscreen) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pin @@ -323,15 +322,15 @@ class DeviceEntryInteractorTest : SysuiTestCase() { underTest.attemptDeviceEntry() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Gone)) + assertThat(currentScene).isEqualTo(SceneKey.Gone) } @Test fun showOrUnlockDevice_authMethodNotSecure_switchesToGoneScene() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) switchToScene(SceneKey.Lockscreen) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.None @@ -340,15 +339,15 @@ class DeviceEntryInteractorTest : SysuiTestCase() { underTest.attemptDeviceEntry() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Gone)) + assertThat(currentScene).isEqualTo(SceneKey.Gone) } @Test fun showOrUnlockDevice_authMethodSwipe_switchesToGoneScene() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) switchToScene(SceneKey.Lockscreen) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) kosmos.fakeDeviceEntryRepository.setLockscreenEnabled(true) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( @@ -358,7 +357,7 @@ class DeviceEntryInteractorTest : SysuiTestCase() { underTest.attemptDeviceEntry() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Gone)) + assertThat(currentScene).isEqualTo(SceneKey.Gone) } @Test @@ -384,6 +383,6 @@ class DeviceEntryInteractorTest : SysuiTestCase() { } private fun switchToScene(sceneKey: SceneKey) { - sceneInteractor.changeScene(SceneModel(sceneKey), "reason") + sceneInteractor.changeScene(sceneKey, "reason") } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt index 7242cb20dc77..f6c056698967 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt @@ -54,7 +54,7 @@ class LightRevealScrimRepositoryTest : SysuiTestCase() { private lateinit var powerInteractor: PowerInteractor private lateinit var underTest: LightRevealScrimRepositoryImpl - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Before fun setUp() { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt index c23ec2290d6a..bf1d76f87f5a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt @@ -74,6 +74,8 @@ class KeyguardRootViewModelTest : SysuiTestCase() { private val dozeParameters = kosmos.dozeParameters private val underTest by lazy { kosmos.keyguardRootViewModel } + private val viewState = ViewStateAccessor() + @Before fun setUp() { mSetFlagsRule.enableFlags(AConfigFlags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR) @@ -251,7 +253,7 @@ class KeyguardRootViewModelTest : SysuiTestCase() { @Test fun alpha_idleOnHub_isZero() = testScope.runTest { - val alpha by collectLastValue(underTest.alpha) + val alpha by collectLastValue(underTest.alpha(viewState)) // Hub transition state is idle with hub open. communalRepository.setTransitionState( @@ -269,7 +271,7 @@ class KeyguardRootViewModelTest : SysuiTestCase() { @Test fun alpha_transitionToHub_isZero() = testScope.runTest { - val alpha by collectLastValue(underTest.alpha) + val alpha by collectLastValue(underTest.alpha(viewState)) keyguardTransitionRepository.sendTransitionSteps( from = KeyguardState.LOCKSCREEN, @@ -283,7 +285,7 @@ class KeyguardRootViewModelTest : SysuiTestCase() { @Test fun alpha_transitionFromHubToLockscreen_isOne() = testScope.runTest { - val alpha by collectLastValue(underTest.alpha) + val alpha by collectLastValue(underTest.alpha(viewState)) // Transition to the glanceable hub and back. keyguardTransitionRepository.sendTransitionSteps( diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt index 72617238cbb1..3455050d8542 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt @@ -36,7 +36,6 @@ import com.android.systemui.flags.fakeFeatureFlagsClassic import com.android.systemui.kosmos.testScope import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.testKosmos import com.android.systemui.user.data.repository.fakeUserRepository @@ -66,7 +65,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { ) kosmos.fakeDeviceEntryRepository.setLockscreenEnabled(true) kosmos.fakeDeviceEntryRepository.setUnlocked(true) - sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason") + sceneInteractor.changeScene(SceneKey.Lockscreen, "reason") assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Gone) } @@ -79,7 +78,7 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { AuthenticationMethodModel.Pin ) kosmos.fakeDeviceEntryRepository.setUnlocked(false) - sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason") + sceneInteractor.changeScene(SceneKey.Lockscreen, "reason") assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Bouncer) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt index 6fc5be1e376d..15cf83c50de3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt @@ -53,7 +53,7 @@ class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() { val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository val primaryBouncerInteractor = kosmos.mockPrimaryBouncerInteractor - val sysuiStatusBarStateController = kosmos.sysuiStatusBarStateController + private val sysuiStatusBarStateController = kosmos.sysuiStatusBarStateController val underTest by lazy { kosmos.primaryBouncerToGoneTransitionViewModel } @Before diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt index 51f8b11ab72d..d47da3e47d2f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt @@ -29,8 +29,8 @@ import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository @@ -120,8 +120,8 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { assertThat(destinations) .isEqualTo( mapOf( - UserAction.Back to SceneModel(SceneKey.Shade), - UserAction.Swipe(Direction.UP) to SceneModel(SceneKey.Shade), + UserAction.Back to UserActionResult(SceneKey.Shade), + UserAction.Swipe(Direction.UP) to UserActionResult(SceneKey.Shade), ) ) } @@ -135,7 +135,7 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { assertThat(destinations) .isEqualTo( mapOf( - UserAction.Back to SceneModel(SceneKey.QuickSettings), + UserAction.Back to UserActionResult(SceneKey.QuickSettings), ) ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt index 006f429ab98a..7c30c7eb7f50 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt @@ -62,7 +62,7 @@ import com.android.systemui.scene.domain.startable.SceneContainerStartable import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import com.android.systemui.settings.FakeDisplayTracker import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel @@ -196,6 +196,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { private lateinit var emergencyAffordanceManager: EmergencyAffordanceManager private lateinit var telecomManager: TelecomManager + private val fakeSceneDataSource = kosmos.fakeSceneDataSource @Before fun setUp() { @@ -270,7 +271,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { startable.start() assertWithMessage("Initial scene key mismatch!") - .that(sceneContainerViewModel.currentScene.value.key) + .that(sceneContainerViewModel.currentScene.value) .isEqualTo(sceneContainerConfig.initialSceneKey) assertWithMessage("Initial scene container visibility mismatch!") .that(sceneContainerViewModel.isVisible.value) @@ -285,11 +286,12 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { testScope.runTest { emulateUserDrivenTransition(SceneKey.Bouncer) + fakeSceneDataSource.pause() enterPin() - assertCurrentScene(SceneKey.Gone) - emulateUiSceneTransition( + emulatePendingTransitionProgress( expectedVisible = false, ) + assertCurrentScene(SceneKey.Gone) } @Test @@ -302,11 +304,12 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { to = upDestinationSceneKey, ) + fakeSceneDataSource.pause() enterPin() - assertCurrentScene(SceneKey.Gone) - emulateUiSceneTransition( + emulatePendingTransitionProgress( expectedVisible = false, ) + assertCurrentScene(SceneKey.Gone) } @Test @@ -451,10 +454,11 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { to = upDestinationSceneKey, ) + fakeSceneDataSource.pause() dismissIme() + emulatePendingTransitionProgress() assertCurrentScene(SceneKey.Lockscreen) - emulateUiSceneTransition() } @Test @@ -507,8 +511,9 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { @Test fun goesToGone_whenSimUnlocked_whileDeviceUnlocked() = testScope.runTest { + fakeSceneDataSource.pause() introduceLockedSim() - emulateUiSceneTransition(expectedVisible = true) + emulatePendingTransitionProgress(expectedVisible = true) enterSimPin(authMethodAfterSimUnlock = AuthenticationMethodModel.None) assertCurrentScene(SceneKey.Gone) } @@ -516,8 +521,9 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { @Test fun showLockscreen_whenSimUnlocked_whileDeviceLocked() = testScope.runTest { + fakeSceneDataSource.pause() introduceLockedSim() - emulateUiSceneTransition(expectedVisible = true) + emulatePendingTransitionProgress(expectedVisible = true) enterSimPin(authMethodAfterSimUnlock = AuthenticationMethodModel.Pin) assertCurrentScene(SceneKey.Lockscreen) } @@ -545,7 +551,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { private fun TestScope.assertCurrentScene(expected: SceneKey) { runCurrent() assertWithMessage("Current scene mismatch!") - .that(sceneContainerViewModel.currentScene.value.key) + .that(sceneContainerViewModel.currentScene.value) .isEqualTo(expected) } @@ -592,35 +598,32 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { } /** - * Emulates a complete transition in the UI from whatever the current scene is in the UI to - * whatever the current scene should be, based on the value in - * [SceneContainerViewModel.onSceneChanged]. - * - * This should post a series of values into [transitionState] to emulate a gradual scene - * transition and culminate with a call to [SceneContainerViewModel.onSceneChanged]. + * Emulates a gradual transition to the currently pending scene that's sitting in the + * [fakeSceneDataSource]. This emits a series of progress updates to the [transitionState] and + * finishes by committing the pending scene as the current scene. * - * The method asserts that a transition is actually required. E.g. it will fail if the current - * scene in [transitionState] is already caught up with the scene in - * [SceneContainerViewModel.currentScene]. - * - * @param expectedVisible Whether [SceneContainerViewModel.isVisible] should be set at the end - * of the UI transition. + * In order to use this, the [fakeSceneDataSource] must be paused before this method is called. */ - private fun TestScope.emulateUiSceneTransition( + private fun TestScope.emulatePendingTransitionProgress( expectedVisible: Boolean = true, ) { - val to = sceneContainerViewModel.currentScene.value + assertWithMessage("The FakeSceneDataSource has to be paused for this to do anything.") + .that(fakeSceneDataSource.isPaused) + .isTrue() + + val to = fakeSceneDataSource.pendingScene ?: return val from = getCurrentSceneInUi() - assertWithMessage("Cannot transition to ${to.key} as the UI is already on that scene!") - .that(to.key) - .isNotEqualTo(from) + + if (to == from) { + return + } // Begin to transition. val progressFlow = MutableStateFlow(0f) transitionState.value = ObservableTransitionState.Transition( fromScene = getCurrentSceneInUi(), - toScene = to.key, + toScene = to, progress = progressFlow, isInitiatedByUserInput = false, isUserInputOngoing = flowOf(false), @@ -634,17 +637,18 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { } // End the transition and report the change. - transitionState.value = ObservableTransitionState.Idle(to.key) + transitionState.value = ObservableTransitionState.Idle(to) - sceneContainerViewModel.onSceneChanged(to) + fakeSceneDataSource.unpause(force = true) runCurrent() - assertWithMessage("Visibility mismatch after scene transition from $from to ${to.key}!") + assertWithMessage("Visibility mismatch after scene transition from $from to $to!") .that(sceneContainerViewModel.isVisible.value) .isEqualTo(expectedVisible) + assertThat(sceneContainerViewModel.currentScene.value).isEqualTo(to) bouncerSceneJob = - if (to.key == SceneKey.Bouncer) { + if (to == SceneKey.Bouncer) { testScope.backgroundScope.launch { bouncerViewModel.authMethodViewModel.collect { // Do nothing. Need this to turn this otherwise cold flow, hot. @@ -662,7 +666,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { * causes a scene change to the [to] scene. * * This also includes the emulation of the resulting UI transition that culminates with the UI - * catching up with the requested scene change (see [emulateUiSceneTransition]). + * catching up with the requested scene change (see [emulatePendingTransitionProgress]). * * @param to The scene to transition to. */ @@ -671,10 +675,10 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { ) { checkNotNull(to) - sceneInteractor.changeScene(SceneModel(to), "reason") - assertThat(sceneContainerViewModel.currentScene.value.key).isEqualTo(to) + fakeSceneDataSource.pause() + sceneInteractor.changeScene(to, "reason") - emulateUiSceneTransition( + emulatePendingTransitionProgress( expectedVisible = to != SceneKey.Gone, ) } @@ -703,11 +707,12 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { .isFalse() emulateUserDrivenTransition(SceneKey.Bouncer) + fakeSceneDataSource.pause() enterPin() // This repository state is not changed by the AuthInteractor, it relies on // KeyguardStateController. kosmos.fakeDeviceEntryRepository.setUnlocked(true) - emulateUiSceneTransition( + emulatePendingTransitionProgress( expectedVisible = false, ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryTest.kt index 2ad872ca6023..1da3bc1aeda8 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryTest.kt @@ -28,7 +28,6 @@ import com.android.systemui.scene.sceneKeys import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -63,21 +62,21 @@ class SceneContainerRepositoryTest : SysuiTestCase() { } @Test - fun desiredScene() = + fun currentScene() = testScope.runTest { val underTest = kosmos.sceneContainerRepository - val currentScene by collectLastValue(underTest.desiredScene) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) - underTest.setDesiredScene(SceneModel(SceneKey.Shade)) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Shade)) + underTest.changeScene(SceneKey.Shade) + assertThat(currentScene).isEqualTo(SceneKey.Shade) } @Test(expected = IllegalStateException::class) - fun setDesiredScene_noSuchSceneInContainer_throws() { + fun changeScene_noSuchSceneInContainer_throws() { kosmos.sceneKeys = listOf(SceneKey.QuickSettings, SceneKey.Lockscreen) val underTest = kosmos.sceneContainerRepository - underTest.setDesiredScene(SceneModel(SceneKey.Shade)) + underTest.changeScene(SceneKey.Shade) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt index 942fbc229e8a..4b9ebdc295c6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt @@ -29,7 +29,7 @@ import com.android.systemui.scene.sceneKeys import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.MutableStateFlow @@ -46,6 +46,7 @@ class SceneInteractorTest : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope + private val fakeSceneDataSource = kosmos.fakeSceneDataSource private lateinit var underTest: SceneInteractor @@ -63,24 +64,24 @@ class SceneInteractorTest : SysuiTestCase() { @Test fun changeScene() = testScope.runTest { - val desiredScene by collectLastValue(underTest.desiredScene) - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) - underTest.changeScene(SceneModel(SceneKey.Shade), "reason") - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Shade)) + underTest.changeScene(SceneKey.Shade, "reason") + assertThat(currentScene).isEqualTo(SceneKey.Shade) } @Test fun changeScene_toGoneWhenUnl_doesNotThrow() = testScope.runTest { - val desiredScene by collectLastValue(underTest.desiredScene) - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) kosmos.fakeDeviceEntryRepository.setUnlocked(true) runCurrent() - underTest.changeScene(SceneModel(SceneKey.Gone), "reason") - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Gone)) + underTest.changeScene(SceneKey.Gone, "reason") + assertThat(currentScene).isEqualTo(SceneKey.Gone) } @Test(expected = IllegalStateException::class) @@ -88,17 +89,18 @@ class SceneInteractorTest : SysuiTestCase() { testScope.runTest { kosmos.fakeDeviceEntryRepository.setUnlocked(false) - underTest.changeScene(SceneModel(SceneKey.Gone), "reason") + underTest.changeScene(SceneKey.Gone, "reason") } @Test - fun onSceneChanged() = + fun sceneChanged_inDataSource() = testScope.runTest { - val desiredScene by collectLastValue(underTest.desiredScene) - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) - underTest.onSceneChanged(SceneModel(SceneKey.Shade), "reason") - assertThat(desiredScene).isEqualTo(SceneModel(SceneKey.Shade)) + fakeSceneDataSource.changeScene(SceneKey.Shade) + + assertThat(currentScene).isEqualTo(SceneKey.Shade) } @Test @@ -142,20 +144,20 @@ class SceneInteractorTest : SysuiTestCase() { testScope.runTest { val transitionState = MutableStateFlow<ObservableTransitionState>( - ObservableTransitionState.Idle(underTest.desiredScene.value.key) + ObservableTransitionState.Idle(underTest.currentScene.value) ) underTest.setTransitionState(transitionState) val transitionTo by collectLastValue(underTest.transitioningTo) assertThat(transitionTo).isNull() - underTest.changeScene(SceneModel(SceneKey.Shade), "reason") + underTest.changeScene(SceneKey.Shade, "reason") assertThat(transitionTo).isNull() val progress = MutableStateFlow(0f) transitionState.value = ObservableTransitionState.Transition( - fromScene = underTest.desiredScene.value.key, + fromScene = underTest.currentScene.value, toScene = SceneKey.Shade, progress = progress, isInitiatedByUserInput = false, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt index 34c5173436c8..ffea84b70d07 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -@file:OptIn(ExperimentalCoroutinesApi::class) +@file:OptIn(ExperimentalCoroutinesApi::class, ExperimentalCoroutinesApi::class) package com.android.systemui.scene.domain.startable @@ -47,7 +47,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.phone.CentralSurfaces import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository @@ -59,7 +59,6 @@ import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.map import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -95,6 +94,7 @@ class SceneContainerStartableTest : SysuiTestCase() { private val sysUiState: SysUiState = mock() private val falsingCollector: FalsingCollector = mock() private val powerInteractor = PowerInteractorFactory.create().powerInteractor + private val fakeSceneDataSource = kosmos.fakeSceneDataSource private lateinit var underTest: SceneContainerStartable @@ -115,8 +115,8 @@ class SceneContainerStartableTest : SysuiTestCase() { falsingCollector = falsingCollector, powerInteractor = powerInteractor, bouncerInteractor = bouncerInteractor, - simBouncerInteractor = dagger.Lazy { kosmos.simBouncerInteractor }, - authenticationInteractor = dagger.Lazy { authenticationInteractor }, + simBouncerInteractor = { kosmos.simBouncerInteractor }, + authenticationInteractor = { authenticationInteractor }, windowController = windowController, deviceProvisioningInteractor = kosmos.deviceProvisioningInteractor, centralSurfaces = centralSurfaces, @@ -126,8 +126,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun hydrateVisibility() = testScope.runTest { - val currentDesiredSceneKey by - collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentDesiredSceneKey by collectLastValue(sceneInteractor.currentScene) val isVisible by collectLastValue(sceneInteractor.isVisible) val transitionStateFlow = prepareState( @@ -140,7 +139,8 @@ class SceneContainerStartableTest : SysuiTestCase() { underTest.start() assertThat(isVisible).isFalse() - sceneInteractor.changeScene(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Shade, "reason") transitionStateFlow.value = ObservableTransitionState.Transition( fromScene = SceneKey.Gone, @@ -150,11 +150,12 @@ class SceneContainerStartableTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) assertThat(isVisible).isTrue() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Shade) transitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Shade) assertThat(isVisible).isTrue() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Gone, "reason") transitionStateFlow.value = ObservableTransitionState.Transition( fromScene = SceneKey.Shade, @@ -164,7 +165,7 @@ class SceneContainerStartableTest : SysuiTestCase() { isUserInputOngoing = flowOf(false), ) assertThat(isVisible).isTrue() - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Gone) transitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Gone) assertThat(isVisible).isFalse() } @@ -196,7 +197,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun startsInLockscreenScene() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState() underTest.start() @@ -208,7 +209,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchToLockscreenWhenDeviceLocks() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isDeviceUnlocked = true, initialSceneKey = SceneKey.Gone, @@ -224,7 +225,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchFromBouncerToGoneWhenDeviceUnlocked() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isDeviceUnlocked = false, initialSceneKey = SceneKey.Bouncer, @@ -240,7 +241,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchFromLockscreenToGoneWhenDeviceUnlocksWithBypassOn() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isBypassEnabled = true, initialSceneKey = SceneKey.Lockscreen, @@ -256,7 +257,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun stayOnLockscreenWhenDeviceUnlocksWithBypassOff() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isBypassEnabled = false, initialSceneKey = SceneKey.Lockscreen, @@ -274,7 +275,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun stayOnCurrentSceneWhenDeviceIsUnlockedAndUserIsNotOnLockscreen() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) val transitionStateFlowValue = prepareState( isBypassEnabled = true, @@ -284,7 +285,7 @@ class SceneContainerStartableTest : SysuiTestCase() { underTest.start() runCurrent() - sceneInteractor.changeScene(SceneModel(SceneKey.Shade), "switch to shade") + sceneInteractor.changeScene(SceneKey.Shade, "switch to shade") transitionStateFlowValue.value = ObservableTransitionState.Idle(SceneKey.Shade) assertThat(currentSceneKey).isEqualTo(SceneKey.Shade) @@ -297,7 +298,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchToGoneWhenDeviceIsUnlockedAndUserIsOnBouncerWithBypassDisabled() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isBypassEnabled = false, initialSceneKey = SceneKey.Bouncer, @@ -315,7 +316,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchToLockscreenWhenDeviceSleepsLocked() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( isDeviceUnlocked = false, initialSceneKey = SceneKey.Shade, @@ -347,11 +348,12 @@ class SceneContainerStartableTest : SysuiTestCase() { kosmos.fakeDeviceEntryRepository.setUnlocked(true) runCurrent() } - sceneInteractor.changeScene(SceneModel(sceneKey), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(sceneKey, "reason") runCurrent() verify(sysUiState, times(index)).commitUpdate(Display.DEFAULT_DISPLAY) - sceneInteractor.onSceneChanged(SceneModel(sceneKey), "reason") + fakeSceneDataSource.unpause(expectedScene = sceneKey) runCurrent() verify(sysUiState, times(index)).commitUpdate(Display.DEFAULT_DISPLAY) @@ -364,7 +366,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchToGoneWhenDeviceStartsToWakeUp_authMethodNone() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, authenticationMethod = AuthenticationMethodModel.None, @@ -380,7 +382,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun stayOnLockscreenWhenDeviceStartsToWakeUp_authMethodSwipe() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, authenticationMethod = AuthenticationMethodModel.None, @@ -396,7 +398,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun doesNotSwitchToGoneWhenDeviceStartsToWakeUp_authMethodSecure() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, authenticationMethod = AuthenticationMethodModel.Pin, @@ -411,7 +413,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchToGoneWhenDeviceStartsToWakeUp_authMethodSecure_deviceUnlocked() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, authenticationMethod = AuthenticationMethodModel.Pin, @@ -450,7 +452,7 @@ class SceneContainerStartableTest : SysuiTestCase() { SceneKey.Bouncer, ) .forEach { sceneKey -> - sceneInteractor.changeScene(SceneModel(sceneKey), "reason") + sceneInteractor.changeScene(sceneKey, "reason") runCurrent() verify(falsingCollector, never()).onSuccessfulUnlock() } @@ -458,7 +460,7 @@ class SceneContainerStartableTest : SysuiTestCase() { // Changing to the Gone scene should report a successful unlock. kosmos.fakeDeviceEntryRepository.setUnlocked(true) runCurrent() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") + sceneInteractor.changeScene(SceneKey.Gone, "reason") runCurrent() verify(falsingCollector).onSuccessfulUnlock() @@ -471,13 +473,13 @@ class SceneContainerStartableTest : SysuiTestCase() { SceneKey.Gone, ) .forEach { sceneKey -> - sceneInteractor.changeScene(SceneModel(sceneKey), "reason") + sceneInteractor.changeScene(sceneKey, "reason") runCurrent() verify(falsingCollector, times(1)).onSuccessfulUnlock() } // Changing to the Lockscreen scene shouldn't report a successful unlock. - sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason") + sceneInteractor.changeScene(SceneKey.Lockscreen, "reason") runCurrent() verify(falsingCollector, times(1)).onSuccessfulUnlock() @@ -490,13 +492,13 @@ class SceneContainerStartableTest : SysuiTestCase() { SceneKey.Bouncer, ) .forEach { sceneKey -> - sceneInteractor.changeScene(SceneModel(sceneKey), "reason") + sceneInteractor.changeScene(sceneKey, "reason") runCurrent() verify(falsingCollector, times(1)).onSuccessfulUnlock() } // Changing to the Gone scene should report a second successful unlock. - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") + sceneInteractor.changeScene(SceneKey.Gone, "reason") runCurrent() verify(falsingCollector, times(2)).onSuccessfulUnlock() } @@ -525,7 +527,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun bouncerImeHidden_shouldTransitionBackToLockscreen() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, authenticationMethod = AuthenticationMethodModel.Password, @@ -647,13 +649,13 @@ class SceneContainerStartableTest : SysuiTestCase() { runCurrent() verify(falsingCollector).onBouncerHidden() - sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer), "reason") + sceneInteractor.changeScene(SceneKey.Bouncer, "reason") runCurrent() verify(falsingCollector).onBouncerShown() kosmos.fakeDeviceEntryRepository.setUnlocked(true) runCurrent() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") + sceneInteractor.changeScene(SceneKey.Gone, "reason") runCurrent() verify(falsingCollector, times(2)).onBouncerHidden() } @@ -661,7 +663,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun switchesToBouncer_whenSimBecomesLocked() = testScope.runTest { - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, @@ -681,7 +683,7 @@ class SceneContainerStartableTest : SysuiTestCase() { fun switchesToLockscreen_whenSimBecomesUnlocked() = testScope.runTest { kosmos.fakeMobileConnectionsRepository.isAnySimSecure.value = true - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Bouncer, @@ -700,7 +702,7 @@ class SceneContainerStartableTest : SysuiTestCase() { fun switchesToGone_whenSimBecomesUnlocked_ifDeviceUnlockedAndLockscreenDisabled() = testScope.runTest { kosmos.fakeMobileConnectionsRepository.isAnySimSecure.value = true - val currentSceneKey by collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentSceneKey by collectLastValue(sceneInteractor.currentScene) prepareState( initialSceneKey = SceneKey.Lockscreen, @@ -719,8 +721,7 @@ class SceneContainerStartableTest : SysuiTestCase() { @Test fun hydrateWindowFocus() = testScope.runTest { - val currentDesiredSceneKey by - collectLastValue(sceneInteractor.desiredScene.map { it.key }) + val currentDesiredSceneKey by collectLastValue(sceneInteractor.currentScene) val transitionStateFlow = prepareState( isDeviceUnlocked = true, @@ -733,7 +734,8 @@ class SceneContainerStartableTest : SysuiTestCase() { runCurrent() verify(windowController, times(1)).setNotificationShadeFocusable(false) - sceneInteractor.changeScene(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Shade, "reason") transitionStateFlow.value = ObservableTransitionState.Transition( fromScene = SceneKey.Gone, @@ -745,12 +747,13 @@ class SceneContainerStartableTest : SysuiTestCase() { runCurrent() verify(windowController, times(1)).setNotificationShadeFocusable(false) - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Shade) transitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Shade) runCurrent() verify(windowController, times(1)).setNotificationShadeFocusable(true) - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Gone, "reason") transitionStateFlow.value = ObservableTransitionState.Transition( fromScene = SceneKey.Shade, @@ -762,7 +765,7 @@ class SceneContainerStartableTest : SysuiTestCase() { runCurrent() verify(windowController, times(1)).setNotificationShadeFocusable(true) - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Gone) transitionStateFlow.value = ObservableTransitionState.Idle(SceneKey.Gone) runCurrent() verify(windowController, times(2)).setNotificationShadeFocusable(false) @@ -965,8 +968,8 @@ class SceneContainerStartableTest : SysuiTestCase() { verifyDuringTransition: (() -> Unit)? = null, verifyAfterTransition: (() -> Unit)? = null, ) { - val fromScene = sceneInteractor.desiredScene.value.key - sceneInteractor.changeScene(SceneModel(toScene), "reason") + val fromScene = sceneInteractor.currentScene.value + sceneInteractor.changeScene(toScene, "reason") runCurrent() verifyBeforeTransition?.invoke() @@ -1020,8 +1023,7 @@ class SceneContainerStartableTest : SysuiTestCase() { sceneInteractor.setTransitionState(transitionStateFlow) initialSceneKey?.let { transitionStateFlow.value = ObservableTransitionState.Idle(it) - sceneInteractor.changeScene(SceneModel(it), "reason") - sceneInteractor.onSceneChanged(SceneModel(it), "reason") + sceneInteractor.changeScene(it, "reason") } authenticationMethod?.let { kosmos.fakeAuthenticationRepository.setAuthenticationMethod(authenticationMethod) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegatorTest.kt new file mode 100644 index 000000000000..ed4b1e6a43c9 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegatorTest.kt @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.shared.model + +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.scene.initialSceneKey +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class SceneDataSourceDelegatorTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val initialSceneKey = kosmos.initialSceneKey + private val fakeSceneDataSource = kosmos.fakeSceneDataSource + + private val underTest = kosmos.sceneDataSourceDelegator + + @Test + fun currentScene_withoutDelegate_startsWithInitialScene() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + underTest.setDelegate(null) + + assertThat(currentScene).isEqualTo(initialSceneKey) + } + + @Test + fun currentScene_withoutDelegate_doesNothing() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + underTest.setDelegate(null) + assertThat(currentScene).isNotEqualTo(SceneKey.Bouncer) + + underTest.changeScene(toScene = SceneKey.Bouncer) + + assertThat(currentScene).isEqualTo(initialSceneKey) + } + + @Test + fun currentScene_withDelegate_startsWithInitialScene() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(initialSceneKey) + } + + @Test + fun currentScene_withDelegate_changesScenes() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isNotEqualTo(SceneKey.Bouncer) + + underTest.changeScene(toScene = SceneKey.Bouncer) + + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) + } + + @Test + fun currentScene_reflectsDelegate() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + + fakeSceneDataSource.changeScene(toScene = SceneKey.Bouncer) + + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt index a16ce4325dcf..6c78317f61e5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt @@ -23,11 +23,12 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.classifier.domain.interactor.falsingInteractor import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.testScope import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.sceneKeys import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -41,7 +42,10 @@ import org.junit.runner.RunWith class SceneContainerViewModelTest : SysuiTestCase() { private val kosmos = testKosmos() + private val testScope by lazy { kosmos.testScope } private val interactor by lazy { kosmos.sceneInteractor } + private val fakeSceneDataSource = kosmos.fakeSceneDataSource + private lateinit var underTest: SceneContainerViewModel @Before @@ -55,16 +59,17 @@ class SceneContainerViewModelTest : SysuiTestCase() { } @Test - fun isVisible() = runTest { - val isVisible by collectLastValue(underTest.isVisible) - assertThat(isVisible).isTrue() + fun isVisible() = + testScope.runTest { + val isVisible by collectLastValue(underTest.isVisible) + assertThat(isVisible).isTrue() - interactor.setVisible(false, "reason") - assertThat(isVisible).isFalse() + interactor.setVisible(false, "reason") + assertThat(isVisible).isFalse() - interactor.setVisible(true, "reason") - assertThat(isVisible).isTrue() - } + interactor.setVisible(true, "reason") + assertThat(isVisible).isTrue() + } @Test fun allSceneKeys() { @@ -72,12 +77,13 @@ class SceneContainerViewModelTest : SysuiTestCase() { } @Test - fun sceneTransition() = runTest { - val currentScene by collectLastValue(underTest.currentScene) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen)) + fun sceneTransition() = + testScope.runTest { + val currentScene by collectLastValue(underTest.currentScene) + assertThat(currentScene).isEqualTo(SceneKey.Lockscreen) - underTest.onSceneChanged(SceneModel(SceneKey.Shade)) + fakeSceneDataSource.changeScene(SceneKey.Shade) - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Shade)) - } + assertThat(currentScene).isEqualTo(SceneKey.Shade) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt index 51b834207cfd..ec424b05fc06 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt @@ -30,7 +30,6 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.statusbar.CommandQueue @@ -88,7 +87,7 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { runCurrent() // THEN the shade remains collapsed and the post-collapse action ran - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Gone) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Gone) verify(testRunnable, times(1)).run() } @@ -106,7 +105,7 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { runCurrent() // THEN the shade remains expanded and the post-collapse action did not run - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Shade) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Shade) assertThat(shadeInteractor.isAnyFullyExpanded.value).isTrue() verify(testRunnable, never()).run() } @@ -123,7 +122,7 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { runCurrent() // THEN the shade collapses back to lockscreen and the post-collapse action ran - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Lockscreen) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Lockscreen) } @Test @@ -138,7 +137,7 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { runCurrent() // THEN the shade collapses back to lockscreen and the post-collapse action ran - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Gone) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Gone) } @Test @@ -172,7 +171,7 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { } private fun setScene(key: SceneKey) { - sceneInteractor.changeScene(SceneModel(key), "test") + sceneInteractor.changeScene(key, "test") sceneInteractor.setTransitionState( MutableStateFlow<ObservableTransitionState>(ObservableTransitionState.Idle(key)) ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImplTest.kt index d3c6598296a6..ec4da0405b6d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImplTest.kt @@ -26,7 +26,6 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.shared.recents.utilities.Utilities import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat @@ -60,7 +59,7 @@ class ShadeBackActionInteractorImplTest : SysuiTestCase() { setScene(SceneKey.Shade) underTest.animateCollapseQs(true) runCurrent() - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Shade) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Shade) } @Test @@ -70,7 +69,7 @@ class ShadeBackActionInteractorImplTest : SysuiTestCase() { setScene(SceneKey.QuickSettings) underTest.animateCollapseQs(true) runCurrent() - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Gone) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Gone) } @Test @@ -80,7 +79,7 @@ class ShadeBackActionInteractorImplTest : SysuiTestCase() { setScene(SceneKey.QuickSettings) underTest.animateCollapseQs(true) runCurrent() - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Lockscreen) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Lockscreen) } @Test @@ -89,7 +88,7 @@ class ShadeBackActionInteractorImplTest : SysuiTestCase() { setScene(SceneKey.QuickSettings) underTest.animateCollapseQs(false) runCurrent() - assertThat(sceneInteractor.desiredScene.value.key).isEqualTo(SceneKey.Shade) + assertThat(sceneInteractor.currentScene.value).isEqualTo(SceneKey.Shade) } private fun enterDevice() { @@ -99,7 +98,7 @@ class ShadeBackActionInteractorImplTest : SysuiTestCase() { } private fun setScene(key: SceneKey) { - sceneInteractor.changeScene(SceneModel(key), "test") + sceneInteractor.changeScene(key, "test") sceneInteractor.setTransitionState( MutableStateFlow<ObservableTransitionState>(ObservableTransitionState.Idle(key)) ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt index f1f5dc378e0a..799e8f054d51 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt @@ -31,7 +31,6 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor @@ -146,8 +145,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.None ) - sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason") - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Lockscreen), "reason") + sceneInteractor.changeScene(SceneKey.Lockscreen, "reason") assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Lockscreen) } @@ -162,8 +160,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { AuthenticationMethodModel.None ) runCurrent() - sceneInteractor.changeScene(SceneModel(SceneKey.Gone), "reason") - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Gone), "reason") + sceneInteractor.changeScene(SceneKey.Gone, "reason") assertThat(upTransitionSceneKey).isEqualTo(SceneKey.Gone) } @@ -171,7 +168,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { @Test fun onContentClicked_deviceUnlocked_switchesToGone() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pin ) @@ -180,13 +177,13 @@ class ShadeSceneViewModelTest : SysuiTestCase() { underTest.onContentClicked() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Gone)) + assertThat(currentScene).isEqualTo(SceneKey.Gone) } @Test fun onContentClicked_deviceLockedSecurely_switchesToBouncer() = testScope.runTest { - val currentScene by collectLastValue(sceneInteractor.desiredScene) + val currentScene by collectLastValue(sceneInteractor.currentScene) kosmos.fakeAuthenticationRepository.setAuthenticationMethod( AuthenticationMethodModel.Pin ) @@ -195,7 +192,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { underTest.onContentClicked() - assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer)) + assertThat(currentScene).isEqualTo(SceneKey.Bouncer) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt index 4d7d5d3fa664..efd8f000df41 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt @@ -30,7 +30,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.fakeSceneDataSource import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel import com.android.systemui.testKosmos @@ -59,6 +59,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { private val placeholderViewModel by lazy { kosmos.notificationsPlaceholderViewModel } private val appearanceViewModel by lazy { kosmos.notificationStackAppearanceViewModel } private val sceneInteractor by lazy { kosmos.sceneInteractor } + private val fakeSceneDataSource by lazy { kosmos.fakeSceneDataSource } @Test fun updateBounds() = @@ -97,7 +98,8 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { val expandFraction by collectLastValue(appearanceViewModel.expandFraction) assertThat(expandFraction).isEqualTo(0f) - sceneInteractor.changeScene(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.Shade, "reason") val transitionProgress = MutableStateFlow(0f) transitionState.value = ObservableTransitionState.Transition( @@ -115,7 +117,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { assertThat(expandFraction).isWithin(0.01f).of(progress) } - sceneInteractor.onSceneChanged(SceneModel(SceneKey.Shade), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.Shade) assertThat(expandFraction).isWithin(0.01f).of(1f) } @@ -142,7 +144,8 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { val expandFraction by collectLastValue(appearanceViewModel.expandFraction) assertThat(expandFraction).isEqualTo(1f) - sceneInteractor.changeScene(SceneModel(SceneKey.QuickSettings), "reason") + fakeSceneDataSource.pause() + sceneInteractor.changeScene(SceneKey.QuickSettings, "reason") val transitionProgress = MutableStateFlow(0f) transitionState.value = ObservableTransitionState.Transition( @@ -160,7 +163,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { assertThat(expandFraction).isEqualTo(1f) } - sceneInteractor.onSceneChanged(SceneModel(SceneKey.QuickSettings), "reason") + fakeSceneDataSource.unpause(expectedScene = SceneKey.QuickSettings) assertThat(expandFraction).isEqualTo(1f) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt index 0c7ce970cf3a..288c0832170f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerTest.kt @@ -16,10 +16,12 @@ package com.android.systemui.statusbar.notification.collection.render +import android.os.Build import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager +import com.android.systemui.log.assertLogsWtf import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline @@ -30,7 +32,7 @@ import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.Truth.assertThat -import org.junit.Assert.assertThrows +import org.junit.Assume import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -116,9 +118,9 @@ class GroupExpansionManagerTest : SysuiTestCase() { underTest.setGroupExpanded(summary1, false) // Expanding again should throw. - assertThrows(IllegalArgumentException::class.java) { - underTest.setGroupExpanded(summary1, true) - } + // TODO(b/320238410): Remove this check when robolectric supports wtf assertions. + Assume.assumeFalse(Build.FINGERPRINT.contains("robolectric")) + assertLogsWtf { underTest.setGroupExpanded(summary1, true) } } @Test diff --git a/packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml b/packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml index 50d560728fb7..41fb57a6ebb5 100644 --- a/packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml +++ b/packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml @@ -32,4 +32,24 @@ android:importantForAccessibility="no" sysui:ignoreRightInset="true" /> + <!-- Keyguard messages --> + <LinearLayout + android:id="@+id/alternate_bouncer_message_area_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_marginTop="@dimen/status_bar_height" + android:layout_gravity="top|center_horizontal" + android:gravity="center_horizontal"> + <com.android.keyguard.AuthKeyguardMessageArea + android:id="@+id/alternate_bouncer_message_area" + style="@style/Keyguard.TextView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/keyguard_lock_padding" + android:gravity="center" + android:singleLine="true" + android:ellipsize="marquee" + android:focusable="true"/> + </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml index e853f02ef510..4e540de245dd 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -169,9 +169,6 @@ <dimen name="weather_clock_smartspace_translateX">0dp</dimen> <dimen name="weather_clock_smartspace_translateY">0dp</dimen> - <!-- Additional length to add to the SFPS sensor length we get from framework so that the length - of the progress bar matches the length of the power button --> - <dimen name="sfps_progress_bar_length_extra_padding">12dp</dimen> <!-- Thickness of the progress bar we show for the SFPS based authentication. --> <dimen name="sfps_progress_bar_thickness">6dp</dimen> <!-- Padding from the edge of the screen for the progress bar --> diff --git a/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml index a877853eaec8..0ecdcfcbdd83 100644 --- a/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml +++ b/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml @@ -13,6 +13,16 @@ android:layout_height="match_parent"> android:scaleType="fitXY" android:visibility="gone" /> + <TextView + android:id="@+id/logo_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="@integer/biometric_dialog_text_gravity" + android:singleLine="true" + android:marqueeRepeatLimit="1" + android:ellipsize="marquee" + android:visibility="gone"/> + <ImageView android:id="@+id/background" android:layout_width="0dp" diff --git a/packages/SystemUI/res/layout/biometric_prompt_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_layout.xml index 10f71134c4cc..e7590746207d 100644 --- a/packages/SystemUI/res/layout/biometric_prompt_layout.xml +++ b/packages/SystemUI/res/layout/biometric_prompt_layout.xml @@ -28,6 +28,15 @@ android:scaleType="fitXY"/> <TextView + android:id="@+id/logo_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="@integer/biometric_dialog_text_gravity" + android:singleLine="true" + android:marqueeRepeatLimit="1" + android:ellipsize="marquee"/> + + <TextView android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml index a0f916c6827a..ac781ec2be68 100644 --- a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml +++ b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml @@ -81,7 +81,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="21dp" - android:minHeight="145dp" + android:minHeight="@dimen/bluetooth_dialog_scroll_view_min_height" android:fillViewport="true" app:layout_constrainedHeight="true" app:layout_constraintStart_toStartOf="parent" @@ -97,11 +97,11 @@ <TextView android:id="@+id/bluetooth_toggle_title" android:layout_width="0dp" - android:layout_height="64dp" - android:maxLines="1" + android:layout_height="68dp" + android:maxLines="2" android:ellipsize="end" android:gravity="start|center_vertical" - android:paddingEnd="0dp" + android:paddingEnd="15dp" android:paddingStart="36dp" android:text="@string/turn_on_bluetooth" android:clickable="false" @@ -114,7 +114,7 @@ <Switch android:id="@+id/bluetooth_toggle" android:layout_width="wrap_content" - android:layout_height="64dp" + android:layout_height="68dp" android:gravity="start|center_vertical" android:paddingEnd="40dp" android:contentDescription="@string/turn_on_bluetooth" @@ -126,14 +126,79 @@ app:layout_constraintStart_toEndOf="@+id/bluetooth_toggle_title" app:layout_constraintTop_toTopOf="parent" /> + <androidx.constraintlayout.widget.Group + android:id="@+id/bluetooth_auto_on_toggle_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + app:constraint_referenced_ids="bluetooth_auto_on_toggle_title,bluetooth_auto_on_toggle,bluetooth_auto_on_toggle_info_icon,bluetooth_auto_on_toggle_info_text" /> + + <TextView + android:id="@+id/bluetooth_auto_on_toggle_title" + android:layout_width="0dp" + android:layout_height="68dp" + android:layout_marginBottom="20dp" + android:maxLines="2" + android:ellipsize="end" + android:text="@string/turn_on_bluetooth_auto_tomorrow" + android:gravity="start|center_vertical" + android:paddingEnd="15dp" + android:paddingStart="36dp" + android:clickable="false" + android:textAppearance="@style/TextAppearance.Dialog.Title" + android:textSize="16sp" + app:layout_constraintEnd_toStartOf="@+id/bluetooth_auto_on_toggle" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle_title" /> + + <Switch + android:id="@+id/bluetooth_auto_on_toggle" + android:layout_width="wrap_content" + android:layout_height="68dp" + android:layout_marginBottom="20dp" + android:gravity="start|center_vertical" + android:paddingEnd="40dp" + android:contentDescription="@string/turn_on_bluetooth_auto_tomorrow" + android:switchMinWidth="@dimen/settingslib_switch_track_width" + android:theme="@style/MainSwitch.Settingslib" + android:thumb="@drawable/settingslib_thumb_selector" + android:track="@drawable/settingslib_track_selector" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/bluetooth_auto_on_toggle_title" + app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle" /> + + <ImageView + android:id="@+id/bluetooth_auto_on_toggle_info_icon" + android:src="@drawable/ic_info_outline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:tint="?android:attr/textColorTertiary" + android:paddingStart="36dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="@dimen/bluetooth_dialog_layout_margin" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/bluetooth_auto_on_toggle" /> + + <TextView + android:id="@+id/bluetooth_auto_on_toggle_info_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:paddingStart="36dp" + android:paddingEnd="40dp" + android:text="@string/turn_on_bluetooth_auto_info" + android:textAppearance="@style/TextAppearance.Dialog.Body.Message" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/bluetooth_auto_on_toggle_info_icon" /> + <androidx.recyclerview.widget.RecyclerView android:id="@+id/device_list" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle" - app:layout_constraintBottom_toTopOf="@+id/see_all_button" /> + app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle" /> <Button android:id="@+id/see_all_button" @@ -168,12 +233,10 @@ android:background="@drawable/bluetooth_tile_dialog_bg_off" android:layout_width="0dp" android:layout_height="64dp" - android:layout_marginBottom="9dp" android:contentDescription="@string/accessibility_bluetooth_device_settings_pair_new_device" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/see_all_button" - app:layout_constraintBottom_toTopOf="@+id/done_button" android:drawableStart="@drawable/ic_add" android:drawablePadding="20dp" android:drawableTint="?android:attr/textColorPrimary" @@ -186,11 +249,19 @@ android:ellipsize="end" android:visibility="gone" /> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="pair_new_device_button,bluetooth_auto_on_toggle_info_text" /> + <Button android:id="@+id/done_button" style="@style/Widget.Dialog.Button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="9dp" android:layout_marginBottom="@dimen/dialog_bottom_padding" android:layout_marginEnd="@dimen/dialog_side_padding" android:layout_marginStart="@dimen/dialog_side_padding" @@ -200,7 +271,9 @@ android:maxLines="1" android:text="@string/inline_done_button" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/barrier" + app:layout_constraintVertical_bias="1" /> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index cc317544de9b..7537a003275d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1717,6 +1717,10 @@ <dimen name="bluetooth_dialog_layout_margin">16dp</dimen> <!-- The height of the bluetooth device in bluetooth dialog. --> <dimen name="bluetooth_dialog_device_height">72dp</dimen> + <!-- The height of the main scroll view in bluetooth dialog. --> + <dimen name="bluetooth_dialog_scroll_view_min_height">145dp</dimen> + <!-- The height of the main scroll view in bluetooth dialog with auto on toggle. --> + <dimen name="bluetooth_dialog_scroll_view_min_height_with_auto_on">350dp</dimen> <!-- Height percentage of the parent container occupied by the communal view --> <item name="communal_source_height_percentage" format="float" type="dimen">0.80</item> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 2ab0813300e3..71ae0d716429 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -228,6 +228,7 @@ <item type="id" name="ambient_indication_container" /> <item type="id" name="status_view_media_container" /> <item type="id" name="smart_space_barrier_bottom" /> + <item type="id" name="small_clock_guideline_top" /> <item type="id" name="weather_clock_date_and_icons_barrier_bottom" /> <!-- Privacy dialog --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 64c6cfa08259..e401c71b3716 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -669,6 +669,10 @@ <string name="accessibility_quick_settings_bluetooth_device_tap_to_disconnect">disconnect</string> <!-- QuickSettings: Accessibility label to activate a device [CHAR LIMIT=NONE]--> <string name="accessibility_quick_settings_bluetooth_device_tap_to_activate">activate</string> + <!-- QuickSettings: Bluetooth auto on tomorrow [CHAR LIMIT=NONE]--> + <string name="turn_on_bluetooth_auto_tomorrow">Automatically turn on again tomorrow</string> + <!-- QuickSettings: Bluetooth auto on info text [CHAR LIMIT=NONE]--> + <string name="turn_on_bluetooth_auto_info">Features like Quick Share, Find My Device, and device location use Bluetooth</string> <!-- QuickSettings: Bluetooth secondary label for the battery level of a connected device [CHAR LIMIT=20]--> <string name="quick_settings_bluetooth_secondary_label_battery_level"><xliff:g id="battery_level_as_percentage">%s</xliff:g> battery</string> diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegate.java index 975a6020430d..ad6609a41125 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegate.java @@ -100,7 +100,7 @@ class MenuItemAccessibilityDelegate extends RecyclerViewAccessibilityDelegate.It new AccessibilityNodeInfoCompat.AccessibilityActionCompat( R.id.action_edit, res.getString( - R.string.accessibility_floating_button_action_remove_menu)); + R.string.accessibility_floating_button_action_edit)); info.addAction(edit); } } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java index 035ccbd19f59..27f9106fde7c 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java @@ -41,6 +41,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.internal.accessibility.dialog.AccessibilityTarget; +import com.android.internal.annotations.VisibleForTesting; +import com.android.modules.expresslog.Counter; import com.android.systemui.Flags; import com.android.systemui.util.settings.SecureSettings; @@ -436,6 +438,20 @@ class MenuView extends FrameLayout implements mContext.startActivity(getIntentForEditScreen()); } + void incrementTexMetricForAllTargets(String metric) { + if (!Flags.floatingMenuDragToEdit()) { + return; + } + for (AccessibilityTarget target : mTargetFeatures) { + incrementTexMetric(metric, target.getUid()); + } + } + + @VisibleForTesting + void incrementTexMetric(String metric, int uid) { + Counter.logIncrementWithUid(metric, uid); + } + Intent getIntentForEditScreen() { List<String> targets = new SettingsStringUtil.ColonDelimitedSet.OfStrings( mSecureSettings.getStringForUser( diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java index a883c009269c..6d4baf4771b8 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java @@ -92,6 +92,20 @@ class MenuViewLayer extends FrameLayout implements MenuView.OnMoveToTuckedListener { private static final int SHOW_MESSAGE_DELAY_MS = 3000; + /** + * Counter indicating the FAB was dragged to the Dismiss action button. + * + * <p>Defined in frameworks/proto_logging/stats/express/catalog/accessibility.cfg. + */ + static final String TEX_METRIC_DISMISS = "accessibility.value_fab_shortcut_action_dismiss"; + + /** + * Counter indicating the FAB was dragged to the Edit action button. + * + * <p>Defined in frameworks/proto_logging/stats/express/catalog/accessibility.cfg. + */ + static final String TEX_METRIC_EDIT = "accessibility.value_fab_shortcut_action_edit"; + private final WindowManager mWindowManager; private final MenuView mMenuView; private final MenuListViewTouchHandler mMenuListViewTouchHandler; @@ -229,20 +243,23 @@ class MenuViewLayer extends FrameLayout implements } mDragToInteractAnimationController.setMagnetListener(new MagnetizedObject.MagnetListener() { @Override - public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { mDragToInteractAnimationController.animateInteractMenu( target.getTargetView().getId(), /* scaleUp= */ true); } @Override public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject, float velocityX, float velocityY, boolean wasFlungOut) { mDragToInteractAnimationController.animateInteractMenu( target.getTargetView().getId(), /* scaleUp= */ false); } @Override - public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { dispatchAccessibilityAction(target.getTargetView().getId()); } }); @@ -457,9 +474,11 @@ class MenuViewLayer extends FrameLayout implements } else { hideMenuAndShowMessage(); } + mMenuView.incrementTexMetricForAllTargets(TEX_METRIC_DISMISS); } else if (id == R.id.action_edit && Flags.floatingMenuDragToEdit()) { mMenuView.gotoEditScreen(); + mMenuView.incrementTexMetricForAllTargets(TEX_METRIC_EDIT); } mDismissView.hide(); mDragToInteractView.hide(); diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 685ea81fe40d..74ea58caf8b6 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -21,6 +21,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; +import android.service.voice.VisualQueryAttentionResult; import android.service.voice.VoiceInteractionSession; import android.util.Log; @@ -157,12 +158,14 @@ public class AssistManager { private final IVisualQueryDetectionAttentionListener mVisualQueryDetectionAttentionListener = new IVisualQueryDetectionAttentionListener.Stub() { @Override - public void onAttentionGained() { + public void onAttentionGained(VisualQueryAttentionResult attentionResult) { + // TODO (b/319132184): Implemented this with different types. handleVisualAttentionChanged(true); } @Override - public void onAttentionLost() { + public void onAttentionLost(int interactionIntention) { + //TODO (b/319132184): Implemented this with different types. handleVisualAttentionChanged(false); } }; @@ -472,6 +475,7 @@ public class AssistManager { }); } + // TODO (b/319132184): Implemented this with different types. private void handleVisualAttentionChanged(boolean attentionGained) { final StatusBarManager statusBarManager = mContext.getSystemService(StatusBarManager.class); if (statusBarManager != null) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FaceHelpMessageDeferral.kt b/packages/SystemUI/src/com/android/systemui/biometrics/FaceHelpMessageDeferral.kt index b015f7078a83..8c68eac84963 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FaceHelpMessageDeferral.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/FaceHelpMessageDeferral.kt @@ -20,23 +20,37 @@ import android.content.res.Resources import com.android.keyguard.logging.BiometricMessageDeferralLogger import com.android.keyguard.logging.FaceMessageDeferralLogger import com.android.systemui.Dumpable -import com.android.systemui.res.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager +import com.android.systemui.res.R import java.io.PrintWriter import java.util.Objects import javax.inject.Inject +@SysUISingleton +class FaceHelpMessageDeferralFactory +@Inject +constructor( + @Main private val resources: Resources, + private val logBuffer: FaceMessageDeferralLogger, + private val dumpManager: DumpManager +) { + fun create(): FaceHelpMessageDeferral { + return FaceHelpMessageDeferral( + resources = resources, + logBuffer = logBuffer, + dumpManager = dumpManager, + ) + } +} + /** * Provides whether a face acquired help message should be shown immediately when its received or * should be shown when face auth times out. See [updateMessage] and [getDeferredMessage]. */ -@SysUISingleton -class FaceHelpMessageDeferral -@Inject -constructor( - @Main resources: Resources, +class FaceHelpMessageDeferral( + resources: Resources, logBuffer: FaceMessageDeferralLogger, dumpManager: DumpManager ) : diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt index e6939f06b642..ff9cdbd7dc24 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt @@ -39,6 +39,8 @@ constructor( configurationInteractor: ConfigurationInteractor, displayStateInteractor: DisplayStateInteractor, ) { + val isUdfps: Flow<Boolean> = repository.sensorType.map { it.isUdfps() } + /** * Devices with multiple physical displays use unique display ids to determine which sensor is * on the active physical display. This value represents a unique physical display id. diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequest.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequest.kt index c17c8dced668..6133a51c6497 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequest.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequest.kt @@ -40,6 +40,7 @@ sealed class BiometricPromptRequest( val contentView: PromptContentView? = info.contentView val logoRes: Int = info.logoRes val logoBitmap: Bitmap? = info.logoBitmap + val logoDescription: String? = info.logoDescription val negativeButtonText: String = info.negativeButtonText?.toString() ?: "" } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt index efad21bda380..31aadf51c4f2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt @@ -95,6 +95,7 @@ object BiometricViewBinder { view.resources.getColor(R.color.biometric_dialog_gray, view.context.theme) val logoView = view.requireViewById<ImageView>(R.id.logo) + val logoDescriptionView = view.requireViewById<TextView>(R.id.logo_description) val titleView = view.requireViewById<TextView>(R.id.title) val subtitleView = view.requireViewById<TextView>(R.id.subtitle) val descriptionView = view.requireViewById<TextView>(R.id.description) @@ -104,6 +105,8 @@ object BiometricViewBinder { // set selected to enable marquee unless a screen reader is enabled logoView.isSelected = !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled + logoDescriptionView.isSelected = + !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled titleView.isSelected = !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled subtitleView.isSelected = @@ -165,6 +168,7 @@ object BiometricViewBinder { } logoView.setImageDrawable(viewModel.logo.first()) + logoDescriptionView.text = viewModel.logoDescription.first() titleView.text = viewModel.title.first() subtitleView.text = viewModel.subtitle.first() descriptionView.text = viewModel.description.first() @@ -197,6 +201,7 @@ object BiometricViewBinder { viewsToHideWhenSmall = listOf( logoView, + logoDescriptionView, titleView, subtitleView, descriptionView, @@ -205,6 +210,7 @@ object BiometricViewBinder { viewsToFadeInOnSizeChange = listOf( logoView, + logoDescriptionView, titleView, subtitleView, descriptionView, diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt index ef5c37eaa953..788991d2e45b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt @@ -17,6 +17,7 @@ package com.android.systemui.biometrics.ui.viewmodel import android.content.Context +import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.graphics.Rect import android.graphics.drawable.BitmapDrawable @@ -280,8 +281,9 @@ constructor( it.logoBitmap != null -> BitmapDrawable(context.resources, it.logoBitmap) else -> try { - context.packageManager.getApplicationIcon(it.opPackageName) - } catch (e: PackageManager.NameNotFoundException) { + val info = context.getApplicationInfo(it.opPackageName) + context.packageManager.getApplicationIcon(info) + } catch (e: Exception) { Log.w(TAG, "Cannot find icon for package " + it.opPackageName, e) null } @@ -289,6 +291,25 @@ constructor( } .distinctUntilChanged() + /** Logo description for the prompt. */ + val logoDescription: Flow<String> = + promptSelectorInteractor.prompt + .map { + when { + !customBiometricPrompt() || it == null -> "" + it.logoDescription != null -> it.logoDescription + else -> + try { + val info = context.getApplicationInfo(it.opPackageName) + context.packageManager.getApplicationLabel(info).toString() + } catch (e: Exception) { + Log.w(TAG, "Cannot find name for package " + it.opPackageName, e) + "" + } + } + } + .distinctUntilChanged() + /** Title for the prompt. */ val title: Flow<String> = promptSelectorInteractor.prompt.map { it?.title ?: "" }.distinctUntilChanged() @@ -682,6 +703,12 @@ constructor( } } +private fun Context.getApplicationInfo(packageName: String): ApplicationInfo = + packageManager.getApplicationInfo( + packageName, + PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.MATCH_ANY_USER + ) + /** How the fingerprint sensor was started for the prompt. */ enum class FingerprintStartMode { /** Fingerprint sensor has not started. */ diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt index ef4554cfdd7c..8197145f9646 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt @@ -92,6 +92,7 @@ private const val SYS_BOOT_REASON_PROP = "sys.boot.reason.last" private const val REBOOT_MAINLINE_UPDATE = "reboot,mainline_update" private const val TAG = "BouncerMessageInteractor" +/** Handles business logic for the primary bouncer message area. */ @SysUISingleton class BouncerMessageInteractor @Inject diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt index 4a06585f5a70..9e68ff88622c 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt @@ -102,7 +102,7 @@ constructor( override val isCommunalHubShowing: Flow<Boolean> = if (sceneContainerFlags.isEnabled()) { - sceneContainerRepository.desiredScene.map { scene -> scene.key == SceneKey.Communal } + sceneContainerRepository.currentScene.map { sceneKey -> sceneKey == SceneKey.Communal } } else { desiredScene.map { sceneKey -> sceneKey == CommunalSceneKey.Communal } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt index 40d2d1656fbc..febfd4c95db1 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt @@ -28,6 +28,8 @@ import com.android.systemui.media.controls.ui.MediaHierarchyManager import com.android.systemui.media.controls.ui.MediaHost import com.android.systemui.media.controls.ui.MediaHostState import com.android.systemui.media.dagger.MediaModule +import com.android.systemui.shade.domain.interactor.ShadeInteractor +import com.android.systemui.util.kotlin.BooleanFlowOperators.not import javax.inject.Inject import javax.inject.Named import kotlinx.coroutines.CoroutineScope @@ -51,6 +53,7 @@ constructor( @Application private val scope: CoroutineScope, private val communalInteractor: CommunalInteractor, tutorialInteractor: CommunalTutorialInteractor, + shadeInteractor: ShadeInteractor, @Named(MediaModule.COMMUNAL_HUB) mediaHost: MediaHost, @CommunalLog logBuffer: LogBuffer, ) : BaseCommunalViewModel(communalInteractor, mediaHost) { @@ -81,6 +84,9 @@ constructor( override val isPopupOnDismissCtaShowing: Flow<Boolean> = _isPopupOnDismissCtaShowing.asStateFlow() + /** Whether touches should be disabled in communal */ + val touchesAllowed: Flow<Boolean> = not(shadeInteractor.isAnyFullyExpanded) + init { // Initialize our media host for the UMO. This only needs to happen once and must be done // before the MediaHierarchyManager attempts to move the UMO to the hub. @@ -114,6 +120,7 @@ constructor( } private var delayedHidePopupJob: Job? = null + private fun schedulePopupHiding() { cancelDelayedPopupHiding() delayedHidePopupJob = diff --git a/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt b/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt index 9a4dfdd5d1f6..8178adef49b2 100644 --- a/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt +++ b/packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt @@ -25,6 +25,7 @@ import androidx.lifecycle.LifecycleOwner import com.android.systemui.bouncer.ui.BouncerDialogFactory import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel +import com.android.systemui.communal.ui.viewmodel.CommunalViewModel import com.android.systemui.communal.widgets.WidgetConfigurator import com.android.systemui.keyboard.stickykeys.ui.viewmodel.StickyKeysIndicatorViewModel import com.android.systemui.keyguard.shared.model.LockscreenSceneBlueprint @@ -32,6 +33,7 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel import com.android.systemui.people.ui.viewmodel.PeopleViewModel import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel import com.android.systemui.scene.shared.model.Scene +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel @@ -94,6 +96,7 @@ interface BaseComposeFacade { viewModel: SceneContainerViewModel, windowInsets: StateFlow<WindowInsets?>, sceneByKey: Map<SceneKey, Scene>, + dataSourceDelegator: SceneDataSourceDelegator, ): View /** Creates sticky key indicator content presenting provided [viewModel] */ @@ -116,7 +119,7 @@ interface BaseComposeFacade { ): View /** Creates a container that hosts the communal UI and handles gesture transitions. */ - fun createCommunalContainer(context: Context, viewModel: BaseCommunalViewModel): View + fun createCommunalContainer(context: Context, viewModel: CommunalViewModel): View /** Creates a [View] that represents the Lockscreen. */ fun createLockscreen( diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 1720de880cbd..e8931770b15e 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -88,6 +88,8 @@ import com.android.systemui.qs.footer.dagger.FooterActionsModule; import com.android.systemui.recents.Recents; import com.android.systemui.recordissue.RecordIssueModule; import com.android.systemui.retail.dagger.RetailModeModule; +import com.android.systemui.scene.shared.model.SceneDataSource; +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator; import com.android.systemui.scene.ui.view.WindowRootViewComponent; import com.android.systemui.screenrecord.ScreenRecordModule; import com.android.systemui.screenshot.dagger.ScreenshotModule; @@ -393,4 +395,7 @@ public abstract class SystemUIModule { @IntoMap @ClassKey(SystemUISecondaryUserService.class) abstract Service bindsSystemUISecondaryUserService(SystemUISecondaryUserService service); + + @Binds + abstract SceneDataSource bindSceneDataSource(SceneDataSourceDelegator delegator); } diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractor.kt new file mode 100644 index 000000000000..55d2bfcc8911 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractor.kt @@ -0,0 +1,174 @@ +/* + * 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.deviceentry.domain.interactor + +import android.content.res.Resources +import com.android.systemui.biometrics.domain.interactor.FingerprintPropertyInteractor +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.deviceentry.shared.model.ErrorFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.FaceMessage +import com.android.systemui.deviceentry.shared.model.FaceTimeoutMessage +import com.android.systemui.deviceentry.shared.model.FailedFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.FingerprintLockoutMessage +import com.android.systemui.deviceentry.shared.model.FingerprintMessage +import com.android.systemui.deviceentry.shared.model.HelpFaceAuthenticationStatus +import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus +import com.android.systemui.res.R +import com.android.systemui.util.kotlin.sample +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance +import kotlinx.coroutines.flow.filterNot +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.merge + +/** + * BiometricMessage business logic. Filters biometric error/acquired/fail/success events for + * authentication events that should never surface a message to the user at the current device + * state. + */ +@ExperimentalCoroutinesApi +@SysUISingleton +class BiometricMessageInteractor +@Inject +constructor( + @Main private val resources: Resources, + fingerprintAuthInteractor: DeviceEntryFingerprintAuthInteractor, + fingerprintPropertyInteractor: FingerprintPropertyInteractor, + faceAuthInteractor: DeviceEntryFaceAuthInteractor, + biometricSettingsInteractor: DeviceEntryBiometricSettingsInteractor, +) { + private val faceHelp: Flow<HelpFaceAuthenticationStatus> = + faceAuthInteractor.authenticationStatus.filterIsInstance<HelpFaceAuthenticationStatus>() + private val faceError: Flow<ErrorFaceAuthenticationStatus> = + faceAuthInteractor.authenticationStatus.filterIsInstance<ErrorFaceAuthenticationStatus>() + private val faceFailure: Flow<FailedFaceAuthenticationStatus> = + faceAuthInteractor.authenticationStatus.filterIsInstance<FailedFaceAuthenticationStatus>() + + /** + * The acquisition message ids to show message when both fingerprint and face are enrolled and + * enabled for device entry. + */ + private val coExFaceAcquisitionMsgIdsToShow: Set<Int> = + resources.getIntArray(R.array.config_face_help_msgs_when_fingerprint_enrolled).toSet() + + private fun ErrorFingerprintAuthenticationStatus.shouldSuppressError(): Boolean { + return isCancellationError() || isPowerPressedError() + } + + private fun ErrorFaceAuthenticationStatus.shouldSuppressError(): Boolean { + return isCancellationError() || isUnableToProcessError() + } + + private val fingerprintErrorMessage: Flow<FingerprintMessage> = + fingerprintAuthInteractor.fingerprintError + .filterNot { it.shouldSuppressError() } + .sample(biometricSettingsInteractor.fingerprintAuthCurrentlyAllowed, ::Pair) + .filter { (errorStatus, fingerprintAuthAllowed) -> + fingerprintAuthAllowed || errorStatus.isLockoutError() + } + .map { (errorStatus, _) -> + when { + errorStatus.isLockoutError() -> FingerprintLockoutMessage(errorStatus.msg) + else -> FingerprintMessage(errorStatus.msg) + } + } + + private val fingerprintHelpMessage: Flow<FingerprintMessage> = + fingerprintAuthInteractor.fingerprintHelp + .sample(biometricSettingsInteractor.fingerprintAuthCurrentlyAllowed, ::Pair) + .filter { (_, fingerprintAuthAllowed) -> fingerprintAuthAllowed } + .map { (helpStatus, _) -> + FingerprintMessage( + helpStatus.msg, + ) + } + + private val fingerprintFailMessage: Flow<FingerprintMessage> = + fingerprintPropertyInteractor.isUdfps.flatMapLatest { isUdfps -> + fingerprintAuthInteractor.fingerprintFailure + .sample(biometricSettingsInteractor.fingerprintAuthCurrentlyAllowed) + .filter { fingerprintAuthAllowed -> fingerprintAuthAllowed } + .map { + FingerprintMessage( + if (isUdfps) { + resources.getString( + com.android.internal.R.string.fingerprint_udfps_error_not_match + ) + } else { + resources.getString( + com.android.internal.R.string.fingerprint_error_not_match + ) + }, + ) + } + } + + val fingerprintMessage: Flow<FingerprintMessage> = + merge( + fingerprintErrorMessage, + fingerprintFailMessage, + fingerprintHelpMessage, + ) + + private val faceHelpMessage: Flow<FaceMessage> = + biometricSettingsInteractor.fingerprintAndFaceEnrolledAndEnabled + .flatMapLatest { fingerprintAndFaceEnrolledAndEnabled -> + if (fingerprintAndFaceEnrolledAndEnabled) { + faceHelp.filter { faceAuthHelpStatus -> + coExFaceAcquisitionMsgIdsToShow.contains(faceAuthHelpStatus.msgId) + } + } else { + faceHelp + } + } + .sample(biometricSettingsInteractor.faceAuthCurrentlyAllowed, ::Pair) + .filter { (_, faceAuthCurrentlyAllowed) -> faceAuthCurrentlyAllowed } + .map { (status, _) -> FaceMessage(status.msg) } + + private val faceFailureMessage: Flow<FaceMessage> = + faceFailure + .sample(biometricSettingsInteractor.faceAuthCurrentlyAllowed) + .filter { faceAuthCurrentlyAllowed -> faceAuthCurrentlyAllowed } + .map { FaceMessage(resources.getString(R.string.keyguard_face_failed)) } + + private val faceErrorMessage: Flow<FaceMessage> = + faceError + .filterNot { it.shouldSuppressError() } + .sample(biometricSettingsInteractor.faceAuthCurrentlyAllowed, ::Pair) + .filter { (errorStatus, faceAuthCurrentlyAllowed) -> + faceAuthCurrentlyAllowed || errorStatus.isLockoutError() + } + .map { (status, _) -> + when { + status.isTimeoutError() -> FaceTimeoutMessage(status.msg) + else -> FaceMessage(status.msg) + } + } + + // TODO(b/317215391): support showing face acquired messages on timeout + face lockout errors + val faceMessage: Flow<FaceMessage> = + merge( + faceHelpMessage, + faceFailureMessage, + faceErrorMessage, + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractor.kt new file mode 100644 index 000000000000..4515fcb545b3 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractor.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.deviceentry.domain.interactor + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine + +/** Encapsulates business logic for device entry biometric settings. */ +@ExperimentalCoroutinesApi +@SysUISingleton +class DeviceEntryBiometricSettingsInteractor +@Inject +constructor( + repository: BiometricSettingsRepository, +) { + val fingerprintAuthCurrentlyAllowed: Flow<Boolean> = + repository.isFingerprintAuthCurrentlyAllowed + val faceAuthCurrentlyAllowed: Flow<Boolean> = repository.isFaceAuthCurrentlyAllowed + + /** Whether both fingerprint and face are enrolled and enabled for device entry. */ + val fingerprintAndFaceEnrolledAndEnabled: Flow<Boolean> = + combine( + repository.isFingerprintEnrolledAndEnabled, + repository.isFaceAuthEnrolledAndEnabled, + ) { fpEnabled, faceEnabled -> + fpEnabled && faceEnabled + } +} diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt index 2461c26a56ca..a5f6f7c77a38 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFingerprintAuthInteractor.kt @@ -18,8 +18,10 @@ package com.android.systemui.deviceentry.domain.interactor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.FingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterIsInstance @@ -30,9 +32,6 @@ class DeviceEntryFingerprintAuthInteractor constructor( repository: DeviceEntryFingerprintAuthRepository, ) { - val fingerprintFailure: Flow<FailFingerprintAuthenticationStatus> = - repository.authenticationStatus.filterIsInstance<FailFingerprintAuthenticationStatus>() - /** Whether fingerprint authentication is currently running or not */ val isRunning: Flow<Boolean> = repository.isRunning @@ -41,4 +40,11 @@ constructor( repository.authenticationStatus val isLockedOut: Flow<Boolean> = repository.isLockedOut + + val fingerprintFailure: Flow<FailFingerprintAuthenticationStatus> = + repository.authenticationStatus.filterIsInstance<FailFingerprintAuthenticationStatus>() + val fingerprintError: Flow<ErrorFingerprintAuthenticationStatus> = + repository.authenticationStatus.filterIsInstance<ErrorFingerprintAuthenticationStatus>() + val fingerprintHelp: Flow<HelpFingerprintAuthenticationStatus> = + repository.authenticationStatus.filterIsInstance<HelpFingerprintAuthenticationStatus>() } diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractor.kt index 73389cb1bdce..21fd87c1c241 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractor.kt @@ -26,7 +26,6 @@ import com.android.systemui.keyguard.data.repository.TrustRepository import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -80,8 +79,7 @@ constructor( * Note: This does not imply that the lockscreen is visible or not. */ val isDeviceEntered: StateFlow<Boolean> = - sceneInteractor.desiredScene - .map { it.key } + sceneInteractor.currentScene .filter { currentScene -> currentScene == SceneKey.Gone || currentScene == SceneKey.Lockscreen } @@ -150,12 +148,12 @@ constructor( applicationScope.launch { if (isAuthenticationRequired()) { sceneInteractor.changeScene( - scene = SceneModel(SceneKey.Bouncer), + toScene = SceneKey.Bouncer, loggingReason = "request to unlock device while authentication required", ) } else { sceneInteractor.changeScene( - scene = SceneModel(SceneKey.Gone), + toScene = SceneKey.Gone, loggingReason = "request to unlock device while authentication isn't required", ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/OccludingAppDeviceEntryInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractor.kt index 63823385dc21..79455ebb624c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/OccludingAppDeviceEntryInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractor.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -11,10 +11,10 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.deviceentry.domain.interactor import android.content.Context import android.content.Intent @@ -22,7 +22,10 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.deviceentry.shared.model.BiometricMessage +import com.android.systemui.deviceentry.shared.model.FingerprintLockoutMessage import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus import com.android.systemui.plugins.ActivityStarter @@ -40,7 +43,6 @@ import kotlinx.coroutines.flow.filterNot import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge import kotlinx.coroutines.launch /** Business logic for handling authentication events when an app is occluding the lockscreen. */ @@ -77,16 +79,15 @@ constructor( private val fingerprintLockoutEvents: Flow<Unit> = fingerprintAuthRepository.authenticationStatus .ifKeyguardOccludedByApp() - .filter { it is ErrorFingerprintAuthenticationStatus && it.isLockoutMessage() } + .filter { it is ErrorFingerprintAuthenticationStatus && it.isLockoutError() } .map {} // maps FingerprintAuthenticationStatus => Unit val message: Flow<BiometricMessage?> = - merge( - biometricMessageInteractor.fingerprintErrorMessage.filterNot { - it.isFingerprintLockoutMessage() - }, - biometricMessageInteractor.fingerprintFailMessage, - biometricMessageInteractor.fingerprintHelpMessage, - ) + biometricMessageInteractor.fingerprintMessage + .filterNot { fingerprintMessage -> + // On lockout, the device will show the bouncer. Let's not show the message + // before the transition or else it'll look flickery. + fingerprintMessage is FingerprintLockoutMessage + } .ifKeyguardOccludedByApp(/* elseFlow */ flowOf(null)) init { diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/BiometricMessageModels.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/BiometricMessageModels.kt new file mode 100644 index 000000000000..118215c6ba15 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/BiometricMessageModels.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.deviceentry.shared.model + +/** + * BiometricMessage provided by + * [com.android.systemui.deviceentry.domain.interactor.BiometricMessageInteractor] + */ +sealed class BiometricMessage( + val message: String?, +) + +/** Face biometric message */ +open class FaceMessage(faceMessage: String?) : BiometricMessage(faceMessage) + +data class FaceTimeoutMessage( + private val faceTimeoutMessage: String?, +) : FaceMessage(faceTimeoutMessage) + +/** Fingerprint biometric message */ +open class FingerprintMessage(fingerprintMessage: String?) : BiometricMessage(fingerprintMessage) + +data class FingerprintLockoutMessage( + private val fingerprintLockoutMessage: String?, +) : FingerprintMessage(fingerprintLockoutMessage) diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/FaceAuthenticationModels.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/FaceAuthenticationModels.kt index f006b3484033..5f1667a70e5a 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/FaceAuthenticationModels.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/shared/model/FaceAuthenticationModels.kt @@ -71,11 +71,16 @@ data class ErrorFaceAuthenticationStatus( */ fun isCancellationError() = msgId == FaceManager.FACE_ERROR_CANCELED + fun isUnableToProcessError() = msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS + /** Method that checks if [msgId] is a hardware error. */ fun isHardwareError() = msgId == FaceManager.FACE_ERROR_HW_UNAVAILABLE || msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS + /** Method that checks if [msgId] is a timeout error. */ + fun isTimeoutError() = msgId == FaceManager.FACE_ERROR_TIMEOUT + companion object { /** * Error message that is created when cancel confirmation is not received from FaceManager diff --git a/packages/SystemUI/src/com/android/systemui/dreams/homecontrols/TaskFragmentComponent.kt b/packages/SystemUI/src/com/android/systemui/dreams/homecontrols/TaskFragmentComponent.kt index 6f7dcb173156..297ad847caa6 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/homecontrols/TaskFragmentComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/homecontrols/TaskFragmentComponent.kt @@ -17,7 +17,7 @@ package com.android.systemui.dreams.homecontrols import android.app.Activity -import android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.content.Intent import android.graphics.Rect import android.os.Binder @@ -122,15 +122,14 @@ constructor( /** Creates the task fragment */ fun createTaskFragment() { - val taskBounds = Rect(activity.resources.configuration.windowConfiguration.bounds) val fragmentOptions = TaskFragmentCreationParams.Builder( organizer.organizerToken, fragmentToken, activity.activityToken!! ) - .setInitialRelativeBounds(taskBounds) - .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW) + .setInitialRelativeBounds(Rect()) + .setWindowingMode(WINDOWING_MODE_FULLSCREEN) .build() organizer.applyTransaction( WindowContainerTransaction().createTaskFragment(fragmentOptions), diff --git a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt index 41ce3fd11e8a..83b2ee28b664 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt @@ -22,8 +22,10 @@ import com.android.server.notification.Flags.FLAG_VIBRATE_WHILE_UNLOCKED import com.android.server.notification.Flags.crossAppPoliteNotifications import com.android.server.notification.Flags.politeNotifications import com.android.server.notification.Flags.vibrateWhileUnlocked +import com.android.systemui.Flags.FLAG_COMMUNAL_HUB import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT +import com.android.systemui.Flags.communalHub import com.android.systemui.Flags.keyguardBottomAreaRefactor import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.dagger.SysUISingleton @@ -63,6 +65,9 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha ComposeLockscreen.token dependsOn KeyguardShadeMigrationNssl.token ComposeLockscreen.token dependsOn keyguardBottomAreaRefactor ComposeLockscreen.token dependsOn migrateClocksToBlueprint + + // CommunalHub dependencies + communalHub dependsOn KeyguardShadeMigrationNssl.token } private inline val politeNotifications @@ -75,4 +80,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha get() = FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor()) private inline val migrateClocksToBlueprint get() = FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint()) + private inline val communalHub + get() = FlagToken(FLAG_COMMUNAL_HUB, communalHub()) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt index abe49eefda99..86b99ecac66c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt @@ -100,6 +100,7 @@ constructor( private val keyguardClockViewModel: KeyguardClockViewModel, private val lockscreenContentViewModel: LockscreenContentViewModel, private val lockscreenSceneBlueprintsLazy: Lazy<Set<LockscreenSceneBlueprint>>, + private val keyguardBlueprintViewBinder: KeyguardBlueprintViewBinder, ) : CoreStartable { private var rootViewHandle: DisposableHandle? = null @@ -143,7 +144,7 @@ constructor( cs.connect(composeView.id, BOTTOM, PARENT_ID, BOTTOM) keyguardRootView.addView(composeView) } else { - KeyguardBlueprintViewBinder.bind( + keyguardBlueprintViewBinder.bind( keyguardRootView, keyguardBlueprintViewModel, keyguardClockViewModel, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java index 0b227fa7f5a6..968c3e3a6792 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -73,6 +73,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.user.domain.interactor.SelectedUserInteractor; import com.android.systemui.util.DeviceConfigProxy; +import com.android.systemui.util.ThreadAssert; import com.android.systemui.util.kotlin.JavaAdapter; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.util.settings.SystemSettings; @@ -223,6 +224,13 @@ public interface KeyguardModule { return new KeyguardQuickAffordancesMetricsLoggerImpl(); } + /** */ + @Provides + @SysUISingleton + static ThreadAssert providesThreadAssert() { + return new ThreadAssert(); + } + /** Binds {@link KeyguardUpdateMonitor} as a {@link CoreStartable}. */ @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepository.kt index 938183025336..0659c7c7d79c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepository.kt @@ -17,14 +17,16 @@ package com.android.systemui.keyguard.data.repository +import android.os.Handler import android.util.Log import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.shared.model.KeyguardBlueprint import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint.Companion.DEFAULT import com.android.systemui.keyguard.ui.view.layout.blueprints.KeyguardBlueprintModule -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType.DefaultTransition +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config +import com.android.systemui.util.ThreadAssert import java.io.PrintWriter import java.util.TreeMap import javax.inject.Inject @@ -49,16 +51,17 @@ class KeyguardBlueprintRepository constructor( configurationRepository: ConfigurationRepository, blueprints: Set<@JvmSuppressWildcards KeyguardBlueprint>, + @Main val handler: Handler, + val assert: ThreadAssert, ) { // This is TreeMap so that we can order the blueprints and assign numerical values to the // blueprints in the adb tool. private val blueprintIdMap: TreeMap<String, KeyguardBlueprint> = TreeMap<String, KeyguardBlueprint>().apply { putAll(blueprints.associateBy { it.id }) } val blueprint: MutableStateFlow<KeyguardBlueprint> = MutableStateFlow(blueprintIdMap[DEFAULT]!!) - val refreshBluePrint: MutableSharedFlow<Unit> = MutableSharedFlow(extraBufferCapacity = 1) - val refreshBlueprintTransition: MutableSharedFlow<IntraBlueprintTransitionType> = - MutableSharedFlow(extraBufferCapacity = 1) + val refreshTransition = MutableSharedFlow<Config>(extraBufferCapacity = 1) val configurationChange: Flow<Unit> = configurationRepository.onAnyConfigurationChange + private var targetTransitionConfig: Config? = null /** * Emits the blueprint value to the collectors. @@ -105,14 +108,32 @@ constructor( blueprint?.let { this.blueprint.value = it } } - /** Re-emits the last emitted blueprint value if possible. */ - fun refreshBlueprint() { - refreshBlueprintWithTransition(DefaultTransition) - } + /** + * Re-emits the last emitted blueprint value if possible. This is delayed until next frame to + * dedupe requests and determine the correct transition to execute. + */ + fun refreshBlueprint(config: Config = Config.DEFAULT) { + fun scheduleCallback() { + // We use a handler here instead of a CoroutineDipsatcher because the one provided by + // @Main CoroutineDispatcher is currently Dispatchers.Main.immediate, which doesn't + // delay the callback, and instead runs it imemdiately. + handler.post { + assert.isMainThread() + targetTransitionConfig?.let { + val success = refreshTransition.tryEmit(it) + if (!success) { + Log.e(TAG, "refreshBlueprint: Failed to emit blueprint refresh: $it") + } + } + targetTransitionConfig = null + } + } - fun refreshBlueprintWithTransition(type: IntraBlueprintTransitionType = DefaultTransition) { - refreshBluePrint.tryEmit(Unit) - refreshBlueprintTransition.tryEmit(type) + assert.isMainThread() + if ((targetTransitionConfig?.type?.priority ?: Int.MIN_VALUE) < config.type.priority) { + if (targetTransitionConfig == null) scheduleCallback() + targetTransitionConfig = config + } } /** Prints all available blueprints to the PrintWriter. */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractor.kt deleted file mode 100644 index 508f71a2c4a5..000000000000 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractor.kt +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.android.systemui.keyguard.domain.interactor - -import android.content.res.Resources -import android.hardware.biometrics.BiometricSourceType -import android.hardware.biometrics.BiometricSourceType.FINGERPRINT -import android.hardware.fingerprint.FingerprintManager -import com.android.keyguard.KeyguardUpdateMonitor -import com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED -import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepository -import com.android.systemui.biometrics.shared.model.FingerprintSensorType -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus -import com.android.systemui.keyguard.util.IndicationHelper -import javax.inject.Inject -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterNot -import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.map - -/** - * BiometricMessage business logic. Filters biometric error/acquired/fail/success events for - * authentication events that should never surface a message to the user at the current device - * state. - */ -@ExperimentalCoroutinesApi -@SysUISingleton -class BiometricMessageInteractor -@Inject -constructor( - @Main private val resources: Resources, - private val fingerprintAuthRepository: DeviceEntryFingerprintAuthRepository, - private val fingerprintPropertyRepository: FingerprintPropertyRepository, - private val indicationHelper: IndicationHelper, - private val keyguardUpdateMonitor: KeyguardUpdateMonitor, -) { - val fingerprintErrorMessage: Flow<BiometricMessage> = - fingerprintAuthRepository.authenticationStatus - .filter { - it is ErrorFingerprintAuthenticationStatus && - !indicationHelper.shouldSuppressErrorMsg(FINGERPRINT, it.msgId) - } - .map { - val errorStatus = it as ErrorFingerprintAuthenticationStatus - BiometricMessage( - FINGERPRINT, - BiometricMessageType.ERROR, - errorStatus.msgId, - errorStatus.msg, - ) - } - - val fingerprintHelpMessage: Flow<BiometricMessage> = - fingerprintAuthRepository.authenticationStatus - .filter { it is HelpFingerprintAuthenticationStatus } - .filterNot { isPrimaryAuthRequired() } - .map { - val helpStatus = it as HelpFingerprintAuthenticationStatus - BiometricMessage( - FINGERPRINT, - BiometricMessageType.HELP, - helpStatus.msgId, - helpStatus.msg, - ) - } - - val fingerprintFailMessage: Flow<BiometricMessage> = - isUdfps().flatMapLatest { isUdfps -> - fingerprintAuthRepository.authenticationStatus - .filter { it is FailFingerprintAuthenticationStatus } - .filterNot { isPrimaryAuthRequired() } - .map { - BiometricMessage( - FINGERPRINT, - BiometricMessageType.FAIL, - BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED, - if (isUdfps) { - resources.getString( - com.android.internal.R.string.fingerprint_udfps_error_not_match - ) - } else { - resources.getString( - com.android.internal.R.string.fingerprint_error_not_match - ) - }, - ) - } - } - - private fun isUdfps() = - fingerprintPropertyRepository.sensorType.map { - it == FingerprintSensorType.UDFPS_OPTICAL || - it == FingerprintSensorType.UDFPS_ULTRASONIC - } - - private fun isPrimaryAuthRequired(): Boolean { - // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong - // as long as primary auth, i.e. PIN/pattern/password, is required), so it's ok to - // pass true for isStrongBiometric to isUnlockingWithBiometricAllowed() to bypass the - // check of whether non-strong biometric is allowed since strong biometrics can still be - // used. - return !keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */) - } -} - -data class BiometricMessage( - val source: BiometricSourceType, - val type: BiometricMessageType, - val id: Int, - val message: String?, -) { - fun isFingerprintLockoutMessage(): Boolean { - return source == FINGERPRINT && - type == BiometricMessageType.ERROR && - (id == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT || - id == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) - } -} - -enum class BiometricMessageType { - HELP, - ERROR, - FAIL, -} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt index 566e006598a5..56d64a298bc0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt @@ -24,13 +24,12 @@ import com.android.systemui.keyguard.data.repository.KeyguardBlueprintRepository import com.android.systemui.keyguard.shared.model.KeyguardBlueprint import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint import com.android.systemui.keyguard.ui.view.layout.blueprints.SplitShadeKeyguardBlueprint -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType.DefaultTransition +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.statusbar.policy.SplitShadeStateController import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch @@ -44,20 +43,14 @@ constructor( private val splitShadeStateController: SplitShadeStateController, ) { - /** - * The current blueprint for the lockscreen. - * - * This flow can also emit the same blueprint value if refreshBlueprint is emitted. - */ + /** The current blueprint for the lockscreen. */ val blueprint: Flow<KeyguardBlueprint> = keyguardBlueprintRepository.blueprint - val blueprintWithTransition = - combine( - keyguardBlueprintRepository.refreshBluePrint, - keyguardBlueprintRepository.refreshBlueprintTransition - ) { _, source -> - source - } + /** + * Triggered when the blueprint isn't changed, but the ConstraintSet should be rebuilt and + * optionally a transition should be fired to move to the rebuilt ConstraintSet. + */ + val refreshTransition = keyguardBlueprintRepository.refreshTransition init { applicationScope.launch { @@ -105,14 +98,11 @@ constructor( return keyguardBlueprintRepository.applyBlueprint(blueprintId) } - /** Re-emits the blueprint value to the collectors. */ - fun refreshBlueprint() { - keyguardBlueprintRepository.refreshBlueprint() - } + /** Emits a value to refresh the blueprint with the appropriate transition. */ + fun refreshBlueprint(type: Type = Type.NoTransition) = refreshBlueprint(Config(type)) - fun refreshBlueprintWithTransition(type: IntraBlueprintTransitionType = DefaultTransition) { - keyguardBlueprintRepository.refreshBlueprintWithTransition(type) - } + /** Emits a value to refresh the blueprint with the appropriate transition. */ + fun refreshBlueprint(config: Config) = keyguardBlueprintRepository.refreshBlueprint(config) fun getCurrentBlueprint(): KeyguardBlueprint { return keyguardBlueprintRepository.blueprint.value diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/FingerprintAuthenticationModels.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/FingerprintAuthenticationModels.kt index 474de77f09ab..d8b7b4a6a3d4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/FingerprintAuthenticationModels.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/FingerprintAuthenticationModels.kt @@ -16,6 +16,7 @@ package com.android.systemui.keyguard.shared.model +import android.hardware.biometrics.BiometricFingerprintConstants import android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD import android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_START import android.hardware.fingerprint.FingerprintManager @@ -61,8 +62,14 @@ data class ErrorFingerprintAuthenticationStatus( // present to break equality check if the same error occurs repeatedly. val createdAt: Long = elapsedRealtime(), ) : FingerprintAuthenticationStatus() { - fun isLockoutMessage(): Boolean { - return msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT || + fun isCancellationError(): Boolean = + msgId == BiometricFingerprintConstants.FINGERPRINT_ERROR_CANCELED || + msgId == BiometricFingerprintConstants.FINGERPRINT_ERROR_USER_CANCELED + + fun isPowerPressedError(): Boolean = + msgId == BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED + + fun isLockoutError(): Boolean = + msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT || msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT - } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerMessageAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerMessageAreaViewBinder.kt new file mode 100644 index 000000000000..9186dde9a9bf --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerMessageAreaViewBinder.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.binder + +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.repeatOnLifecycle +import com.android.keyguard.AuthKeyguardMessageArea +import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerMessageAreaViewModel +import com.android.systemui.lifecycle.repeatWhenAttached +import kotlinx.coroutines.ExperimentalCoroutinesApi + +/** Binds the alternate bouncer message view to its view-model. */ +@ExperimentalCoroutinesApi +object AlternateBouncerMessageAreaViewBinder { + + /** Binds the view to the view-model, continuing to update the former based on the latter. */ + @JvmStatic + fun bind( + view: AuthKeyguardMessageArea, + viewModel: AlternateBouncerMessageAreaViewModel, + ) { + view.setIsVisible(true) + view.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.message.collect { biometricMsg -> + if (biometricMsg == null) { + view.setMessage("", true) + } else { + view.setMessage(biometricMsg.message, true) + } + } + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt index b2a35495c693..d40021007a2b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt @@ -62,6 +62,11 @@ object AlternateBouncerViewBinder { alternateBouncerDependencies.udfpsAccessibilityOverlayViewModel, ) + AlternateBouncerMessageAreaViewBinder.bind( + view = view.requireViewById(R.id.alternate_bouncer_message_area), + viewModel = alternateBouncerDependencies.messageAreaViewModel, + ) + val scrim = view.requireViewById(R.id.alternate_bouncer_scrim) as ScrimView val viewModel = alternateBouncerDependencies.viewModel val swipeUpAnywhereGestureHandler = diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt index 404046b00b66..6e70368476ed 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt @@ -17,7 +17,9 @@ package com.android.systemui.keyguard.ui.binder +import android.os.Handler import android.os.Trace +import android.transition.Transition import android.transition.TransitionManager import android.util.Log import androidx.constraintlayout.widget.ConstraintLayout @@ -25,98 +27,168 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.systemui.Flags.keyguardBottomAreaRefactor +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.BaseBlueprintTransition import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config import com.android.systemui.keyguard.ui.viewmodel.KeyguardBlueprintViewModel import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel import com.android.systemui.lifecycle.repeatWhenAttached +import javax.inject.Inject +import kotlin.math.max import kotlinx.coroutines.launch -class KeyguardBlueprintViewBinder { - companion object { - private const val TAG = "KeyguardBlueprintViewBinder" - - fun bind( - constraintLayout: ConstraintLayout, - viewModel: KeyguardBlueprintViewModel, - clockViewModel: KeyguardClockViewModel - ) { - constraintLayout.repeatWhenAttached { - repeatOnLifecycle(Lifecycle.State.CREATED) { - launch { - viewModel.blueprint.collect { blueprint -> - val prevBluePrint = viewModel.currentBluePrint - Trace.beginSection("KeyguardBlueprint#applyBlueprint") - Log.d(TAG, "applying blueprint: $blueprint") - TransitionManager.endTransitions(constraintLayout) - - val cs = - ConstraintSet().apply { - clone(constraintLayout) - val emptyLayout = ConstraintSet.Layout() - knownIds.forEach { - getConstraint(it).layout.copyFrom(emptyLayout) - } - blueprint.applyConstraints(this) - } - - // Apply transition. +private const val TAG = "KeyguardBlueprintViewBinder" +private const val DEBUG = true + +@SysUISingleton +class KeyguardBlueprintViewBinder +@Inject +constructor( + @Main private val handler: Handler, +) { + private var runningPriority = -1 + private val runningTransitions = mutableSetOf<Transition>() + private val isTransitionRunning: Boolean + get() = runningTransitions.size > 0 + private val transitionListener = + object : Transition.TransitionListener { + override fun onTransitionCancel(transition: Transition) { + if (DEBUG) Log.e(TAG, "onTransitionCancel: ${transition::class.simpleName}") + runningTransitions.remove(transition) + } + + override fun onTransitionEnd(transition: Transition) { + if (DEBUG) Log.e(TAG, "onTransitionEnd: ${transition::class.simpleName}") + runningTransitions.remove(transition) + } + + override fun onTransitionPause(transition: Transition) { + if (DEBUG) Log.i(TAG, "onTransitionPause: ${transition::class.simpleName}") + runningTransitions.remove(transition) + } + + override fun onTransitionResume(transition: Transition) { + if (DEBUG) Log.i(TAG, "onTransitionResume: ${transition::class.simpleName}") + runningTransitions.add(transition) + } + + override fun onTransitionStart(transition: Transition) { + if (DEBUG) Log.i(TAG, "onTransitionStart: ${transition::class.simpleName}") + runningTransitions.add(transition) + } + } + + fun bind( + constraintLayout: ConstraintLayout, + viewModel: KeyguardBlueprintViewModel, + clockViewModel: KeyguardClockViewModel, + ) { + constraintLayout.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.CREATED) { + launch { + viewModel.blueprint.collect { blueprint -> + Trace.beginSection("KeyguardBlueprintViewBinder#applyBlueprint") + val prevBluePrint = viewModel.currentBluePrint + + val cs = + ConstraintSet().apply { + clone(constraintLayout) + val emptyLayout = ConstraintSet.Layout() + knownIds.forEach { getConstraint(it).layout.copyFrom(emptyLayout) } + blueprint.applyConstraints(this) + } + + var transition = if ( !keyguardBottomAreaRefactor() && prevBluePrint != null && prevBluePrint != blueprint ) { - TransitionManager.beginDelayedTransition( - constraintLayout, - BaseBlueprintTransition(clockViewModel) - .addTransition( - IntraBlueprintTransition( - IntraBlueprintTransitionType.NoTransition, - clockViewModel - ) - ) - ) - } else { - TransitionManager.beginDelayedTransition( - constraintLayout, - IntraBlueprintTransition( - IntraBlueprintTransitionType.NoTransition, - clockViewModel + BaseBlueprintTransition(clockViewModel) + .addTransition( + IntraBlueprintTransition(Config.DEFAULT, clockViewModel) ) - ) + } else { + IntraBlueprintTransition(Config.DEFAULT, clockViewModel) } - // Add and remove views of sections that are not contained by the - // other. + runTransition(constraintLayout, transition, Config.DEFAULT) { + // Add and remove views of sections that are not contained by the other. blueprint.replaceViews(prevBluePrint, constraintLayout) cs.applyTo(constraintLayout) - - viewModel.currentBluePrint = blueprint - Trace.endSection() } - } - launch { - viewModel.blueprintWithTransition.collect { source -> - TransitionManager.endTransitions(constraintLayout) + viewModel.currentBluePrint = blueprint + Trace.endSection() + } + } - val cs = - ConstraintSet().apply { - clone(constraintLayout) - viewModel.currentBluePrint?.applyConstraints(this) - } + launch { + viewModel.refreshTransition.collect { transition -> + Trace.beginSection("KeyguardBlueprintViewBinder#refreshTransition") + val cs = + ConstraintSet().apply { + clone(constraintLayout) + viewModel.currentBluePrint?.applyConstraints(this) + } - TransitionManager.beginDelayedTransition( - constraintLayout, - IntraBlueprintTransition(source, clockViewModel) - ) + runTransition( + constraintLayout, + IntraBlueprintTransition(transition, clockViewModel), + transition, + ) { cs.applyTo(constraintLayout) - Trace.endSection() } + Trace.endSection() } } } } } + + private fun runTransition( + constraintLayout: ConstraintLayout, + transition: Transition, + config: Config, + apply: () -> Unit, + ) { + val currentPriority = if (isTransitionRunning) runningPriority else -1 + if (config.checkPriority && config.type.priority < currentPriority) { + if (DEBUG) { + Log.w( + TAG, + "runTransition: skipping ${transition::class.simpleName}: " + + "currentPriority=$currentPriority; config=$config" + ) + } + apply() + return + } + + if (DEBUG) { + Log.i( + TAG, + "runTransition: running ${transition::class.simpleName}: " + + "currentPriority=$currentPriority; config=$config" + ) + } + + // beginDelayedTransition makes a copy, so we temporarially add the uncopied transition to + // the running set until the copy is started by the handler. + runningTransitions.add(transition) + transition.addListener(transitionListener) + runningPriority = max(currentPriority, config.type.priority) + + handler.post { + if (config.terminatePrevious) { + TransitionManager.endTransitions(constraintLayout) + } + + TransitionManager.beginDelayedTransition(constraintLayout, transition) + runningTransitions.remove(transition) + apply() + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt index 62a6e8b45285..01596ed2e3ef 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt @@ -30,7 +30,7 @@ import com.android.keyguard.KeyguardClockSwitch.SMALL import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.keyguard.domain.interactor.KeyguardBlueprintInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.keyguard.ui.view.layout.sections.ClockSection import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel import com.android.systemui.lifecycle.repeatWhenAttached @@ -39,6 +39,8 @@ import com.android.systemui.shared.clocks.DEFAULT_CLOCK_ID import kotlinx.coroutines.launch object KeyguardClockViewBinder { + private val TAG = KeyguardClockViewBinder::class.simpleName!! + @JvmStatic fun bind( clockSection: ClockSection, @@ -68,9 +70,7 @@ object KeyguardClockViewBinder { if (!migrateClocksToBlueprint()) return@launch viewModel.clockSize.collect { updateBurnInLayer(keyguardRootView, viewModel) - blueprintInteractor.refreshBlueprintWithTransition( - IntraBlueprintTransitionType.ClockSize - ) + blueprintInteractor.refreshBlueprint(Type.ClockSize) } } launch { @@ -83,13 +83,9 @@ object KeyguardClockViewBinder { it.largeClock.config.hasCustomPositionUpdatedAnimation && it.config.id == DEFAULT_CLOCK_ID ) { - blueprintInteractor.refreshBlueprintWithTransition( - IntraBlueprintTransitionType.DefaultClockStepping - ) + blueprintInteractor.refreshBlueprint(Type.DefaultClockStepping) } else { - blueprintInteractor.refreshBlueprintWithTransition( - IntraBlueprintTransitionType.DefaultTransition - ) + blueprintInteractor.refreshBlueprint(Type.DefaultTransition) } } } @@ -102,9 +98,7 @@ object KeyguardClockViewBinder { if ( viewModel.useLargeClock && it.config.id == "DIGITAL_CLOCK_WEATHER" ) { - blueprintInteractor.refreshBlueprintWithTransition( - IntraBlueprintTransitionType.DefaultTransition - ) + blueprintInteractor.refreshBlueprint(Type.DefaultTransition) } } } @@ -112,6 +106,7 @@ object KeyguardClockViewBinder { } } } + @VisibleForTesting fun updateBurnInLayer( keyguardRootView: ConstraintLayout, @@ -171,6 +166,7 @@ object KeyguardClockViewBinder { } } } + fun applyConstraints( clockSection: ClockSection, rootView: ConstraintLayout, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt index 9e7c70d67156..1b7a50790561 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt @@ -48,6 +48,7 @@ import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel +import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.clocks.ClockController @@ -112,6 +113,10 @@ object KeyguardRootViewBinder { } val burnInParams = MutableStateFlow(BurnInParameters()) + val viewState = + ViewStateAccessor( + alpha = { view.alpha }, + ) val disposableHandle = view.repeatWhenAttached { @@ -134,7 +139,7 @@ object KeyguardRootViewBinder { if (keyguardBottomAreaRefactor()) { launch { - viewModel.alpha.collect { alpha -> + viewModel.alpha(viewState).collect { alpha -> view.alpha = alpha childViews[statusViewId]?.alpha = alpha } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt index 08a2b9cb8968..b77f0c5a1e60 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt @@ -23,6 +23,8 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.keyguard.domain.interactor.KeyguardBlueprintInteractor +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel import com.android.systemui.lifecycle.repeatWhenAttached @@ -49,7 +51,13 @@ object KeyguardSmartspaceViewBinder { clockViewModel, smartspaceViewModel ) - blueprintInteractor.refreshBlueprintWithTransition() + blueprintInteractor.refreshBlueprint( + Config( + Type.SmartspaceVisibility, + checkPriority = false, + terminatePrevious = false, + ) + ) } } @@ -57,7 +65,13 @@ object KeyguardSmartspaceViewBinder { if (!migrateClocksToBlueprint()) return@launch smartspaceViewModel.bcSmartspaceVisibility.collect { updateBCSmartspaceInBurnInLayer(keyguardRootView, clockViewModel) - blueprintInteractor.refreshBlueprintWithTransition() + blueprintInteractor.refreshBlueprint( + Config( + Type.SmartspaceVisibility, + checkPriority = false, + terminatePrevious = false, + ) + ) } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt index 1144efe90c84..f95efaab75f4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt @@ -43,6 +43,10 @@ import android.widget.TextView import android.window.InputTransferToken import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet +import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID +import androidx.constraintlayout.widget.ConstraintSet.START +import androidx.constraintlayout.widget.ConstraintSet.TOP +import androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT import androidx.core.view.isInvisible import com.android.keyguard.ClockEventController import com.android.keyguard.KeyguardClockSwitch @@ -393,7 +397,7 @@ constructor( ), ) - setUpUdfps(previewContext, rootView) + setUpUdfps(previewContext, if (migrateClocksToBlueprint()) keyguardRootView else rootView) if (keyguardBottomAreaRefactor()) { setupShortcuts(keyguardRootView) @@ -468,15 +472,6 @@ constructor( return } - // Place the UDFPS view in the proper sensor location - val fingerprintLayoutParams = - FrameLayout.LayoutParams(sensorBounds.width(), sensorBounds.height()) - fingerprintLayoutParams.setMarginsRelative( - sensorBounds.left, - sensorBounds.top, - sensorBounds.right, - sensorBounds.bottom - ) val finger = LayoutInflater.from(previewContext) .inflate( @@ -484,7 +479,31 @@ constructor( parentView, false, ) as View - parentView.addView(finger, fingerprintLayoutParams) + + // Place the UDFPS view in the proper sensor location + if (migrateClocksToBlueprint()) { + finger.id = R.id.lock_icon_view + parentView.addView(finger) + val cs = ConstraintSet() + cs.clone(parentView as ConstraintLayout) + cs.apply { + constrainWidth(R.id.lock_icon_view, sensorBounds.width()) + constrainHeight(R.id.lock_icon_view, sensorBounds.height()) + connect(R.id.lock_icon_view, TOP, PARENT_ID, TOP, sensorBounds.top) + connect(R.id.lock_icon_view, START, PARENT_ID, START, sensorBounds.left) + } + cs.applyTo(parentView) + } else { + val fingerprintLayoutParams = + FrameLayout.LayoutParams(sensorBounds.width(), sensorBounds.height()) + fingerprintLayoutParams.setMarginsRelative( + sensorBounds.left, + sensorBounds.top, + sensorBounds.right, + sensorBounds.bottom + ) + parentView.addView(finger, fingerprintLayoutParams) + } } private fun setUpClock(previewContext: Context, parentView: ViewGroup) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt index 524aa1a95d2d..a7075d97459e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/transitions/IntraBlueprintTransition.kt @@ -21,25 +21,42 @@ import com.android.systemui.keyguard.ui.view.layout.sections.transitions.ClockSi import com.android.systemui.keyguard.ui.view.layout.sections.transitions.DefaultClockSteppingTransition import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel -enum class IntraBlueprintTransitionType { - ClockSize, - ClockCenter, - DefaultClockStepping, - DefaultTransition, - AodNotifIconsTransition, - // When transition between blueprint, we don't need any duration or interpolator but we need - // all elements go to correct state - NoTransition, -} - class IntraBlueprintTransition( - type: IntraBlueprintTransitionType, - clockViewModel: KeyguardClockViewModel + config: IntraBlueprintTransition.Config, + clockViewModel: KeyguardClockViewModel, ) : TransitionSet() { + + enum class Type( + val priority: Int, + ) { + ClockSize(100), + ClockCenter(99), + DefaultClockStepping(98), + AodNotifIconsTransition(97), + SmartspaceVisibility(2), + DefaultTransition(1), + // When transition between blueprint, we don't need any duration or interpolator but we need + // all elements go to correct state + NoTransition(0), + } + + data class Config( + val type: Type, + val checkPriority: Boolean = true, + val terminatePrevious: Boolean = true, + ) { + companion object { + val DEFAULT = Config(Type.NoTransition) + } + } + init { ordering = ORDERING_TOGETHER - if (type == IntraBlueprintTransitionType.DefaultClockStepping) - addTransition(clockViewModel.clock?.let { DefaultClockSteppingTransition(it) }) - addTransition(ClockSizeTransition(type, clockViewModel)) + when (config.type) { + Type.NoTransition -> {} + Type.DefaultClockStepping -> + addTransition(clockViewModel.clock?.let { DefaultClockSteppingTransition(it) }) + else -> addTransition(ClockSizeTransition(config, clockViewModel)) + } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt index 631b3427dae9..54a7ca47d4e7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt @@ -24,7 +24,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.constraintlayout.widget.ConstraintSet.BOTTOM import androidx.constraintlayout.widget.ConstraintSet.END -import androidx.constraintlayout.widget.ConstraintSet.INVISIBLE +import androidx.constraintlayout.widget.ConstraintSet.GONE import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP @@ -52,11 +52,6 @@ internal fun ConstraintSet.setVisibility( visibility: Int, ) = views.forEach { view -> this.setVisibility(view.id, visibility) } -internal fun ConstraintSet.setAlpha( - views: Iterable<View>, - alpha: Float, -) = views.forEach { view -> this.setAlpha(view.id, alpha) } - open class ClockSection @Inject constructor( @@ -105,7 +100,7 @@ constructor( // Add constraint between elements in clock and clock container return constraintSet.apply { setVisibility(getTargetClockFace(clock).views, VISIBLE) - setVisibility(getNonTargetClockFace(clock).views, INVISIBLE) + setVisibility(getNonTargetClockFace(clock).views, GONE) if (!keyguardClockViewModel.useLargeClock) { connect(sharedR.id.bc_smartspace_view, TOP, sharedR.id.date_smartspace_view, BOTTOM) } @@ -150,6 +145,7 @@ constructor( } } } + open fun applyDefaultConstraints(constraints: ConstraintSet) { val guideline = if (keyguardClockViewModel.clockShouldBeCentered.value) PARENT_ID @@ -168,8 +164,8 @@ constructor( largeClockTopMargin += getDimen(ENHANCED_SMARTSPACE_HEIGHT) connect(R.id.lockscreen_clock_view_large, TOP, PARENT_ID, TOP, largeClockTopMargin) - constrainHeight(R.id.lockscreen_clock_view_large, WRAP_CONTENT) constrainWidth(R.id.lockscreen_clock_view_large, WRAP_CONTENT) + constrainHeight(R.id.lockscreen_clock_view_large, WRAP_CONTENT) constrainWidth(R.id.lockscreen_clock_view, WRAP_CONTENT) constrainHeight( R.id.lockscreen_clock_view, @@ -190,11 +186,10 @@ constructor( context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin) + Utils.getStatusBarHeaderHeightKeyguard(context) } - if (keyguardClockViewModel.useLargeClock) { - smallClockTopMargin -= - context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height) - } - connect(R.id.lockscreen_clock_view, TOP, PARENT_ID, TOP, smallClockTopMargin) + + create(R.id.small_clock_guideline_top, ConstraintSet.HORIZONTAL_GUIDELINE) + setGuidelineBegin(R.id.small_clock_guideline_top, smallClockTopMargin) + connect(R.id.lockscreen_clock_view, TOP, R.id.small_clock_guideline_top, BOTTOM) } constrainWeatherClockDateIconsBarrier(constraints) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt index d75a72f91061..75132a59eb88 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt @@ -24,11 +24,13 @@ import androidx.constraintlayout.widget.ConstraintSet.END import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP +import com.android.systemui.Flags.centralizedStatusBarDimensRefactor import com.android.systemui.Flags.migrateClocksToBlueprint import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags +import com.android.systemui.shade.LargeScreenHeaderHelper import com.android.systemui.shade.NotificationPanelView import com.android.systemui.statusbar.notification.stack.AmbientState import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController @@ -36,6 +38,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCa import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel +import dagger.Lazy import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher @@ -52,6 +55,7 @@ constructor( ambientState: AmbientState, controller: NotificationStackScrollLayoutController, notificationStackSizeCalculator: NotificationStackSizeCalculator, + private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, @Main mainDispatcher: CoroutineDispatcher, ) : NotificationStackScrollLayoutSection( @@ -74,12 +78,27 @@ constructor( val bottomMargin = context.resources.getDimensionPixelSize(R.dimen.keyguard_status_view_bottom_margin) if (migrateClocksToBlueprint()) { + val useLargeScreenHeader = + context.resources.getBoolean(R.bool.config_use_large_screen_shade_header) + val marginTopLargeScreen = + if (centralizedStatusBarDimensRefactor()) { + largeScreenHeaderHelperLazy.get().getLargeScreenHeaderHeight() + } else { + context.resources.getDimensionPixelSize( + R.dimen.large_screen_shade_header_height + ) + } connect( R.id.nssl_placeholder, TOP, R.id.smart_space_barrier_bottom, BOTTOM, - bottomMargin + bottomMargin + + if (useLargeScreenHeader) { + marginTopLargeScreen + } else { + 0 + } ) } else { connect(R.id.nssl_placeholder, TOP, R.id.keyguard_status_view, BOTTOM, bottomMargin) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt index 2f99719df36c..8255bcc87400 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt @@ -53,14 +53,14 @@ constructor( private var dateView: View? = null private var smartspaceVisibilityListener: OnGlobalLayoutListener? = null + private var pastVisibility: Int = -1 override fun addViews(constraintLayout: ConstraintLayout) { - if (!migrateClocksToBlueprint()) { - return - } + if (!migrateClocksToBlueprint()) return smartspaceView = smartspaceController.buildAndConnectView(constraintLayout) weatherView = smartspaceController.buildAndConnectWeatherView(constraintLayout) dateView = smartspaceController.buildAndConnectDateView(constraintLayout) + pastVisibility = smartspaceView?.visibility ?: View.GONE if (keyguardSmartspaceViewModel.isSmartspaceEnabled) { constraintLayout.addView(smartspaceView) if (keyguardSmartspaceViewModel.isDateWeatherDecoupled) { @@ -69,26 +69,20 @@ constructor( } } keyguardUnlockAnimationController.lockscreenSmartspace = smartspaceView - smartspaceVisibilityListener = - object : OnGlobalLayoutListener { - var pastVisibility = GONE - override fun onGlobalLayout() { - smartspaceView?.let { - val newVisibility = it.visibility - if (pastVisibility != newVisibility) { - keyguardSmartspaceInteractor.setBcSmartspaceVisibility(newVisibility) - pastVisibility = newVisibility - } - } + smartspaceVisibilityListener = OnGlobalLayoutListener { + smartspaceView?.let { + val newVisibility = it.visibility + if (pastVisibility != newVisibility) { + keyguardSmartspaceInteractor.setBcSmartspaceVisibility(newVisibility) + pastVisibility = newVisibility } } + } smartspaceView?.viewTreeObserver?.addOnGlobalLayoutListener(smartspaceVisibilityListener) } override fun bindData(constraintLayout: ConstraintLayout) { - if (!migrateClocksToBlueprint()) { - return - } + if (!migrateClocksToBlueprint()) return KeyguardSmartspaceViewBinder.bind( constraintLayout, keyguardClockViewModel, @@ -98,9 +92,7 @@ constructor( } override fun applyConstraints(constraintSet: ConstraintSet) { - if (!migrateClocksToBlueprint()) { - return - } + if (!migrateClocksToBlueprint()) return val horizontalPaddingStart = context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start) + context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) @@ -196,9 +188,7 @@ constructor( } override fun removeViews(constraintLayout: ConstraintLayout) { - if (!migrateClocksToBlueprint()) { - return - } + if (!migrateClocksToBlueprint()) return listOf(smartspaceView, dateView, weatherView).forEach { it?.let { if (it.parent == constraintLayout) { @@ -211,6 +201,9 @@ constructor( } private fun updateVisibility(constraintSet: ConstraintSet) { + // This may update the visibility of the smartspace views + smartspaceController.requestSmartspaceUpdate() + constraintSet.apply { setVisibility( sharedR.id.weather_smartspace_view, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt index 756a4cca69d0..3e35ae4b2dc3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeNotificationStackScrollLayoutSection.kt @@ -23,13 +23,11 @@ import androidx.constraintlayout.widget.ConstraintSet.END import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP -import com.android.systemui.Flags.centralizedStatusBarDimensRefactor import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags -import com.android.systemui.shade.LargeScreenHeaderHelper import com.android.systemui.shade.NotificationPanelView import com.android.systemui.statusbar.notification.stack.AmbientState import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController @@ -37,7 +35,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCa import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel -import dagger.Lazy import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher @@ -56,7 +53,6 @@ constructor( notificationStackSizeCalculator: NotificationStackSizeCalculator, private val smartspaceViewModel: KeyguardSmartspaceViewModel, @Main mainDispatcher: CoroutineDispatcher, - private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, ) : NotificationStackScrollLayoutSection( context, @@ -75,16 +71,13 @@ constructor( return } constraintSet.apply { - val splitShadeTopMargin = - if (centralizedStatusBarDimensRefactor()) { - largeScreenHeaderHelperLazy.get().getLargeScreenHeaderHeight() - } else { - context.resources.getDimensionPixelSize( - R.dimen.large_screen_shade_header_height - ) - } - connect(R.id.nssl_placeholder, TOP, PARENT_ID, TOP, splitShadeTopMargin) - + connect( + R.id.nssl_placeholder, + TOP, + PARENT_ID, + TOP, + context.resources.getDimensionPixelSize(R.dimen.keyguard_split_shade_top_margin) + ) connect(R.id.nssl_placeholder, START, PARENT_ID, START) connect(R.id.nssl_placeholder, END, PARENT_ID, END) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt index 99565b104a00..64cbb3229a57 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/ClockSizeTransition.kt @@ -17,128 +17,192 @@ package com.android.systemui.keyguard.ui.view.layout.sections.transitions import android.animation.Animator -import android.animation.ObjectAnimator -import android.transition.ChangeBounds +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.graphics.Rect +import android.transition.Transition import android.transition.TransitionSet import android.transition.TransitionValues -import android.transition.Visibility +import android.util.Log import android.view.View import android.view.ViewGroup +import android.view.ViewTreeObserver.OnPreDrawListener import com.android.app.animation.Interpolators -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel import com.android.systemui.res.R import com.android.systemui.shared.R as sharedR +import kotlin.math.abs -const val CLOCK_OUT_MILLIS = 133L -const val CLOCK_IN_MILLIS = 167L -val CLOCK_IN_INTERPOLATOR = Interpolators.LINEAR_OUT_SLOW_IN -const val CLOCK_IN_START_DELAY_MILLIS = 133L -val CLOCK_OUT_INTERPOLATOR = Interpolators.LINEAR +internal fun View.setRect(rect: Rect) = + this.setLeftTopRightBottom(rect.left, rect.top, rect.right, rect.bottom) class ClockSizeTransition( - val type: IntraBlueprintTransitionType, - clockViewModel: KeyguardClockViewModel + config: IntraBlueprintTransition.Config, + clockViewModel: KeyguardClockViewModel, ) : TransitionSet() { init { ordering = ORDERING_TOGETHER - addTransition(ClockOutTransition(clockViewModel, type)) - addTransition(ClockInTransition(clockViewModel, type)) - addTransition(SmartspaceChangeBounds(clockViewModel, type)) - addTransition(ClockInChangeBounds(clockViewModel, type)) - addTransition(ClockOutChangeBounds(clockViewModel, type)) + if (config.type != Type.SmartspaceVisibility) { + addTransition(ClockFaceOutTransition(config, clockViewModel)) + addTransition(ClockFaceInTransition(config, clockViewModel)) + } + addTransition(SmartspaceMoveTransition(config, clockViewModel)) } - class ClockInTransition(viewModel: KeyguardClockViewModel, type: IntraBlueprintTransitionType) : - Visibility() { - init { - mode = MODE_IN - if (type != IntraBlueprintTransitionType.NoTransition) { - duration = CLOCK_IN_MILLIS - startDelay = CLOCK_IN_START_DELAY_MILLIS - interpolator = Interpolators.LINEAR_OUT_SLOW_IN - } else { - duration = 0 - startDelay = 0 - } + open class VisibilityBoundsTransition() : Transition() { + var captureSmartspace: Boolean = false - addTarget(sharedR.id.bc_smartspace_view) - addTarget(sharedR.id.date_smartspace_view) - addTarget(sharedR.id.weather_smartspace_view) - if (viewModel.useLargeClock) { - viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } - } else { - addTarget(R.id.lockscreen_clock_view) - } + override fun captureEndValues(transition: TransitionValues) = captureValues(transition) + override fun captureStartValues(transition: TransitionValues) = captureValues(transition) + override fun getTransitionProperties(): Array<String> = TRANSITION_PROPERTIES + open fun mutateBounds( + view: View, + fromVis: Int, + toVis: Int, + fromBounds: Rect, + toBounds: Rect, + fromSSBounds: Rect?, + toSSBounds: Rect? + ) {} + + private fun captureValues(transition: TransitionValues) { + val view = transition.view + transition.values[PROP_VISIBILITY] = view.visibility + transition.values[PROP_ALPHA] = view.alpha + transition.values[PROP_BOUNDS] = Rect(view.left, view.top, view.right, view.bottom) + + if (!captureSmartspace) return + val ss = (view.parent as View).findViewById<View>(sharedR.id.bc_smartspace_view) + if (ss == null) return + transition.values[SMARTSPACE_BOUNDS] = Rect(ss.left, ss.top, ss.right, ss.bottom) } - override fun onAppear( - sceneRoot: ViewGroup?, - view: View, + override fun createAnimator( + sceenRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues? - ): Animator { - return ObjectAnimator.ofFloat(view, "alpha", 1f).also { - it.duration = duration - it.startDelay = startDelay - it.interpolator = interpolator - it.addUpdateListener { view.alpha = it.animatedValue as Float } - it.start() + ): Animator? { + if (startValues == null || endValues == null) return null + + val fromView = startValues.view + var fromVis = startValues.values[PROP_VISIBILITY] as Int + var fromIsVis = fromVis == View.VISIBLE + var fromAlpha = startValues.values[PROP_ALPHA] as Float + val fromBounds = startValues.values[PROP_BOUNDS] as Rect + val fromSSBounds = + if (captureSmartspace) startValues.values[SMARTSPACE_BOUNDS] as Rect else null + + val toView = endValues.view + val toVis = endValues.values[PROP_VISIBILITY] as Int + val toBounds = endValues.values[PROP_BOUNDS] as Rect + val toSSBounds = + if (captureSmartspace) endValues.values[SMARTSPACE_BOUNDS] as Rect else null + val toIsVis = toVis == View.VISIBLE + val toAlpha = if (toIsVis) 1f else 0f + + // Align starting visibility and alpha + if (!fromIsVis) fromAlpha = 0f + else if (fromAlpha <= 0f) { + fromIsVis = false + fromVis = View.INVISIBLE } - } - } - class ClockOutTransition( - viewModel: KeyguardClockViewModel, - type: IntraBlueprintTransitionType - ) : Visibility() { - init { - mode = MODE_OUT - if (type != IntraBlueprintTransitionType.NoTransition) { - duration = CLOCK_OUT_MILLIS - interpolator = CLOCK_OUT_INTERPOLATOR - } else { - duration = 0 + mutateBounds(toView, fromVis, toVis, fromBounds, toBounds, fromSSBounds, toSSBounds) + if (fromIsVis == toIsVis && fromBounds.equals(toBounds)) { + if (DEBUG) { + Log.w( + TAG, + "Skipping no-op transition: $toView; " + + "vis: $fromVis -> $toVis; " + + "alpha: $fromAlpha -> $toAlpha; " + + "bounds: $fromBounds -> $toBounds; " + ) + } + return null } - addTarget(sharedR.id.bc_smartspace_view) - addTarget(sharedR.id.date_smartspace_view) - addTarget(sharedR.id.weather_smartspace_view) - if (viewModel.useLargeClock) { - addTarget(R.id.lockscreen_clock_view) - } else { - viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } + val sendToBack = fromIsVis && !toIsVis + fun lerp(start: Int, end: Int, fract: Float): Int = + (start * (1f - fract) + end * fract).toInt() + fun computeBounds(fract: Float): Rect = + Rect( + lerp(fromBounds.left, toBounds.left, fract), + lerp(fromBounds.top, toBounds.top, fract), + lerp(fromBounds.right, toBounds.right, fract), + lerp(fromBounds.bottom, toBounds.bottom, fract) + ) + + fun assignAnimValues(src: String, alpha: Float, fract: Float, vis: Int? = null) { + val bounds = computeBounds(fract) + if (DEBUG) Log.i(TAG, "$src: $toView; alpha=$alpha; vis=$vis; bounds=$bounds;") + toView.setVisibility(vis ?: View.VISIBLE) + toView.setAlpha(alpha) + toView.setRect(bounds) } - } - override fun onDisappear( - sceneRoot: ViewGroup?, - view: View, - startValues: TransitionValues?, - endValues: TransitionValues? - ): Animator { - return ObjectAnimator.ofFloat(view, "alpha", 0f).also { - it.duration = duration - it.interpolator = interpolator - it.addUpdateListener { view.alpha = it.animatedValue as Float } - it.start() + if (DEBUG) { + Log.i( + TAG, + "transitioning: $toView; " + + "vis: $fromVis -> $toVis; " + + "alpha: $fromAlpha -> $toAlpha; " + + "bounds: $fromBounds -> $toBounds; " + ) + } + + return ValueAnimator.ofFloat(fromAlpha, toAlpha).also { anim -> + // We enforce the animation parameters on the target view every frame using a + // predraw listener. This is suboptimal but prevents issues with layout passes + // overwriting the animation for individual frames. + val predrawCallback = OnPreDrawListener { + assignAnimValues("predraw", anim.animatedValue as Float, anim.animatedFraction) + return@OnPreDrawListener true + } + + anim.duration = duration + anim.startDelay = startDelay + anim.interpolator = interpolator + anim.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationStart(anim: Animator) { + assignAnimValues("start", fromAlpha, 0f) + } + + override fun onAnimationEnd(anim: Animator) { + assignAnimValues("end", toAlpha, 1f, toVis) + if (sendToBack) toView.translationZ = 0f + toView.viewTreeObserver.removeOnPreDrawListener(predrawCallback) + } + } + ) + toView.viewTreeObserver.addOnPreDrawListener(predrawCallback) } } + + companion object { + private const val PROP_VISIBILITY = "ClockSizeTransition:Visibility" + private const val PROP_ALPHA = "ClockSizeTransition:Alpha" + private const val PROP_BOUNDS = "ClockSizeTransition:Bounds" + private const val SMARTSPACE_BOUNDS = "ClockSizeTransition:SSBounds" + private val TRANSITION_PROPERTIES = + arrayOf(PROP_VISIBILITY, PROP_ALPHA, PROP_BOUNDS, SMARTSPACE_BOUNDS) + + private val DEBUG = true + private val TAG = ClockFaceInTransition::class.simpleName!! + } } - class ClockInChangeBounds( - viewModel: KeyguardClockViewModel, - type: IntraBlueprintTransitionType - ) : ChangeBounds() { + class ClockFaceInTransition( + config: IntraBlueprintTransition.Config, + val viewModel: KeyguardClockViewModel, + ) : VisibilityBoundsTransition() { init { - if (type != IntraBlueprintTransitionType.NoTransition) { - duration = CLOCK_IN_MILLIS - startDelay = CLOCK_IN_START_DELAY_MILLIS - interpolator = CLOCK_IN_INTERPOLATOR - } else { - duration = 0 - startDelay = 0 - } + duration = CLOCK_IN_MILLIS + startDelay = CLOCK_IN_START_DELAY_MILLIS + interpolator = CLOCK_IN_INTERPOLATOR + captureSmartspace = !viewModel.useLargeClock if (viewModel.useLargeClock) { viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } @@ -146,46 +210,115 @@ class ClockSizeTransition( addTarget(R.id.lockscreen_clock_view) } } - } - class ClockOutChangeBounds( - viewModel: KeyguardClockViewModel, - type: IntraBlueprintTransitionType - ) : ChangeBounds() { - init { - if (type != IntraBlueprintTransitionType.NoTransition) { - duration = CLOCK_OUT_MILLIS - interpolator = CLOCK_OUT_INTERPOLATOR + override fun mutateBounds( + view: View, + fromVis: Int, + toVis: Int, + fromBounds: Rect, + toBounds: Rect, + fromSSBounds: Rect?, + toSSBounds: Rect? + ) { + fromBounds.left = toBounds.left + fromBounds.right = toBounds.right + if (viewModel.useLargeClock) { + // Large clock shouldn't move + fromBounds.top = toBounds.top + fromBounds.bottom = toBounds.bottom + } else if (toSSBounds != null && fromSSBounds != null) { + // Instead of moving the small clock the full distance, we compute the distance + // smartspace will move. We then scale this to match the duration of this animation + // so that the small clock moves at the same speed as smartspace. + val ssTranslation = + abs((toSSBounds.top - fromSSBounds.top) * SMALL_CLOCK_IN_MOVE_SCALE).toInt() + fromBounds.top = toBounds.top - ssTranslation + fromBounds.bottom = toBounds.bottom - ssTranslation } else { - duration = 0 + Log.e(TAG, "mutateBounds: smallClock received no smartspace bounds") } + } + + companion object { + const val CLOCK_IN_MILLIS = 167L + const val CLOCK_IN_START_DELAY_MILLIS = 133L + val CLOCK_IN_INTERPOLATOR = Interpolators.LINEAR_OUT_SLOW_IN + const val SMALL_CLOCK_IN_MOVE_SCALE = + CLOCK_IN_MILLIS / SmartspaceMoveTransition.STATUS_AREA_MOVE_DOWN_MILLIS.toFloat() + private val TAG = ClockFaceInTransition::class.simpleName!! + } + } + + class ClockFaceOutTransition( + config: IntraBlueprintTransition.Config, + val viewModel: KeyguardClockViewModel, + ) : VisibilityBoundsTransition() { + init { + duration = CLOCK_OUT_MILLIS + interpolator = CLOCK_OUT_INTERPOLATOR + captureSmartspace = viewModel.useLargeClock + if (viewModel.useLargeClock) { addTarget(R.id.lockscreen_clock_view) } else { viewModel.clock?.let { it.largeClock.layout.views.forEach { addTarget(it) } } } } + + override fun mutateBounds( + view: View, + fromVis: Int, + toVis: Int, + fromBounds: Rect, + toBounds: Rect, + fromSSBounds: Rect?, + toSSBounds: Rect? + ) { + toBounds.left = fromBounds.left + toBounds.right = fromBounds.right + if (!viewModel.useLargeClock) { + // Large clock shouldn't move + toBounds.top = fromBounds.top + toBounds.bottom = fromBounds.bottom + } else if (toSSBounds != null && fromSSBounds != null) { + // Instead of moving the small clock the full distance, we compute the distance + // smartspace will move. We then scale this to match the duration of this animation + // so that the small clock moves at the same speed as smartspace. + val ssTranslation = + abs((toSSBounds.top - fromSSBounds.top) * SMALL_CLOCK_OUT_MOVE_SCALE).toInt() + toBounds.top = fromBounds.top - ssTranslation + toBounds.bottom = fromBounds.bottom - ssTranslation + } else { + Log.w(TAG, "mutateBounds: smallClock received no smartspace bounds") + } + } + + companion object { + const val CLOCK_OUT_MILLIS = 133L + val CLOCK_OUT_INTERPOLATOR = Interpolators.LINEAR + const val SMALL_CLOCK_OUT_MOVE_SCALE = + CLOCK_OUT_MILLIS / SmartspaceMoveTransition.STATUS_AREA_MOVE_UP_MILLIS.toFloat() + private val TAG = ClockFaceOutTransition::class.simpleName!! + } } - class SmartspaceChangeBounds( + // TODO: Might need a mechanism to update this one while in-progress + class SmartspaceMoveTransition( + val config: IntraBlueprintTransition.Config, viewModel: KeyguardClockViewModel, - val type: IntraBlueprintTransitionType = IntraBlueprintTransitionType.DefaultTransition - ) : ChangeBounds() { + ) : VisibilityBoundsTransition() { init { - if (type != IntraBlueprintTransitionType.NoTransition) { - duration = - if (viewModel.useLargeClock) { - STATUS_AREA_MOVE_UP_MILLIS - } else { - STATUS_AREA_MOVE_DOWN_MILLIS - } - interpolator = Interpolators.EMPHASIZED - } else { - duration = 0 - } + duration = + if (viewModel.useLargeClock) STATUS_AREA_MOVE_UP_MILLIS + else STATUS_AREA_MOVE_DOWN_MILLIS + interpolator = Interpolators.EMPHASIZED addTarget(sharedR.id.date_smartspace_view) addTarget(sharedR.id.weather_smartspace_view) addTarget(sharedR.id.bc_smartspace_view) + + // Notifications normally and media on split shade needs to be moved + addTarget(R.id.aod_notification_icon_container) + addTarget(R.id.status_view_media_container) } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/DefaultClockSteppingTransition.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/DefaultClockSteppingTransition.kt index c35dad71a584..60ab40c0a16b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/DefaultClockSteppingTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/transitions/DefaultClockSteppingTransition.kt @@ -24,12 +24,15 @@ import android.view.ViewGroup import com.android.app.animation.Interpolators import com.android.systemui.plugins.clocks.ClockController -class DefaultClockSteppingTransition(private val clock: ClockController) : Transition() { +class DefaultClockSteppingTransition( + private val clock: ClockController, +) : Transition() { init { interpolator = Interpolators.LINEAR duration = KEYGUARD_STATUS_VIEW_CUSTOM_CLOCK_MOVE_DURATION_MS addTarget(clock.largeClock.view) } + private fun captureValues(transitionValues: TransitionValues) { transitionValues.values[PROP_BOUNDS_LEFT] = transitionValues.view.left val locationInWindowTmp = IntArray(2) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerDependencies.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerDependencies.kt index 6846886875c9..065c20ac52e8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerDependencies.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerDependencies.kt @@ -36,4 +36,5 @@ constructor( val udfpsIconViewModel: AlternateBouncerUdfpsIconViewModel, val udfpsAccessibilityOverlayViewModel: Lazy<AlternateBouncerUdfpsAccessibilityOverlayViewModel>, + val messageAreaViewModel: AlternateBouncerMessageAreaViewModel, ) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerMessageAreaViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerMessageAreaViewModel.kt new file mode 100644 index 000000000000..49c64bdcdd23 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerMessageAreaViewModel.kt @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.viewmodel + +import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor +import com.android.systemui.deviceentry.domain.interactor.BiometricMessageInteractor +import com.android.systemui.deviceentry.shared.model.BiometricMessage +import com.android.systemui.deviceentry.shared.model.FaceMessage +import com.android.systemui.deviceentry.shared.model.FaceTimeoutMessage +import com.android.systemui.deviceentry.shared.model.FingerprintLockoutMessage +import com.android.systemui.deviceentry.shared.model.FingerprintMessage +import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.filterNot +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.merge + +/** View model for the alternate bouncer message area. */ +@ExperimentalCoroutinesApi +class AlternateBouncerMessageAreaViewModel +@Inject +constructor( + biometricMessageInteractor: BiometricMessageInteractor, + alternateBouncerInteractor: AlternateBouncerInteractor, +) { + + private val faceHelp: Flow<FaceMessage> = + biometricMessageInteractor.faceMessage.filterNot { faceMessage -> + faceMessage !is FaceTimeoutMessage + } + private val fingerprintMessages: Flow<FingerprintMessage> = + biometricMessageInteractor.fingerprintMessage.filterNot { fingerprintMessage -> + // On lockout, the device will show the bouncer. Let's not show the message + // before the transition or else it'll look flickery. + fingerprintMessage is FingerprintLockoutMessage + } + + val message: Flow<BiometricMessage?> = + alternateBouncerInteractor.isVisible.flatMapLatest { isVisible -> + if (isVisible) { + merge( + faceHelp, + fingerprintMessages, + ) + } else { + flowOf(null) + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt index a3d54532411c..c9cf0c31a8fd 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryIconViewModel.kt @@ -34,9 +34,11 @@ import com.android.systemui.util.kotlin.sample import dagger.Lazy import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge @@ -175,19 +177,33 @@ constructor( flowOf(BurnInOffsets(x = 0, y = 0, progress = 0f)) } } + + private val isUnlocked: Flow<Boolean> = + deviceEntryInteractor.isUnlocked.flatMapLatest { isUnlocked -> + if (!isUnlocked) { + flowOf(false) + } else { + flow { + // delay in case device ends up transitioning away from the lock screen; + // we don't want to animate to the unlocked icon and just let the + // icon fade with the transition to GONE + delay(UNLOCKED_DELAY_MS) + emit(true) + } + } + } + val iconType: Flow<DeviceEntryIconView.IconType> = combine( deviceEntryUdfpsInteractor.isListeningForUdfps, - deviceEntryInteractor.isUnlocked, + keyguardInteractor.isKeyguardDismissible, ) { isListeningForUdfps, isUnlocked -> - if (isUnlocked) { + if (isListeningForUdfps) { + DeviceEntryIconView.IconType.FINGERPRINT + } else if (isUnlocked) { DeviceEntryIconView.IconType.UNLOCK } else { - if (isListeningForUdfps) { - DeviceEntryIconView.IconType.FINGERPRINT - } else { - DeviceEntryIconView.IconType.LOCK - } + DeviceEntryIconView.IconType.LOCK } } val isLongPressEnabled: Flow<Boolean> = @@ -229,6 +245,10 @@ constructor( DeviceEntryIconView.AccessibilityHintType.NONE } } + + companion object { + const val UNLOCKED_DELAY_MS = 50L + } } data class BurnInOffsets( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBlueprintViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBlueprintViewModel.kt index d22856b1bec2..edd331882896 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBlueprintViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBlueprintViewModel.kt @@ -23,8 +23,10 @@ import javax.inject.Inject class KeyguardBlueprintViewModel @Inject -constructor(keyguardBlueprintInteractor: KeyguardBlueprintInteractor) { +constructor( + keyguardBlueprintInteractor: KeyguardBlueprintInteractor, +) { var currentBluePrint: KeyguardBlueprint? = null val blueprint = keyguardBlueprintInteractor.blueprint - val blueprintWithTransition = keyguardBlueprintInteractor.blueprintWithTransition + val refreshTransition = keyguardBlueprintInteractor.refreshTransition } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt index ec13228c6216..83be65181bea 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt @@ -60,18 +60,21 @@ constructor( private val deviceEntryInteractor: DeviceEntryInteractor, private val dozeParameters: DozeParameters, private val keyguardInteractor: KeyguardInteractor, - communalInteractor: CommunalInteractor, + private val communalInteractor: CommunalInteractor, keyguardTransitionInteractor: KeyguardTransitionInteractor, private val notificationsKeyguardInteractor: NotificationsKeyguardInteractor, - aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel, - lockscreenToGoneTransitionViewModel: LockscreenToGoneTransitionViewModel, - alternateBouncerToGoneTransitionViewModel: AlternateBouncerToGoneTransitionViewModel, - primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel, - lockscreenToGlanceableHubTransitionViewModel: LockscreenToGlanceableHubTransitionViewModel, - glanceableHubToLockscreenTransitionViewModel: GlanceableHubToLockscreenTransitionViewModel, - screenOffAnimationController: ScreenOffAnimationController, + private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel, + private val lockscreenToGoneTransitionViewModel: LockscreenToGoneTransitionViewModel, + private val alternateBouncerToGoneTransitionViewModel: + AlternateBouncerToGoneTransitionViewModel, + private val primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel, + private val lockscreenToGlanceableHubTransitionViewModel: + LockscreenToGlanceableHubTransitionViewModel, + private val glanceableHubToLockscreenTransitionViewModel: + GlanceableHubToLockscreenTransitionViewModel, + private val screenOffAnimationController: ScreenOffAnimationController, private val aodBurnInViewModel: AodBurnInViewModel, - aodAlphaViewModel: AodAlphaViewModel, + private val aodAlphaViewModel: AodAlphaViewModel, ) { val burnInLayerVisibility: Flow<Int> = @@ -101,8 +104,8 @@ constructor( val topClippingBounds: Flow<Int?> = keyguardInteractor.topClippingBounds /** An observable for the alpha level for the entire keyguard root view. */ - val alpha: Flow<Float> = - combine( + fun alpha(viewState: ViewStateAccessor): Flow<Float> { + return combine( communalInteractor.isIdleOnCommunal, // The transitions are mutually exclusive, so they are safe to merge to get the last // value emitted by any of them. Do not add flows that cannot make this guarantee. @@ -110,7 +113,7 @@ constructor( aodAlphaViewModel.alpha, lockscreenToGlanceableHubTransitionViewModel.keyguardAlpha, glanceableHubToLockscreenTransitionViewModel.keyguardAlpha, - lockscreenToGoneTransitionViewModel.lockscreenAlpha, + lockscreenToGoneTransitionViewModel.lockscreenAlpha(viewState), primaryBouncerToGoneTransitionViewModel.lockscreenAlpha, alternateBouncerToGoneTransitionViewModel.lockscreenAlpha, ) @@ -125,6 +128,7 @@ constructor( } } .distinctUntilChanged() + } /** Specific alpha value for elements visible during [KeyguardState.LOCKSCREEN] */ val lockscreenStateAlpha: Flow<Float> = aodToLockscreenTransitionViewModel.lockscreenAlpha diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModel.kt index d981650adf60..15459f4af9a4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModel.kt @@ -16,10 +16,12 @@ package com.android.systemui.keyguard.ui.viewmodel +import android.util.MathUtils import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.domain.interactor.FromLockscreenTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow +import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow.FlowBuilder import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds @@ -37,7 +39,7 @@ constructor( animationFlow: KeyguardTransitionAnimationFlow, ) : DeviceEntryIconTransition { - private val transitionAnimation = + private val transitionAnimation: FlowBuilder = animationFlow.setup( duration = FromLockscreenTransitionInteractor.TO_GONE_DURATION, from = KeyguardState.LOCKSCREEN, @@ -52,7 +54,26 @@ constructor( onCancel = { 1f }, ) - val lockscreenAlpha: Flow<Float> = shortcutsAlpha + fun lockscreenAlpha(viewState: ViewStateAccessor): Flow<Float> { + var startAlpha: Float? = null + return transitionAnimation.sharedFlow( + duration = 200.milliseconds, + onStep = { + if (startAlpha == null) { + startAlpha = viewState.alpha() + } + MathUtils.lerp(startAlpha!!, 0f, it) + }, + onFinish = { + startAlpha = null + 0f + }, + onCancel = { + startAlpha = null + 1f + }, + ) + } override val deviceEntryParentViewAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(0f) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludingAppDeviceEntryMessageViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludingAppDeviceEntryMessageViewModel.kt index 3a162d7f14a6..846bcbfd38d9 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludingAppDeviceEntryMessageViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludingAppDeviceEntryMessageViewModel.kt @@ -18,8 +18,8 @@ package com.android.systemui.keyguard.ui.viewmodel import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.keyguard.domain.interactor.BiometricMessage -import com.android.systemui.keyguard.domain.interactor.OccludingAppDeviceEntryInteractor +import com.android.systemui.deviceentry.domain.interactor.OccludingAppDeviceEntryInteractor +import com.android.systemui.deviceentry.shared.model.BiometricMessage import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt index 67c42f0fe343..00e5d35354b1 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/SideFpsProgressBarViewModel.kt @@ -67,8 +67,8 @@ class SideFpsProgressBarViewModel @Inject constructor( private val context: Context, - private val biometricStatusInteractor: BiometricStatusInteractor, - private val deviceEntryFingerprintAuthInteractor: DeviceEntryFingerprintAuthInteractor, + biometricStatusInteractor: BiometricStatusInteractor, + deviceEntryFingerprintAuthInteractor: DeviceEntryFingerprintAuthInteractor, private val sfpsSensorInteractor: SideFpsSensorInteractor, // todo (b/317432075) Injecting DozeServiceHost directly instead of using it through // DozeInteractor as DozeServiceHost already depends on DozeInteractor. @@ -89,9 +89,6 @@ constructor( _progress.value = 0.0f } - private val additionalSensorLengthPadding = - context.resources.getDimension(R.dimen.sfps_progress_bar_length_extra_padding).toInt() - // Merged [FingerprintAuthenticationStatus] from BiometricPrompt acquired messages and // device entry authentication messages private val mergedFingerprintAuthenticationStatus = @@ -114,9 +111,7 @@ constructor( val progress: Flow<Float> = _progress.asStateFlow() val progressBarLength: Flow<Int> = - sfpsSensorInteractor.sensorLocation - .map { it.length + additionalSensorLengthPadding } - .distinctUntilChanged() + sfpsSensorInteractor.sensorLocation.map { it.length }.distinctUntilChanged() val progressBarThickness = context.resources.getDimension(R.dimen.sfps_progress_bar_thickness).toInt() @@ -128,7 +123,6 @@ constructor( context.resources .getDimension(R.dimen.sfps_progress_bar_padding_from_edge) .toInt() - val lengthOfTheProgressBar = sensorLocation.length + additionalSensorLengthPadding val viewLeftTop = Point(sensorLocation.left, sensorLocation.top) val totalDistanceFromTheEdge = paddingFromEdge + progressBarThickness @@ -139,7 +133,7 @@ constructor( // Sensor is vertical to the current orientation, we rotate it 270 deg // around the (left,top) point as the pivot. We need to push it down the // length of the progress bar so that it is still aligned to the sensor - viewLeftTop.y += lengthOfTheProgressBar + viewLeftTop.y += sensorLocation.length val isSensorOnTheNearEdge = rotation == DisplayRotation.ROTATION_180 || rotation == DisplayRotation.ROTATION_90 @@ -164,7 +158,6 @@ constructor( // We want to push it up from the bottom edge by the padding and // the thickness of the progressbar. viewLeftTop.y -= totalDistanceFromTheEdge - viewLeftTop.x -= additionalSensorLengthPadding } } viewLeftTop diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/ViewStateAccessor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/ViewStateAccessor.kt new file mode 100644 index 000000000000..cb5db8632a3e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/ViewStateAccessor.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.viewmodel + +/** View-level state information to be shared between ui and viewmodel. */ +data class ViewStateAccessor( + val alpha: () -> Float = { 0f }, + val translationY: () -> Int = { 0 }, + val translationX: () -> Int = { 0 }, +) diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt index 40a9b9c699bc..13d743f8a4e4 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/player/SeekBarViewModel.kt @@ -141,6 +141,7 @@ constructor( if (field != value) { field = value checkIfPollingNeeded() + _data = _data.copy(listening = value) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractor.kt new file mode 100644 index 000000000000..dcae088fecf7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractor.kt @@ -0,0 +1,61 @@ +/* + * 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.qs.tiles.dialog.bluetooth + +import android.util.Log +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map + +/** Interactor class responsible for interacting with the Bluetooth Auto-On feature. */ +@SysUISingleton +class BluetoothAutoOnInteractor +@Inject +constructor( + private val bluetoothAutoOnRepository: BluetoothAutoOnRepository, +) { + + val isEnabled = bluetoothAutoOnRepository.getValue.map { it == ENABLED }.distinctUntilChanged() + + /** + * Checks if the auto on value is present in the repository. + * + * @return `true` if a value is present (i.e, the feature is enabled by the Bluetooth server). + */ + suspend fun isValuePresent(): Boolean = bluetoothAutoOnRepository.isValuePresent() + + /** + * Sets enabled or disabled based on the provided value. + * + * @param value `true` to enable the feature, `false` to disable it. + */ + suspend fun setEnabled(value: Boolean) { + if (!isValuePresent()) { + Log.e(TAG, "Trying to set toggle value while feature not available.") + } else { + val newValue = if (value) ENABLED else DISABLED + bluetoothAutoOnRepository.setValue(newValue) + } + } + + companion object { + private const val TAG = "BluetoothAutoOnInteractor" + const val DISABLED = 0 + const val ENABLED = 1 + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepository.kt new file mode 100644 index 000000000000..e17b4d3f376b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepository.kt @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.dialog.bluetooth + +import android.os.UserHandle +import android.util.Log +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.user.data.repository.UserRepository +import com.android.systemui.util.settings.SecureSettings +import com.android.systemui.util.settings.SettingsProxyExt.observerFlow +import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.withContext + +/** Repository class responsible for managing the Bluetooth Auto-On feature settings. */ +// TODO(b/316822488): Handle multi-user +@SysUISingleton +class BluetoothAutoOnRepository +@Inject +constructor( + private val secureSettings: SecureSettings, + private val userRepository: UserRepository, + @Application private val coroutineScope: CoroutineScope, + @Background private val backgroundDispatcher: CoroutineDispatcher, +) { + // Flow representing the auto on setting value + internal val getValue: Flow<Int> = + secureSettings + .observerFlow(UserHandle.USER_SYSTEM, SETTING_NAME) + .onStart { emit(Unit) } + .map { + if (userRepository.getSelectedUserInfo().id != UserHandle.USER_SYSTEM) { + Log.i(TAG, "Current user is not USER_SYSTEM. Multi-user is not supported") + return@map UNSET + } + secureSettings.getIntForUser(SETTING_NAME, UNSET, UserHandle.USER_SYSTEM) + } + .distinctUntilChanged() + .flowOn(backgroundDispatcher) + .shareIn(coroutineScope, SharingStarted.WhileSubscribed(replayExpirationMillis = 0)) + + /** + * Checks if the auto on setting value is ever set for the current user. + * + * @return `true` if the setting value is not UNSET, `false` otherwise. + */ + suspend fun isValuePresent(): Boolean = + withContext(backgroundDispatcher) { + if (userRepository.getSelectedUserInfo().id != UserHandle.USER_SYSTEM) { + Log.i(TAG, "Current user is not USER_SYSTEM. Multi-user is not supported") + false + } else { + secureSettings.getIntForUser(SETTING_NAME, UNSET, UserHandle.USER_SYSTEM) != UNSET + } + } + + /** + * Sets the Bluetooth Auto-On setting value for the current user. + * + * @param value The new setting value to be applied. + */ + suspend fun setValue(value: Int) { + withContext(backgroundDispatcher) { + if (userRepository.getSelectedUserInfo().id != UserHandle.USER_SYSTEM) { + Log.i(TAG, "Current user is not USER_SYSTEM. Multi-user is not supported") + } else { + secureSettings.putIntForUser(SETTING_NAME, value, UserHandle.USER_SYSTEM) + } + } + } + + companion object { + private const val TAG = "BluetoothAutoOnRepository" + const val SETTING_NAME = "bluetooth_automatic_turn_on" + const val UNSET = -1 + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialog.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialog.kt index 1a06c38803af..6b53c7ac0a14 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialog.kt @@ -56,7 +56,7 @@ import kotlinx.coroutines.withContext internal class BluetoothTileDialog constructor( private val bluetoothToggleInitialValue: Boolean, - private val subtitleResIdInitialValue: Int, + private val initialUiProperties: BluetoothTileDialogViewModel.UiProperties, private val cachedContentHeight: Int, private val bluetoothTileDialogCallback: BluetoothTileDialogCallback, @Main private val mainDispatcher: CoroutineDispatcher, @@ -71,6 +71,10 @@ constructor( internal val bluetoothStateToggle get() = mutableBluetoothStateToggle.asStateFlow() + private val mutableBluetoothAutoOnToggle: MutableStateFlow<Boolean?> = MutableStateFlow(null) + internal val bluetoothAutoOnToggle + get() = mutableBluetoothAutoOnToggle.asStateFlow() + private val mutableDeviceItemClick: MutableSharedFlow<DeviceItem> = MutableSharedFlow(extraBufferCapacity = 1) internal val deviceItemClick @@ -89,6 +93,8 @@ constructor( private lateinit var toggleView: Switch private lateinit var subtitleTextView: TextView + private lateinit var autoOnToggle: Switch + private lateinit var autoOnToggleView: View private lateinit var doneButton: View private lateinit var seeAllButton: View private lateinit var pairNewDeviceButton: View @@ -108,6 +114,8 @@ constructor( toggleView = requireViewById(R.id.bluetooth_toggle) subtitleTextView = requireViewById(R.id.bluetooth_tile_dialog_subtitle) as TextView + autoOnToggle = requireViewById(R.id.bluetooth_auto_on_toggle) + autoOnToggleView = requireViewById(R.id.bluetooth_auto_on_toggle_layout) doneButton = requireViewById(R.id.done_button) seeAllButton = requireViewById(R.id.see_all_button) pairNewDeviceButton = requireViewById(R.id.pair_new_device_button) @@ -116,7 +124,7 @@ constructor( setupToggle() setupRecyclerView() - subtitleTextView.text = context.getString(subtitleResIdInitialValue) + subtitleTextView.text = context.getString(initialUiProperties.subTitleResId) doneButton.setOnClickListener { dismiss() } seeAllButton.setOnClickListener { bluetoothTileDialogCallback.onSeeAllClicked(it) } pairNewDeviceButton.setOnClickListener { @@ -124,7 +132,9 @@ constructor( } requireViewById<View>(R.id.scroll_view).apply { scrollViewContent = this - layoutParams.height = cachedContentHeight + minimumHeight = + resources.getDimensionPixelSize(initialUiProperties.scrollViewMinHeightResId) + layoutParams.height = maxOf(cachedContentHeight, minimumHeight) } progressBarAnimation = requireViewById(R.id.bluetooth_tile_dialog_progress_animation) progressBarBackground = requireViewById(R.id.bluetooth_tile_dialog_progress_background) @@ -178,13 +188,27 @@ constructor( } } - internal fun onBluetoothStateUpdated(isEnabled: Boolean, subtitleResId: Int) { + internal fun onBluetoothStateUpdated( + isEnabled: Boolean, + uiProperties: BluetoothTileDialogViewModel.UiProperties + ) { toggleView.apply { isChecked = isEnabled setEnabled(true) alpha = ENABLED_ALPHA } - subtitleTextView.text = context.getString(subtitleResId) + subtitleTextView.text = context.getString(uiProperties.subTitleResId) + autoOnToggleView.visibility = uiProperties.autoOnToggleVisibility + } + + internal fun onBluetoothAutoOnUpdated(isEnabled: Boolean) { + if (::autoOnToggle.isInitialized) { + autoOnToggle.apply { + isChecked = isEnabled + setEnabled(true) + alpha = ENABLED_ALPHA + } + } } private fun setupToggle() { @@ -198,6 +222,16 @@ constructor( logger.logBluetoothState(BluetoothStateStage.USER_TOGGLED, isChecked.toString()) uiEventLogger.log(BluetoothTileDialogUiEvent.BLUETOOTH_TOGGLE_CLICKED) } + + autoOnToggleView.visibility = initialUiProperties.autoOnToggleVisibility + autoOnToggle.setOnCheckedChangeListener { view, isChecked -> + mutableBluetoothAutoOnToggle.value = isChecked + view.apply { + isEnabled = false + alpha = DISABLED_ALPHA + } + uiEventLogger.log(BluetoothTileDialogUiEvent.BLUETOOTH_AUTO_ON_TOGGLE_CLICKED) + } } private fun setupRecyclerView() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogUiEvent.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogUiEvent.kt index 86e5ddef87e7..cd52e0dcca4a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogUiEvent.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogUiEvent.kt @@ -31,7 +31,8 @@ enum class BluetoothTileDialogUiEvent(val metricId: Int) : UiEventLogger.UiEvent @UiEvent(doc = "Saved clicked to connect") SAVED_DEVICE_CONNECT(1500), @UiEvent(doc = "Active device clicked to disconnect") ACTIVE_DEVICE_DISCONNECT(1507), @UiEvent(doc = "Connected other device clicked to disconnect") - CONNECTED_OTHER_DEVICE_DISCONNECT(1508); + CONNECTED_OTHER_DEVICE_DISCONNECT(1508), + @UiEvent(doc = "The auto on toggle is clicked") BLUETOOTH_AUTO_ON_TOGGLE_CLICKED(1617); override fun getId() = metricId } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt index 54bb95cafca6..5a14e5f11d38 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt @@ -21,9 +21,15 @@ import android.content.Intent import android.content.SharedPreferences import android.os.Bundle import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE import android.view.ViewGroup +import androidx.annotation.DimenRes +import androidx.annotation.StringRes +import androidx.annotation.VisibleForTesting import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger +import com.android.settingslib.flags.Flags.bluetoothQsTileDialogAutoOnToggle import com.android.systemui.Prefs import com.android.systemui.animation.DialogCuj import com.android.systemui.animation.DialogTransitionAnimator @@ -58,6 +64,7 @@ internal class BluetoothTileDialogViewModel constructor( private val deviceItemInteractor: DeviceItemInteractor, private val bluetoothStateInteractor: BluetoothStateInteractor, + private val bluetoothAutoOnInteractor: BluetoothAutoOnInteractor, private val dialogTransitionAnimator: DialogTransitionAnimator, private val activityStarter: ActivityStarter, private val systemClock: SystemClock, @@ -143,7 +150,10 @@ constructor( bluetoothStateInteractor.bluetoothStateUpdate .filterNotNull() .onEach { - dialog.onBluetoothStateUpdated(it, getSubtitleResId(it)) + dialog.onBluetoothStateUpdated( + it, + UiProperties.build(it, isAutoOnToggleFeatureAvailable()) + ) updateDeviceItemJob?.cancel() updateDeviceItemJob = launch { deviceItemInteractor.updateDeviceItems( @@ -177,6 +187,21 @@ constructor( } .launchIn(this) + if (isAutoOnToggleFeatureAvailable()) { + // bluetoothAutoOnUpdate is emitted when bluetooth auto on on/off state is + // changed. + bluetoothAutoOnInteractor.isEnabled + .onEach { dialog.onBluetoothAutoOnUpdated(it) } + .launchIn(this) + + // bluetoothAutoOnToggle is emitted when user toggles the bluetooth auto on + // switch, send the new value to the bluetoothAutoOnInteractor. + dialog.bluetoothAutoOnToggle + .filterNotNull() + .onEach { bluetoothAutoOnInteractor.setEnabled(it) } + .launchIn(this) + } + produce<Unit> { awaitClose { dialog.cancel() } } } } @@ -192,7 +217,10 @@ constructor( return BluetoothTileDialog( bluetoothStateInteractor.isBluetoothEnabled, - getSubtitleResId(bluetoothStateInteractor.isBluetoothEnabled), + UiProperties.build( + bluetoothStateInteractor.isBluetoothEnabled, + isAutoOnToggleFeatureAvailable() + ), cachedContentHeight, this@BluetoothTileDialogViewModel, mainDispatcher, @@ -244,6 +272,10 @@ constructor( } } + @VisibleForTesting + internal suspend fun isAutoOnToggleFeatureAvailable() = + bluetoothQsTileDialogAutoOnToggle() && bluetoothAutoOnInteractor.isValuePresent() + companion object { private const val INTERACTION_JANK_TAG = "bluetooth_tile_dialog" private const val CONTENT_HEIGHT_PREF_KEY = Prefs.Key.BLUETOOTH_TILE_DIALOG_CONTENT_HEIGHT @@ -251,6 +283,29 @@ constructor( if (isBluetoothEnabled) R.string.quick_settings_bluetooth_tile_subtitle else R.string.bt_is_off } + + internal data class UiProperties( + @StringRes val subTitleResId: Int, + val autoOnToggleVisibility: Int, + @DimenRes val scrollViewMinHeightResId: Int, + ) { + companion object { + internal fun build( + isBluetoothEnabled: Boolean, + isAutoOnToggleFeatureAvailable: Boolean + ) = + UiProperties( + subTitleResId = getSubtitleResId(isBluetoothEnabled), + autoOnToggleVisibility = + if (isAutoOnToggleFeatureAvailable && !isBluetoothEnabled) VISIBLE + else GONE, + scrollViewMinHeightResId = + if (isAutoOnToggleFeatureAvailable) + R.dimen.bluetooth_dialog_scroll_view_min_height_with_auto_on + else R.dimen.bluetooth_dialog_scroll_view_min_height + ) + } + } } internal interface BluetoothTileDialogCallback { diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt index 8a900ece2750..17454a97f5d2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt @@ -23,8 +23,8 @@ import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction +import com.android.systemui.scene.shared.model.UserActionResult import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel import java.util.concurrent.atomic.AtomicBoolean @@ -45,11 +45,13 @@ constructor( val destinationScenes = qsSceneAdapter.isCustomizing.map { customizing -> if (customizing) { - mapOf<UserAction, SceneModel>(UserAction.Back to SceneModel(SceneKey.QuickSettings)) + mapOf<UserAction, UserActionResult>( + UserAction.Back to UserActionResult(SceneKey.QuickSettings) + ) } else { mapOf( - UserAction.Back to SceneModel(SceneKey.Shade), - UserAction.Swipe(Direction.UP) to SceneModel(SceneKey.Shade), + UserAction.Back to UserActionResult(SceneKey.Shade), + UserAction.Swipe(Direction.UP) to UserActionResult(SceneKey.Shade), ) } } diff --git a/packages/SystemUI/src/com/android/systemui/scene/data/repository/SceneContainerRepository.kt b/packages/SystemUI/src/com/android/systemui/scene/data/repository/SceneContainerRepository.kt index 350fa38f2052..a3021946713f 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/data/repository/SceneContainerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/data/repository/SceneContainerRepository.kt @@ -21,8 +21,9 @@ package com.android.systemui.scene.data.repository import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneContainerConfig +import com.android.systemui.scene.shared.model.SceneDataSource import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.TransitionKey import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -41,9 +42,9 @@ class SceneContainerRepository constructor( @Application applicationScope: CoroutineScope, private val config: SceneContainerConfig, + private val dataSource: SceneDataSource, ) { - private val _desiredScene = MutableStateFlow(SceneModel(config.initialSceneKey)) - val desiredScene: StateFlow<SceneModel> = _desiredScene.asStateFlow() + val currentScene: StateFlow<SceneKey> = dataSource.currentScene private val _isVisible = MutableStateFlow(true) val isVisible: StateFlow<Boolean> = _isVisible.asStateFlow() @@ -69,16 +70,22 @@ constructor( return config.sceneKeys } - fun setDesiredScene(scene: SceneModel) { - check(allSceneKeys().contains(scene.key)) { + fun changeScene( + toScene: SceneKey, + transitionKey: TransitionKey? = null, + ) { + check(allSceneKeys().contains(toScene)) { """ - Cannot set the desired scene key to "${scene.key}". The configuration does not + Cannot set the desired scene key to "$toScene". The configuration does not contain a scene with that key. """ .trimIndent() } - _desiredScene.value = scene + dataSource.changeScene( + toScene = toScene, + transitionKey = transitionKey, + ) } /** Sets whether the container is visible. */ diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt index b9e9fe7684e9..494c86c7b8c8 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt @@ -24,7 +24,8 @@ import com.android.systemui.scene.data.repository.SceneContainerRepository import com.android.systemui.scene.shared.logger.SceneLogger import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.TransitionKey +import com.android.systemui.util.kotlin.pairwiseBy import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -55,34 +56,25 @@ constructor( ) { /** - * The currently *desired* scene. + * The current scene. * - * **Important:** this value will _commonly be different_ from what is being rendered in the UI, - * by design. - * - * There are two intended sources for this value: - * 1. Programmatic requests to transition to another scene (calls to [changeScene]). - * 2. Reports from the UI about completing a transition to another scene (calls to - * [onSceneChanged]). - * - * Both the sources above cause the value of this flow to change; however, they cause mismatches - * in different ways. - * - * **Updates from programmatic transitions** - * - * When an external bit of code asks the framework to switch to another scene, the value here - * will update immediately. Downstream, the UI will detect this change and initiate the - * transition animation. As the transition animation progresses, a threshold will be reached, at - * which point the UI and the state here will match each other. - * - * **Updates from the UI** - * - * When the user interacts with the UI, the UI runs a transition animation that tracks the user - * pointer (for example, the user's finger). During this time, the state value here and what the - * UI shows will likely not match. Once/if a threshold is met, the UI reports it and commits the - * change, making the value here match the UI again. + * Note that during a transition between scenes, more than one scene might be rendered but only + * one is considered the committed/current scene. */ - val desiredScene: StateFlow<SceneModel> = repository.desiredScene + val currentScene: StateFlow<SceneKey> = + repository.currentScene + .pairwiseBy(initialValue = repository.currentScene.value) { from, to -> + logger.logSceneChangeCommitted( + from = from, + to = to, + ) + to + } + .stateIn( + scope = applicationScope, + started = SharingStarted.WhileSubscribed(), + initialValue = repository.currentScene.value, + ) /** * The current state of the transition. @@ -146,14 +138,32 @@ constructor( /** * Requests a scene change to the given scene. * - * The change is animated. Therefore, while the value in [desiredScene] will update immediately, - * it will be some time before the UI will switch to the desired scene. The scene change - * requested is remembered here but served by the UI layer, which will start a transition - * animation. Once enough of the transition has occurred, the system will come into agreement - * between the [desiredScene] and the UI. + * The change is animated. Therefore, it will be some time before the UI will switch to the + * desired scene. Once enough of the transition has occurred, the [currentScene] will become + * [toScene] (unless the transition is canceled by user action or another call to this method). */ - fun changeScene(scene: SceneModel, loggingReason: String) { - updateDesiredScene(scene, loggingReason, logger::logSceneChangeRequested) + fun changeScene( + toScene: SceneKey, + loggingReason: String, + transitionKey: TransitionKey? = null, + ) { + check(toScene != SceneKey.Gone || deviceUnlockedInteractor.isDeviceUnlocked.value) { + "Cannot change to the Gone scene while the device is locked. Logging reason for scene" + + " change was: $loggingReason" + } + + val currentSceneKey = currentScene.value + if (currentSceneKey == toScene) { + return + } + + logger.logSceneChangeRequested( + from = currentSceneKey, + to = toScene, + reason = loggingReason, + ) + + repository.changeScene(toScene, transitionKey) } /** Sets the visibility of the container. */ @@ -184,39 +194,4 @@ constructor( fun onUserInput() { powerInteractor.onUserTouch() } - - /** - * Notifies that the UI has transitioned sufficiently to the given scene. - * - * *Not intended for external use!* - * - * Once a transition between one scene and another passes a threshold, the UI invokes this - * method to report it, updating the value in [desiredScene] to match what the UI shows. - */ - fun onSceneChanged(scene: SceneModel, loggingReason: String) { - updateDesiredScene(scene, loggingReason, logger::logSceneChangeCommitted) - } - - private fun updateDesiredScene( - scene: SceneModel, - loggingReason: String, - log: (from: SceneKey, to: SceneKey, loggingReason: String) -> Unit, - ) { - check(scene.key != SceneKey.Gone || deviceUnlockedInteractor.isDeviceUnlocked.value) { - "Cannot change to the Gone scene while the device is locked. Logging reason for scene" + - " change was: $loggingReason" - } - - val currentSceneKey = desiredScene.value.key - if (currentSceneKey == scene.key) { - return - } - - log( - /* from= */ currentSceneKey, - /* to= */ scene.key, - /* loggingReason= */ loggingReason, - ) - repository.setDesiredScene(scene) - } } diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt index dcd87c0fe845..605a5d9b6772 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt @@ -40,7 +40,6 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.scene.shared.logger.SceneLogger import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.statusbar.NotificationShadeWindowController import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled import com.android.systemui.statusbar.phone.CentralSurfaces @@ -164,9 +163,9 @@ constructor( applicationScope.launch { // TODO (b/308001302): Move this to a bouncer specific interactor. bouncerInteractor.onImeHiddenByUser.collectLatest { - if (sceneInteractor.desiredScene.value.key == SceneKey.Bouncer) { + if (sceneInteractor.currentScene.value == SceneKey.Bouncer) { sceneInteractor.changeScene( - scene = SceneModel(SceneKey.Lockscreen), + toScene = SceneKey.Lockscreen, loggingReason = "IME hidden", ) } @@ -353,8 +352,8 @@ constructor( } applicationScope.launch { - sceneInteractor.desiredScene - .map { it.key == SceneKey.Bouncer } + sceneInteractor.currentScene + .map { it == SceneKey.Bouncer } .distinctUntilChanged() .collect { switchedToBouncerScene -> if (switchedToBouncerScene) { @@ -422,7 +421,7 @@ constructor( private fun switchToScene(targetSceneKey: SceneKey, loggingReason: String) { sceneInteractor.changeScene( - scene = SceneModel(targetSceneKey), + toScene = targetSceneKey, loggingReason = loggingReason, ) } diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt index c2c2e04990c2..d59fcff34796 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt @@ -62,7 +62,6 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer: fun logSceneChangeCommitted( from: SceneKey, to: SceneKey, - reason: String, ) { logBuffer.log( tag = TAG, @@ -70,9 +69,8 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer: messageInitializer = { str1 = from.toString() str2 = to.toString() - str3 = reason }, - messagePrinter = { "Scene change committed: $str1 → $str2, reason: $str3" }, + messagePrinter = { "Scene change committed: $str1 → $str2" }, ) } diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/Scene.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/Scene.kt index 2e45353634fe..05056c133ca3 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/shared/model/Scene.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/Scene.kt @@ -32,7 +32,7 @@ interface Scene { val key: SceneKey /** - * The mapping between [UserAction] and destination [SceneModel]s. + * The mapping between [UserAction] and destination [UserActionResult]s. * * When the scene framework detects a user action, if the current scene has a map entry for that * user action, the framework starts a transition to the scene in the map. @@ -40,7 +40,7 @@ interface Scene { * Once the [Scene] becomes the current one, the scene framework will read this property and set * up a collector to watch for new mapping values. If every map entry provided by the scene, the * framework will set up user input handling for its [UserAction] and, if such a user action is - * detected, initiate a transition to the specified [SceneModel]. + * detected, initiate a transition to the specified [UserActionResult]. * * Note that reading from this method does _not_ mean that any user action has occurred. * Instead, the property is read before any user action/gesture is detected so that the @@ -51,7 +51,7 @@ interface Scene { * type is not currently active in the scene and should be ignored by the framework, while the * current scene is this one. */ - val destinationScenes: StateFlow<Map<UserAction, SceneModel>> + val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> } /** Enumerates all scene framework supported user actions. */ diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSource.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSource.kt new file mode 100644 index 000000000000..f7b45e547b7f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSource.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.shared.model + +import kotlinx.coroutines.flow.StateFlow + +/** Defines interface for classes that provide access to scene state. */ +interface SceneDataSource { + + /** + * The current scene, as seen by the real data source in the UI layer. + * + * During a transition between two scenes, the original scene will still be reflected in + * [currentScene] until a time when the UI layer decides to commit the change, which is when + * [currentScene] will have the value of the target/new scene. + */ + val currentScene: StateFlow<SceneKey> + + /** + * Asks for an asynchronous scene switch to [toScene], which will use the corresponding + * installed transition or the one specified by [transitionKey], if provided. + */ + fun changeScene( + toScene: SceneKey, + transitionKey: TransitionKey? = null, + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegator.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegator.kt new file mode 100644 index 000000000000..a50830c1f212 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneDataSourceDelegator.kt @@ -0,0 +1,85 @@ +/* + * 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. + */ + +@file:OptIn(ExperimentalCoroutinesApi::class) + +package com.android.systemui.scene.shared.model + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +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.asStateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.stateIn + +/** + * Delegates calls to a runtime-provided [SceneDataSource] or to a no-op implementation if a + * delegate isn't set. + */ +@SysUISingleton +class SceneDataSourceDelegator +@Inject +constructor( + @Application private val applicationScope: CoroutineScope, + config: SceneContainerConfig, +) : SceneDataSource { + + private val noOpDelegate = NoOpSceneDataSource(config.initialSceneKey) + private val delegateMutable = MutableStateFlow<SceneDataSource>(noOpDelegate) + + override val currentScene: StateFlow<SceneKey> = + delegateMutable + .flatMapLatest { delegate -> delegate.currentScene } + .stateIn( + scope = applicationScope, + started = SharingStarted.WhileSubscribed(), + initialValue = config.initialSceneKey, + ) + + override fun changeScene(toScene: SceneKey, transitionKey: TransitionKey?) { + delegateMutable.value.changeScene( + toScene = toScene, + transitionKey = transitionKey, + ) + } + + /** + * Binds the current, dependency injection provided [SceneDataSource] to the given object. + * + * In other words: once this is invoked, the state and functionality of the [SceneDataSource] + * will be served by the given [delegate]. + * + * If `null` is passed in, the delegator will use a no-op implementation of [SceneDataSource]. + * + * This removes any previously set delegate. + */ + fun setDelegate(delegate: SceneDataSource?) { + delegateMutable.value = delegate ?: noOpDelegate + } + + private class NoOpSceneDataSource( + initialSceneKey: SceneKey, + ) : SceneDataSource { + override val currentScene: StateFlow<SceneKey> = + MutableStateFlow(initialSceneKey).asStateFlow() + override fun changeScene(toScene: SceneKey, transitionKey: TransitionKey?) = Unit + } +} diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneModel.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/TransitionKey.kt index f3d549f03868..87332ae8e084 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/shared/model/SceneModel.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/TransitionKey.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,11 @@ package com.android.systemui.scene.shared.model -/** Models a scene. */ -data class SceneModel( - - /** The key of the scene. */ - val key: SceneKey, - - /** An optional name for the transition that led to this scene being the current scene. */ - val transitionName: String? = null, +/** + * Key for a transition. This can be used to specify which transition spec should be used when + * starting the transition between two scenes. + */ +data class TransitionKey( + val debugName: String, + val identity: Any = Object(), ) diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/TransitionKeys.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/TransitionKeys.kt new file mode 100644 index 000000000000..926878c1870e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/TransitionKeys.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.scene.shared.model + +/** + * Defines all known named transitions. + * + * These are the subset of transitions that can be referenced by key when asking for a scene change. + */ +object TransitionKeys { + + /** Reference to a scene transition that can collapse the shade scene instantly. */ + val CollapseShadeInstantly = TransitionKey("CollapseShadeInstantly") + + /** + * Reference to a scene transition that can collapse the shade scene slightly faster than a + * normal collapse would. + */ + val SlightlyFasterShadeCollapse = TransitionKey("SlightlyFasterShadeCollapse") +} diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionDistance.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionDistance.kt new file mode 100644 index 000000000000..b93f8378c22f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionDistance.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.shared.model + +interface UserActionDistance { + + /** + * Return the **absolute** distance of the user action (in pixels) given the size of the scene + * we are animating from and the orientation. + */ + fun absoluteDistance(fromSceneWidth: Int, fromSceneHeight: Int, isHorizontal: Boolean): Float +} diff --git a/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionResult.kt b/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionResult.kt new file mode 100644 index 000000000000..e1b96e4db938 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/scene/shared/model/UserActionResult.kt @@ -0,0 +1,38 @@ +/* + * 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.scene.shared.model + +data class UserActionResult( + + /** The scene we should be transitioning due to the [UserAction]. */ + val toScene: SceneKey, + + /** + * The distance the action takes to animate from 0% to 100%. + * + * If `null`, a default distance will be used depending on the [UserAction] performed. + */ + val distance: UserActionDistance? = null, + + /** + * The key of the transition that should be used, if a specific one should be used. + * + * If `null`, the transition used will be the corresponding transition from the collection + * passed into the UI layer. + */ + val transitionKey: TransitionKey? = null, +) diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt index c88a04c24044..67dc0cc6e03b 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt @@ -7,6 +7,7 @@ import android.view.WindowInsets import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.scene.shared.model.Scene import com.android.systemui.scene.shared.model.SceneContainerConfig +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer import kotlinx.coroutines.flow.MutableStateFlow @@ -33,6 +34,7 @@ class SceneWindowRootView( flags: SceneContainerFlags, scenes: Set<Scene>, layoutInsetController: LayoutInsetsController, + sceneDataSourceDelegator: SceneDataSourceDelegator, ) { this.viewModel = viewModel setLayoutInsetsController(layoutInsetController) @@ -46,7 +48,8 @@ class SceneWindowRootView( scenes = scenes, onVisibilityChangedInternal = { isVisible -> super.setVisibility(if (isVisible) View.VISIBLE else View.INVISIBLE) - } + }, + dataSourceDelegator = sceneDataSourceDelegator, ) } diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt index 2b978b2375d9..45b6f65d5d67 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt @@ -34,6 +34,7 @@ import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.scene.shared.model.Scene import com.android.systemui.scene.shared.model.SceneContainerConfig +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled @@ -54,6 +55,7 @@ object SceneWindowRootViewBinder { flags: SceneContainerFlags, scenes: Set<Scene>, onVisibilityChangedInternal: (isVisible: Boolean) -> Unit, + dataSourceDelegator: SceneDataSourceDelegator, ) { val unsortedSceneByKey: Map<SceneKey, Scene> = scenes.associateBy { scene -> scene.key } val sortedSceneByKey: Map<SceneKey, Scene> = buildMap { @@ -90,6 +92,7 @@ object SceneWindowRootViewBinder { viewModel = viewModel, windowInsets = windowInsets, sceneByKey = sortedSceneByKey, + dataSourceDelegator = dataSourceDelegator, ) .also { it.id = R.id.scene_container_root_composable } ) diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt index 24316601830a..5d290cefcd55 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt @@ -22,7 +22,6 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow @@ -44,19 +43,11 @@ constructor( val allSceneKeys: List<SceneKey> = sceneInteractor.allSceneKeys() /** The scene that should be rendered. */ - val currentScene: StateFlow<SceneModel> = sceneInteractor.desiredScene + val currentScene: StateFlow<SceneKey> = sceneInteractor.currentScene /** Whether the container is visible. */ val isVisible: StateFlow<Boolean> = sceneInteractor.isVisible - /** Notifies that the UI has transitioned sufficiently to the given scene. */ - fun onSceneChanged(scene: SceneModel) { - sceneInteractor.onSceneChanged( - scene = scene, - loggingReason = SCENE_TRANSITION_LOGGING_REASON, - ) - } - /** * Binds the given flow so the system remembers it. * diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt index 4e8b4039cc79..7cb3be7f159d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt @@ -26,7 +26,8 @@ import com.android.systemui.log.LogBuffer import com.android.systemui.log.dagger.ShadeTouchLog import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel +import com.android.systemui.scene.shared.model.TransitionKeys.CollapseShadeInstantly +import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShadeCollapse import com.android.systemui.shade.ShadeController.ShadeVisibilityListener import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.CommandQueue @@ -97,8 +98,9 @@ constructor( override fun instantCollapseShade() { // TODO(b/315921512) add support for instant transition sceneInteractor.changeScene( - SceneModel(getCollapseDestinationScene(), "instant"), - "hide shade" + getCollapseDestinationScene(), + "hide shade", + CollapseShadeInstantly, ) } @@ -119,10 +121,7 @@ constructor( // release focus immediately to kick off focus change transition notificationShadeWindowController.setNotificationShadeFocusable(false) notificationStackScrollLayout.cancelExpandHelper() - sceneInteractor.changeScene( - SceneModel(SceneKey.Shade, null), - "ShadeController.animateExpandShade" - ) + sceneInteractor.changeScene(SceneKey.Shade, "ShadeController.animateExpandShade") if (delayed) { scope.launch { delay(125) @@ -136,8 +135,9 @@ constructor( private fun animateCollapseShadeInternal() { sceneInteractor.changeScene( - SceneModel(getCollapseDestinationScene(), "ShadeController.animateCollapseShade"), - "ShadeController.animateCollapseShade" + getCollapseDestinationScene(), + "ShadeController.animateCollapseShade", + SlightlyFasterShadeCollapse, ) } @@ -183,17 +183,11 @@ constructor( } override fun expandToNotifications() { - sceneInteractor.changeScene( - SceneModel(SceneKey.Shade, null), - "ShadeController.animateExpandShade" - ) + sceneInteractor.changeScene(SceneKey.Shade, "ShadeController.animateExpandShade") } override fun expandToQs() { - sceneInteractor.changeScene( - SceneModel(SceneKey.QuickSettings, null), - "ShadeController.animateExpandQs" - ) + sceneInteractor.changeScene(SceneKey.QuickSettings, "ShadeController.animateExpandQs") } override fun setVisibilityListener(listener: ShadeVisibilityListener) { @@ -243,7 +237,7 @@ constructor( } override fun isExpandedVisible(): Boolean { - return sceneInteractor.desiredScene.value.key != SceneKey.Gone + return sceneInteractor.currentScene.value != SceneKey.Gone } override fun onStatusBarTouch(event: MotionEvent) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt index f40be4bbb678..2cb9f9acca26 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt @@ -35,6 +35,7 @@ import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.scene.shared.model.Scene import com.android.systemui.scene.shared.model.SceneContainerConfig +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.ui.view.SceneWindowRootView import com.android.systemui.scene.ui.view.WindowRootView import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel @@ -72,6 +73,7 @@ abstract class ShadeViewProviderModule { flagsProvider: Provider<SceneContainerFlags>, scenesProvider: Provider<Set<@JvmSuppressWildcards Scene>>, layoutInsetController: NotificationInsetsController, + sceneDataSourceDelegator: Provider<SceneDataSourceDelegator>, ): WindowRootView { return if (sceneContainerFlags.isEnabled()) { val sceneWindowRootView = @@ -84,6 +86,7 @@ abstract class ShadeViewProviderModule { flags = flagsProvider.get(), scenes = scenesProvider.get(), layoutInsetController = layoutInsetController, + sceneDataSourceDelegator = sceneDataSourceDelegator.get(), ) sceneWindowRootView } else { diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImpl.kt index 9bbe1bd28fee..a2e25983e68f 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImpl.kt @@ -19,7 +19,6 @@ package com.android.systemui.shade.domain.interactor import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor import com.android.systemui.scene.domain.interactor.SceneInteractor import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -44,7 +43,7 @@ constructor( } else { SceneKey.Shade } - sceneInteractor.changeScene(SceneModel(key), "animateCollapseQs") + sceneInteractor.changeScene(key, "animateCollapseQs") } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 04d9b0cbd428..14230ba43f59 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -87,6 +87,7 @@ import com.android.settingslib.Utils; import com.android.settingslib.fuelgauge.BatteryStatus; import com.android.systemui.biometrics.AuthController; import com.android.systemui.biometrics.FaceHelpMessageDeferral; +import com.android.systemui.biometrics.FaceHelpMessageDeferralFactory; import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.broadcast.BroadcastDispatcher; @@ -270,7 +271,7 @@ public class KeyguardIndicationController { ScreenLifecycle screenLifecycle, KeyguardBypassController keyguardBypassController, AccessibilityManager accessibilityManager, - FaceHelpMessageDeferral faceHelpMessageDeferral, + FaceHelpMessageDeferralFactory faceHelpMessageDeferral, KeyguardLogger keyguardLogger, AlternateBouncerInteractor alternateBouncerInteractor, AlarmManager alarmManager, @@ -308,7 +309,7 @@ public class KeyguardIndicationController { mIndicationHelper = indicationHelper; mKeyguardInteractor = keyguardInteractor; - mFaceAcquiredMessageDeferral = faceHelpMessageDeferral; + mFaceAcquiredMessageDeferral = faceHelpMessageDeferral.create(); mCoExFaceAcquisitionMsgIdsToShow = new HashSet<>(); int[] msgIds = context.getResources().getIntArray( com.android.systemui.res.R.array.config_face_help_msgs_when_fingerprint_enrolled); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index 4d373353d7a3..0e0f15237185 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -766,7 +766,6 @@ public class NotificationShelf extends ActivatableNotificationView { } } else if (viewEnd >= shelfClipStart - && view.isInShelf() && (mAmbientState.isShadeExpanded() || (!view.isPinned() && !view.isHeadsUpAnimatingAway()))) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java index 90abec17771c..80c3551b7de0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputNotificationRebuilder.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar; +import static android.app.Flags.lifetimeExtensionRefactor; + import android.annotation.NonNull; import android.app.Notification; import android.app.RemoteInputHistoryItem; @@ -29,6 +31,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import java.util.ArrayList; import java.util.Arrays; import java.util.stream.Stream; @@ -68,7 +71,7 @@ public class RemoteInputNotificationRebuilder { @NonNull public StatusBarNotification rebuildForCanceledSmartReplies( NotificationEntry entry) { - return rebuildWithRemoteInputInserted(entry, null /* remoteInputTest */, + return rebuildWithRemoteInputInserted(entry, null /* remoteInputText */, false /* showSpinner */, null /* mimeType */, null /* uri */); } @@ -97,22 +100,50 @@ public class RemoteInputNotificationRebuilder { StatusBarNotification rebuildWithRemoteInputInserted(NotificationEntry entry, CharSequence remoteInputText, boolean showSpinner, String mimeType, Uri uri) { StatusBarNotification sbn = entry.getSbn(); - Notification.Builder b = Notification.Builder .recoverBuilder(mContext, sbn.getNotification().clone()); - if (remoteInputText != null || uri != null) { - RemoteInputHistoryItem newItem = uri != null - ? new RemoteInputHistoryItem(mimeType, uri, remoteInputText) - : new RemoteInputHistoryItem(remoteInputText); + + if (lifetimeExtensionRefactor()) { + if (entry.remoteInputs == null) { + entry.remoteInputs = new ArrayList<RemoteInputHistoryItem>(); + } + + // Append new remote input information to remoteInputs list + if (remoteInputText != null || uri != null) { + RemoteInputHistoryItem newItem = uri != null + ? new RemoteInputHistoryItem(mimeType, uri, remoteInputText) + : new RemoteInputHistoryItem(remoteInputText); + // The list is latest-first, so new elements should be added as the first element. + entry.remoteInputs.add(0, newItem); + } + + // Read the whole remoteInputs list from the entry, then append all of those to the sbn. Parcelable[] oldHistoryItems = sbn.getNotification().extras .getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); + RemoteInputHistoryItem[] newHistoryItems = oldHistoryItems != null ? Stream.concat( - Stream.of(newItem), - Arrays.stream(oldHistoryItems).map(p -> (RemoteInputHistoryItem) p)) + entry.remoteInputs.stream(), + Arrays.stream(oldHistoryItems).map(p -> (RemoteInputHistoryItem) p)) .toArray(RemoteInputHistoryItem[]::new) - : new RemoteInputHistoryItem[] { newItem }; + : entry.remoteInputs.toArray(RemoteInputHistoryItem[]::new); b.setRemoteInputHistory(newHistoryItems); + + } else { + if (remoteInputText != null || uri != null) { + RemoteInputHistoryItem newItem = uri != null + ? new RemoteInputHistoryItem(mimeType, uri, remoteInputText) + : new RemoteInputHistoryItem(remoteInputText); + Parcelable[] oldHistoryItems = sbn.getNotification().extras + .getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); + RemoteInputHistoryItem[] newHistoryItems = oldHistoryItems != null + ? Stream.concat( + Stream.of(newItem), + Arrays.stream(oldHistoryItems).map(p -> (RemoteInputHistoryItem) p)) + .toArray(RemoteInputHistoryItem[]::new) + : new RemoteInputHistoryItem[]{newItem}; + b.setRemoteInputHistory(newHistoryItems); + } } b.setShowRemoteInputSpinner(showSpinner); b.setHideSmartReplies(true); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt index e7012ea51caf..17fc5c60f74f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationContentDescription.kt @@ -20,35 +20,14 @@ package com.android.systemui.statusbar.notification import android.app.Notification import android.content.Context -import android.content.pm.ApplicationInfo import android.text.TextUtils -import android.util.Log import androidx.annotation.MainThread import com.android.systemui.res.R -/** - * Returns accessibility content description for a given notification. - * - * NOTE: This is a relatively slow call. - */ +/** Returns accessibility content description for a given notification. */ @MainThread fun contentDescForNotification(c: Context, n: Notification?): CharSequence { - var appName = "" - try { - val builder = Notification.Builder.recoverBuilder(c, n) - appName = builder.loadHeaderAppName() - } catch (e: RuntimeException) { - Log.e("ContentDescription", "Unable to recover builder", e) - // Trying to get the app name from the app info instead. - val appInfo = - n?.extras?.getParcelable( - Notification.EXTRA_BUILDER_APPLICATION_INFO, - ApplicationInfo::class.java - ) - if (appInfo != null) { - appName = appInfo.loadLabel(c.packageManager).toString() - } - } + val appName = n?.loadHeaderAppName(c) ?: "" val title = n?.extras?.getCharSequence(Notification.EXTRA_TITLE) val text = n?.extras?.getCharSequence(Notification.EXTRA_TEXT) val ticker = n?.tickerText diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index cdacb10e1676..8678f0aad181 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -40,6 +40,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager.Policy; import android.app.Person; import android.app.RemoteInput; +import android.app.RemoteInputHistoryItem; import android.content.Context; import android.content.pm.ShortcutInfo; import android.net.Uri; @@ -127,6 +128,7 @@ public final class NotificationEntry extends ListEntry { public int targetSdk; private long lastFullScreenIntentLaunchTime = NOT_LAUNCHED_YET; public CharSequence remoteInputText; + public List<RemoteInputHistoryItem> remoteInputs = null; public String remoteInputMimeType; public Uri remoteInputUri; public ContentInfo remoteInputAttachment; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinator.kt index 918bf083f9fe..28fff1519032 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinator.kt @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator +import android.app.Flags.lifetimeExtensionRefactor +import android.app.Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY import android.os.Handler import android.service.notification.NotificationListenerService.REASON_CANCEL import android.service.notification.NotificationListenerService.REASON_CLICK @@ -88,11 +90,21 @@ class RemoteInputCoordinator @Inject constructor( override fun attach(pipeline: NotifPipeline) { mNotificationRemoteInputManager.setRemoteInputListener(this) - mRemoteInputLifetimeExtenders.forEach { pipeline.addNotificationLifetimeExtender(it) } + if (lifetimeExtensionRefactor()) { + pipeline.addNotificationLifetimeExtender(mRemoteInputActiveExtender) + } else { + mRemoteInputLifetimeExtenders.forEach { + pipeline.addNotificationLifetimeExtender(it) + } + } mNotifUpdater = pipeline.getInternalNotifUpdater(TAG) pipeline.addCollectionListener(mCollectionListener) } + /* + * Listener that updates the appearance of the notification if it has been lifetime extended + * by a a direct reply or a smart reply, and cancelled. + */ val mCollectionListener = object : NotifCollectionListener { override fun onEntryUpdated(entry: NotificationEntry, fromSystem: Boolean) { if (DEBUG) { @@ -100,9 +112,32 @@ class RemoteInputCoordinator @Inject constructor( " fromSystem=$fromSystem)") } if (fromSystem) { - // Mark smart replies as sent whenever a notification is updated by the app, - // otherwise the smart replies are never marked as sent. - mSmartReplyController.stopSending(entry) + if (lifetimeExtensionRefactor()) { + if ((entry.getSbn().getNotification().flags + and FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY) > 0) { + if (mNotificationRemoteInputManager.shouldKeepForRemoteInputHistory( + entry)) { + val newSbn = mRebuilder.rebuildForRemoteInputReply(entry) + entry.onRemoteInputInserted() + mNotifUpdater.onInternalNotificationUpdate(newSbn, + "Extending lifetime of notification with remote input") + } else if (mNotificationRemoteInputManager.shouldKeepForSmartReplyHistory( + entry)) { + val newSbn = mRebuilder.rebuildForCanceledSmartReplies(entry) + mSmartReplyController.stopSending(entry) + mNotifUpdater.onInternalNotificationUpdate(newSbn, + "Extending lifetime of notification with smart reply") + } + } else { + // Notifications updated without FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY + // should have their remote inputs list cleared. + entry.remoteInputs = null + } + } else { + // Mark smart replies as sent whenever a notification is updated by the app, + // otherwise the smart replies are never marked as sent. + mSmartReplyController.stopSending(entry) + } } } @@ -130,8 +165,10 @@ class RemoteInputCoordinator @Inject constructor( // NOTE: This is some trickery! By removing the lifetime extensions when we know they should // be immediately re-upped, we ensure that the side-effects of the lifetime extenders get to // fire again, thus ensuring that we add subsequent replies to the notification. - mRemoteInputHistoryExtender.endLifetimeExtension(entry.key) - mSmartReplyHistoryExtender.endLifetimeExtension(entry.key) + if (!lifetimeExtensionRefactor()) { + mRemoteInputHistoryExtender.endLifetimeExtension(entry.key) + mSmartReplyHistoryExtender.endLifetimeExtension(entry.key) + } // If we're extending for remote input being active, then from the apps point of // view it is already canceled, so we'll need to cancel it on the apps behalf @@ -160,15 +197,19 @@ class RemoteInputCoordinator @Inject constructor( } override fun isNotificationKeptForRemoteInputHistory(key: String) = + if (!lifetimeExtensionRefactor()) { mRemoteInputHistoryExtender.isExtending(key) || mSmartReplyHistoryExtender.isExtending(key) + } else false override fun releaseNotificationIfKeptForRemoteInputHistory(entry: NotificationEntry) { if (DEBUG) Log.d(TAG, "releaseNotificationIfKeptForRemoteInputHistory(entry=${entry.key})") - mRemoteInputHistoryExtender.endLifetimeExtensionAfterDelay(entry.key, - REMOTE_INPUT_EXTENDER_RELEASE_DELAY) - mSmartReplyHistoryExtender.endLifetimeExtensionAfterDelay(entry.key, - REMOTE_INPUT_EXTENDER_RELEASE_DELAY) + if (!lifetimeExtensionRefactor()) { + mRemoteInputHistoryExtender.endLifetimeExtensionAfterDelay(entry.key, + REMOTE_INPUT_EXTENDER_RELEASE_DELAY) + mSmartReplyHistoryExtender.endLifetimeExtensionAfterDelay(entry.key, + REMOTE_INPUT_EXTENDER_RELEASE_DELAY) + } mRemoteInputActiveExtender.endLifetimeExtensionAfterDelay(entry.key, REMOTE_INPUT_EXTENDER_RELEASE_DELAY) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerImpl.java index 3cdb2cd9b5c6..d1aff80b4e7c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/GroupExpansionManagerImpl.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.notification.collection.render; +import android.util.Log; + import androidx.annotation.NonNull; import com.android.systemui.Dumpable; @@ -40,6 +42,8 @@ import javax.inject.Inject; */ @SysUISingleton public class GroupExpansionManagerImpl implements GroupExpansionManager, Dumpable { + private static final String TAG = "GroupExpansionaManagerImpl"; + private final DumpManager mDumpManager; private final GroupMembershipManager mGroupMembershipManager; private final Set<OnGroupExpansionChangeListener> mOnGroupChangeListeners = new HashSet<>(); @@ -100,7 +104,7 @@ public class GroupExpansionManagerImpl implements GroupExpansionManager, Dumpabl NotificationEntry groupSummary = mGroupMembershipManager.getGroupSummary(entry); if (entry.getParent() == null) { if (expanded) { - throw new IllegalArgumentException("Cannot expand group that is not attached"); + Log.wtf(TAG, "Cannot expand group that is not attached"); } else { // The entry is no longer attached, but we still want to make sure we don't have // a stale expansion state. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt index de3a6262eafd..c8d6abe18ac3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt @@ -311,12 +311,13 @@ object NotificationIconContainerViewBinder { boundViewsByNotifKey[it.notifKey]?.first } val childCount = view.childCount + val toRemove = mutableListOf<View>() for (i in 0 until childCount) { val actual = view.getChildAt(i) val expected = expectedChildren.getOrNull(i) if (expected == null) { Log.wtf(TAG, "[$logTag] Unexpected child $actual") - view.removeView(actual) + toRemove.add(actual) continue } if (actual === expected) { @@ -325,6 +326,9 @@ object NotificationIconContainerViewBinder { view.removeView(expected) view.addView(expected, i) } + for (child in toRemove) { + view.removeView(child) + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationMemoryLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationMemoryLogger.kt index f096dd6abb0e..6e4b32761a7b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationMemoryLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationMemoryLogger.kt @@ -142,7 +142,7 @@ constructor( private fun getAllNotificationsOnMainThread() = runBlocking(mainDispatcher) { - traceSection("NML#getNotifications") { notificationPipeline.allNotifs } + traceSection("NML#getNotifications") { notificationPipeline.allNotifs.toList() } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java index c4d266ed2f17..ec8e5d730c36 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java @@ -720,6 +720,9 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro mInShelf = inShelf; } + /** + * @return true if the view is currently fully in the notification shelf. + */ public boolean isInShelf() { return mInShelf; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationThrottleHun.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationThrottleHun.kt new file mode 100644 index 000000000000..dd81d42b58ee --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationThrottleHun.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.shared + +import com.android.systemui.Flags +import com.android.systemui.flags.FlagToken +import com.android.systemui.flags.RefactorFlagUtils + +/** Helper for reading or using the notification throttle hun flag state. */ +@Suppress("NOTHING_TO_INLINE") +object NotificationThrottleHun { + /** The aconfig flag name */ + const val FLAG_NAME = Flags.FLAG_NOTIFICATION_THROTTLE_HUN + + /** A token used for dependency declaration */ + val token: FlagToken + get() = FlagToken(FLAG_NAME, isEnabled) + + /** Is the refactor enabled */ + @JvmStatic + inline val isEnabled + get() = Flags.notificationThrottleHun() + + /** + * Called to ensure code is only run when the flag is enabled. This protects users from the + * unintended behaviors caused by accidentally running new logic, while also crashing on an eng + * build to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun isUnexpectedlyInLegacyMode() = + RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is enabled to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 47daf495b87d..830b8c1ae63e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -1335,6 +1335,10 @@ public class NotificationStackScrollLayoutController implements Dumpable { } } + public float getAlpha() { + return mView.getAlpha(); + } + public void setSuppressChildrenMeasureAndLayout(boolean suppressLayout) { mView.suppressChildrenMeasureAndLayout(suppressLayout); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index 15fde0ed49ee..634de7a17ef7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -826,16 +826,11 @@ public class StackScrollAlgorithm { } } if (row.isPinned()) { - if (NotificationsImprovedHunAnimation.isEnabled()) { - // Make sure row yTranslation is at the HUN yTranslation, - // which accounts for AmbientState.stackTopMargin in split-shade. - childState.setYTranslation(headsUpTranslation); - } else { - // Make sure row yTranslation is at maximum the HUN yTranslation, - // which accounts for AmbientState.stackTopMargin in split-shade. - childState.setYTranslation( - Math.max(childState.getYTranslation(), headsUpTranslation)); - } + // Make sure row yTranslation is at at least the HUN yTranslation, + // which accounts for AmbientState.stackTopMargin in split-shade. + // Once we start opening the shade, we keep the previously calculated translation. + childState.setYTranslation( + Math.max(childState.getYTranslation(), headsUpTranslation)); childState.height = Math.max(row.getIntrinsicHeight(), childState.height); childState.hidden = false; ExpandableViewState topState = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java index 433e5c77e128..ab62ed65716e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java @@ -470,15 +470,8 @@ public class StackStateAnimator { mHeadsUpAppearChildren.add(changingView); mTmpState.copyFrom(changingView.getViewState()); - if (event.headsUpFromBottom) { - // start from the bottom of the screen - mTmpState.setYTranslation( - mHeadsUpAppearHeightBottom + mHeadsUpAppearStartAboveScreen); - } else { - // start from the top of the screen - mTmpState.setYTranslation( - -mStackTopMargin - mHeadsUpAppearStartAboveScreen); - } + // translate the HUN in from the top, or the bottom of the screen + mTmpState.setYTranslation(getHeadsUpYTranslationStart(event.headsUpFromBottom)); // set the height and the initial position mTmpState.applyToView(changingView); mAnimationProperties.setCustomInterpolator(View.TRANSLATION_Y, @@ -522,12 +515,20 @@ public class StackStateAnimator { || event.animationType == ANIMATION_TYPE_HEADS_UP_DISAPPEAR_CLICK) { mHeadsUpDisappearChildren.add(changingView); Runnable endRunnable = null; + mTmpState.copyFrom(changingView.getViewState()); if (changingView.getParent() == null) { // This notification was actually removed, so we need to add it // transiently mHostLayout.addTransientView(changingView, 0); changingView.setTransientContainer(mHostLayout); - mTmpState.initFrom(changingView); + if (NotificationsImprovedHunAnimation.isEnabled()) { + // StackScrollAlgorithm cannot find this view because it has been removed + // from the NSSL. To correctly translate the view to the top or bottom of + // the screen (where it animated from), we need to update its translation. + mTmpState.setYTranslation( + getHeadsUpYTranslationStart(event.headsUpFromBottom) + ); + } endRunnable = changingView::removeFromTransientContainer; } @@ -575,16 +576,19 @@ public class StackStateAnimator { changingView.setInRemovalAnimation(true); }; } - if (NotificationsImprovedHunAnimation.isEnabled()) { - mAnimationProperties.setCustomInterpolator(View.TRANSLATION_Y, - Interpolators.FAST_OUT_SLOW_IN_REVERSE); - } long removeAnimationDelay = changingView.performRemoveAnimation( ANIMATION_DURATION_HEADS_UP_DISAPPEAR, 0, 0.0f, true /* isHeadsUpAppear */, startAnimation, postAnimation, getGlobalAnimationFinishedListener()); mAnimationProperties.delay += removeAnimationDelay; + if (NotificationsImprovedHunAnimation.isEnabled()) { + mAnimationProperties.duration = ANIMATION_DURATION_HEADS_UP_DISAPPEAR; + mAnimationProperties.setCustomInterpolator(View.TRANSLATION_Y, + Interpolators.FAST_OUT_SLOW_IN_REVERSE); + mAnimationProperties.getAnimationFilter().animateY = true; + mTmpState.animateTo(changingView, mAnimationProperties); + } } else if (endRunnable != null) { endRunnable.run(); } @@ -595,6 +599,15 @@ public class StackStateAnimator { return needsCustomAnimation; } + private float getHeadsUpYTranslationStart(boolean headsUpFromBottom) { + if (headsUpFromBottom) { + // start from the bottom of the screen + return mHeadsUpAppearHeightBottom + mHeadsUpAppearStartAboveScreen; + } + // start from the top of the screen + return -mStackTopMargin - mHeadsUpAppearStartAboveScreen; + } + public void animateOverScrollToAmount(float targetAmount, final boolean onTop, final boolean isRubberbanded) { final float startOverScrollAmount = mHostLayout.getCurrentOverScrollAmount(onTop); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/view/SharedNotificationContainer.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/view/SharedNotificationContainer.kt index b4f578fec910..ffab9ea00b35 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/view/SharedNotificationContainer.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/view/SharedNotificationContainer.kt @@ -76,14 +76,10 @@ class SharedNotificationContainer( } val nsslId = R.id.notification_stack_scroller constraintSet.apply { - connect(nsslId, START, startConstraintId, START) - connect(nsslId, END, PARENT_ID, END) - connect(nsslId, BOTTOM, PARENT_ID, BOTTOM) - connect(nsslId, TOP, PARENT_ID, TOP) - setMargin(nsslId, START, marginStart) - setMargin(nsslId, END, marginEnd) - setMargin(nsslId, TOP, marginTop) - setMargin(nsslId, BOTTOM, marginBottom) + connect(nsslId, START, startConstraintId, START, marginStart) + connect(nsslId, END, PARENT_ID, END, marginEnd) + connect(nsslId, BOTTOM, PARENT_ID, BOTTOM, marginBottom) + connect(nsslId, TOP, PARENT_ID, TOP, marginTop) } constraintSet.applyTo(this) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt index 97db9b6c4191..daea8af8f334 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt @@ -24,6 +24,7 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters +import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.scene.shared.flag.SceneContainerFlags import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor @@ -75,6 +76,10 @@ object SharedNotificationContainerBinder { } val burnInParams = MutableStateFlow(BurnInParameters()) + val viewState = + ViewStateAccessor( + alpha = { controller.getAlpha() }, + ) /* * For animation sensitive coroutines, immediately run just like applicationScope does @@ -141,7 +146,7 @@ object SharedNotificationContainerBinder { if (!sceneContainerFlags.isEnabled()) { launch { - viewModel.expansionAlpha.collect { + viewModel.expansionAlpha(viewState).collect { controller.setMaxAlphaForExpansion(it) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt index 811da51b55ce..ff00cb31783d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt @@ -50,6 +50,7 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenToGoneTransitionView import com.android.systemui.keyguard.ui.viewmodel.LockscreenToOccludedTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.OccludedToLockscreenTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel +import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.stack.domain.interactor.SharedNotificationContainerInteractor import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine @@ -67,7 +68,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart @@ -100,21 +100,35 @@ constructor( setOf(AOD, LOCKSCREEN, DOZING, ALTERNATE_BOUNCER, PRIMARY_BOUNCER) private val edgeToAlphaViewModel = - mapOf<Edge?, Flow<Float>>( + mapOf<Edge?, (ViewStateAccessor) -> Flow<Float>>( Edge(from = LOCKSCREEN, to = DREAMING) to - lockscreenToDreamingTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + lockscreenToDreamingTransitionViewModel.lockscreenAlpha + }, Edge(from = LOCKSCREEN, to = GONE) to - lockscreenToGoneTransitionViewModel.lockscreenAlpha, + { viewState: ViewStateAccessor -> + lockscreenToGoneTransitionViewModel.lockscreenAlpha(viewState) + }, Edge(from = ALTERNATE_BOUNCER, to = GONE) to - alternateBouncerToGoneTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + alternateBouncerToGoneTransitionViewModel.lockscreenAlpha + }, Edge(from = PRIMARY_BOUNCER, to = GONE) to - primaryBouncerToGoneTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + primaryBouncerToGoneTransitionViewModel.lockscreenAlpha + }, Edge(from = DREAMING, to = LOCKSCREEN) to - dreamingToLockscreenTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + dreamingToLockscreenTransitionViewModel.lockscreenAlpha + }, Edge(from = LOCKSCREEN, to = OCCLUDED) to - lockscreenToOccludedTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + lockscreenToOccludedTransitionViewModel.lockscreenAlpha + }, Edge(from = OCCLUDED, to = LOCKSCREEN) to - occludedToLockscreenTransitionViewModel.lockscreenAlpha, + { _: ViewStateAccessor -> + occludedToLockscreenTransitionViewModel.lockscreenAlpha + }, ) private val lockscreenTransitionInProgress: Flow<Edge?> = @@ -151,21 +165,20 @@ constructor( val configurationBasedDimensions: Flow<ConfigurationBasedDimensions> = interactor.configurationBasedDimensions .map { + val marginTop = + if (it.useLargeScreenHeader) it.marginTopLargeScreen else it.marginTop ConfigurationBasedDimensions( marginStart = if (it.useSplitShade) 0 else it.marginHorizontal, marginEnd = it.marginHorizontal, marginBottom = it.marginBottom, - marginTop = - if (it.useLargeScreenHeader) it.marginTopLargeScreen else it.marginTop, + marginTop = marginTop, useSplitShade = it.useSplitShade, paddingTop = if (it.useSplitShade) { - // When in split shade, the margin is applied twice as the legacy shade - // code uses it to calculate padding. - it.keyguardSplitShadeTopMargin - 2 * it.marginTopLargeScreen + marginTop } else { 0 - } + }, ) } .distinctUntilChanged() @@ -255,13 +268,15 @@ constructor( isOnLockscreenWithoutShade, keyguardInteractor.notificationContainerBounds, configurationBasedDimensions, - interactor.topPosition.sampleCombine( - keyguardTransitionInteractor.isInTransitionToAnyState, - shadeInteractor.qsExpansion, - ), + interactor.topPosition + .sampleCombine( + keyguardTransitionInteractor.isInTransitionToAnyState, + shadeInteractor.qsExpansion, + ) + .onStart { emit(Triple(0f, false, 0f)) } ) { onLockscreen, bounds, config, (top, isInTransitionToAnyState, qsExpansion) -> if (onLockscreen) { - bounds.copy(top = bounds.top + config.paddingTop) + bounds.copy(top = bounds.top - config.paddingTop) } else { // When QS expansion > 0, it should directly set the top padding so do not // animate it @@ -278,46 +293,63 @@ constructor( initialValue = NotificationContainerBounds(), ) - /** As QS is expanding, fade out notifications unless in splitshade */ - private val alphaForQsExpansion: Flow<Float> = - interactor.configurationBasedDimensions.flatMapLatest { - if (it.useSplitShade) { - flowOf(1f) - } else { - shadeInteractor.qsExpansion.map { 1f - it } + /** + * Ensure view is visible when the shade/qs are expanded. Also, as QS is expanding, fade out + * notifications unless in splitshade. + */ + private val alphaForShadeAndQsExpansion: Flow<Float> = + interactor.configurationBasedDimensions + .flatMapLatest { configurationBasedDimensions -> + combine( + shadeInteractor.shadeExpansion, + shadeInteractor.qsExpansion, + ) { shadeExpansion, qsExpansion -> + if (shadeExpansion > 0f || qsExpansion > 0f) { + if (configurationBasedDimensions.useSplitShade) { + 1f + } else { + // Fade as QS shade expands + 1f - qsExpansion + } + } else { + // Not visible unless the shade/qs is visible + 0f + } + } } - } + .distinctUntilChanged() - val expansionAlpha: Flow<Float> = + fun expansionAlpha(viewState: ViewStateAccessor): Flow<Float> { // Due to issues with the legacy shade, some shade expansion events are sent incorrectly, // such as when the shade resets. This can happen while the transition to/from LOCKSCREEN // is running. Therefore use a series of flatmaps to prevent unwanted interruptions while // those transitions are in progress. Without this, the alpha value will produce a visible // flicker. - lockscreenTransitionInProgress + return lockscreenTransitionInProgress .flatMapLatest { edge -> - edgeToAlphaViewModel.getOrElse( + edgeToAlphaViewModel.getOrDefault( edge, - { + { _: ViewStateAccessor -> isOnLockscreenWithoutShade.flatMapLatest { isOnLockscreenWithoutShade -> combineTransform( keyguardInteractor.keyguardAlpha, shadeCollpaseFadeIn, - alphaForQsExpansion, - ) { alpha, shadeCollpaseFadeIn, alphaForQsExpansion -> + alphaForShadeAndQsExpansion, + ) { alpha, shadeCollpaseFadeIn, alphaForShadeAndQsExpansion -> if (isOnLockscreenWithoutShade) { if (!shadeCollpaseFadeIn) { emit(alpha) } } else { - emit(alphaForQsExpansion) + emit(alphaForShadeAndQsExpansion) } } } } - ) + )(viewState) } .distinctUntilChanged() + } /** * Returns a flow of the expected alpha while running a LOCKSCREEN<->GLANCEABLE_HUB transition diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java index ca3e3c629619..db55da7b8acb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java @@ -43,6 +43,7 @@ import javax.inject.Inject; */ public class KeyguardClockPositionAlgorithm { private static final String TAG = "KeyguardClockPositionAlgorithm"; + private static final boolean DEBUG = false; /** * Margin between the bottom of the status view and the notification shade. @@ -318,24 +319,26 @@ public class KeyguardClockPositionAlgorithm { } float fullyDarkBurnInOffset = burnInPreventionOffsetY(burnInPreventionOffsetY); - float clockYDark = clockY - + fullyDarkBurnInOffset - + shift; + float clockYDark = clockY + fullyDarkBurnInOffset + shift; mCurrentBurnInOffsetY = MathUtils.lerp(0, fullyDarkBurnInOffset, darkAmount); - final String inputs = "panelExpansion: " + panelExpansion + " darkAmount: " + darkAmount; - final String outputs = "clockY: " + clockY - + " burnInPreventionOffsetY: " + burnInPreventionOffsetY - + " fullyDarkBurnInOffset: " + fullyDarkBurnInOffset - + " shift: " + shift - + " mOverStretchAmount: " + mOverStretchAmount - + " mCurrentBurnInOffsetY: " + mCurrentBurnInOffsetY; - mLogger.i(msg -> { - return msg.getStr1() + " -> " + msg.getStr2(); - }, msg -> { - msg.setStr1(inputs); - msg.setStr2(outputs); - return kotlin.Unit.INSTANCE; - }); + + if (DEBUG) { + final float finalShift = shift; + final float finalBurnInPreventionOffsetY = burnInPreventionOffsetY; + mLogger.i(msg -> { + final String inputs = "panelExpansion: " + panelExpansion + + " darkAmount: " + darkAmount; + final String outputs = "clockY: " + clockY + + " burnInPreventionOffsetY: " + finalBurnInPreventionOffsetY + + " fullyDarkBurnInOffset: " + fullyDarkBurnInOffset + + " shift: " + finalShift + + " mOverStretchAmount: " + mOverStretchAmount + + " mCurrentBurnInOffsetY: " + mCurrentBurnInOffsetY; + return inputs + " -> " + outputs; + }, msg -> { + return kotlin.Unit.INSTANCE; + }); + } return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mOverStretchAmount); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java index 2206be5e614b..38b37183b97f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java @@ -20,6 +20,7 @@ import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; import static android.app.StatusBarManager.DISABLE_SYSTEM_INFO; import static com.android.systemui.statusbar.StatusBarState.KEYGUARD; +import static com.android.systemui.Flags.updateUserSwitcherBackground; import android.content.res.Configuration; import android.content.res.Resources; @@ -43,6 +44,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.logging.KeyguardLogger; import com.android.systemui.battery.BatteryMeterViewController; +import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; @@ -122,6 +124,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat private final SecureSettings mSecureSettings; private final CommandQueue mCommandQueue; private final Executor mMainExecutor; + private final Executor mBackgroundExecutor; private final Object mLock = new Object(); private final KeyguardLogger mLogger; @@ -296,6 +299,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat SecureSettings secureSettings, CommandQueue commandQueue, @Main Executor mainExecutor, + @Background Executor backgroundExecutor, KeyguardLogger logger, NotificationMediaManager notificationMediaManager, StatusOverlayHoverListenerFactory statusOverlayHoverListenerFactory @@ -323,6 +327,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat mSecureSettings = secureSettings; mCommandQueue = commandQueue; mMainExecutor = mainExecutor; + mBackgroundExecutor = backgroundExecutor; mLogger = logger; mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled(); @@ -607,8 +612,18 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat * Updates visibility of the user switcher button based on {@link android.os.UserManager} state. */ private void updateUserSwitcher() { - mView.setUserSwitcherEnabled(mUserManager.isUserSwitcherEnabled(getResources().getBoolean( - R.bool.qs_show_user_switcher_for_single_user))); + if (updateUserSwitcherBackground()) { + mBackgroundExecutor.execute(() -> { + final boolean isUserSwitcherEnabled = mUserManager.isUserSwitcherEnabled( + getResources().getBoolean(R.bool.qs_show_user_switcher_for_single_user)); + mMainExecutor.execute(() -> { + mView.setUserSwitcherEnabled(isUserSwitcherEnabled); + }); + }); + } else { + mView.setUserSwitcherEnabled(mUserManager.isUserSwitcherEnabled( + getResources().getBoolean(R.bool.qs_show_user_switcher_for_single_user))); + } } @VisibleForTesting diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index 45bdae83bbd9..8ac3b4a75141 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -132,9 +132,9 @@ public class PhoneStatusBarView extends FrameLayout { if (updateDisplayParameters()) { updateLayoutForCutout(); requestLayout(); - if (truncatedStatusBarIconsFix()) { - updateWindowHeight(); - } + } + if (truncatedStatusBarIconsFix()) { + updateWindowHeight(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 7f7eb04f9970..9d70f4221e3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -439,8 +439,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } mBypassController = bypassController; mNotificationContainer = notificationContainer; - mKeyguardMessageAreaController = mKeyguardMessageAreaFactory.create( - centralSurfaces.getKeyguardMessageArea()); + if (!DeviceEntryUdfpsRefactor.isEnabled()) { + mKeyguardMessageAreaController = mKeyguardMessageAreaFactory.create( + centralSurfaces.getKeyguardMessageArea()); + } + mCentralSurfacesRegistered = true; registerListeners(); @@ -863,6 +866,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb final boolean isShowingAlternateBouncer = mAlternateBouncerInteractor.isVisibleState(); if (mKeyguardMessageAreaController != null) { + DeviceEntryUdfpsRefactor.assertInLegacyMode(); mKeyguardMessageAreaController.setIsVisible(isShowingAlternateBouncer); mKeyguardMessageAreaController.setMessage(""); } @@ -1447,6 +1451,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb public void setKeyguardMessage(String message, ColorStateList colorState) { if (mAlternateBouncerInteractor.isVisibleState()) { if (mKeyguardMessageAreaController != null) { + DeviceEntryUdfpsRefactor.assertInLegacyMode(); mKeyguardMessageAreaController.setMessage(message); } } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java index fc2f6e958b32..c089092c9b86 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java @@ -35,6 +35,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; +import com.android.systemui.Flags; import com.android.systemui.bluetooth.BluetoothLogger; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; @@ -240,9 +241,21 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa @WorkerThread @Override public String getConnectedDeviceName() { - synchronized (mConnectedDevices) { - if (mConnectedDevices.size() == 1) { - return mConnectedDevices.get(0).getName(); + if (Flags.getConnectedDeviceNameUnsynchronized()) { + CachedBluetoothDevice connectedDevice = null; + // Calling the getName() API for CachedBluetoothDevice outside the synchronized block + // so that the main thread is not blocked. + synchronized (mConnectedDevices) { + if (mConnectedDevices.size() == 1) { + connectedDevice = mConnectedDevices.get(0); + } + } + return connectedDevice != null ? connectedDevice.getName() : null; + } else { + synchronized (mConnectedDevices) { + if (mConnectedDevices.size() == 1) { + return mConnectedDevices.get(0).getName(); + } } } return null; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index 9f4a90658b2e..f39762766633 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -444,7 +444,8 @@ public class SecurityControllerImpl implements SecurityController { UserHandle.of(userId))) { boolean hasCACerts = !(conn.getService().getUserCaAliases().getList().isEmpty()); idWithCert = new Pair<Integer, Boolean>(userId, hasCACerts); - } catch (RemoteException | InterruptedException | AssertionError e) { + } catch (RemoteException | InterruptedException | AssertionError + | IllegalStateException e) { Log.i(TAG, "failed to get CA certs", e); idWithCert = new Pair<Integer, Boolean>(userId, null); } finally { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java index d4c180df7442..2b0a92c6ecd7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java @@ -16,11 +16,14 @@ package com.android.systemui.statusbar.policy; +import static android.provider.Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS; + import static com.android.server.notification.Flags.screenshareNotificationHiding; import android.annotation.MainThread; import android.app.IActivityManager; import android.content.Context; +import android.database.ExecutorContentObserver; import android.media.projection.MediaProjectionInfo; import android.media.projection.MediaProjectionManager; import android.os.Handler; @@ -37,6 +40,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.util.Assert; import com.android.systemui.util.ListenerSet; +import com.android.systemui.util.settings.GlobalSettings; import java.util.concurrent.Executor; @@ -50,6 +54,7 @@ public class SensitiveNotificationProtectionControllerImpl private final ArraySet<String> mExemptPackages = new ArraySet<>(); private final ListenerSet<Runnable> mListeners = new ListenerSet<>(); private volatile MediaProjectionInfo mProjection; + boolean mDisableScreenShareProtections = false; @VisibleForTesting final MediaProjectionManager.Callback mMediaProjectionCallback = @@ -58,6 +63,12 @@ public class SensitiveNotificationProtectionControllerImpl public void onStart(MediaProjectionInfo info) { Trace.beginSection("SNPC.onProjectionStart"); try { + if (mDisableScreenShareProtections) { + Log.w(LOG_TAG, + "Screen share protections disabled, ignoring projectionstart"); + return; + } + // Only enable sensitive content protection if sharing full screen // Launch cookie only set (non-null) if sharing single app/task updateProjectionStateAndNotifyListeners( @@ -81,6 +92,7 @@ public class SensitiveNotificationProtectionControllerImpl @Inject public SensitiveNotificationProtectionControllerImpl( Context context, + GlobalSettings settings, MediaProjectionManager mediaProjectionManager, IActivityManager activityManager, @Main Handler mainHandler, @@ -89,6 +101,25 @@ public class SensitiveNotificationProtectionControllerImpl return; } + ExecutorContentObserver developerOptionsObserver = new ExecutorContentObserver(bgExecutor) { + @Override + public void onChange(boolean selfChange) { + super.onChange(selfChange); + boolean disableScreenShareProtections = settings.getInt( + DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS, + 0) != 0; + mainHandler.post(() -> { + mDisableScreenShareProtections = disableScreenShareProtections; + }); + } + }; + settings.registerContentObserver( + DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS, + developerOptionsObserver); + + // Get current setting value + bgExecutor.execute(() -> developerOptionsObserver.onChange(true)); + bgExecutor.execute(() -> { ArraySet<String> exemptPackages = new ArraySet<>(); // Exempt SystemUI diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS b/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS new file mode 100644 index 000000000000..43450c4418aa --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS @@ -0,0 +1,5 @@ +# Android TV Core Framework +rgl@google.com +valiiftime@google.com +galinap@google.com +robhor@google.com
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/volume/dagger/AudioModule.kt b/packages/SystemUI/src/com/android/systemui/volume/dagger/AudioModule.kt index 1af5c46cd14b..67d6a7f5d735 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dagger/AudioModule.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dagger/AudioModule.kt @@ -16,11 +16,14 @@ package com.android.systemui.volume.dagger +import android.app.NotificationManager import android.content.Context import android.media.AudioManager import com.android.settingslib.media.data.repository.SpatializerRepository import com.android.settingslib.media.data.repository.SpatializerRepositoryImpl import com.android.settingslib.media.domain.interactor.SpatializerInteractor +import com.android.settingslib.statusbar.notification.data.repository.NotificationsSoundPolicyRepository +import com.android.settingslib.statusbar.notification.data.repository.NotificationsSoundPolicyRepositoryImpl import com.android.settingslib.volume.data.repository.AudioRepository import com.android.settingslib.volume.data.repository.AudioRepositoryImpl import com.android.settingslib.volume.domain.interactor.AudioModeInteractor @@ -68,5 +71,19 @@ interface AudioModule { @Provides fun provideSpatializerInetractor(repository: SpatializerRepository): SpatializerInteractor = SpatializerInteractor(repository) + + @Provides + fun provideNotificationsSoundPolicyRepository( + context: Context, + notificationManager: NotificationManager, + @Background coroutineContext: CoroutineContext, + @Application coroutineScope: CoroutineScope, + ): NotificationsSoundPolicyRepository = + NotificationsSoundPolicyRepositoryImpl( + context, + notificationManager, + coroutineScope, + coroutineContext, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualLocationsService.kt b/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualLocationsService.kt index 1c17fc34a34a..bb4a2c405b31 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualLocationsService.kt +++ b/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualLocationsService.kt @@ -77,17 +77,17 @@ constructor( controller.setSuggestionCardIds(storeLocations.toSet()) } - private val binder: IWalletContextualLocationsService.Stub - = object : IWalletContextualLocationsService.Stub() { - override fun addWalletCardsUpdatedListener(listener: IWalletCardsUpdatedListener) { - addWalletCardsUpdatedListenerInternal(listener) - } - override fun onWalletContextualLocationsStateUpdated(storeLocations: List<String>) { - onWalletContextualLocationsStateUpdatedInternal(storeLocations) + private val binder: IWalletContextualLocationsService.Stub = + object : IWalletContextualLocationsService.Stub() { + override fun addWalletCardsUpdatedListener(listener: IWalletCardsUpdatedListener) { + addWalletCardsUpdatedListenerInternal(listener) + } + override fun onWalletContextualLocationsStateUpdated(storeLocations: List<String>) { + onWalletContextualLocationsStateUpdatedInternal(storeLocations) + } } - } companion object { private const val TAG = "WalletContextualLocationsService" } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt b/packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt index 0fe2283c8543..f23fbee18904 100644 --- a/packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt +++ b/packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt @@ -34,7 +34,7 @@ import org.junit.runner.RunWith @RunWithLooper class AnimatorTestRuleIsolationTest : SysuiTestCase() { - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Test fun testA() { diff --git a/packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt b/packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt index cc7f7e4067d9..fd5f1573ba5e 100644 --- a/packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt +++ b/packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt @@ -31,7 +31,7 @@ import org.junit.runner.RunWith @RunWithLooper class AnimatorTestRulePrecisionTest : SysuiTestCase() { - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) var value1: Float = -1f var value2: Float = -1f diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt index e6637e60b146..cd19259091ab 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt @@ -22,6 +22,7 @@ import android.view.ViewTreeObserver import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.Flags as AConfigFlags import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.flags.Flags import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository @@ -259,6 +260,7 @@ class ClockEventControllerTest : SysuiTestCase() { @Test fun keyguardCallback_visibilityChanged_clockDozeCalled() = runBlocking(IMMEDIATE) { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) val captor = argumentCaptor<KeyguardUpdateMonitorCallback>() verify(keyguardUpdateMonitor).registerCallback(capture(captor)) diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java index fad85526dec9..e893eb196039 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java @@ -56,7 +56,7 @@ import java.lang.reflect.Field; public class KeyguardStatusViewControllerTest extends KeyguardStatusViewControllerBaseTest { @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); @Test public void dozeTimeTick_updatesSlice() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java index ba27fcd49fac..dd428f562bd1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; public class ExpandHelperTest extends SysuiTestCase { @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); private ExpandableNotificationRow mRow; diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java index e006d59cad82..64936862bc20 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationAnimationControllerTest.java @@ -82,7 +82,7 @@ import java.util.function.Supplier; public class WindowMagnificationAnimationControllerTest extends SysuiTestCase { @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); @Rule public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); private static final float DEFAULT_SCALE = 4.0f; diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index 2225ad6e49d7..f1b0c1874511 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -129,7 +129,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class WindowMagnificationControllerTest extends SysuiTestCase { @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + // NOTE: pass 'null' to allow this test advances time on the main thread. + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(null); @Rule public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java index a35a50982a97..08b49e7d2745 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerWindowlessMagnifierTest.java @@ -132,7 +132,7 @@ import java.util.function.Supplier; public class WindowMagnificationControllerWindowlessMagnifierTest extends SysuiTestCase { @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); @Rule public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java index 90878169c201..abc95bc23f87 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/DragToInteractAnimationControllerTest.java @@ -82,18 +82,21 @@ public class DragToInteractAnimationControllerTest extends SysuiTestCase { mDragToInteractAnimationController.setMagnetListener(new MagnetizedObject.MagnetListener() { @Override - public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { } @Override public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, - float velX, float velY, boolean wasFlungOut) { + @NonNull MagnetizedObject<?> draggedObject, float velX, float velY, + boolean wasFlungOut) { } @Override - public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { + public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target, + @NonNull MagnetizedObject<?> draggedObject) { } }); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java index 4a1bdbcc9b48..ce4db8febb6c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java @@ -31,10 +31,12 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -69,6 +71,7 @@ import androidx.dynamicanimation.animation.DynamicAnimation; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.test.filters.SmallTest; +import com.android.internal.accessibility.dialog.AccessibilityTarget; import com.android.internal.messages.nano.SystemMessageProto; import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; @@ -116,6 +119,7 @@ public class MenuViewLayerTest extends SysuiTestCase { private String mLastAccessibilityButtonTargets; private String mLastEnabledAccessibilityServices; private WindowMetrics mWindowMetrics; + private MenuViewModel mMenuViewModel; private MenuView mMenuView; private MenuAnimationController mMenuAnimationController; @@ -148,15 +152,17 @@ public class MenuViewLayerTest extends SysuiTestCase { new WindowMetrics(mDisplayBounds, fakeDisplayInsets(), /* density = */ 0.0f)); doReturn(mWindowMetrics).when(mStubWindowManager).getCurrentWindowMetrics(); - MenuViewModel menuViewModel = new MenuViewModel( + mMenuViewModel = new MenuViewModel( mSpyContext, mStubAccessibilityManager, mSecureSettings); MenuViewAppearance menuViewAppearance = new MenuViewAppearance( mSpyContext, mStubWindowManager); mMenuView = spy( - new MenuView(mSpyContext, menuViewModel, menuViewAppearance, mSecureSettings)); + new MenuView(mSpyContext, mMenuViewModel, menuViewAppearance, mSecureSettings)); + // Ensure tests don't actually update metrics. + doNothing().when(mMenuView).incrementTexMetric(any(), anyInt()); mMenuViewLayer = spy(new MenuViewLayer(mSpyContext, mStubWindowManager, - mStubAccessibilityManager, menuViewModel, menuViewAppearance, mMenuView, + mStubAccessibilityManager, mMenuViewModel, menuViewAppearance, mMenuView, mFloatingMenu, mSecureSettings)); mMenuView = (MenuView) mMenuViewLayer.getChildAt(LayerIndex.MENU_VIEW); mMenuAnimationController = mMenuView.getMenuAnimationController(); @@ -382,6 +388,47 @@ public class MenuViewLayerTest extends SysuiTestCase { verify(mFloatingMenu).hide(); } + @Test + @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT) + public void onDismissAction_incrementsTexMetricDismiss() { + int uid1 = 1234, uid2 = 5678; + mMenuViewModel.onTargetFeaturesChanged( + List.of(new TestAccessibilityTarget(mSpyContext, uid1), + new TestAccessibilityTarget(mSpyContext, uid2))); + + mMenuViewLayer.dispatchAccessibilityAction(R.id.action_remove_menu); + + ArgumentCaptor<Integer> uidCaptor = ArgumentCaptor.forClass(Integer.class); + verify(mMenuView, times(2)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_DISMISS), + uidCaptor.capture()); + assertThat(uidCaptor.getAllValues()).containsExactly(uid1, uid2); + } + + @Test + @EnableFlags(Flags.FLAG_FLOATING_MENU_DRAG_TO_EDIT) + public void onEditAction_incrementsTexMetricEdit() { + int uid1 = 1234, uid2 = 5678; + mMenuViewModel.onTargetFeaturesChanged( + List.of(new TestAccessibilityTarget(mSpyContext, uid1), + new TestAccessibilityTarget(mSpyContext, uid2))); + + mMenuViewLayer.dispatchAccessibilityAction(R.id.action_edit); + + ArgumentCaptor<Integer> uidCaptor = ArgumentCaptor.forClass(Integer.class); + verify(mMenuView, times(2)).incrementTexMetric(eq(MenuViewLayer.TEX_METRIC_EDIT), + uidCaptor.capture()); + assertThat(uidCaptor.getAllValues()).containsExactly(uid1, uid2); + } + + /** Simplified AccessibilityTarget for testing MenuViewLayer. */ + private static class TestAccessibilityTarget extends AccessibilityTarget { + TestAccessibilityTarget(Context context, int uid) { + // Set fields unused by tests to defaults that allow test compilation. + super(context, AccessibilityManager.ACCESSIBILITY_BUTTON, 0, false, + TEST_SELECT_TO_SPEAK_COMPONENT_NAME.flattenToString(), uid, null, null, null); + } + } + private void setupEnabledAccessibilityServiceList() { Settings.Secure.putString(mSpyContext.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, @@ -455,6 +502,6 @@ public class MenuViewLayerTest extends SysuiTestCase { View view = mock(View.class); when(view.getId()).thenReturn(id); magnetListener.onReleasedInTarget( - new MagnetizedObject.MagneticTarget(view, 200)); + new MagnetizedObject.MagneticTarget(view, 200), mock(MagnetizedObject.class)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/AnimatorTestRuleOrderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/AnimatorTestRuleOrderTest.kt index 2b51ac5e3187..f07932c0de69 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/AnimatorTestRuleOrderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/AnimatorTestRuleOrderTest.kt @@ -19,7 +19,6 @@ package com.android.systemui.animation import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import androidx.core.animation.doOnEnd -import androidx.test.filters.FlakyTest import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.util.doOnEnd @@ -31,10 +30,9 @@ import org.junit.runner.RunWith @RunWith(AndroidTestingRunner::class) @SmallTest @RunWithLooper -@FlakyTest(bugId = 302149604) class AnimatorTestRuleOrderTest : SysuiTestCase() { - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) var value1: Float = -1f var value2: Float = -1f diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt index a46167a423f1..8fab2332c00e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt @@ -26,6 +26,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { @Test fun biometricRequestFromPromptInfo() { val logoRes = R.drawable.ic_cake + val logoDescription = "test cake" val title = "what" val subtitle = "a" val description = "request" @@ -41,6 +42,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { BiometricPromptRequest.Biometric( promptInfo( logoRes = logoRes, + logoDescription = logoDescription, title = title, subtitle = subtitle, description = description, @@ -53,6 +55,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { ) assertThat(request.logoRes).isEqualTo(logoRes) + assertThat(request.logoDescription).isEqualTo(logoDescription) assertThat(request.title).isEqualTo(title) assertThat(request.subtitle).isEqualTo(subtitle) assertThat(request.description).isEqualTo(description) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index 2e94d381b8dc..ff68fe3df9e9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt @@ -16,6 +16,7 @@ package com.android.systemui.biometrics.ui.viewmodel +import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.content.res.Configuration import android.graphics.Bitmap @@ -74,6 +75,8 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.junit.MockitoJUnit @@ -95,6 +98,8 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa @Mock private lateinit var selectedUserInteractor: SelectedUserInteractor @Mock private lateinit var udfpsUtils: UdfpsUtils @Mock private lateinit var packageManager: PackageManager + @Mock private lateinit var applicationInfoWithIcon: ApplicationInfo + @Mock private lateinit var applicationInfoNoIcon: ApplicationInfo private val fakeExecutor = FakeExecutor(FakeSystemClock()) private val testScope = TestScope() @@ -102,6 +107,8 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa private val logoResFromApp = R.drawable.ic_cake private val logoFromApp = context.getDrawable(logoResFromApp) private val logoBitmapFromApp = Bitmap.createBitmap(400, 400, Bitmap.Config.RGB_565) + private val defaultLogoDescription = "Test Android App" + private val logoDescriptionFromApp = "Test Cake App" private lateinit var fingerprintRepository: FakeFingerprintPropertyRepository private lateinit var promptRepository: FakePromptRepository @@ -166,7 +173,14 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa iconViewModel = viewModel.iconViewModel // Set up default logo icon and app customized icon - whenever(packageManager.getApplicationIcon(OP_PACKAGE_NAME)).thenReturn(defaultLogoIcon) + whenever(packageManager.getApplicationInfo(eq(OP_PACKAGE_NAME_NO_ICON), anyInt())) + .thenReturn(applicationInfoNoIcon) + whenever(packageManager.getApplicationInfo(eq(OP_PACKAGE_NAME), anyInt())) + .thenReturn(applicationInfoWithIcon) + whenever(packageManager.getApplicationIcon(applicationInfoWithIcon)) + .thenReturn(defaultLogoIcon) + whenever(packageManager.getApplicationLabel(applicationInfoWithIcon)) + .thenReturn(defaultLogoDescription) context.setMockPackageManager(packageManager) val resources = context.getOrCreateTestableResources() resources.addOverride(logoResFromApp, logoFromApp) @@ -1277,6 +1291,29 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa assertThat((logo as BitmapDrawable).bitmap).isEqualTo(logoBitmapFromApp) } + @Test + fun logoDescriptionIsEmptyIfPackageNameNotFound() = + runGenericTest(packageName = OP_PACKAGE_NAME_NO_ICON) { + mSetFlagsRule.enableFlags(FLAG_CUSTOM_BIOMETRIC_PROMPT) + val logoDescription by collectLastValue(viewModel.logoDescription) + assertThat(logoDescription).isEqualTo("") + } + + @Test + fun defaultLogoDescriptionIfNoLogoDescriptionSet() = runGenericTest { + mSetFlagsRule.enableFlags(FLAG_CUSTOM_BIOMETRIC_PROMPT) + val logoDescription by collectLastValue(viewModel.logoDescription) + assertThat(logoDescription).isEqualTo(defaultLogoDescription) + } + + @Test + fun logoDescriptionSetByApp() = + runGenericTest(logoDescription = logoDescriptionFromApp) { + mSetFlagsRule.enableFlags(FLAG_CUSTOM_BIOMETRIC_PROMPT) + val logoDescription by collectLastValue(viewModel.logoDescription) + assertThat(logoDescription).isEqualTo(logoDescriptionFromApp) + } + /** Asserts that the selected buttons are visible now. */ private suspend fun TestScope.assertButtonsVisible( tryAgain: Boolean = false, @@ -1300,6 +1337,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa contentView: PromptContentView? = null, logoRes: Int = -1, logoBitmap: Bitmap? = null, + logoDescription: String? = null, packageName: String = OP_PACKAGE_NAME, block: suspend TestScope.() -> Unit, ) { @@ -1312,6 +1350,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa contentViewFromApp = contentView, logoResFromApp = logoRes, logoBitmapFromApp = logoBitmap, + logoDescriptionFromApp = logoDescription, packageName = packageName, ) @@ -1492,12 +1531,14 @@ private fun PromptSelectorInteractor.initializePrompt( contentViewFromApp: PromptContentView? = null, logoResFromApp: Int = -1, logoBitmapFromApp: Bitmap? = null, + logoDescriptionFromApp: String? = null, packageName: String = OP_PACKAGE_NAME, ) { val info = PromptInfo().apply { logoRes = logoResFromApp logoBitmap = logoBitmapFromApp + logoDescription = logoDescriptionFromApp title = "t" subtitle = "s" description = descriptionFromApp diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorTest.kt new file mode 100644 index 000000000000..a53f8d43f323 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorTest.kt @@ -0,0 +1,352 @@ +/* + * 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.deviceentry.domain.interactor + +import android.content.res.mainResources +import android.hardware.face.FaceManager +import android.hardware.fingerprint.FingerprintManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository +import com.android.systemui.biometrics.shared.model.FingerprintSensorType +import com.android.systemui.biometrics.shared.model.SensorStrength +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.deviceentry.shared.model.ErrorFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.FaceTimeoutMessage +import com.android.systemui.deviceentry.shared.model.FailedFaceAuthenticationStatus +import com.android.systemui.deviceentry.shared.model.FingerprintLockoutMessage +import com.android.systemui.deviceentry.shared.model.HelpFaceAuthenticationStatus +import com.android.systemui.keyguard.data.repository.biometricSettingsRepository +import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository +import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus +import com.android.systemui.kosmos.testScope +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +class BiometricMessageInteractorTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val underTest = kosmos.biometricMessageInteractor + + private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository + private val fingerprintAuthRepository = kosmos.deviceEntryFingerprintAuthRepository + private val faceAuthRepository = kosmos.fakeDeviceEntryFaceAuthRepository + private val biometricSettingsRepository = kosmos.biometricSettingsRepository + + @Test + fun fingerprintErrorMessage() = + testScope.runTest { + val fingerprintErrorMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN fingerprint is allowed + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // WHEN authentication status error is FINGERPRINT_ERROR_HW_UNAVAILABLE + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + msgId = FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE, + msg = "test" + ) + ) + + // THEN fingerprintErrorMessage is updated + assertThat(fingerprintErrorMessage?.message).isEqualTo("test") + } + + @Test + fun fingerprintLockoutErrorMessage() = + testScope.runTest { + val fingerprintErrorMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN fingerprint is allowed + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // WHEN authentication status error is FINGERPRINT_ERROR_HW_UNAVAILABLE + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + msgId = FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, + msg = "lockout" + ) + ) + + // THEN fingerprintError is updated + assertThat(fingerprintErrorMessage).isInstanceOf(FingerprintLockoutMessage::class.java) + assertThat(fingerprintErrorMessage?.message).isEqualTo("lockout") + } + + @Test + fun fingerprintErrorMessage_suppressedError() = + testScope.runTest { + val fingerprintErrorMessage by collectLastValue(underTest.fingerprintMessage) + + // WHEN authentication status error is FINGERPRINT_ERROR_HW_UNAVAILABLE + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + msgId = FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE, + msg = "test" + ) + ) + + // THEN fingerprintErrorMessage isn't update - it's still null + assertThat(fingerprintErrorMessage).isNull() + } + + @Test + fun fingerprintHelpMessage() = + testScope.runTest { + val fingerprintHelpMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN fingerprint is allowed + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // WHEN authentication status help is FINGERPRINT_ACQUIRED_IMAGER_DIRTY + fingerprintAuthRepository.setAuthenticationStatus( + HelpFingerprintAuthenticationStatus( + msgId = FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY, + msg = "test" + ) + ) + + // THEN fingerprintHelpMessage is updated + assertThat(fingerprintHelpMessage?.message).isEqualTo("test") + } + + @Test + fun fingerprintHelpMessage_primaryAuthRequired() = + testScope.runTest { + val fingerprintHelpMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN fingerprint cannot currently be used + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(false) + + // WHEN authentication status help is FINGERPRINT_ACQUIRED_IMAGER_DIRTY + fingerprintAuthRepository.setAuthenticationStatus( + HelpFingerprintAuthenticationStatus( + msgId = FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY, + msg = "test" + ) + ) + + // THEN fingerprintHelpMessage isn't update - it's still null + assertThat(fingerprintHelpMessage).isNull() + } + + @Test + fun fingerprintFailMessage_nonUdfps() = + testScope.runTest { + val fingerprintFailMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN rear fingerprint (not UDFPS) + fingerprintPropertyRepository.setProperties( + 0, + SensorStrength.STRONG, + FingerprintSensorType.REAR, + mapOf() + ) + + // GIVEN fingerprint is allowed + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // WHEN authentication status fail + fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) + + // THEN fingerprintFailMessage is updated + assertThat(fingerprintFailMessage?.message) + .isEqualTo( + kosmos.mainResources.getString( + com.android.internal.R.string.fingerprint_error_not_match + ) + ) + } + + @Test + fun fingerprintFailMessage_udfps() = + testScope.runTest { + val fingerprintFailMessage by collectLastValue(underTest.fingerprintMessage) + + // GIVEN UDFPS + fingerprintPropertyRepository.setProperties( + 0, + SensorStrength.STRONG, + FingerprintSensorType.UDFPS_OPTICAL, + mapOf() + ) + + // GIVEN fingerprint is allowed + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // WHEN authentication status fail + fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) + + // THEN fingerprintFailMessage is updated to udfps message + assertThat(fingerprintFailMessage?.message) + .isEqualTo( + kosmos.mainResources.getString( + com.android.internal.R.string.fingerprint_udfps_error_not_match + ) + ) + } + + @Test + fun faceFailedMessage_primaryAuthRequired() = + testScope.runTest { + val faceFailedMessage by collectLastValue(underTest.faceMessage) + + // GIVEN face is not allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(false) + + // WHEN authentication status fail + faceAuthRepository.setAuthenticationStatus(FailedFaceAuthenticationStatus()) + + // THEN fingerprintFailedMessage doesn't update - it's still null + assertThat(faceFailedMessage).isNull() + } + + @Test + fun faceFailedMessage_faceOnly() = + testScope.runTest { + val faceFailedMessage by collectLastValue(underTest.faceMessage) + + // GIVEN face is allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + + // GIVEN face only enrolled + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + + // WHEN authentication status fail + faceAuthRepository.setAuthenticationStatus(FailedFaceAuthenticationStatus()) + + // THEN fingerprintFailedMessage is updated + assertThat(faceFailedMessage).isNotNull() + } + + @Test + fun faceHelpMessage_faceOnly() = + testScope.runTest { + val faceHelpMessage by collectLastValue(underTest.faceMessage) + + // GIVEN face is allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + + // GIVEN face only enrolled + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(false) + + // WHEN authentication status help + faceAuthRepository.setAuthenticationStatus( + HelpFaceAuthenticationStatus( + msg = "Move left", + msgId = FaceManager.FACE_ACQUIRED_TOO_RIGHT, + ) + ) + + // THEN fingerprintFailedMessage is updated + assertThat(faceHelpMessage).isNotNull() + } + + @Test + fun faceHelpMessage_coEx() = + testScope.runTest { + val faceHelpMessage by collectLastValue(underTest.faceMessage) + + // GIVEN face and fingerprint are allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) + + // GIVEN face only enrolled + biometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true) + biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) + + // WHEN authentication status help + faceAuthRepository.setAuthenticationStatus( + HelpFaceAuthenticationStatus( + msg = "Move left", + msgId = FaceManager.FACE_ACQUIRED_TOO_RIGHT, + ) + ) + + // THEN fingerprintFailedMessage is NOT updated + assertThat(faceHelpMessage).isNull() + } + + @Test + fun faceErrorMessage_suppressedError() = + testScope.runTest { + val faceErrorMessage by collectLastValue(underTest.faceMessage) + + // WHEN authentication status error is FACE_ERROR_HW_UNAVAILABLE + faceAuthRepository.setAuthenticationStatus( + ErrorFaceAuthenticationStatus( + msgId = FaceManager.FACE_ERROR_HW_UNAVAILABLE, + msg = "test" + ) + ) + + // THEN faceErrorMessage isn't updated - it's still null since it was suppressed + assertThat(faceErrorMessage).isNull() + } + + @Test + fun faceErrorMessage() = + testScope.runTest { + val faceErrorMessage by collectLastValue(underTest.faceMessage) + + // WHEN authentication status error is FACE_ERROR_HW_UNAVAILABLE + faceAuthRepository.setAuthenticationStatus( + ErrorFaceAuthenticationStatus( + msgId = FaceManager.FACE_ERROR_HW_UNAVAILABLE, + msg = "test" + ) + ) + + // GIVEN face is allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + + // THEN faceErrorMessage is updated + assertThat(faceErrorMessage?.message).isEqualTo("test") + } + + @Test + fun faceTimeoutErrorMessage() = + testScope.runTest { + val faceErrorMessage by collectLastValue(underTest.faceMessage) + + // WHEN authentication status error is FACE_ERROR_HW_UNAVAILABLE + faceAuthRepository.setAuthenticationStatus( + ErrorFaceAuthenticationStatus(msgId = FaceManager.FACE_ERROR_TIMEOUT, msg = "test") + ) + + // GIVEN face is allowed + biometricSettingsRepository.setIsFaceAuthCurrentlyAllowed(true) + + // THEN faceErrorMessage is updated + assertThat(faceErrorMessage).isInstanceOf(FaceTimeoutMessage::class.java) + assertThat(faceErrorMessage?.message).isEqualTo("test") + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryHapticsInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryHapticsInteractorTest.kt index bdf0e06ce410..43c860cd302f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryHapticsInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryHapticsInteractorTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt new file mode 100644 index 000000000000..f36f0320b14d --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt @@ -0,0 +1,259 @@ +/* + * 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.deviceentry.domain.interactor + +import android.content.Intent +import android.content.mockedContext +import android.hardware.fingerprint.FingerprintManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.bouncer.data.repository.keyguardBouncerRepository +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.keyguard.data.repository.biometricSettingsRepository +import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository +import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus +import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus +import com.android.systemui.kosmos.testScope +import com.android.systemui.plugins.ActivityStarter.OnDismissAction +import com.android.systemui.plugins.activityStarter +import com.android.systemui.power.data.repository.fakePowerRepository +import com.android.systemui.testKosmos +import com.android.systemui.util.mockito.any +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.eq +import org.mockito.ArgumentMatchers.isNull +import org.mockito.Mockito.never +import org.mockito.Mockito.verify + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@RunWith(AndroidJUnit4::class) +class OccludingAppDeviceEntryInteractorTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val underTest = kosmos.occludingAppDeviceEntryInteractor + + private val fingerprintAuthRepository = kosmos.deviceEntryFingerprintAuthRepository + private val keyguardRepository = kosmos.fakeKeyguardRepository + private val bouncerRepository = kosmos.keyguardBouncerRepository + private val powerRepository = kosmos.fakePowerRepository + private val biometricSettingsRepository = kosmos.biometricSettingsRepository + private val mockedContext = kosmos.mockedContext + private val mockedActivityStarter = kosmos.activityStarter + + @Test + fun fingerprintSuccess_goToHomeScreen() = + testScope.runTest { + givenOnOccludingApp(true) + fingerprintAuthRepository.setAuthenticationStatus( + SuccessFingerprintAuthenticationStatus(0, true) + ) + runCurrent() + verifyGoToHomeScreen() + } + + @Test + fun fingerprintSuccess_notInteractive_doesNotGoToHomeScreen() = + testScope.runTest { + givenOnOccludingApp(true) + powerRepository.setInteractive(false) + fingerprintAuthRepository.setAuthenticationStatus( + SuccessFingerprintAuthenticationStatus(0, true) + ) + runCurrent() + verifyNeverGoToHomeScreen() + } + + @Test + fun fingerprintSuccess_dreaming_doesNotGoToHomeScreen() = + testScope.runTest { + givenOnOccludingApp(true) + keyguardRepository.setDreaming(true) + fingerprintAuthRepository.setAuthenticationStatus( + SuccessFingerprintAuthenticationStatus(0, true) + ) + runCurrent() + verifyNeverGoToHomeScreen() + } + + @Test + fun fingerprintSuccess_notOnOccludingApp_doesNotGoToHomeScreen() = + testScope.runTest { + givenOnOccludingApp(false) + fingerprintAuthRepository.setAuthenticationStatus( + SuccessFingerprintAuthenticationStatus(0, true) + ) + runCurrent() + verifyNeverGoToHomeScreen() + } + + @Test + fun lockout_goToHomeScreenOnDismissAction() = + testScope.runTest { + givenOnOccludingApp(true) + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, + "lockoutTest" + ) + ) + runCurrent() + verifyGoToHomeScreenOnDismiss() + } + + @Test + fun lockout_notOnOccludingApp_neverGoToHomeScreen() = + testScope.runTest { + givenOnOccludingApp(false) + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, + "lockoutTest" + ) + ) + runCurrent() + verifyNeverGoToHomeScreen() + } + + @Test + fun message_fpFailOnOccludingApp_thenNotOnOccludingApp() = + testScope.runTest { + val message by collectLastValue(underTest.message) + + givenOnOccludingApp(true) + givenFingerprintAllowed(true) + runCurrent() + // WHEN a fp failure come in + fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) + + // GIVEN fingerprint shouldn't run + givenOnOccludingApp(false) + runCurrent() + // WHEN another fp failure arrives + fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) + + // THEN message set to null + assertThat(message).isNull() + } + + @Test + fun message_fpErrorHelpFailOnOccludingApp() = + testScope.runTest { + val message by collectLastValue(underTest.message) + + givenOnOccludingApp(true) + givenFingerprintAllowed(true) + runCurrent() + + // ERROR message + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE, + "testError", + ) + ) + assertThat(message?.message).isEqualTo("testError") + + // HELP message + fingerprintAuthRepository.setAuthenticationStatus( + HelpFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ACQUIRED_PARTIAL, + "testHelp", + ) + ) + assertThat(message?.message).isEqualTo("testHelp") + + // FAIL message + fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) + assertThat(message?.message).isNotEqualTo("testHelp") + } + + @Test + fun message_fpError_lockoutFilteredOut() = + testScope.runTest { + val message by collectLastValue(underTest.message) + + givenOnOccludingApp(true) + givenFingerprintAllowed(true) + runCurrent() + + // permanent lockout error message + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT, + "testPermanentLockoutMessageFiltered", + ) + ) + assertThat(message).isNull() + + // temporary lockout error message + fingerprintAuthRepository.setAuthenticationStatus( + ErrorFingerprintAuthenticationStatus( + FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, + "testLockoutMessageFiltered", + ) + ) + assertThat(message).isNull() + } + + private fun givenOnOccludingApp(isOnOccludingApp: Boolean) { + powerRepository.setInteractive(true) + keyguardRepository.setKeyguardOccluded(isOnOccludingApp) + keyguardRepository.setKeyguardShowing(isOnOccludingApp) + keyguardRepository.setDreaming(false) + bouncerRepository.setPrimaryShow(!isOnOccludingApp) + bouncerRepository.setAlternateVisible(!isOnOccludingApp) + } + + private fun givenFingerprintAllowed(allowed: Boolean) { + biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(allowed) + } + + private fun verifyGoToHomeScreen() { + val intentCaptor = ArgumentCaptor.forClass(Intent::class.java) + verify(mockedContext).startActivity(intentCaptor.capture()) + + assertThat(intentCaptor.value.hasCategory(Intent.CATEGORY_HOME)).isTrue() + assertThat(intentCaptor.value.action).isEqualTo(Intent.ACTION_MAIN) + } + + private fun verifyNeverGoToHomeScreen() { + verify(mockedContext, never()).startActivity(any()) + verify(mockedActivityStarter, never()) + .dismissKeyguardThenExecute(any(OnDismissAction::class.java), isNull(), eq(false)) + } + + private fun verifyGoToHomeScreenOnDismiss() { + val onDimissActionCaptor = ArgumentCaptor.forClass(OnDismissAction::class.java) + verify(mockedActivityStarter) + .dismissKeyguardThenExecute(onDimissActionCaptor.capture(), isNull(), eq(false)) + onDimissActionCaptor.value.onDismiss() + + verifyGoToHomeScreen() + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/UdfpsAccessibilityOverlayViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/UdfpsAccessibilityOverlayViewModelTest.kt index e158e47b3cfa..e97edcbdc68a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/UdfpsAccessibilityOverlayViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/UdfpsAccessibilityOverlayViewModelTest.kt @@ -27,6 +27,7 @@ import com.android.systemui.deviceentry.data.ui.viewmodel.deviceEntryUdfpsAccess import com.android.systemui.flags.Flags.FULL_SCREEN_USER_SWITCHER import com.android.systemui.flags.fakeFeatureFlagsClassic import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState @@ -51,6 +52,7 @@ class UdfpsAccessibilityOverlayViewModelTest : SysuiTestCase() { } private val deviceEntryIconTransition = kosmos.fakeDeviceEntryIconViewModelTransition private val testScope = kosmos.testScope + private val keyguardRepository = kosmos.fakeKeyguardRepository private val accessibilityRepository = kosmos.fakeAccessibilityRepository private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository @@ -101,13 +103,11 @@ class UdfpsAccessibilityOverlayViewModelTest : SysuiTestCase() { ) assertThat(visible).isFalse() } - - @Test - fun deviceUnlocked_overlayNotVisible() = + fun fpNotRunning_overlayNotVisible() = testScope.runTest { val visible by collectLastValue(underTest.visible) setupVisibleStateOnLockscreen() - deviceEntryRepository.setUnlocked(true) + deviceEntryFingerprintAuthRepository.setIsRunning(false) assertThat(visible).isFalse() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt index f2bd817af44d..37836a56fdd5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryTest.kt @@ -19,12 +19,18 @@ package com.android.systemui.keyguard.data.repository +import android.os.fakeExecutorHandler import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.common.ui.data.repository.ConfigurationRepository +import com.android.systemui.concurrency.fakeExecutor import com.android.systemui.coroutines.collectLastValue import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint.Companion.DEFAULT +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.testKosmos +import com.android.systemui.util.ThreadAssert import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -45,17 +51,23 @@ class KeyguardBlueprintRepositoryTest : SysuiTestCase() { private lateinit var underTest: KeyguardBlueprintRepository @Mock lateinit var configurationRepository: ConfigurationRepository @Mock lateinit var defaultLockscreenBlueprint: DefaultKeyguardBlueprint + @Mock lateinit var threadAssert: ThreadAssert private val testScope = TestScope(StandardTestDispatcher()) + private val kosmos: Kosmos = testKosmos() @Before fun setup() { MockitoAnnotations.initMocks(this) - whenever(defaultLockscreenBlueprint.id).thenReturn(DEFAULT) - underTest = - KeyguardBlueprintRepository( - configurationRepository, - setOf(defaultLockscreenBlueprint), - ) + with(kosmos) { + whenever(defaultLockscreenBlueprint.id).thenReturn(DEFAULT) + underTest = + KeyguardBlueprintRepository( + configurationRepository, + setOf(defaultLockscreenBlueprint), + fakeExecutorHandler, + threadAssert, + ) + } } @Test @@ -88,13 +100,17 @@ class KeyguardBlueprintRepositoryTest : SysuiTestCase() { @Test fun testTransitionToSameBlueprint_refreshesBlueprint() = - testScope.runTest { - val refreshBlueprint by collectLastValue(underTest.refreshBluePrint) - runCurrent() + with(kosmos) { + testScope.runTest { + val transition by collectLastValue(underTest.refreshTransition) + fakeExecutor.runAllReady() + runCurrent() - underTest.applyBlueprint(defaultLockscreenBlueprint) - runCurrent() + underTest.applyBlueprint(defaultLockscreenBlueprint) + fakeExecutor.runAllReady() + runCurrent() - assertThat(refreshBlueprint).isNotNull() + assertThat(transition).isNotNull() + } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractorTest.kt deleted file mode 100644 index 3389fa9a48af..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/BiometricMessageInteractorTest.kt +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.android.systemui.keyguard.domain.interactor - -import android.hardware.biometrics.BiometricSourceType.FINGERPRINT -import android.hardware.fingerprint.FingerprintManager -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.SmallTest -import com.android.keyguard.KeyguardUpdateMonitor -import com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED -import com.android.systemui.SysuiTestCase -import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository -import com.android.systemui.biometrics.shared.model.FingerprintSensorType -import com.android.systemui.biometrics.shared.model.SensorStrength -import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus -import com.android.systemui.keyguard.util.IndicationHelper -import com.android.systemui.util.mockito.whenever -import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.runTest -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.ArgumentMatchers.anyBoolean -import org.mockito.Mock -import org.mockito.MockitoAnnotations - -@OptIn(ExperimentalCoroutinesApi::class) -@SmallTest -@RunWith(AndroidJUnit4::class) -class BiometricMessageInteractorTest : SysuiTestCase() { - - private lateinit var underTest: BiometricMessageInteractor - private lateinit var testScope: TestScope - private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository - private lateinit var fingerprintAuthRepository: FakeDeviceEntryFingerprintAuthRepository - - @Mock private lateinit var indicationHelper: IndicationHelper - @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor - - @Before - fun setup() { - MockitoAnnotations.initMocks(this) - testScope = TestScope() - fingerprintPropertyRepository = FakeFingerprintPropertyRepository() - fingerprintAuthRepository = FakeDeviceEntryFingerprintAuthRepository() - underTest = - BiometricMessageInteractor( - mContext.resources, - fingerprintAuthRepository, - fingerprintPropertyRepository, - indicationHelper, - keyguardUpdateMonitor, - ) - } - - @Test - fun fingerprintErrorMessage() = - testScope.runTest { - val fingerprintErrorMessage by collectLastValue(underTest.fingerprintErrorMessage) - - // GIVEN FINGERPRINT_ERROR_HW_UNAVAILABLE should NOT be suppressed - whenever( - indicationHelper.shouldSuppressErrorMsg( - FINGERPRINT, - FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE - ) - ) - .thenReturn(false) - - // WHEN authentication status error is FINGERPRINT_ERROR_HW_UNAVAILABLE - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - msgId = FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE, - msg = "test" - ) - ) - - // THEN fingerprintErrorMessage is updated - assertThat(fingerprintErrorMessage?.source).isEqualTo(FINGERPRINT) - assertThat(fingerprintErrorMessage?.type).isEqualTo(BiometricMessageType.ERROR) - assertThat(fingerprintErrorMessage?.id) - .isEqualTo(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE) - assertThat(fingerprintErrorMessage?.message).isEqualTo("test") - } - - @Test - fun fingerprintErrorMessage_suppressedError() = - testScope.runTest { - val fingerprintErrorMessage by collectLastValue(underTest.fingerprintErrorMessage) - - // GIVEN FINGERPRINT_ERROR_HW_UNAVAILABLE should be suppressed - whenever( - indicationHelper.shouldSuppressErrorMsg( - FINGERPRINT, - FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE - ) - ) - .thenReturn(true) - - // WHEN authentication status error is FINGERPRINT_ERROR_HW_UNAVAILABLE - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - msgId = FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE, - msg = "test" - ) - ) - - // THEN fingerprintErrorMessage isn't update - it's still null - assertThat(fingerprintErrorMessage).isNull() - } - - @Test - fun fingerprintHelpMessage() = - testScope.runTest { - val fingerprintHelpMessage by collectLastValue(underTest.fingerprintHelpMessage) - - // GIVEN primary auth is NOT required - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(true) - - // WHEN authentication status help is FINGERPRINT_ACQUIRED_IMAGER_DIRTY - fingerprintAuthRepository.setAuthenticationStatus( - HelpFingerprintAuthenticationStatus( - msgId = FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY, - msg = "test" - ) - ) - - // THEN fingerprintHelpMessage is updated - assertThat(fingerprintHelpMessage?.source).isEqualTo(FINGERPRINT) - assertThat(fingerprintHelpMessage?.type).isEqualTo(BiometricMessageType.HELP) - assertThat(fingerprintHelpMessage?.id) - .isEqualTo(FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY) - assertThat(fingerprintHelpMessage?.message).isEqualTo("test") - } - - @Test - fun fingerprintHelpMessage_primaryAuthRequired() = - testScope.runTest { - val fingerprintHelpMessage by collectLastValue(underTest.fingerprintHelpMessage) - - // GIVEN primary auth is required - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(false) - - // WHEN authentication status help is FINGERPRINT_ACQUIRED_IMAGER_DIRTY - fingerprintAuthRepository.setAuthenticationStatus( - HelpFingerprintAuthenticationStatus( - msgId = FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY, - msg = "test" - ) - ) - - // THEN fingerprintHelpMessage isn't update - it's still null - assertThat(fingerprintHelpMessage).isNull() - } - - @Test - fun fingerprintFailMessage_nonUdfps() = - testScope.runTest { - val fingerprintFailMessage by collectLastValue(underTest.fingerprintFailMessage) - - // GIVEN primary auth is NOT required - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(true) - - // GIVEN rear fingerprint (not UDFPS) - fingerprintPropertyRepository.setProperties( - 0, - SensorStrength.STRONG, - FingerprintSensorType.REAR, - mapOf() - ) - - // WHEN authentication status fail - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - - // THEN fingerprintFailMessage is updated - assertThat(fingerprintFailMessage?.source).isEqualTo(FINGERPRINT) - assertThat(fingerprintFailMessage?.type).isEqualTo(BiometricMessageType.FAIL) - assertThat(fingerprintFailMessage?.id) - .isEqualTo(BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED) - assertThat(fingerprintFailMessage?.message) - .isEqualTo( - mContext.resources.getString( - com.android.internal.R.string.fingerprint_error_not_match - ) - ) - } - - @Test - fun fingerprintFailMessage_udfps() = - testScope.runTest { - val fingerprintFailMessage by collectLastValue(underTest.fingerprintFailMessage) - - // GIVEN primary auth is NOT required - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(true) - - // GIVEN UDFPS - fingerprintPropertyRepository.setProperties( - 0, - SensorStrength.STRONG, - FingerprintSensorType.UDFPS_OPTICAL, - mapOf() - ) - - // WHEN authentication status fail - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - - // THEN fingerprintFailMessage is updated to udfps message - assertThat(fingerprintFailMessage?.source).isEqualTo(FINGERPRINT) - assertThat(fingerprintFailMessage?.type).isEqualTo(BiometricMessageType.FAIL) - assertThat(fingerprintFailMessage?.id) - .isEqualTo(BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED) - assertThat(fingerprintFailMessage?.message) - .isEqualTo( - mContext.resources.getString( - com.android.internal.R.string.fingerprint_udfps_error_not_match - ) - ) - } - - @Test - fun fingerprintFailedMessage_primaryAuthRequired() = - testScope.runTest { - val fingerprintFailedMessage by collectLastValue(underTest.fingerprintFailMessage) - - // GIVEN primary auth is required - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(false) - - // WHEN authentication status fail - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - - // THEN fingerprintFailedMessage isn't update - it's still null - assertThat(fingerprintFailedMessage).isNull() - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractorTest.kt index 8b16da2a1f78..9df00d3682a4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractorTest.kt @@ -23,7 +23,9 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.keyguard.data.repository.KeyguardBlueprintRepository import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint import com.android.systemui.keyguard.ui.view.layout.blueprints.SplitShadeKeyguardBlueprint -import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransitionType +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Config +import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.IntraBlueprintTransition.Type import com.android.systemui.statusbar.policy.SplitShadeStateController import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.whenever @@ -47,8 +49,7 @@ class KeyguardBlueprintInteractorTest : SysuiTestCase() { private lateinit var underTest: KeyguardBlueprintInteractor private lateinit var testScope: TestScope - val refreshBluePrint: MutableSharedFlow<Unit> = MutableSharedFlow(extraBufferCapacity = 1) - val refreshBlueprintTransition: MutableSharedFlow<IntraBlueprintTransitionType> = + val refreshTransition: MutableSharedFlow<IntraBlueprintTransition.Config> = MutableSharedFlow(extraBufferCapacity = 1) @Mock private lateinit var splitShadeStateController: SplitShadeStateController @@ -59,9 +60,7 @@ class KeyguardBlueprintInteractorTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) testScope = TestScope(StandardTestDispatcher()) whenever(keyguardBlueprintRepository.configurationChange).thenReturn(configurationFlow) - whenever(keyguardBlueprintRepository.refreshBluePrint).thenReturn(refreshBluePrint) - whenever(keyguardBlueprintRepository.refreshBlueprintTransition) - .thenReturn(refreshBlueprintTransition) + whenever(keyguardBlueprintRepository.refreshTransition).thenReturn(refreshTransition) underTest = KeyguardBlueprintInteractor( @@ -116,8 +115,8 @@ class KeyguardBlueprintInteractorTest : SysuiTestCase() { @Test fun testRefreshBlueprintWithTransition() { - underTest.refreshBlueprintWithTransition(IntraBlueprintTransitionType.DefaultTransition) + underTest.refreshBlueprint(Type.DefaultTransition) verify(keyguardBlueprintRepository) - .refreshBlueprintWithTransition(IntraBlueprintTransitionType.DefaultTransition) + .refreshBlueprint(Config(Type.DefaultTransition, true, true)) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt deleted file mode 100644 index 7358b9d5d2d1..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/OccludingAppDeviceEntryInteractorTest.kt +++ /dev/null @@ -1,371 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.android.systemui.keyguard.domain.interactor - -import android.content.Context -import android.content.Intent -import android.hardware.biometrics.BiometricSourceType -import android.hardware.fingerprint.FingerprintManager -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.SmallTest -import com.android.keyguard.KeyguardUpdateMonitor -import com.android.systemui.SysuiTestCase -import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository -import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository -import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor -import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor -import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository -import com.android.systemui.coroutines.collectLastValue -import com.android.systemui.flags.FakeFeatureFlags -import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsRepository -import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository -import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository -import com.android.systemui.keyguard.data.repository.FakeTrustRepository -import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.FailFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.HelpFingerprintAuthenticationStatus -import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus -import com.android.systemui.keyguard.util.IndicationHelper -import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.plugins.ActivityStarter.OnDismissAction -import com.android.systemui.power.data.repository.FakePowerRepository -import com.android.systemui.power.domain.interactor.PowerInteractor -import com.android.systemui.user.domain.interactor.SelectedUserInteractor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.mock -import com.android.systemui.util.mockito.whenever -import com.android.systemui.util.time.FakeSystemClock -import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.ArgumentCaptor -import org.mockito.ArgumentMatchers.anyBoolean -import org.mockito.ArgumentMatchers.eq -import org.mockito.ArgumentMatchers.isNull -import org.mockito.Mock -import org.mockito.Mockito.never -import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations - -@OptIn(ExperimentalCoroutinesApi::class) -@SmallTest -@RunWith(AndroidJUnit4::class) -class OccludingAppDeviceEntryInteractorTest : SysuiTestCase() { - - private lateinit var underTest: OccludingAppDeviceEntryInteractor - private lateinit var testScope: TestScope - private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository - private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository - private lateinit var fingerprintAuthRepository: FakeDeviceEntryFingerprintAuthRepository - private lateinit var keyguardRepository: FakeKeyguardRepository - private lateinit var bouncerRepository: FakeKeyguardBouncerRepository - private lateinit var configurationRepository: FakeConfigurationRepository - private lateinit var featureFlags: FakeFeatureFlags - private lateinit var trustRepository: FakeTrustRepository - private lateinit var powerRepository: FakePowerRepository - private lateinit var powerInteractor: PowerInteractor - - @Mock private lateinit var indicationHelper: IndicationHelper - @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor - @Mock private lateinit var mockedContext: Context - @Mock private lateinit var activityStarter: ActivityStarter - @Mock private lateinit var mSelectedUserInteractor: SelectedUserInteractor - - @Before - fun setup() { - MockitoAnnotations.initMocks(this) - testScope = TestScope() - biometricSettingsRepository = FakeBiometricSettingsRepository() - fingerprintPropertyRepository = FakeFingerprintPropertyRepository() - fingerprintAuthRepository = FakeDeviceEntryFingerprintAuthRepository() - keyguardRepository = FakeKeyguardRepository() - bouncerRepository = FakeKeyguardBouncerRepository() - configurationRepository = FakeConfigurationRepository() - featureFlags = FakeFeatureFlags() - trustRepository = FakeTrustRepository() - powerRepository = FakePowerRepository() - powerInteractor = - PowerInteractor( - powerRepository, - falsingCollector = mock(), - screenOffAnimationController = mock(), - statusBarStateController = mock(), - ) - - underTest = - OccludingAppDeviceEntryInteractor( - BiometricMessageInteractor( - mContext.resources, - fingerprintAuthRepository, - fingerprintPropertyRepository, - indicationHelper, - keyguardUpdateMonitor, - ), - fingerprintAuthRepository, - KeyguardInteractorFactory.create( - featureFlags = featureFlags, - repository = keyguardRepository, - bouncerRepository = bouncerRepository, - configurationRepository = configurationRepository, - sceneInteractor = - mock { whenever(transitioningTo).thenReturn(MutableStateFlow(null)) }, - powerInteractor = powerInteractor, - ) - .keyguardInteractor, - PrimaryBouncerInteractor( - bouncerRepository, - primaryBouncerView = mock(), - mainHandler = mock(), - keyguardStateController = mock(), - keyguardSecurityModel = mock(), - primaryBouncerCallbackInteractor = mock(), - falsingCollector = mock(), - dismissCallbackRegistry = mock(), - context, - keyguardUpdateMonitor, - trustRepository, - testScope.backgroundScope, - mSelectedUserInteractor, - deviceEntryFaceAuthInteractor = mock(), - ), - AlternateBouncerInteractor( - statusBarStateController = mock(), - keyguardStateController = mock(), - bouncerRepository, - FakeFingerprintPropertyRepository(), - biometricSettingsRepository, - FakeSystemClock(), - keyguardUpdateMonitor, - scope = testScope.backgroundScope, - ), - testScope.backgroundScope, - mockedContext, - activityStarter, - powerInteractor, - ) - } - - @Test - fun fingerprintSuccess_goToHomeScreen() = - testScope.runTest { - givenOnOccludingApp(true) - fingerprintAuthRepository.setAuthenticationStatus( - SuccessFingerprintAuthenticationStatus(0, true) - ) - runCurrent() - verifyGoToHomeScreen() - } - - @Test - fun fingerprintSuccess_notInteractive_doesNotGoToHomeScreen() = - testScope.runTest { - givenOnOccludingApp(true) - powerRepository.setInteractive(false) - fingerprintAuthRepository.setAuthenticationStatus( - SuccessFingerprintAuthenticationStatus(0, true) - ) - runCurrent() - verifyNeverGoToHomeScreen() - } - - @Test - fun fingerprintSuccess_dreaming_doesNotGoToHomeScreen() = - testScope.runTest { - givenOnOccludingApp(true) - keyguardRepository.setDreaming(true) - fingerprintAuthRepository.setAuthenticationStatus( - SuccessFingerprintAuthenticationStatus(0, true) - ) - runCurrent() - verifyNeverGoToHomeScreen() - } - - @Test - fun fingerprintSuccess_notOnOccludingApp_doesNotGoToHomeScreen() = - testScope.runTest { - givenOnOccludingApp(false) - fingerprintAuthRepository.setAuthenticationStatus( - SuccessFingerprintAuthenticationStatus(0, true) - ) - runCurrent() - verifyNeverGoToHomeScreen() - } - - @Test - fun lockout_goToHomeScreenOnDismissAction() = - testScope.runTest { - givenOnOccludingApp(true) - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, - "lockoutTest" - ) - ) - runCurrent() - verifyGoToHomeScreenOnDismiss() - } - - @Test - fun lockout_notOnOccludingApp_neverGoToHomeScreen() = - testScope.runTest { - givenOnOccludingApp(false) - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, - "lockoutTest" - ) - ) - runCurrent() - verifyNeverGoToHomeScreen() - } - - @Test - fun message_fpFailOnOccludingApp_thenNotOnOccludingApp() = - testScope.runTest { - val message by collectLastValue(underTest.message) - - givenOnOccludingApp(true) - givenPrimaryAuthRequired(false) - runCurrent() - // WHEN a fp failure come in - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - // THEN message set to failure - assertThat(message?.type).isEqualTo(BiometricMessageType.FAIL) - - // GIVEN fingerprint shouldn't run - givenOnOccludingApp(false) - runCurrent() - // WHEN another fp failure arrives - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - - // THEN message set to null - assertThat(message).isNull() - } - - @Test - fun message_fpErrorHelpFailOnOccludingApp() = - testScope.runTest { - val message by collectLastValue(underTest.message) - - givenOnOccludingApp(true) - givenPrimaryAuthRequired(false) - runCurrent() - - // ERROR message - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ERROR_CANCELED, - "testError", - ) - ) - assertThat(message?.source).isEqualTo(BiometricSourceType.FINGERPRINT) - assertThat(message?.id).isEqualTo(FingerprintManager.FINGERPRINT_ERROR_CANCELED) - assertThat(message?.message).isEqualTo("testError") - assertThat(message?.type).isEqualTo(BiometricMessageType.ERROR) - - // HELP message - fingerprintAuthRepository.setAuthenticationStatus( - HelpFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ACQUIRED_PARTIAL, - "testHelp", - ) - ) - assertThat(message?.source).isEqualTo(BiometricSourceType.FINGERPRINT) - assertThat(message?.id).isEqualTo(FingerprintManager.FINGERPRINT_ACQUIRED_PARTIAL) - assertThat(message?.message).isEqualTo("testHelp") - assertThat(message?.type).isEqualTo(BiometricMessageType.HELP) - - // FAIL message - fingerprintAuthRepository.setAuthenticationStatus(FailFingerprintAuthenticationStatus) - assertThat(message?.source).isEqualTo(BiometricSourceType.FINGERPRINT) - assertThat(message?.id) - .isEqualTo(KeyguardUpdateMonitor.BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED) - assertThat(message?.type).isEqualTo(BiometricMessageType.FAIL) - } - - @Test - fun message_fpError_lockoutFilteredOut() = - testScope.runTest { - val message by collectLastValue(underTest.message) - - givenOnOccludingApp(true) - givenPrimaryAuthRequired(false) - runCurrent() - - // permanent lockout error message - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT, - "testPermanentLockoutMessageFiltered", - ) - ) - assertThat(message).isNull() - - // temporary lockout error message - fingerprintAuthRepository.setAuthenticationStatus( - ErrorFingerprintAuthenticationStatus( - FingerprintManager.FINGERPRINT_ERROR_LOCKOUT, - "testLockoutMessageFiltered", - ) - ) - assertThat(message).isNull() - } - - private fun givenOnOccludingApp(isOnOccludingApp: Boolean) { - powerRepository.setInteractive(true) - keyguardRepository.setKeyguardOccluded(isOnOccludingApp) - keyguardRepository.setKeyguardShowing(isOnOccludingApp) - keyguardRepository.setDreaming(false) - bouncerRepository.setPrimaryShow(!isOnOccludingApp) - bouncerRepository.setAlternateVisible(!isOnOccludingApp) - } - - private fun givenPrimaryAuthRequired(required: Boolean) { - whenever(keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(!required) - } - - private fun verifyGoToHomeScreen() { - val intentCaptor = ArgumentCaptor.forClass(Intent::class.java) - verify(mockedContext).startActivity(intentCaptor.capture()) - - assertThat(intentCaptor.value.hasCategory(Intent.CATEGORY_HOME)).isTrue() - assertThat(intentCaptor.value.action).isEqualTo(Intent.ACTION_MAIN) - } - - private fun verifyNeverGoToHomeScreen() { - verify(mockedContext, never()).startActivity(any()) - verify(activityStarter, never()) - .dismissKeyguardThenExecute(any(OnDismissAction::class.java), isNull(), eq(false)) - } - - private fun verifyGoToHomeScreenOnDismiss() { - val onDimissActionCaptor = ArgumentCaptor.forClass(OnDismissAction::class.java) - verify(activityStarter) - .dismissKeyguardThenExecute(onDimissActionCaptor.capture(), isNull(), eq(false)) - onDimissActionCaptor.value.onDismiss() - - verifyGoToHomeScreen() - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardSurfaceBehindParamsApplierTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardSurfaceBehindParamsApplierTest.kt index 5b29a867ceaf..7787a7fa6af1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardSurfaceBehindParamsApplierTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/KeyguardSurfaceBehindParamsApplierTest.kt @@ -43,7 +43,7 @@ import org.mockito.MockitoAnnotations @RunWithLooper(setAsMainLooper = true) @kotlinx.coroutines.ExperimentalCoroutinesApi class KeyguardSurfaceBehindParamsApplierTest : SysuiTestCase() { - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) private lateinit var underTest: KeyguardSurfaceBehindParamsApplier private lateinit var executor: FakeExecutor diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt index 2da74b099eda..08d44c1855e2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt @@ -138,10 +138,10 @@ class ClockSectionTest : SysuiTestCase() { underTest.applyDefaultConstraints(cs) val expectedLargeClockTopMargin = LARGE_CLOCK_TOP - assetLargeClockTop(cs, expectedLargeClockTopMargin) + assertLargeClockTop(cs, expectedLargeClockTopMargin) - val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_SPLIT_SHADE - CLOCK_FADE_TRANSLATION_Y - assetSmallClockTop(cs, expectedSmallClockTopMargin) + val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_SPLIT_SHADE + assertSmallClockTop(cs, expectedSmallClockTopMargin) } @Test @@ -152,10 +152,10 @@ class ClockSectionTest : SysuiTestCase() { underTest.applyDefaultConstraints(cs) val expectedLargeClockTopMargin = LARGE_CLOCK_TOP - assetLargeClockTop(cs, expectedLargeClockTopMargin) + assertLargeClockTop(cs, expectedLargeClockTopMargin) - val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_NON_SPLIT_SHADE - CLOCK_FADE_TRANSLATION_Y - assetSmallClockTop(cs, expectedSmallClockTopMargin) + val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_NON_SPLIT_SHADE + assertSmallClockTop(cs, expectedSmallClockTopMargin) } @Test @@ -166,10 +166,10 @@ class ClockSectionTest : SysuiTestCase() { underTest.applyDefaultConstraints(cs) val expectedLargeClockTopMargin = LARGE_CLOCK_TOP - assetLargeClockTop(cs, expectedLargeClockTopMargin) + assertLargeClockTop(cs, expectedLargeClockTopMargin) val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_SPLIT_SHADE - assetSmallClockTop(cs, expectedSmallClockTopMargin) + assertSmallClockTop(cs, expectedSmallClockTopMargin) } @Test @@ -179,10 +179,10 @@ class ClockSectionTest : SysuiTestCase() { val cs = ConstraintSet() underTest.applyDefaultConstraints(cs) val expectedLargeClockTopMargin = LARGE_CLOCK_TOP - assetLargeClockTop(cs, expectedLargeClockTopMargin) + assertLargeClockTop(cs, expectedLargeClockTopMargin) val expectedSmallClockTopMargin = SMALL_CLOCK_TOP_NON_SPLIT_SHADE - assetSmallClockTop(cs, expectedSmallClockTopMargin) + assertSmallClockTop(cs, expectedSmallClockTopMargin) } @Test @@ -228,16 +228,22 @@ class ClockSectionTest : SysuiTestCase() { .thenReturn(isInSplitShade) } - private fun assetLargeClockTop(cs: ConstraintSet, expectedLargeClockTopMargin: Int) { + private fun assertLargeClockTop(cs: ConstraintSet, expectedLargeClockTopMargin: Int) { val largeClockConstraint = cs.getConstraint(R.id.lockscreen_clock_view_large) assertThat(largeClockConstraint.layout.topToTop).isEqualTo(ConstraintSet.PARENT_ID) assertThat(largeClockConstraint.layout.topMargin).isEqualTo(expectedLargeClockTopMargin) } - private fun assetSmallClockTop(cs: ConstraintSet, expectedSmallClockTopMargin: Int) { + private fun assertSmallClockTop(cs: ConstraintSet, expectedSmallClockTopMargin: Int) { + val smallClockGuidelineConstraint = cs.getConstraint(R.id.small_clock_guideline_top) + assertThat(smallClockGuidelineConstraint.layout.topToTop).isEqualTo(-1) + assertThat(smallClockGuidelineConstraint.layout.guideBegin) + .isEqualTo(expectedSmallClockTopMargin) + val smallClockConstraint = cs.getConstraint(R.id.lockscreen_clock_view) - assertThat(smallClockConstraint.layout.topToTop).isEqualTo(ConstraintSet.PARENT_ID) - assertThat(smallClockConstraint.layout.topMargin).isEqualTo(expectedSmallClockTopMargin) + assertThat(smallClockConstraint.layout.topToBottom) + .isEqualTo(R.id.small_clock_guideline_top) + assertThat(smallClockConstraint.layout.topMargin).isEqualTo(0) } companion object { diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModelTest.kt index 8b05a54fe7cf..e7aaddd94695 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGoneTransitionViewModelTest.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState @@ -56,6 +57,41 @@ class LockscreenToGoneTransitionViewModelTest : SysuiTestCase() { deviceEntryParentViewAlpha.forEach { assertThat(it).isEqualTo(0f) } } + @Test + fun lockscreenAlphaStartsFromViewStateAccessorAlpha() = + testScope.runTest { + val viewState = ViewStateAccessor(alpha = { 0.5f }) + val alpha by collectLastValue(underTest.lockscreenAlpha(viewState)) + + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + + repository.sendTransitionStep(step(0f)) + assertThat(alpha).isEqualTo(0.5f) + + repository.sendTransitionStep(step(0.25f)) + assertThat(alpha).isEqualTo(0.25f) + + repository.sendTransitionStep(step(.5f)) + assertThat(alpha).isEqualTo(0f) + } + + @Test + fun lockscreenAlphaWithNoViewStateAccessorValue() = + testScope.runTest { + val alpha by collectLastValue(underTest.lockscreenAlpha(ViewStateAccessor())) + + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) + + repository.sendTransitionStep(step(0f)) + assertThat(alpha).isEqualTo(0f) + + repository.sendTransitionStep(step(0.25f)) + assertThat(alpha).isEqualTo(0f) + + repository.sendTransitionStep(step(0.5f)) + assertThat(alpha).isEqualTo(0f) + } + private fun step( value: Float, state: TransitionState = TransitionState.RUNNING diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/player/SeekBarObserverTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/player/SeekBarObserverTest.kt index 100e579f1d93..4ec29ceb56d3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/player/SeekBarObserverTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/models/player/SeekBarObserverTest.kt @@ -164,6 +164,18 @@ class SeekBarObserverTest : SysuiTestCase() { } @Test + fun seekbarNotListeningNotScrubbingPlaying() { + // WHEN playing + val isPlaying = true + val isScrubbing = false + val data = + SeekBarViewModel.Progress(true, true, isPlaying, isScrubbing, 3000, 120000, false) + observer.onChanged(data) + // THEN progress drawable is not animating + verify(mockSquigglyProgress).animate = false + } + + @Test fun seekBarPlayingScrubbing() { // WHEN playing & scrubbing val isPlaying = true diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java index 8a531fd9c842..bfb18c88bf9b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java @@ -20,7 +20,10 @@ import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; +import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -47,7 +50,6 @@ import com.android.dx.mockito.inline.extended.StaticMockitoSession; import com.android.systemui.Dependency; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; -import com.android.systemui.flags.FeatureFlags; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.settings.FakeDisplayTracker; @@ -140,6 +142,8 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { @Test public void testCreateNavigationBarsIncludeDefaultTrue() { + assumeFalse(enableTaskbarNavbarUnification()); + // Large screens may be using taskbar and the logic is different mNavigationBarController.mIsLargeScreen = false; doNothing().when(mNavigationBarController).createNavigationBar(any(), any(), any()); @@ -295,11 +299,22 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { } @Test - public void testConfigurationChange_taskbarInitialized() { + public void testConfigurationChangeUnfolding_taskbarInitialized() { Configuration configuration = mContext.getResources().getConfiguration(); when(Utilities.isLargeScreen(any())).thenReturn(true); when(mTaskbarDelegate.isInitialized()).thenReturn(true); mNavigationBarController.onConfigChanged(configuration); verify(mTaskbarDelegate, times(1)).onConfigurationChanged(configuration); } + + @Test + public void testConfigurationChangeFolding_taskbarInitialized() { + assumeTrue(enableTaskbarNavbarUnification()); + + Configuration configuration = mContext.getResources().getConfiguration(); + when(Utilities.isLargeScreen(any())).thenReturn(false); + when(mTaskbarDelegate.isInitialized()).thenReturn(true); + mNavigationBarController.onConfigChanged(configuration); + verify(mTaskbarDelegate, times(1)).onConfigurationChanged(configuration); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt index bbae0c90170a..ae2a9add4fb7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt @@ -40,7 +40,7 @@ import org.junit.runner.RunWith @SmallTest class QSIconViewImplTest_311121830 : SysuiTestCase() { - @get:Rule val animatorRule = AnimatorTestRule() + @get:Rule val animatorRule = AnimatorTestRule(this) @Test fun alwaysLastIcon() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractorTest.kt new file mode 100644 index 000000000000..37107135c6d8 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnInteractorTest.kt @@ -0,0 +1,98 @@ +/* + * 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.qs.tiles.dialog.bluetooth + +import android.content.pm.UserInfo +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.user.data.repository.FakeUserRepository +import com.android.systemui.util.settings.FakeSettings +import com.google.common.truth.Truth +import kotlin.test.Test +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Rule +import org.junit.runner.RunWith +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class BluetoothAutoOnInteractorTest : SysuiTestCase() { + @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule() + private val testDispatcher = StandardTestDispatcher() + private val testScope = TestScope(testDispatcher) + private var secureSettings: FakeSettings = FakeSettings() + private val userRepository: FakeUserRepository = FakeUserRepository() + private lateinit var bluetoothAutoOnInteractor: BluetoothAutoOnInteractor + + @Before + fun setUp() { + bluetoothAutoOnInteractor = + BluetoothAutoOnInteractor( + BluetoothAutoOnRepository( + secureSettings, + userRepository, + testScope.backgroundScope, + testDispatcher + ) + ) + } + + @Test + fun testSet_bluetoothAutoOnUnset_doNothing() { + testScope.runTest { + bluetoothAutoOnInteractor.setEnabled(true) + + val actualValue by collectLastValue(bluetoothAutoOnInteractor.isEnabled) + + runCurrent() + + Truth.assertThat(actualValue).isEqualTo(false) + } + } + + @Test + fun testSet_bluetoothAutoOnSet_setNewValue() { + testScope.runTest { + userRepository.setUserInfos(listOf(SYSTEM_USER)) + secureSettings.putIntForUser( + BluetoothAutoOnRepository.SETTING_NAME, + BluetoothAutoOnInteractor.DISABLED, + SYSTEM_USER_ID + ) + bluetoothAutoOnInteractor.setEnabled(true) + + val actualValue by collectLastValue(bluetoothAutoOnInteractor.isEnabled) + + runCurrent() + + Truth.assertThat(actualValue).isEqualTo(true) + } + } + + companion object { + private const val SYSTEM_USER_ID = 0 + private val SYSTEM_USER = + UserInfo(/* id= */ SYSTEM_USER_ID, /* name= */ "system user", /* flags= */ 0) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepositoryTest.kt new file mode 100644 index 000000000000..8986d99712a0 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothAutoOnRepositoryTest.kt @@ -0,0 +1,127 @@ +/* + * 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.qs.tiles.dialog.bluetooth + +import android.content.pm.UserInfo +import android.os.UserHandle +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.qs.tiles.dialog.bluetooth.BluetoothAutoOnInteractor.Companion.DISABLED +import com.android.systemui.qs.tiles.dialog.bluetooth.BluetoothAutoOnInteractor.Companion.ENABLED +import com.android.systemui.qs.tiles.dialog.bluetooth.BluetoothAutoOnRepository.Companion.SETTING_NAME +import com.android.systemui.qs.tiles.dialog.bluetooth.BluetoothAutoOnRepository.Companion.UNSET +import com.android.systemui.user.data.repository.FakeUserRepository +import com.android.systemui.util.settings.FakeSettings +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class BluetoothAutoOnRepositoryTest : SysuiTestCase() { + @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule() + private val testDispatcher = StandardTestDispatcher() + private val testScope = TestScope(testDispatcher) + private var secureSettings: FakeSettings = FakeSettings() + private val userRepository: FakeUserRepository = FakeUserRepository() + + private lateinit var bluetoothAutoOnRepository: BluetoothAutoOnRepository + + @Before + fun setUp() { + bluetoothAutoOnRepository = + BluetoothAutoOnRepository( + secureSettings, + userRepository, + testScope.backgroundScope, + testDispatcher + ) + + userRepository.setUserInfos(listOf(SECONDARY_USER, SYSTEM_USER)) + } + + @Test + fun testGetValue_valueUnset() { + testScope.runTest { + userRepository.setSelectedUserInfo(SYSTEM_USER) + val actualValue by collectLastValue(bluetoothAutoOnRepository.getValue) + + runCurrent() + + assertThat(actualValue).isEqualTo(UNSET) + assertThat(bluetoothAutoOnRepository.isValuePresent()).isFalse() + } + } + + @Test + fun testGetValue_valueFalse() { + testScope.runTest { + userRepository.setSelectedUserInfo(SYSTEM_USER) + val actualValue by collectLastValue(bluetoothAutoOnRepository.getValue) + + secureSettings.putIntForUser(SETTING_NAME, DISABLED, UserHandle.USER_SYSTEM) + runCurrent() + + assertThat(actualValue).isEqualTo(DISABLED) + } + } + + @Test + fun testGetValue_valueTrue() { + testScope.runTest { + userRepository.setSelectedUserInfo(SYSTEM_USER) + val actualValue by collectLastValue(bluetoothAutoOnRepository.getValue) + + secureSettings.putIntForUser(SETTING_NAME, ENABLED, UserHandle.USER_SYSTEM) + runCurrent() + + assertThat(actualValue).isEqualTo(ENABLED) + } + } + + @Test + fun testGetValue_valueTrue_secondaryUser_returnUnset() { + testScope.runTest { + userRepository.setSelectedUserInfo(SECONDARY_USER) + val actualValue by collectLastValue(bluetoothAutoOnRepository.getValue) + + secureSettings.putIntForUser(SETTING_NAME, ENABLED, SECONDARY_USER_ID) + runCurrent() + + assertThat(actualValue).isEqualTo(UNSET) + } + } + + companion object { + private const val SYSTEM_USER_ID = 0 + private const val SECONDARY_USER_ID = 1 + private val SYSTEM_USER = + UserInfo(/* id= */ SYSTEM_USER_ID, /* name= */ "system user", /* flags= */ 0) + private val SECONDARY_USER = + UserInfo(/* id= */ SECONDARY_USER_ID, /* name= */ "secondary user", /* flags= */ 0) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogTest.kt index 154aa1cabb0c..70b04175da91 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogTest.kt @@ -71,7 +71,11 @@ class BluetoothTileDialogTest : SysuiTestCase() { @Mock private lateinit var logger: BluetoothTileDialogLogger - private val subtitleResId = R.string.quick_settings_bluetooth_tile_subtitle + private val uiProperties = + BluetoothTileDialogViewModel.UiProperties.build( + isBluetoothEnabled = ENABLED, + isAutoOnToggleFeatureAvailable = ENABLED + ) private val fakeSystemClock = FakeSystemClock() @@ -90,7 +94,7 @@ class BluetoothTileDialogTest : SysuiTestCase() { bluetoothTileDialog = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, CONTENT_HEIGHT, bluetoothTileDialogCallback, dispatcher, @@ -131,7 +135,7 @@ class BluetoothTileDialogTest : SysuiTestCase() { bluetoothTileDialog = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, CONTENT_HEIGHT, bluetoothTileDialogCallback, dispatcher, @@ -166,7 +170,7 @@ class BluetoothTileDialogTest : SysuiTestCase() { val viewHolder = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, CONTENT_HEIGHT, bluetoothTileDialogCallback, dispatcher, @@ -194,7 +198,7 @@ class BluetoothTileDialogTest : SysuiTestCase() { val viewHolder = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, CONTENT_HEIGHT, bluetoothTileDialogCallback, dispatcher, @@ -219,7 +223,7 @@ class BluetoothTileDialogTest : SysuiTestCase() { bluetoothTileDialog = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, CONTENT_HEIGHT, bluetoothTileDialogCallback, dispatcher, @@ -253,12 +257,36 @@ class BluetoothTileDialogTest : SysuiTestCase() { } @Test - fun testShowDialog_displayFromCachedHeight() { + fun testShowDialog_cachedHeightLargerThanMinHeight_displayFromCachedHeight() { testScope.runTest { + val cachedHeight = Int.MAX_VALUE bluetoothTileDialog = BluetoothTileDialog( ENABLED, - subtitleResId, + uiProperties, + cachedHeight, + bluetoothTileDialogCallback, + dispatcher, + fakeSystemClock, + uiEventLogger, + logger, + mContext + ) + bluetoothTileDialog.show() + assertThat( + bluetoothTileDialog.requireViewById<View>(R.id.scroll_view).layoutParams.height + ) + .isEqualTo(cachedHeight) + } + } + + @Test + fun testShowDialog_cachedHeightLessThanMinHeight_displayFromUiProperties() { + testScope.runTest { + bluetoothTileDialog = + BluetoothTileDialog( + ENABLED, + uiProperties, MATCH_PARENT, bluetoothTileDialogCallback, dispatcher, @@ -271,7 +299,32 @@ class BluetoothTileDialogTest : SysuiTestCase() { assertThat( bluetoothTileDialog.requireViewById<View>(R.id.scroll_view).layoutParams.height ) - .isEqualTo(MATCH_PARENT) + .isGreaterThan(MATCH_PARENT) + } + } + + @Test + fun testShowDialog_bluetoothEnabled_autoOnToggleGone() { + testScope.runTest { + bluetoothTileDialog = + BluetoothTileDialog( + ENABLED, + BluetoothTileDialogViewModel.UiProperties.build(ENABLED, ENABLED), + MATCH_PARENT, + bluetoothTileDialogCallback, + dispatcher, + fakeSystemClock, + uiEventLogger, + logger, + mContext + ) + bluetoothTileDialog.show() + assertThat( + bluetoothTileDialog + .requireViewById<View>(R.id.bluetooth_auto_on_toggle_layout) + .visibility + ) + .isEqualTo(GONE) } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt index 98ac17b96c16..cb9f4b4e4810 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt @@ -17,20 +17,27 @@ package com.android.systemui.qs.tiles.dialog.bluetooth import android.content.SharedPreferences +import android.content.pm.UserInfo import android.testing.AndroidTestingRunner import android.testing.TestableLooper import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE import android.widget.LinearLayout import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger import com.android.settingslib.bluetooth.CachedBluetoothDevice +import com.android.settingslib.flags.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.user.data.repository.FakeUserRepository import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.nullable +import com.android.systemui.util.settings.FakeSettings import com.android.systemui.util.time.FakeSystemClock +import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow @@ -84,16 +91,36 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { private lateinit var scheduler: TestCoroutineScheduler private lateinit var dispatcher: CoroutineDispatcher private lateinit var testScope: TestScope + private lateinit var secureSettings: FakeSettings + private lateinit var userRepository: FakeUserRepository @Before fun setUp() { + mSetFlagsRule.enableFlags(Flags.FLAG_BLUETOOTH_QS_TILE_DIALOG_AUTO_ON_TOGGLE) scheduler = TestCoroutineScheduler() dispatcher = UnconfinedTestDispatcher(scheduler) testScope = TestScope(dispatcher) + secureSettings = FakeSettings() + userRepository = FakeUserRepository() + userRepository.setUserInfos(listOf(SYSTEM_USER)) + secureSettings.putIntForUser( + BluetoothAutoOnRepository.SETTING_NAME, + BluetoothAutoOnInteractor.ENABLED, + SYSTEM_USER_ID + ) bluetoothTileDialogViewModel = BluetoothTileDialogViewModel( deviceItemInteractor, bluetoothStateInteractor, + // TODO(b/316822488): Create FakeBluetoothAutoOnInteractor. + BluetoothAutoOnInteractor( + BluetoothAutoOnRepository( + secureSettings, + userRepository, + testScope.backgroundScope, + dispatcher + ) + ), mDialogTransitionAnimator, activityStarter, fakeSystemClock, @@ -174,4 +201,64 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { verify(activityStarter).postStartActivityDismissingKeyguard(any(), anyInt(), nullable()) } } + + @Test + fun testBuildUiProperties_bluetoothOn_shouldHideAutoOn() { + testScope.runTest { + val actual = + BluetoothTileDialogViewModel.UiProperties.build( + isBluetoothEnabled = true, + isAutoOnToggleFeatureAvailable = true + ) + assertThat(actual.autoOnToggleVisibility).isEqualTo(GONE) + } + } + + @Test + fun testBuildUiProperties_bluetoothOff_shouldShowAutoOn() { + testScope.runTest { + val actual = + BluetoothTileDialogViewModel.UiProperties.build( + isBluetoothEnabled = false, + isAutoOnToggleFeatureAvailable = true + ) + assertThat(actual.autoOnToggleVisibility).isEqualTo(VISIBLE) + } + } + + @Test + fun testBuildUiProperties_bluetoothOff_autoOnFeatureUnavailable_shouldHideAutoOn() { + testScope.runTest { + val actual = + BluetoothTileDialogViewModel.UiProperties.build( + isBluetoothEnabled = false, + isAutoOnToggleFeatureAvailable = false + ) + assertThat(actual.autoOnToggleVisibility).isEqualTo(GONE) + } + } + + @Test + fun testIsAutoOnToggleFeatureAvailable_flagOn_settingValueSet_returnTrue() { + testScope.runTest { + val actual = bluetoothTileDialogViewModel.isAutoOnToggleFeatureAvailable() + assertThat(actual).isTrue() + } + } + + @Test + fun testIsAutoOnToggleFeatureAvailable_flagOff_settingValueSet_returnFalse() { + testScope.runTest { + mSetFlagsRule.disableFlags(Flags.FLAG_BLUETOOTH_QS_TILE_DIALOG_AUTO_ON_TOGGLE) + + val actual = bluetoothTileDialogViewModel.isAutoOnToggleFeatureAvailable() + assertThat(actual).isFalse() + } + } + + companion object { + private const val SYSTEM_USER_ID = 0 + private val SYSTEM_USER = + UserInfo(/* id= */ SYSTEM_USER_ID, /* name= */ "system user", /* flags= */ 0) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java index 8a22f4cf3fd3..17e4e0fb33cb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java @@ -178,7 +178,8 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { mTestScope.getBackgroundScope(), new SceneContainerRepository( mTestScope.getBackgroundScope(), - mKosmos.getFakeSceneContainerConfig()), + mKosmos.getFakeSceneContainerConfig(), + mKosmos.getSceneDataSource()), powerInteractor, mock(SceneLogger.class), mKosmos.getDeviceUnlockedInteractor()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index 0c4bf8120d25..ab5e51c1b1a1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -207,6 +207,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { @Test fun testDragDownHelperCalledWhenDraggingDown() = testScope.runTest { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) whenever(dragDownHelper.isDraggingDown).thenReturn(true) val now = SystemClock.elapsedRealtime() val ev = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 0f, 0f, 0 /* meta */) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt index c2261211b339..4cc123407d83 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt @@ -26,6 +26,7 @@ import androidx.annotation.IdRes import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.test.filters.SmallTest +import com.android.systemui.Flags as AConfigFlags import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR import com.android.systemui.SysuiTestCase import com.android.systemui.fragments.FragmentHostManager @@ -400,6 +401,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testSplitShadeLayout_isAlignedToGuideline() { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) enableSplitShade() underTest.updateResources() assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd).isEqualTo(R.id.qs_edge_guideline) @@ -409,6 +411,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testSinglePaneLayout_childrenHaveEqualMargins() { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) disableSplitShade() underTest.updateResources() val qsStartMargin = getConstraintSetLayout(R.id.qs_frame).startMargin @@ -425,6 +428,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testSplitShadeLayout_childrenHaveInsideMarginsOfZero() { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) enableSplitShade() underTest.updateResources() assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin).isEqualTo(0) @@ -443,6 +447,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testLargeScreenLayout_refactorFlagOff_qsAndNotifsTopMarginIsOfHeaderHeightResource() { mSetFlagsRule.disableFlags(FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR) + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) setLargeScreen() val largeScreenHeaderResourceHeight = 100 val largeScreenHeaderHelperHeight = 200 @@ -465,6 +470,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testLargeScreenLayout_refactorFlagOn_qsAndNotifsTopMarginIsOfHeaderHeightHelper() { mSetFlagsRule.enableFlags(FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR) + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) setLargeScreen() val largeScreenHeaderResourceHeight = 100 val largeScreenHeaderHelperHeight = 200 @@ -486,6 +492,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testSmallScreenLayout_qsAndNotifsTopMarginIsZero() { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) setSmallScreen() underTest.updateResources() assertThat(getConstraintSetLayout(R.id.qs_frame).topMargin).isEqualTo(0) @@ -506,6 +513,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { @Test fun testSinglePaneShadeLayout_isAlignedToParent() { + mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL) disableSplitShade() underTest.updateResources() assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd) diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java index f582402b95a4..2f765d540b6b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java @@ -206,7 +206,8 @@ public class QuickSettingsControllerBaseTest extends SysuiTestCase { mTestScope.getBackgroundScope(), new SceneContainerRepository( mTestScope.getBackgroundScope(), - mKosmos.getFakeSceneContainerConfig()), + mKosmos.getFakeSceneContainerConfig(), + mKosmos.getSceneDataSource()), powerInteractor, mock(SceneLogger.class), mKosmos.getDeviceUnlockedInteractor()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java index 459040abd566..2bd0d7963593 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java @@ -58,6 +58,7 @@ import com.android.keyguard.logging.KeyguardLogger; import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; import com.android.systemui.biometrics.FaceHelpMessageDeferral; +import com.android.systemui.biometrics.FaceHelpMessageDeferralFactory; import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.broadcast.BroadcastDispatcher; @@ -136,6 +137,8 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase { @Mock protected AccessibilityManager mAccessibilityManager; @Mock + protected FaceHelpMessageDeferralFactory mFaceHelpMessageDeferralFactory; + @Mock protected FaceHelpMessageDeferral mFaceHelpMessageDeferral; @Mock protected AlternateBouncerInteractor mAlternateBouncerInteractor; @@ -224,6 +227,8 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase { .thenReturn(mDisclosureWithOrganization); when(mUserTracker.getUserId()).thenReturn(mCurrentUserId); + when(mFaceHelpMessageDeferralFactory.create()).thenReturn(mFaceHelpMessageDeferral); + mIndicationHelper = new IndicationHelper(mKeyguardUpdateMonitor); mWakeLock = new WakeLockFake(); @@ -257,7 +262,7 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase { mUserManager, mExecutor, mExecutor, mFalsingManager, mAuthController, mLockPatternUtils, mScreenLifecycle, mKeyguardBypassController, mAccessibilityManager, - mFaceHelpMessageDeferral, mock(KeyguardLogger.class), + mFaceHelpMessageDeferralFactory, mock(KeyguardLogger.class), mAlternateBouncerInteractor, mAlarmManager, mUserTracker, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt index 8be2ef008039..452302d4db8a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt @@ -51,7 +51,7 @@ import org.mockito.MockitoAnnotations class SystemEventChipAnimationControllerTest : SysuiTestCase() { private lateinit var controller: SystemEventChipAnimationController - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Mock private lateinit var sbWindowController: StatusBarWindowController @Mock private lateinit var insetsProvider: StatusBarContentInsetsProvider diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt index 875fe58e5b50..cacfa8dc0be4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt @@ -76,7 +76,7 @@ class SystemStatusAnimationSchedulerImplTest : SysuiTestCase() { private lateinit var chipAnimationController: SystemEventChipAnimationController private lateinit var systemStatusAnimationScheduler: SystemStatusAnimationScheduler - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Before fun setup() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt index 039fef9c1df5..82093adcb75c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorTest.kt @@ -54,7 +54,7 @@ import org.mockito.Mockito.verifyNoMoreInteractions @TestableLooper.RunWithLooper(setAsMainLooper = true) class NotificationWakeUpCoordinatorTest : SysuiTestCase() { - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) private val kosmos = Kosmos() diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinatorTest.kt index 7073cc7c5707..85b8b03a1b46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RemoteInputCoordinatorTest.kt @@ -15,7 +15,13 @@ */ package com.android.systemui.statusbar.notification.collection.coordinator +import android.app.Flags.lifetimeExtensionRefactor +import android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR +import android.app.Notification +import android.app.RemoteInputHistoryItem import android.os.Handler +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags import android.service.notification.StatusBarNotification import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper @@ -34,6 +40,7 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.No import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender.OnEndLifetimeExtensionCallback import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.captureMany import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -42,6 +49,7 @@ import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.`when` import org.mockito.Mockito.never +import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations.initMocks @@ -57,6 +65,7 @@ class RemoteInputCoordinatorTest : SysuiTestCase() { private lateinit var entry2: NotificationEntry @Mock private lateinit var lifetimeExtensionCallback: OnEndLifetimeExtensionCallback + @Mock private lateinit var rebuilder: RemoteInputNotificationRebuilder @Mock private lateinit var remoteInputManager: NotificationRemoteInputManager @Mock private lateinit var mainHandler: Handler @@ -84,9 +93,6 @@ class RemoteInputCoordinatorTest : SysuiTestCase() { listener = withArgCaptor { verify(remoteInputManager).setRemoteInputListener(capture()) } - collectionListener = withArgCaptor { - verify(pipeline).addCollectionListener(capture()) - } entry1 = NotificationEntryBuilder().setId(1).build() entry2 = NotificationEntryBuilder().setId(2).build() `when`(rebuilder.rebuildForCanceledSmartReplies(any())).thenReturn(sbn) @@ -98,16 +104,23 @@ class RemoteInputCoordinatorTest : SysuiTestCase() { val remoteInputHistoryExtender get() = coordinator.mRemoteInputHistoryExtender val smartReplyHistoryExtender get() = coordinator.mSmartReplyHistoryExtender + val collectionListeners get() = captureMany { + verify(pipeline, times(1)).addCollectionListener(capture()) + } + @Test fun testRemoteInputActive() { `when`(remoteInputManager.isRemoteInputActive(entry1)).thenReturn(true) assertThat(remoteInputActiveExtender.maybeExtendLifetime(entry1, 0)).isTrue() - assertThat(remoteInputHistoryExtender.maybeExtendLifetime(entry1, 0)).isFalse() - assertThat(smartReplyHistoryExtender.maybeExtendLifetime(entry1, 0)).isFalse() + if (!lifetimeExtensionRefactor()) { + assertThat(remoteInputHistoryExtender.maybeExtendLifetime(entry1, 0)).isFalse() + assertThat(smartReplyHistoryExtender.maybeExtendLifetime(entry1, 0)).isFalse() + } assertThat(listener.isNotificationKeptForRemoteInputHistory(entry1.key)).isFalse() } @Test + @DisableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) fun testRemoteInputHistory() { `when`(remoteInputManager.shouldKeepForRemoteInputHistory(entry1)).thenReturn(true) assertThat(remoteInputActiveExtender.maybeExtendLifetime(entry1, 0)).isFalse() @@ -117,6 +130,7 @@ class RemoteInputCoordinatorTest : SysuiTestCase() { } @Test + @DisableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) fun testSmartReplyHistory() { `when`(remoteInputManager.shouldKeepForSmartReplyHistory(entry1)).thenReturn(true) assertThat(remoteInputActiveExtender.maybeExtendLifetime(entry1, 0)).isFalse() @@ -142,4 +156,81 @@ class RemoteInputCoordinatorTest : SysuiTestCase() { verify(lifetimeExtensionCallback).onEndLifetimeExtension(remoteInputActiveExtender, entry1) assertThat(remoteInputActiveExtender.isExtending(entry1.key)).isFalse() } + + @Test + @EnableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) + fun testOnlyRemoteInputActiveLifetimeExtenderExtends() { + `when`(remoteInputManager.isRemoteInputActive(entry1)).thenReturn(true) + assertThat(remoteInputActiveExtender.maybeExtendLifetime(entry1, 0)).isTrue() + assertThat(remoteInputActiveExtender.isExtending(entry1.key)).isTrue() + + listener.onPanelCollapsed() + assertThat(remoteInputActiveExtender.isExtending(entry1.key)).isFalse() + + // Checks that lifetimeExtensionCallback is only called the expected number of times, + // by the remoteInputActiveExtender. + // Checks that the remote input history extender and smart reply history extenders + // aren't attached to the pipeline. + verify(lifetimeExtensionCallback, times(1)).onEndLifetimeExtension(any(), any()) + } + + @Test + @EnableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) + fun testRemoteInputLifetimeExtensionListenerTrigger() { + // Create notification with LIFETIME_EXTENDED_BY_DIRECT_REPLY flag. + val entry = NotificationEntryBuilder() + .setId(3) + .setTag("entry") + .setFlag(mContext, Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY, true) + .build() + `when`(remoteInputManager.shouldKeepForRemoteInputHistory(entry)).thenReturn(true) + `when`(remoteInputManager.shouldKeepForSmartReplyHistory(entry)).thenReturn(false) + + collectionListeners.forEach { + it.onEntryUpdated(entry, true) + } + + verify(rebuilder, times(1)).rebuildForRemoteInputReply(entry) + } + + @Test + @EnableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) + fun testSmartReplyLifetimeExtensionListenerTrigger() { + // Create notification with LIFETIME_EXTENDED_BY_DIRECT_REPLY flag. + val entry = NotificationEntryBuilder() + .setId(3) + .setTag("entry") + .setFlag(mContext, Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY, true) + .build() + `when`(remoteInputManager.shouldKeepForRemoteInputHistory(entry)).thenReturn(false) + `when`(remoteInputManager.shouldKeepForSmartReplyHistory(entry)).thenReturn(true) + collectionListeners.forEach { + it.onEntryUpdated(entry, true) + } + + + verify(rebuilder, times(1)).rebuildForCanceledSmartReplies(entry) + verify(smartReplyController, times(1)).stopSending(entry) + } + + @Test + @EnableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) + fun testLifetimeExtensionListenerClearsRemoteInputs() { + // Create notification with LIFETIME_EXTENDED_BY_DIRECT_REPLY flag. + val entry = NotificationEntryBuilder() + .setId(3) + .setTag("entry") + .setFlag(mContext, Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY, false) + .build() + entry.remoteInputs = ArrayList<RemoteInputHistoryItem>() + entry.remoteInputs.add(RemoteInputHistoryItem("Test Text")) + `when`(remoteInputManager.shouldKeepForRemoteInputHistory(entry)).thenReturn(false) + `when`(remoteInputManager.shouldKeepForSmartReplyHistory(entry)).thenReturn(false) + + collectionListeners.forEach { + it.onEntryUpdated(entry, true) + } + + assertThat(entry.remoteInputs).isNull() + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt index 446b9d0bd434..dbf7b6ce145e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt @@ -57,7 +57,6 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags import com.android.systemui.scene.shared.model.ObservableTransitionState import com.android.systemui.scene.shared.model.SceneKey -import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.settings.UserContextProvider import com.android.systemui.shade.shadeControllerSceneImpl import com.android.systemui.statusbar.NotificationEntryHelper @@ -607,7 +606,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { } else { SceneKey.Bouncer } - sceneInteractor.changeScene(SceneModel(key), "test") + sceneInteractor.changeScene(key, "test") sceneInteractor.setTransitionState( MutableStateFlow<ObservableTransitionState>(ObservableTransitionState.Idle(key)) ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt index d4300f08fbac..b938029cc6b8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt @@ -226,7 +226,7 @@ open class NotificationShelfTest : SysuiTestCase() { whenever(expandableView.minHeight).thenReturn(25) whenever(expandableView.shelfTransformationTarget).thenReturn(null) // use translationY - whenever(expandableView.isInShelf).thenReturn(true) + whenever(expandableView.isInShelf).thenReturn(false) whenever(ambientState.isOnKeyguard).thenReturn(true) whenever(ambientState.isExpansionChanging).thenReturn(false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt index f266f039958f..91a9da399ee8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt @@ -85,6 +85,7 @@ class StackScrollAlgorithmTest : SysuiTestCase() { private val bigGap = px(R.dimen.notification_section_divider_height) private val smallGap = px(R.dimen.notification_section_divider_height_lockscreen) + private val scrimPadding = px(R.dimen.notification_side_paddings) @Before fun setUp() { @@ -119,6 +120,18 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test + fun resetViewStates_defaultHunWhenShadeIsOpening_yTranslationIsInset() { + whenever(notificationRow.isPinned).thenReturn(true) + whenever(notificationRow.isHeadsUp).thenReturn(true) + + // scroll the panel over the HUN inset + ambientState.stackY = stackScrollAlgorithm.mHeadsUpInset + bigGap + + // the HUN translation should be the panel scroll position + the scrim padding + resetViewStates_hunYTranslationIs(ambientState.stackY + scrimPadding) + } + + @Test @DisableFlags(NotificationsImprovedHunAnimation.FLAG_NAME) fun resetViewStates_hunAnimatingAway_yTranslationIsInset() { whenever(notificationRow.isHeadsUpAnimatingAway).thenReturn(true) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackStateAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackStateAnimatorTest.kt index 414d3181c282..4f0f91a7ee56 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackStateAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackStateAnimatorTest.kt @@ -18,8 +18,10 @@ package com.android.systemui.statusbar.notification.stack import android.platform.test.annotations.EnableFlags import android.testing.AndroidTestingRunner +import android.testing.TestableLooper.RunWithLooper import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.AnimatorTestRule import com.android.systemui.res.R import com.android.systemui.statusbar.notification.row.ExpandableView import com.android.systemui.statusbar.notification.shared.NotificationsImprovedHunAnimation @@ -31,10 +33,12 @@ import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mockito.any +import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.description import org.mockito.Mockito.eq import org.mockito.Mockito.verify @@ -45,8 +49,11 @@ private const val HEADS_UP_ABOVE_SCREEN = 80 @SmallTest @RunWith(AndroidTestingRunner::class) +@RunWithLooper class StackStateAnimatorTest : SysuiTestCase() { + @get:Rule val animatorTestRule = AnimatorTestRule(this) + private lateinit var stackStateAnimator: StackStateAnimator private val stackScroller: NotificationStackScrollLayout = mock() private val view: ExpandableView = mock() @@ -112,13 +119,16 @@ class StackStateAnimatorTest : SysuiTestCase() { } @Test + @EnableFlags(NotificationsImprovedHunAnimation.FLAG_NAME) fun startAnimationForEvents_startsHeadsUpDisappearAnim() { + val disappearDuration = ANIMATION_DURATION_HEADS_UP_DISAPPEAR.toLong() val event = AnimationEvent(view, AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR) + clearInvocations(view) stackStateAnimator.startAnimationForEvents(arrayListOf(event), 0) verify(view) .performRemoveAnimation( - /* duration= */ eq(ANIMATION_DURATION_HEADS_UP_DISAPPEAR.toLong()), + /* duration= */ eq(disappearDuration), /* delay= */ eq(0L), /* translationDirection= */ eq(0f), /* isHeadsUpAnimation= */ eq(true), @@ -127,9 +137,12 @@ class StackStateAnimatorTest : SysuiTestCase() { /* animationListener= */ any() ) + animatorTestRule.advanceTimeBy(disappearDuration) // move to the end of SSA animations runnableCaptor.value.run() // execute the end runnable - verify(view, description("should be called at the end of the animation")) + verify(view, description("should be translated to the heads up appear start")) + .translationY = -stackStateAnimator.mHeadsUpAppearStartAboveScreen + verify(view, description("should be called at the end of the disappear animation")) .removeFromTransientContainer() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt index ff882b19ab13..9055ba4e1c4e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt @@ -138,7 +138,8 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { configurationRepository.onAnyConfigurationChange() - assertThat(dimens!!.paddingTop).isEqualTo(30) + // Should directly use the header height (flagged off value) + assertThat(dimens!!.paddingTop).isEqualTo(10) } @Test @@ -154,7 +155,8 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { configurationRepository.onAnyConfigurationChange() - assertThat(dimens!!.paddingTop).isEqualTo(40) + // Should directly use the header height (flagged on value) + assertThat(dimens!!.paddingTop).isEqualTo(5) } @Test @@ -456,8 +458,8 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { ) runCurrent() - // Top should be equal to bounds (1) + padding adjustment (30) - assertThat(bounds).isEqualTo(NotificationContainerBounds(top = 31f, bottom = 2f)) + // Top should be equal to bounds (1) - padding adjustment (10) + assertThat(bounds).isEqualTo(NotificationContainerBounds(top = -9f, bottom = 2f)) } @Test @@ -483,8 +485,8 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { ) runCurrent() - // Top should be equal to bounds (1) + padding adjustment (40) - assertThat(bounds).isEqualTo(NotificationContainerBounds(top = 41f, bottom = 2f)) + // Top should be equal to bounds (1) - padding adjustment (5) + assertThat(bounds).isEqualTo(NotificationContainerBounds(top = -4f, bottom = 2f)) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java index bbf9a6b93201..38698f86c659 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java @@ -45,6 +45,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.MockitoSession; +import org.mockito.quality.Strictness; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -80,6 +81,7 @@ public class KeyguardClockPositionAlgorithmTest extends SysuiTestCase { public void setUp() { MockitoAnnotations.initMocks(this); mStaticMockSession = mockitoSession() + .strictness(Strictness.WARN) .mockStatic(BurnInHelperKt.class) .mockStatic(LargeScreenHeaderHelper.class) .startMocking(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java index 2d120cd9b13f..76c9740f77dc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java @@ -147,6 +147,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { private KeyguardStatusBarView mKeyguardStatusBarView; private KeyguardStatusBarViewController mController; private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); + private final FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock()); private final TestScope mTestScope = TestScopeProvider.getTestScope(); private final FakeKeyguardRepository mKeyguardRepository = new FakeKeyguardRepository(); private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this); @@ -214,6 +215,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { mSecureSettings, mCommandQueue, mFakeExecutor, + mBackgroundExecutor, mLogger, mNotificationMediaManager, mStatusOverlayHoverListenerFactory diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyLightsOutNotifControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyLightsOutNotifControllerTest.java index bde2243db4e6..f91064b49e95 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyLightsOutNotifControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyLightsOutNotifControllerTest.java @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.platform.test.annotations.DisableFlags; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.view.Display; @@ -40,6 +41,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.notification.collection.NotifLiveData; import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore; +import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor; import org.junit.Before; import org.junit.Test; @@ -54,6 +56,7 @@ import java.util.Objects; @SmallTest @RunWith(AndroidTestingRunner.class) @RunWithLooper +@DisableFlags(NotificationsLiveDataStoreRefactor.FLAG_NAME) public class LegacyLightsOutNotifControllerTest extends SysuiTestCase { private static final int LIGHTS_ON = 0; private static final int LIGHTS_OUT = APPEARANCE_LOW_PROFILE_BARS; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImplTest.java index b3708bad6917..41b959e98221 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImplTest.java @@ -26,6 +26,7 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; +import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.demomode.DemoModeController; import com.android.systemui.flags.FeatureFlags; @@ -118,6 +119,7 @@ public class LegacyNotificationIconAreaControllerImplTest extends SysuiTestCase @Test public void testAppearResetsTranslation() { + mSetFlagsRule.disableFlags(Flags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL); mController.setupAodIcons(mAodIcons); when(mDozeParameters.shouldControlScreenOff()).thenReturn(false); mController.appearAodIcons(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt index 6eb1c1a9f12c..269b70fe6dfb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt @@ -42,6 +42,7 @@ import org.junit.Before import org.junit.Test import org.mockito.Mockito.never import org.mockito.Mockito.spy +import org.mockito.Mockito.times import org.mockito.Mockito.verify @SmallTest @@ -145,6 +146,18 @@ class PhoneStatusBarViewTest : SysuiTestCase() { } @Test + fun onConfigurationChanged_multipleCalls_flagEnabled_updatesWindowHeightMultipleTimes() { + mSetFlagsRule.enableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX) + + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + + verify(windowController, times(4)).refreshStatusBarHeight() + } + + @Test fun onConfigurationChanged_flagDisabled_doesNotUpdateWindowHeight() { mSetFlagsRule.disableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX) @@ -154,6 +167,18 @@ class PhoneStatusBarViewTest : SysuiTestCase() { } @Test + fun onConfigurationChanged_multipleCalls_flagDisabled_doesNotUpdateWindowHeight() { + mSetFlagsRule.disableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX) + + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + view.onConfigurationChanged(Configuration()) + + verify(windowController, never()).refreshStatusBarHeight() + } + + @Test fun onAttachedToWindow_updatesLeftTopRightPaddingsBasedOnInsets() { val insets = Insets.of(/* left = */ 10, /* top = */ 20, /* right = */ 30, /* bottom = */ 40) whenever(contentInsetsProvider.getStatusBarContentInsetsForCurrentRotation()) @@ -232,6 +257,10 @@ class PhoneStatusBarViewTest : SysuiTestCase() { /* privacyIndicatorBounds = */ PrivacyIndicatorBounds(), /* displayShape = */ DisplayShape.NONE, /* compatInsetsTypes = */ 0, - /* compatIgnoreVisibility = */ false + /* compatIgnoreVisibility = */ false, + /* typeBoundingRectsMap = */ arrayOf(), + /* typeMaxBoundingRectsMap = */ arrayOf(), + /* frameWidth = */ 0, + /* frameHeight = */ 0 ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 54d3607c7a83..3da5ab9f9d3d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -131,7 +131,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); private List<StatusBarWindowStateListener> mStatusBarWindowStateListeners = new ArrayList<>(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt index 2ce060c5d097..997c00cf49a4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt @@ -42,7 +42,7 @@ class MultiSourceMinAlphaControllerTest : SysuiTestCase() { private val multiSourceMinAlphaController = MultiSourceMinAlphaController(view, initialAlpha = INITIAL_ALPHA) - @get:Rule val animatorTestRule = AnimatorTestRule() + @get:Rule val animatorTestRule = AnimatorTestRule(this) @Before fun setup() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java index 658e6b01d7b4..13167b2d281f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java @@ -112,7 +112,7 @@ public class RemoteInputViewTest extends SysuiTestCase { private final UiEventLoggerFake mUiEventLoggerFake = new UiEventLoggerFake(); @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); @Before public void setUp() throws Exception { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt index 98be163bdf34..759235655eca 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt @@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest import com.android.server.notification.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.settings.FakeGlobalSettings import com.android.systemui.util.time.FakeSystemClock import org.junit.Before import org.junit.Test @@ -49,6 +50,7 @@ class SensitiveNotificationProtectionControllerFlagDisabledTest : SysuiTestCase( controller = SensitiveNotificationProtectionControllerImpl( mContext, + FakeGlobalSettings(), mediaProjectionManager, activityManager, handler, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt index a1aff48ae1b7..1dac642836c6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt @@ -22,6 +22,7 @@ import android.app.Notification import android.media.projection.MediaProjectionInfo import android.media.projection.MediaProjectionManager import android.platform.test.annotations.EnableFlags +import android.provider.Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS import android.service.notification.StatusBarNotification import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper @@ -33,6 +34,7 @@ import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.concurrency.mockExecutorHandler import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.withArgCaptor +import com.android.systemui.util.settings.FakeGlobalSettings import com.android.systemui.util.time.FakeSystemClock import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull @@ -61,6 +63,8 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { @Mock private lateinit var listener2: Runnable @Mock private lateinit var listener3: Runnable + private lateinit var executor: FakeExecutor + private lateinit var globalSettings: FakeGlobalSettings private lateinit var mediaProjectionCallback: MediaProjectionManager.Callback private lateinit var controller: SensitiveNotificationProtectionControllerImpl @@ -73,18 +77,19 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { whenever(activityManager.bugreportWhitelistedPackages) .thenReturn(listOf(BUGREPORT_PACKAGE_NAME)) - val executor = FakeExecutor(FakeSystemClock()) - + executor = FakeExecutor(FakeSystemClock()) + globalSettings = FakeGlobalSettings() controller = SensitiveNotificationProtectionControllerImpl( mContext, + globalSettings, mediaProjectionManager, activityManager, mockExecutorHandler(executor), executor ) - // Process exemption processing + // Process pending work (getting global setting and list of exemptions) executor.runAllReady() // Obtain useful MediaProjectionCallback @@ -229,6 +234,14 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { } @Test + fun isSensitiveStateActive_projectionActive_disabledViaDevOption_false() { + setDisabledViaDeveloperOption() + mediaProjectionCallback.onStart(mediaProjectionInfo) + + assertFalse(controller.isSensitiveStateActive) + } + + @Test fun shouldProtectNotification_projectionInactive_false() { val notificationEntry = mock(NotificationEntry::class.java) @@ -294,6 +307,23 @@ class SensitiveNotificationProtectionControllerTest : SysuiTestCase() { assertFalse(controller.shouldProtectNotification(notificationEntry)) } + @Test + fun shouldProtectNotification_projectionActive_disabledViaDevOption_false() { + setDisabledViaDeveloperOption() + mediaProjectionCallback.onStart(mediaProjectionInfo) + + val notificationEntry = setupNotificationEntry(TEST_PROJECTION_PACKAGE_NAME) + + assertFalse(controller.shouldProtectNotification(notificationEntry)) + } + + private fun setDisabledViaDeveloperOption() { + globalSettings.putInt(DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS, 1) + + // Process pending work that gets current developer option global setting + executor.runAllReady() + } + private fun setShareFullScreen() { whenever(mediaProjectionInfo.packageName).thenReturn(TEST_PROJECTION_PACKAGE_NAME) whenever(mediaProjectionInfo.launchCookie).thenReturn(null) diff --git a/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt new file mode 100644 index 000000000000..7c36a85243a2 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/surfaceeffects/loadingeffect/LoadingEffectTest.kt @@ -0,0 +1,267 @@ +/* + * 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.surfaceeffects.loadingeffect + +import android.graphics.Paint +import android.graphics.RenderEffect +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.systemui.model.SysUiStateTest +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState.EASE_IN +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState.EASE_OUT +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState.MAIN +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationState.NOT_PLAYING +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.AnimationStateChangedCallback +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.PaintDrawCallback +import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect.Companion.RenderEffectDrawCallback +import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseAnimationConfig +import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseShader +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.time.FakeSystemClock +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class LoadingEffectTest : SysUiStateTest() { + + private val fakeSystemClock = FakeSystemClock() + private val fakeExecutor = FakeExecutor(fakeSystemClock) + + @Test + fun play_paintCallback_triggersDrawCallback() { + var paintFromCallback: Paint? = null + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) { + paintFromCallback = loadingPaint + } + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + TurbulenceNoiseAnimationConfig(), + paintCallback = drawCallback, + animationStateChangedCallback = null + ) + + fakeExecutor.execute { + assertThat(paintFromCallback).isNull() + + loadingEffect.play() + fakeSystemClock.advanceTime(500L) + + assertThat(paintFromCallback).isNotNull() + } + } + + @Test + fun play_renderEffectCallback_triggersDrawCallback() { + var renderEffectFromCallback: RenderEffect? = null + val drawCallback = + object : RenderEffectDrawCallback { + override fun onDraw(loadingRenderEffect: RenderEffect) { + renderEffectFromCallback = loadingRenderEffect + } + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + TurbulenceNoiseAnimationConfig(), + renderEffectCallback = drawCallback, + animationStateChangedCallback = null + ) + + fakeExecutor.execute { + assertThat(renderEffectFromCallback).isNull() + + loadingEffect.play() + fakeSystemClock.advanceTime(500L) + + assertThat(renderEffectFromCallback).isNotNull() + } + } + + @Test + fun play_animationStateChangesInOrder() { + val config = TurbulenceNoiseAnimationConfig() + val expectedStates = arrayOf(NOT_PLAYING, EASE_IN, MAIN, EASE_OUT, NOT_PLAYING) + val actualStates = mutableListOf(NOT_PLAYING) + val stateChangedCallback = + object : AnimationStateChangedCallback { + override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { + actualStates.add(newState) + } + } + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) {} + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + config, + paintCallback = drawCallback, + stateChangedCallback + ) + + val timeToAdvance = + config.easeInDuration + config.maxDuration + config.easeOutDuration + 100 + + fakeExecutor.execute { + loadingEffect.play() + + fakeSystemClock.advanceTime(timeToAdvance.toLong()) + + assertThat(actualStates).isEqualTo(expectedStates) + } + } + + @Test + fun play_alreadyPlaying_playsOnlyOnce() { + val config = TurbulenceNoiseAnimationConfig() + var numPlay = 0 + val stateChangedCallback = + object : AnimationStateChangedCallback { + override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { + if (oldState == NOT_PLAYING && newState == EASE_IN) { + numPlay++ + } + } + } + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) {} + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + config, + paintCallback = drawCallback, + stateChangedCallback + ) + + fakeExecutor.execute { + assertThat(numPlay).isEqualTo(0) + + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + loadingEffect.play() + + assertThat(numPlay).isEqualTo(1) + } + } + + @Test + fun finish_finishesLoadingEffect() { + val config = TurbulenceNoiseAnimationConfig(maxDuration = 1000f) + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) {} + } + var isFinished = false + val stateChangedCallback = + object : AnimationStateChangedCallback { + override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { + if (oldState == MAIN && newState == NOT_PLAYING) { + isFinished = true + } + } + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + config, + paintCallback = drawCallback, + stateChangedCallback + ) + + fakeExecutor.execute { + assertThat(isFinished).isFalse() + + loadingEffect.play() + fakeSystemClock.advanceTime(config.easeInDuration.toLong() + 500L) + + assertThat(isFinished).isFalse() + + loadingEffect.finish() + + assertThat(isFinished).isTrue() + } + } + + @Test + fun finish_notMainState_hasNoEffect() { + val config = TurbulenceNoiseAnimationConfig(maxDuration = 1000f) + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) {} + } + var isFinished = false + val stateChangedCallback = + object : AnimationStateChangedCallback { + override fun onStateChanged(oldState: AnimationState, newState: AnimationState) { + if (oldState == MAIN && newState == NOT_PLAYING) { + isFinished = true + } + } + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + config, + paintCallback = drawCallback, + stateChangedCallback + ) + + fakeExecutor.execute { + assertThat(isFinished).isFalse() + + loadingEffect.finish() + + assertThat(isFinished).isFalse() + } + } + + @Test + fun getNoiseOffset_returnsNoiseOffset() { + val expectedNoiseOffset = arrayOf(0.1f, 0.2f, 0.3f) + val config = + TurbulenceNoiseAnimationConfig( + noiseOffsetX = expectedNoiseOffset[0], + noiseOffsetY = expectedNoiseOffset[1], + noiseOffsetZ = expectedNoiseOffset[2] + ) + val drawCallback = + object : PaintDrawCallback { + override fun onDraw(loadingPaint: Paint) {} + } + val loadingEffect = + LoadingEffect( + baseType = TurbulenceNoiseShader.Companion.Type.SIMPLEX_NOISE, + config, + paintCallback = drawCallback, + animationStateChangedCallback = null + ) + + assertThat(loadingEffect.getNoiseOffset()).isEqualTo(expectedNoiseOffset) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java index 8a33778f320a..25a0bc4fba61 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java @@ -157,7 +157,7 @@ public class VolumeDialogImplTest extends SysuiTestCase { private FakeSettings mSecureSettings; @Rule - public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(); + public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); @Before public void setup() throws Exception { diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/WalletContextualLocationsServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/WalletContextualLocationsServiceTest.kt index af1d7881195e..e6b4d069ac98 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/WalletContextualLocationsServiceTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/WalletContextualLocationsServiceTest.kt @@ -12,12 +12,9 @@ import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.test.TestCoroutineScope -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update +import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -41,11 +38,12 @@ class WalletContextualLocationsServiceTest : SysuiTestCase() { private lateinit var underTest: WalletContextualLocationsService private lateinit var testScope: TestScope private var listenerRegisteredCount: Int = 0 - private val listener: IWalletCardsUpdatedListener.Stub = object : IWalletCardsUpdatedListener.Stub() { - override fun registerNewWalletCards(cards: List<WalletCard?>) { - listenerRegisteredCount++ + private val listener: IWalletCardsUpdatedListener.Stub = + object : IWalletCardsUpdatedListener.Stub() { + override fun registerNewWalletCards(cards: List<WalletCard?>) { + listenerRegisteredCount++ + } } - } @Before @kotlinx.coroutines.ExperimentalCoroutinesApi @@ -60,50 +58,56 @@ class WalletContextualLocationsServiceTest : SysuiTestCase() { featureFlags.set(Flags.ENABLE_WALLET_CONTEXTUAL_LOYALTY_CARDS, true) listenerRegisteredCount = 0 - underTest = WalletContextualLocationsService(controller, featureFlags, testScope.backgroundScope) + underTest = + WalletContextualLocationsService(controller, featureFlags, testScope.backgroundScope) } @Test @kotlinx.coroutines.ExperimentalCoroutinesApi - fun addListener() = testScope.runTest { - underTest.addWalletCardsUpdatedListenerInternal(listener) - assertThat(listenerRegisteredCount).isEqualTo(1) - } + fun addListener() = + testScope.runTest { + underTest.addWalletCardsUpdatedListenerInternal(listener) + assertThat(listenerRegisteredCount).isEqualTo(1) + } @Test @kotlinx.coroutines.ExperimentalCoroutinesApi - fun addStoreLocations() = testScope.runTest { - underTest.onWalletContextualLocationsStateUpdatedInternal(ArrayList<String>()) - verify(controller, times(1)).setSuggestionCardIds(anySet()) - } + fun addStoreLocations() = + testScope.runTest { + underTest.onWalletContextualLocationsStateUpdatedInternal(ArrayList<String>()) + verify(controller, times(1)).setSuggestionCardIds(anySet()) + } @Test @kotlinx.coroutines.ExperimentalCoroutinesApi - fun updateListenerAndLocationsState() = testScope.runTest { - // binds to the service and adds a listener - val underTestStub = getInterface - underTestStub.addWalletCardsUpdatedListener(listener) - assertThat(listenerRegisteredCount).isEqualTo(1) + fun updateListenerAndLocationsState() = + testScope.runTest { + // binds to the service and adds a listener + val underTestStub = getInterface + underTestStub.addWalletCardsUpdatedListener(listener) + assertThat(listenerRegisteredCount).isEqualTo(1) - // sends a list of card IDs to the controller - underTestStub.onWalletContextualLocationsStateUpdated(ArrayList<String>()) - verify(controller, times(1)).setSuggestionCardIds(anySet()) + // sends a list of card IDs to the controller + underTestStub.onWalletContextualLocationsStateUpdated(ArrayList<String>()) + verify(controller, times(1)).setSuggestionCardIds(anySet()) - // adds another listener - fakeWalletCards.update{ updatedFakeWalletCards } - runCurrent() - assertThat(listenerRegisteredCount).isEqualTo(2) + // adds another listener + fakeWalletCards.update { updatedFakeWalletCards } + runCurrent() + assertThat(listenerRegisteredCount).isEqualTo(2) - // sends another list of card IDs to the controller - underTestStub.onWalletContextualLocationsStateUpdated(ArrayList<String>()) - verify(controller, times(2)).setSuggestionCardIds(anySet()) - } + // sends another list of card IDs to the controller + underTestStub.onWalletContextualLocationsStateUpdated(ArrayList<String>()) + verify(controller, times(2)).setSuggestionCardIds(anySet()) + } private val fakeWalletCards: MutableStateFlow<List<WalletCard>> get() { val intent = Intent(getContext(), WalletContextualLocationsService::class.java) - val pi: PendingIntent = PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE) - val icon: Icon = Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)) + val pi: PendingIntent = + PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE) + val icon: Icon = + Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)) val walletCards: ArrayList<WalletCard> = ArrayList<WalletCard>() walletCards.add(WalletCard.Builder("card1", icon, "card", pi).build()) walletCards.add(WalletCard.Builder("card2", icon, "card", pi).build()) @@ -113,8 +117,10 @@ class WalletContextualLocationsServiceTest : SysuiTestCase() { private val updatedFakeWalletCards: List<WalletCard> get() { val intent = Intent(getContext(), WalletContextualLocationsService::class.java) - val pi: PendingIntent = PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE) - val icon: Icon = Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)) + val pi: PendingIntent = + PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_IMMUTABLE) + val icon: Icon = + Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)) val walletCards: ArrayList<WalletCard> = ArrayList<WalletCard>() walletCards.add(WalletCard.Builder("card3", icon, "card", pi).build()) return walletCards @@ -125,4 +131,4 @@ class WalletContextualLocationsServiceTest : SysuiTestCase() { val intent = Intent() return IWalletContextualLocationsService.Stub.asInterface(underTest.onBind(intent)) } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index 8d933dcdb9d6..97bd96d605ef 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -413,7 +413,8 @@ public class BubblesTest extends SysuiTestCase { mTestScope.getBackgroundScope(), new SceneContainerRepository( mTestScope.getBackgroundScope(), - mKosmos.getFakeSceneContainerConfig()), + mKosmos.getFakeSceneContainerConfig(), + mKosmos.getSceneDataSource()), powerInteractor, mock(SceneLogger.class), mKosmos.getDeviceUnlockedInteractor()); diff --git a/packages/SystemUI/tests/utils/src/android/animation/AnimatorTestRule.java b/packages/SystemUI/tests/utils/src/android/animation/AnimatorTestRule.java index 1afe56f27be7..5860c2dd4cdc 100644 --- a/packages/SystemUI/tests/utils/src/android/animation/AnimatorTestRule.java +++ b/packages/SystemUI/tests/utils/src/android/animation/AnimatorTestRule.java @@ -16,14 +16,21 @@ package android.animation; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + import android.animation.AnimationHandler.AnimationFrameCallback; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Looper; import android.os.SystemClock; +import android.testing.TestableLooper; +import android.testing.TestableLooper.RunnableWithException; import android.util.AndroidRuntimeException; import android.util.Singleton; import android.view.Choreographer; +import android.view.animation.AnimationUtils; + +import androidx.test.platform.app.InstrumentationRegistry; import com.android.internal.util.Preconditions; @@ -74,25 +81,31 @@ public final class AnimatorTestRule implements TestRule { return new TestHandler(); } }; + private final Object mTest; private final long mStartTime; private long mTotalTimeDelta = 0; + private volatile boolean mCanLockAnimationClock; + private Looper mLooperWithLockedAnimationClock; /** - * Construct an AnimatorTestRule with a custom start time. - * @see #AnimatorTestRule() + * Construct an AnimatorTestRule with access to the test instance and a custom start time. + * @see #AnimatorTestRule(Object) */ - public AnimatorTestRule(long startTime) { + public AnimatorTestRule(Object test, long startTime) { + mTest = test; mStartTime = startTime; } /** - * Construct an AnimatorTestRule with a start time of {@link SystemClock#uptimeMillis()}. - * Initializing the start time with this clock reduces the discrepancies with various internals - * of classes like ValueAnimator which can sometimes read that clock via - * {@link android.view.animation.AnimationUtils#currentAnimationTimeMillis()}. + * Construct an AnimatorTestRule for the given test instance with a start time of + * {@link SystemClock#uptimeMillis()}. Initializing the start time with this clock reduces the + * discrepancies with various internals of classes like ValueAnimator which can sometimes read + * that clock via {@link android.view.animation.AnimationUtils#currentAnimationTimeMillis()}. + * + * @param test the test instance used to access the {@link TestableLooper} used by the class. */ - public AnimatorTestRule() { - this(SystemClock.uptimeMillis()); + public AnimatorTestRule(Object test) { + this(test, SystemClock.uptimeMillis()); } @NonNull @@ -102,10 +115,16 @@ public final class AnimatorTestRule implements TestRule { @Override public void evaluate() throws Throwable { final TestHandler testHandler = mTestHandler.get(); - AnimationHandler objAtStart = AnimationHandler.setTestHandler(testHandler); + final AnimationHandler objAtStart = AnimationHandler.setTestHandler(testHandler); + final RunnableWithException lockClock = + wrapWithRunBlocking(new LockAnimationClockRunnable()); + final RunnableWithException unlockClock = + wrapWithRunBlocking(new UnlockAnimationClockRunnable()); try { + lockClock.run(); base.evaluate(); } finally { + unlockClock.run(); AnimationHandler objAtEnd = AnimationHandler.setTestHandler(objAtStart); if (testHandler != objAtEnd) { // pass or fail, inner logic not restoring the handler needs to be reported. @@ -118,6 +137,78 @@ public final class AnimatorTestRule implements TestRule { }; } + private RunnableWithException wrapWithRunBlocking(RunnableWithException runnable) { + RunnableWithException wrapped = TestableLooper.wrapWithRunBlocking(mTest, runnable); + if (wrapped != null) { + return wrapped; + } + return () -> runOnMainThrowing(runnable); + } + + private static void runOnMainThrowing(RunnableWithException runnable) throws Exception { + if (Looper.myLooper() == Looper.getMainLooper()) { + runnable.run(); + } else { + final Throwable[] throwableBox = new Throwable[1]; + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + try { + runnable.run(); + } catch (Throwable t) { + throwableBox[0] = t; + } + }); + if (throwableBox[0] == null) { + return; + } else if (throwableBox[0] instanceof RuntimeException ex) { + throw ex; + } else if (throwableBox[0] instanceof Error err) { + throw err; + } else { + throw new RuntimeException(throwableBox[0]); + } + } + } + + private class LockAnimationClockRunnable implements RunnableWithException { + @Override + public void run() { + mLooperWithLockedAnimationClock = Looper.myLooper(); + mCanLockAnimationClock = true; + lockAnimationClockToCurrentTime(); + } + } + + private class UnlockAnimationClockRunnable implements RunnableWithException { + @Override + public void run() { + mCanLockAnimationClock = false; + mLooperWithLockedAnimationClock = null; + AnimationUtils.unlockAnimationClock(); + } + } + + private void lockAnimationClockToCurrentTime() { + if (!mCanLockAnimationClock) { + throw new AssertionError("Unable to lock the animation clock; " + + "has the test started? already finished?"); + } + if (mLooperWithLockedAnimationClock != Looper.myLooper()) { + throw new AssertionError("Animation clock being locked on " + Looper.myLooper() + + " but should only be locked on " + mLooperWithLockedAnimationClock); + } + long desiredTime = getCurrentTime(); + AnimationUtils.lockAnimationClock(desiredTime); + if (!mCanLockAnimationClock) { + AnimationUtils.unlockAnimationClock(); + throw new AssertionError("Threading error when locking the animation clock"); + } + long outputTime = AnimationUtils.currentAnimationTimeMillis(); + if (outputTime != desiredTime) { + throw new AssertionError("currentAnimationTimeMillis() is " + outputTime + + " after locking to " + desiredTime); + } + } + /** * If any new {@link Animator}s have been registered since the last time the frame time was * advanced, initialize them with the current frame time. Failing to do this will result in the @@ -178,6 +269,7 @@ public final class AnimatorTestRule implements TestRule { // advance time mTotalTimeDelta += timeDelta; } + lockAnimationClockToCurrentTime(); if (preFrameAction != null) { preFrameAction.accept(timeDelta); // After letting other code run, clear any new callbacks to avoid double-ticking them diff --git a/packages/SystemUI/tests/utils/src/android/content/ContextKosmos.kt b/packages/SystemUI/tests/utils/src/android/content/ContextKosmos.kt index 5e254bf4f879..f6ddfccfa532 100644 --- a/packages/SystemUI/tests/utils/src/android/content/ContextKosmos.kt +++ b/packages/SystemUI/tests/utils/src/android/content/ContextKosmos.kt @@ -18,5 +18,7 @@ package android.content import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testCase +import com.android.systemui.util.mockito.mock var Kosmos.applicationContext: Context by Kosmos.Fixture { testCase.context } +val Kosmos.mockedContext: Context by Kosmos.Fixture { mock<Context>() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/FakeSystemUiModule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/FakeSystemUiModule.kt index dc5fd953239d..6dd8d07b356b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/FakeSystemUiModule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/FakeSystemUiModule.kt @@ -19,7 +19,6 @@ import com.android.systemui.classifier.FakeClassifierModule import com.android.systemui.data.FakeSystemUiDataLayerModule import com.android.systemui.flags.FakeFeatureFlagsClassicModule import com.android.systemui.log.FakeUiEventLoggerModule -import com.android.systemui.scene.FakeSceneModule import com.android.systemui.settings.FakeSettingsModule import com.android.systemui.statusbar.policy.FakeConfigurationControllerModule import com.android.systemui.statusbar.policy.FakeSplitShadeStateControllerModule @@ -34,7 +33,6 @@ import dagger.Module FakeConfigurationControllerModule::class, FakeExecutorModule::class, FakeFeatureFlagsClassicModule::class, - FakeSceneModule::class, FakeSettingsModule::class, FakeSplitShadeStateControllerModule::class, FakeSystemClockModule::class, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysUITestModule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/SysUITestModule.kt index 3724291571d7..69b769eb2321 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysUITestModule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysUITestModule.kt @@ -27,7 +27,10 @@ import com.android.systemui.coroutines.collectValues import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.scene.SceneContainerFrameworkModule import com.android.systemui.scene.shared.flag.SceneContainerFlags +import com.android.systemui.scene.shared.model.SceneDataSource +import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.shade.domain.interactor.BaseShadeInteractor import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.shade.domain.interactor.ShadeInteractorImpl @@ -52,6 +55,7 @@ import kotlinx.coroutines.test.runTest TestMocksModule::class, CoroutineTestScopeModule::class, FakeSystemUiModule::class, + SceneContainerFrameworkModule::class, ] ) interface SysUITestModule { @@ -63,6 +67,7 @@ interface SysUITestModule { @Binds @Main fun bindMainResources(resources: Resources): Resources @Binds fun bindBroadcastDispatcher(fake: FakeBroadcastDispatcher): BroadcastDispatcher @Binds @SysUISingleton fun bindsShadeInteractor(sii: ShadeInteractorImpl): ShadeInteractor + @Binds fun bindSceneDataSource(delegator: SceneDataSourceDelegator): SceneDataSource companion object { @Provides diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt index 3f55f42b8d85..b8c880b3892f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt @@ -42,6 +42,7 @@ import com.android.systemui.model.SysUiState import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.DarkIconDispatcher import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.scene.shared.logger.SceneLogger import com.android.systemui.shared.system.ActivityManagerWrapper import com.android.systemui.statusbar.LockscreenShadeTransitionController import com.android.systemui.statusbar.NotificationListener @@ -121,12 +122,13 @@ data class TestMocksModule( @get:Provides val systemUIDialogManager: SystemUIDialogManager = mock(), @get:Provides val deviceEntryIconTransitions: Set<DeviceEntryIconTransition> = emptySet(), @get:Provides val communalInteractor: CommunalInteractor = mock(), + @get:Provides val sceneLogger: SceneLogger = mock(), // log buffers @get:[Provides BroadcastDispatcherLog] val broadcastDispatcherLogger: LogBuffer = mock(), @get:[Provides SceneFrameworkLog] - val sceneLogger: LogBuffer = mock(), + val sceneLogBuffer: LogBuffer = mock(), @get:[Provides BiometricLog] val biometricLogger: LogBuffer = mock(), @get:Provides val lsShadeTransitionLogger: LSShadeTransitionLogger = mock(), diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/animation/AnimatorTestRule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/animation/AnimatorTestRule.kt index ba9c5eda1b63..e2fc44fd2d0d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/animation/AnimatorTestRule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/animation/AnimatorTestRule.kt @@ -26,12 +26,16 @@ import org.junit.runners.model.Statement * A rule that wraps both [androidx.core.animation.AnimatorTestRule] and * [android.animation.AnimatorTestRule] such that the clocks of the two animation handlers can be * advanced together. + * + * @param test the instance of the test used to look up the TestableLooper. If a TestableLooper is + * found, the time can only be advanced on that thread; otherwise the time must be advanced on the + * main thread. */ -class AnimatorTestRule : TestRule { +class AnimatorTestRule(test: Any?) : TestRule { // Create the androidx rule, which initializes start time to SystemClock.uptimeMillis(), // then copy that time to the platform rule so that the two clocks are in sync. private val androidxRule = androidx.core.animation.AnimatorTestRule() - private val platformRule = android.animation.AnimatorTestRule(androidxRule.startTime) + private val platformRule = android.animation.AnimatorTestRule(test, androidxRule.startTime) private val advanceAndroidXTimeBy = Consumer<Long> { timeDelta -> androidxRule.advanceTimeBy(timeDelta) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorKosmos.kt index 244ef8d81ebd..3c6135388971 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorKosmos.kt @@ -34,7 +34,8 @@ import com.android.systemui.util.concurrency.mockExecutorHandler import com.android.systemui.util.mockito.mock var Kosmos.mockPrimaryBouncerInteractor by Kosmos.Fixture { mock<PrimaryBouncerInteractor>() } -var Kosmos.primaryBouncerInteractor by + +val Kosmos.primaryBouncerInteractor by Kosmos.Fixture { PrimaryBouncerInteractor( repository = keyguardBouncerRepository, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorKosmos.kt new file mode 100644 index 000000000000..77f48db60f41 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/BiometricMessageInteractorKosmos.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.deviceentry.domain.interactor + +import android.content.res.mainResources +import com.android.systemui.biometrics.domain.interactor.fingerprintPropertyInteractor +import com.android.systemui.kosmos.Kosmos +import kotlinx.coroutines.ExperimentalCoroutinesApi + +@ExperimentalCoroutinesApi +val Kosmos.biometricMessageInteractor by + Kosmos.Fixture { + BiometricMessageInteractor( + resources = mainResources, + fingerprintAuthInteractor = deviceEntryFingerprintAuthInteractor, + fingerprintPropertyInteractor = fingerprintPropertyInteractor, + faceAuthInteractor = deviceEntryFaceAuthInteractor, + biometricSettingsInteractor = deviceEntryBiometricSettingsInteractor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/FakeSceneContainerConfigModule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractorKosmos.kt index 8811b8db1cc0..4fcf43a2a055 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/FakeSceneContainerConfigModule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryBiometricSettingsInteractorKosmos.kt @@ -13,25 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.scene.shared.model -import dagger.Module -import dagger.Provides +package com.android.systemui.deviceentry.domain.interactor -@Module -data class FakeSceneContainerConfigModule( - @get:Provides - val sceneContainerConfig: SceneContainerConfig = - SceneContainerConfig( - sceneKeys = - listOf( - SceneKey.QuickSettings, - SceneKey.Shade, - SceneKey.Lockscreen, - SceneKey.Bouncer, - SceneKey.Gone, - SceneKey.Communal, - ), - initialSceneKey = SceneKey.Lockscreen, - ), -) +import com.android.systemui.keyguard.data.repository.biometricSettingsRepository +import com.android.systemui.kosmos.Kosmos +import kotlinx.coroutines.ExperimentalCoroutinesApi + +@ExperimentalCoroutinesApi +val Kosmos.deviceEntryBiometricSettingsInteractor by + Kosmos.Fixture { + DeviceEntryBiometricSettingsInteractor( + repository = biometricSettingsRepository, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorKosmos.kt new file mode 100644 index 000000000000..c3f677e8d0d3 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractorKosmos.kt @@ -0,0 +1,44 @@ +/* + * 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.deviceentry.domain.interactor + +import android.content.mockedContext +import com.android.systemui.bouncer.domain.interactor.alternateBouncerInteractor +import com.android.systemui.bouncer.domain.interactor.primaryBouncerInteractor +import com.android.systemui.keyguard.data.repository.deviceEntryFingerprintAuthRepository +import com.android.systemui.keyguard.domain.interactor.keyguardInteractor +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.plugins.activityStarter +import com.android.systemui.power.domain.interactor.powerInteractor +import kotlinx.coroutines.ExperimentalCoroutinesApi + +@ExperimentalCoroutinesApi +val Kosmos.occludingAppDeviceEntryInteractor by + Kosmos.Fixture { + OccludingAppDeviceEntryInteractor( + biometricMessageInteractor = biometricMessageInteractor, + fingerprintAuthRepository = deviceEntryFingerprintAuthRepository, + keyguardInteractor = keyguardInteractor, + primaryBouncerInteractor = primaryBouncerInteractor, + alternateBouncerInteractor = alternateBouncerInteractor, + scope = applicationCoroutineScope, + context = mockedContext, + activityStarter = activityStarter, + powerInteractor = powerInteractor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryKosmos.kt index 19cd9502862f..8452963ddba1 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardBlueprintRepositoryKosmos.kt @@ -16,17 +16,22 @@ package com.android.systemui.keyguard.data.repository +import android.os.fakeExecutorHandler import com.android.systemui.common.ui.data.repository.configurationRepository import com.android.systemui.keyguard.shared.model.KeyguardBlueprint import com.android.systemui.keyguard.shared.model.KeyguardSection import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint.Companion.DEFAULT import com.android.systemui.kosmos.Kosmos +import com.android.systemui.util.ThreadAssert +import com.android.systemui.util.mockito.mock val Kosmos.keyguardBlueprintRepository by Kosmos.Fixture { KeyguardBlueprintRepository( configurationRepository = configurationRepository, blueprints = setOf(defaultBlueprint), + handler = fakeExecutorHandler, + assert = mock<ThreadAssert>(), ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt index 10305f7d50c4..f6b32800263a 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt @@ -43,6 +43,7 @@ import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.scene.domain.interactor.sceneInteractor import com.android.systemui.scene.sceneContainerConfig import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags +import com.android.systemui.scene.shared.model.sceneDataSource import com.android.systemui.statusbar.phone.screenOffAnimationController import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository import com.android.systemui.statusbar.policy.data.repository.fakeDeviceProvisioningRepository @@ -90,6 +91,7 @@ class KosmosJavaAdapter( val fromPrimaryBouncerTransitionInteractor by lazy { kosmos.fromPrimaryBouncerTransitionInteractor } + val sceneDataSource by lazy { kosmos.sceneDataSource } init { kosmos.applicationContext = testCase.context diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryKosmos.kt index e19941cfbaa0..8734609c6c69 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SceneContainerRepositoryKosmos.kt @@ -17,8 +17,15 @@ package com.android.systemui.scene.data.repository import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.scene.sceneContainerConfig +import com.android.systemui.scene.shared.model.sceneDataSource -val Kosmos.sceneContainerRepository by - Kosmos.Fixture { SceneContainerRepository(applicationCoroutineScope, sceneContainerConfig) } +val Kosmos.sceneContainerRepository by Fixture { + SceneContainerRepository( + applicationScope = applicationCoroutineScope, + config = sceneContainerConfig, + dataSource = sceneDataSource, + ) +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/FakeSceneDataSource.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/FakeSceneDataSource.kt new file mode 100644 index 000000000000..c208aad78295 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/FakeSceneDataSource.kt @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.shared.model + +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +class FakeSceneDataSource( + initialSceneKey: SceneKey, +) : SceneDataSource { + + private val _currentScene = MutableStateFlow(initialSceneKey) + override val currentScene: StateFlow<SceneKey> = _currentScene.asStateFlow() + + var isPaused = false + private set + var pendingScene: SceneKey? = null + private set + + override fun changeScene(toScene: SceneKey, transitionKey: TransitionKey?) { + if (isPaused) { + pendingScene = toScene + } else { + _currentScene.value = toScene + } + } + + /** + * Pauses scene changes. + * + * Any following calls to [changeScene] will be conflated and the last one will be remembered. + */ + fun pause() { + check(!isPaused) { "Can't pause what's already paused!" } + + isPaused = true + } + + /** + * Unpauses scene changes. + * + * If there were any calls to [changeScene] since [pause] was called, the latest of the bunch + * will be replayed. + * + * If [force] is `true`, there will be no check that [isPaused] is true. + * + * If [expectedScene] is provided, will assert that it's indeed the latest called. + */ + fun unpause( + force: Boolean = false, + expectedScene: SceneKey? = null, + ) { + check(force || isPaused) { "Can't unpause what's already not paused!" } + + isPaused = false + pendingScene?.let { _currentScene.value = it } + pendingScene = null + + check(expectedScene == null || currentScene.value == expectedScene) { + """ + Unexpected scene while unpausing. + Expected $expectedScene but was $currentScene. + """ + .trimIndent() + } + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/SceneDataSourceKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/SceneDataSourceKosmos.kt new file mode 100644 index 000000000000..f5196866ae6f --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/model/SceneDataSourceKosmos.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.shared.model + +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.scene.initialSceneKey +import com.android.systemui.scene.sceneContainerConfig + +val Kosmos.fakeSceneDataSource by Fixture { + FakeSceneDataSource( + initialSceneKey = initialSceneKey, + ) +} + +val Kosmos.sceneDataSourceDelegator by Fixture { + SceneDataSourceDelegator( + applicationScope = applicationCoroutineScope, + config = sceneContainerConfig, + ) + .apply { setDelegate(fakeSceneDataSource) } +} + +val Kosmos.sceneDataSource by Fixture { sceneDataSourceDelegator } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/NotificationsDataKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/NotificationsDataKosmos.kt new file mode 100644 index 000000000000..a61f7ececc69 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/NotificationsDataKosmos.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.notification.data + +import com.android.settingslib.statusbar.notification.data.repository.FakeNotificationsSoundPolicyRepository +import com.android.systemui.kosmos.Kosmos + +val Kosmos.notificationsSoundPolicyRepository by + Kosmos.Fixture { FakeNotificationsSoundPolicyRepository() } diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index 1ac69f6c4fc8..35ce4814f97d 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -58,11 +58,14 @@ java_library { visibility: ["//visibility:public"], } -java_host_for_device { - name: "core-xml-for-device", - libs: [ - "core-xml-for-host", +java_library { + // Prefixed with "200" to ensure it's sorted early in Tradefed classpath + // so that we provide a concrete implementation before Mainline stubs + name: "200-kxml2-android", + static_libs: [ + "kxml2-android", ], + visibility: ["//frameworks/base"], } java_host_for_device { diff --git a/ravenwood/TEST_MAPPING b/ravenwood/TEST_MAPPING index 031984829e77..a5b28ad550ba 100644 --- a/ravenwood/TEST_MAPPING +++ b/ravenwood/TEST_MAPPING @@ -2,6 +2,9 @@ "presubmit": [ { "name": "RavenwoodMockitoTest_device" + }, + { + "name": "RavenwoodBivalentTest_device" } ], "ravenwood-presubmit": [ @@ -16,6 +19,14 @@ { "name": "CtsUtilTestCasesRavenwood", "host": true + }, + { + "name": "RavenwoodCoreTest", + "host": true + }, + { + "name": "RavenwoodBivalentTest", + "host": true } ] } diff --git a/ravenwood/bivalenttest/Android.bp b/ravenwood/bivalenttest/Android.bp new file mode 100644 index 000000000000..a6b6ed934ce7 --- /dev/null +++ b/ravenwood/bivalenttest/Android.bp @@ -0,0 +1,77 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +cc_library_shared { + name: "libravenwoodbivalenttest_jni", + host_supported: true, + + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-parameter", + "-Wthread-safety", + ], + + srcs: [ + "jni/*.cpp", + ], + + shared_libs: [ + "libbase", + "liblog", + "libnativehelper", + "libutils", + "libcutils", + ], +} + +android_ravenwood_test { + name: "RavenwoodBivalentTest", + + static_libs: [ + "androidx.annotation_annotation", + "androidx.test.ext.junit", + "androidx.test.rules", + ], + srcs: [ + "test/**/*.java", + ], + jni_libs: [ + "libravenwoodbivalenttest_jni", + ], + sdk_version: "test_current", + auto_gen_config: true, +} + +android_test { + name: "RavenwoodBivalentTest_device", + + srcs: [ + "test/**/*.java", + ], + static_libs: [ + "junit", + "truth", + + "androidx.annotation_annotation", + "androidx.test.ext.junit", + "androidx.test.rules", + + "ravenwood-junit", + ], + jni_libs: [ + "libravenwoodbivalenttest_jni", + ], + test_suites: [ + "device-tests", + ], + optimize: { + enabled: false, + }, +} diff --git a/ravenwood/bivalenttest/AndroidManifest.xml b/ravenwood/bivalenttest/AndroidManifest.xml new file mode 100644 index 000000000000..474c03f4f3c9 --- /dev/null +++ b/ravenwood/bivalenttest/AndroidManifest.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.ravenwood.bivalenttest"> + + <application android:debuggable="true" > + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation + android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.ravenwood.bivalenttest" + /> +</manifest> diff --git a/ravenwood/bivalenttest/AndroidTest.xml b/ravenwood/bivalenttest/AndroidTest.xml new file mode 100644 index 000000000000..ac4695bb9a50 --- /dev/null +++ b/ravenwood/bivalenttest/AndroidTest.xml @@ -0,0 +1,29 @@ +<?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. +--> +<configuration description="Runs Frameworks Services Tests."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-instrumentation" /> + + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="RavenwoodBivalentTest_device.apk" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.ravenwood.bivalenttest" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> + </test> +</configuration> diff --git a/ravenwood/bivalenttest/README.md b/ravenwood/bivalenttest/README.md new file mode 100644 index 000000000000..71535556ec75 --- /dev/null +++ b/ravenwood/bivalenttest/README.md @@ -0,0 +1,3 @@ +# Ravenwood bivalent test + +This test contains bivalent tests for Ravenwood itself.
\ No newline at end of file diff --git a/ravenwood/bivalenttest/jni/ravenwood_core_test_jni.cpp b/ravenwood/bivalenttest/jni/ravenwood_core_test_jni.cpp new file mode 100644 index 000000000000..5e66b29b370a --- /dev/null +++ b/ravenwood/bivalenttest/jni/ravenwood_core_test_jni.cpp @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#include <nativehelper/JNIHelp.h> +#include "jni.h" +#include "utils/Log.h" +#include "utils/misc.h" + +static jint add(JNIEnv* env, jclass clazz, jint a, jint b) { + return a + b; +} + +static const JNINativeMethod sMethods[] = +{ + { "add", "(II)I", (void*)add }, +}; + +extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) +{ + JNIEnv* env = NULL; + jint result = -1; + + if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { + ALOGE("GetEnv failed!"); + return result; + } + ALOG_ASSERT(env, "Could not retrieve the env!"); + + ALOGI("%s: JNI_OnLoad", __FILE__); + + int res = jniRegisterNativeMethods(env, + "com/android/platform/test/ravenwood/bivalenttest/RavenwoodJniTest", + sMethods, NELEM(sMethods)); + if (res < 0) { + return res; + } + + return JNI_VERSION_1_4; +} diff --git a/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodJniTest.java b/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodJniTest.java new file mode 100644 index 000000000000..3b106da74ed4 --- /dev/null +++ b/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodJniTest.java @@ -0,0 +1,44 @@ +/* + * 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.platform.test.ravenwood.bivalenttest; + +import static junit.framework.Assert.assertEquals; + +import android.platform.test.ravenwood.RavenwoodRule; +import android.platform.test.ravenwood.RavenwoodUtils; + +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public final class RavenwoodJniTest { + static { + RavenwoodUtils.loadJniLibrary("ravenwoodbivalenttest_jni"); + } + + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder().build(); + + private static native int add(int a, int b); + + @Test + public void testNativeMethod() { + assertEquals(5, add(2, 3)); + } +} diff --git a/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodRuleTest.java b/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodRuleTest.java new file mode 100644 index 000000000000..4b650b4bc5e1 --- /dev/null +++ b/ravenwood/bivalenttest/test/com/android/platform/test/ravenwood/bivalenttest/RavenwoodRuleTest.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.platform.test.ravenwood.bivalenttest; + +import android.platform.test.annotations.DisabledOnNonRavenwood; +import android.platform.test.annotations.DisabledOnRavenwood; +import android.platform.test.ravenwood.RavenwoodRule; + +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +public class RavenwoodRuleTest { + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule(); + + @Test + @DisabledOnRavenwood + public void testDeviceOnly() { + Assert.assertFalse(RavenwoodRule.isOnRavenwood()); + } + + @Test + @DisabledOnNonRavenwood + public void testRavenwoodOnly() { + Assert.assertTrue(RavenwoodRule.isOnRavenwood()); + } + + // TODO: Add more tests +} diff --git a/ravenwood/coretest/Android.bp b/ravenwood/coretest/Android.bp index 9b7f8f7d2171..a78c5c1e8227 100644 --- a/ravenwood/coretest/Android.bp +++ b/ravenwood/coretest/Android.bp @@ -12,9 +12,9 @@ android_ravenwood_test { static_libs: [ "androidx.annotation_annotation", + "androidx.test.ext.junit", "androidx.test.rules", ], - srcs: [ "test/**/*.java", ], diff --git a/ravenwood/coretest/README.md b/ravenwood/coretest/README.md new file mode 100644 index 000000000000..b60bfbfcb6f4 --- /dev/null +++ b/ravenwood/coretest/README.md @@ -0,0 +1,3 @@ +# Ravenwood core test + +This test contains (non-bivalent) tests for Ravenwood itself -- e.g. tests for the ravenwood rules.
\ No newline at end of file diff --git a/ravenwood/coretest/test/com/android/platform/test/ravenwood/coretest/RavenwoodTestRunnerValidationTest.java b/ravenwood/coretest/test/com/android/platform/test/ravenwood/coretest/RavenwoodTestRunnerValidationTest.java index e58c282fb690..2cd585ff6c9c 100644 --- a/ravenwood/coretest/test/com/android/platform/test/ravenwood/coretest/RavenwoodTestRunnerValidationTest.java +++ b/ravenwood/coretest/test/com/android/platform/test/ravenwood/coretest/RavenwoodTestRunnerValidationTest.java @@ -17,7 +17,7 @@ package com.android.platform.test.ravenwood.coretest; import android.platform.test.ravenwood.RavenwoodRule; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; // Intentionally use the deprecated one. import org.junit.Assume; import org.junit.Rule; diff --git a/ravenwood/framework-minus-apex-ravenwood-policies.txt b/ravenwood/framework-minus-apex-ravenwood-policies.txt index 022961164b84..2eef0cdaf24b 100644 --- a/ravenwood/framework-minus-apex-ravenwood-policies.txt +++ b/ravenwood/framework-minus-apex-ravenwood-policies.txt @@ -89,6 +89,7 @@ class android.util.UtilConfig stubclass # Internals class com.android.internal.util.FileRotator stubclass +class com.android.internal.util.FastXmlSerializer stubclass class com.android.internal.util.HexDump stubclass class com.android.internal.util.MessageUtils stubclass class com.android.internal.util.Preconditions stubclass diff --git a/ravenwood/junit-src/android/platform/test/annotations/DisabledOnNonRavenwood.java b/ravenwood/junit-src/android/platform/test/annotations/DisabledOnNonRavenwood.java new file mode 100644 index 000000000000..8ca34bafc2c6 --- /dev/null +++ b/ravenwood/junit-src/android/platform/test/annotations/DisabledOnNonRavenwood.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.platform.test.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Tests marked with this annotation are only executed when running on Ravenwood, but not + * on a device. + * + * This is basically equivalent to the opposite of {@link DisabledOnRavenwood}, but in order to + * avoid complex structure, and there's no equivalent to the opposite {@link EnabledOnRavenwood}, + * which means if a test class has this annotation, you can't negate it in subclasses or + * on a per-method basis. + * + * The {@code RAVENWOOD_RUN_DISABLED_TESTS} environmental variable won't work because it won't be + * propagated to the device. (We may support it in the future, possibly using a debug. sysprop.) + * + * @hide + */ +@Inherited +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DisabledOnNonRavenwood { + /** + * General free-form description of why this test is being ignored. + */ + String reason() default ""; +} diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodClassRule.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodClassRule.java index 8d76970f9ad4..9a4d4886d6f0 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodClassRule.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodClassRule.java @@ -18,6 +18,7 @@ package android.platform.test.ravenwood; import static android.platform.test.ravenwood.RavenwoodRule.ENABLE_PROBE_IGNORED; import static android.platform.test.ravenwood.RavenwoodRule.IS_ON_RAVENWOOD; +import static android.platform.test.ravenwood.RavenwoodRule.shouldEnableOnDevice; import static android.platform.test.ravenwood.RavenwoodRule.shouldEnableOnRavenwood; import static android.platform.test.ravenwood.RavenwoodRule.shouldStillIgnoreInProbeIgnoreMode; @@ -42,6 +43,7 @@ public class RavenwoodClassRule implements TestRule { public Statement apply(Statement base, Description description) { // No special treatment when running outside Ravenwood; run tests as-is if (!IS_ON_RAVENWOOD) { + Assume.assumeTrue(shouldEnableOnDevice(description)); return base; } diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java index 764573defd7a..b90f112c1655 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java @@ -22,6 +22,7 @@ import static android.os.UserHandle.USER_SYSTEM; import static org.junit.Assert.fail; +import android.platform.test.annotations.DisabledOnNonRavenwood; import android.platform.test.annotations.DisabledOnRavenwood; import android.platform.test.annotations.EnabledOnRavenwood; import android.platform.test.annotations.IgnoreUnderRavenwood; @@ -211,6 +212,15 @@ public class RavenwoodRule implements TestRule { return IS_ON_RAVENWOOD; } + static boolean shouldEnableOnDevice(Description description) { + if (description.isTest()) { + if (description.getAnnotation(DisabledOnNonRavenwood.class) != null) { + return false; + } + } + return true; + } + /** * Determine if the given {@link Description} should be enabled when running on the * Ravenwood test environment. @@ -271,6 +281,7 @@ public class RavenwoodRule implements TestRule { public Statement apply(Statement base, Description description) { // No special treatment when running outside Ravenwood; run tests as-is if (!IS_ON_RAVENWOOD) { + Assume.assumeTrue(shouldEnableOnDevice(description)); return base; } diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodUtils.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodUtils.java new file mode 100644 index 000000000000..b736a7662bd4 --- /dev/null +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodUtils.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.platform.test.ravenwood; + +import java.io.File; +import java.io.PrintStream; +import java.util.Arrays; + +/** + * Utilities for writing (bivalent) ravenwood tests. + */ +public class RavenwoodUtils { + private RavenwoodUtils() { + } + + /** + * Load a JNI library respecting {@code java.library.path} + * (which reflects {@code LD_LIBRARY_PATH}). + * + * <p>{@code libname} must be the library filename without: + * - directory + * - "lib" prefix + * - and the ".so" extension + * + * <p>For example, in order to load "libmyjni.so", then pass "myjni". + * + * <p>This is basically the same thing as Java's {@link System#loadLibrary(String)}, + * but this API works slightly different on ART and on the desktop Java, namely + * the desktop Java version uses a different entry point method name + * {@code JNI_OnLoad_libname()} (note the included "libname") + * while ART always seems to use {@code JNI_OnLoad()}. + * + * <p>This method provides the same behavior on both the device side and on Ravenwood -- + * it uses {@code JNI_OnLoad()} as the entry point name on both. + */ + public static void loadJniLibrary(String libname) { + if (RavenwoodRule.isOnRavenwood()) { + loadLibraryOnRavenwood(libname); + } else { + // Just delegate to the loadLibrary(). + System.loadLibrary(libname); + } + } + + private static void loadLibraryOnRavenwood(String libname) { + var path = System.getProperty("java.library.path"); + var filename = "lib" + libname + ".so"; + + System.out.println("Looking for library " + libname + ".so in java.library.path:" + path); + + try { + if (path == null) { + throw new UnsatisfiedLinkError("Cannot load library " + libname + "." + + " Property java.library.path not set!"); + } + for (var dir : path.split(":")) { + var file = new File(dir + "/" + filename); + if (file.exists()) { + System.load(file.getAbsolutePath()); + return; + } + } + throw new UnsatisfiedLinkError("Library " + libname + " no found in " + + "java.library.path: " + path); + } catch (Exception e) { + dumpFiles(System.out); + throw e; + } + } + + private static void dumpFiles(PrintStream out) { + try { + var path = System.getProperty("java.library.path"); + out.println("# java.library.path=" + path); + + for (var dir : path.split(":")) { + listFiles(out, new File(dir), ""); + + var gparent = new File((new File(dir)).getAbsolutePath() + "../../..") + .getCanonicalFile(); + if (gparent.getName().contains("testcases")) { + // Special case: if we found this directory, dump its contents too. + listFiles(out, gparent, ""); + } + } + } catch (Throwable th) { + out.println("Error: " + th.toString()); + th.printStackTrace(out); + } + } + + private static void listFiles(PrintStream out, File dir, String prefix) { + if (!dir.isDirectory()) { + out.println(prefix + dir.getAbsolutePath() + " is not a directory!"); + return; + } + out.println(prefix + ":" + dir.getAbsolutePath() + "/"); + // First, list the files. + for (var file : Arrays.stream(dir.listFiles()).sorted().toList()) { + out.println(prefix + " " + file.getName() + "" + (file.isDirectory() ? "/" : "")); + } + + // Then recurse. + if (dir.getAbsolutePath().startsWith("/usr") || dir.getAbsolutePath().startsWith("/lib")) { + // There would be too many files, so don't recurse. + return; + } + for (var file : Arrays.stream(dir.listFiles()).sorted().toList()) { + if (file.isDirectory()) { + listFiles(out, file, prefix + " "); + } + } + } +} diff --git a/ravenwood/minimum-test/README.md b/ravenwood/minimum-test/README.md new file mode 100644 index 000000000000..6b0abe968053 --- /dev/null +++ b/ravenwood/minimum-test/README.md @@ -0,0 +1,3 @@ +# Ravenwood minimum test + +This directory contains a minimum possible ravenwood test -- no extra dependencies, etc.
\ No newline at end of file diff --git a/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java b/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java index 03cfad5c7a70..b4771171815a 100644 --- a/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java +++ b/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class RavenwoodMinimumTest { @Rule - public RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() .setProcessApp() .build(); diff --git a/ravenwood/mockito/Android.bp b/ravenwood/mockito/Android.bp index a74bca47f692..95c7394b19f3 100644 --- a/ravenwood/mockito/Android.bp +++ b/ravenwood/mockito/Android.bp @@ -13,6 +13,9 @@ android_ravenwood_test { srcs: [ "test/**/*.java", ], + exclude_srcs: [ + "test/**/*DeviceOnly*.java", + ], static_libs: [ "junit", "truth", @@ -31,6 +34,9 @@ android_test { srcs: [ "test/**/*.java", ], + exclude_srcs: [ + "test/**/*RavenwoodOnly*.java", + ], static_libs: [ "junit", "truth", diff --git a/ravenwood/mockito/AndroidTest.xml b/ravenwood/mockito/AndroidTest.xml index 96bc2752fe95..5ba9b1ff2cd8 100644 --- a/ravenwood/mockito/AndroidTest.xml +++ b/ravenwood/mockito/AndroidTest.xml @@ -22,8 +22,6 @@ <option name="test-file-name" value="RavenwoodMockitoTest_device.apk" /> </target_preparer> - <option name="test-tag" value="FrameworksMockingServicesTests" /> - <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.ravenwood.mockitotest" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> diff --git a/ravenwood/mockito/README.md b/ravenwood/mockito/README.md new file mode 100644 index 000000000000..4ceb795fe14a --- /dev/null +++ b/ravenwood/mockito/README.md @@ -0,0 +1,3 @@ +# Ravenwood mockito test + +This directory contains a sample bivalent test using Mockito.
\ No newline at end of file diff --git a/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoDeviceOnlyTest.java b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoDeviceOnlyTest.java new file mode 100644 index 000000000000..d02fe69d3168 --- /dev/null +++ b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoDeviceOnlyTest.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ravenwood.mockito; + +import static com.google.common.truth.Truth.assertThat; + +import android.app.ActivityManager; +import android.platform.test.ravenwood.RavenwoodRule; + +import com.android.dx.mockito.inline.extended.ExtendedMockito; + +import org.junit.Rule; +import org.junit.Test; +import org.mockito.quality.Strictness; + +public class RavenwoodMockitoDeviceOnlyTest { + @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); + + @Test + public void testStaticMockOnDevice() { + var mockingSession = ExtendedMockito.mockitoSession() + .strictness(Strictness.LENIENT) + .mockStatic(ActivityManager.class) + .startMocking(); + try { + ExtendedMockito.doReturn(true).when(ActivityManager::isUserAMonkey); + + assertThat(ActivityManager.isUserAMonkey()).isEqualTo(true); + } finally { + mockingSession.finishMocking(); + } + } +} diff --git a/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoRavenwoodOnlyTest.java b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoRavenwoodOnlyTest.java new file mode 100644 index 000000000000..0c137d5eaacc --- /dev/null +++ b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoRavenwoodOnlyTest.java @@ -0,0 +1,38 @@ +/* + * 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.ravenwood.mockito; + +import static com.google.common.truth.Truth.assertThat; + +import android.app.ActivityManager; +import android.platform.test.ravenwood.RavenwoodRule; + +import org.junit.Rule; +import org.junit.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + +public class RavenwoodMockitoRavenwoodOnlyTest { + @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); + + @Test + public void testStaticMockOnRavenwood() { + try (MockedStatic<ActivityManager> am = Mockito.mockStatic(ActivityManager.class)) { + am.when(ActivityManager::isUserAMonkey).thenReturn(true); + assertThat(ActivityManager.isUserAMonkey()).isEqualTo(true); + } + } +} diff --git a/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoTest.java b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoTest.java index 1284d64b9a90..95667103bd21 100644 --- a/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoTest.java +++ b/ravenwood/mockito/test/com/android/ravenwood/mockito/RavenwoodMockitoTest.java @@ -31,28 +31,6 @@ import org.junit.Test; public class RavenwoodMockitoTest { @Rule public final RavenwoodRule mRavenwood = new RavenwoodRule(); - -// Use this to mock static methods, which isn't supported by mockito 2. -// Mockito supports static mocking since 3.4.0: -// See: https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#48 - -// private MockitoSession mMockingSession; -// -// @Before -// public void setUp() { -// mMockingSession = mockitoSession() -// .strictness(Strictness.LENIENT) -// .mockStatic(RavenwoodMockitoTest.class) -// .startMocking(); -// } -// -// @After -// public void tearDown() { -// if (mMockingSession != null) { -// mMockingSession.finishMocking(); -// } -// } - @Test public void testMockJdkClass() { Process object = mock(Process.class); diff --git a/ravenwood/ravenwood-annotation-allowed-classes.txt b/ravenwood/ravenwood-annotation-allowed-classes.txt index 01c0074e463f..927ddd71dd15 100644 --- a/ravenwood/ravenwood-annotation-allowed-classes.txt +++ b/ravenwood/ravenwood-annotation-allowed-classes.txt @@ -13,11 +13,13 @@ com.android.internal.os.BatteryStatsHistoryIterator com.android.internal.os.Clock com.android.internal.os.LongArrayMultiStateCounter com.android.internal.os.LongArrayMultiStateCounter$LongArrayContainer +com.android.internal.os.LongMultiStateCounter com.android.internal.os.MonotonicClock com.android.internal.os.PowerProfile com.android.internal.os.PowerStats com.android.internal.os.PowerStats$Descriptor com.android.internal.os.RuntimeInit +com.android.internal.power.EnergyConsumerStats com.android.internal.power.ModemPowerProfile android.util.AtomicFile @@ -54,6 +56,7 @@ android.os.BatteryUsageStats android.os.BatteryUsageStatsQuery android.os.Binder android.os.Binder$IdentitySupplier +android.os.BluetoothBatteryStats android.os.Broadcaster android.os.Build android.os.BundleMerger @@ -83,12 +86,15 @@ android.os.TestLooperManager android.os.ThreadLocalWorkSource android.os.TimestampedValue android.os.Trace +android.os.UserBatteryConsumer +android.os.UserBatteryConsumer$Builder android.os.UidBatteryConsumer android.os.UidBatteryConsumer$Builder android.os.UserHandle android.os.UserManager android.os.VibrationAttributes android.os.VibrationAttributes$Builder +android.os.WakeLockStats android.os.WorkSource android.content.ClipData @@ -159,6 +165,7 @@ android.app.Instrumentation android.metrics.LogMaker +android.view.Display android.view.Display$HdrCapabilities android.view.Display$Mode android.view.DisplayInfo @@ -169,7 +176,6 @@ android.telephony.ModemActivityInfo android.telephony.ServiceState com.android.server.LocalServices -com.android.server.power.stats.BatteryStatsImpl com.android.internal.util.BitUtils com.android.internal.util.BitwiseInputStream @@ -192,6 +198,7 @@ com.android.internal.util.QuickSelect com.android.internal.util.RingBuffer com.android.internal.util.StringPool +com.android.internal.os.BackgroundThread com.android.internal.os.BinderCallHeavyHitterWatcher com.android.internal.os.BinderDeathDispatcher com.android.internal.os.BinderfsStatsReader diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java index b64c74e69817..af47ed28e3b0 100644 --- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java @@ -42,10 +42,12 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityTrace; import android.accessibilityservice.IAccessibilityServiceClient; import android.accessibilityservice.IAccessibilityServiceConnection; +import android.accessibilityservice.IBrailleDisplayController; import android.accessibilityservice.MagnificationConfig; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; @@ -58,6 +60,7 @@ import android.graphics.Region; import android.hardware.HardwareBuffer; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManagerInternal; +import android.hardware.usb.UsbDevice; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -2776,4 +2779,23 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ t.close(); mOverlays.clear(); } + + @Override + @SuppressLint("AndroidFrameworkRequiresPermission") // Unsupported in Abstract class + public void connectBluetoothBrailleDisplay(String bluetoothAddress, + IBrailleDisplayController controller) { + throw new UnsupportedOperationException(); + } + + @Override + public void connectUsbBrailleDisplay(UsbDevice usbDevice, + IBrailleDisplayController controller) { + throw new UnsupportedOperationException(); + } + + @Override + @SuppressLint("AndroidFrameworkRequiresPermission") // Unsupported in Abstract class + public void setTestBrailleDisplayData(List<Bundle> brailleDisplays) { + throw new UnsupportedOperationException(); + } } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java index 5ebe16115a4b..b90a66a24442 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java @@ -26,16 +26,25 @@ import android.Manifest; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityTrace; +import android.accessibilityservice.BrailleDisplayController; import android.accessibilityservice.IAccessibilityServiceClient; +import android.accessibilityservice.IBrailleDisplayController; import android.accessibilityservice.TouchInteractionController; +import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.app.PendingIntent; +import android.bluetooth.BluetoothAdapter; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ParceledListSlice; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbManager; import android.os.Binder; +import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -44,6 +53,7 @@ import android.os.RemoteException; import android.os.Trace; import android.os.UserHandle; import android.provider.Settings; +import android.text.TextUtils; import android.util.Slog; import android.view.Display; import android.view.MotionEvent; @@ -55,6 +65,8 @@ import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; import java.lang.ref.WeakReference; +import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -82,6 +94,9 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect final Intent mIntent; final ActivityTaskManagerInternal mActivityTaskManagerService; + private BrailleDisplayConnection mBrailleDisplayConnection; + private List<Bundle> mTestBrailleDisplays = null; + private final Handler mMainHandler; private static final class AccessibilityInputMethodSessionCallback @@ -448,6 +463,16 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect } } + @Override + public void resetLocked() { + super.resetLocked(); + if (android.view.accessibility.Flags.brailleDisplayHid()) { + if (mBrailleDisplayConnection != null) { + mBrailleDisplayConnection.disconnect(); + } + } + } + public boolean isAccessibilityButtonAvailableLocked(AccessibilityUserState userState) { // If the service does not request the accessibility button, it isn't available if (!mRequestAccessibilityButton) { @@ -640,4 +665,123 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect } } } + + private void checkAccessibilityAccessLocked() { + if (!hasRightsToCurrentUserLocked() + || !mSecurityPolicy.checkAccessibilityAccess(this)) { + throw new SecurityException("Caller does not have accessibility access"); + } + } + + /** + * Sets up a BrailleDisplayConnection interface for the requested Bluetooth-connected + * Braille display. + * + * @param bluetoothAddress The address from + * {@link android.bluetooth.BluetoothDevice#getAddress()}. + */ + @Override + @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT) + public void connectBluetoothBrailleDisplay( + @NonNull String bluetoothAddress, @NonNull IBrailleDisplayController controller) { + if (!android.view.accessibility.Flags.brailleDisplayHid()) { + throw new IllegalStateException("Flag BRAILLE_DISPLAY_HID not enabled"); + } + Objects.requireNonNull(bluetoothAddress); + Objects.requireNonNull(controller); + mContext.enforceCallingPermission(Manifest.permission.BLUETOOTH_CONNECT, + "Missing BLUETOOTH_CONNECT permission"); + if (!BluetoothAdapter.checkBluetoothAddress(bluetoothAddress)) { + throw new IllegalArgumentException( + bluetoothAddress + " is not a valid Bluetooth address"); + } + synchronized (mLock) { + checkAccessibilityAccessLocked(); + if (mBrailleDisplayConnection != null) { + throw new IllegalStateException( + "This service already has a connected Braille display"); + } + BrailleDisplayConnection connection = new BrailleDisplayConnection(mLock, this); + if (mTestBrailleDisplays != null) { + connection.setTestData(mTestBrailleDisplays); + } + connection.connectLocked( + bluetoothAddress, BrailleDisplayConnection.BUS_BLUETOOTH, controller); + } + } + + /** + * Sets up a BrailleDisplayConnection interface for the requested USB-connected + * Braille display. + * + * <p>The caller package must already have USB permission for this {@link UsbDevice}. + */ + @SuppressLint("MissingPermission") // system_server has the required MANAGE_USB permission + @Override + @NonNull + public void connectUsbBrailleDisplay(@NonNull UsbDevice usbDevice, + @NonNull IBrailleDisplayController controller) { + if (!android.view.accessibility.Flags.brailleDisplayHid()) { + throw new IllegalStateException("Flag BRAILLE_DISPLAY_HID not enabled"); + } + Objects.requireNonNull(usbDevice); + Objects.requireNonNull(controller); + final UsbManager usbManager = (UsbManager) mContext.getSystemService(Context.USB_SERVICE); + final String usbSerialNumber; + final int uid = Binder.getCallingUid(); + final int pid = Binder.getCallingPid(); + final long identity = Binder.clearCallingIdentity(); + try { + if (usbManager == null || !usbManager.hasPermission( + usbDevice, mComponentName.getPackageName(), /*pid=*/ pid, /*uid=*/ uid)) { + throw new SecurityException( + "Caller does not have permission to access this UsbDevice"); + } + usbSerialNumber = usbDevice.getSerialNumber(); + if (TextUtils.isEmpty(usbSerialNumber)) { + // If the UsbDevice does not report a serial number for locating the HIDRAW + // node then notify connection error ERROR_BRAILLE_DISPLAY_NOT_FOUND. + try { + controller.onConnectionFailed(BrailleDisplayController.BrailleDisplayCallback + .FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Error calling onConnectionFailed", e); + } + return; + } + } finally { + Binder.restoreCallingIdentity(identity); + } + synchronized (mLock) { + checkAccessibilityAccessLocked(); + if (mBrailleDisplayConnection != null) { + throw new IllegalStateException( + "This service already has a connected Braille display"); + } + BrailleDisplayConnection connection = new BrailleDisplayConnection(mLock, this); + if (mTestBrailleDisplays != null) { + connection.setTestData(mTestBrailleDisplays); + } + connection.connectLocked( + usbSerialNumber, BrailleDisplayConnection.BUS_USB, controller); + } + } + + @Override + @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) + public void setTestBrailleDisplayData(List<Bundle> brailleDisplays) { + // Enforce that this TestApi is only called by trusted (test) callers. + mContext.enforceCallingPermission(Manifest.permission.MANAGE_ACCESSIBILITY, + "Missing MANAGE_ACCESSIBILITY permission"); + mTestBrailleDisplays = brailleDisplays; + } + + void onBrailleDisplayConnectedLocked(BrailleDisplayConnection connection) { + mBrailleDisplayConnection = connection; + } + + // Reset state when the BrailleDisplayConnection object disconnects itself. + void onBrailleDisplayDisconnectedLocked() { + mBrailleDisplayConnection = null; + } } diff --git a/services/accessibility/java/com/android/server/accessibility/BrailleDisplayConnection.java b/services/accessibility/java/com/android/server/accessibility/BrailleDisplayConnection.java new file mode 100644 index 000000000000..1f18e15bb646 --- /dev/null +++ b/services/accessibility/java/com/android/server/accessibility/BrailleDisplayConnection.java @@ -0,0 +1,534 @@ +/* + * 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.accessibility; + +import static android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback.FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND; +import static android.accessibilityservice.BrailleDisplayController.BrailleDisplayCallback.FLAG_ERROR_CANNOT_ACCESS; + +import android.accessibilityservice.BrailleDisplayController; +import android.accessibilityservice.IBrailleDisplayConnection; +import android.accessibilityservice.IBrailleDisplayController; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.PermissionManuallyEnforced; +import android.annotation.RequiresNoPermission; +import android.bluetooth.BluetoothDevice; +import android.hardware.usb.UsbDevice; +import android.os.Bundle; +import android.os.HandlerThread; +import android.os.IBinder; +import android.os.Process; +import android.os.RemoteException; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Pair; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; + +/** + * This class represents the connection between {@code system_server} and a connected + * Braille Display using the Braille Display HID standard (usage page 0x41). + */ +class BrailleDisplayConnection extends IBrailleDisplayConnection.Stub { + private static final String LOG_TAG = "BrailleDisplayConnection"; + + /** + * Represents the connection type of a Braille display. + * + * <p>The integer values must match the kernel's bus type values because this bus type is + * used to locate the correct HIDRAW node using data from the kernel. These values come + * from the UAPI header file bionic/libc/kernel/uapi/linux/input.h, which is guaranteed + * to stay constant. + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = true, prefix = {"BUS_"}, value = { + BUS_UNKNOWN, + BUS_USB, + BUS_BLUETOOTH + }) + @interface BusType { + } + static final int BUS_UNKNOWN = -1; + static final int BUS_USB = 0x03; + static final int BUS_BLUETOOTH = 0x05; + + // Access to this static object must be guarded by a lock that is shared for all instances + // of this class: the singular Accessibility system_server lock (mLock). + private static final Set<File> sConnectedNodes = new ArraySet<>(); + + // Used to guard to AIDL methods from concurrent calls. + // Lock must match the one used by AccessibilityServiceConnection, which itself + // comes from AccessibilityManagerService. + private final Object mLock; + private final AccessibilityServiceConnection mServiceConnection; + + + private File mHidrawNode; + private IBrailleDisplayController mController; + + private Thread mInputThread; + private OutputStream mOutputStream; + private HandlerThread mOutputThread; + + // mScanner is not final because tests may modify this to use a test-only scanner. + private BrailleDisplayScanner mScanner; + + BrailleDisplayConnection(@NonNull Object lock, + @NonNull AccessibilityServiceConnection serviceConnection) { + this.mLock = Objects.requireNonNull(lock); + this.mScanner = getDefaultNativeScanner(getDefaultNativeInterface()); + this.mServiceConnection = Objects.requireNonNull(serviceConnection); + } + + /** + * Interface to scan for properties of connected Braille displays. + * + * <p>Helps simplify testing Braille Display APIs using test data without requiring + * a real Braille display to be connected to the device, by using a test implementation + * of this interface. + * + * @see #getDefaultNativeScanner + * @see #setTestData + */ + @VisibleForTesting + interface BrailleDisplayScanner { + Collection<Path> getHidrawNodePaths(); + + byte[] getDeviceReportDescriptor(@NonNull Path path); + + String getUniqueId(@NonNull Path path); + + @BusType + int getDeviceBusType(@NonNull Path path); + } + + /** + * Finds the Braille display HIDRAW node associated with the provided unique ID. + * + * <p>If found, saves instance state for this connection and starts a thread to + * read from the Braille display. + * + * @param expectedUniqueId The expected unique ID of the device to connect, from + * {@link UsbDevice#getSerialNumber()} + * or {@link BluetoothDevice#getAddress()} + * @param expectedBusType The expected bus type from {@link BusType}. + * @param controller Interface containing oneway callbacks used to communicate with the + * {@link android.accessibilityservice.BrailleDisplayController}. + */ + void connectLocked( + @NonNull String expectedUniqueId, + @BusType int expectedBusType, + @NonNull IBrailleDisplayController controller) { + Objects.requireNonNull(expectedUniqueId); + this.mController = Objects.requireNonNull(controller); + + final List<Pair<File, byte[]>> result = new ArrayList<>(); + final Collection<Path> hidrawNodePaths = mScanner.getHidrawNodePaths(); + if (hidrawNodePaths == null) { + Slog.w(LOG_TAG, "Unable to access the HIDRAW node directory"); + sendConnectionErrorLocked(FLAG_ERROR_CANNOT_ACCESS); + return; + } + boolean unableToGetDescriptor = false; + // For every present HIDRAW device node: + for (Path path : hidrawNodePaths) { + final byte[] descriptor = mScanner.getDeviceReportDescriptor(path); + if (descriptor == null) { + unableToGetDescriptor = true; + continue; + } + final String uniqueId = mScanner.getUniqueId(path); + if (isBrailleDisplay(descriptor) + && mScanner.getDeviceBusType(path) == expectedBusType + && expectedUniqueId.equalsIgnoreCase(uniqueId)) { + result.add(Pair.create(path.toFile(), descriptor)); + } + } + + // Return success only when exactly one matching device node is found. + if (result.size() != 1) { + @BrailleDisplayController.BrailleDisplayCallback.ErrorCode int errorCode = + FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND; + // If we were unable to get some /dev/hidraw* descriptor then tell the accessibility + // service that the device may not have proper access to these device nodes. + if (unableToGetDescriptor) { + Slog.w(LOG_TAG, "Unable to access some HIDRAW node's descriptor"); + errorCode |= FLAG_ERROR_CANNOT_ACCESS; + } else { + Slog.w(LOG_TAG, + "Unable to find a unique Braille display matching the provided device"); + } + sendConnectionErrorLocked(errorCode); + return; + } + + this.mHidrawNode = result.get(0).first; + final byte[] reportDescriptor = result.get(0).second; + + // Only one connection instance should exist for this hidraw node, across + // all currently running accessibility services. + if (sConnectedNodes.contains(this.mHidrawNode)) { + Slog.w(LOG_TAG, + "Unable to find an unused Braille display matching the provided device"); + sendConnectionErrorLocked(FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND); + return; + } + sConnectedNodes.add(this.mHidrawNode); + + startReadingLocked(); + + try { + mServiceConnection.onBrailleDisplayConnectedLocked(this); + mController.onConnected(this, reportDescriptor); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Error calling onConnected", e); + disconnect(); + } + } + + private void sendConnectionErrorLocked( + @BrailleDisplayController.BrailleDisplayCallback.ErrorCode int errorCode) { + try { + mController.onConnectionFailed(errorCode); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Error calling onConnectionFailed", e); + } + } + + /** Returns true if this descriptor includes usages for the Braille display usage page 0x41. */ + private static boolean isBrailleDisplay(byte[] descriptor) { + // TODO: b/316036493 - Check that descriptor includes 0x41 reports. + return true; + } + + /** + * Checks that the AccessibilityService that owns this BrailleDisplayConnection + * is still connected to the system. + * + * @throws IllegalStateException if not connected + */ + private void assertServiceIsConnectedLocked() { + if (!mServiceConnection.isConnectedLocked()) { + throw new IllegalStateException("Accessibility service is not connected"); + } + } + + /** + * Disconnects from this Braille display. This object is no longer valid after + * this call returns. + */ + @Override + // This is a cleanup method, so allow the call even if the calling service was disabled. + @RequiresNoPermission + public void disconnect() { + synchronized (mLock) { + closeInputLocked(); + closeOutputLocked(); + mServiceConnection.onBrailleDisplayDisconnectedLocked(); + try { + mController.onDisconnected(); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Error calling onDisconnected"); + } + sConnectedNodes.remove(this.mHidrawNode); + } + } + + /** + * Writes the provided HID bytes to this Braille display. + * + * <p>Writes are posted to a background thread handler. + * + * @param buffer The bytes to write to the Braille display. These bytes should be formatted + * according to the report descriptor. + */ + @Override + @PermissionManuallyEnforced // by assertServiceIsConnectedLocked() + public void write(@NonNull byte[] buffer) { + Objects.requireNonNull(buffer); + if (buffer.length > IBinder.getSuggestedMaxIpcSizeBytes()) { + Slog.e(LOG_TAG, "Requested write of size " + buffer.length + + " which is larger than maximum " + IBinder.getSuggestedMaxIpcSizeBytes()); + return; + } + synchronized (mLock) { + assertServiceIsConnectedLocked(); + if (mOutputThread == null) { + try { + mOutputStream = new FileOutputStream(mHidrawNode); + } catch (FileNotFoundException e) { + Slog.e(LOG_TAG, "Unable to create write stream", e); + disconnect(); + return; + } + mOutputThread = new HandlerThread("BrailleDisplayConnection output thread", + Process.THREAD_PRIORITY_BACKGROUND); + mOutputThread.setDaemon(true); + mOutputThread.start(); + } + // TODO: b/316035785 - Proactively disconnect a misbehaving Braille display by calling + // disconnect() if the mOutputThread handler queue grows too large. + mOutputThread.getThreadHandler().post(() -> { + try { + mOutputStream.write(buffer); + } catch (IOException e) { + Slog.d(LOG_TAG, "Error writing to connected Braille display", e); + disconnect(); + } + }); + } + } + + /** + * Starts reading HID bytes from this Braille display. + * + * <p>Reads are performed on a background thread. + */ + private void startReadingLocked() { + mInputThread = new Thread(() -> { + Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); + try (InputStream inputStream = new FileInputStream(mHidrawNode)) { + final byte[] buffer = new byte[IBinder.getSuggestedMaxIpcSizeBytes()]; + int readSize; + while (!Thread.interrupted()) { + if (!mHidrawNode.exists()) { + disconnect(); + break; + } + // Reading from the HIDRAW character device node will block + // until bytes are available. + readSize = inputStream.read(buffer); + if (readSize > 0) { + try { + // Send the input to the AccessibilityService. + mController.onInput(Arrays.copyOfRange(buffer, 0, readSize)); + } catch (RemoteException e) { + // Error communicating with the AccessibilityService. + Slog.e(LOG_TAG, "Error calling onInput", e); + disconnect(); + break; + } + } + } + } catch (IOException e) { + Slog.d(LOG_TAG, "Error reading from connected Braille display", e); + disconnect(); + } + }, "BrailleDisplayConnection input thread"); + mInputThread.setDaemon(true); + mInputThread.start(); + } + + /** Stop the Input thread. */ + private void closeInputLocked() { + if (mInputThread != null) { + mInputThread.interrupt(); + } + mInputThread = null; + } + + /** Stop the Output thread and close the Output stream. */ + private void closeOutputLocked() { + if (mOutputThread != null) { + mOutputThread.quit(); + } + mOutputThread = null; + if (mOutputStream != null) { + try { + mOutputStream.close(); + } catch (IOException e) { + Slog.e(LOG_TAG, "Unable to close output stream", e); + } + } + mOutputStream = null; + } + + /** + * Returns a {@link BrailleDisplayScanner} that opens {@link FileInputStream}s to read + * from HIDRAW nodes and perform ioctls using the provided {@link NativeInterface}. + */ + @VisibleForTesting + BrailleDisplayScanner getDefaultNativeScanner(@NonNull NativeInterface nativeInterface) { + Objects.requireNonNull(nativeInterface); + return new BrailleDisplayScanner() { + private static final Path DEVICE_DIR = Path.of("/dev"); + private static final String HIDRAW_DEVICE_GLOB = "hidraw*"; + + @Override + public Collection<Path> getHidrawNodePaths() { + final List<Path> result = new ArrayList<>(); + try (DirectoryStream<Path> hidrawNodePaths = Files.newDirectoryStream( + DEVICE_DIR, HIDRAW_DEVICE_GLOB)) { + for (Path path : hidrawNodePaths) { + result.add(path); + } + return result; + } catch (IOException e) { + return null; + } + } + + private <T> T readFromFileDescriptor(Path path, Function<Integer, T> readFn) { + try (FileInputStream stream = new FileInputStream(path.toFile())) { + return readFn.apply(stream.getFD().getInt$()); + } catch (IOException e) { + return null; + } + } + + @Override + public byte[] getDeviceReportDescriptor(@NonNull Path path) { + Objects.requireNonNull(path); + return readFromFileDescriptor(path, fd -> { + final int descSize = nativeInterface.getHidrawDescSize(fd); + if (descSize > 0) { + return nativeInterface.getHidrawDesc(fd, descSize); + } + return null; + }); + } + + @Override + public String getUniqueId(@NonNull Path path) { + Objects.requireNonNull(path); + return readFromFileDescriptor(path, nativeInterface::getHidrawUniq); + } + + @Override + public int getDeviceBusType(@NonNull Path path) { + Objects.requireNonNull(path); + Integer busType = readFromFileDescriptor(path, nativeInterface::getHidrawBusType); + return busType != null ? busType : BUS_UNKNOWN; + } + }; + } + + /** + * Sets test data to be used by CTS tests. + * + * <p>Replaces the default {@link BrailleDisplayScanner} object for this connection, + * and also returns it to allow unit testing this test-only implementation. + * + * @see BrailleDisplayController#setTestBrailleDisplayData + */ + BrailleDisplayScanner setTestData(@NonNull List<Bundle> brailleDisplays) { + Objects.requireNonNull(brailleDisplays); + final Map<Path, Bundle> brailleDisplayMap = new ArrayMap<>(); + for (Bundle brailleDisplay : brailleDisplays) { + Path hidrawNodePath = Path.of(brailleDisplay.getString( + BrailleDisplayController.TEST_BRAILLE_DISPLAY_HIDRAW_PATH)); + brailleDisplayMap.put(hidrawNodePath, brailleDisplay); + } + synchronized (mLock) { + mScanner = new BrailleDisplayScanner() { + @Override + public Collection<Path> getHidrawNodePaths() { + return brailleDisplayMap.keySet(); + } + + @Override + public byte[] getDeviceReportDescriptor(@NonNull Path path) { + return brailleDisplayMap.get(path).getByteArray( + BrailleDisplayController.TEST_BRAILLE_DISPLAY_DESCRIPTOR); + } + + @Override + public String getUniqueId(@NonNull Path path) { + return brailleDisplayMap.get(path).getString( + BrailleDisplayController.TEST_BRAILLE_DISPLAY_UNIQUE_ID); + } + + @Override + public int getDeviceBusType(@NonNull Path path) { + return brailleDisplayMap.get(path).getBoolean( + BrailleDisplayController.TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH) + ? BUS_BLUETOOTH : BUS_USB; + } + }; + return mScanner; + } + } + + /** + * This interface exists to support unit testing {@link #getDefaultNativeScanner}. + */ + @VisibleForTesting + interface NativeInterface { + int getHidrawDescSize(int fd); + + byte[] getHidrawDesc(int fd, int descSize); + + String getHidrawUniq(int fd); + + int getHidrawBusType(int fd); + } + + /** Native interface that actually calls native HIDRAW ioctls. */ + private NativeInterface getDefaultNativeInterface() { + return new NativeInterface() { + @Override + public int getHidrawDescSize(int fd) { + return nativeGetHidrawDescSize(fd); + } + + @Override + public byte[] getHidrawDesc(int fd, int descSize) { + return nativeGetHidrawDesc(fd, descSize); + } + + @Override + public String getHidrawUniq(int fd) { + return nativeGetHidrawUniq(fd); + } + + @Override + public int getHidrawBusType(int fd) { + return nativeGetHidrawBusType(fd); + } + }; + } + + private native int nativeGetHidrawDescSize(int fd); + + private native byte[] nativeGetHidrawDesc(int fd, int descSize); + + private native String nativeGetHidrawUniq(int fd); + + private native int nativeGetHidrawBusType(int fd); +} diff --git a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java index 2c5038940e98..df4e699e3926 100644 --- a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java +++ b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java @@ -35,6 +35,7 @@ import android.content.Context; import android.content.pm.ParceledListSlice; import android.os.Binder; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.Process; import android.os.ResultReceiver; import android.os.ShellCallback; @@ -162,6 +163,13 @@ public class AppPredictionManagerService extends (service) -> service.onDestroyPredictionSessionLocked(sessionId)); } + @Override + public void requestServiceFeatures(@NonNull AppPredictionSessionId sessionId, + IRemoteCallback callback) { + runForUserLocked("requestServiceFeatures", sessionId, + (service) -> service.requestServiceFeaturesLocked(sessionId, callback)); + } + public void onShellCommand(@Nullable FileDescriptor in, @Nullable FileDescriptor out, @Nullable FileDescriptor err, @NonNull String[] args, @Nullable ShellCallback callback, diff --git a/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java b/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java index 84707a8d9c00..a0198f2fe240 100644 --- a/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java +++ b/services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java @@ -31,6 +31,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ParceledListSlice; import android.content.pm.ServiceInfo; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.provider.DeviceConfig; @@ -237,6 +238,18 @@ public class AppPredictionPerUserService extends sessionInfo.destroy(); } + /** + * Requests the service to provide AppPredictionService features info. + */ + @GuardedBy("mLock") + public void requestServiceFeaturesLocked(@NonNull AppPredictionSessionId sessionId, + @NonNull IRemoteCallback callback) { + final AppPredictionSessionInfo sessionInfo = mSessionInfos.get(sessionId); + if (sessionInfo == null) return; + resolveService(sessionId, true, sessionInfo.mUsesPeopleService, + s -> s.requestServiceFeatures(sessionId, callback)); + } + @Override public void onFailureOrTimeout(boolean timedOut) { if (isDebug()) { diff --git a/services/companion/java/com/android/server/companion/virtual/TEST_MAPPING b/services/companion/java/com/android/server/companion/virtual/TEST_MAPPING index 5a548fdca12e..82ab0980a22b 100644 --- a/services/companion/java/com/android/server/companion/virtual/TEST_MAPPING +++ b/services/companion/java/com/android/server/companion/virtual/TEST_MAPPING @@ -33,6 +33,14 @@ ] }, { + "name": "CtsVirtualDevicesCameraTestCases", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + }, + { "name": "CtsHardwareTestCases", "options": [ { @@ -54,11 +62,33 @@ "exclude-annotation": "android.support.test.filters.FlakyTest" } ] + } + ], + "postsubmit": [ + { + "name": "CtsMediaAudioTestCases", + "options": [ + { + "include-filter": "android.media.audio.cts.AudioFocusWithVdmTest" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] }, { - "name": "CtsVirtualDevicesCameraTestCases", + "name": "CtsPermissionTestCases", "options": [ { + "include-filter": "android.permissionmultidevice.cts.DeviceAwarePermissionGrantTest" + }, + { + "include-filter": "android.permission.cts.DevicePermissionsTest" + }, + { + "include-filter": "android.permission.cts.PermissionUpdateListenerTest" + }, + { "exclude-annotation": "androidx.test.filters.FlakyTest" } ] diff --git a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java index f619ca3f66a2..44d0132ef9a8 100644 --- a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java +++ b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java @@ -16,6 +16,8 @@ package com.android.server; +import static android.provider.Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS; + import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.NonNull; @@ -24,11 +26,10 @@ import android.content.ComponentName; import android.content.Context; import android.media.projection.MediaProjectionInfo; import android.media.projection.MediaProjectionManager; -import android.os.Handler; -import android.os.Looper; import android.os.RemoteException; import android.os.Trace; import android.os.UserHandle; +import android.provider.Settings; import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; @@ -117,7 +118,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic // TODO(b/317250444): use MediaProjectionManagerService directly, reduces unnecessary // handler, delegate, and binder death recipient - mProjectionManager.addCallback(mProjectionCallback, new Handler(Looper.getMainLooper())); + mProjectionManager.addCallback(mProjectionCallback, getContext().getMainThreadHandler()); try { mNotificationListener.registerAsSystemService( @@ -148,6 +149,15 @@ public final class SensitiveContentProtectionManagerService extends SystemServic } private void onProjectionStart() { + // TODO(b/324447419): move GlobalSettings lookup to background thread + boolean disableScreenShareProtections = + Settings.Global.getInt(getContext().getContentResolver(), + DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS, 0) != 0; + if (disableScreenShareProtections) { + Log.w(TAG, "Screen share protections disabled, ignoring projection start"); + return; + } + synchronized (mSensitiveContentProtectionLock) { mProjectionActive = true; updateAppsThatShouldBlockScreenCapture(); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index cd45b03ba7ad..b8f6b3f3a988 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -480,9 +480,14 @@ public final class ActiveServices { /** * The available ANR timers. */ + // ActivityManagerConstants.SERVICE_TIMEOUT/ActivityManagerConstants.SERVICE_BACKGROUND_TIMEOUT private final ProcessAnrTimer mActiveServiceAnrTimer; + // see ServiceRecord$ShortFgsInfo#getAnrTime() private final ServiceAnrTimer mShortFGSAnrTimer; + // ActivityManagerConstants.DEFAULT_SERVICE_START_FOREGROUND_TIMEOUT_MS private final ServiceAnrTimer mServiceFGAnrTimer; + // see ServiceRecord#getEarliestStopTypeAndTime() + private final ServiceAnrTimer mFGSAnrTimer; // allowlisted packageName. ArraySet<String> mAllowListWhileInUsePermissionInFgs = new ArraySet<>(); @@ -744,10 +749,13 @@ public final class ActiveServices { "SERVICE_TIMEOUT"); this.mShortFGSAnrTimer = new ServiceAnrTimer(service, ActivityManagerService.SERVICE_SHORT_FGS_ANR_TIMEOUT_MSG, - "FGS_TIMEOUT"); + "SHORT_FGS_TIMEOUT"); this.mServiceFGAnrTimer = new ServiceAnrTimer(service, ActivityManagerService.SERVICE_FOREGROUND_TIMEOUT_MSG, "SERVICE_FOREGROUND_TIMEOUT"); + this.mFGSAnrTimer = new ServiceAnrTimer(service, + ActivityManagerService.SERVICE_FGS_ANR_TIMEOUT_MSG, + "FGS_TIMEOUT"); } void systemServicesReady() { @@ -1570,6 +1578,7 @@ public final class ActiveServices { } maybeStopShortFgsTimeoutLocked(service); + maybeStopFgsTimeoutLocked(service); final int uid = service.appInfo.uid; final String packageName = service.name.getPackageName(); @@ -1758,6 +1767,7 @@ public final class ActiveServices { } maybeStopShortFgsTimeoutLocked(r); + maybeStopFgsTimeoutLocked(r); final int uid = r.appInfo.uid; final String packageName = r.name.getPackageName(); @@ -2243,6 +2253,8 @@ public final class ActiveServices { // Whether to extend the SHORT_SERVICE time out. boolean extendShortServiceTimeout = false; + // Whether to extend the timeout for a time-limited FGS type. + boolean extendFgsTimeout = false; // Whether setFgsRestrictionLocked() is called in here. Only used for logging. boolean fgsRestrictionRecalculated = false; @@ -2287,6 +2299,19 @@ public final class ActiveServices { final boolean isOldTypeShortFgsAndTimedOut = r.shouldTriggerShortFgsTimeout(nowUptime); + // Calling startForeground on a FGS type which has a time limit will only be + // allowed if the app is in a state where it can normally start another FGS. + // The timeout will behave as follows: + // A) <TIME_LIMITED_TYPE> -> another <TIME_LIMITED_TYPE> + // - If the start succeeds, the timeout is reset. + // B) <TIME_LIMITED_TYPE> -> non-time-limited type + // - If the start succeeds, the timeout will stop. + // C) non-time-limited type -> <TIME_LIMITED_TYPE> + // - If the start succeeds, the timeout will start. + final boolean isOldTypeTimeLimited = r.isFgsTimeLimited(); + final boolean isNewTypeTimeLimited = + r.canFgsTypeTimeOut(foregroundServiceType); + // If true, we skip the BFSL check. boolean bypassBfslCheck = false; @@ -2355,6 +2380,35 @@ public final class ActiveServices { // "if (r.mAllowStartForeground == REASON_DENIED...)" block below. } } + } else if (r.isForeground && isOldTypeTimeLimited) { + + // See if the app could start an FGS or not. + r.clearFgsAllowStart(); + setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.getPid(), + r.appInfo.uid, r.intent.getIntent(), r, r.userId, + BackgroundStartPrivileges.NONE, false /* isBindService */); + fgsRestrictionRecalculated = true; + + final boolean fgsStartAllowed = !isBgFgsRestrictionEnabledForService + || r.isFgsAllowedStart(); + + if (fgsStartAllowed) { + if (isNewTypeTimeLimited) { + // Note: in the future, we may want to look into metrics to see if + // apps are constantly switching between a time-limited type and a + // non-time-limited type or constantly calling startForeground() + // opportunistically on the same type to gain runtime and apply the + // stricter timeout. For now, always extend the timeout if the app + // is in a state where it's allowed to start a FGS. + extendFgsTimeout = true; + } else { + // FGS type is changing from a time-restricted type to one without + // a time limit so proceed as normal. + // The timeout will stop later, in maybeUpdateFgsTrackingLocked(). + } + } else { + // This case will be handled in the BFSL check below. + } } else if (r.mStartForegroundCount == 0) { /* If the service was started with startService(), not @@ -2596,6 +2650,7 @@ public final class ActiveServices { maybeUpdateShortFgsTrackingLocked(r, extendShortServiceTimeout); + maybeUpdateFgsTrackingLocked(r, extendFgsTimeout); } else { if (DEBUG_FOREGROUND_SERVICE) { Slog.d(TAG, "Suppressing startForeground() for FAS " + r); @@ -2631,6 +2686,7 @@ public final class ActiveServices { } maybeStopShortFgsTimeoutLocked(r); + maybeStopFgsTimeoutLocked(r); // Adjust notification handling before setting isForeground to false, because // that state is relevant to the notification policy side. @@ -3608,6 +3664,116 @@ public final class ActiveServices { } } + void onFgsTimeout(ServiceRecord sr) { + synchronized (mAm) { + final long nowUptime = SystemClock.uptimeMillis(); + final int fgsType = sr.getTimedOutFgsType(nowUptime); + if (fgsType == -1) { + mFGSAnrTimer.discard(sr); + return; + } + Slog.e(TAG_SERVICE, "FGS (" + ServiceInfo.foregroundServiceTypeToLabel(fgsType) + + ") timed out: " + sr); + mFGSAnrTimer.accept(sr); + traceInstant("FGS timed out: ", sr); + + logFGSStateChangeLocked(sr, + FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT, + nowUptime > sr.mFgsEnterTime ? (int) (nowUptime - sr.mFgsEnterTime) : 0, + FGS_STOP_REASON_UNKNOWN, + FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); + try { + sr.app.getThread().scheduleTimeoutServiceForType(sr, sr.getLastStartId(), fgsType); + } catch (RemoteException e) { + Slog.w(TAG_SERVICE, "Exception from scheduleTimeoutServiceForType: " + e); + } + + // ANR the service after giving the service some time to clean up. + // ServiceRecord.getEarliestStopTypeAndTime() is an absolute time with a reference that + // is not "now". Compute the time from "now" when starting the anr timer. + final long anrTime = sr.getEarliestStopTypeAndTime().second + + mAm.mConstants.mFgsAnrExtraWaitDuration - SystemClock.uptimeMillis(); + mFGSAnrTimer.start(sr, anrTime); + } + } + + private void maybeUpdateFgsTrackingLocked(ServiceRecord sr, boolean extendTimeout) { + if (!sr.isFgsTimeLimited()) { + // Reset timers if they exist. + sr.setIsFgsTimeLimited(false); + mFGSAnrTimer.cancel(sr); + mAm.mHandler.removeMessages(ActivityManagerService.SERVICE_FGS_TIMEOUT_MSG, sr); + return; + } + + if (extendTimeout || !sr.wasFgsPreviouslyTimeLimited()) { + traceInstant("FGS start: ", sr); + sr.setIsFgsTimeLimited(true); + + // We'll restart the timeout. + mFGSAnrTimer.cancel(sr); + mAm.mHandler.removeMessages(ActivityManagerService.SERVICE_FGS_TIMEOUT_MSG, sr); + + final Message msg = mAm.mHandler.obtainMessage( + ActivityManagerService.SERVICE_FGS_TIMEOUT_MSG, sr); + mAm.mHandler.sendMessageAtTime(msg, sr.getEarliestStopTypeAndTime().second); + } + } + + private void maybeStopFgsTimeoutLocked(ServiceRecord sr) { + sr.setIsFgsTimeLimited(false); // reset fgs boolean holding time-limited type state. + if (!sr.isFgsTimeLimited()) { + return; // if none of the types are time-limited, return. + } + Slog.d(TAG_SERVICE, "Stop FGS timeout: " + sr); + mFGSAnrTimer.cancel(sr); + mAm.mHandler.removeMessages(ActivityManagerService.SERVICE_FGS_TIMEOUT_MSG, sr); + } + + boolean hasServiceTimedOutLocked(ComponentName className, IBinder token) { + final int userId = UserHandle.getCallingUserId(); + final long ident = mAm.mInjector.clearCallingIdentity(); + try { + ServiceRecord sr = findServiceLocked(className, token, userId); + if (sr == null) { + return false; + } + final long nowUptime = SystemClock.uptimeMillis(); + return sr.getTimedOutFgsType(nowUptime) != -1; + } finally { + mAm.mInjector.restoreCallingIdentity(ident); + } + } + + void onFgsAnrTimeout(ServiceRecord sr) { + final long nowUptime = SystemClock.uptimeMillis(); + final int fgsType = sr.getTimedOutFgsType(nowUptime); + if (fgsType == -1 || !sr.wasFgsPreviouslyTimeLimited()) { + return; // no timed out FGS type was found + } + final String reason = "A foreground service of type " + + ServiceInfo.foregroundServiceTypeToLabel(fgsType) + + " did not stop within a timeout: " + sr.getComponentName(); + + final TimeoutRecord tr = TimeoutRecord.forFgsTimeout(reason); + + tr.mLatencyTracker.waitingOnAMSLockStarted(); + synchronized (mAm) { + tr.mLatencyTracker.waitingOnAMSLockEnded(); + + Slog.e(TAG_SERVICE, "FGS ANR'ed: " + sr); + traceInstant("FGS ANR: ", sr); + mAm.appNotResponding(sr.app, tr); + + // TODO: Can we close the ANR dialog here, if it's still shown? Currently, the ANR + // dialog really doesn't remember the "cause" (especially if there have been multiple + // ANRs), so it's not doable. + } + } + private void updateAllowlistManagerLocked(ProcessServiceRecord psr) { psr.mAllowlistManager = false; for (int i = psr.numberOfRunningServices() - 1; i >= 0; i--) { @@ -3621,6 +3787,7 @@ public final class ActiveServices { private void stopServiceAndUpdateAllowlistManagerLocked(ServiceRecord service) { maybeStopShortFgsTimeoutLocked(service); + maybeStopFgsTimeoutLocked(service); final ProcessServiceRecord psr = service.app.mServices; psr.stopService(service); psr.updateBoundClientUids(); @@ -5893,6 +6060,7 @@ public final class ActiveServices { Slog.w(TAG_SERVICE, "Short FGS brought down without stopping: " + r); maybeStopShortFgsTimeoutLocked(r); } + maybeStopFgsTimeoutLocked(r); // Report to all of the connections that the service is no longer // available. @@ -6015,6 +6183,7 @@ public final class ActiveServices { final boolean exitingFg = r.isForeground; if (exitingFg) { maybeStopShortFgsTimeoutLocked(r); + maybeStopFgsTimeoutLocked(r); decActiveForegroundAppLocked(smap, r); synchronized (mAm.mProcessStats.mLock) { ServiceState stracker = r.getTracker(); @@ -8643,7 +8812,7 @@ public final class ActiveServices { event = EventLogTags.AM_FOREGROUND_SERVICE_DENIED; } else if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT) { event = EventLogTags.AM_FOREGROUND_SERVICE_TIMED_OUT; - }else { + } else { // Unknown event. return; } diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index 72e62c37106d..d97731c85d38 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -1052,6 +1052,27 @@ final class ActivityManagerConstants extends ContentObserver { public volatile long mShortFgsProcStateExtraWaitDuration = DEFAULT_SHORT_FGS_PROC_STATE_EXTRA_WAIT_DURATION; + /** Timeout for a mediaProcessing FGS, in milliseconds. */ + private static final String KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION = + "media_processing_fgs_timeout_duration"; + + /** @see #KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION */ + static final long DEFAULT_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION = 6 * 60 * 60_000; // 6 hours + + /** @see #KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION */ + public volatile long mMediaProcessingFgsTimeoutDuration = + DEFAULT_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION; + + /** Timeout for a dataSync FGS, in milliseconds. */ + private static final String KEY_DATA_SYNC_FGS_TIMEOUT_DURATION = + "data_sync_fgs_timeout_duration"; + + /** @see #KEY_DATA_SYNC_FGS_TIMEOUT_DURATION */ + static final long DEFAULT_DATA_SYNC_FGS_TIMEOUT_DURATION = 6 * 60 * 60_000; // 6 hours + + /** @see #KEY_DATA_SYNC_FGS_TIMEOUT_DURATION */ + public volatile long mDataSyncFgsTimeoutDuration = DEFAULT_DATA_SYNC_FGS_TIMEOUT_DURATION; + /** * If enabled, when starting an application, the system will wait for a * {@link ActivityManagerService#finishAttachApplication} from the app before scheduling @@ -1082,6 +1103,20 @@ final class ActivityManagerConstants extends ContentObserver { public volatile long mShortFgsAnrExtraWaitDuration = DEFAULT_SHORT_FGS_ANR_EXTRA_WAIT_DURATION; + /** + * If a service of a timeout-enforced type doesn't finish within this duration after its + * timeout, then we'll declare an ANR. + * i.e. if the time limit for a type is 1 hour, and this extra duration is 10 seconds, then + * the app will be ANR'ed 1 hour and 10 seconds after it started. + */ + private static final String KEY_FGS_ANR_EXTRA_WAIT_DURATION = "fgs_anr_extra_wait_duration"; + + /** @see #KEY_FGS_ANR_EXTRA_WAIT_DURATION */ + static final long DEFAULT_FGS_ANR_EXTRA_WAIT_DURATION = 10_000; + + /** @see #KEY_FGS_ANR_EXTRA_WAIT_DURATION */ + public volatile long mFgsAnrExtraWaitDuration = DEFAULT_FGS_ANR_EXTRA_WAIT_DURATION; + /** @see #KEY_USE_TIERED_CACHED_ADJ */ public boolean USE_TIERED_CACHED_ADJ = DEFAULT_USE_TIERED_CACHED_ADJ; @@ -1264,9 +1299,18 @@ final class ActivityManagerConstants extends ContentObserver { case KEY_SHORT_FGS_PROC_STATE_EXTRA_WAIT_DURATION: updateShortFgsProcStateExtraWaitDuration(); break; + case KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION: + updateMediaProcessingFgsTimeoutDuration(); + break; + case KEY_DATA_SYNC_FGS_TIMEOUT_DURATION: + updateDataSyncFgsTimeoutDuration(); + break; case KEY_SHORT_FGS_ANR_EXTRA_WAIT_DURATION: updateShortFgsAnrExtraWaitDuration(); break; + case KEY_FGS_ANR_EXTRA_WAIT_DURATION: + updateFgsAnrExtraWaitDuration(); + break; case KEY_PROACTIVE_KILLS_ENABLED: updateProactiveKillsEnabled(); break; @@ -2064,6 +2108,27 @@ final class ActivityManagerConstants extends ContentObserver { DEFAULT_SHORT_FGS_ANR_EXTRA_WAIT_DURATION); } + private void updateMediaProcessingFgsTimeoutDuration() { + mMediaProcessingFgsTimeoutDuration = DeviceConfig.getLong( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION, + DEFAULT_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION); + } + + private void updateDataSyncFgsTimeoutDuration() { + mDataSyncFgsTimeoutDuration = DeviceConfig.getLong( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_DATA_SYNC_FGS_TIMEOUT_DURATION, + DEFAULT_DATA_SYNC_FGS_TIMEOUT_DURATION); + } + + private void updateFgsAnrExtraWaitDuration() { + mFgsAnrExtraWaitDuration = DeviceConfig.getLong( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_FGS_ANR_EXTRA_WAIT_DURATION, + DEFAULT_FGS_ANR_EXTRA_WAIT_DURATION); + } + private void updateEnableWaitForFinishAttachApplication() { mEnableWaitForFinishAttachApplication = DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -2295,6 +2360,13 @@ final class ActivityManagerConstants extends ContentObserver { pw.print(" "); pw.print(KEY_SHORT_FGS_ANR_EXTRA_WAIT_DURATION); pw.print("="); pw.println(mShortFgsAnrExtraWaitDuration); + pw.print(" "); pw.print(KEY_MEDIA_PROCESSING_FGS_TIMEOUT_DURATION); + pw.print("="); pw.println(mMediaProcessingFgsTimeoutDuration); + pw.print(" "); pw.print(KEY_DATA_SYNC_FGS_TIMEOUT_DURATION); + pw.print("="); pw.println(mDataSyncFgsTimeoutDuration); + pw.print(" "); pw.print(KEY_FGS_ANR_EXTRA_WAIT_DURATION); + pw.print("="); pw.println(mFgsAnrExtraWaitDuration); + pw.print(" "); pw.print(KEY_USE_TIERED_CACHED_ADJ); pw.print("="); pw.println(USE_TIERED_CACHED_ADJ); pw.print(" "); pw.print(KEY_TIERED_CACHED_ADJ_DECAY_TIME); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2750344b487e..bfdcb95b099e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1702,6 +1702,8 @@ public class ActivityManagerService extends IActivityManager.Stub static final int REMOVE_UID_FROM_OBSERVER_MSG = 81; static final int BIND_APPLICATION_TIMEOUT_SOFT_MSG = 82; static final int BIND_APPLICATION_TIMEOUT_HARD_MSG = 83; + static final int SERVICE_FGS_TIMEOUT_MSG = 84; + static final int SERVICE_FGS_ANR_TIMEOUT_MSG = 85; static final int FIRST_BROADCAST_QUEUE_MSG = 200; @@ -2064,6 +2066,12 @@ public class ActivityManagerService extends IActivityManager.Stub case BIND_APPLICATION_TIMEOUT_HARD_MSG: { handleBindApplicationTimeoutHard((ProcessRecord) msg.obj); } break; + case SERVICE_FGS_TIMEOUT_MSG: { + mServices.onFgsTimeout((ServiceRecord) msg.obj); + } break; + case SERVICE_FGS_ANR_TIMEOUT_MSG: { + mServices.onFgsAnrTimeout((ServiceRecord) msg.obj); + } break; } } } @@ -13794,6 +13802,13 @@ public class ActivityManagerService extends IActivityManager.Stub } @Override + public boolean hasServiceTimeLimitExceeded(ComponentName className, IBinder token) { + synchronized (this) { + return mServices.hasServiceTimedOutLocked(className, token); + } + } + + @Override public int handleIncomingUser(int callingPid, int callingUid, int userId, boolean allowAll, boolean requireFull, String name, String callerPackage) { return mUserController.handleIncomingUser(callingPid, callingUid, userId, allowAll, diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 2771572edb01..3c8d7fc833dc 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -56,6 +56,7 @@ import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; import android.util.ArrayMap; +import android.util.Pair; import android.util.Slog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -236,6 +237,8 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN boolean mFgsNotificationShown; // Whether FGS package has permissions to show notifications. boolean mFgsHasNotificationPermission; + // Whether the FGS contains a type that is time limited. + private boolean mFgsIsTimeLimited; // allow the service becomes foreground service? Service started from background may not be // allowed to become a foreground service. @@ -915,6 +918,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN pw.print(prefix); pw.print("isForeground="); pw.print(isForeground); pw.print(" foregroundId="); pw.print(foregroundId); pw.printf(" types=%08X", foregroundServiceType); + pw.print(" fgsHasTimeLimitedType="); pw.print(mFgsIsTimeLimited); pw.print(" foregroundNoti="); pw.println(foregroundNoti); if (isShortFgs() && mShortFgsInfo != null) { @@ -1789,6 +1793,83 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN + " " + (mShortFgsInfo == null ? "" : mShortFgsInfo.getDescription()); } + /** + * @return true if one of the types of this FGS has a time limit. + */ + public boolean isFgsTimeLimited() { + return startRequested && isForeground && canFgsTypeTimeOut(foregroundServiceType); + } + + /** + * Called when a FGS with a time-limited type starts ({@code true}) or stops ({@code false}). + */ + public void setIsFgsTimeLimited(boolean fgsIsTimeLimited) { + this.mFgsIsTimeLimited = fgsIsTimeLimited; + } + + /** + * @return whether {@link #mFgsIsTimeLimited} was previously set or not. + */ + public boolean wasFgsPreviouslyTimeLimited() { + return mFgsIsTimeLimited; + } + + /** + * @return the FGS type if the service has reached its time limit, otherwise -1. + */ + public int getTimedOutFgsType(long nowUptime) { + if (!isAppAlive() || !isFgsTimeLimited()) { + return -1; + } + + final Pair<Integer, Long> fgsTypeAndStopTime = getEarliestStopTypeAndTime(); + if (fgsTypeAndStopTime.first != -1 && fgsTypeAndStopTime.second <= nowUptime) { + return fgsTypeAndStopTime.first; + } + return -1; // no fgs type exceeded time limit + } + + /** + * @return a {@code Pair<fgs_type, stop_time>}, representing the earliest time at which the FGS + * should be stopped (fgs start time + time limit for most restrictive type) + */ + Pair<Integer, Long> getEarliestStopTypeAndTime() { + int fgsType = -1; + long timeout = 0; + if ((foregroundServiceType & ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING) + == ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING) { + fgsType = ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING; + timeout = ams.mConstants.mMediaProcessingFgsTimeoutDuration; + } + if ((foregroundServiceType & ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) + == ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) { + // update the timeout and type if this type has a more restrictive time limit + if (timeout == 0 || ams.mConstants.mDataSyncFgsTimeoutDuration < timeout) { + fgsType = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC; + timeout = ams.mConstants.mDataSyncFgsTimeoutDuration; + } + } + // Add the logic for time limits introduced in the future for other fgs types here. + return Pair.create(fgsType, timeout == 0 ? 0 : (mFgsEnterTime + timeout)); + } + + /** + * Check if the given types contain a type which is time restricted. + */ + boolean canFgsTypeTimeOut(int fgsType) { + // The below conditionals are not simplified on purpose to help with readability. + if ((fgsType & ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING) + == ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING) { + return true; + } + if ((fgsType & ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) + == ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) { + return true; + } + // Additional types which have time limits should be added here in the future. + return false; + } + private boolean isAppAlive() { if (app == null) { return false; diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING index bd3c8e0b3fe6..feab2c05cad6 100644 --- a/services/core/java/com/android/server/am/TEST_MAPPING +++ b/services/core/java/com/android/server/am/TEST_MAPPING @@ -157,7 +157,6 @@ ] }, { - "file_patterns": ["Broadcast.*"], "name": "CtsContentTestCases", "options": [ { "include-filter": "android.content.cts.BroadcastReceiverTest" }, diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 96c6be824561..55ac4cf37283 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -1350,41 +1350,57 @@ class UserController implements Handler.Callback { } /** - * For mDelayUserDataLocking mode, storage once unlocked is kept unlocked. - * Total number of unlocked user storage is limited by mMaxRunningUsers. - * If there are more unlocked users, evict and lock the least recently stopped user and - * lock that user's data. Regardless of the mode, ephemeral user is always locked - * immediately. + * Returns which user, if any, should be locked when the given user is stopped. + * + * For typical (non-mDelayUserDataLocking) devices and users, this will be the provided user. + * + * However, for some devices or users (based on {@link #canDelayDataLockingForUser(int)}), + * storage once unlocked is kept unlocked, even after the user is stopped, so the user to be + * locked (if any) may differ. + * + * For mDelayUserDataLocking devices, the total number of unlocked user storage is limited + * (currently by mMaxRunningUsers). If there are more unlocked users, evict and lock the least + * recently stopped user and lock that user's data. + * + * Regardless of the mode, ephemeral user is always locked immediately. * * @return user id to lock. UserHandler.USER_NULL will be returned if no user should be locked. */ @GuardedBy("mLock") private int updateUserToLockLU(@UserIdInt int userId, boolean allowDelayedLocking) { - int userIdToLock = userId; - // TODO: Decouple the delayed locking flows from mMaxRunningUsers or rename the property to - // state maximum running unlocked users specifically - if (canDelayDataLockingForUser(userIdToLock) && allowDelayedLocking - && !getUserInfo(userId).isEphemeral() - && !hasUserRestriction(UserManager.DISALLOW_RUN_IN_BACKGROUND, userId)) { + if (!canDelayDataLockingForUser(userId) + || !allowDelayedLocking + || getUserInfo(userId).isEphemeral() + || hasUserRestriction(UserManager.DISALLOW_RUN_IN_BACKGROUND, userId)) { + return userId; + } + + // Once we reach here, we are in a delayed locking scenario. + // Now, no user will be locked, unless the device's policy dictates we should based on the + // maximum of such users allowed for the device. + if (mDelayUserDataLocking) { // arg should be object, not index mLastActiveUsersForDelayedLocking.remove((Integer) userId); mLastActiveUsersForDelayedLocking.add(0, userId); int totalUnlockedUsers = mStartedUsers.size() + mLastActiveUsersForDelayedLocking.size(); + // TODO: Decouple the delayed locking flows from mMaxRunningUsers. These users aren't + // running so this calculation shouldn't be based on this parameter. Also note that + // that if these devices ever support background running users (such as profiles), the + // implementation is incorrect since starting such users can cause the max to be + // exceeded. if (totalUnlockedUsers > mMaxRunningUsers) { // should lock a user - userIdToLock = mLastActiveUsersForDelayedLocking.get( + final int userIdToLock = mLastActiveUsersForDelayedLocking.get( mLastActiveUsersForDelayedLocking.size() - 1); mLastActiveUsersForDelayedLocking .remove(mLastActiveUsersForDelayedLocking.size() - 1); - Slogf.i(TAG, "finishUserStopped, stopping user:" + userId - + " lock user:" + userIdToLock); - } else { - Slogf.i(TAG, "finishUserStopped, user:" + userId + ", skip locking"); - // do not lock - userIdToLock = UserHandle.USER_NULL; + Slogf.i(TAG, "finishUserStopped: should stop user " + userId + + " but should lock user " + userIdToLock); + return userIdToLock; } } - return userIdToLock; + Slogf.i(TAG, "finishUserStopped: should stop user " + userId + " but without any locking"); + return UserHandle.USER_NULL; } /** diff --git a/services/core/java/com/android/server/appop/LegacyAppOpStateParser.java b/services/core/java/com/android/server/appop/LegacyAppOpStateParser.java index a6d505021090..9ed3a99013ea 100644 --- a/services/core/java/com/android/server/appop/LegacyAppOpStateParser.java +++ b/services/core/java/com/android/server/appop/LegacyAppOpStateParser.java @@ -49,15 +49,7 @@ class LegacyAppOpStateParser { */ public int readState(AtomicFile file, SparseArray<SparseIntArray> uidModes, SparseArray<ArrayMap<String, SparseIntArray>> userPackageModes) { - FileInputStream stream; - try { - stream = file.openRead(); - } catch (FileNotFoundException e) { - Slog.i(TAG, "No existing app ops " + file.getBaseFile() + "; starting empty"); - return NO_FILE_VERSION; - } - - try { + try (FileInputStream stream = file.openRead()) { TypedXmlPullParser parser = Xml.resolvePullParser(stream); int type; while ((type = parser.next()) != XmlPullParser.START_TAG @@ -95,6 +87,9 @@ class LegacyAppOpStateParser { } } return versionAtBoot; + } catch (FileNotFoundException e) { + Slog.i(TAG, "No existing app ops " + file.getBaseFile() + "; starting empty"); + return NO_FILE_VERSION; } catch (XmlPullParserException e) { throw new RuntimeException(e); } catch (IOException e) { diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 53255a0639fe..c59f4f7888ce 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -32,6 +32,7 @@ import static android.media.AudioManager.RINGER_MODE_VIBRATE; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.audio.Flags.autoPublicVolumeApiHardening; import static android.media.audio.Flags.automaticBtDeviceType; +import static android.media.audio.Flags.featureSpatialAudioHeadtrackingLowLatency; import static android.media.audio.Flags.focusFreezeTestApi; import static android.media.audiopolicy.Flags.enableFadeManagerConfiguration; import static android.os.Process.FIRST_APPLICATION_UID; @@ -4519,6 +4520,10 @@ public class AudioService extends IAudioService.Stub pw.println("\nFun with Flags: "); pw.println("\tandroid.media.audio.autoPublicVolumeApiHardening:" + autoPublicVolumeApiHardening()); + pw.println("\tandroid.media.audio.Flags.automaticBtDeviceType:" + + automaticBtDeviceType()); + pw.println("\tandroid.media.audio.featureSpatialAudioHeadtrackingLowLatency:" + + featureSpatialAudioHeadtrackingLowLatency()); pw.println("\tandroid.media.audio.focusFreezeTestApi:" + focusFreezeTestApi()); pw.println("\tcom.android.media.audio.disablePrescaleAbsoluteVolume:" diff --git a/services/core/java/com/android/server/audio/AudioServiceEvents.java b/services/core/java/com/android/server/audio/AudioServiceEvents.java index 3417f6501459..3b1c011f09c0 100644 --- a/services/core/java/com/android/server/audio/AudioServiceEvents.java +++ b/services/core/java/com/android/server/audio/AudioServiceEvents.java @@ -259,6 +259,7 @@ public class AudioServiceEvents { /** used for VOL_ADJUST_VOL_UID, * VOL_ADJUST_SUGG_VOL, * VOL_ADJUST_STREAM_VOL, + * VOL_SET_LE_AUDIO_VOL */ VolumeEvent(int op, int stream, int val1, int val2, String caller) { mOp = op; @@ -434,6 +435,8 @@ public class AudioServiceEvents { .set(MediaMetrics.Property.EVENT, "setLeAudioVolume") .set(MediaMetrics.Property.INDEX, mVal1) .set(MediaMetrics.Property.MAX_INDEX, mVal2) + .set(MediaMetrics.Property.STREAM_TYPE, + AudioSystem.streamToString(mStream)) .record(); return; case VOL_SET_AVRCP_VOL: @@ -519,7 +522,8 @@ public class AudioServiceEvents { .append(" gain dB:").append(mVal2) .toString(); case VOL_SET_LE_AUDIO_VOL: - return new StringBuilder("setLeAudioVolume:") + return new StringBuilder("setLeAudioVolume(stream:") + .append(AudioSystem.streamToString(mStream)) .append(" index:").append(mVal1) .append(" maxIndex:").append(mVal2) .toString(); diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index f51043dc1cdc..0f3f8073edcc 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -470,7 +470,8 @@ public class BtHelper { + index + " volume=" + volume); } AudioService.sVolumeLogger.enqueue(new AudioServiceEvents.VolumeEvent( - AudioServiceEvents.VolumeEvent.VOL_SET_LE_AUDIO_VOL, index, maxIndex)); + AudioServiceEvents.VolumeEvent.VOL_SET_LE_AUDIO_VOL, streamType, index, + maxIndex, /*caller=*/null)); try { mLeAudio.setVolume(volume); } catch (Exception e) { diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index 8d767313d5ab..3b5fa7f00891 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -26,6 +26,7 @@ import static com.android.media.audio.Flags.dsaOverBtLeAudio; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; +import android.content.pm.PackageManager; import android.hardware.Sensor; import android.hardware.SensorManager; import android.media.AudioAttributes; @@ -1611,6 +1612,9 @@ public class SpatializerHelper { pw.println("\tsupports binaural:" + mBinauralSupported + " / transaural:" + mTransauralSupported); pw.println("\tmSpatOutput:" + mSpatOutput); + pw.println("\thas FEATURE_AUDIO_SPATIAL_HEADTRACKING_LOW_LATENCY:" + + mAudioService.mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUDIO_SPATIAL_HEADTRACKING_LOW_LATENCY)); } private static String spatStateString(int state) { diff --git a/services/core/java/com/android/server/biometrics/OWNERS b/services/core/java/com/android/server/biometrics/OWNERS index 1bf2aeffdf0c..4703efbcd7be 100644 --- a/services/core/java/com/android/server/biometrics/OWNERS +++ b/services/core/java/com/android/server/biometrics/OWNERS @@ -2,7 +2,6 @@ set noparent graciecheng@google.com ilyamaty@google.com -jaggies@google.com jbolinger@google.com jeffpu@google.com joshmccloskey@google.com diff --git a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java index cb15abcc65fc..cd064ae38aa5 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java @@ -19,11 +19,11 @@ package com.android.server.devicestate; import static android.Manifest.permission.CONTROL_DEVICE_STATE; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND; import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import static android.hardware.devicestate.DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS; import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE; import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE; -import static com.android.server.devicestate.DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS; import static com.android.server.devicestate.OverrideRequest.OVERRIDE_REQUEST_TYPE_BASE_STATE; import static com.android.server.devicestate.OverrideRequest.OVERRIDE_REQUEST_TYPE_EMULATED_STATE; import static com.android.server.devicestate.OverrideRequestController.FLAG_POWER_SAVE_ENABLED; @@ -40,6 +40,7 @@ import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.IProcessObserver; import android.content.Context; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateInfo; import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateManagerInternal; diff --git a/services/core/java/com/android/server/devicestate/DeviceStateManagerShellCommand.java b/services/core/java/com/android/server/devicestate/DeviceStateManagerShellCommand.java index 8c6068d89296..02c9bb3b9deb 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateManagerShellCommand.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateManagerShellCommand.java @@ -18,6 +18,7 @@ package com.android.server.devicestate; import android.annotation.NonNull; import android.annotation.Nullable; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateManager; import android.hardware.devicestate.DeviceStateRequest; import android.os.Binder; diff --git a/services/core/java/com/android/server/devicestate/DeviceStateProvider.java b/services/core/java/com/android/server/devicestate/DeviceStateProvider.java index d5945f4e8b52..65b393ad94b9 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateProvider.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateProvider.java @@ -21,6 +21,7 @@ import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STA import android.annotation.IntDef; import android.annotation.IntRange; +import android.hardware.devicestate.DeviceState; import android.util.Dumpable; import java.lang.annotation.Retention; diff --git a/services/core/java/com/android/server/devicestate/OverrideRequest.java b/services/core/java/com/android/server/devicestate/OverrideRequest.java index 20485c1ac102..d92629f77a95 100644 --- a/services/core/java/com/android/server/devicestate/OverrideRequest.java +++ b/services/core/java/com/android/server/devicestate/OverrideRequest.java @@ -18,6 +18,7 @@ package com.android.server.devicestate; import android.annotation.IntDef; import android.annotation.NonNull; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateRequest; import android.os.IBinder; diff --git a/services/core/java/com/android/server/devicestate/OverrideRequestController.java b/services/core/java/com/android/server/devicestate/OverrideRequestController.java index f5f2fa8cabdc..6c3fd83d17a0 100644 --- a/services/core/java/com/android/server/devicestate/OverrideRequestController.java +++ b/services/core/java/com/android/server/devicestate/OverrideRequestController.java @@ -18,6 +18,7 @@ package com.android.server.devicestate; import android.annotation.IntDef; import android.annotation.NonNull; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateRequest; import android.os.IBinder; import android.util.Slog; diff --git a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeMap.java b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeMap.java new file mode 100644 index 000000000000..f2185163824f --- /dev/null +++ b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeMap.java @@ -0,0 +1,155 @@ +/* + * 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.inputmethod; + +import android.annotation.AnyThread; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.util.ArrayMap; +import android.view.inputmethod.InputMethodSubtype; + +import java.util.Collection; +import java.util.List; + +/** + * An on-memory immutable data representation of subtype.xml, which contains so-called additional + * {@link InputMethodSubtype}. + * + * <p>While the data structure could be also used for general purpose map from IME ID to + * a list of {@link InputMethodSubtype}, unlike {@link InputMethodMap} this particular data + * structure is currently used only around additional {@link InputMethodSubtype}, which is why this + * class is (still) called {@code AdditionalSubtypeMap} rather than {@code InputMethodSubtypeMap}. + * </p> + */ +final class AdditionalSubtypeMap { + /** + * An empty {@link AdditionalSubtypeMap}. + */ + static final AdditionalSubtypeMap EMPTY_MAP = new AdditionalSubtypeMap(new ArrayMap<>()); + + @NonNull + private final ArrayMap<String, List<InputMethodSubtype>> mMap; + + @AnyThread + @NonNull + private static AdditionalSubtypeMap createOrEmpty( + @NonNull ArrayMap<String, List<InputMethodSubtype>> map) { + return map.isEmpty() ? EMPTY_MAP : new AdditionalSubtypeMap(map); + } + + /** + * Create a new instance from the given {@link ArrayMap}. + * + * <p>This method effectively creates a new copy of map.</p> + * + * @param map An {@link ArrayMap} from which {@link AdditionalSubtypeMap} is to be created. + * @return A {@link AdditionalSubtypeMap} that contains a new copy of {@code map}. + */ + @AnyThread + @NonNull + static AdditionalSubtypeMap of(@NonNull ArrayMap<String, List<InputMethodSubtype>> map) { + return createOrEmpty(map); + } + + /** + * Create a new instance of {@link AdditionalSubtypeMap} from an existing + * {@link AdditionalSubtypeMap} by removing {@code key}, or return {@code map} itself if it does + * not contain an entry of {@code key}. + * + * @param key The key to be removed from {@code map}. + * @return A new instance of {@link AdditionalSubtypeMap}, which is guaranteed to not contain + * {@code key}, or {@code map} itself if it does not contain an entry of {@code key}. + */ + @AnyThread + @NonNull + AdditionalSubtypeMap cloneWithRemoveOrSelf(@NonNull String key) { + if (isEmpty() || !containsKey(key)) { + return this; + } + final ArrayMap<String, List<InputMethodSubtype>> newMap = new ArrayMap<>(mMap); + newMap.remove(key); + return createOrEmpty(newMap); + } + + /** + * Create a new instance of {@link AdditionalSubtypeMap} from an existing + * {@link AdditionalSubtypeMap} by removing {@code keys} or return {@code map} itself if it does + * not contain any entry for {@code keys}. + * + * @param keys Keys to be removed from {@code map}. + * @return A new instance of {@link AdditionalSubtypeMap}, which is guaranteed to not contain + * {@code keys}, or {@code map} itself if it does not contain any entry of {@code keys}. + */ + @AnyThread + @NonNull + AdditionalSubtypeMap cloneWithRemoveOrSelf(@NonNull Collection<String> keys) { + if (isEmpty()) { + return this; + } + final ArrayMap<String, List<InputMethodSubtype>> newMap = new ArrayMap<>(mMap); + return newMap.removeAll(keys) ? createOrEmpty(newMap) : this; + } + + /** + * Create a new instance of {@link AdditionalSubtypeMap} from an existing + * {@link AdditionalSubtypeMap} by putting {@code key} and {@code value}. + * + * @param key Key to be put into {@code map}. + * @param value Value to be put into {@code map}. + * @return A new instance of {@link AdditionalSubtypeMap}, which is guaranteed to contain the + * pair of {@code key} and {@code value}. + */ + @AnyThread + @NonNull + AdditionalSubtypeMap cloneWithPut( + @Nullable String key, @NonNull List<InputMethodSubtype> value) { + final ArrayMap<String, List<InputMethodSubtype>> newMap = new ArrayMap<>(mMap); + newMap.put(key, value); + return new AdditionalSubtypeMap(newMap); + } + + private AdditionalSubtypeMap(@NonNull ArrayMap<String, List<InputMethodSubtype>> map) { + mMap = map; + } + + @AnyThread + @Nullable + List<InputMethodSubtype> get(@Nullable String key) { + return mMap.get(key); + } + + @AnyThread + boolean containsKey(@Nullable String key) { + return mMap.containsKey(key); + } + + @AnyThread + boolean isEmpty() { + return mMap.isEmpty(); + } + + @AnyThread + @NonNull + Collection<String> keySet() { + return mMap.keySet(); + } + + @AnyThread + int size() { + return mMap.size(); + } +} diff --git a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java index fba71fd0ff9e..146ce1732070 100644 --- a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java +++ b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java @@ -108,12 +108,12 @@ final class AdditionalSubtypeUtils { * multiple threads are not calling this method at the same time for the same {@code userId}. * </p> * - * @param allSubtypes {@link ArrayMap} from IME ID to additional subtype list. Passing an empty - * map deletes the file. + * @param allSubtypes {@link AdditionalSubtypeMap} from IME ID to additional subtype list. + * Passing an empty map deletes the file. * @param methodMap {@link ArrayMap} from IME ID to {@link InputMethodInfo}. * @param userId The user ID to be associated with. */ - static void save(ArrayMap<String, List<InputMethodSubtype>> allSubtypes, + static void save(AdditionalSubtypeMap allSubtypes, InputMethodMap methodMap, @UserIdInt int userId) { final File inputMethodDir = getInputMethodDir(userId); @@ -142,7 +142,7 @@ final class AdditionalSubtypeUtils { } @VisibleForTesting - static void saveToFile(ArrayMap<String, List<InputMethodSubtype>> allSubtypes, + static void saveToFile(AdditionalSubtypeMap allSubtypes, InputMethodMap methodMap, AtomicFile subtypesFile) { // Safety net for the case that this function is called before methodMap is set. final boolean isSetMethodMap = methodMap != null && methodMap.size() > 0; @@ -212,24 +212,21 @@ final class AdditionalSubtypeUtils { * multiple threads are not calling this method at the same time for the same {@code userId}. * </p> * - * @param allSubtypes {@link ArrayMap} from IME ID to additional subtype list. This parameter - * will be used to return the result. - * @param userId The user ID to be associated with. + * @param userId The user ID to be associated with. + * @return {@link AdditionalSubtypeMap} that contains the additional {@link InputMethodSubtype}. */ - static void load(@NonNull ArrayMap<String, List<InputMethodSubtype>> allSubtypes, - @UserIdInt int userId) { - allSubtypes.clear(); - + static AdditionalSubtypeMap load(@UserIdInt int userId) { final AtomicFile subtypesFile = getAdditionalSubtypeFile(getInputMethodDir(userId)); // Not having the file means there is no additional subtype. if (subtypesFile.exists()) { - loadFromFile(allSubtypes, subtypesFile); + return loadFromFile(subtypesFile); } + return AdditionalSubtypeMap.EMPTY_MAP; } @VisibleForTesting - static void loadFromFile(@NonNull ArrayMap<String, List<InputMethodSubtype>> allSubtypes, - AtomicFile subtypesFile) { + static AdditionalSubtypeMap loadFromFile(AtomicFile subtypesFile) { + final ArrayMap<String, List<InputMethodSubtype>> allSubtypes = new ArrayMap<>(); try (FileInputStream fis = subtypesFile.openRead()) { final TypedXmlPullParser parser = Xml.resolvePullParser(fis); int type = parser.next(); @@ -310,5 +307,6 @@ final class AdditionalSubtypeUtils { } catch (XmlPullParserException | IOException | NumberFormatException e) { Slog.w(TAG, "Error reading subtypes", e); } + return AdditionalSubtypeMap.of(allSubtypes); } } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java index c8c0482f5a9d..a100fe06c407 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java @@ -77,6 +77,7 @@ final class InputMethodBindingController { @GuardedBy("ImfLock.class") private int mCurSeq; @GuardedBy("ImfLock.class") private boolean mVisibleBound; @GuardedBy("ImfLock.class") private boolean mSupportsStylusHw; + @GuardedBy("ImfLock.class") private boolean mSupportsConnectionlessStylusHw; @Nullable private CountDownLatch mLatchForTesting; @@ -243,10 +244,17 @@ final class InputMethodBindingController { /** * Returns {@code true} if current IME supports Stylus Handwriting. */ + @GuardedBy("ImfLock.class") boolean supportsStylusHandwriting() { return mSupportsStylusHw; } + /** Returns whether the current IME supports connectionless stylus handwriting sessions. */ + @GuardedBy("ImfLock.class") + boolean supportsConnectionlessStylusHandwriting() { + return mSupportsConnectionlessStylusHw; + } + /** * Used to bring IME service up to visible adjustment while it is being shown. */ @@ -298,6 +306,15 @@ final class InputMethodBindingController { if (supportsStylusHwChanged) { InputMethodManager.invalidateLocalStylusHandwritingAvailabilityCaches(); } + boolean supportsConnectionlessStylusHwChanged = + mSupportsConnectionlessStylusHw + != info.supportsConnectionlessStylusHandwriting(); + if (supportsConnectionlessStylusHwChanged) { + mSupportsConnectionlessStylusHw = + info.supportsConnectionlessStylusHandwriting(); + InputMethodManager + .invalidateLocalConnectionlessStylusHandwritingAvailabilityCaches(); + } mService.initializeImeLocked(mCurMethod, mCurToken); mService.scheduleNotifyImeUidToAudioService(mCurMethodUid); mService.reRequestCurrentClientSessionLocked(); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index ffdc9347369e..5db18ad7a07f 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -123,6 +123,7 @@ import android.view.WindowManager; import android.view.WindowManager.DisplayImePolicy; import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams.SoftInputModeFlags; +import android.view.inputmethod.CursorAnchorInfo; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.Flags; import android.view.inputmethod.ImeTracker; @@ -145,6 +146,7 @@ import com.android.internal.content.PackageMonitor; import com.android.internal.infra.AndroidFuture; import com.android.internal.inputmethod.DirectBootAwareness; import com.android.internal.inputmethod.IAccessibilityInputMethodSession; +import com.android.internal.inputmethod.IConnectionlessHandwritingCallback; import com.android.internal.inputmethod.IImeTracker; import com.android.internal.inputmethod.IInlineSuggestionsRequestCallback; import com.android.internal.inputmethod.IInputContentUriToken; @@ -204,6 +206,7 @@ import java.util.OptionalInt; import java.util.WeakHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.IntConsumer; @@ -286,8 +289,10 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub final InputManagerInternal mInputManagerInternal; final ImePlatformCompatUtils mImePlatformCompatUtils; final InputMethodDeviceConfigs mInputMethodDeviceConfigs; - private final ArrayMap<String, List<InputMethodSubtype>> mAdditionalSubtypeMap = - new ArrayMap<>(); + + @GuardedBy("ImfLock.class") + @NonNull + private AdditionalSubtypeMap mAdditionalSubtypeMap = AdditionalSubtypeMap.EMPTY_MAP; private final UserManagerInternal mUserManagerInternal; private final InputMethodMenuController mMenuController; @NonNull private final InputMethodBindingController mBindingController; @@ -1332,16 +1337,21 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @Override public void onPackageDataCleared(String packageName, int uid) { synchronized (ImfLock.class) { - boolean changed = false; + // Note that one package may implement multiple IMEs. + final ArrayList<String> changedImes = new ArrayList<>(); for (InputMethodInfo imi : mSettings.getMethodList()) { if (imi.getPackageName().equals(packageName)) { - mAdditionalSubtypeMap.remove(imi.getId()); - changed = true; + changedImes.add(imi.getId()); } } - if (changed) { + final AdditionalSubtypeMap newMap = + mAdditionalSubtypeMap.cloneWithRemoveOrSelf(changedImes); + if (newMap != mAdditionalSubtypeMap) { + mAdditionalSubtypeMap = newMap; AdditionalSubtypeUtils.save( mAdditionalSubtypeMap, mSettings.getMethodMap(), mSettings.getUserId()); + } + if (!changedImes.isEmpty()) { mChangedPackages.add(packageName); } } @@ -1413,7 +1423,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub Slog.i(TAG, "Input method reinstalling, clearing additional subtypes: " + imi.getComponent()); - mAdditionalSubtypeMap.remove(imi.getId()); + mAdditionalSubtypeMap = + mAdditionalSubtypeMap.cloneWithRemoveOrSelf(imi.getId()); AdditionalSubtypeUtils.save(mAdditionalSubtypeMap, mSettings.getMethodMap(), mSettings.getUserId()); } @@ -1648,7 +1659,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // mSettings should be created before buildInputMethodListLocked mSettings = InputMethodSettings.createEmptyMap(userId); - AdditionalSubtypeUtils.load(mAdditionalSubtypeMap, userId); + mAdditionalSubtypeMap = AdditionalSubtypeUtils.load(userId); mSwitchingController = InputMethodSubtypeSwitchingController.createInstanceLocked(context, mSettings.getMethodMap(), userId); @@ -1783,7 +1794,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub mSettings = InputMethodSettings.createEmptyMap(newUserId); // Additional subtypes should be reset when the user is changed - AdditionalSubtypeUtils.load(mAdditionalSubtypeMap, newUserId); + mAdditionalSubtypeMap = AdditionalSubtypeUtils.load(newUserId); final String defaultImiId = mSettings.getSelectedInputMethod(); if (DEBUG) { @@ -1972,7 +1983,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } @Override - public boolean isStylusHandwritingAvailableAsUser(@UserIdInt int userId) { + public boolean isStylusHandwritingAvailableAsUser( + @UserIdInt int userId, boolean connectionless) { if (UserHandle.getCallingUserId() != userId) { mContext.enforceCallingOrSelfPermission( Manifest.permission.INTERACT_ACROSS_USERS_FULL, null); @@ -1985,14 +1997,17 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub // Check if selected IME of current user supports handwriting. if (userId == mSettings.getUserId()) { - return mBindingController.supportsStylusHandwriting(); + return mBindingController.supportsStylusHandwriting() + && (!connectionless + || mBindingController.supportsConnectionlessStylusHandwriting()); } //TODO(b/197848765): This can be optimized by caching multi-user methodMaps/methodList. //TODO(b/210039666): use cache. final InputMethodSettings settings = queryMethodMapForUser(userId); final InputMethodInfo imi = settings.getMethodMap().get( settings.getSelectedInputMethod()); - return imi != null && imi.supportsStylusHandwriting(); + return imi != null && imi.supportsStylusHandwriting() + && (!connectionless || imi.supportsConnectionlessStylusHandwriting()); } } @@ -2016,9 +2031,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub && directBootAwareness == DirectBootAwareness.AUTO) { settings = mSettings; } else { - final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap = - new ArrayMap<>(); - AdditionalSubtypeUtils.load(additionalSubtypeMap, userId); + final AdditionalSubtypeMap additionalSubtypeMap = AdditionalSubtypeUtils.load(userId); settings = queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, directBootAwareness); } @@ -3370,6 +3383,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub startStylusHandwriting(client, false /* usesDelegation */); } + @BinderThread + @Override + public void startConnectionlessStylusHandwriting(IInputMethodClient client, int userId, + @Nullable CursorAnchorInfo cursorAnchorInfo, @Nullable String delegatePackageName, + @Nullable String delegatorPackageName, + @NonNull IConnectionlessHandwritingCallback callback) { + // TODO(b/300979854) + } + private void startStylusHandwriting(IInputMethodClient client, boolean usesDelegation) { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.startStylusHandwriting"); try { @@ -3554,8 +3576,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_SERVER_HAS_IME); mCurStatsToken = null; - if (!Flags.useHandwritingListenerForTooltype() - && lastClickToolType != MotionEvent.TOOL_TYPE_UNKNOWN) { + if (lastClickToolType != MotionEvent.TOOL_TYPE_UNKNOWN) { curMethod.updateEditorToolType(lastClickToolType); } mVisibilityApplier.performShowIme(windowToken, statsToken, @@ -4218,10 +4239,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } if (mSettings.getUserId() == userId) { - if (!mSettings.setAdditionalInputMethodSubtypes(imiId, toBeAdded, - mAdditionalSubtypeMap, mPackageManagerInternal, callingUid)) { + final var newAdditionalSubtypeMap = mSettings.getNewAdditionalSubtypeMap( + imiId, toBeAdded, mAdditionalSubtypeMap, mPackageManagerInternal, + callingUid); + if (mAdditionalSubtypeMap == newAdditionalSubtypeMap) { return; } + AdditionalSubtypeUtils.save(newAdditionalSubtypeMap, mSettings.getMethodMap(), + mSettings.getUserId()); + mAdditionalSubtypeMap = newAdditionalSubtypeMap; final long ident = Binder.clearCallingIdentity(); try { buildInputMethodListLocked(false /* resetDefaultEnabledIme */); @@ -4231,13 +4257,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub return; } - final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap = - new ArrayMap<>(); - AdditionalSubtypeUtils.load(additionalSubtypeMap, userId); + final AdditionalSubtypeMap additionalSubtypeMap = AdditionalSubtypeUtils.load(userId); final InputMethodSettings settings = queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, DirectBootAwareness.AUTO); - settings.setAdditionalInputMethodSubtypes(imiId, toBeAdded, additionalSubtypeMap, - mPackageManagerInternal, callingUid); + final var newAdditionalSubtypeMap = settings.getNewAdditionalSubtypeMap( + imiId, toBeAdded, additionalSubtypeMap, mPackageManagerInternal, callingUid); + if (additionalSubtypeMap != newAdditionalSubtypeMap) { + AdditionalSubtypeUtils.save(newAdditionalSubtypeMap, settings.getMethodMap(), + settings.getUserId()); + } } } @@ -5072,7 +5100,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @NonNull static InputMethodSettings queryInputMethodServicesInternal(Context context, - @UserIdInt int userId, ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap, + @UserIdInt int userId, @NonNull AdditionalSubtypeMap additionalSubtypeMap, @DirectBootAwareness int directBootAwareness) { final Context userAwareContext = context.getUserId() == userId ? context @@ -5112,7 +5140,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @NonNull static InputMethodMap filterInputMethodServices( - ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap, + @NonNull AdditionalSubtypeMap additionalSubtypeMap, List<String> enabledInputMethodList, Context userAwareContext, List<ResolveInfo> services) { final ArrayMap<String, Integer> imiPackageCount = new ArrayMap<>(); @@ -5512,9 +5540,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub if (userId == mSettings.getUserId()) { settings = mSettings; } else { - final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap = - new ArrayMap<>(); - AdditionalSubtypeUtils.load(additionalSubtypeMap, userId); + final AdditionalSubtypeMap additionalSubtypeMap = AdditionalSubtypeUtils.load(userId); settings = queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, DirectBootAwareness.AUTO); } @@ -5522,9 +5548,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } private InputMethodSettings queryMethodMapForUser(@UserIdInt int userId) { - final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap = - new ArrayMap<>(); - AdditionalSubtypeUtils.load(additionalSubtypeMap, userId); + final AdditionalSubtypeMap additionalSubtypeMap = AdditionalSubtypeUtils.load(userId); return queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, DirectBootAwareness.AUTO); } @@ -5980,7 +6004,23 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @BinderThread private void dumpAsProtoNoCheck(FileDescriptor fd) { final ProtoOutputStream proto = new ProtoOutputStream(fd); + // Dump in the format of an ImeTracing trace with a single entry. + final long magicNumber = + ((long) InputMethodManagerServiceTraceFileProto.MAGIC_NUMBER_H << 32) + | InputMethodManagerServiceTraceFileProto.MAGIC_NUMBER_L; + final long timeOffsetNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()) + - SystemClock.elapsedRealtimeNanos(); + proto.write(InputMethodManagerServiceTraceFileProto.MAGIC_NUMBER, + magicNumber); + proto.write(InputMethodManagerServiceTraceFileProto.REAL_TO_ELAPSED_TIME_OFFSET_NANOS, + timeOffsetNs); + final long token = proto.start(InputMethodManagerServiceTraceFileProto.ENTRY); + proto.write(InputMethodManagerServiceTraceProto.ELAPSED_REALTIME_NANOS, + SystemClock.elapsedRealtimeNanos()); + proto.write(InputMethodManagerServiceTraceProto.WHERE, + "InputMethodManagerService.mPriorityDumper#dumpAsProtoNoCheck"); dumpDebug(proto, InputMethodManagerServiceTraceProto.INPUT_METHOD_MANAGER_SERVICE); + proto.end(token); proto.flush(); } }; @@ -6572,9 +6612,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub nextIme = mSettings.getSelectedInputMethod(); nextEnabledImes = mSettings.getEnabledInputMethodList(); } else { - final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap = - new ArrayMap<>(); - AdditionalSubtypeUtils.load(additionalSubtypeMap, userId); + final AdditionalSubtypeMap additionalSubtypeMap = + AdditionalSubtypeUtils.load(userId); final InputMethodSettings settings = queryInputMethodServicesInternal( mContext, userId, additionalSubtypeMap, DirectBootAwareness.AUTO); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodSettings.java b/services/core/java/com/android/server/inputmethod/InputMethodSettings.java index e444db1b79e8..a558838172f8 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodSettings.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodSettings.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManagerInternal; import android.os.LocaleList; import android.provider.Settings; import android.text.TextUtils; -import android.util.ArrayMap; import android.util.IntArray; import android.util.Pair; import android.util.Printer; @@ -614,26 +613,27 @@ final class InputMethodSettings { explicitlyOrImplicitlyEnabledSubtypes, null, locale, true); } - boolean setAdditionalInputMethodSubtypes(@NonNull String imeId, + @NonNull + AdditionalSubtypeMap getNewAdditionalSubtypeMap(@NonNull String imeId, @NonNull ArrayList<InputMethodSubtype> subtypes, - @NonNull ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap, + @NonNull AdditionalSubtypeMap additionalSubtypeMap, @NonNull PackageManagerInternal packageManagerInternal, int callingUid) { final InputMethodInfo imi = mMethodMap.get(imeId); if (imi == null) { - return false; + return additionalSubtypeMap; } if (!InputMethodUtils.checkIfPackageBelongsToUid(packageManagerInternal, callingUid, imi.getPackageName())) { - return false; + return additionalSubtypeMap; } + final AdditionalSubtypeMap newMap; if (subtypes.isEmpty()) { - additionalSubtypeMap.remove(imi.getId()); + newMap = additionalSubtypeMap.cloneWithRemoveOrSelf(imi.getId()); } else { - additionalSubtypeMap.put(imi.getId(), subtypes); + newMap = additionalSubtypeMap.cloneWithPut(imi.getId(), subtypes); } - AdditionalSubtypeUtils.save(additionalSubtypeMap, mMethodMap, getUserId()); - return true; + return newMap; } boolean setEnabledInputMethodSubtypes(@NonNull String imeId, diff --git a/services/core/java/com/android/server/locksettings/OWNERS b/services/core/java/com/android/server/locksettings/OWNERS index 5d4986307835..48da270180e6 100644 --- a/services/core/java/com/android/server/locksettings/OWNERS +++ b/services/core/java/com/android/server/locksettings/OWNERS @@ -1,4 +1,3 @@ # Bug component: 1333694 ebiggers@google.com -jaggies@google.com rubinxu@google.com diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java index cec7a79cdada..5d415c2f636f 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java @@ -200,7 +200,9 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider Slog.d(TAG, this + ": Starting"); } mRunning = true; - updateBinding(); + if (!Flags.enablePreventionOfKeepAliveRouteProviders()) { + updateBinding(); + } } if (rebindIfDisconnected && mActiveConnection == null && shouldBind()) { unbind(); diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java index 233a3ab4a4ea..fcca94b0611a 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java @@ -150,7 +150,9 @@ final class MediaRoute2ProviderWatcher { mCallback.onAddProviderService(proxy); } else if (sourceIndex >= targetIndex) { MediaRoute2ProviderServiceProxy proxy = mProxies.get(sourceIndex); - proxy.start(/* rebindIfDisconnected= */ true); // restart the proxy if needed + proxy.start( + /* rebindIfDisconnected= */ + !Flags.enablePreventionOfKeepAliveRouteProviders()); Collections.swap(mProxies, sourceIndex, targetIndex++); } } diff --git a/services/core/java/com/android/server/media/MediaSession2Record.java b/services/core/java/com/android/server/media/MediaSession2Record.java index 393e7efcce6e..34bb219a9162 100644 --- a/services/core/java/com/android/server/media/MediaSession2Record.java +++ b/services/core/java/com/android/server/media/MediaSession2Record.java @@ -55,8 +55,15 @@ public class MediaSession2Record implements MediaSessionRecordImpl { @GuardedBy("mLock") private boolean mIsClosed; - public MediaSession2Record(Session2Token sessionToken, MediaSessionService service, - Looper handlerLooper, int policies) { + private final int mPid; + private final ForegroundServiceDelegationOptions mForegroundServiceDelegationOptions; + + public MediaSession2Record( + Session2Token sessionToken, + MediaSessionService service, + Looper handlerLooper, + int pid, + int policies) { // The lock is required to prevent `Controller2Callback` from using partially initialized // `MediaSession2Record.this`. synchronized (mLock) { @@ -66,7 +73,27 @@ public class MediaSession2Record implements MediaSessionRecordImpl { mController = new MediaController2.Builder(service.getContext(), sessionToken) .setControllerCallback(mHandlerExecutor, new Controller2Callback()) .build(); + mPid = pid; mPolicies = policies; + mForegroundServiceDelegationOptions = + new ForegroundServiceDelegationOptions.Builder() + .setClientPid(mPid) + .setClientUid(getUid()) + .setClientPackageName(getPackageName()) + .setClientAppThread(null) + .setSticky(false) + .setClientInstanceName( + "MediaSessionFgsDelegate_" + + getUid() + + "_" + + mPid + + "_" + + getPackageName()) + .setForegroundServiceTypes(0) + .setDelegationService( + ForegroundServiceDelegationOptions + .DELEGATION_SERVICE_MEDIA_PLAYBACK) + .build(); } } @@ -91,8 +118,7 @@ public class MediaSession2Record implements MediaSessionRecordImpl { @Override public ForegroundServiceDelegationOptions getForegroundServiceDelegationOptions() { - // TODO: Implement when MediaSession2 knows about its owner pid. - return null; + return mForegroundServiceDelegationOptions; } @Override diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 7fabdf293b39..8cb5cef38ec6 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -171,12 +171,27 @@ public class MediaSessionService extends SystemService implements Monitor { private final MediaCommunicationManager.SessionCallback mSession2TokenCallback = new MediaCommunicationManager.SessionCallback() { @Override + // TODO (b/324266224): Deprecate this method once other overload is published. public void onSession2TokenCreated(Session2Token token) { + addSession(token, Process.INVALID_PID); + } + + @Override + public void onSession2TokenCreated(Session2Token token, int pid) { + addSession(token, pid); + } + + private void addSession(Session2Token token, int pid) { if (DEBUG) { Log.d(TAG, "Session2 is created " + token); } - MediaSession2Record record = new MediaSession2Record(token, - MediaSessionService.this, mRecordThread.getLooper(), 0); + MediaSession2Record record = + new MediaSession2Record( + token, + MediaSessionService.this, + mRecordThread.getLooper(), + pid, + /* policies= */ 0); synchronized (mLock) { FullUserRecord user = getFullUserRecordLocked(record.getUserId()); if (user != null) { @@ -583,7 +598,8 @@ public class MediaSessionService extends SystemService implements Monitor { } ForegroundServiceDelegationOptions foregroundServiceDelegationOptions = record.getForegroundServiceDelegationOptions(); - if (foregroundServiceDelegationOptions == null) { + if (foregroundServiceDelegationOptions == null + || foregroundServiceDelegationOptions.mClientPid == Process.INVALID_PID) { // This record doesn't support FGS delegation. In practice, this is MediaSession2. return; } diff --git a/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java b/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java index bbe6d3a0c8fa..f60f55c11935 100644 --- a/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java +++ b/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java @@ -18,10 +18,13 @@ package com.android.server.media.metrics; import android.content.Context; import android.content.pm.PackageManager; +import android.hardware.DataSpace; import android.media.MediaMetrics; +import android.media.codec.Enums; import android.media.metrics.BundleSession; import android.media.metrics.EditingEndedEvent; import android.media.metrics.IMediaMetricsManager; +import android.media.metrics.MediaItemInfo; import android.media.metrics.NetworkEvent; import android.media.metrics.PlaybackErrorEvent; import android.media.metrics.PlaybackMetrics; @@ -31,7 +34,9 @@ import android.os.Binder; import android.os.PersistableBundle; import android.provider.DeviceConfig; import android.provider.DeviceConfig.Properties; +import android.text.TextUtils; import android.util.Base64; +import android.util.Size; import android.util.Slog; import android.util.StatsEvent; import android.util.StatsLog; @@ -42,6 +47,7 @@ import com.android.server.SystemService; import java.security.SecureRandom; import java.util.Arrays; import java.util.List; +import java.util.regex.Pattern; /** * System service manages media metrics. @@ -72,7 +78,18 @@ public final class MediaMetricsManagerService extends SystemService { private static final String mMetricsId = MediaMetrics.Name.METRICS_MANAGER; private static final String FAILED_TO_GET = "failed_to_get"; + + private static final MediaItemInfo EMPTY_MEDIA_ITEM_INFO = new MediaItemInfo.Builder().build(); + private static final Pattern PATTERN_KNOWN_EDITING_LIBRARY_NAMES = + Pattern.compile( + "androidx\\.media3:media3-(transformer|muxer):" + + "[\\d.]+(-(alpha|beta|rc)\\d\\d)?"); + private static final int DURATION_BUCKETS_BELOW_ONE_MINUTE = 8; + private static final int DURATION_BUCKETS_COUNT = 13; + private static final String AUDIO_MIME_TYPE_PREFIX = "audio/"; + private static final String VIDEO_MIME_TYPE_PREFIX = "video/"; private final SecureRandom mSecureRandom; + @GuardedBy("mLock") private Integer mMode = null; @GuardedBy("mLock") @@ -353,13 +370,121 @@ public final class MediaMetricsManagerService extends SystemService { if (level == LOGGING_LEVEL_BLOCKED) { return; } + MediaItemInfo inputMediaItemInfo = + event.getInputMediaItemInfos().isEmpty() + ? EMPTY_MEDIA_ITEM_INFO + : event.getInputMediaItemInfos().get(0); + String inputAudioSampleMimeType = + getFilteredFirstMimeType( + inputMediaItemInfo.getSampleMimeTypes(), AUDIO_MIME_TYPE_PREFIX); + String inputVideoSampleMimeType = + getFilteredFirstMimeType( + inputMediaItemInfo.getSampleMimeTypes(), VIDEO_MIME_TYPE_PREFIX); + Size inputVideoSize = inputMediaItemInfo.getVideoSize(); + int inputVideoResolution = getVideoResolutionEnum(inputVideoSize); + if (inputVideoResolution == Enums.RESOLUTION_UNKNOWN) { + // Try swapping width/height in case it's a portrait video. + inputVideoResolution = + getVideoResolutionEnum( + new Size(inputVideoSize.getHeight(), inputVideoSize.getWidth())); + } + List<String> inputCodecNames = inputMediaItemInfo.getCodecNames(); + String inputFirstCodecName = !inputCodecNames.isEmpty() ? inputCodecNames.get(0) : ""; + String inputSecondCodecName = inputCodecNames.size() > 1 ? inputCodecNames.get(1) : ""; + + MediaItemInfo outputMediaItemInfo = + event.getOutputMediaItemInfo() == null + ? EMPTY_MEDIA_ITEM_INFO + : event.getOutputMediaItemInfo(); + String outputAudioSampleMimeType = + getFilteredFirstMimeType( + outputMediaItemInfo.getSampleMimeTypes(), AUDIO_MIME_TYPE_PREFIX); + String outputVideoSampleMimeType = + getFilteredFirstMimeType( + outputMediaItemInfo.getSampleMimeTypes(), VIDEO_MIME_TYPE_PREFIX); + Size outputVideoSize = outputMediaItemInfo.getVideoSize(); + int outputVideoResolution = getVideoResolutionEnum(outputVideoSize); + if (outputVideoResolution == Enums.RESOLUTION_UNKNOWN) { + // Try swapping width/height in case it's a portrait video. + outputVideoResolution = + getVideoResolutionEnum( + new Size(outputVideoSize.getHeight(), outputVideoSize.getWidth())); + } + List<String> outputCodecNames = outputMediaItemInfo.getCodecNames(); + String outputFirstCodecName = + !outputCodecNames.isEmpty() ? outputCodecNames.get(0) : ""; + String outputSecondCodecName = + outputCodecNames.size() > 1 ? outputCodecNames.get(1) : ""; StatsEvent statsEvent = StatsEvent.newBuilder() .setAtomId(798) .writeString(sessionId) .writeInt(event.getFinalState()) + .writeFloat(event.getFinalProgressPercent()) .writeInt(event.getErrorCode()) .writeLong(event.getTimeSinceCreatedMillis()) + .writeString(getFilteredLibraryName(event.getExporterName())) + .writeString(getFilteredLibraryName(event.getMuxerName())) + .writeInt(getThroughputFps(event)) + .writeInt(event.getInputMediaItemInfos().size()) + .writeInt(inputMediaItemInfo.getSourceType()) + .writeLong( + getBucketedDurationMillis( + inputMediaItemInfo.getDurationMillis())) + .writeLong( + getBucketedDurationMillis( + inputMediaItemInfo.getClipDurationMillis())) + .writeString( + getFilteredMimeType(inputMediaItemInfo.getContainerMimeType())) + .writeString(inputAudioSampleMimeType) + .writeString(inputVideoSampleMimeType) + .writeInt(getCodecEnum(inputVideoSampleMimeType)) + .writeInt( + getFilteredAudioSampleRateHz( + inputMediaItemInfo.getAudioSampleRateHz())) + .writeInt(inputMediaItemInfo.getAudioChannelCount()) + .writeInt(inputVideoSize.getWidth()) + .writeInt(inputVideoSize.getHeight()) + .writeInt(inputVideoResolution) + .writeInt(getVideoResolutionAspectRatioEnum(inputVideoSize)) + .writeInt(inputMediaItemInfo.getVideoDataSpace()) + .writeInt( + getVideoHdrFormatEnum( + inputMediaItemInfo.getVideoDataSpace(), + inputVideoSampleMimeType)) + .writeInt(Math.round(inputMediaItemInfo.getVideoFrameRate())) + .writeInt(getVideoFrameRateEnum(inputMediaItemInfo.getVideoFrameRate())) + .writeString(inputFirstCodecName) + .writeString(inputSecondCodecName) + .writeLong( + getBucketedDurationMillis( + outputMediaItemInfo.getDurationMillis())) + .writeLong( + getBucketedDurationMillis( + outputMediaItemInfo.getClipDurationMillis())) + .writeString( + getFilteredMimeType(outputMediaItemInfo.getContainerMimeType())) + .writeString(outputAudioSampleMimeType) + .writeString(outputVideoSampleMimeType) + .writeInt(getCodecEnum(outputVideoSampleMimeType)) + .writeInt( + getFilteredAudioSampleRateHz( + outputMediaItemInfo.getAudioSampleRateHz())) + .writeInt(outputMediaItemInfo.getAudioChannelCount()) + .writeInt(outputVideoSize.getWidth()) + .writeInt(outputVideoSize.getHeight()) + .writeInt(outputVideoResolution) + .writeInt(getVideoResolutionAspectRatioEnum(outputVideoSize)) + .writeInt(outputMediaItemInfo.getVideoDataSpace()) + .writeInt( + getVideoHdrFormatEnum( + outputMediaItemInfo.getVideoDataSpace(), + outputVideoSampleMimeType)) + .writeInt(Math.round(outputMediaItemInfo.getVideoFrameRate())) + .writeInt( + getVideoFrameRateEnum(outputMediaItemInfo.getVideoFrameRate())) + .writeString(outputFirstCodecName) + .writeString(outputSecondCodecName) .usePooledBuffer() .build(); StatsLog.write(statsEvent); @@ -511,4 +636,225 @@ public final class MediaMetricsManagerService extends SystemService { } } } + + private static String getFilteredLibraryName(String libraryName) { + if (TextUtils.isEmpty(libraryName)) { + return ""; + } + if (!PATTERN_KNOWN_EDITING_LIBRARY_NAMES.matcher(libraryName).matches()) { + return ""; + } + return libraryName; + } + + private static int getThroughputFps(EditingEndedEvent event) { + MediaItemInfo outputMediaItemInfo = event.getOutputMediaItemInfo(); + if (outputMediaItemInfo == null) { + return -1; + } + long videoSampleCount = outputMediaItemInfo.getVideoSampleCount(); + if (videoSampleCount == MediaItemInfo.VALUE_UNSPECIFIED) { + return -1; + } + long elapsedTimeMs = event.getTimeSinceCreatedMillis(); + if (elapsedTimeMs == EditingEndedEvent.TIME_SINCE_CREATED_UNKNOWN) { + return -1; + } + return (int) + Math.min(Integer.MAX_VALUE, Math.round(1000.0 * videoSampleCount / elapsedTimeMs)); + } + + private static long getBucketedDurationMillis(long durationMillis) { + if (durationMillis == MediaItemInfo.VALUE_UNSPECIFIED || durationMillis <= 0) { + return -1; + } + // Bucket values in an exponential distribution to reduce the precision that's stored: + // bucket index -> range -> bucketed duration + // 1 -> [0, 469 ms) -> 235 ms + // 2 -> [469 ms, 938 ms) -> 469 ms + // 3 -> [938 ms, 1875 ms) -> 938 ms + // 4 -> [1875 ms, 3750 ms) -> 1875 ms + // 5 -> [3750 ms, 7500 ms) -> 3750 ms + // [...] + // 13 -> [960000 ms, max) -> 960000 ms + int bucketIndex = + (int) + Math.floor( + DURATION_BUCKETS_BELOW_ONE_MINUTE + + Math.log((durationMillis + 1) / 60_000.0) / Math.log(2)); + // Clamp to range [0, DURATION_BUCKETS_COUNT]. + bucketIndex = Math.min(DURATION_BUCKETS_COUNT, Math.max(0, bucketIndex)); + // Map back onto the representative value for the bucket. + return (long) + Math.ceil(Math.pow(2, bucketIndex - DURATION_BUCKETS_BELOW_ONE_MINUTE) * 60_000.0); + } + + /** + * Returns the first entry in {@code mimeTypes} with the given prefix, if it matches the + * filtering allowlist. If no entries match the prefix or if the first matching entry is not on + * the allowlist, returns an empty string. + */ + private static String getFilteredFirstMimeType(List<String> mimeTypes, String prefix) { + int size = mimeTypes.size(); + for (int i = 0; i < size; i++) { + String mimeType = mimeTypes.get(i); + if (mimeType.startsWith(prefix)) { + return getFilteredMimeType(mimeType); + } + } + return ""; + } + + private static String getFilteredMimeType(String mimeType) { + if (TextUtils.isEmpty(mimeType)) { + return ""; + } + // Discard all inputs that aren't allowlisted MIME types. + return switch (mimeType) { + case "video/mp4", + "video/x-matroska", + "video/webm", + "video/3gpp", + "video/avc", + "video/hevc", + "video/x-vnd.on2.vp8", + "video/x-vnd.on2.vp9", + "video/av01", + "video/mp2t", + "video/mp4v-es", + "video/mpeg", + "video/x-flv", + "video/dolby-vision", + "video/raw", + "audio/mp4", + "audio/mp4a-latm", + "audio/x-matroska", + "audio/webm", + "audio/mpeg", + "audio/mpeg-L1", + "audio/mpeg-L2", + "audio/ac3", + "audio/eac3", + "audio/eac3-joc", + "audio/av4", + "audio/true-hd", + "audio/vnd.dts", + "audio/vnd.dts.hd", + "audio/vorbis", + "audio/opus", + "audio/flac", + "audio/ogg", + "audio/wav", + "audio/midi", + "audio/raw", + "application/mp4", + "application/webm", + "application/x-matroska", + "application/dash+xml", + "application/x-mpegURL", + "application/vnd.ms-sstr+xml" -> + mimeType; + default -> ""; + }; + } + + private static int getCodecEnum(String mimeType) { + if (TextUtils.isEmpty(mimeType)) { + return Enums.CODEC_UNKNOWN; + } + return switch (mimeType) { + case "video/avc" -> Enums.CODEC_AVC; + case "video/hevc" -> Enums.CODEC_HEVC; + case "video/x-vnd.on2.vp8" -> Enums.CODEC_VP8; + case "video/x-vnd.on2.vp9" -> Enums.CODEC_VP9; + case "video/av01" -> Enums.CODEC_AV1; + default -> Enums.CODEC_UNKNOWN; + }; + } + + private static int getFilteredAudioSampleRateHz(int sampleRateHz) { + return switch (sampleRateHz) { + case 8000, 11025, 16000, 22050, 44100, 48000, 96000, 192000 -> sampleRateHz; + default -> -1; + }; + } + + private static int getVideoResolutionEnum(Size size) { + int width = size.getWidth(); + int height = size.getHeight(); + if (width == 352 && height == 640) { + return Enums.RESOLUTION_352X640; + } else if (width == 360 && height == 640) { + return Enums.RESOLUTION_360X640; + } else if (width == 480 && height == 640) { + return Enums.RESOLUTION_480X640; + } else if (width == 480 && height == 854) { + return Enums.RESOLUTION_480X854; + } else if (width == 540 && height == 960) { + return Enums.RESOLUTION_540X960; + } else if (width == 576 && height == 1024) { + return Enums.RESOLUTION_576X1024; + } else if (width == 1280 && height == 720) { + return Enums.RESOLUTION_720P_HD; + } else if (width == 1920 && height == 1080) { + return Enums.RESOLUTION_1080P_FHD; + } else if (width == 1440 && height == 2560) { + return Enums.RESOLUTION_1440X2560; + } else if (width == 3840 && height == 2160) { + return Enums.RESOLUTION_4K_UHD; + } else if (width == 7680 && height == 4320) { + return Enums.RESOLUTION_8K_UHD; + } else { + return Enums.RESOLUTION_UNKNOWN; + } + } + + private static int getVideoResolutionAspectRatioEnum(Size size) { + int width = size.getWidth(); + int height = size.getHeight(); + if (width <= 0 || height <= 0) { + return android.media.editing.Enums.RESOLUTION_ASPECT_RATIO_UNSPECIFIED; + } else if (width < height) { + return android.media.editing.Enums.RESOLUTION_ASPECT_RATIO_PORTRAIT; + } else if (height < width) { + return android.media.editing.Enums.RESOLUTION_ASPECT_RATIO_LANDSCAPE; + } else { + return android.media.editing.Enums.RESOLUTION_ASPECT_RATIO_SQUARE; + } + } + + private static int getVideoHdrFormatEnum(int dataSpace, String mimeType) { + if (dataSpace == DataSpace.DATASPACE_UNKNOWN) { + return Enums.HDR_FORMAT_UNKNOWN; + } + if (mimeType.equals("video/dolby-vision")) { + return Enums.HDR_FORMAT_DOLBY_VISION; + } + int standard = DataSpace.getStandard(dataSpace); + int transfer = DataSpace.getTransfer(dataSpace); + if (standard == DataSpace.STANDARD_BT2020 && transfer == DataSpace.TRANSFER_HLG) { + return Enums.HDR_FORMAT_HLG; + } + if (standard == DataSpace.STANDARD_BT2020 && transfer == DataSpace.TRANSFER_ST2084) { + // We don't currently distinguish HDR10+ from HDR10. + return Enums.HDR_FORMAT_HDR10; + } + return Enums.HDR_FORMAT_NONE; + } + + private static int getVideoFrameRateEnum(float frameRate) { + int frameRateInt = Math.round(frameRate); + return switch (frameRateInt) { + case 24 -> Enums.FRAMERATE_24; + case 25 -> Enums.FRAMERATE_25; + case 30 -> Enums.FRAMERATE_30; + case 50 -> Enums.FRAMERATE_50; + case 60 -> Enums.FRAMERATE_60; + case 120 -> Enums.FRAMERATE_120; + case 240 -> Enums.FRAMERATE_240; + case 480 -> Enums.FRAMERATE_480; + case 960 -> Enums.FRAMERATE_960; + default -> Enums.FRAMERATE_UNKNOWN; + }; + } } diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index d0c054307d0c..f645eaa28632 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -16,6 +16,7 @@ package com.android.server.notification; +import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR; import static android.content.Context.BIND_ALLOW_WHITELIST_MANAGEMENT; import static android.content.Context.BIND_AUTO_CREATE; import static android.content.Context.BIND_FOREGROUND_SERVICE; @@ -24,6 +25,7 @@ import static android.os.UserHandle.USER_ALL; import static android.os.UserHandle.USER_SYSTEM; import static android.service.notification.NotificationListenerService.META_DATA_DEFAULT_AUTOBIND; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.ActivityOptions; @@ -1802,6 +1804,8 @@ abstract public class ManagedServices { public ComponentName component; public int userid; public boolean isSystem; + @FlaggedApi(FLAG_LIFETIME_EXTENSION_REFACTOR) + public boolean isSystemUi; public ServiceConnection connection; public int targetSdkVersion; public Pair<ComponentName, Integer> mKey; @@ -1836,6 +1840,11 @@ abstract public class ManagedServices { return isSystem; } + @FlaggedApi(FLAG_LIFETIME_EXTENSION_REFACTOR) + public boolean isSystemUi() { + return isSystemUi; + } + @Override public String toString() { return new StringBuilder("ManagedServiceInfo[") diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index e7ad99a8cf20..ea4e67a17e50 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -71,6 +71,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; +import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR; import static android.app.Flags.lifetimeExtensionRefactor; import static android.app.NotificationManager.zenModeFromInterruptionFilter; import static android.app.StatusBarManager.ACTION_KEYGUARD_PRIVATE_NOTIFICATIONS_CHANGED; @@ -94,9 +95,11 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; import static android.os.PowerWhitelistManager.REASON_NOTIFICATION_SERVICE; import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED; +import static android.os.UserHandle.USER_ALL; import static android.os.UserHandle.USER_NULL; import static android.os.UserHandle.USER_SYSTEM; import static android.service.notification.Flags.redactSensitiveNotificationsFromUntrustedListeners; +import static android.service.notification.Flags.callstyleCallbackApi; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING; @@ -159,6 +162,8 @@ import android.Manifest; import android.Manifest.permission; import android.annotation.DurationMillisLong; import android.annotation.ElapsedRealtimeLong; +import android.annotation.EnforcePermission; +import android.annotation.FlaggedApi; import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; @@ -174,6 +179,7 @@ import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.AutomaticZenRule; import android.app.IActivityManager; +import android.app.ICallNotificationEventCallback; import android.app.INotificationManager; import android.app.ITransientNotification; import android.app.ITransientNotificationCallback; @@ -253,6 +259,7 @@ import android.os.ParcelFileDescriptor; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.Process; +import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; @@ -727,6 +734,9 @@ public class NotificationManagerService extends SystemService { private NotificationUsageStats mUsageStats; private boolean mLockScreenAllowSecureNotifications = true; boolean mSystemExemptFromDismissal = false; + final ArrayMap<String, ArrayMap<Integer, + RemoteCallbackList<ICallNotificationEventCallback>>> + mCallNotificationEventCallbacks = new ArrayMap<>(); private static final int MY_UID = Process.myUid(); private static final int MY_PID = Process.myPid(); @@ -1852,6 +1862,7 @@ public class NotificationManagerService extends SystemService { } if (ACTION_NOTIFICATION_TIMEOUT.equals(action)) { final NotificationRecord record; + // TODO: b/323013410 - Record should be cloned instead of used directly. synchronized (mNotificationLock) { record = findNotificationByKeyLocked(intent.getStringExtra(EXTRA_KEY)); } @@ -1864,6 +1875,14 @@ public class NotificationManagerService extends SystemService { FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB | FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY, true, record.getUserId(), REASON_TIMEOUT, null); + // If cancellation will be prevented due to lifetime extension, we send an + // update to system UI. + synchronized (mNotificationLock) { + maybeNotifySystemUiListenerLifetimeExtendedLocked(record, + record.getSbn().getPackageName(), + mActivityManager.getPackageImportance( + record.getSbn().getPackageName())); + } } else { cancelNotification(record.getSbn().getUid(), record.getSbn().getInitialPid(), @@ -3825,7 +3844,17 @@ public class NotificationManagerService extends SystemService { int mustNotHaveFlags = isCallingUidSystem() ? 0 : (FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB | FLAG_AUTOGROUP_SUMMARY); if (lifetimeExtensionRefactor()) { + // Also don't allow client apps to cancel lifetime extended notifs. mustNotHaveFlags |= FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY; + // If cancellation will be prevented due to lifetime extension, we send an update to + // system UI. + NotificationRecord record = null; + final int packageImportance = mActivityManager.getPackageImportance(pkg); + synchronized (mNotificationLock) { + record = findNotificationLocked(pkg, tag, id, userId); + maybeNotifySystemUiListenerLifetimeExtendedLocked(record, pkg, + packageImportance); + } } cancelNotificationInternal(pkg, opPkg, Binder.getCallingUid(), Binder.getCallingPid(), @@ -3845,6 +3874,16 @@ public class NotificationManagerService extends SystemService { pkg, null, 0, FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB | FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY, userId, REASON_APP_CANCEL_ALL); + // If cancellation will be prevented due to lifetime extension, we send updates + // to system UI. + // In this case, we need to hold the lock to access these lists. + final int packageImportance = mActivityManager.getPackageImportance(pkg); + synchronized (mNotificationLock) { + notifySystemUiListenerLifetimeExtendedListLocked(mNotificationList, + packageImportance); + notifySystemUiListenerLifetimeExtendedListLocked(mEnqueuedNotifications, + packageImportance); + } } else { cancelAllNotificationsInt(Binder.getCallingUid(), Binder.getCallingPid(), pkg, null, 0, FLAG_FOREGROUND_SERVICE | FLAG_USER_INITIATED_JOB, @@ -4857,6 +4896,94 @@ public class NotificationManagerService extends SystemService { } /** + * Register a listener to be notified when a call notification is posted or removed + * for a specific package and user. + * @param packageName Which package to monitor + * @param userHandle Which user to monitor + * @param listener Listener to register + */ + @Override + @EnforcePermission(allOf = { + android.Manifest.permission.INTERACT_ACROSS_USERS, + android.Manifest.permission.ACCESS_NOTIFICATIONS}) + public void registerCallNotificationEventListener(String packageName, UserHandle userHandle, + ICallNotificationEventCallback listener) { + registerCallNotificationEventListener_enforcePermission(); + + final int userId = userHandle.getIdentifier() != UserHandle.USER_CURRENT + ? userHandle.getIdentifier() : mAmi.getCurrentUserId(); + + synchronized (mCallNotificationEventCallbacks) { + ArrayMap<Integer, RemoteCallbackList<ICallNotificationEventCallback>> + callbacksForPackage = + mCallNotificationEventCallbacks.getOrDefault(packageName, new ArrayMap<>()); + RemoteCallbackList<ICallNotificationEventCallback> callbackList = + callbacksForPackage.getOrDefault(userId, new RemoteCallbackList<>()); + + if (callbackList.register(listener)) { + callbacksForPackage.put(userId, callbackList); + mCallNotificationEventCallbacks.put(packageName, callbacksForPackage); + } else { + Log.e(TAG, + "registerCallNotificationEventListener failed to register listener: " + + packageName + " " + userHandle + " " + listener); + return; + } + } + + synchronized (mNotificationLock) { + for (NotificationRecord r : mNotificationList) { + if (r.getNotification().isStyle(Notification.CallStyle.class) + && notificationMatchesUserId(r, userId, false) + && r.getSbn().getPackageName().equals(packageName)) { + try { + listener.onCallNotificationPosted(packageName, r.getUser()); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + } + } + } + } + + /** + * Unregister a listener that was previously + * registered with {@link #registerCallNotificationEventListener} + * + * @param packageName Which package to stop monitoring + * @param userHandle Which user to stop monitoring + * @param listener Listener to unregister + */ + @Override + @EnforcePermission(allOf = { + android.Manifest.permission.INTERACT_ACROSS_USERS, + android.Manifest.permission.ACCESS_NOTIFICATIONS}) + public void unregisterCallNotificationEventListener(String packageName, + UserHandle userHandle, ICallNotificationEventCallback listener) { + unregisterCallNotificationEventListener_enforcePermission(); + synchronized (mCallNotificationEventCallbacks) { + final int userId = userHandle.getIdentifier() != UserHandle.USER_CURRENT + ? userHandle.getIdentifier() : mAmi.getCurrentUserId(); + + ArrayMap<Integer, RemoteCallbackList<ICallNotificationEventCallback>> + callbacksForPackage = mCallNotificationEventCallbacks.get(packageName); + if (callbacksForPackage == null) { + return; + } + RemoteCallbackList<ICallNotificationEventCallback> callbackList = + callbacksForPackage.get(userId); + if (callbackList == null) { + return; + } + if (!callbackList.unregister(listener)) { + Log.e(TAG, + "unregisterCallNotificationEventListener listener not found for: " + + packageName + " " + userHandle + " " + listener); + } + } + } + + /** * Register a listener binder directly with the notification manager. * * Only works with system callers. Apps should extend @@ -4891,11 +5018,19 @@ public class NotificationManagerService extends SystemService { final long identity = Binder.clearCallingIdentity(); boolean notificationsRapidlyCleared = false; final String pkg; + final int packageImportance; + final ManagedServiceInfo info; try { synchronized (mNotificationLock) { - final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); + info = mListeners.checkServiceTokenLocked(token); pkg = info.component.getPackageName(); - + } + if (lifetimeExtensionRefactor()) { + packageImportance = mActivityManager.getPackageImportance(pkg); + } else { + packageImportance = IMPORTANCE_NONE; + } + synchronized (mNotificationLock) { // Cancellation reason. If the token comes from assistant, label the // cancellation as coming from the assistant; default to LISTENER_CANCEL. int reason = REASON_LISTENER_CANCEL; @@ -4917,7 +5052,7 @@ public class NotificationManagerService extends SystemService { || isNotificationRecent(r.getUpdateTimeMs()); cancelNotificationFromListenerLocked(info, callingUid, callingPid, r.getSbn().getPackageName(), r.getSbn().getTag(), - r.getSbn().getId(), userId, reason); + r.getSbn().getId(), userId, reason, packageImportance); } } else { for (NotificationRecord notificationRecord : mNotificationList) { @@ -4931,6 +5066,12 @@ public class NotificationManagerService extends SystemService { REASON_LISTENER_CANCEL_ALL, info, info.supportsProfiles(), FLAG_ONGOING_EVENT | FLAG_NO_CLEAR | FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); + // If cancellation will be prevented due to lifetime extension, we send + // an update to system UI. + notifySystemUiListenerLifetimeExtendedListLocked(mNotificationList, + packageImportance); + notifySystemUiListenerLifetimeExtendedListLocked(mEnqueuedNotifications, + packageImportance); } else { cancelAllLocked(callingUid, callingPid, info.userid, REASON_LISTENER_CANCEL_ALL, info, info.supportsProfiles(), @@ -5051,10 +5192,14 @@ public class NotificationManagerService extends SystemService { @GuardedBy("mNotificationLock") private void cancelNotificationFromListenerLocked(ManagedServiceInfo info, int callingUid, int callingPid, String pkg, String tag, int id, int userId, - int reason) { + int reason, int packageImportance) { int mustNotHaveFlags = FLAG_ONGOING_EVENT; if (lifetimeExtensionRefactor()) { mustNotHaveFlags |= FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY; + // If cancellation will be prevented due to lifetime extension, we send an update + // to system UI. + NotificationRecord record = findNotificationLocked(pkg, tag, id, userId); + maybeNotifySystemUiListenerLifetimeExtendedLocked(record, pkg, packageImportance); } cancelNotification(callingUid, callingPid, pkg, tag, id, 0 /* mustHaveFlags */, mustNotHaveFlags, @@ -5197,7 +5342,13 @@ public class NotificationManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); final long identity = Binder.clearCallingIdentity(); + final int packageImportance; try { + if (lifetimeExtensionRefactor()) { + packageImportance = mActivityManager.getPackageImportance(pkg); + } else { + packageImportance = IMPORTANCE_NONE; + } synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); int cancelReason = REASON_LISTENER_CANCEL; @@ -5210,7 +5361,7 @@ public class NotificationManagerService extends SystemService { + " use cancelNotification(key) instead."); } else { cancelNotificationFromListenerLocked(info, callingUid, callingPid, - pkg, tag, id, info.userid, cancelReason); + pkg, tag, id, info.userid, cancelReason, packageImportance); } } } finally { @@ -6254,6 +6405,10 @@ public class NotificationManagerService extends SystemService { Objects.requireNonNull(user); verifyPrivilegedListener(token, user, false); + + final NotificationChannel originalChannel = mPreferencesHelper.getNotificationChannel( + pkg, getUidForPackageAndUser(pkg, user), channel.getId(), true); + verifyPrivilegedListenerUriPermission(Binder.getCallingUid(), channel, originalChannel); updateNotificationChannelInt(pkg, getUidForPackageAndUser(pkg, user), channel, true); } @@ -6351,6 +6506,24 @@ public class NotificationManagerService extends SystemService { } } + private void verifyPrivilegedListenerUriPermission(int sourceUid, + @NonNull NotificationChannel updateChannel, + @Nullable NotificationChannel originalChannel) { + // Check that the NLS has the required permissions to access the channel + final Uri soundUri = updateChannel.getSound(); + final Uri originalSoundUri = + (originalChannel != null) ? originalChannel.getSound() : null; + if (soundUri != null && !Objects.equals(originalSoundUri, soundUri)) { + Binder.withCleanCallingIdentity(() -> { + mUgmInternal.checkGrantUriPermission(sourceUid, null, + ContentProvider.getUriWithoutUserId(soundUri), + Intent.FLAG_GRANT_READ_URI_PERMISSION, + ContentProvider.getUserIdFromUri(soundUri, + UserHandle.getUserId(sourceUid))); + }); + } + } + private int getUidForPackageAndUser(String pkg, UserHandle user) throws RemoteException { int uid = INVALID_UID; final long identity = Binder.clearCallingIdentity(); @@ -8621,6 +8794,11 @@ public class NotificationManagerService extends SystemService { } }); } + + if (callstyleCallbackApi()) { + notifyCallNotificationEventListenerOnRemoved(r); + } + // ATTENTION: in a future release we will bail out here // so that we do not play sounds, show lights, etc. for invalid // notifications @@ -9978,6 +10156,9 @@ public class NotificationManagerService extends SystemService { mGroupHelper.onNotificationRemoved(r.getSbn()); } }); + if (callstyleCallbackApi()) { + notifyCallNotificationEventListenerOnRemoved(r); + } } if (Flags.refactorAttentionHelper()) { @@ -11652,6 +11833,34 @@ public class NotificationManagerService extends SystemService { mNotificationRecordLogger.logNotificationPosted(report); } }); + + if (callstyleCallbackApi()) { + notifyCallNotificationEventListenerOnPosted(r); + } + } + + @FlaggedApi(FLAG_LIFETIME_EXTENSION_REFACTOR) + @GuardedBy("mNotificationLock") + private void notifySystemUiListenerLifetimeExtendedListLocked( + List<NotificationRecord> notificationList, int packageImportance) { + for (int i = notificationList.size() - 1; i >= 0; --i) { + NotificationRecord record = notificationList.get(i); + maybeNotifySystemUiListenerLifetimeExtendedLocked(record, + record.getSbn().getPackageName(), packageImportance); + } + } + + @FlaggedApi(FLAG_LIFETIME_EXTENSION_REFACTOR) + @GuardedBy("mNotificationLock") + private void maybeNotifySystemUiListenerLifetimeExtendedLocked(NotificationRecord record, + String pkg, int packageImportance) { + if (record != null && (record.getSbn().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY) > 0) { + boolean isAppForeground = pkg != null && packageImportance == IMPORTANCE_FOREGROUND; + mHandler.post(new EnqueueNotificationRunnable(record.getUser().getIdentifier(), + record, isAppForeground, + mPostNotificationTrackerFactory.newTracker(null))); + } } public class NotificationListeners extends ManagedServices { @@ -11777,6 +11986,11 @@ public class NotificationManagerService extends SystemService { @Override public void onServiceAdded(ManagedServiceInfo info) { + if (lifetimeExtensionRefactor()) { + // Only System or System UI can call registerSystemService, so if the caller is not + // system, we know it's system UI. + info.isSystemUi = !isCallerSystemOrPhone(); + } final INotificationListener listener = (INotificationListener) info.service; final NotificationRankingUpdate update; synchronized (mNotificationLock) { @@ -12141,6 +12355,23 @@ public class NotificationManagerService extends SystemService { continue; } + if (lifetimeExtensionRefactor()) { + // Checks if this is a request to notify system UI about a notification that + // has been lifetime extended. + // (We only need to check old for the flag, because in both cancellation and + // update cases, old should have the flag.) + // If it is such a request, and this is system UI, we send the post request + // only to System UI, and break as we don't need to continue checking other + // Managed Services. + if (info.isSystemUi() && old != null && old.getNotification() != null + && (old.getNotification().flags + & Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY) > 0) { + final NotificationRankingUpdate update = makeRankingUpdateLocked(info); + listenerCalls.add(() -> notifyPosted(info, oldSbn, update)); + break; + } + } + // If we shouldn't notify all listeners, this means the hidden state of // a notification was changed. Don't notifyPosted listeners targeting >= P. // Instead, those listeners will receive notifyRankingUpdate. @@ -12662,6 +12893,91 @@ public class NotificationManagerService extends SystemService { } } + @GuardedBy("mNotificationLock") + private void broadcastToCallNotificationEventCallbacks( + final RemoteCallbackList<ICallNotificationEventCallback> callbackList, + final NotificationRecord r, + boolean isPosted) { + if (callbackList != null) { + int numCallbacks = callbackList.beginBroadcast(); + try { + for (int i = 0; i < numCallbacks; i++) { + if (isPosted) { + callbackList.getBroadcastItem(i) + .onCallNotificationPosted(r.getSbn().getPackageName(), r.getUser()); + } else { + callbackList.getBroadcastItem(i) + .onCallNotificationRemoved(r.getSbn().getPackageName(), + r.getUser()); + } + } + } catch (RemoteException e) { + throw new RuntimeException(e); + } + callbackList.finishBroadcast(); + } + } + + @GuardedBy("mNotificationLock") + void notifyCallNotificationEventListenerOnPosted(final NotificationRecord r) { + if (!r.getNotification().isStyle(Notification.CallStyle.class)) { + return; + } + + synchronized (mCallNotificationEventCallbacks) { + ArrayMap<Integer, RemoteCallbackList<ICallNotificationEventCallback>> + callbacksForPackage = + mCallNotificationEventCallbacks.get(r.getSbn().getPackageName()); + if (callbacksForPackage == null) { + return; + } + + if (!r.getUser().equals(UserHandle.ALL)) { + broadcastToCallNotificationEventCallbacks( + callbacksForPackage.get(r.getUser().getIdentifier()), r, true); + // Also notify the listeners registered for USER_ALL + broadcastToCallNotificationEventCallbacks(callbacksForPackage.get(USER_ALL), r, + true); + } else { + // Notify listeners registered for any userId + for (RemoteCallbackList<ICallNotificationEventCallback> callbackList + : callbacksForPackage.values()) { + broadcastToCallNotificationEventCallbacks(callbackList, r, true); + } + } + } + } + + @GuardedBy("mNotificationLock") + void notifyCallNotificationEventListenerOnRemoved(final NotificationRecord r) { + if (!r.getNotification().isStyle(Notification.CallStyle.class)) { + return; + } + + synchronized (mCallNotificationEventCallbacks) { + ArrayMap<Integer, RemoteCallbackList<ICallNotificationEventCallback>> + callbacksForPackage = + mCallNotificationEventCallbacks.get(r.getSbn().getPackageName()); + if (callbacksForPackage == null) { + return; + } + + if (!r.getUser().equals(UserHandle.ALL)) { + broadcastToCallNotificationEventCallbacks( + callbacksForPackage.get(r.getUser().getIdentifier()), r, false); + // Also notify the listeners registered for USER_ALL + broadcastToCallNotificationEventCallbacks(callbacksForPackage.get(USER_ALL), r, + false); + } else { + // Notify listeners registered for any userId + for (RemoteCallbackList<ICallNotificationEventCallback> callbackList + : callbacksForPackage.values()) { + broadcastToCallNotificationEventCallbacks(callbackList, r, false); + } + } + } + } + // TODO (b/194833441): remove when we've fully migrated to a permission class RoleObserver implements OnRoleHoldersChangedListener { // Role name : user id : list of approved packages diff --git a/services/core/java/com/android/server/notification/ZenLog.java b/services/core/java/com/android/server/notification/ZenLog.java index 88d23ce3f9a1..82c5733655b0 100644 --- a/services/core/java/com/android/server/notification/ZenLog.java +++ b/services/core/java/com/android/server/notification/ZenLog.java @@ -28,6 +28,7 @@ import android.service.notification.IConditionProvider; import android.service.notification.NotificationListenerService; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeDiff; +import android.util.LocalLog; import android.util.Log; import android.util.Slog; @@ -37,26 +38,16 @@ import java.util.Date; import java.util.List; public class ZenLog { - private static final String TAG = "ZenLog"; - // the ZenLog is *very* verbose, so be careful about setting this to true - private static final boolean DEBUG = false; private static final int SIZE = Build.IS_DEBUGGABLE ? 200 : 100; - private static final long[] TIMES = new long[SIZE]; - private static final int[] TYPES = new int[SIZE]; - private static final String[] MSGS = new String[SIZE]; - - private static final SimpleDateFormat FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS"); + private static final LocalLog STATE_CHANGES = new LocalLog(SIZE); + private static final LocalLog INTERCEPTION_EVENTS = new LocalLog(SIZE); private static final int TYPE_INTERCEPTED = 1; - private static final int TYPE_ALLOW_DISABLE = 2; private static final int TYPE_SET_RINGER_MODE_EXTERNAL = 3; private static final int TYPE_SET_RINGER_MODE_INTERNAL = 4; - private static final int TYPE_DOWNTIME = 5; private static final int TYPE_SET_ZEN_MODE = 6; - private static final int TYPE_UPDATE_ZEN_MODE = 7; - private static final int TYPE_EXIT_CONDITION = 8; private static final int TYPE_SUBSCRIBE = 9; private static final int TYPE_UNSUBSCRIBE = 10; private static final int TYPE_CONFIG = 11; @@ -71,9 +62,6 @@ public class ZenLog { private static final int TYPE_CHECK_REPEAT_CALLER = 20; private static final int TYPE_ALERT_ON_UPDATED_INTERCEPT = 21; - private static int sNext; - private static int sSize; - public static void traceIntercepted(NotificationRecord record, String reason) { append(TYPE_INTERCEPTED, record.getKey() + "," + reason); } @@ -104,10 +92,6 @@ public class ZenLog { ringerModeToString(ringerModeExternalOut)); } - public static void traceDowntimeAutotrigger(String result) { - append(TYPE_DOWNTIME, result); - } - public static void traceSetZenMode(int zenMode, String reason) { append(TYPE_SET_ZEN_MODE, zenModeToString(zenMode) + "," + reason); } @@ -120,21 +104,12 @@ public class ZenLog { append(TYPE_SET_CONSOLIDATED_ZEN_POLICY, policy.toString() + "," + reason); } - public static void traceUpdateZenMode(int fromMode, int toMode) { - append(TYPE_UPDATE_ZEN_MODE, zenModeToString(fromMode) + " -> " + zenModeToString(toMode)); - } - - public static void traceExitCondition(Condition c, ComponentName component, String reason) { - append(TYPE_EXIT_CONDITION, c + "," + componentToString(component) + "," + reason); - } public static void traceSetNotificationPolicy(String pkg, int targetSdk, NotificationManager.Policy policy) { String policyLog = "pkg=" + pkg + " targetSdk=" + targetSdk + " NotificationPolicy=" + policy.toString(); append(TYPE_SET_NOTIFICATION_POLICY, policyLog); - // TODO(b/180205791): remove when we can better surface apps that are changing policy - Log.d(TAG, "Zen Policy Changed: " + policyLog); } public static void traceSubscribe(Uri uri, IConditionProvider provider, RemoteException e) { @@ -145,13 +120,14 @@ public class ZenLog { append(TYPE_UNSUBSCRIBE, uri + "," + subscribeResult(provider, e)); } - public static void traceConfig(String reason, ZenModeConfig oldConfig, - ZenModeConfig newConfig) { + public static void traceConfig(String reason, ComponentName triggeringComponent, + ZenModeConfig oldConfig, ZenModeConfig newConfig, int callingUid) { ZenModeDiff.ConfigDiff diff = new ZenModeDiff.ConfigDiff(oldConfig, newConfig); if (diff == null || !diff.hasDiff()) { append(TYPE_CONFIG, reason + " no changes"); } else { append(TYPE_CONFIG, reason + + " - " + triggeringComponent + " : " + callingUid + ",\n" + (newConfig != null ? newConfig.toString() : null) + ",\n" + diff); } @@ -204,13 +180,9 @@ public class ZenLog { private static String typeToString(int type) { switch (type) { case TYPE_INTERCEPTED: return "intercepted"; - case TYPE_ALLOW_DISABLE: return "allow_disable"; case TYPE_SET_RINGER_MODE_EXTERNAL: return "set_ringer_mode_external"; case TYPE_SET_RINGER_MODE_INTERNAL: return "set_ringer_mode_internal"; - case TYPE_DOWNTIME: return "downtime"; case TYPE_SET_ZEN_MODE: return "set_zen_mode"; - case TYPE_UPDATE_ZEN_MODE: return "update_zen_mode"; - case TYPE_EXIT_CONDITION: return "exit_condition"; case TYPE_SUBSCRIBE: return "subscribe"; case TYPE_UNSUBSCRIBE: return "unsubscribe"; case TYPE_CONFIG: return "config"; @@ -278,30 +250,27 @@ public class ZenLog { } private static void append(int type, String msg) { - synchronized(MSGS) { - TIMES[sNext] = System.currentTimeMillis(); - TYPES[sNext] = type; - MSGS[sNext] = msg; - sNext = (sNext + 1) % SIZE; - if (sSize < SIZE) { - sSize++; + if (type == TYPE_INTERCEPTED || type == TYPE_NOT_INTERCEPTED + || type == TYPE_CHECK_REPEAT_CALLER || type == TYPE_RECORD_CALLER + || type == TYPE_MATCHES_CALL_FILTER || type == TYPE_ALERT_ON_UPDATED_INTERCEPT) { + synchronized (INTERCEPTION_EVENTS) { + INTERCEPTION_EVENTS.log(typeToString(type) + ": " +msg); + } + } else { + synchronized (STATE_CHANGES) { + STATE_CHANGES.log(typeToString(type) + ": " +msg); } } - if (DEBUG) Slog.d(TAG, typeToString(type) + ": " + msg); } public static void dump(PrintWriter pw, String prefix) { - synchronized(MSGS) { - final int start = (sNext - sSize + SIZE) % SIZE; - for (int i = 0; i < sSize; i++) { - final int j = (start + i) % SIZE; - pw.print(prefix); - pw.print(FORMAT.format(new Date(TIMES[j]))); - pw.print(' '); - pw.print(typeToString(TYPES[j])); - pw.print(": "); - pw.println(MSGS[j]); - } + synchronized (INTERCEPTION_EVENTS) { + pw.printf(prefix + "Interception Events:\n"); + INTERCEPTION_EVENTS.dump(prefix, pw); + } + synchronized (STATE_CHANGES) { + pw.printf(prefix + "State Changes:\n"); + STATE_CHANGES.dump(prefix, pw); } } } diff --git a/services/core/java/com/android/server/notification/ZenModeEventLogger.java b/services/core/java/com/android/server/notification/ZenModeEventLogger.java index a90efe6f54f8..b9a267f37ff9 100644 --- a/services/core/java/com/android/server/notification/ZenModeEventLogger.java +++ b/services/core/java/com/android/server/notification/ZenModeEventLogger.java @@ -26,6 +26,7 @@ import static android.service.notification.NotificationServiceProto.RULE_TYPE_UN import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.app.Flags; import android.app.NotificationManager; import android.content.pm.PackageManager; @@ -33,6 +34,7 @@ import android.os.Process; import android.service.notification.DNDPolicyProto; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ConfigChangeOrigin; +import android.service.notification.ZenModeConfig.ZenRule; import android.service.notification.ZenModeDiff; import android.service.notification.ZenPolicy; import android.util.ArrayMap; @@ -46,6 +48,9 @@ import com.android.internal.logging.UiEventLogger; import com.android.internal.util.FrameworkStatsLog; import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Objects; /** @@ -58,6 +63,9 @@ class ZenModeEventLogger { // Placeholder int for unknown zen mode, to distinguish from "off". static final int ZEN_MODE_UNKNOWN = -1; + // Special rule type for manual rule. Keep in sync with ActiveRuleType in dnd_enums.proto. + protected static final int ACTIVE_RULE_TYPE_MANUAL = 999; + // Object for tracking config changes and policy changes associated with an overall zen // mode change. ZenModeEventLogger.ZenStateChanges mChangeState = new ZenModeEventLogger.ZenStateChanges(); @@ -192,7 +200,8 @@ class ZenModeEventLogger { /* bool user_action = 6 */ mChangeState.getIsUserAction(), /* int32 package_uid = 7 */ mChangeState.getPackageUid(), /* DNDPolicyProto current_policy = 8 */ mChangeState.getDNDPolicyProto(), - /* bool are_channels_bypassing = 9 */ mChangeState.getAreChannelsBypassing()); + /* bool are_channels_bypassing = 9 */ mChangeState.getAreChannelsBypassing(), + /* ActiveRuleType active_rule_types = 10 */ mChangeState.getActiveRuleTypes()); } /** @@ -371,35 +380,45 @@ class ZenModeEventLogger { } /** - * Get the number of active rules represented in a zen mode config. Because this is based - * on a config, this does not take into account the zen mode at the time of the config, - * which means callers need to take the zen mode into account for whether the rules are - * actually active. + * Get a list of the active rules in the provided config. This is a helper function for + * other methods that then use this information to get the number and type of active + * rules available. */ - int numActiveRulesInConfig(ZenModeConfig config) { - // If the config is null, return early + @SuppressLint("WrongConstant") // special case for log-only type on manual rule + @NonNull List<ZenRule> activeRulesList(ZenModeConfig config) { + ArrayList<ZenRule> rules = new ArrayList<>(); if (config == null) { - return 0; + return rules; } - int rules = 0; - // Loop through the config and check: - // - does a manual rule exist? (if it's non-null, it's active) - // - how many automatic rules are active, as defined by isAutomaticActive()? if (config.manualRule != null) { - rules++; + // If the manual rule is non-null, then it's active. We make a copy and set the rule + // type so that the correct value gets logged. + ZenRule rule = config.manualRule.copy(); + rule.type = ACTIVE_RULE_TYPE_MANUAL; + rules.add(rule); } if (config.automaticRules != null) { for (ZenModeConfig.ZenRule rule : config.automaticRules.values()) { if (rule != null && rule.isAutomaticActive()) { - rules++; + rules.add(rule); } } } return rules; } + /** + * Get the number of active rules represented in a zen mode config. Because this is based + * on a config, this does not take into account the zen mode at the time of the config, + * which means callers need to take the zen mode into account for whether the rules are + * actually active. + */ + int numActiveRulesInConfig(ZenModeConfig config) { + return activeRulesList(config).size(); + } + // Determine the number of (automatic & manual) rules active after the change takes place. int getNumRulesActive() { if (!Flags.modesApi()) { @@ -412,6 +431,34 @@ class ZenModeEventLogger { } /** + * Return a list of the types of each of the active rules in the configuration. + * Only available when {@code MODES_API} is active; otherwise returns an empty list. + */ + int[] getActiveRuleTypes() { + if (!Flags.modesApi() || mNewZenMode == ZEN_MODE_OFF) { + return new int[0]; + } + + ArrayList<Integer> activeTypes = new ArrayList<>(); + List<ZenRule> activeRules = activeRulesList(mNewConfig); + if (activeRules.size() == 0) { + return new int[0]; + } + + for (ZenRule rule : activeRules) { + activeTypes.add(rule.type); + } + + // Sort the list of active types to have a consistent order in the atom + Collections.sort(activeTypes); + int[] out = new int[activeTypes.size()]; + for (int i = 0; i < activeTypes.size(); i++) { + out[i] = activeTypes.get(i); + } + return out; + } + + /** * Return our best guess as to whether the changes observed are due to a user action. * Note that this (before {@code MODES_API}) won't be 100% accurate as we can't necessarily * distinguish between a system uid call indicating "user interacted with Settings" vs "a diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index aebd28a549ca..54de1976edb6 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -16,6 +16,7 @@ package com.android.server.notification; +import static android.app.AutomaticZenRule.TYPE_UNKNOWN; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_ACTIVATED; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_DEACTIVATED; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_DISABLED; @@ -1264,7 +1265,7 @@ public class ZenModeHelper { : new ZenDeviceEffects.Builder().build(); if (isFromApp) { - // Don't allow apps to toggle hidden effects. + // Don't allow apps to toggle hidden (non-public-API) effects. newEffects = new ZenDeviceEffects.Builder(newEffects) .setShouldDisableAutoBrightness(oldEffects.shouldDisableAutoBrightness()) .setShouldDisableTapToWake(oldEffects.shouldDisableTapToWake()) @@ -1272,6 +1273,7 @@ public class ZenModeHelper { .setShouldDisableTouch(oldEffects.shouldDisableTouch()) .setShouldMinimizeRadioUsage(oldEffects.shouldMinimizeRadioUsage()) .setShouldMaximizeDoze(oldEffects.shouldMaximizeDoze()) + .setExtraEffects(oldEffects.getExtraEffects()) .build(); } @@ -1311,6 +1313,9 @@ public class ZenModeHelper { if (oldEffects.shouldMaximizeDoze() != newEffects.shouldMaximizeDoze()) { userModifiedFields |= ZenDeviceEffects.FIELD_MAXIMIZE_DOZE; } + if (!Objects.equals(oldEffects.getExtraEffects(), newEffects.getExtraEffects())) { + userModifiedFields |= ZenDeviceEffects.FIELD_EXTRA_EFFECTS; + } zenRule.zenDeviceEffectsUserModifiedFields = userModifiedFields; } } @@ -1713,7 +1718,7 @@ public class ZenModeHelper { mConfigs.put(config.user, config); } if (DEBUG) Log.d(TAG, "setConfigLocked reason=" + reason, new Throwable()); - ZenLog.traceConfig(reason, mConfig, config); + ZenLog.traceConfig(reason, triggeringComponent, mConfig, config, callingUid); // send some broadcasts Policy newPolicy = getNotificationPolicy(config); @@ -2166,7 +2171,8 @@ public class ZenModeHelper { /* optional DNDPolicyProto policy = 7 */ config.toZenPolicy().toProto(), /* optional int32 rule_modified_fields = 8 */ 0, /* optional int32 policy_modified_fields = 9 */ 0, - /* optional int32 device_effects_modified_fields = 10 */ 0)); + /* optional int32 device_effects_modified_fields = 10 */ 0, + /* optional ActiveRuleType rule_type = 11 */ TYPE_UNKNOWN)); if (config.manualRule != null) { ruleToProtoLocked(user, config.manualRule, true, events); } @@ -2192,8 +2198,10 @@ public class ZenModeHelper { pkg = rule.enabler; } + int ruleType = rule.type; if (isManualRule) { id = ZenModeConfig.MANUAL_RULE_ID; + ruleType = ZenModeEventLogger.ACTIVE_RULE_TYPE_MANUAL; } SysUiStatsEvent.Builder data; @@ -2212,7 +2220,8 @@ public class ZenModeHelper { /* optional int32 rule_modified_fields = 8 */ rule.userModifiedFields, /* optional int32 policy_modified_fields = 9 */ rule.zenPolicyUserModifiedFields, /* optional int32 device_effects_modified_fields = 10 */ - rule.zenDeviceEffectsUserModifiedFields)); + rule.zenDeviceEffectsUserModifiedFields, + /* optional ActiveRuleType rule_type = 11 */ ruleType)); } private int getPackageUid(String pkg, int user) { diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java index 25a39cc8456f..86d05d92c95b 100644 --- a/services/core/java/com/android/server/om/IdmapManager.java +++ b/services/core/java/com/android/server/om/IdmapManager.java @@ -257,7 +257,7 @@ final class IdmapManager { private boolean matchesActorSignature(@NonNull AndroidPackage targetPackage, @NonNull AndroidPackage overlayPackage, int userId) { String targetOverlayableName = overlayPackage.getOverlayTargetOverlayableName(); - if (targetOverlayableName != null) { + if (targetOverlayableName != null && !mPackageManager.getNamedActors().isEmpty()) { try { OverlayableInfo overlayableInfo = mPackageManager.getOverlayableForTarget( targetPackage.getPackageName(), targetOverlayableName, userId); diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index b9464d96a019..872952299055 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -362,7 +362,7 @@ public final class OverlayManagerService extends SystemService { defaultPackages.add(packageName); } } - return defaultPackages.toArray(new String[defaultPackages.size()]); + return defaultPackages.toArray(new String[0]); } private final class OverlayManagerPackageMonitor extends PackageMonitor { @@ -1160,7 +1160,7 @@ public final class OverlayManagerService extends SystemService { // state may lead to contradictions within OMS. Better then to lag // behind until all pending intents have been processed. private final ArrayMap<String, PackageStateUsers> mCache = new ArrayMap<>(); - private final Set<Integer> mInitializedUsers = new ArraySet<>(); + private final ArraySet<Integer> mInitializedUsers = new ArraySet<>(); PackageManagerHelperImpl(Context context) { mContext = context; @@ -1176,8 +1176,7 @@ public final class OverlayManagerService extends SystemService { */ @NonNull public ArrayMap<String, PackageState> initializeForUser(final int userId) { - if (!mInitializedUsers.contains(userId)) { - mInitializedUsers.add(userId); + if (mInitializedUsers.add(userId)) { mPackageManagerInternal.forEachPackageState((packageState -> { if (packageState.getPkg() != null && packageState.getUserStateOrDefault(userId).isInstalled()) { @@ -1545,8 +1544,7 @@ public final class OverlayManagerService extends SystemService { final OverlayPaths frameworkOverlays = mImpl.getEnabledOverlayPaths("android", userId, false); for (final String targetPackageName : targetPackageNames) { - final OverlayPaths.Builder list = new OverlayPaths.Builder(); - list.addAll(frameworkOverlays); + final var list = new OverlayPaths.Builder(frameworkOverlays); if (!"android".equals(targetPackageName)) { list.addAll(mImpl.getEnabledOverlayPaths(targetPackageName, userId, true)); } @@ -1558,17 +1556,21 @@ public final class OverlayManagerService extends SystemService { final HashSet<String> invalidPackages = new HashSet<>(); pm.setEnabledOverlayPackages(userId, pendingChanges, updatedPackages, invalidPackages); - for (final String targetPackageName : targetPackageNames) { - if (DEBUG) { - Slog.d(TAG, "-> Updating overlay: target=" + targetPackageName + " overlays=[" - + pendingChanges.get(targetPackageName) - + "] userId=" + userId); - } + if (DEBUG || !invalidPackages.isEmpty()) { + for (final String targetPackageName : targetPackageNames) { + if (DEBUG) { + Slog.d(TAG, + "-> Updating overlay: target=" + targetPackageName + " overlays=[" + + pendingChanges.get(targetPackageName) + + "] userId=" + userId); + } - if (invalidPackages.contains(targetPackageName)) { - Slog.e(TAG, TextUtils.formatSimple( - "Failed to change enabled overlays for %s user %d", targetPackageName, - userId)); + if (invalidPackages.contains(targetPackageName)) { + Slog.e(TAG, TextUtils.formatSimple( + "Failed to change enabled overlays for %s user %d", + targetPackageName, + userId)); + } } } return new ArrayList<>(updatedPackages); diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java index 972c78db9460..c1b6ccc7e25c 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -772,24 +772,20 @@ final class OverlayManagerServiceImpl { OverlayPaths getEnabledOverlayPaths(@NonNull final String targetPackageName, final int userId, boolean includeImmutableOverlays) { - final List<OverlayInfo> overlays = mSettings.getOverlaysForTarget(targetPackageName, - userId); - final OverlayPaths.Builder paths = new OverlayPaths.Builder(); - final int n = overlays.size(); - for (int i = 0; i < n; i++) { - final OverlayInfo oi = overlays.get(i); + final var paths = new OverlayPaths.Builder(); + mSettings.forEachMatching(userId, null, targetPackageName, oi -> { if (!oi.isEnabled()) { - continue; + return; } if (!includeImmutableOverlays && !oi.isMutable) { - continue; + return; } if (oi.isFabricated()) { paths.addNonApkPath(oi.baseCodePath); } else { paths.addApkPath(oi.baseCodePath); } - } + }); return paths.build(); } diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java index eae614ac9e77..b8b49f3eed2f 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -47,6 +47,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Set; +import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; @@ -182,6 +183,23 @@ final class OverlayManagerSettings { return CollectionUtils.map(items, SettingsItem::getOverlayInfo); } + void forEachMatching(int userId, String overlayName, String targetPackageName, + @NonNull Consumer<OverlayInfo> consumer) { + for (int i = 0, n = mItems.size(); i < n; i++) { + final SettingsItem item = mItems.get(i); + if (item.getUserId() != userId) { + continue; + } + if (overlayName != null && !item.mOverlay.getPackageName().equals(overlayName)) { + continue; + } + if (targetPackageName != null && !item.mTargetPackageName.equals(targetPackageName)) { + continue; + } + consumer.accept(item.getOverlayInfo()); + } + } + ArrayMap<String, List<OverlayInfo>> getOverlaysForUser(final int userId) { final List<SettingsItem> items = selectWhereUser(userId); diff --git a/services/core/java/com/android/server/pm/AppDataHelper.java b/services/core/java/com/android/server/pm/AppDataHelper.java index 79d17534ab26..18ba2cf1405e 100644 --- a/services/core/java/com/android/server/pm/AppDataHelper.java +++ b/services/core/java/com/android/server/pm/AppDataHelper.java @@ -50,6 +50,7 @@ import com.android.server.pm.dex.ArtManagerService; import com.android.server.pm.parsing.pkg.AndroidPackageUtils; import com.android.server.pm.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.pkg.PackageUserStateInternal; import com.android.server.pm.pkg.SELinuxUtil; import dalvik.system.VMRuntime; @@ -505,16 +506,21 @@ public class AppDataHelper { if (packageState == null) { throw PackageManagerException.ofInternalError("Package " + packageName + " is unknown", PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_PACKAGE_UNKNOWN); - } else if (!TextUtils.equals(volumeUuid, packageState.getVolumeUuid())) { + } + if (!TextUtils.equals(volumeUuid, packageState.getVolumeUuid())) { throw PackageManagerException.ofInternalError( "Package " + packageName + " found on unknown volume " + volumeUuid + "; expected volume " + packageState.getVolumeUuid(), PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_VOLUME_UNKNOWN); - } else if (!packageState.getUserStateOrDefault(userId).isInstalled()) { + } + final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId); + if (!userState.isInstalled() && !userState.dataExists()) { throw PackageManagerException.ofInternalError( - "Package " + packageName + " not installed for user " + userId, + "Package " + packageName + " not installed for user " + userId + + " or was deleted without DELETE_KEEP_DATA", PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_NOT_INSTALLED_FOR_USER); - } else if (packageState.getPkg() != null + } + if (packageState.getPkg() != null && !shouldHaveAppStorage(packageState.getPkg())) { throw PackageManagerException.ofInternalError( "Package " + packageName + " shouldn't have storage", diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index db5acc2eda09..a1dac0456ff9 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4191,7 +4191,7 @@ final class InstallPackageHelper { + "; old: " + pkgSetting.getPathString() + " @ " + pkgSetting.getVersionCode() + "; new: " + parsedPackage.getPath() + " @ " - + parsedPackage.getPath()); + + parsedPackage.getLongVersionCode()); } } diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 984a6299cc81..295528e14ca7 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -38,6 +38,7 @@ import static android.content.pm.LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS; import static com.android.server.pm.PackageArchiver.isArchivingEnabled; +import android.Manifest; import android.annotation.AppIdInt; import android.annotation.NonNull; import android.annotation.Nullable; @@ -52,6 +53,7 @@ import android.app.IApplicationThread; import android.app.PendingIntent; import android.app.admin.DevicePolicyCache; import android.app.admin.DevicePolicyManager; +import android.app.role.RoleManager; import android.app.usage.UsageStatsManagerInternal; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; @@ -84,7 +86,9 @@ import android.content.pm.ShortcutQueryWrapper; import android.content.pm.ShortcutServiceInternal; import android.content.pm.ShortcutServiceInternal.ShortcutChangeListener; import android.content.pm.UserInfo; +import android.content.pm.UserProperties; import android.graphics.Rect; +import android.multiuser.Flags; import android.net.Uri; import android.os.Binder; import android.os.Bundle; @@ -211,6 +215,7 @@ public class LauncherAppsService extends SystemService { private final Context mContext; private final UserManager mUm; + private final RoleManager mRoleManager; private final IPackageManager mIPM; private final UserManagerInternal mUserManagerInternal; private final UsageStatsManagerInternal mUsageStatsManagerInternal; @@ -247,6 +252,7 @@ public class LauncherAppsService extends SystemService { mContext = context; mIPM = AppGlobals.getPackageManager(); mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + mRoleManager = mContext.getSystemService(RoleManager.class); mUserManagerInternal = Objects.requireNonNull( LocalServices.getService(UserManagerInternal.class)); mUsageStatsManagerInternal = Objects.requireNonNull( @@ -451,7 +457,6 @@ public class LauncherAppsService extends SystemService { private boolean canAccessProfile(int callingUid, int callingUserId, int callingPid, int targetUserId, String message) { - if (targetUserId == callingUserId) return true; if (injectHasInteractAcrossUsersFullPermission(callingPid, callingUid)) { return true; @@ -465,6 +470,14 @@ public class LauncherAppsService extends SystemService { + targetUserId + " from " + callingUserId + " not allowed"); return false; } + + if (areHiddenApisChecksEnabled() + && mUm.getUserProperties(UserHandle.of(targetUserId)) + .getProfileApiVisibility() + == UserProperties.PROFILE_API_VISIBILITY_HIDDEN + && !canAccessHiddenProfileInjected(callingUid, callingPid)) { + return false; + } } finally { injectRestoreCallingIdentity(ident); } @@ -473,10 +486,43 @@ public class LauncherAppsService extends SystemService { message, true); } + boolean areHiddenApisChecksEnabled() { + return android.os.Flags.allowPrivateProfile() + && Flags.enableLauncherAppsHiddenProfileChecks() + && Flags.enablePermissionToAccessHiddenProfiles(); + } + private void verifyCallingPackage(String callingPackage) { verifyCallingPackage(callingPackage, injectBinderCallingUid()); } + boolean canAccessHiddenProfileInjected(int callingUid, int callingPid) { + AndroidPackage callingPackage = mPackageManagerInternal.getPackage(callingUid); + if (callingPackage == null) { + return false; + } + + if (!mRoleManager + .getRoleHoldersAsUser( + RoleManager.ROLE_HOME, UserHandle.getUserHandleForUid(callingUid)) + .contains(callingPackage.getPackageName())) { + return false; + } + + if (mContext.checkPermission( + Manifest.permission.ACCESS_HIDDEN_PROFILES_FULL, callingPid, callingUid) + == PackageManager.PERMISSION_GRANTED) { + return true; + } + + // TODO(b/321988638): add option to disable with a flag + return mContext.checkPermission( + android.Manifest.permission.ACCESS_HIDDEN_PROFILES, + callingPid, + callingUid) + == PackageManager.PERMISSION_GRANTED; + } + @VisibleForTesting // We override it in unit tests void verifyCallingPackage(String callingPackage, int callerUid) { int packageUid = -1; @@ -1566,11 +1612,6 @@ public class LauncherAppsService extends SystemService { @Override public @Nullable LauncherUserInfo getLauncherUserInfo(@NonNull UserHandle user) { - // Only system launchers, which have access to recents should have access to this API. - // TODO(b/303803157): Add the new permission check if we decide to have one. - if (!mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid())) { - throw new SecurityException("Caller is not the recents app"); - } if (!canAccessProfile(user.getIdentifier(), "Can't access LauncherUserInfo for another user")) { return null; @@ -1585,11 +1626,6 @@ public class LauncherAppsService extends SystemService { @Override public List<String> getPreInstalledSystemPackages(UserHandle user) { - // Only system launchers, which have access to recents should have access to this API. - // TODO(b/303803157): Update access control for this API to default Launcher app. - if (!mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid())) { - throw new SecurityException("Caller is not the recents app"); - } if (!canAccessProfile(user.getIdentifier(), "Can't access preinstalled packages for another user")) { return null; @@ -1610,11 +1646,6 @@ public class LauncherAppsService extends SystemService { @Override public @Nullable IntentSender getAppMarketActivityIntent(@NonNull String callingPackage, @Nullable String packageName, @NonNull UserHandle user) { - // Only system launchers, which have access to recents should have access to this API. - // TODO(b/303803157): Update access control for this API to default Launcher app. - if (!mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid())) { - throw new SecurityException("Caller is not the recents app"); - } if (!canAccessProfile(user.getIdentifier(), "Can't access AppMarketActivity for another user")) { return null; diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 796edde7d9bd..f222fe9add0f 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1466,7 +1466,7 @@ public class UserManagerService extends IUserManager.Stub { if (userType != null && !userType.equals(profile.userType)) { continue; } - if (excludeHidden && isProfileHidden(userId)) { + if (excludeHidden && isProfileHidden(profile.id)) { continue; } result.add(profile.id); diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java index c94c49d68e75..a9d2858fd36e 100644 --- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java +++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java @@ -154,7 +154,8 @@ public class UserRestrictionsUtils { UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, UserManager.DISALLOW_CONFIG_DEFAULT_APPS, UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO, - UserManager.DISALLOW_SIM_GLOBALLY + UserManager.DISALLOW_SIM_GLOBALLY, + UserManager.DISALLOW_ASSIST_CONTENT }); public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet( @@ -230,7 +231,8 @@ public class UserRestrictionsUtils { UserManager.DISALLOW_RUN_IN_BACKGROUND, UserManager.DISALLOW_UNMUTE_MICROPHONE, UserManager.DISALLOW_UNMUTE_DEVICE, - UserManager.DISALLOW_CAMERA + UserManager.DISALLOW_CAMERA, + UserManager.DISALLOW_ASSIST_CONTENT ); /** diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java index 3f00a9d999aa..7d902401a537 100644 --- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java +++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java @@ -26,6 +26,7 @@ import android.content.pm.verify.domain.DomainVerificationInfo; import android.content.pm.verify.domain.DomainVerificationManager; import android.content.pm.verify.domain.DomainVerificationUserState; import android.content.pm.verify.domain.IDomainVerificationManager; +import android.os.Bundle; import android.os.ServiceSpecificException; import java.util.List; @@ -41,6 +42,27 @@ public class DomainVerificationManagerStub extends IDomainVerificationManager.St mService = service; } + @Override + public void setUriRelativeFilterGroups(@NonNull String packageName, + @NonNull Bundle domainToGroupsBundle) { + try { + mService.setUriRelativeFilterGroups(packageName, domainToGroupsBundle); + } catch (Exception e) { + throw rethrow(e); + } + } + + @NonNull + @Override + public Bundle getUriRelativeFilterGroups( + @NonNull String packageName, @NonNull List<String> domains) { + try { + return mService.getUriRelativeFilterGroups(packageName, domains); + } catch (Exception e) { + throw rethrow(e); + } + } + @NonNull @Override public List<String> queryValidVerificationPackageNames() { diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java index ac6d79541bc1..de464a4a42bb 100644 --- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java +++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java @@ -19,6 +19,8 @@ package com.android.server.pm.verify.domain; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.content.UriRelativeFilter; +import android.content.UriRelativeFilterGroup; import android.content.pm.Signature; import android.content.pm.verify.domain.DomainVerificationState; import android.os.UserHandle; @@ -38,7 +40,10 @@ import com.android.server.pm.verify.domain.models.DomainVerificationStateMap; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; +import java.util.List; import java.util.UUID; import java.util.function.Function; @@ -67,6 +72,13 @@ public class DomainVerificationPersistence { public static final String TAG_DOMAIN = "domain"; public static final String ATTR_NAME = "name"; public static final String ATTR_STATE = "state"; + public static final String TAG_URI_RELATIVE_FILTER_GROUPS = "uri-relative-filter-groups"; + public static final String TAG_URI_RELATIVE_FILTER_GROUP = "uri-relative-filter-group"; + public static final String ATTR_ACTION = "action"; + public static final String TAG_URI_RELATIVE_FILTER = "uri-relative-filter"; + public static final String ATTR_URI_PART = "uri-part"; + public static final String ATTR_PATTERN_TYPE = "pattern-type"; + public static final String ATTR_FILTER = "filter"; /** * @param pkgNameToSignature Converts package name to a string representation of its signature. @@ -176,6 +188,7 @@ public class DomainVerificationPersistence { final ArrayMap<String, Integer> stateMap = new ArrayMap<>(); final SparseArray<DomainVerificationInternalUserState> userStates = new SparseArray<>(); + final ArrayMap<String, List<UriRelativeFilterGroup>> groupMap = new ArrayMap<>(); SettingsXml.ChildSection child = section.children(); while (child.moveToNext()) { @@ -186,11 +199,47 @@ public class DomainVerificationPersistence { case TAG_USER_STATES: readUserStates(child, userStates); break; + case TAG_URI_RELATIVE_FILTER_GROUPS: + readUriRelativeFilterGroups(child, groupMap); + break; } } return new DomainVerificationPkgState(packageName, id, hasAutoVerifyDomains, stateMap, - userStates, signature); + userStates, signature, groupMap); + } + + private static void readUriRelativeFilterGroups(@NonNull SettingsXml.ReadSection section, + @NonNull ArrayMap<String, List<UriRelativeFilterGroup>> groupMap) { + SettingsXml.ChildSection child = section.children(); + while (child.moveToNext(TAG_DOMAIN)) { + String domain = child.getString(ATTR_NAME); + groupMap.put(domain, createUriRelativeFilterGroupsFromXml(child)); + } + } + + private static ArrayList<UriRelativeFilterGroup> createUriRelativeFilterGroupsFromXml( + @NonNull SettingsXml.ReadSection section) { + SettingsXml.ChildSection child = section.children(); + ArrayList<UriRelativeFilterGroup> groups = new ArrayList<>(); + while (child.moveToNext(TAG_URI_RELATIVE_FILTER_GROUP)) { + UriRelativeFilterGroup group = new UriRelativeFilterGroup(section.getInt(ATTR_ACTION)); + readUriRelativeFiltersFromXml(child, group); + groups.add(group); + } + return groups; + } + + private static void readUriRelativeFiltersFromXml( + @NonNull SettingsXml.ReadSection section, UriRelativeFilterGroup group) { + SettingsXml.ChildSection child = section.children(); + while (child.moveToNext(TAG_URI_RELATIVE_FILTER)) { + String filter = child.getString(ATTR_FILTER); + if (filter != null) { + group.addUriRelativeFilter(new UriRelativeFilter(child.getInt(ATTR_URI_PART), + child.getInt(ATTR_PATTERN_TYPE), filter)); + } + } } private static void readUserStates(@NonNull SettingsXml.ReadSection section, @@ -236,6 +285,7 @@ public class DomainVerificationPersistence { .attribute(ATTR_SIGNATURE, signature)) { writeStateMap(parentSection, pkgState.getStateMap()); writeUserStates(parentSection, userId, pkgState.getUserStates()); + writeUriRelativeFilterGroupMap(parentSection, pkgState.getUriRelativeFilterGroupMap()); } } @@ -334,6 +384,52 @@ public class DomainVerificationPersistence { } } + private static void writeUriRelativeFilterGroupMap( + @NonNull SettingsXml.WriteSection parentSection, + @NonNull ArrayMap<String, List<UriRelativeFilterGroup>> groupMap) throws IOException { + if (groupMap.isEmpty()) { + return; + } + try (SettingsXml.WriteSection section = + parentSection.startSection(TAG_URI_RELATIVE_FILTER_GROUPS)) { + for (int i = 0; i < groupMap.size(); i++) { + writeUriRelativeFilterGroups(section, groupMap.keyAt(i), groupMap.valueAt(i)); + } + } + } + + private static void writeUriRelativeFilterGroups( + @NonNull SettingsXml.WriteSection parentSection, @NonNull String domain, + @NonNull List<UriRelativeFilterGroup> groups) throws IOException { + if (groups.isEmpty()) { + return; + } + try (SettingsXml.WriteSection section = + parentSection.startSection(TAG_DOMAIN) + .attribute(ATTR_NAME, domain)) { + for (int i = 0; i < groups.size(); i++) { + writeUriRelativeFilterGroup(section, groups.get(i)); + } + } + } + + private static void writeUriRelativeFilterGroup( + @NonNull SettingsXml.WriteSection parentSection, + @NonNull UriRelativeFilterGroup group) throws IOException { + try (SettingsXml.WriteSection section = + parentSection.startSection(TAG_URI_RELATIVE_FILTER_GROUP) + .attribute(ATTR_ACTION, group.getAction())) { + Iterator<UriRelativeFilter> it = group.getUriRelativeFilters().iterator(); + while (it.hasNext()) { + UriRelativeFilter filter = it.next(); + section.startSection(TAG_URI_RELATIVE_FILTER) + .attribute(ATTR_URI_PART, filter.getUriPart()) + .attribute(ATTR_PATTERN_TYPE, filter.getPatternType()) + .attribute(ATTR_FILTER, filter.getFilter()).finish(); + } + } + } + public static class ReadResult { @NonNull diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java index c796b40f11bf..305b087190d6 100644 --- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java +++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java @@ -19,14 +19,19 @@ package com.android.server.pm.verify.domain; import static java.util.Collections.emptyList; import static java.util.Collections.emptySet; +import android.Manifest; import android.annotation.CheckResult; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.compat.annotation.ChangeId; import android.content.Context; import android.content.Intent; +import android.content.UriRelativeFilterGroup; +import android.content.UriRelativeFilterGroupParcel; +import android.content.pm.Flags; import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -38,6 +43,8 @@ import android.content.pm.verify.domain.DomainVerificationManager; import android.content.pm.verify.domain.DomainVerificationState; import android.content.pm.verify.domain.DomainVerificationUserState; import android.content.pm.verify.domain.IDomainVerificationManager; +import android.net.Uri; +import android.os.Bundle; import android.os.UserHandle; import android.util.ArrayMap; import android.util.ArraySet; @@ -223,6 +230,72 @@ public class DomainVerificationService extends SystemService mProxy = proxy; } + /** + * Update the URI relative filter groups for a package's verified domains. All previously + * existing groups will be cleared before the new groups will be applied. + */ + @RequiresPermission(Manifest.permission.DOMAIN_VERIFICATION_AGENT) + public void setUriRelativeFilterGroups(@NonNull String packageName, + @NonNull Bundle bundle) + throws NameNotFoundException { + getContext().enforceCallingOrSelfPermission( + android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, + "Caller " + mConnection.getCallingUid() + " does not hold " + + android.Manifest.permission.DOMAIN_VERIFICATION_AGENT); + if (bundle.isEmpty()) { + return; + } + synchronized (mLock) { + DomainVerificationPkgState pkgState = mAttachedPkgStates.get(packageName); + if (pkgState == null) { + throw DomainVerificationUtils.throwPackageUnavailable(packageName); + } + Map<String, List<UriRelativeFilterGroup>> domainToGroupsMap = + pkgState.getUriRelativeFilterGroupMap(); + for (String domain : bundle.keySet()) { + ArrayList<UriRelativeFilterGroupParcel> parcels = + bundle.getParcelableArrayList(domain, UriRelativeFilterGroupParcel.class); + domainToGroupsMap.put(domain, UriRelativeFilterGroup.parcelsToGroups(parcels)); + } + } + } + + /** + * Retrieve the current URI relative filter groups for a package's verified domain. + */ + @NonNull + public Bundle getUriRelativeFilterGroups(@NonNull String packageName, + @NonNull List<String> domains) { + Bundle bundle = new Bundle(); + synchronized (mLock) { + DomainVerificationPkgState pkgState = mAttachedPkgStates.get(packageName); + if (pkgState != null) { + Map<String, List<UriRelativeFilterGroup>> map = + pkgState.getUriRelativeFilterGroupMap(); + for (int i = 0; i < domains.size(); i++) { + List<UriRelativeFilterGroup> groups = map.get(domains.get(i)); + bundle.putParcelableList(domains.get(i), + UriRelativeFilterGroup.groupsToParcels(groups)); + } + } + } + return bundle; + } + + @NonNull + private List<UriRelativeFilterGroup> getUriRelativeFilterGroups(@NonNull String packageName, + @NonNull String domain) { + List<UriRelativeFilterGroup> groups = Collections.emptyList(); + synchronized (mLock) { + DomainVerificationPkgState pkgState = mAttachedPkgStates.get(packageName); + if (pkgState != null) { + groups = pkgState.getUriRelativeFilterGroupMap().getOrDefault(domain, + Collections.emptyList()); + } + } + return groups; + } + @NonNull public List<String> queryValidVerificationPackageNames() { mEnforcer.assertApprovedVerifier(mConnection.getCallingUid(), mProxy); @@ -891,6 +964,8 @@ public class DomainVerificationService extends SystemService } ArrayMap<String, Integer> oldStateMap = oldPkgState.getStateMap(); + ArrayMap<String, List<UriRelativeFilterGroup>> oldGroups = + oldPkgState.getUriRelativeFilterGroupMap(); ArraySet<String> newAutoVerifyDomains = mCollector.collectValidAutoVerifyDomains(newPkg); int newDomainsSize = newAutoVerifyDomains.size(); @@ -941,7 +1016,7 @@ public class DomainVerificationService extends SystemService mAttachedPkgStates.put(pkgName, newDomainSetId, new DomainVerificationPkgState( pkgName, newDomainSetId, hasAutoVerifyDomains, newStateMap, newUserStates, - null /* signature */)); + null /* signature */, oldGroups)); } if (sendBroadcast) { @@ -1572,8 +1647,6 @@ public class DomainVerificationService extends SystemService public Pair<List<ResolveInfo>, Integer> filterToApprovedApp(@NonNull Intent intent, @NonNull List<ResolveInfo> infos, @UserIdInt int userId, @NonNull Function<String, PackageStateInternal> pkgSettingFunction) { - String domain = intent.getData().getHost(); - // Collect valid infos ArrayMap<ResolveInfo, Integer> infoApprovals = new ArrayMap<>(); int infosSize = infos.size(); @@ -1586,7 +1659,7 @@ public class DomainVerificationService extends SystemService } // Find all approval levels - int highestApproval = fillMapWithApprovalLevels(infoApprovals, domain, userId, + int highestApproval = fillMapWithApprovalLevels(infoApprovals, intent.getData(), userId, pkgSettingFunction); if (highestApproval <= APPROVAL_LEVEL_NONE) { return Pair.create(emptyList(), highestApproval); @@ -1623,12 +1696,23 @@ public class DomainVerificationService extends SystemService return Pair.create(finalList, highestApproval); } + private boolean matchUriRelativeFilterGroups(Uri uri, String pkgName) { + if (uri.getHost() == null) { + return false; + } + List<UriRelativeFilterGroup> groups = getUriRelativeFilterGroups(pkgName, uri.getHost()); + if (groups.isEmpty()) { + return true; + } + return UriRelativeFilterGroup.matchGroupsToUri(groups, uri); + } + /** * @return highest approval level found */ @ApprovalLevel private int fillMapWithApprovalLevels(@NonNull ArrayMap<ResolveInfo, Integer> inputMap, - @NonNull String domain, @UserIdInt int userId, + @NonNull Uri uri, @UserIdInt int userId, @NonNull Function<String, PackageStateInternal> pkgSettingFunction) { int highestApproval = APPROVAL_LEVEL_NONE; int size = inputMap.size(); @@ -1641,12 +1725,13 @@ public class DomainVerificationService extends SystemService ResolveInfo info = inputMap.keyAt(index); final String packageName = info.getComponentInfo().packageName; PackageStateInternal pkgSetting = pkgSettingFunction.apply(packageName); - if (pkgSetting == null) { + if (pkgSetting == null || (Flags.relativeReferenceIntentFilters() + && !matchUriRelativeFilterGroups(uri, packageName))) { fillInfoMapForSamePackage(inputMap, packageName, APPROVAL_LEVEL_NONE); continue; } - int approval = approvalLevelForDomain(pkgSetting, domain, false, userId, DEBUG_APPROVAL, - domain); + int approval = approvalLevelForDomain(pkgSetting, uri.getHost(), false, userId, + DEBUG_APPROVAL, uri.getHost()); highestApproval = Math.max(highestApproval, approval); fillInfoMapForSamePackage(inputMap, packageName, approval); } diff --git a/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java index d71dbbb5d53b..46051fe3d782 100644 --- a/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java +++ b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java @@ -19,6 +19,7 @@ package com.android.server.pm.verify.domain.models; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.content.UriRelativeFilterGroup; import android.content.pm.Signature; import android.content.pm.verify.domain.DomainVerificationState; import android.util.ArrayMap; @@ -26,6 +27,7 @@ import android.util.SparseArray; import com.android.internal.util.DataClass; +import java.util.List; import java.util.Objects; import java.util.UUID; @@ -77,15 +79,30 @@ public class DomainVerificationPkgState { @Nullable private final String mBackupSignatureHash; + /** + * List of {@link UriRelativeFilterGroup} for filtering domains. + */ + @NonNull + private final ArrayMap<String, List<UriRelativeFilterGroup>> mUriRelativeFilterGroupMap; + public DomainVerificationPkgState(@NonNull String packageName, @NonNull UUID id, boolean hasAutoVerifyDomains) { - this(packageName, id, hasAutoVerifyDomains, new ArrayMap<>(0), new SparseArray<>(0), null); + this(packageName, id, hasAutoVerifyDomains, new ArrayMap<>(0), new SparseArray<>(0), null, + new ArrayMap<>()); } public DomainVerificationPkgState(@NonNull DomainVerificationPkgState pkgState, @NonNull UUID id, boolean hasAutoVerifyDomains) { this(pkgState.getPackageName(), id, hasAutoVerifyDomains, pkgState.getStateMap(), - pkgState.getUserStates(), null); + pkgState.getUserStates(), null, new ArrayMap<>()); + } + + public DomainVerificationPkgState(@NonNull String packageName, @NonNull UUID id, + boolean hasAutoVerifyDomains, @NonNull ArrayMap<String, Integer> stateMap, + @NonNull SparseArray<DomainVerificationInternalUserState> userStates, + @Nullable String backupSignatureHash) { + this(packageName, id, hasAutoVerifyDomains, stateMap, userStates, backupSignatureHash, + new ArrayMap<>()); } @Nullable @@ -158,6 +175,8 @@ public class DomainVerificationPkgState { * * It's assumed the domain verification agent will eventually re-verify this domain * and revoke if necessary. + * @param uriRelativeFilterGroupMap + * List of {@link UriRelativeFilterGroup} for filtering domains. */ @DataClass.Generated.Member public DomainVerificationPkgState( @@ -166,7 +185,8 @@ public class DomainVerificationPkgState { boolean hasAutoVerifyDomains, @NonNull ArrayMap<String,Integer> stateMap, @NonNull SparseArray<DomainVerificationInternalUserState> userStates, - @Nullable String backupSignatureHash) { + @Nullable String backupSignatureHash, + @NonNull ArrayMap<String,List<UriRelativeFilterGroup>> uriRelativeFilterGroupMap) { this.mPackageName = packageName; com.android.internal.util.AnnotationValidations.validate( NonNull.class, null, mPackageName); @@ -181,6 +201,9 @@ public class DomainVerificationPkgState { com.android.internal.util.AnnotationValidations.validate( NonNull.class, null, mUserStates); this.mBackupSignatureHash = backupSignatureHash; + this.mUriRelativeFilterGroupMap = uriRelativeFilterGroupMap; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mUriRelativeFilterGroupMap); // onConstructed(); // You can define this method to get a callback } @@ -239,6 +262,14 @@ public class DomainVerificationPkgState { return mBackupSignatureHash; } + /** + * List of {@link UriRelativeFilterGroup} for filtering domains. + */ + @DataClass.Generated.Member + public @NonNull ArrayMap<String,List<UriRelativeFilterGroup>> getUriRelativeFilterGroupMap() { + return mUriRelativeFilterGroupMap; + } + @Override @DataClass.Generated.Member public String toString() { @@ -251,7 +282,8 @@ public class DomainVerificationPkgState { "hasAutoVerifyDomains = " + mHasAutoVerifyDomains + ", " + "stateMap = " + mStateMap + ", " + "userStates = " + mUserStates + ", " + - "backupSignatureHash = " + mBackupSignatureHash + + "backupSignatureHash = " + mBackupSignatureHash + ", " + + "uriRelativeFilterGroupMap = " + mUriRelativeFilterGroupMap + " }"; } @@ -273,7 +305,8 @@ public class DomainVerificationPkgState { && mHasAutoVerifyDomains == that.mHasAutoVerifyDomains && Objects.equals(mStateMap, that.mStateMap) && userStatesEquals(that.mUserStates) - && Objects.equals(mBackupSignatureHash, that.mBackupSignatureHash); + && Objects.equals(mBackupSignatureHash, that.mBackupSignatureHash) + && Objects.equals(mUriRelativeFilterGroupMap, that.mUriRelativeFilterGroupMap); } @Override @@ -289,14 +322,15 @@ public class DomainVerificationPkgState { _hash = 31 * _hash + Objects.hashCode(mStateMap); _hash = 31 * _hash + userStatesHashCode(); _hash = 31 * _hash + Objects.hashCode(mBackupSignatureHash); + _hash = 31 * _hash + Objects.hashCode(mUriRelativeFilterGroupMap); return _hash; } @DataClass.Generated( - time = 1617315369614L, + time = 1707351734724L, codegenVersion = "1.0.23", sourceFile = "frameworks/base/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java", - inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate @android.annotation.NonNull java.util.UUID mId\nprivate final boolean mHasAutoVerifyDomains\nprivate final @android.annotation.NonNull android.util.ArrayMap<java.lang.String,java.lang.Integer> mStateMap\nprivate final @android.annotation.NonNull android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState> mUserStates\nprivate final @android.annotation.Nullable java.lang.String mBackupSignatureHash\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState getUserState(int)\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState getOrCreateUserState(int)\npublic void removeUser(int)\npublic void removeAllUsers()\nprivate int userStatesHashCode()\nprivate boolean userStatesEquals(android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState>)\nclass DomainVerificationPkgState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true)") + inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.util.UUID mId\nprivate final boolean mHasAutoVerifyDomains\nprivate final @android.annotation.NonNull android.util.ArrayMap<java.lang.String,java.lang.Integer> mStateMap\nprivate final @android.annotation.NonNull android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState> mUserStates\nprivate final @android.annotation.Nullable java.lang.String mBackupSignatureHash\nprivate final @android.annotation.NonNull android.util.ArrayMap<java.lang.String,java.util.List<android.content.UriRelativeFilterGroup>> mUriRelativeFilterGroupMap\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState getUserState(int)\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState getOrCreateUserState(int)\npublic void removeUser(int)\npublic void removeAllUsers()\nprivate int userStatesHashCode()\nprivate boolean userStatesEquals(android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationInternalUserState>)\nclass DomainVerificationPkgState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true)") @Deprecated private void __metadata() {} diff --git a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java index afcf5a094bd4..76952b30c1e9 100644 --- a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java +++ b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java @@ -29,6 +29,7 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.hardware.devicestate.DeviceState; import android.os.Environment; import android.os.PowerManager; import android.util.ArrayMap; @@ -40,7 +41,6 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; import com.android.server.LocalServices; -import com.android.server.devicestate.DeviceState; import com.android.server.devicestate.DeviceStateProvider; import com.android.server.input.InputManagerInternal; import com.android.server.policy.devicestate.config.Conditions; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 25e4116a4507..bc260184e487 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4057,15 +4057,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_SYSRQ: if (down && repeatCount == 0) { interceptScreenshotChord(SCREENSHOT_KEY_OTHER, 0 /*pressDelay*/); + return true; } - return true; + break; case KeyEvent.KEYCODE_ESCAPE: if (down && KeyEvent.metaStateHasNoModifiers(metaState) && repeatCount == 0) { mContext.closeSystemDialogs(); + return true; } - return true; + break; case KeyEvent.KEYCODE_STEM_PRIMARY: handleUnhandledSystemKey(event); sendSystemKeyToStatusBarAsync(event); diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java index 25e749f08782..af4da812d79e 100644 --- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java +++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java @@ -137,7 +137,6 @@ import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.XmlUtils; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; -import com.android.net.module.util.NetworkCapabilitiesUtils; import com.android.server.power.optimization.Flags; import com.android.server.power.stats.SystemServerCpuThreadReader.SystemServiceCpuThreadTimes; @@ -843,7 +842,7 @@ public class BatteryStatsImpl extends BatteryStats { private int mBatteryChargeUah; private int mBatteryHealth; private int mBatteryTemperature; - private int mBatteryVoltageMv = -1; + private int mBatteryVoltageMv; @NonNull private final BatteryStatsHistory mHistory; @@ -1716,14 +1715,101 @@ public class BatteryStatsImpl extends BatteryStats { return mMaxLearnedBatteryCapacityUah; } + public class FrameworkStatsLogger { + public void uidProcessStateChanged(int uid, int state) { + // TODO(b/155216561): It is possible for isolated uids to be in a higher + // state than its parent uid. We should track the highest state within the union of host + // and isolated uids rather than only the parent uid. + FrameworkStatsLog.write(FrameworkStatsLog.UID_PROCESS_STATE_CHANGED, uid, + ActivityManager.processStateAmToProto(state)); + } + + public void wakelockStateChanged(int uid, WorkChain wc, String name, int type, + int procState, boolean acquired) { + int event = acquired + ? FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE + : FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE; + if (wc != null) { + FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), + wc.getTags(), getPowerManagerWakeLockLevel(type), name, + event, procState); + } else { + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, + mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name, + event, procState); + } + } + + public void kernelWakeupReported(long deltaUptimeUs) { + FrameworkStatsLog.write(FrameworkStatsLog.KERNEL_WAKEUP_REPORTED, mLastWakeupReason, + /* duration_usec */ deltaUptimeUs, mLastWakeupElapsedTimeMs); + } + + public void gpsScanStateChanged(int uid, WorkChain workChain, boolean stateOn) { + int event = stateOn + ? FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON + : FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF; + if (workChain != null) { + FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, + workChain.getUids(), workChain.getTags(), event); + } else { + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, + uid, null, event); + } + } + + public void batterySaverModeChanged(boolean enabled) { + FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED, + enabled + ? FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON + : FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF); + } + + public void deviceIdlingModeStateChanged(int mode) { + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLING_MODE_STATE_CHANGED, mode); + } + + public void deviceIdleModeStateChanged(int mode) { + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mode); + } + + public void chargingStateChanged(int status) { + FrameworkStatsLog.write(FrameworkStatsLog.CHARGING_STATE_CHANGED, status); + } + + public void pluggedStateChanged(int plugType) { + FrameworkStatsLog.write(FrameworkStatsLog.PLUGGED_STATE_CHANGED, plugType); + } + + public void batteryLevelChanged(int level) { + FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_LEVEL_CHANGED, level); + } + + public void phoneServiceStateChanged(int state, int simState, int strengthBin) { + FrameworkStatsLog.write(FrameworkStatsLog.PHONE_SERVICE_STATE_CHANGED, state, + simState, strengthBin); + } + + public void phoneSignalStrengthChanged(int strengthBin) { + FrameworkStatsLog.write( + FrameworkStatsLog.PHONE_SIGNAL_STRENGTH_CHANGED, strengthBin); + } + } + + private final FrameworkStatsLogger mFrameworkStatsLogger; + @VisibleForTesting public BatteryStatsImpl(Clock clock, File historyDirectory, @NonNull Handler handler, - @NonNull PowerStatsUidResolver powerStatsUidResolver) { + @NonNull PowerStatsUidResolver powerStatsUidResolver, + @NonNull FrameworkStatsLogger frameworkStatsLogger, + @NonNull BatteryStatsHistory.TraceDelegate traceDelegate, + @NonNull BatteryStatsHistory.EventLogger eventLogger) { mClock = clock; initKernelStatsReaders(); mBatteryStatsConfig = new BatteryStatsConfig.Builder().build(); mHandler = handler; mPowerStatsUidResolver = powerStatsUidResolver; + mFrameworkStatsLogger = frameworkStatsLogger; mConstants = new Constants(mHandler); mStartClockTimeMs = clock.currentTimeMillis(); mDailyFile = null; @@ -1732,12 +1818,14 @@ public class BatteryStatsImpl extends BatteryStats { mCheckinFile = null; mStatsFile = null; mHistory = new BatteryStatsHistory(mConstants.MAX_HISTORY_FILES, - mConstants.MAX_HISTORY_BUFFER, mStepDetailsCalculator, mClock, mMonotonicClock); + mConstants.MAX_HISTORY_BUFFER, mStepDetailsCalculator, mClock, mMonotonicClock, + traceDelegate, eventLogger); } else { mCheckinFile = new AtomicFile(new File(historyDirectory, "batterystats-checkin.bin")); mStatsFile = new AtomicFile(new File(historyDirectory, "batterystats.bin")); mHistory = new BatteryStatsHistory(historyDirectory, mConstants.MAX_HISTORY_FILES, - mConstants.MAX_HISTORY_BUFFER, mStepDetailsCalculator, mClock, mMonotonicClock); + mConstants.MAX_HISTORY_BUFFER, mStepDetailsCalculator, mClock, mMonotonicClock, + traceDelegate, eventLogger); } mPlatformIdleStateCallback = null; mEnergyConsumerRetriever = null; @@ -4269,7 +4357,7 @@ public class BatteryStatsImpl extends BatteryStats { } @GuardedBy("this") - private void updateBatteryPropertiesLocked() { + protected void updateBatteryPropertiesLocked() { try { IBatteryPropertiesRegistrar registrar = IBatteryPropertiesRegistrar.Stub.asInterface( ServiceManager.getService("batteryproperties")); @@ -4403,11 +4491,7 @@ public class BatteryStatsImpl extends BatteryStats { return; } } - // TODO(b/155216561): It is possible for isolated uids to be in a higher - // state than its parent uid. We should track the highest state within the union of host - // and isolated uids rather than only the parent uid. - FrameworkStatsLog.write(FrameworkStatsLog.UID_PROCESS_STATE_CHANGED, uid, - ActivityManager.processStateAmToProto(state)); + mFrameworkStatsLogger.uidProcessStateChanged(uid, state); getUidStatsLocked(parentUid, elapsedRealtimeMs, uptimeMs) .updateUidProcessStateLocked(state, elapsedRealtimeMs, uptimeMs); } @@ -4721,17 +4805,8 @@ public class BatteryStatsImpl extends BatteryStats { Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs); uidStats.noteStartWakeLocked(pid, name, type, elapsedRealtimeMs); - int procState = uidStats.mProcessState; - - if (wc != null) { - FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), - wc.getTags(), getPowerManagerWakeLockLevel(type), name, - FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE, procState); - } else { - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, - mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name, - FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE, procState); - } + mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, type, + uidStats.mProcessState, true /* acquired */); } } @@ -4774,16 +4849,8 @@ public class BatteryStatsImpl extends BatteryStats { Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs); uidStats.noteStopWakeLocked(pid, name, type, elapsedRealtimeMs); - int procState = uidStats.mProcessState; - if (wc != null) { - FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), - wc.getTags(), getPowerManagerWakeLockLevel(type), name, - FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState); - } else { - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, - mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name, - FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState); - } + mFrameworkStatsLogger.wakelockStateChanged(mapIsolatedUid(uid), wc, name, type, + uidStats.mProcessState, false /* acquired */); if (mappedUid != uid) { // Decrement the ref count for the isolated uid and delete the mapping if uneeded. @@ -5020,8 +5087,7 @@ public class BatteryStatsImpl extends BatteryStats { long deltaUptimeMs = uptimeMs - mLastWakeupUptimeMs; SamplingTimer timer = getWakeupReasonTimerLocked(mLastWakeupReason); timer.add(deltaUptimeMs * 1000, 1, elapsedRealtimeMs); // time in in microseconds - FrameworkStatsLog.write(FrameworkStatsLog.KERNEL_WAKEUP_REPORTED, mLastWakeupReason, - /* duration_usec */ deltaUptimeMs * 1000, mLastWakeupElapsedTimeMs); + mFrameworkStatsLogger.kernelWakeupReported(deltaUptimeMs * 1000); mLastWakeupReason = null; } } @@ -5159,14 +5225,7 @@ public class BatteryStatsImpl extends BatteryStats { } mGpsNesting++; - if (workChain == null) { - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, - mapIsolatedUid(uid), null, FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); - } else { - FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, - workChain.getUids(), workChain.getTags(), - FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); - } + mFrameworkStatsLogger.gpsScanStateChanged(mapIsolatedUid(uid), workChain, /* on */true); getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs).noteStartGps(elapsedRealtimeMs); } @@ -5188,14 +5247,7 @@ public class BatteryStatsImpl extends BatteryStats { mGpsSignalQualityBin = -1; } - if (workChain == null) { - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, - mapIsolatedUid(uid), null, - FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); - } else { - FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, workChain.getUids(), - workChain.getTags(), FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); - } + mFrameworkStatsLogger.gpsScanStateChanged(mapIsolatedUid(uid), workChain, /* on */ false); getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs).noteStopGps(elapsedRealtimeMs); } @@ -5673,10 +5725,7 @@ public class BatteryStatsImpl extends BatteryStats { } else { // Log an initial value for BATTERY_SAVER_MODE_STATE_CHANGED in order to // allow the atom to read all future state changes. - FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED, - enabled - ? FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON - : FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF); + mFrameworkStatsLogger.batterySaverModeChanged(enabled); } } @@ -5696,10 +5745,7 @@ public class BatteryStatsImpl extends BatteryStats { HistoryItem.STATE2_POWER_SAVE_FLAG); mPowerSaveModeEnabledTimer.stopRunningLocked(elapsedRealtimeMs); } - FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED, - enabled - ? FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON - : FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF); + mFrameworkStatsLogger.batterySaverModeChanged(enabled); } } @@ -5727,7 +5773,7 @@ public class BatteryStatsImpl extends BatteryStats { if (nowIdling) statsmode = DEVICE_IDLE_MODE_DEEP; else if (nowLightIdling) statsmode = DEVICE_IDLE_MODE_LIGHT; else statsmode = DEVICE_IDLE_MODE_OFF; - FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLING_MODE_STATE_CHANGED, statsmode); + mFrameworkStatsLogger.deviceIdlingModeStateChanged(statsmode); } if (mDeviceIdling != nowIdling) { mDeviceIdling = nowIdling; @@ -5769,7 +5815,7 @@ public class BatteryStatsImpl extends BatteryStats { mDeviceIdleModeFullTimer.startRunningLocked(elapsedRealtimeMs); } mDeviceIdleMode = mode; - FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mode); + mFrameworkStatsLogger.deviceIdleModeStateChanged(mode); } } @@ -5933,8 +5979,7 @@ public class BatteryStatsImpl extends BatteryStats { addStateFlag = HistoryItem.STATE_PHONE_SCANNING_FLAG; newHistory = true; mPhoneSignalScanningTimer.startRunningLocked(elapsedRealtimeMs); - FrameworkStatsLog.write(FrameworkStatsLog.PHONE_SERVICE_STATE_CHANGED, state, - simState, strengthBin); + mFrameworkStatsLogger.phoneServiceStateChanged(state, simState, strengthBin); } } @@ -5944,8 +5989,7 @@ public class BatteryStatsImpl extends BatteryStats { removeStateFlag = HistoryItem.STATE_PHONE_SCANNING_FLAG; newHistory = true; mPhoneSignalScanningTimer.stopRunningLocked(elapsedRealtimeMs); - FrameworkStatsLog.write(FrameworkStatsLog.PHONE_SERVICE_STATE_CHANGED, state, - simState, strengthBin); + mFrameworkStatsLogger.phoneServiceStateChanged(state, simState, strengthBin); } } @@ -5966,8 +6010,7 @@ public class BatteryStatsImpl extends BatteryStats { } newSignalStrength = strengthBin; newHistory = true; - FrameworkStatsLog.write( - FrameworkStatsLog.PHONE_SIGNAL_STRENGTH_CHANGED, strengthBin); + mFrameworkStatsLogger.phoneSignalStrengthChanged(strengthBin); } else { stopAllPhoneSignalStrengthTimersLocked(-1, elapsedRealtimeMs); } @@ -6076,7 +6119,7 @@ public class BatteryStatsImpl extends BatteryStats { // Unknown is included in DATA_CONNECTION_OTHER. int bin = DATA_CONNECTION_OUT_OF_SERVICE; if (hasData) { - if (dataType > 0 && dataType <= TelephonyManager.getAllNetworkTypes().length) { + if (dataType > 0 && dataType <= NUM_ALL_NETWORK_TYPES) { bin = dataType; } else { switch (serviceType) { @@ -6995,7 +7038,7 @@ public class BatteryStatsImpl extends BatteryStats { /** @hide */ public void noteNetworkInterfaceForTransports(String iface, int[] transportTypes) { if (TextUtils.isEmpty(iface)) return; - final int displayTransport = NetworkCapabilitiesUtils.getDisplayTransport(transportTypes); + final int displayTransport = getDisplayTransport(transportTypes); synchronized (mModemNetworkLock) { if (displayTransport == TRANSPORT_CELLULAR) { @@ -10507,8 +10550,7 @@ public class BatteryStatsImpl extends BatteryStats { long elapsedRealtimeMs, long uptimeMs) { int uidRunningState; // Make special note of Foreground Services - final boolean userAwareService = - (ActivityManager.isForegroundService(procState)); + final boolean userAwareService = ActivityManager.isForegroundService(procState); uidRunningState = BatteryStats.mapToInternalProcessState(procState); if (mProcessState == uidRunningState && userAwareService == mInForegroundService) { @@ -10912,6 +10954,7 @@ public class BatteryStatsImpl extends BatteryStats { mPowerProfile = powerProfile; mCpuScalingPolicies = cpuScalingPolicies; mPowerStatsUidResolver = powerStatsUidResolver; + mFrameworkStatsLogger = new FrameworkStatsLogger(); initPowerProfile(); @@ -10966,7 +11009,7 @@ public class BatteryStatsImpl extends BatteryStats { // Notify statsd that the system is initially not in doze. mDeviceIdleMode = DEVICE_IDLE_MODE_OFF; - FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mDeviceIdleMode); + mFrameworkStatsLogger.deviceIdleModeStateChanged(mDeviceIdleMode); } private void recordPowerStats(PowerStats stats) { @@ -11702,7 +11745,9 @@ public class BatteryStatsImpl extends BatteryStats { mWakeupReasonStats.clear(); } - mTmpRailStats.reset(); + if (mTmpRailStats != null) { + mTmpRailStats.reset(); + } EnergyConsumerStats.resetIfNotNull(mGlobalEnergyConsumerStats); @@ -11864,6 +11909,78 @@ public class BatteryStatsImpl extends BatteryStats { return networkStatsManager.getWifiUidStats(); } + private static class NetworkStatsDelta { + int mUid; + int mSet; + long mRxBytes; + long mRxPackets; + long mTxBytes; + long mTxPackets; + + public int getUid() { + return mUid; + } + + + public int getSet() { + return mSet; + } + + public long getRxBytes() { + return mRxBytes; + } + + public long getRxPackets() { + return mRxPackets; + } + + public long getTxBytes() { + return mTxBytes; + } + + public long getTxPackets() { + return mTxPackets; + } + } + + private List<NetworkStatsDelta> computeDelta(NetworkStats currentStats, + NetworkStats lastStats) { + List<NetworkStatsDelta> deltaList = new ArrayList<>(); + for (NetworkStats.Entry entry : currentStats) { + NetworkStatsDelta delta = new NetworkStatsDelta(); + delta.mUid = entry.getUid(); + delta.mSet = entry.getSet(); + NetworkStats.Entry lastEntry = null; + if (lastStats != null) { + for (NetworkStats.Entry e : lastStats) { + if (e.getUid() == entry.getUid() && e.getSet() == entry.getSet() + && e.getTag() == entry.getTag() + && e.getMetered() == entry.getMetered() + && e.getRoaming() == entry.getRoaming() + && e.getDefaultNetwork() == entry.getDefaultNetwork() + /*&& Objects.equals(e.getIface(), entry.getIface())*/) { + lastEntry = e; + break; + } + } + } + if (lastEntry != null) { + delta.mRxBytes = entry.getRxBytes() - lastEntry.getRxBytes(); + delta.mRxPackets = entry.getRxPackets() - lastEntry.getRxPackets(); + delta.mTxBytes = entry.getTxBytes() - lastEntry.getTxBytes(); + delta.mTxPackets = entry.getTxPackets() - lastEntry.getTxPackets(); + } else { + delta.mRxBytes = entry.getRxBytes(); + delta.mRxPackets = entry.getRxPackets(); + delta.mTxBytes = entry.getTxBytes(); + delta.mTxPackets = entry.getTxPackets(); + } + deltaList.add(delta); + } + + return deltaList; + } + /** * Distribute WiFi energy info and network traffic to apps. * @param info The energy information from the WiFi controller. @@ -11879,14 +11996,14 @@ public class BatteryStatsImpl extends BatteryStats { } // Grab a separate lock to acquire the network stats, which may do I/O. - NetworkStats delta = null; + List<NetworkStatsDelta> delta; synchronized (mWifiNetworkLock) { final NetworkStats latestStats = readWifiNetworkStatsLocked(networkStatsManager); if (latestStats != null) { - delta = mLastWifiNetworkStats != null - ? latestStats.subtract(mLastWifiNetworkStats) - : latestStats.subtract(new NetworkStats(0, -1)); + delta = computeDelta(latestStats, mLastWifiNetworkStats); mLastWifiNetworkStats = latestStats; + } else { + delta = null; } } @@ -11914,7 +12031,7 @@ public class BatteryStatsImpl extends BatteryStats { long totalTxPackets = 0; long totalRxPackets = 0; if (delta != null) { - for (NetworkStats.Entry entry : delta) { + for (NetworkStatsDelta entry : delta) { if (DEBUG_ENERGY) { Slog.d(TAG, "Wifi uid " + entry.getUid() + ": delta rx=" + entry.getRxBytes() @@ -12199,13 +12316,16 @@ public class BatteryStatsImpl extends BatteryStats { } // Converting uWs to mAms. // Conversion: (uWs * (1000ms / 1s) * (1mW / 1000uW)) / mV = mAms - long monitoredRailChargeConsumedMaMs = - (long) (mTmpRailStats.getWifiTotalEnergyUseduWs() / opVolt); + long monitoredRailChargeConsumedMaMs = mTmpRailStats != null + ? (long) (mTmpRailStats.getWifiTotalEnergyUseduWs() / opVolt) + : 0L; mWifiActivity.getMonitoredRailChargeConsumedMaMs().addCountLocked( monitoredRailChargeConsumedMaMs); mHistory.recordWifiConsumedCharge(elapsedRealtimeMs, uptimeMs, (monitoredRailChargeConsumedMaMs / MILLISECONDS_IN_HOUR)); - mTmpRailStats.resetWifiTotalEnergyUsed(); + if (mTmpRailStats != null) { + mTmpRailStats.resetWifiTotalEnergyUsed(); + } if (uidEstimatedConsumptionMah != null) { totalEstimatedConsumptionMah = Math.max(controllerMaMs / MILLISECONDS_IN_HOUR, @@ -13519,14 +13639,16 @@ public class BatteryStatsImpl extends BatteryStats { } } - // Record whether we've seen a non-zero time (for debugging b/22716723). - if (wakelockStats.isEmpty()) { - Slog.wtf(TAG, "All kernel wakelocks had time of zero"); - } + if (DEBUG) { + // Record whether we've seen a non-zero time (for debugging b/22716723). + if (wakelockStats.isEmpty()) { + Slog.wtf(TAG, "All kernel wakelocks had time of zero"); + } - if (numWakelocksSetStale == mKernelWakelockStats.size()) { - Slog.wtf(TAG, "All kernel wakelocks were set stale. new version=" + - wakelockStats.kernelWakelockVersion); + if (numWakelocksSetStale == mKernelWakelockStats.size()) { + Slog.wtf(TAG, "All kernel wakelocks were set stale. new version=" + + wakelockStats.kernelWakelockVersion); + } } } @@ -14711,13 +14833,13 @@ public class BatteryStatsImpl extends BatteryStats { // Inform StatsLog of setBatteryState changes. private void reportChangesToStatsLog(final int status, final int plugType, final int level) { if (!mHaveBatteryLevel || mBatteryStatus != status) { - FrameworkStatsLog.write(FrameworkStatsLog.CHARGING_STATE_CHANGED, status); + mFrameworkStatsLogger.chargingStateChanged(status); } if (!mHaveBatteryLevel || mBatteryPlugType != plugType) { - FrameworkStatsLog.write(FrameworkStatsLog.PLUGGED_STATE_CHANGED, plugType); + mFrameworkStatsLogger.pluggedStateChanged(plugType); } if (!mHaveBatteryLevel || mBatteryLevel != level) { - FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_LEVEL_CHANGED, level); + mFrameworkStatsLogger.batteryLevelChanged(level); } } diff --git a/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java b/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java index aba8e5fa9507..1050e8a371e8 100644 --- a/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java +++ b/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java @@ -32,6 +32,7 @@ import com.android.internal.power.ModemPowerProfile; import java.util.ArrayList; +@android.ravenwood.annotation.RavenwoodKeepWholeClass public class MobileRadioPowerCalculator extends PowerCalculator { private static final String TAG = "MobRadioPowerCalculator"; private static final boolean DEBUG = PowerCalculator.DEBUG; @@ -320,7 +321,7 @@ public class MobileRadioPowerCalculator extends PowerCalculator { private double calculateActiveModemPowerMah(BatteryStats bs, long elapsedRealtimeUs) { final long elapsedRealtimeMs = elapsedRealtimeUs / 1000; - final int txLvlCount = CellSignalStrength.getNumSignalStrengthLevels(); + final int txLvlCount = NUM_SIGNAL_STRENGTH_LEVELS; double consumptionMah = 0.0; if (DEBUG) { diff --git a/services/core/java/com/android/server/security/KeyAttestationApplicationIdProviderService.java b/services/core/java/com/android/server/security/KeyAttestationApplicationIdProviderService.java index d5bc91278aa8..b69ccb348fa7 100644 --- a/services/core/java/com/android/server/security/KeyAttestationApplicationIdProviderService.java +++ b/services/core/java/com/android/server/security/KeyAttestationApplicationIdProviderService.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package com.android.server.security; import android.content.Context; @@ -23,6 +22,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Binder; import android.os.RemoteException; +import android.os.ServiceSpecificException; import android.os.UserHandle; import android.security.keystore.IKeyAttestationApplicationIdProvider; import android.security.keystore.KeyAttestationApplicationId; @@ -57,7 +57,10 @@ public class KeyAttestationApplicationIdProviderService try { String[] packageNames = mPackageManager.getPackagesForUid(uid); if (packageNames == null) { - throw new RemoteException("No packages for uid"); + throw new ServiceSpecificException( + IKeyAttestationApplicationIdProvider + .ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED, + "No package for uid: " + uid); } int userId = UserHandle.getUserId(uid); keyAttestationPackageInfos = new KeyAttestationPackageInfo[packageNames.length]; diff --git a/services/core/java/com/android/server/selinux/OWNERS b/services/core/java/com/android/server/selinux/OWNERS new file mode 100644 index 000000000000..6ca4da2fd740 --- /dev/null +++ b/services/core/java/com/android/server/selinux/OWNERS @@ -0,0 +1,3 @@ +# Bug component: 1117393 + +sandrom@google.com diff --git a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java index 0de73a5a30f6..b0dcf95b3f5d 100644 --- a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java +++ b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java @@ -30,7 +30,9 @@ import android.util.StatsEvent; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.FrameworkStatsLog; +import com.android.server.selinux.RateLimiter; +import java.time.Duration; import java.util.List; import java.util.Map; @@ -131,19 +133,36 @@ class AggregatedMobileDataStatsPuller { private final Handler mMobileDataStatsHandler; + private final RateLimiter mRateLimiter; + AggregatedMobileDataStatsPuller(NetworkStatsManager networkStatsManager) { + if (DEBUG) { + if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) { + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, + TAG + "-AggregatedMobileDataStatsPullerInit"); + } + } + + mRateLimiter = new RateLimiter(/* window= */ Duration.ofSeconds(1)); + mUidStats = new ArrayMap<>(); mUidPreviousState = new SparseIntArray(); mNetworkStatsManager = networkStatsManager; - if (mNetworkStatsManager != null) { - updateNetworkStats(mNetworkStatsManager); - } - HandlerThread mMobileDataStatsHandlerThread = new HandlerThread("MobileDataStatsHandler"); mMobileDataStatsHandlerThread.start(); mMobileDataStatsHandler = new Handler(mMobileDataStatsHandlerThread.getLooper()); + + if (mNetworkStatsManager != null) { + mMobileDataStatsHandler.post( + () -> { + updateNetworkStats(mNetworkStatsManager); + }); + } + if (DEBUG) { + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); + } } public void noteUidProcessState(int uid, int state, long unusedElapsedRealtime, @@ -180,18 +199,20 @@ class AggregatedMobileDataStatsPuller { } private void noteUidProcessStateImpl(int uid, int state) { - // noteUidProcessStateLocked can be called back to back several times while - // the updateNetworkStatsLocked loops over several stats for multiple uids - // and during the first call in a batch of proc state change event it can - // contain info for uid with unknown previous state yet which can happen due to a few - // reasons: - // - app was just started - // - app was started before the ActivityManagerService - // as result stats would be created with state == ActivityManager.PROCESS_STATE_UNKNOWN - if (mNetworkStatsManager != null) { - updateNetworkStats(mNetworkStatsManager); - } else { - Slog.w(TAG, "noteUidProcessStateLocked() can not get mNetworkStatsManager"); + if (mRateLimiter.tryAcquire()) { + // noteUidProcessStateImpl can be called back to back several times while + // the updateNetworkStats loops over several stats for multiple uids + // and during the first call in a batch of proc state change event it can + // contain info for uid with unknown previous state yet which can happen due to a few + // reasons: + // - app was just started + // - app was started before the ActivityManagerService + // as result stats would be created with state == ActivityManager.PROCESS_STATE_UNKNOWN + if (mNetworkStatsManager != null) { + updateNetworkStats(mNetworkStatsManager); + } else { + Slog.w(TAG, "noteUidProcessStateLocked() can not get mNetworkStatsManager"); + } } mUidPreviousState.put(uid, state); } diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java index f4fb1a108663..1bc635bd9ca3 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java @@ -17,6 +17,7 @@ package com.android.server.webkit; import android.annotation.Nullable; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; @@ -31,8 +32,12 @@ import android.webkit.WebViewFactory; import android.webkit.WebViewProviderInfo; import android.webkit.WebViewProviderResponse; +import com.android.server.LocalServices; +import com.android.server.PinnerService; + import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -83,6 +88,8 @@ class WebViewUpdateServiceImpl2 implements WebViewUpdateServiceInterface { private static final int VALIDITY_INCORRECT_SIGNATURE = 3; private static final int VALIDITY_NO_LIBRARY_FLAG = 4; + private static final String PIN_GROUP = "webview"; + private final SystemInterface mSystemInterface; private final Context mContext; @@ -349,6 +356,39 @@ class WebViewUpdateServiceImpl2 implements WebViewUpdateServiceInterface { return newPackage; } + private void pinWebviewIfRequired(ApplicationInfo appInfo) { + PinnerService pinnerService = LocalServices.getService(PinnerService.class); + if (pinnerService == null) { + // This happens in unit tests which do not have services. + return; + } + int webviewPinQuota = pinnerService.getWebviewPinQuota(); + if (webviewPinQuota <= 0) { + return; + } + + pinnerService.unpinGroup(PIN_GROUP); + + ArrayList<String> apksToPin = new ArrayList<>(); + boolean pinSharedFirst = appInfo.metaData.getBoolean("PIN_SHARED_LIBS_FIRST", true); + for (String sharedLib : appInfo.sharedLibraryFiles) { + apksToPin.add(sharedLib); + } + apksToPin.add(appInfo.sourceDir); + if (!pinSharedFirst) { + // We want to prioritize pinning of the native library that is most likely used by apps + // which in some build flavors live in the main apk and as a shared library for others. + Collections.reverse(apksToPin); + } + for (String apk : apksToPin) { + if (webviewPinQuota <= 0) { + break; + } + int bytesPinned = pinnerService.pinFile(apk, webviewPinQuota, appInfo, PIN_GROUP); + webviewPinQuota -= bytesPinned; + } + } + /** * This is called when we change WebView provider, either when the current provider is * updated or a new provider is chosen / takes precedence. @@ -357,6 +397,7 @@ class WebViewUpdateServiceImpl2 implements WebViewUpdateServiceInterface { synchronized (mLock) { mAnyWebViewInstalled = true; if (mNumRelroCreationsStarted == mNumRelroCreationsFinished) { + pinWebviewIfRequired(newPackage.applicationInfo); mCurrentWebViewPackage = newPackage; // The relro creations might 'finish' (not start at all) before diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 640c9dc21a53..dcc68a7e3190 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3522,10 +3522,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (displayContent == null) { return false; } - hasRestrictedWindow = displayContent.forAllWindows(windowState -> { - return windowState.isOnScreen() && UserManager.isUserTypePrivateProfile( - getUserManager().getProfileType(windowState.mShowUserId)); - }, true /* traverseTopToBottom */); + final long callingIdentity = Binder.clearCallingIdentity(); + try { + hasRestrictedWindow = displayContent.forAllWindows(windowState -> { + return windowState.isOnScreen() && UserManager.isUserTypePrivateProfile( + getUserManager().getProfileType(windowState.mShowUserId)); + }, true /* traverseTopToBottom */); + } finally { + Binder.restoreCallingIdentity(callingIdentity); + } } return DevicePolicyCache.getInstance().isScreenCaptureAllowed(userId) && !hasRestrictedWindow; diff --git a/services/core/java/com/android/server/wm/DragDropController.java b/services/core/java/com/android/server/wm/DragDropController.java index 6a3cf43438fd..a3e28693cb21 100644 --- a/services/core/java/com/android/server/wm/DragDropController.java +++ b/services/core/java/com/android/server/wm/DragDropController.java @@ -16,6 +16,9 @@ package com.android.server.wm; +import static android.view.View.DRAG_FLAG_GLOBAL; +import static android.view.View.DRAG_FLAG_GLOBAL_SAME_APPLICATION; + import static com.android.input.flags.Flags.enablePointerChoreographer; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DRAG; import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS; @@ -30,15 +33,20 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.RemoteException; import android.util.Slog; import android.view.Display; +import android.view.DragEvent; import android.view.IWindow; import android.view.InputDevice; import android.view.PointerIcon; import android.view.SurfaceControl; import android.view.View; import android.view.accessibility.AccessibilityManager; +import android.window.IUnhandledDragCallback; +import android.window.IUnhandledDragListener; +import com.android.internal.annotations.VisibleForTesting; import com.android.server.wm.WindowManagerInternal.IDragDropCallback; import java.util.Objects; @@ -59,6 +67,7 @@ class DragDropController { static final int MSG_TEAR_DOWN_DRAG_AND_DROP_INPUT = 1; static final int MSG_ANIMATION_END = 2; static final int MSG_REMOVE_DRAG_SURFACE_TIMEOUT = 3; + static final int MSG_UNHANDLED_DROP_LISTENER_TIMEOUT = 4; /** * Drag state per operation. @@ -72,6 +81,21 @@ class DragDropController { private WindowManagerService mService; private final Handler mHandler; + // The unhandled drag listener for handling cross-window drags that end with no target window + private IUnhandledDragListener mUnhandledDragListener; + private final IBinder.DeathRecipient mUnhandledDragListenerDeathRecipient = + new IBinder.DeathRecipient() { + @Override + public void binderDied() { + synchronized (mService.mGlobalLock) { + if (hasPendingUnhandledDropCallback()) { + onUnhandledDropCallback(false /* consumedByListeners */); + } + setUnhandledDragListener(null); + } + } + }; + /** * Callback which is used to sync drag state with the vendor-specific code. */ @@ -83,10 +107,16 @@ class DragDropController { mHandler = new DragHandler(service, looper); } + @VisibleForTesting + Handler getHandler() { + return mHandler; + } + boolean dragDropActiveLocked() { return mDragState != null && !mDragState.isClosing(); } + @VisibleForTesting boolean dragSurfaceRelinquishedToDropTarget() { return mDragState != null && mDragState.mRelinquishDragSurfaceToDropTarget; } @@ -96,6 +126,32 @@ class DragDropController { mCallback.set(callback); } + /** + * Sets the listener for unhandled cross-window drags. + */ + public void setUnhandledDragListener(IUnhandledDragListener listener) { + if (mUnhandledDragListener != null && mUnhandledDragListener.asBinder() != null) { + mUnhandledDragListener.asBinder().unlinkToDeath( + mUnhandledDragListenerDeathRecipient, 0); + } + mUnhandledDragListener = listener; + if (listener != null && listener.asBinder() != null) { + try { + mUnhandledDragListener.asBinder().linkToDeath( + mUnhandledDragListenerDeathRecipient, 0); + } catch (RemoteException e) { + mUnhandledDragListener = null; + } + } + } + + /** + * Returns whether there is an unhandled drag listener set. + */ + boolean hasUnhandledDragListener() { + return mUnhandledDragListener != null; + } + void sendDragStartedIfNeededLocked(WindowState window) { mDragState.sendDragStartedIfNeededLocked(window); } @@ -247,6 +303,10 @@ class DragDropController { } } + /** + * This is called from the drop target window that received ACTION_DROP + * (see DragState#reportDropWindowLock()). + */ void reportDropResult(IWindow window, boolean consumed) { IBinder token = window.asBinder(); if (DEBUG_DRAG) { @@ -273,22 +333,89 @@ class DragDropController { // so be sure to halt the timeout even if the later WindowState // lookup fails. mHandler.removeMessages(MSG_DRAG_END_TIMEOUT, window.asBinder()); + WindowState callingWin = mService.windowForClientLocked(null, window, false); if (callingWin == null) { Slog.w(TAG_WM, "Bad result-reporting window " + window); return; // !!! TODO: throw here? } - mDragState.mDragResult = consumed; - mDragState.mRelinquishDragSurfaceToDropTarget = consumed - && mDragState.targetInterceptsGlobalDrag(callingWin); - mDragState.endDragLocked(); + // If the drop was not consumed by the target window, then check if it should be + // consumed by the system unhandled drag listener + if (!consumed && notifyUnhandledDrop(mDragState.mUnhandledDropEvent, + "window-drop")) { + // If the unhandled drag listener is notified, then defer ending the drag until + // the listener calls back + return; + } + + final boolean relinquishDragSurfaceToDropTarget = + consumed && mDragState.targetInterceptsGlobalDrag(callingWin); + mDragState.endDragLocked(consumed, relinquishDragSurfaceToDropTarget); } } finally { mCallback.get().postReportDropResult(); } } + /** + * Notifies the unhandled drag listener if needed. + * @return whether the listener was notified and subsequent drag completion should be deferred + * until the listener calls back + */ + boolean notifyUnhandledDrop(DragEvent dropEvent, String reason) { + final boolean isLocalDrag = + (mDragState.mFlags & (DRAG_FLAG_GLOBAL_SAME_APPLICATION | DRAG_FLAG_GLOBAL)) == 0; + if (!com.android.window.flags.Flags.delegateUnhandledDrags() + || mUnhandledDragListener == null + || isLocalDrag) { + // Skip if the flag is disabled, there is no unhandled-drag listener, or if this is a + // purely local drag + if (DEBUG_DRAG) Slog.d(TAG_WM, "Skipping unhandled listener " + + "(listener=" + mUnhandledDragListener + ", flags=" + mDragState.mFlags + ")"); + return false; + } + if (DEBUG_DRAG) Slog.d(TAG_WM, "Sending DROP to unhandled listener (" + reason + ")"); + try { + // Schedule timeout for the unhandled drag listener to call back + sendTimeoutMessage(MSG_UNHANDLED_DROP_LISTENER_TIMEOUT, null, DRAG_TIMEOUT_MS); + mUnhandledDragListener.onUnhandledDrop(dropEvent, new IUnhandledDragCallback.Stub() { + @Override + public void notifyUnhandledDropComplete(boolean consumedByListener) { + if (DEBUG_DRAG) Slog.d(TAG_WM, "Unhandled listener finished handling DROP"); + synchronized (mService.mGlobalLock) { + onUnhandledDropCallback(consumedByListener); + } + } + }); + return true; + } catch (RemoteException e) { + Slog.e(TAG_WM, "Failed to call unhandled drag listener", e); + return false; + } + } + + /** + * Called when the unhandled drag listener has completed handling the drop + * (if it was notififed). + */ + @VisibleForTesting + void onUnhandledDropCallback(boolean consumedByListener) { + mHandler.removeMessages(MSG_UNHANDLED_DROP_LISTENER_TIMEOUT, null); + // If handled, then the listeners assume responsibility of cleaning up the drag surface + mDragState.mDragResult = consumedByListener; + mDragState.mRelinquishDragSurfaceToDropTarget = consumedByListener; + mDragState.closeLocked(); + } + + /** + * Returns whether we are currently waiting for the unhandled drag listener to callback after + * it was notified of an unhandled drag. + */ + boolean hasPendingUnhandledDropCallback() { + return mHandler.hasMessages(MSG_UNHANDLED_DROP_LISTENER_TIMEOUT); + } + void cancelDragAndDrop(IBinder dragToken, boolean skipAnimation) { if (DEBUG_DRAG) { Slog.d(TAG_WM, "cancelDragAndDrop"); @@ -436,8 +563,8 @@ class DragDropController { synchronized (mService.mGlobalLock) { // !!! TODO: ANR the drag-receiving app if (mDragState != null) { - mDragState.mDragResult = false; - mDragState.endDragLocked(); + mDragState.endDragLocked(false /* consumed */, + false /* relinquishDragSurfaceToDropTarget */); } } break; @@ -473,6 +600,13 @@ class DragDropController { } break; } + + case MSG_UNHANDLED_DROP_LISTENER_TIMEOUT: { + synchronized (mService.mGlobalLock) { + onUnhandledDropCallback(false /* consumedByListener */); + } + break; + } } } } diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index d302f0641b58..76038b945288 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -147,6 +147,11 @@ class DragState { */ private boolean mIsClosing; + // Stores the last drop event which was reported to a valid drop target window, or null + // otherwise. This drop event will contain private info and should only be consumed by the + // unhandled drag listener. + DragEvent mUnhandledDropEvent; + DragState(WindowManagerService service, DragDropController controller, IBinder token, SurfaceControl surface, int flags, IBinder localWin) { mService = service; @@ -287,14 +292,54 @@ class DragState { mData = null; mThumbOffsetX = mThumbOffsetY = 0; mNotifiedWindows = null; + if (mUnhandledDropEvent != null) { + mUnhandledDropEvent.recycle(); + mUnhandledDropEvent = null; + } // Notifies the controller that the drag state is closed. mDragDropController.onDragStateClosedLocked(this); } /** + * Creates the drop event for this drag gesture. If `touchedWin` is null, then the drop event + * will be created for dispatching to the unhandled drag and the drag surface will be provided + * as a part of the dispatched event. + */ + private DragEvent createDropEvent(float x, float y, @Nullable WindowState touchedWin, + boolean includeDragSurface) { + if (touchedWin != null) { + final int targetUserId = UserHandle.getUserId(touchedWin.getOwningUid()); + final DragAndDropPermissionsHandler dragAndDropPermissions; + if ((mFlags & View.DRAG_FLAG_GLOBAL) != 0 && (mFlags & DRAG_FLAGS_URI_ACCESS) != 0 + && mData != null) { + dragAndDropPermissions = new DragAndDropPermissionsHandler(mService.mGlobalLock, + mData, + mUid, + touchedWin.getOwningPackage(), + mFlags & DRAG_FLAGS_URI_PERMISSIONS, + mSourceUserId, + targetUserId); + } else { + dragAndDropPermissions = null; + } + if (mSourceUserId != targetUserId) { + if (mData != null) { + mData.fixUris(mSourceUserId); + } + } + return obtainDragEvent(DragEvent.ACTION_DROP, x, y, mData, + targetInterceptsGlobalDrag(touchedWin), dragAndDropPermissions); + } else { + return obtainDragEvent(DragEvent.ACTION_DROP, x, y, mData, + includeDragSurface /* includeDragSurface */, null /* dragAndDropPermissions */); + } + } + + /** * Notify the drop target and tells it about the data. If the drop event is not sent to the - * target, invokes {@code endDragLocked} immediately. + * target, invokes {@code endDragLocked} after the unhandled drag listener gets a chance to + * handle the drop. */ boolean reportDropWindowLock(IBinder token, float x, float y) { if (mAnimator != null) { @@ -302,41 +347,27 @@ class DragState { } final WindowState touchedWin = mService.mInputToWindowMap.get(token); + final DragEvent unhandledDropEvent = createDropEvent(x, y, null /* touchedWin */, + true /* includePrivateInfo */); if (!isWindowNotified(touchedWin)) { - // "drop" outside a valid window -- no recipient to apply a - // timeout to, and we can send the drag-ended message immediately. - mDragResult = false; - endDragLocked(); + // Delegate to the unhandled drag listener as a first pass + if (mDragDropController.notifyUnhandledDrop(unhandledDropEvent, "unhandled-drop")) { + // The unhandled drag listener will call back to notify whether it has consumed + // the drag, so return here + return true; + } + + // "drop" outside a valid window -- no recipient to apply a timeout to, and we can send + // the drag-ended message immediately. + endDragLocked(false /* consumed */, false /* relinquishDragSurfaceToDropTarget */); if (DEBUG_DRAG) Slog.d(TAG_WM, "Drop outside a valid window " + touchedWin); return false; } if (DEBUG_DRAG) Slog.d(TAG_WM, "sending DROP to " + touchedWin); - final int targetUserId = UserHandle.getUserId(touchedWin.getOwningUid()); - - final DragAndDropPermissionsHandler dragAndDropPermissions; - if ((mFlags & View.DRAG_FLAG_GLOBAL) != 0 && (mFlags & DRAG_FLAGS_URI_ACCESS) != 0 - && mData != null) { - dragAndDropPermissions = new DragAndDropPermissionsHandler(mService.mGlobalLock, - mData, - mUid, - touchedWin.getOwningPackage(), - mFlags & DRAG_FLAGS_URI_PERMISSIONS, - mSourceUserId, - targetUserId); - } else { - dragAndDropPermissions = null; - } - if (mSourceUserId != targetUserId) { - if (mData != null) { - mData.fixUris(mSourceUserId); - } - } final IBinder clientToken = touchedWin.mClient.asBinder(); - final DragEvent event = obtainDragEvent(DragEvent.ACTION_DROP, x, y, - mData, targetInterceptsGlobalDrag(touchedWin), - dragAndDropPermissions); + final DragEvent event = createDropEvent(x, y, touchedWin, false /* includePrivateInfo */); try { touchedWin.mClient.dispatchDragEvent(event); @@ -345,7 +376,7 @@ class DragState { DragDropController.DRAG_TIMEOUT_MS); } catch (RemoteException e) { Slog.w(TAG_WM, "can't send drop notification to win " + touchedWin); - endDragLocked(); + endDragLocked(false /* consumed */, false /* relinquishDragSurfaceToDropTarget */); return false; } finally { if (MY_PID != touchedWin.mSession.mPid) { @@ -353,6 +384,7 @@ class DragState { } } mToken = clientToken; + mUnhandledDropEvent = unhandledDropEvent; return true; } @@ -478,6 +510,9 @@ class DragState { boolean containsAppExtras) { final boolean interceptsGlobalDrag = targetInterceptsGlobalDrag(newWin); if (mDragInProgress && isValidDropTarget(newWin, containsAppExtras, interceptsGlobalDrag)) { + if (DEBUG_DRAG) { + Slog.d(TAG_WM, "Sending DRAG_STARTED to new window " + newWin); + } // Only allow the extras to be dispatched to a global-intercepting drag target ClipData data = interceptsGlobalDrag ? mData.copyForTransferWithActivityInfo() : null; DragEvent event = obtainDragEvent(DragEvent.ACTION_DRAG_STARTED, @@ -523,14 +558,25 @@ class DragState { return false; } if (!targetWin.isPotentialDragTarget(interceptsGlobalDrag)) { + // Window should not be a target return false; } - if ((mFlags & View.DRAG_FLAG_GLOBAL) == 0 || !targetWindowSupportsGlobalDrag(targetWin)) { + final boolean isGlobalSameAppDrag = (mFlags & View.DRAG_FLAG_GLOBAL_SAME_APPLICATION) != 0; + final boolean isGlobalDrag = (mFlags & View.DRAG_FLAG_GLOBAL) != 0; + final boolean isAnyGlobalDrag = isGlobalDrag || isGlobalSameAppDrag; + if (!isAnyGlobalDrag || !targetWindowSupportsGlobalDrag(targetWin)) { // Drag is limited to the current window. if (!isLocalWindow) { return false; } } + if (isGlobalSameAppDrag) { + // Drag is limited to app windows from the same uid or windows that can intercept global + // drag + if (!interceptsGlobalDrag && mUid != targetWin.getUid()) { + return false; + } + } return interceptsGlobalDrag || mCrossProfileCopyAllowed @@ -547,7 +593,10 @@ class DragState { /** * @return whether the given window {@param targetWin} can intercept global drags. */ - public boolean targetInterceptsGlobalDrag(WindowState targetWin) { + public boolean targetInterceptsGlobalDrag(@Nullable WindowState targetWin) { + if (targetWin == null) { + return false; + } return (targetWin.mAttrs.privateFlags & PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP) != 0; } @@ -561,9 +610,6 @@ class DragState { if (isWindowNotified(newWin)) { return; } - if (DEBUG_DRAG) { - Slog.d(TAG_WM, "need to send DRAG_STARTED to new window " + newWin); - } sendDragStartedLocked(newWin, mCurrentX, mCurrentY, containsApplicationExtras(mDataDescription)); } @@ -578,7 +624,13 @@ class DragState { return false; } - void endDragLocked() { + /** + * Ends the current drag, animating the drag surface back to the source if the drop was not + * consumed by the receiving window. + */ + void endDragLocked(boolean dropConsumed, boolean relinquishDragSurfaceToDropTarget) { + mDragResult = dropConsumed; + mRelinquishDragSurfaceToDropTarget = relinquishDragSurfaceToDropTarget; if (mAnimator != null) { return; } diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 2accf9a2a43a..5d9c42d4c3a8 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -44,6 +44,7 @@ import static android.view.WindowManager.TransitionType; import static android.view.WindowManager.transitTypeToString; import static android.window.TaskFragmentAnimationParams.DEFAULT_ANIMATION_BACKGROUND_COLOR; import static android.window.TransitionInfo.FLAGS_IS_OCCLUDED_NO_ANIMATION; +import static android.window.TransitionInfo.FLAG_CONFIG_AT_END; import static android.window.TransitionInfo.FLAG_DISPLAY_HAS_ALERT_WINDOWS; import static android.window.TransitionInfo.FLAG_FILLS_TASK; import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; @@ -65,6 +66,7 @@ import static com.android.server.wm.ActivityRecord.State.RESUMED; import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_RECENTS_ANIM; import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_SPLASH_SCREEN; import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_WINDOWS_DRAWN; +import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION; import android.annotation.IntDef; import android.annotation.NonNull; @@ -307,6 +309,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { */ int mAnimationTrack = 0; + /** + * List of activities whose configurations are sent to the client at the end of the transition + * instead of immediately when the configuration changes. + */ + ArrayList<ActivityRecord> mConfigAtEndActivities = null; + Transition(@TransitionType int type, @TransitionFlags int flags, TransitionController controller, BLASTSyncEngine syncEngine) { mType = type; @@ -484,6 +492,22 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { return mTargetDisplays.contains(dc); } + void setConfigAtEnd(@NonNull WindowContainer<?> wc) { + wc.forAllActivities(ar -> { + if (!ar.isVisible() || !ar.isVisibleRequested()) return; + if (mConfigAtEndActivities == null) { + mConfigAtEndActivities = new ArrayList<>(); + } + if (mConfigAtEndActivities.contains(ar)) { + return; + } + mConfigAtEndActivities.add(ar); + ar.pauseConfigurationDispatch(); + }); + snapshotStartState(wc); + mChanges.get(wc).mFlags |= ChangeInfo.FLAG_CHANGE_CONFIG_AT_END; + } + /** Set a transition to be a seamless-rotation. */ void setSeamlessRotation(@NonNull WindowContainer wc) { final ChangeInfo info = mChanges.get(wc); @@ -644,20 +668,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Collecting in transition %d: %s", mSyncId, wc); - // "snapshot" all parents (as potential promotion targets). Do this before checking - // if this is already a participant in case it has since been re-parented. - for (WindowContainer<?> curr = getAnimatableParent(wc); - curr != null && !mChanges.containsKey(curr); - curr = getAnimatableParent(curr)) { - final ChangeInfo info = new ChangeInfo(curr); - updateTransientFlags(info); - mChanges.put(curr, info); - if (isReadyGroup(curr)) { - mReadyTrackerOld.addGroup(curr); - ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, " Creating Ready-group for" - + " Transition %d with root=%s", mSyncId, curr); - } - } + // Snapshot before checking if this is a participant in case it has been re-parented. + snapshotStartState(getAnimatableParent(wc)); if (mParticipants.contains(wc)) return; // Transient-hide may be hidden later, so no need to request redraw. if (!isInTransientHide(wc)) { @@ -688,6 +700,22 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } } + /** "snapshot" `wc` and all its parents (as potential promotion targets). */ + private void snapshotStartState(@NonNull WindowContainer<?> wc) { + for (WindowContainer<?> curr = wc; + curr != null && !mChanges.containsKey(curr); + curr = getAnimatableParent(curr)) { + final ChangeInfo info = new ChangeInfo(curr); + updateTransientFlags(info); + mChanges.put(curr, info); + if (isReadyGroup(curr)) { + mReadyTrackerOld.addGroup(curr); + ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, " Creating Ready-group for" + + " Transition %d with root=%s", mSyncId, curr); + } + } + } + private void updateTransientFlags(@NonNull ChangeInfo info) { final WindowContainer<?> wc = info.mContainer; // Only look at tasks, taskfragments, or activities @@ -934,47 +962,60 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } /** + * Populates `t` with instructions to reset surface transform of `change` so it matches + * the WM hierarchy. This "undoes" lingering state left by the animation. + */ + private void resetSurfaceTransform(SurfaceControl.Transaction t, WindowContainer target, + SurfaceControl targetLeash) { + final Point tmpPos = new Point(); + target.getRelativePosition(tmpPos); + t.setPosition(targetLeash, tmpPos.x, tmpPos.y); + // No need to clip the display in case seeing the clipped content when during the + // display rotation. No need to clip activities because they rely on clipping on + // task layers. + if (target.asTaskFragment() == null) { + t.setCrop(targetLeash, null /* crop */); + } else { + // Crop to the resolved override bounds. + final Rect clipRect = target.getResolvedOverrideBounds(); + t.setWindowCrop(targetLeash, clipRect.width(), clipRect.height()); + } + t.setMatrix(targetLeash, 1, 0, 0, 1); + // The bounds sent to the transition is always a real bounds. This means we lose + // information about "null" bounds (inheriting from parent). Core will fix-up + // non-organized window surface bounds; however, since Core can't touch organized + // surfaces, add the "inherit from parent" restoration here. + if (target.isOrganized() && target.matchParentBounds()) { + t.setWindowCrop(targetLeash, -1, -1); + } + } + + /** * Build a transaction that "resets" all the re-parenting and layer changes. This is * intended to be applied at the end of the transition but before the finish callback. This * needs to be passed/applied in shell because until finish is called, shell owns the surfaces. * Additionally, this gives shell the ability to better deal with merged transitions. */ private void buildFinishTransaction(SurfaceControl.Transaction t, TransitionInfo info) { - final Point tmpPos = new Point(); // usually only size 1 final ArraySet<DisplayContent> displays = new ArraySet<>(); for (int i = mTargets.size() - 1; i >= 0; --i) { - final WindowContainer target = mTargets.get(i).mContainer; - if (target.getParent() != null) { - final SurfaceControl targetLeash = getLeashSurface(target, null /* t */); - final SurfaceControl origParent = getOrigParentSurface(target); - // Ensure surfaceControls are re-parented back into the hierarchy. - t.reparent(targetLeash, origParent); - t.setLayer(targetLeash, target.getLastLayer()); - target.getRelativePosition(tmpPos); - t.setPosition(targetLeash, tmpPos.x, tmpPos.y); - // No need to clip the display in case seeing the clipped content when during the - // display rotation. No need to clip activities because they rely on clipping on - // task layers. - if (target.asTaskFragment() == null) { - t.setCrop(targetLeash, null /* crop */); - } else { - // Crop to the resolved override bounds. - final Rect clipRect = target.getResolvedOverrideBounds(); - t.setWindowCrop(targetLeash, clipRect.width(), clipRect.height()); - } - t.setCornerRadius(targetLeash, 0); - t.setShadowRadius(targetLeash, 0); - t.setMatrix(targetLeash, 1, 0, 0, 1); - t.setAlpha(targetLeash, 1); - // The bounds sent to the transition is always a real bounds. This means we lose - // information about "null" bounds (inheriting from parent). Core will fix-up - // non-organized window surface bounds; however, since Core can't touch organized - // surfaces, add the "inherit from parent" restoration here. - if (target.isOrganized() && target.matchParentBounds()) { - t.setWindowCrop(targetLeash, -1, -1); - } - displays.add(target.getDisplayContent()); + final WindowContainer<?> target = mTargets.get(i).mContainer; + if (target.getParent() == null) continue; + final SurfaceControl targetLeash = getLeashSurface(target, null /* t */); + final SurfaceControl origParent = getOrigParentSurface(target); + // Ensure surfaceControls are re-parented back into the hierarchy. + t.reparent(targetLeash, origParent); + t.setLayer(targetLeash, target.getLastLayer()); + t.setCornerRadius(targetLeash, 0); + t.setShadowRadius(targetLeash, 0); + t.setAlpha(targetLeash, 1); + displays.add(target.getDisplayContent()); + // For config-at-end, the end-transform will be reset after the config is actually + // applied in the client (since the transform depends on config). The other properties + // remain here because shell might want to persistently override them. + if ((mTargets.get(i).mFlags & ChangeInfo.FLAG_CHANGE_CONFIG_AT_END) == 0) { + resetSurfaceTransform(t, target, targetLeash); } } // Remove screenshot layers if necessary @@ -1304,6 +1345,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { mController.mAtm.mRootWindowContainer.rankTaskLayers(); } + commitConfigAtEndActivities(); + // dispatch legacy callback in a different loop. This is because multiple legacy handlers // (fixed-rotation/displaycontent) make global changes, so we want to ensure that we've // processed all the participants first (in particular, we want to trigger pip-enter first) @@ -1421,6 +1464,52 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { mController.updateAnimatingState(); } + private void commitConfigAtEndActivities() { + if (mConfigAtEndActivities == null || mConfigAtEndActivities.isEmpty()) { + return; + } + final SurfaceControl.Transaction t = + mController.mAtm.mWindowManager.mTransactionFactory.get(); + for (int i = 0; i < mTargets.size(); ++i) { + final WindowContainer target = mTargets.get(i).mContainer; + if (target.getParent() == null || (mTargets.get(i).mFlags + & ChangeInfo.FLAG_CHANGE_CONFIG_AT_END) == 0) { + continue; + } + final SurfaceControl targetLeash = getLeashSurface(target, null /* t */); + // Reset surface state here (since it was skipped in buildFinishTransaction). Since + // we are resuming config to the "current" state, we have to calculate the matching + // surface state now (rather than snapshotting it at animation start). + resetSurfaceTransform(t, target, targetLeash); + } + + // Now we resume the configuration dispatch, wait until the now resumed configs have been + // drawn, and then apply everything together. + final BLASTSyncEngine.SyncGroup sg = mSyncEngine.prepareSyncSet( + new BLASTSyncEngine.TransactionReadyListener() { + @Override + public void onTransactionReady(int mSyncId, + SurfaceControl.Transaction transaction) { + t.merge(transaction); + t.apply(); + } + + @Override + public void onTransactionCommitTimeout() { + t.apply(); + } + }, "ConfigAtTransitEnd"); + final int syncId = sg.mSyncId; + mSyncEngine.startSyncSet(sg, BLAST_TIMEOUT_DURATION, true /* parallel */); + mSyncEngine.setSyncMethod(syncId, BLASTSyncEngine.METHOD_BLAST); + for (int i = 0; i < mConfigAtEndActivities.size(); ++i) { + final ActivityRecord ar = mConfigAtEndActivities.get(i); + mSyncEngine.addToSyncSet(syncId, ar); + ar.resumeConfigurationDispatch(); + } + mSyncEngine.setReady(syncId); + } + @Nullable private ActivityRecord getVisibleTransientLaunch(TaskDisplayArea taskDisplayArea) { if (mTransientLaunches == null) return null; @@ -1546,6 +1635,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { if (mState == STATE_ABORT) { mController.onAbort(this); + if (mConfigAtEndActivities != null) { + for (int i = 0; i < mConfigAtEndActivities.size(); ++i) { + mConfigAtEndActivities.get(i).resumeConfigurationDispatch(); + } + mConfigAtEndActivities = null; + } primaryDisplay.getPendingTransaction().merge(transaction); mSyncId = -1; mOverrideOptions = null; @@ -2291,6 +2386,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } else { parentChange.mFlags |= ChangeInfo.FLAG_CHANGE_YES_ANIMATION; } + final ActivityRecord ar = targetChange.mContainer.asActivityRecord(); + if ((ar != null && ar.isConfigurationDispatchPaused()) + || ((targetChange.mFlags & ChangeInfo.FLAG_CHANGE_CONFIG_AT_END) != 0)) { + parentChange.mFlags |= ChangeInfo.FLAG_CHANGE_CONFIG_AT_END; + } } } @@ -2940,6 +3040,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { /** Whether this change's container moved to the top. */ private static final int FLAG_CHANGE_MOVED_TO_TOP = 0x20; + /** Whether this change contains config-at-end members. */ + private static final int FLAG_CHANGE_CONFIG_AT_END = 0x40; + @IntDef(prefix = { "FLAG_" }, value = { FLAG_NONE, FLAG_SEAMLESS_ROTATION, @@ -2947,7 +3050,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { FLAG_ABOVE_TRANSIENT_LAUNCH, FLAG_CHANGE_NO_ANIMATION, FLAG_CHANGE_YES_ANIMATION, - FLAG_CHANGE_MOVED_TO_TOP + FLAG_CHANGE_MOVED_TO_TOP, + FLAG_CHANGE_CONFIG_AT_END }) @Retention(RetentionPolicy.SOURCE) @interface Flag {} @@ -3095,6 +3199,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { flags |= FLAG_IS_VOICE_INTERACTION; } flags |= record.mTransitionChangeFlags; + if (record.isConfigurationDispatchPaused()) { + flags |= FLAG_CONFIG_AT_END; + } } final TaskFragment taskFragment = wc.asTaskFragment(); if (taskFragment != null && task == null) { @@ -3140,6 +3247,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { if ((mFlags & FLAG_CHANGE_MOVED_TO_TOP) != 0) { flags |= FLAG_MOVED_TO_TOP; } + if ((mFlags & FLAG_CHANGE_CONFIG_AT_END) != 0) { + flags |= FLAG_CONFIG_AT_END; + } return flags; } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 80894b201942..61fde5e31e8f 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -465,7 +465,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } final InsetsSource source = new InsetsSource(id, provider.getType()); - source.setFrame(provider.getArbitraryRectangle()).updateSideHint(getBounds()); + source.setFrame(provider.getArbitraryRectangle()) + .updateSideHint(getBounds()) + .setBoundingRects(provider.getBoundingRects()); mLocalInsetsSources.put(id, source); mDisplayContent.getInsetsStateController().updateAboveInsetsState(true); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 4ea76e128584..de8d9f96453d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -310,6 +310,7 @@ import android.window.IScreenRecordingCallback; import android.window.ISurfaceSyncGroupCompletedListener; import android.window.ITaskFpsCallback; import android.window.ITrustedPresentationListener; +import android.window.IUnhandledDragListener; import android.window.InputTransferToken; import android.window.ScreenCapture; import android.window.SystemPerformanceHinter; @@ -10026,4 +10027,16 @@ public class WindowManagerService extends IWindowManager.Stub void onProcessActivityVisibilityChanged(int uid, boolean visible) { mScreenRecordingCallbackController.onProcessActivityVisibilityChanged(uid, visible); } + + /** + * Sets the listener to be called back when a cross-window drag and drop operation is unhandled + * (ie. not handled by any window which can handle the drag). + */ + @Override + public void setUnhandledDragListener(IUnhandledDragListener listener) throws RemoteException { + mAtmService.enforceTaskPermission("setUnhandledDragListener"); + synchronized (mGlobalLock) { + mDragDropController.setUnhandledDragListener(listener); + } + } } diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 8cd399f6a12e..a8de9198943c 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -583,8 +583,21 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } final List<WindowContainerTransaction.HierarchyOp> hops = t.getHierarchyOps(); final int hopSize = hops.size(); - Iterator<Map.Entry<IBinder, WindowContainerTransaction.Change>> entries = - t.getChanges().entrySet().iterator(); + Iterator<Map.Entry<IBinder, WindowContainerTransaction.Change>> entries; + if (transition != null) { + // Mark any config-at-end containers before applying config changes so that + // the config changes don't dispatch to client. + entries = t.getChanges().entrySet().iterator(); + while (entries.hasNext()) { + final Map.Entry<IBinder, WindowContainerTransaction.Change> entry = + entries.next(); + if (!entry.getValue().getConfigAtTransitionEnd()) continue; + final WindowContainer wc = WindowContainer.fromBinder(entry.getKey()); + if (wc == null || !wc.isAttached()) continue; + transition.setConfigAtEnd(wc); + } + } + entries = t.getChanges().entrySet().iterator(); while (entries.hasNext()) { final Map.Entry<IBinder, WindowContainerTransaction.Change> entry = entries.next(); final WindowContainer wc = WindowContainer.fromBinder(entry.getKey()); diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index dfa9dcecfbb5..3607dddc66d5 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -34,6 +34,7 @@ cc_library_static { "tvinput/BufferProducerThread.cpp", "tvinput/JTvInputHal.cpp", "tvinput/TvInputHal_hidl.cpp", + "com_android_server_accessibility_BrailleDisplayConnection.cpp", "com_android_server_adb_AdbDebuggingManager.cpp", "com_android_server_am_BatteryStatsService.cpp", "com_android_server_biometrics_SurfaceToNativeHandleConverter.cpp", diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS index df7fb991e39e..b999305fbee0 100644 --- a/services/core/jni/OWNERS +++ b/services/core/jni/OWNERS @@ -15,6 +15,7 @@ per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION per-file com_android_server_SystemClock* = file:/services/core/java/com/android/server/timedetector/OWNERS per-file com_android_server_Usb* = file:/services/usb/OWNERS per-file com_android_server_Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS +per-file com_android_server_accessibility_* = file:/services/accessibility/OWNERS per-file com_android_server_hdmi_* = file:/core/java/android/hardware/hdmi/OWNERS per-file com_android_server_lights_* = file:/services/core/java/com/android/server/lights/OWNERS per-file com_android_server_location_* = file:/location/java/android/location/OWNERS diff --git a/services/core/jni/com_android_server_accessibility_BrailleDisplayConnection.cpp b/services/core/jni/com_android_server_accessibility_BrailleDisplayConnection.cpp new file mode 100644 index 000000000000..9a509a71cf92 --- /dev/null +++ b/services/core/jni/com_android_server_accessibility_BrailleDisplayConnection.cpp @@ -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. + */ + +#include <core_jni_helpers.h> +#include <jni.h> +#include <linux/hidraw.h> +#include <linux/input.h> +#include <nativehelper/JNIHelp.h> +#include <sys/ioctl.h> + +/* + * This file defines simple wrappers around the kernel UAPI HIDRAW driver's ioctl() commands. + * See kernel example samples/hidraw/hid-example.c + * + * All methods expect an open file descriptor int from Java. + */ + +namespace android { + +namespace { + +// Max size we allow for the result from HIDIOCGRAWUNIQ (Bluetooth address or USB serial number). +// Copied from linux/hid.h struct hid_device->uniq char array size; the ioctl implementation +// writes at most this many bytes to the provided buffer. +constexpr int UNIQ_SIZE_MAX = 64; + +} // anonymous namespace + +static jint com_android_server_accessibility_BrailleDisplayConnection_getHidrawDescSize( + JNIEnv* env, jobject thiz, int fd) { + int size = 0; + if (ioctl(fd, HIDIOCGRDESCSIZE, &size) < 0) { + return -1; + } + return size; +} + +static jbyteArray com_android_server_accessibility_BrailleDisplayConnection_getHidrawDesc( + JNIEnv* env, jobject thiz, int fd, int descSize) { + struct hidraw_report_descriptor desc; + desc.size = descSize; + if (ioctl(fd, HIDIOCGRDESC, &desc) < 0) { + return nullptr; + } + jbyteArray result = env->NewByteArray(descSize); + if (result != nullptr) { + env->SetByteArrayRegion(result, 0, descSize, (jbyte*)desc.value); + } + // Local ref is not deleted because it is returned to Java + return result; +} + +static jstring com_android_server_accessibility_BrailleDisplayConnection_getHidrawUniq(JNIEnv* env, + jobject thiz, + int fd) { + char buf[UNIQ_SIZE_MAX]; + if (ioctl(fd, HIDIOCGRAWUNIQ(UNIQ_SIZE_MAX), buf) < 0) { + return nullptr; + } + // Local ref is not deleted because it is returned to Java + return env->NewStringUTF(buf); +} + +static jint com_android_server_accessibility_BrailleDisplayConnection_getHidrawBusType(JNIEnv* env, + jobject thiz, + int fd) { + struct hidraw_devinfo info; + if (ioctl(fd, HIDIOCGRAWINFO, &info) < 0) { + return -1; + } + return info.bustype; +} + +static const JNINativeMethod gMethods[] = { + {"nativeGetHidrawDescSize", "(I)I", + (void*)com_android_server_accessibility_BrailleDisplayConnection_getHidrawDescSize}, + {"nativeGetHidrawDesc", "(II)[B", + (void*)com_android_server_accessibility_BrailleDisplayConnection_getHidrawDesc}, + {"nativeGetHidrawUniq", "(I)Ljava/lang/String;", + (void*)com_android_server_accessibility_BrailleDisplayConnection_getHidrawUniq}, + {"nativeGetHidrawBusType", "(I)I", + (void*)com_android_server_accessibility_BrailleDisplayConnection_getHidrawBusType}, +}; + +int register_com_android_server_accessibility_BrailleDisplayConnection(JNIEnv* env) { + return RegisterMethodsOrDie(env, "com/android/server/accessibility/BrailleDisplayConnection", + gMethods, NELEM(gMethods)); +} + +}; // namespace android diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 5d1eb496903b..0936888b24a0 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -70,6 +70,7 @@ int register_com_android_server_wm_TaskFpsCallbackController(JNIEnv* env); int register_com_android_server_display_DisplayControl(JNIEnv* env); int register_com_android_server_SystemClockTime(JNIEnv* env); int register_android_server_display_smallAreaDetectionController(JNIEnv* env); +int register_com_android_server_accessibility_BrailleDisplayConnection(JNIEnv* env); }; using namespace android; @@ -132,5 +133,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_com_android_server_display_DisplayControl(env); register_com_android_server_SystemClockTime(env); register_android_server_display_smallAreaDetectionController(env); + register_com_android_server_accessibility_BrailleDisplayConnection(env); return JNI_VERSION_1_4; } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 7efefeb42d82..0036f498972e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -48,6 +48,7 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCATION; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK; +import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MICROPHONE; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MOBILE_NETWORK; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MODIFY_USERS; @@ -76,6 +77,7 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_TIME; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER; +import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_VPN; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WALLPAPER; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WIFI; @@ -98,6 +100,7 @@ import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_HIBERNATION; import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS; import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_SUSPENSION; import static android.app.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; +import static android.app.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; import static android.app.admin.DeviceAdminInfo.USES_POLICY_FORCE_LOCK; import static android.app.admin.DeviceAdminInfo.USES_POLICY_WIPE_DATA; import static android.app.admin.DeviceAdminReceiver.ACTION_COMPLIANCE_ACKNOWLEDGEMENT_REQUIRED; @@ -189,6 +192,7 @@ import static android.app.admin.DevicePolicyManager.STATUS_HEADLESS_SYSTEM_USER_ import static android.app.admin.DevicePolicyManager.STATUS_MANAGED_USERS_NOT_SUPPORTED; import static android.app.admin.DevicePolicyManager.STATUS_NONSYSTEM_USER_EXISTS; import static android.app.admin.DevicePolicyManager.STATUS_NOT_SYSTEM_USER; +import static android.app.admin.DevicePolicyManager.STATUS_HEADLESS_ONLY_SYSTEM_USER; import static android.app.admin.DevicePolicyManager.STATUS_OK; import static android.app.admin.DevicePolicyManager.STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS; import static android.app.admin.DevicePolicyManager.STATUS_SYSTEM_USER; @@ -225,7 +229,9 @@ import static android.app.admin.ProvisioningException.ERROR_SET_DEVICE_OWNER_FAI import static android.app.admin.ProvisioningException.ERROR_STARTING_PROFILE_FAILED; import static android.app.admin.flags.Flags.backupServiceSecurityLogEventEnabled; import static android.app.admin.flags.Flags.dumpsysPolicyEngineMigrationEnabled; +import static android.app.admin.flags.Flags.headlessDeviceOwnerSingleUserEnabled; import static android.app.admin.flags.Flags.policyEngineMigrationV2Enabled; +import static android.app.admin.flags.Flags.assistContentUserRestrictionEnabled; import static android.content.Intent.ACTION_MANAGED_PROFILE_AVAILABLE; import static android.content.Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; @@ -443,6 +449,7 @@ import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.ParcelableKeyGenParameterSpec; import android.stats.devicepolicy.DevicePolicyEnums; import android.telecom.TelecomManager; +import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.data.ApnSetting; @@ -9460,7 +9467,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } if (setProfileOwnerOnCurrentUserIfNecessary - && mInjector.userManagerIsHeadlessSystemUserMode()) { + && mInjector.userManagerIsHeadlessSystemUserMode() + && getHeadlessDeviceOwnerMode() == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED) { int currentForegroundUser; synchronized (getLockObject()) { currentForegroundUser = getCurrentForegroundUserId(); @@ -9476,6 +9484,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return true; } + private int getHeadlessDeviceOwnerMode() { + synchronized (getLockObject()) { + return getDeviceOwnerAdminLocked().info.getHeadlessDeviceOwnerMode(); + } + } + /** * This API is cached: invalidate with invalidateBinderCaches(). */ @@ -12226,6 +12240,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { + admin + " are not in the same package"); } final CallerIdentity caller = getCallerIdentity(admin); + + if (headlessDeviceOwnerSingleUserEnabled()) { + // Block this method if the device is in headless main user mode + Preconditions.checkCallAuthorization( + getHeadlessDeviceOwnerMode() != HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER, + "createAndManageUser was called while in headless single user mode"); + } // Only allow the system user to use this method Preconditions.checkCallAuthorization(caller.getUserHandle().isSystem(), "createAndManageUser was called from non-system user"); @@ -13355,6 +13376,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { UserManager.DISALLOW_THREAD_NETWORK, new String[]{MANAGE_DEVICE_POLICY_THREAD_NETWORK}); } + if (assistContentUserRestrictionEnabled()) { + USER_RESTRICTION_PERMISSIONS.put( + UserManager.DISALLOW_ASSIST_CONTENT, + new String[]{MANAGE_DEVICE_POLICY_ASSIST_CONTENT}); + } USER_RESTRICTION_PERMISSIONS.put( UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, new String[]{MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION}); USER_RESTRICTION_PERMISSIONS.put( @@ -16636,29 +16662,51 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return STATUS_USER_NOT_RUNNING; } + DeviceAdminInfo adminInfo = null; + + boolean isHeadlessModeAffiliated = false; + + boolean isHeadlessModeSingleUser = false; + boolean isHeadlessSystemUserMode = mInjector.userManagerIsHeadlessSystemUserMode(); + int ensureSetUpUser = UserHandle.USER_SYSTEM; if (isHeadlessSystemUserMode) { - if (deviceOwnerUserId != UserHandle.USER_SYSTEM) { - Slogf.e(LOG_TAG, "In headless system user mode, " - + "device owner can only be set on headless system user."); - return STATUS_NOT_SYSTEM_USER; - } - if (owner != null) { - DeviceAdminInfo adminInfo = findAdmin( - owner, deviceOwnerUserId, /* throwForMissingPermission= */ false); + adminInfo = findAdmin(owner, + deviceOwnerUserId, /* throwForMissingPermission= */ false); + + isHeadlessModeAffiliated = + adminInfo.getHeadlessDeviceOwnerMode() + == HEADLESS_DEVICE_OWNER_MODE_AFFILIATED; - if (adminInfo.getHeadlessDeviceOwnerMode() - != HEADLESS_DEVICE_OWNER_MODE_AFFILIATED) { + isHeadlessModeSingleUser = + adminInfo.getHeadlessDeviceOwnerMode() + == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER; + + if (!isHeadlessModeAffiliated && !isHeadlessModeSingleUser) { return STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED; } + + if (headlessDeviceOwnerSingleUserEnabled() && isHeadlessModeSingleUser) { + ensureSetUpUser = mUserManagerInternal.getMainUserId(); + if (ensureSetUpUser == UserHandle.USER_NULL) { + return STATUS_HEADLESS_ONLY_SYSTEM_USER; + } + } } + + if (isHeadlessModeAffiliated && deviceOwnerUserId != UserHandle.USER_SYSTEM) { + Slogf.e(LOG_TAG, "In headless system user mode, " + + "device owner can only be set on headless system user."); + return STATUS_NOT_SYSTEM_USER; + } + } if (isAdb) { // If shell command runs after user setup completed check device status. Otherwise, OK. - if (hasUserSetupCompleted(UserHandle.USER_SYSTEM)) { + if (hasUserSetupCompleted(ensureSetUpUser)) { // DO can be setup only if there are no users which are neither created by default // nor marked as FOR_TESTING @@ -16681,11 +16729,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return STATUS_OK; } else { // DO has to be user 0 - if (deviceOwnerUserId != UserHandle.USER_SYSTEM) { + if ((!isHeadlessSystemUserMode || isHeadlessModeAffiliated) + && deviceOwnerUserId != UserHandle.USER_SYSTEM) { return STATUS_NOT_SYSTEM_USER; } // Only provision DO before setup wizard completes - if (hasUserSetupCompleted(UserHandle.USER_SYSTEM)) { + if (hasUserSetupCompleted(ensureSetUpUser)) { return STATUS_USER_SETUP_COMPLETED; } return STATUS_OK; @@ -21260,7 +21309,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime()); setLocale(provisioningParams.getLocale()); - int deviceOwnerUserId = UserHandle.USER_SYSTEM; + int deviceOwnerUserId = headlessDeviceOwnerSingleUserEnabled() + && getHeadlessDeviceOwnerMode() == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER + ? mUserManagerInternal.getMainUserId() + : UserHandle.USER_SYSTEM; + if (!removeNonRequiredAppsForManagedDevice( deviceOwnerUserId, provisioningParams.isLeaveAllSystemAppsEnabled(), @@ -22300,6 +22353,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_LOCK, MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, MANAGE_DEVICE_POLICY_LOCK_TASK, + MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS, MANAGE_DEVICE_POLICY_MICROPHONE, MANAGE_DEVICE_POLICY_MOBILE_NETWORK, MANAGE_DEVICE_POLICY_MODIFY_USERS, @@ -22381,7 +22435,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_LOCATION, MANAGE_DEVICE_POLICY_LOCK, MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, - MANAGE_DEVICE_POLICY_CERTIFICATES, + MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS, MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION, MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, MANAGE_DEVICE_POLICY_PACKAGE_STATE, @@ -23933,4 +23987,32 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Slogf.d(LOG_TAG, "Unable to get stacktrace"); } } + + @Override + public int[] getSubscriptionIds(String callerPackageName) { + final CallerIdentity caller = getCallerIdentity(callerPackageName); + enforceCanQuery( + MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS, + caller.getPackageName(), + caller.getUserId()); + return getSubscriptionIdsInternal(callerPackageName).toArray(); + } + + private IntArray getSubscriptionIdsInternal(String callerPackageName) { + SubscriptionManager subscriptionManager = + mContext.getSystemService(SubscriptionManager.class); + return mInjector.binderWithCleanCallingIdentity(() -> { + IntArray adminOwnedSubscriptions = new IntArray(); + List<SubscriptionInfo> subs = subscriptionManager.getAvailableSubscriptionInfoList(); + int subCount = (subs != null) ? subs.size() : 0; + for (int i = 0; i < subCount; i++) { + SubscriptionInfo sub = subs.get(i); + if (sub.getGroupOwner() + .equals(callerPackageName)) { + adminOwnedSubscriptions.add(sub.getSubscriptionId()); + } + } + return adminOwnedSubscriptions; + }); + } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java index 5996e422a2d4..b09908e608ba 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java @@ -487,6 +487,7 @@ final class PolicyDefinition<V> { USER_RESTRICTION_FLAGS.put( UserManager.DISALLOW_SIM_GLOBALLY, POLICY_FLAG_GLOBAL_ONLY_POLICY); + USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_ASSIST_CONTENT, /* flags= */ 0); for (String key : USER_RESTRICTION_FLAGS.keySet()) { createAndAddUserRestrictionPolicyDefinition(key, USER_RESTRICTION_FLAGS.get(key)); diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleDeviceStatePolicy.java b/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleDeviceStatePolicy.java index 8b22718786e5..bc264a46f051 100644 --- a/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleDeviceStatePolicy.java +++ b/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleDeviceStatePolicy.java @@ -16,11 +16,12 @@ package com.android.server.policy; -import static com.android.server.devicestate.DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS; -import static com.android.server.devicestate.DeviceState.FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP; -import static com.android.server.devicestate.DeviceState.FLAG_EMULATED_ONLY; -import static com.android.server.devicestate.DeviceState.FLAG_UNSUPPORTED_WHEN_POWER_SAVE_MODE; -import static com.android.server.devicestate.DeviceState.FLAG_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL; +import static android.hardware.devicestate.DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS; +import static android.hardware.devicestate.DeviceState.FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP; +import static android.hardware.devicestate.DeviceState.FLAG_EMULATED_ONLY; +import static android.hardware.devicestate.DeviceState.FLAG_UNSUPPORTED_WHEN_POWER_SAVE_MODE; +import static android.hardware.devicestate.DeviceState.FLAG_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL; + import static com.android.server.policy.BookStyleStateTransitions.DEFAULT_STATE_TRANSITIONS; import static com.android.server.policy.FoldableDeviceStateProvider.DeviceStateConfiguration.createConfig; import static com.android.server.policy.FoldableDeviceStateProvider.DeviceStateConfiguration.createTentModeClosedState; @@ -36,7 +37,6 @@ import com.android.server.devicestate.DeviceStatePolicy; import com.android.server.devicestate.DeviceStateProvider; import com.android.server.policy.FoldableDeviceStateProvider.DeviceStateConfiguration; import com.android.server.policy.feature.flags.FeatureFlags; -import com.android.server.policy.feature.flags.FeatureFlagsImpl; import java.io.PrintWriter; import java.util.function.Predicate; diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java index 021a667113e7..bf2619b52275 100644 --- a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java +++ b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java @@ -34,6 +34,7 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.hardware.devicestate.DeviceState; import android.hardware.display.DisplayManager; import android.os.Handler; import android.os.Looper; @@ -48,7 +49,6 @@ import android.view.Display; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; -import com.android.server.devicestate.DeviceState; import com.android.server.devicestate.DeviceStateProvider; import com.android.server.policy.feature.flags.FeatureFlags; import com.android.server.policy.feature.flags.FeatureFlagsImpl; diff --git a/services/foldables/devicestateprovider/tests/src/com/android/server/policy/FoldableDeviceStateProviderTest.java b/services/foldables/devicestateprovider/tests/src/com/android/server/policy/FoldableDeviceStateProviderTest.java index 04cebab107ee..930f4a61a453 100644 --- a/services/foldables/devicestateprovider/tests/src/com/android/server/policy/FoldableDeviceStateProviderTest.java +++ b/services/foldables/devicestateprovider/tests/src/com/android/server/policy/FoldableDeviceStateProviderTest.java @@ -51,6 +51,7 @@ import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorManager; +import android.hardware.devicestate.DeviceState; import android.hardware.display.DisplayManager; import android.hardware.input.InputSensorInfo; import android.os.Handler; @@ -58,7 +59,6 @@ import android.os.PowerManager; import android.testing.AndroidTestingRunner; import android.view.Display; -import com.android.server.devicestate.DeviceState; import com.android.server.devicestate.DeviceStateProvider.Listener; import com.android.server.policy.FoldableDeviceStateProvider.DeviceStateConfiguration; import com.android.server.policy.feature.flags.FakeFeatureFlagsImpl; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c55d70927f8e..dbbfb039af78 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -48,7 +48,6 @@ import android.content.pm.PackageManagerInternal; import android.content.res.Configuration; import android.content.res.Resources.Theme; import android.credentials.CredentialManager; -import android.credentials.flags.Flags; import android.database.sqlite.SQLiteCompatibilityWalFlags; import android.database.sqlite.SQLiteGlobal; import android.graphics.GraphicsStatsService; @@ -464,6 +463,11 @@ public final class SystemServer implements Dumpable { private static final String DEVICE_LOCK_APEX_PATH = "/apex/com.android.devicelock/javalib/service-devicelock.jar"; + private static final String PROFILING_SERVICE_LIFECYCLE_CLASS = + "android.os.profiling.ProfilingService$Lifecycle"; + private static final String PROFILING_SERVICE_JAR_PATH = + "/apex/com.android.profiling/javalib/service-profiling.jar"; + private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector"; private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst"; @@ -2774,6 +2778,14 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(ON_DEVICE_PERSONALIZATION_SYSTEM_SERVICE_CLASS); t.traceEnd(); + // Profiling + if (android.server.Flags.telemetryApisService()) { + t.traceBegin("StartProfilingCompanion"); + mSystemServiceManager.startServiceFromJar(PROFILING_SERVICE_LIFECYCLE_CLASS, + PROFILING_SERVICE_JAR_PATH); + t.traceEnd(); + } + if (safeMode) { mActivityManagerService.enterSafeMode(); } diff --git a/services/people/java/com/android/server/people/PeopleService.java b/services/people/java/com/android/server/people/PeopleService.java index 885ed355011b..b9f00d7979c2 100644 --- a/services/people/java/com/android/server/people/PeopleService.java +++ b/services/people/java/com/android/server/people/PeopleService.java @@ -38,6 +38,7 @@ import android.content.pm.ShortcutInfo; import android.os.Binder; import android.os.CancellationSignal; import android.os.IBinder; +import android.os.IRemoteCallback; import android.os.Process; import android.os.RemoteCallbackList; import android.os.RemoteException; @@ -474,6 +475,10 @@ public class PeopleService extends SystemService { getDataManager().restore(userId, payload); } + @Override + public void requestServiceFeatures(AppPredictionSessionId sessionId, + IRemoteCallback callback) {} + @VisibleForTesting SessionInfo getSessionInfo(AppPredictionSessionId sessionId) { return mSessions.get(sessionId); diff --git a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt index 2f5c1092e67b..67f66de71d39 100644 --- a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt +++ b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt @@ -2958,7 +2958,7 @@ class PermissionService(private val service: AccessCheckingService) : /** These permissions are supported for virtual devices. */ // TODO: b/298661870 - Use new API to get the list of device aware permissions. val DEVICE_AWARE_PERMISSIONS = - if (Flags.deviceAwarePermissionApisEnabled()) { + if (Flags.deviceAwarePermissionsEnabled()) { setOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO) } else { emptySet<String>() diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeMapTest.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeMapTest.java new file mode 100644 index 000000000000..3bb6712a34f1 --- /dev/null +++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeMapTest.java @@ -0,0 +1,125 @@ +/* + * 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.inputmethod; + +import static com.google.common.truth.Truth.assertThat; + +import android.util.ArrayMap; +import android.view.inputmethod.InputMethodSubtype; + +import androidx.annotation.NonNull; + +import org.junit.Test; + +import java.util.List; +public final class AdditionalSubtypeMapTest { + + private static final String TEST_IME1_ID = "com.android.test.inputmethod/.TestIme1"; + private static final String TEST_IME2_ID = "com.android.test.inputmethod/.TestIme2"; + + private static InputMethodSubtype createTestSubtype(String locale) { + return new InputMethodSubtype + .InputMethodSubtypeBuilder() + .setSubtypeNameResId(0) + .setSubtypeIconResId(0) + .setSubtypeLocale(locale) + .setIsAsciiCapable(true) + .build(); + } + + private static final InputMethodSubtype TEST_SUBTYPE_EN_US = createTestSubtype("en_US"); + private static final InputMethodSubtype TEST_SUBTYPE_JA_JP = createTestSubtype("ja_JP"); + + private static final List<InputMethodSubtype> TEST_SUBTYPE_LIST1 = List.of(TEST_SUBTYPE_EN_US); + private static final List<InputMethodSubtype> TEST_SUBTYPE_LIST2 = List.of(TEST_SUBTYPE_JA_JP); + + private static ArrayMap<String, List<InputMethodSubtype>> mapOf( + @NonNull String key1, @NonNull List<InputMethodSubtype> value1) { + final ArrayMap<String, List<InputMethodSubtype>> map = new ArrayMap<>(); + map.put(key1, value1); + return map; + } + + private static ArrayMap<String, List<InputMethodSubtype>> mapOf( + @NonNull String key1, @NonNull List<InputMethodSubtype> value1, + @NonNull String key2, @NonNull List<InputMethodSubtype> value2) { + final ArrayMap<String, List<InputMethodSubtype>> map = new ArrayMap<>(); + map.put(key1, value1); + map.put(key2, value2); + return map; + } + + @Test + public void testOfReturnsEmptyInstance() { + assertThat(AdditionalSubtypeMap.of(new ArrayMap<>())) + .isSameInstanceAs(AdditionalSubtypeMap.EMPTY_MAP); + } + + @Test + public void testOfReturnsNewInstance() { + final AdditionalSubtypeMap instance = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1)); + assertThat(instance.keySet()).containsExactly(TEST_IME1_ID); + assertThat(instance.get(TEST_IME1_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST1); + } + + @Test + public void testCloneWithRemoveOrSelfReturnsEmptyInstance() { + final AdditionalSubtypeMap original = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1)); + final AdditionalSubtypeMap result = original.cloneWithRemoveOrSelf(TEST_IME1_ID); + assertThat(result).isSameInstanceAs(AdditionalSubtypeMap.EMPTY_MAP); + } + + @Test + public void testCloneWithRemoveOrSelfWithMultipleKeysReturnsEmptyInstance() { + final AdditionalSubtypeMap original = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1, TEST_IME2_ID, TEST_SUBTYPE_LIST2)); + final AdditionalSubtypeMap result = original.cloneWithRemoveOrSelf( + List.of(TEST_IME1_ID, TEST_IME2_ID)); + assertThat(result).isSameInstanceAs(AdditionalSubtypeMap.EMPTY_MAP); + } + + @Test + public void testCloneWithRemoveOrSelfReturnsNewInstance() { + final AdditionalSubtypeMap original = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1, TEST_IME2_ID, TEST_SUBTYPE_LIST2)); + final AdditionalSubtypeMap result = original.cloneWithRemoveOrSelf(TEST_IME1_ID); + assertThat(result.keySet()).containsExactly(TEST_IME2_ID); + assertThat(result.get(TEST_IME2_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST2); + } + + @Test + public void testCloneWithPutWithNewKey() { + final AdditionalSubtypeMap original = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1)); + final AdditionalSubtypeMap result = original.cloneWithPut(TEST_IME2_ID, TEST_SUBTYPE_LIST2); + assertThat(result.keySet()).containsExactly(TEST_IME1_ID, TEST_IME2_ID); + assertThat(result.get(TEST_IME1_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST1); + assertThat(result.get(TEST_IME2_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST2); + } + + @Test + public void testCloneWithPutWithExistingKey() { + final AdditionalSubtypeMap original = AdditionalSubtypeMap.of( + mapOf(TEST_IME1_ID, TEST_SUBTYPE_LIST1, TEST_IME2_ID, TEST_SUBTYPE_LIST2)); + final AdditionalSubtypeMap result = original.cloneWithPut(TEST_IME2_ID, TEST_SUBTYPE_LIST1); + assertThat(result.keySet()).containsExactly(TEST_IME1_ID, TEST_IME2_ID); + assertThat(result.get(TEST_IME1_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST1); + assertThat(result.get(TEST_IME2_ID)).containsExactlyElementsIn(TEST_SUBTYPE_LIST1); + } +} diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java index 0edb3dfc0bc0..63224bb2aa3f 100644 --- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java +++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java @@ -55,9 +55,9 @@ public final class AdditionalSubtypeUtilsTest { // Save & load. AtomicFile atomicFile = new AtomicFile( new File(InstrumentationRegistry.getContext().getCacheDir(), "subtypes.xml")); - AdditionalSubtypeUtils.saveToFile(allSubtypes, InputMethodMap.of(methodMap), atomicFile); - ArrayMap<String, List<InputMethodSubtype>> loadedSubtypes = new ArrayMap<>(); - AdditionalSubtypeUtils.loadFromFile(loadedSubtypes, atomicFile); + AdditionalSubtypeUtils.saveToFile(AdditionalSubtypeMap.of(allSubtypes), + InputMethodMap.of(methodMap), atomicFile); + AdditionalSubtypeMap loadedSubtypes = AdditionalSubtypeUtils.loadFromFile(atomicFile); // Verifies the loaded data. assertEquals(1, loadedSubtypes.size()); diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceRestrictImeAmountTest.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceRestrictImeAmountTest.java index 71752ba3b393..2ea2e2264bec 100644 --- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceRestrictImeAmountTest.java +++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceRestrictImeAmountTest.java @@ -25,10 +25,8 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.util.ArrayMap; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodInfo; -import android.view.inputmethod.InputMethodSubtype; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -124,10 +122,8 @@ public class InputMethodManagerServiceRestrictImeAmountTest extends private List<InputMethodInfo> filterInputMethodServices(List<ResolveInfo> resolveInfoList, List<String> enabledComponents) { - final ArrayMap<String, List<InputMethodSubtype>> emptyAdditionalSubtypeMap = - new ArrayMap<>(); final InputMethodMap methodMap = InputMethodManagerService.filterInputMethodServices( - emptyAdditionalSubtypeMap, enabledComponents, mContext, resolveInfoList); + AdditionalSubtypeMap.EMPTY_MAP, enabledComponents, mContext, resolveInfoList); return methodMap.values(); } diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt index a8100afc4ac4..66e07175e7f5 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt @@ -18,6 +18,10 @@ package com.android.server.pm.test.verify.domain import android.content.Context import android.content.Intent +import android.content.UriRelativeFilter +import android.content.UriRelativeFilterGroup +import android.content.UriRelativeFilterGroupParcel +import android.content.pm.Flags import android.content.pm.PackageManager import android.content.pm.verify.domain.DomainOwner import android.content.pm.verify.domain.DomainVerificationInfo @@ -25,8 +29,10 @@ import android.content.pm.verify.domain.DomainVerificationManager import android.content.pm.verify.domain.DomainVerificationUserState import android.content.pm.verify.domain.IDomainVerificationManager import android.os.Build -import android.os.PatternMatcher +import android.os.Bundle +import android.os.PatternMatcher.PATTERN_LITERAL import android.os.Process +import android.platform.test.annotations.RequiresFlagsEnabled import android.util.ArraySet import android.util.SparseArray import com.android.internal.pm.parsing.pkg.AndroidPackageInternal @@ -68,6 +74,63 @@ class DomainVerificationManagerApiTest { private val DOMAIN_4 = "four.$DOMAIN_BASE" } + @RequiresFlagsEnabled(Flags.FLAG_RELATIVE_REFERENCE_INTENT_FILTERS) + @Test + fun updateUriRelativeFilterGroups() { + val pkgWithDomains = mockPkgState(PKG_ONE, UUID_ONE, listOf(DOMAIN_1, DOMAIN_2)) + val service = makeService(pkgWithDomains).apply { + addPackages(pkgWithDomains) + } + + val bundle = service.getUriRelativeFilterGroups(PKG_ONE, listOf(DOMAIN_1, DOMAIN_2)) + assertThat(bundle.keySet()).containsExactlyElementsIn(listOf(DOMAIN_1, DOMAIN_2)) + assertThat(bundle.getParcelableArrayList(DOMAIN_1, UriRelativeFilterGroup::class.java)) + .isEmpty() + assertThat(bundle.getParcelableArrayList(DOMAIN_2, UriRelativeFilterGroup::class.java)) + .isEmpty() + + val pathGroup = UriRelativeFilterGroup(UriRelativeFilterGroup.ACTION_ALLOW) + pathGroup.addUriRelativeFilter( + UriRelativeFilter(UriRelativeFilter.PATH, PATTERN_LITERAL, "path") + ) + val queryGroup = UriRelativeFilterGroup(UriRelativeFilterGroup.ACTION_BLOCK) + queryGroup.addUriRelativeFilter( + UriRelativeFilter(UriRelativeFilter.QUERY, PATTERN_LITERAL, "query") + ) + val fragmentGroup = UriRelativeFilterGroup(UriRelativeFilterGroup.ACTION_ALLOW) + fragmentGroup.addUriRelativeFilter( + UriRelativeFilter(UriRelativeFilter.FRAGMENT, PATTERN_LITERAL, "fragment") + ) + + assertGroups(service, arrayListOf(pathGroup)) + assertGroups(service, arrayListOf(queryGroup, pathGroup)) + assertGroups(service, arrayListOf(queryGroup, fragmentGroup, pathGroup)) + } + + private fun assertGroups( + service: DomainVerificationService, + groups: List<UriRelativeFilterGroup> + ) { + val bundle = Bundle() + bundle.putParcelableList(DOMAIN_1, UriRelativeFilterGroup.groupsToParcels(groups)) + service.setUriRelativeFilterGroups(PKG_ONE, bundle) + val fetchedBundle = service.getUriRelativeFilterGroups(PKG_ONE, listOf(DOMAIN_1)) + assertThat(fetchedBundle.keySet()).containsExactlyElementsIn(bundle.keySet()) + assertThat( + UriRelativeFilterGroup.parcelsToGroups( + fetchedBundle.getParcelableArrayList( + DOMAIN_1, + UriRelativeFilterGroupParcel::class.java) + ) + ).containsExactlyElementsIn( + UriRelativeFilterGroup.parcelsToGroups( + bundle.getParcelableArrayList( + DOMAIN_1, + UriRelativeFilterGroupParcel::class.java) + ) + ).inOrder() + } + @Test fun queryValidVerificationPackageNames() { val pkgWithDomains = mockPkgState(PKG_ONE, UUID_ONE, listOf(DOMAIN_1, DOMAIN_2)) @@ -484,6 +547,7 @@ class DomainVerificationManagerApiTest { DomainVerificationService(mockThrowOnUnmocked { // Assume the test has every permission necessary whenever(enforcePermission(anyString(), anyInt(), anyInt(), anyString())) + whenever(enforceCallingOrSelfPermission(anyString(), anyString())) whenever(checkPermission(anyString(), anyInt(), anyInt())) { PackageManager.PERMISSION_GRANTED } @@ -539,7 +603,7 @@ class DomainVerificationManagerApiTest { addCategory(Intent.CATEGORY_DEFAULT) addDataScheme("http") addDataScheme("https") - addDataPath("/sub", PatternMatcher.PATTERN_LITERAL) + addDataPath("/sub", PATTERN_LITERAL) addDataAuthority(it, null) } } diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt index 65b99c524e0e..4fa4190c847b 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt @@ -16,7 +16,12 @@ package com.android.server.pm.test.verify.domain +import android.content.UriRelativeFilter +import android.content.UriRelativeFilter.PATH +import android.content.UriRelativeFilterGroup +import android.content.UriRelativeFilterGroup.ACTION_ALLOW import android.content.pm.verify.domain.DomainVerificationState +import android.os.PatternMatcher.PATTERN_LITERAL import android.os.UserHandle import android.util.ArrayMap import android.util.SparseArray @@ -157,7 +162,7 @@ class DomainVerificationPersistenceTest { @Test fun writeStateSignatureIfFunctionReturnsNull() { - val (attached, pending, restored) = mockWriteValues { "SIGNATURE_$it" } + val (attached, pending, restored) = mockWriteValues { "SIGNATURE_$it" } val file = tempFolder.newFile().writeXml { DomainVerificationPersistence.writeToXml(it, attached, pending, restored, UserHandle.USER_ALL) { null } @@ -313,6 +318,9 @@ class DomainVerificationPersistenceTest { addHosts(setOf("$packageName-user.com")) isLinkHandlingAllowed = true } + val group = UriRelativeFilterGroup(ACTION_ALLOW) + group.addUriRelativeFilter(UriRelativeFilter(PATH, PATTERN_LITERAL, "test")) + uriRelativeFilterGroupMap.put("example.com", listOf(group)) } private fun pkgName(id: Int) = "$PKG_PREFIX.pkg$id" diff --git a/services/tests/mockingservicestests/src/com/android/server/OWNERS b/services/tests/mockingservicestests/src/com/android/server/OWNERS index c0f0ce047da6..b363f545760e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/OWNERS +++ b/services/tests/mockingservicestests/src/com/android/server/OWNERS @@ -1,3 +1,4 @@ per-file *Alarm* = file:/apex/jobscheduler/OWNERS per-file *AppStateTracker* = file:/apex/jobscheduler/OWNERS per-file *DeviceIdleController* = file:/apex/jobscheduler/OWNERS +per-file SensitiveContentProtectionManagerServiceTest.java = file:/core/java/android/permission/OWNERS diff --git a/services/tests/mockingservicestests/src/com/android/server/SensitiveContentProtectionManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/SensitiveContentProtectionManagerServiceTest.java index d78143381ae5..9e98105e5495 100644 --- a/services/tests/mockingservicestests/src/com/android/server/SensitiveContentProtectionManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/SensitiveContentProtectionManagerServiceTest.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; import android.media.projection.MediaProjectionInfo; import android.media.projection.MediaProjectionManager; +import android.provider.Settings; import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; @@ -391,6 +392,16 @@ public class SensitiveContentProtectionManagerServiceTest { } @Test + public void mediaProjectionOnStart_disabledViaDevOption_noBlockedPackages() { + mockDisabledViaDevelopOption(); + setupSensitiveNotification(); + + mMediaProjectionCallbackCaptor.getValue().onStart(mock(MediaProjectionInfo.class)); + + verifyZeroInteractions(mWindowManager); + } + + @Test public void nlsOnListenerConnected_projectionNotStarted_noop() { // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 // as non-sensitive @@ -484,6 +495,18 @@ public class SensitiveContentProtectionManagerServiceTest { } @Test + public void nlsOnListenerConnected_disabledViaDevOption_noBlockedPackages() { + mockDisabledViaDevelopOption(); + // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 + // as non-sensitive + setupSensitiveNotification(); + mMediaProjectionCallbackCaptor.getValue().onStart(mock(MediaProjectionInfo.class)); + mSensitiveContentProtectionManagerService.mNotificationListener.onListenerConnected(); + + verifyZeroInteractions(mWindowManager); + } + + @Test public void nlsOnNotificationRankingUpdate_projectionNotStarted_noop() { // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 // as non-sensitive @@ -599,6 +622,19 @@ public class SensitiveContentProtectionManagerServiceTest { } @Test + public void nlsOnNotificationRankingUpdate_disabledViaDevOption_noBlockedPackages() { + mockDisabledViaDevelopOption(); + // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 + // as non-sensitive + setupSensitiveNotification(); + mMediaProjectionCallbackCaptor.getValue().onStart(mock(MediaProjectionInfo.class)); + mSensitiveContentProtectionManagerService.mNotificationListener + .onNotificationRankingUpdate(mRankingMap); + + verifyZeroInteractions(mWindowManager); + } + + @Test public void nlsOnNotificationPosted_projectionNotStarted_noop() { // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 // as non-sensitive @@ -697,4 +733,26 @@ public class SensitiveContentProtectionManagerServiceTest { verifyZeroInteractions(mWindowManager); } + + @Test + public void nlsOnNotificationPosted_disabledViaDevOption_noBlockedPackages() { + mockDisabledViaDevelopOption(); + // Sets up mNotification1 & mRankingMap to be a sensitive notification, and mNotification2 + // as non-sensitive + setupSensitiveNotification(); + mMediaProjectionCallbackCaptor.getValue().onStart(mock(MediaProjectionInfo.class)); + mSensitiveContentProtectionManagerService.mNotificationListener + .onNotificationPosted(mNotification1, mRankingMap); + + verifyZeroInteractions(mWindowManager); + } + + private void mockDisabledViaDevelopOption() { + // mContext (TestableContext) uses [TestableSettingsProvider] and it will be cleared after + // the test + Settings.Global.putInt( + mContext.getContentResolver(), + Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS, + 1); + } } 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 28471b37d2a0..6bcd778c234b 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 @@ -49,7 +49,6 @@ import static com.android.server.job.controllers.JobStatus.CONSTRAINT_CONNECTIVI import static com.android.server.job.controllers.JobStatus.CONSTRAINT_CONTENT_TRIGGER; import static com.android.server.job.controllers.JobStatus.CONSTRAINT_FLEXIBLE; import static com.android.server.job.controllers.JobStatus.CONSTRAINT_IDLE; -import static com.android.server.job.controllers.JobStatus.MIN_WINDOW_FOR_FLEXIBILITY_MS; import static com.android.server.job.controllers.JobStatus.NO_LATEST_RUNTIME; import static org.junit.Assert.assertArrayEquals; @@ -410,10 +409,12 @@ public class FlexibilityControllerTest { @Test public void testOnConstantsUpdated_PercentsToDropConstraints() { + final long fallbackDuration = 12 * HOUR_IN_MILLIS; JobInfo.Builder jb = createJob(0) - .setOverrideDeadline(MIN_WINDOW_FOR_FLEXIBILITY_MS); + .setOverrideDeadline(HOUR_IN_MILLIS); JobStatus js = createJobStatus("testPercentsToDropConstraintsConfig", jb); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 5, + // Even though the override deadline is 1 hour, the fallback duration is still used. + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 5, mFlexibilityController.getNextConstraintDropTimeElapsedLocked(js)); setDeviceConfigString(KEY_PERCENTS_TO_DROP_FLEXIBLE_CONSTRAINTS, "500=1|2|3|4" @@ -441,13 +442,13 @@ public class FlexibilityControllerTest { mFlexibilityController.mFcConfig.PERCENTS_TO_DROP_FLEXIBLE_CONSTRAINTS .get(JobInfo.PRIORITY_MIN), new int[]{54, 55, 56, 57}); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10, + assertEquals(FROZEN_TIME + fallbackDuration / 10, mFlexibilityController.getNextConstraintDropTimeElapsedLocked(js)); js.setNumDroppedFlexibleConstraints(1); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 2, + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 2, mFlexibilityController.getNextConstraintDropTimeElapsedLocked(js)); js.setNumDroppedFlexibleConstraints(2); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 3, + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 3, mFlexibilityController.getNextConstraintDropTimeElapsedLocked(js)); } @@ -504,37 +505,38 @@ public class FlexibilityControllerTest { @Test public void testGetNextConstraintDropTimeElapsedLocked() { + final long fallbackDuration = 50 * HOUR_IN_MILLIS; setDeviceConfigLong(KEY_FALLBACK_FLEXIBILITY_DEADLINE, 200 * HOUR_IN_MILLIS); setDeviceConfigString(KEY_FALLBACK_FLEXIBILITY_DEADLINES, "500=" + HOUR_IN_MILLIS + ",400=" + 25 * HOUR_IN_MILLIS - + ",300=" + 50 * HOUR_IN_MILLIS + + ",300=" + fallbackDuration + ",200=" + 100 * HOUR_IN_MILLIS + ",100=" + 200 * HOUR_IN_MILLIS); long nextTimeToDropNumConstraints; // no delay, deadline - JobInfo.Builder jb = createJob(0).setOverrideDeadline(MIN_WINDOW_FOR_FLEXIBILITY_MS); + JobInfo.Builder jb = createJob(0).setOverrideDeadline(HOUR_IN_MILLIS); JobStatus js = createJobStatus("time", jb); assertEquals(JobStatus.NO_EARLIEST_RUNTIME, js.getEarliestRunTime()); - assertEquals(MIN_WINDOW_FOR_FLEXIBILITY_MS + FROZEN_TIME, js.getLatestRunTimeElapsed()); + assertEquals(HOUR_IN_MILLIS + FROZEN_TIME, js.getLatestRunTimeElapsed()); assertEquals(FROZEN_TIME, js.enqueueTime); nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 5, + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 5, nextTimeToDropNumConstraints); js.setNumDroppedFlexibleConstraints(1); nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 6, + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 6, nextTimeToDropNumConstraints); js.setNumDroppedFlexibleConstraints(2); nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 7, + assertEquals(FROZEN_TIME + fallbackDuration / 10 * 7, nextTimeToDropNumConstraints); // delay, no deadline @@ -574,81 +576,83 @@ public class FlexibilityControllerTest { // delay, deadline jb = createJob(0) - .setOverrideDeadline(2 * MIN_WINDOW_FOR_FLEXIBILITY_MS) - .setMinimumLatency(MIN_WINDOW_FOR_FLEXIBILITY_MS); + .setOverrideDeadline(2 * HOUR_IN_MILLIS) + .setMinimumLatency(HOUR_IN_MILLIS); js = createJobStatus("time", jb); - final long windowStart = FROZEN_TIME + MIN_WINDOW_FOR_FLEXIBILITY_MS; + final long windowStart = FROZEN_TIME + HOUR_IN_MILLIS; nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(windowStart + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 5, + assertEquals(windowStart + fallbackDuration / 10 * 5, nextTimeToDropNumConstraints); js.setNumDroppedFlexibleConstraints(1); nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(windowStart + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 6, + assertEquals(windowStart + fallbackDuration / 10 * 6, nextTimeToDropNumConstraints); js.setNumDroppedFlexibleConstraints(2); nextTimeToDropNumConstraints = mFlexibilityController .getNextConstraintDropTimeElapsedLocked(js); - assertEquals(windowStart + MIN_WINDOW_FOR_FLEXIBILITY_MS / 10 * 7, + assertEquals(windowStart + fallbackDuration / 10 * 7, nextTimeToDropNumConstraints); } @Test public void testCurPercent() { + final long fallbackDuration = 10 * HOUR_IN_MILLIS; + setDeviceConfigString(KEY_FALLBACK_FLEXIBILITY_DEADLINES, "300=" + fallbackDuration); long deadline = 100 * MINUTE_IN_MILLIS; long nowElapsed = FROZEN_TIME; JobInfo.Builder jb = createJob(0).setOverrideDeadline(deadline); JobStatus js = createJobStatus("time", jb); assertEquals(FROZEN_TIME, mFlexibilityController.getLifeCycleBeginningElapsedLocked(js)); - assertEquals(deadline + FROZEN_TIME, + assertEquals(FROZEN_TIME + fallbackDuration, mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, FROZEN_TIME)); - nowElapsed = FROZEN_TIME + 60 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + 6 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); assertEquals(60, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); - nowElapsed = FROZEN_TIME + 130 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + 13 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); assertEquals(100, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); - nowElapsed = FROZEN_TIME + 95 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + 9 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); - assertEquals(95, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); + assertEquals(90, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); nowElapsed = FROZEN_TIME; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); - long delay = MINUTE_IN_MILLIS; - deadline = 101 * MINUTE_IN_MILLIS; + long delay = HOUR_IN_MILLIS; + deadline = HOUR_IN_MILLIS + 100 * MINUTE_IN_MILLIS; jb = createJob(0).setOverrideDeadline(deadline).setMinimumLatency(delay); js = createJobStatus("time", jb); assertEquals(FROZEN_TIME + delay, mFlexibilityController.getLifeCycleBeginningElapsedLocked(js)); - assertEquals(deadline + FROZEN_TIME, + assertEquals(FROZEN_TIME + delay + fallbackDuration, mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, FROZEN_TIME + delay)); - nowElapsed = FROZEN_TIME + delay + 60 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + delay + 6 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); assertEquals(60, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); - nowElapsed = FROZEN_TIME + 130 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + 13 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); assertEquals(100, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); - nowElapsed = FROZEN_TIME + delay + 95 * MINUTE_IN_MILLIS; + nowElapsed = FROZEN_TIME + delay + 9 * HOUR_IN_MILLIS; JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(Instant.ofEpochMilli(nowElapsed), ZoneOffset.UTC); - assertEquals(95, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); + assertEquals(90, mFlexibilityController.getCurPercentOfLifecycleLocked(js, nowElapsed)); } @Test @@ -786,26 +790,27 @@ public class FlexibilityControllerTest { // deadline JobInfo.Builder jb = createJob(0).setOverrideDeadline(HOUR_IN_MILLIS); JobStatus js = createJobStatus("time", jb); - assertEquals(HOUR_IN_MILLIS + FROZEN_TIME, - mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, 0)); + assertEquals(3 * HOUR_IN_MILLIS + js.enqueueTime, + mFlexibilityController + .getLifeCycleEndElapsedLocked(js, nowElapsed, js.enqueueTime)); // no deadline - assertEquals(FROZEN_TIME + 2 * HOUR_IN_MILLIS, + assertEquals(js.enqueueTime + 2 * HOUR_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("time", createJob(0).setPriority(JobInfo.PRIORITY_HIGH)), - nowElapsed, 100L)); - assertEquals(FROZEN_TIME + 3 * HOUR_IN_MILLIS, + nowElapsed, js.enqueueTime)); + assertEquals(js.enqueueTime + 3 * HOUR_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("time", createJob(0).setPriority(JobInfo.PRIORITY_DEFAULT)), - nowElapsed, 100L)); - assertEquals(FROZEN_TIME + 4 * HOUR_IN_MILLIS, + nowElapsed, js.enqueueTime)); + assertEquals(js.enqueueTime + 4 * HOUR_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("time", createJob(0).setPriority(JobInfo.PRIORITY_LOW)), - nowElapsed, 100L)); - assertEquals(FROZEN_TIME + 5 * HOUR_IN_MILLIS, + nowElapsed, js.enqueueTime)); + assertEquals(js.enqueueTime + 5 * HOUR_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("time", createJob(0).setPriority(JobInfo.PRIORITY_MIN)), - nowElapsed, 100L)); + nowElapsed, js.enqueueTime)); } @Test @@ -871,14 +876,16 @@ public class FlexibilityControllerTest { mFlexibilityController.prepareForExecutionLocked(jsLow); mFlexibilityController.prepareForExecutionLocked(jsMin); - // deadline - JobInfo.Builder jb = createJob(0).setOverrideDeadline(HOUR_IN_MILLIS); - JobStatus js = createJobStatus("testGetLifeCycleEndElapsedLocked_ScoreAddition", jb); - assertEquals(HOUR_IN_MILLIS + FROZEN_TIME, - mFlexibilityController.getLifeCycleEndElapsedLocked(js, nowElapsed, 0)); + final long longDeadlineMs = 14 * 24 * HOUR_IN_MILLIS; + JobInfo.Builder jbWithLongDeadline = createJob(0).setOverrideDeadline(longDeadlineMs); + JobStatus jsWithLongDeadline = createJobStatus( + "testGetLifeCycleEndElapsedLocked_ScoreAddition", jbWithLongDeadline); + JobInfo.Builder jbWithShortDeadline = + createJob(0).setOverrideDeadline(15 * MINUTE_IN_MILLIS); + JobStatus jsWithShortDeadline = createJobStatus( + "testGetLifeCycleEndElapsedLocked_ScoreAddition", jbWithShortDeadline); final long earliestMs = 123L; - // no deadline assertEquals(earliestMs + HOUR_IN_MILLIS + 5 * 15 * MINUTE_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("testGetLifeCycleEndElapsedLocked_ScoreAddition", @@ -894,6 +901,9 @@ public class FlexibilityControllerTest { createJobStatus("testGetLifeCycleEndElapsedLocked_ScoreAddition", createJob(0).setPriority(JobInfo.PRIORITY_DEFAULT)), nowElapsed, earliestMs)); + assertEquals(earliestMs + HOUR_IN_MILLIS + 3 * 15 * MINUTE_IN_MILLIS, + mFlexibilityController.getLifeCycleEndElapsedLocked( + jsWithShortDeadline, nowElapsed, earliestMs)); assertEquals(earliestMs + HOUR_IN_MILLIS + 2 * 15 * MINUTE_IN_MILLIS, mFlexibilityController.getLifeCycleEndElapsedLocked( createJobStatus("testGetLifeCycleEndElapsedLocked_ScoreAddition", @@ -904,6 +914,9 @@ public class FlexibilityControllerTest { createJobStatus("testGetLifeCycleEndElapsedLocked_ScoreAddition", createJob(0).setPriority(JobInfo.PRIORITY_MIN)), nowElapsed, earliestMs)); + assertEquals(jsWithLongDeadline.enqueueTime + longDeadlineMs, + mFlexibilityController.getLifeCycleEndElapsedLocked( + jsWithLongDeadline, nowElapsed, earliestMs)); } @Test @@ -1033,8 +1046,8 @@ public class FlexibilityControllerTest { JobInfo.Builder jb = createJob(0); jb.setMinimumLatency(1); jb.setOverrideDeadline(2); - JobStatus js = createJobStatus("Disable Flexible When Job Has Short Window", jb); - assertFalse(js.hasFlexibilityConstraint()); + JobStatus js = createJobStatus("testExceptions_ShortWindow", jb); + assertTrue(js.hasFlexibilityConstraint()); } @Test diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java index 656bc71eebca..7bbcd50cdf1f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -722,6 +722,17 @@ public final class UserManagerServiceTest { Mockito.verify(mKeyguardManager, never()).addKeyguardLockedStateListener(any(), any()); } + @Test + public void testGetProfileIdsExcludingHidden() { + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_HIDING_PROFILES); + UserInfo privateProfileUser = + mUms.createProfileForUserEvenWhenDisallowedWithThrow("TestPrivateProfile", + USER_TYPE_PROFILE_PRIVATE, 0, 0, null); + for (int id : mUms.getProfileIdsExcludingHidden(0, true)) { + assertThat(id).isNotEqualTo(privateProfileUser.id); + } + } + /** * Returns true if the user's XML file has Default restrictions * @param userId Id of the user. diff --git a/services/tests/mockingservicestests/src/com/android/server/selinux/OWNERS b/services/tests/mockingservicestests/src/com/android/server/selinux/OWNERS new file mode 100644 index 000000000000..49a0934ec642 --- /dev/null +++ b/services/tests/mockingservicestests/src/com/android/server/selinux/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/selinux/OWNERS diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp index 64fef68e387a..1de049eaf263 100644 --- a/services/tests/powerstatstests/Android.bp +++ b/services/tests/powerstatstests/Android.bp @@ -8,6 +8,37 @@ filegroup { srcs: [ "src/com/android/server/power/stats/AggregatedPowerStatsProcessorTest.java", "src/com/android/server/power/stats/AggregatedPowerStatsTest.java", + "src/com/android/server/power/stats/AmbientDisplayPowerCalculatorTest.java", + "src/com/android/server/power/stats/AudioPowerCalculatorTest.java", + "src/com/android/server/power/stats/BatteryChargeCalculatorTest.java", + "src/com/android/server/power/stats/BatteryStatsCounterTest.java", + "src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java", + "src/com/android/server/power/stats/BatteryStatsDualTimerTest.java", + "src/com/android/server/power/stats/BatteryStatsDurationTimerTest.java", + "src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java", + "src/com/android/server/power/stats/BatteryStatsHistoryTest.java", + "src/com/android/server/power/stats/BatteryStatsImplTest.java", + "src/com/android/server/power/stats/BatteryStatsNoteTest.java", + "src/com/android/server/power/stats/BatteryStatsSamplingTimerTest.java", + "src/com/android/server/power/stats/BatteryStatsSensorTest.java", + "src/com/android/server/power/stats/BatteryStatsServTest.java", + "src/com/android/server/power/stats/BatteryStatsStopwatchTimerTest.java", + "src/com/android/server/power/stats/BatteryStatsTimeBaseTest.java", + "src/com/android/server/power/stats/BatteryStatsTimerTest.java", + "src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java", + "src/com/android/server/power/stats/BatteryUsageStatsTest.java", + "src/com/android/server/power/stats/BluetoothPowerCalculatorTest.java", + "src/com/android/server/power/stats/CameraPowerCalculatorTest.java", + "src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java", + "src/com/android/server/power/stats/CpuPowerCalculatorTest.java", + "src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java", + "src/com/android/server/power/stats/EnergyConsumerSnapshotTest.java", + "src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java", + "src/com/android/server/power/stats/GnssPowerCalculatorTest.java", + "src/com/android/server/power/stats/IdlePowerCalculatorTest.java", + "src/com/android/server/power/stats/LongSamplingCounterArrayTest.java", + "src/com/android/server/power/stats/LongSamplingCounterTest.java", + "src/com/android/server/power/stats/MemoryPowerCalculatorTest.java", "src/com/android/server/power/stats/MultiStateStatsTest.java", "src/com/android/server/power/stats/PowerStatsAggregatorTest.java", "src/com/android/server/power/stats/PowerStatsCollectorTest.java", @@ -15,6 +46,12 @@ filegroup { "src/com/android/server/power/stats/PowerStatsSchedulerTest.java", "src/com/android/server/power/stats/PowerStatsStoreTest.java", "src/com/android/server/power/stats/PowerStatsUidResolverTest.java", + "src/com/android/server/power/stats/ScreenPowerCalculatorTest.java", + "src/com/android/server/power/stats/SensorPowerCalculatorTest.java", + "src/com/android/server/power/stats/UserPowerCalculatorTest.java", + "src/com/android/server/power/stats/VideoPowerCalculatorTest.java", + "src/com/android/server/power/stats/WakelockPowerCalculatorTest.java", + "src/com/android/server/power/stats/WifiPowerCalculatorTest.java", ], } @@ -26,10 +63,6 @@ android_test { "src/**/*.java", ], - exclude_srcs: [ - ":power_stats_ravenwood_tests", - ], - static_libs: [ "services.core", "coretests-aidl", @@ -41,6 +74,7 @@ android_test { "androidx.test.ext.truth", "androidx.test.uiautomator_uiautomator", "mockito-target-minus-junit4", + "ravenwood-junit", "servicestests-utils", "platform-test-annotations", "flag-junit", 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 319a280d10cc..f74cfae6a81b 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 @@ -21,6 +21,7 @@ import static com.android.internal.os.PowerProfile.POWER_GROUP_DISPLAY_AMBIENT; import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import android.view.Display; import androidx.test.filters.SmallTest; @@ -34,10 +35,15 @@ import org.junit.runner.RunWith; @SmallTest @SuppressWarnings("GuardedBy") public class AmbientDisplayPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final long MINUTE_IN_MS = 60 * 1000; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePowerForOrdinal(POWER_GROUP_DISPLAY_AMBIENT, 0, 10.0) .setNumDisplays(1); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/AudioPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/AudioPowerCalculatorTest.java index fb367b24168e..ce451c2a842a 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/AudioPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/AudioPowerCalculatorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,11 +35,16 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class AudioPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_AUDIO, 360.0); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryChargeCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryChargeCalculatorTest.java index 3f058a2348c3..3ab1c2eab6ca 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryChargeCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryChargeCalculatorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryManager; import android.os.BatteryUsageStats; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,9 +35,14 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class BatteryChargeCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_BATTERY_CAPACITY, 4000.0); @@ -46,15 +52,17 @@ public class BatteryChargeCalculatorTest { final BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 90, 72, 3700, 3_600_000, 4_000_000, 0, - 1_000_000, 1_000_000, 1_000_000); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 85, 72, 3700, 3_000_000, 4_000_000, 0, - 1_500_000, 1_500_000, 1_500_000); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 80, 72, 3700, 2_400_000, 4_000_000, 0, - 2_000_000, 2_000_000, 2_000_000); + synchronized (batteryStats) { + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 90, 72, 3700, 3_600_000, 4_000_000, 0, + 1_000_000, 1_000_000, 1_000_000); + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 85, 72, 3700, 3_000_000, 4_000_000, 0, + 1_500_000, 1_500_000, 1_500_000); + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 80, 72, 3700, 2_400_000, 4_000_000, 0, + 2_000_000, 2_000_000, 2_000_000); + } mStatsRule.setTime(5_000_000, 5_000_000); BatteryChargeCalculator calculator = new BatteryChargeCalculator(); @@ -73,10 +81,11 @@ public class BatteryChargeCalculatorTest { assertThat(batteryUsageStats.getChargeTimeRemainingMs()).isEqualTo(-1); // Plug in - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_CHARGING, 100, - BatteryManager.BATTERY_PLUGGED_USB, 80, 72, 3700, 2_400_000, 4_000_000, 100, - 4_000_000, 4_000_000, 4_000_000); - + synchronized (batteryStats) { + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_CHARGING, 100, + BatteryManager.BATTERY_PLUGGED_USB, 80, 72, 3700, 2_400_000, 4_000_000, 100, + 4_000_000, 4_000_000, 4_000_000); + } batteryUsageStats = mStatsRule.apply(calculator); assertThat(batteryUsageStats.getChargeTimeRemainingMs()).isEqualTo(100_000); @@ -86,15 +95,17 @@ public class BatteryChargeCalculatorTest { public void testDischargeTotals_chargeUahUnavailable() { final BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 90, 72, 3700, 0, 0, 0, - 1_000_000, 1_000_000, 1_000_000); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 85, 72, 3700, 0, 0, 0, - 1_500_000, 1_500_000, 1_500_000); - batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, - /* plugType */ 0, 80, 72, 3700, 0, 0, 0, - 2_000_000, 2_000_000, 2_000_000); + synchronized (batteryStats) { + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 90, 72, 3700, 0, 0, 0, + 1_000_000, 1_000_000, 1_000_000); + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 85, 72, 3700, 0, 0, 0, + 1_500_000, 1_500_000, 1_500_000); + batteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, + /* plugType */ 0, 80, 72, 3700, 0, 0, 0, + 2_000_000, 2_000_000, 2_000_000); + } BatteryChargeCalculator calculator = new BatteryChargeCalculator(); BatteryUsageStats batteryUsageStats = mStatsRule.apply(calculator); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java index 9c2834d31609..997b7712a9dd 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java @@ -215,7 +215,7 @@ public class BatteryExternalStatsWorkerTest { public class TestBatteryStatsImpl extends BatteryStatsImpl { public TestBatteryStatsImpl(Context context) { - super(Clock.SYSTEM_CLOCK, null, null, null); + super(Clock.SYSTEM_CLOCK, null, null, null, null, null, null); mPowerProfile = new PowerProfile(context, true /* forTest */); SparseArray<int[]> cpusByPolicy = new SparseArray<>(); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java index f9f32b2e7091..6e62147ac6c1 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsCpuTimesTest.java @@ -40,6 +40,7 @@ import android.os.BatteryStats; import android.os.Handler; import android.os.Looper; import android.os.UserHandle; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.SparseArray; import android.util.SparseLongArray; import android.view.Display; @@ -56,6 +57,7 @@ import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidUserSysTimeRea import com.android.internal.util.ArrayUtils; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -84,7 +86,13 @@ import java.util.Arrays; */ @SmallTest @RunWith(AndroidJUnit4.class) +@SuppressWarnings("SynchronizeOnNonFinalField") public class BatteryStatsCpuTimesTest { + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + @Mock KernelCpuUidUserSysTimeReader mCpuUidUserSysTimeReader; @Mock @@ -128,7 +136,9 @@ public class BatteryStatsCpuTimesTest { initKernelCpuSpeedReaders(numClusters); // RUN - mBatteryStatsImpl.updateCpuTimeLocked(false, false, null); + synchronized (mBatteryStatsImpl) { + mBatteryStatsImpl.updateCpuTimeLocked(false, false, null); + } // VERIFY verify(mCpuUidUserSysTimeReader).readDelta(anyBoolean(), isNull()); @@ -147,7 +157,9 @@ public class BatteryStatsCpuTimesTest { mBatteryStatsImpl.setOnBatteryInternal(true); // RUN - mBatteryStatsImpl.updateCpuTimeLocked(true, false, null); + synchronized (mBatteryStatsImpl) { + mBatteryStatsImpl.updateCpuTimeLocked(true, false, null); + } // VERIFY verify(mUserInfoProvider).refreshUserIds(); @@ -239,7 +251,7 @@ public class BatteryStatsCpuTimesTest { mBatteryStatsImpl.updateClusterSpeedTimes(updatedUids, true, null); // VERIFY - int totalClustersTimeMs = 0; + long totalClustersTimeMs = 0; for (int i = 0; i < clusterSpeedTimesMs.length; ++i) { for (int j = 0; j < clusterSpeedTimesMs[i].length; ++j) { totalClustersTimeMs += clusterSpeedTimesMs[i][j]; diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java index bf5bf365965d..d36b55345418 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryIteratorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Process; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -29,6 +30,7 @@ import com.android.internal.os.BatteryStatsHistoryIterator; import com.android.internal.os.MonotonicClock; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,6 +44,11 @@ import java.util.concurrent.Future; @SmallTest @SuppressWarnings("GuardedBy") public class BatteryStatsHistoryIteratorTest { + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; private final MockClock mMockClock = new MockClock(); @@ -88,24 +95,24 @@ public class BatteryStatsHistoryIteratorTest { assertThat(item = iterator.next()).isNotNull(); assertHistoryItem(item, BatteryStats.HistoryItem.CMD_UPDATE, BatteryStats.HistoryItem.EVENT_NONE, - null, 0, 3_600_000, 90, 1_000_000); + null, 0, -1, 3_600_000, 90, 1_000_000); assertThat(item = iterator.next()).isNotNull(); assertHistoryItem(item, BatteryStats.HistoryItem.CMD_UPDATE, BatteryStats.HistoryItem.EVENT_NONE, - null, 0, 2_400_000, 80, 2_000_000); + null, 0, 3700, 2_400_000, 80, 2_000_000); assertThat(item = iterator.next()).isNotNull(); assertHistoryItem(item, BatteryStats.HistoryItem.CMD_UPDATE, BatteryStats.HistoryItem.EVENT_ALARM | BatteryStats.HistoryItem.EVENT_FLAG_START, - "foo", APP_UID, 2_400_000, 80, 3_000_000); + "foo", APP_UID, 3700, 2_400_000, 80, 3_000_000); assertThat(item = iterator.next()).isNotNull(); assertHistoryItem(item, BatteryStats.HistoryItem.CMD_UPDATE, BatteryStats.HistoryItem.EVENT_ALARM | BatteryStats.HistoryItem.EVENT_FLAG_FINISH, - "foo", APP_UID, 2_400_000, 80, 3_001_000); + "foo", APP_UID, 3700, 2_400_000, 80, 3_001_000); assertThat(iterator.hasNext()).isFalse(); assertThat(iterator.next()).isNull(); @@ -133,7 +140,7 @@ public class BatteryStatsHistoryIteratorTest { mMockClock.currentTime = 3000; mBatteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, - 100, /* plugType */ 0, 90, 72, 3700, 3_600_000, 4_000_000, 0, 1_000_000, + 100, /* plugType */ 0, 90, 72, -1, 3_600_000, 4_000_000, 0, 1_000_000, 1_000_000, 1_000_000); mBatteryStats.setBatteryStateLocked(BatteryManager.BATTERY_STATUS_DISCHARGING, 100, /* plugType */ 0, 80, 72, 3700, 2_400_000, 4_000_000, 0, 2_000_000, @@ -296,7 +303,7 @@ public class BatteryStatsHistoryIteratorTest { } private void assertHistoryItem(BatteryStats.HistoryItem item, int command, int eventCode, - String tag, int uid, int batteryChargeUah, int batteryLevel, + String tag, int uid, int voltageMv, int batteryChargeUah, int batteryLevel, long elapsedTimeMs) { assertThat(item.cmd).isEqualTo(command); assertThat(item.eventCode).isEqualTo(eventCode); @@ -306,6 +313,7 @@ public class BatteryStatsHistoryIteratorTest { assertThat(item.eventTag.string).isEqualTo(tag); assertThat(item.eventTag.uid).isEqualTo(uid); } + assertThat((int) item.batteryVoltage).isEqualTo(voltageMv); assertThat(item.batteryChargeUah).isEqualTo(batteryChargeUah); assertThat(item.batteryLevel).isEqualTo(batteryLevel); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java index 92513760fa4a..c58c92b47dd3 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.content.Context; import android.os.BatteryConsumer; import android.os.BatteryManager; import android.os.BatteryStats; @@ -39,7 +38,6 @@ import android.telephony.NetworkRegistrationInfo; import android.util.AtomicFile; import android.util.Log; -import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BatteryStatsHistory; @@ -59,6 +57,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -80,13 +79,14 @@ public class BatteryStatsHistoryTest { private BatteryStatsHistory.TraceDelegate mTracer; @Mock private BatteryStatsHistory.HistoryStepDetailsCalculator mStepDetailsCalculator; + @Mock + private BatteryStatsHistory.EventLogger mEventLogger; private List<String> mReadFiles = new ArrayList<>(); @Before - public void setUp() { + public void setUp() throws IOException { MockitoAnnotations.initMocks(this); - Context context = InstrumentationRegistry.getContext(); - mSystemDir = context.getDataDir(); + mSystemDir = Files.createTempDirectory("BatteryStatsHistoryTest").toFile(); mHistoryDir = new File(mSystemDir, "battery-history"); String[] files = mHistoryDir.list(); if (files != null) { @@ -99,7 +99,7 @@ public class BatteryStatsHistoryTest { mClock.realtime = 123; mHistory = new BatteryStatsHistory(mHistoryBuffer, mSystemDir, 32, 1024, - mStepDetailsCalculator, mClock, mMonotonicClock, mTracer); + mStepDetailsCalculator, mClock, mMonotonicClock, mTracer, mEventLogger); when(mStepDetailsCalculator.getHistoryStepDetails()) .thenReturn(new BatteryStats.HistoryStepDetails()); @@ -238,7 +238,7 @@ public class BatteryStatsHistoryTest { // create a new BatteryStatsHistory object, it will pick up existing history files. BatteryStatsHistory history2 = new BatteryStatsHistory(mHistoryBuffer, mSystemDir, 32, 1024, - null, mClock, mMonotonicClock, mTracer); + null, mClock, mMonotonicClock, mTracer, mEventLogger); // verify constructor can pick up all files from file system. verifyFileNames(history2, fileList); verifyActiveFile(history2, "33000.bh"); @@ -534,7 +534,7 @@ public class BatteryStatsHistoryTest { // Keep the preserved part of history short - we only need to capture the very tail of // history. mHistory = new BatteryStatsHistory(mHistoryBuffer, mSystemDir, 1, 6000, - mStepDetailsCalculator, mClock, mMonotonicClock, mTracer); + mStepDetailsCalculator, mClock, mMonotonicClock, mTracer, mEventLogger); mHistory.forceRecordAllHistory(); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java index 8d51592667c8..548fae7a0b01 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsImplTest.java @@ -31,15 +31,18 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.bluetooth.BluetoothActivityEnergyInfo; import android.bluetooth.UidTraffic; import android.content.Context; +import android.hardware.SensorManager; import android.os.BatteryConsumer; import android.os.BatteryManager; import android.os.BatteryStats; @@ -51,11 +54,11 @@ import android.os.HandlerThread; import android.os.Parcel; import android.os.WakeLockStats; import android.os.WorkSource; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.SparseArray; import android.view.Display; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.CpuScalingPolicies; @@ -68,19 +71,26 @@ import com.google.common.collect.ImmutableList; import com.google.common.truth.LongSubject; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.time.Instant; import java.util.List; -@LargeTest @RunWith(AndroidJUnit4.class) @SuppressWarnings("GuardedBy") public class BatteryStatsImplTest { + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + @Mock private KernelCpuUidFreqTimeReader mKernelUidCpuFreqTimeReader; @Mock @@ -110,7 +120,7 @@ public class BatteryStatsImplTest { private PowerStatsExporter mPowerStatsExporter; @Before - public void setUp() { + public void setUp() throws IOException { MockitoAnnotations.initMocks(this); when(mKernelUidCpuFreqTimeReader.isFastCpuTimesReader()).thenReturn(true); @@ -128,8 +138,17 @@ public class BatteryStatsImplTest { .setKernelSingleUidTimeReader(mKernelSingleUidTimeReader) .setKernelWakelockReader(mKernelWakelockReader); - final Context context = InstrumentationRegistry.getContext(); - File systemDir = context.getCacheDir(); + File systemDir = Files.createTempDirectory("BatteryStatsHistoryTest").toFile(); + + Context context; + if (RavenwoodRule.isUnderRavenwood()) { + context = mock(Context.class); + SensorManager sensorManager = mock(SensorManager.class); + when(sensorManager.getSensorList(anyInt())).thenReturn(List.of()); + when(context.getSystemService(SensorManager.class)).thenReturn(sensorManager); + } else { + context = InstrumentationRegistry.getContext(); + } mPowerStatsStore = new PowerStatsStore(systemDir, mHandler, new AggregatedPowerStatsConfig()); mBatteryUsageStatsProvider = new BatteryUsageStatsProvider(context, mPowerStatsExporter, @@ -747,14 +766,22 @@ public class BatteryStatsImplTest { } private UidTraffic createUidTraffic(int appUid, long rxBytes, long txBytes) { - final Parcel parcel = Parcel.obtain(); - parcel.writeInt(appUid); // mAppUid - parcel.writeLong(rxBytes); // mRxBytes - parcel.writeLong(txBytes); // mTxBytes - parcel.setDataPosition(0); - UidTraffic uidTraffic = UidTraffic.CREATOR.createFromParcel(parcel); - parcel.recycle(); - return uidTraffic; + if (RavenwoodRule.isUnderRavenwood()) { + UidTraffic uidTraffic = mock(UidTraffic.class); + when(uidTraffic.getUid()).thenReturn(appUid); + when(uidTraffic.getRxBytes()).thenReturn(rxBytes); + when(uidTraffic.getTxBytes()).thenReturn(txBytes); + return uidTraffic; + } else { + final Parcel parcel = Parcel.obtain(); + parcel.writeInt(appUid); // mAppUid + parcel.writeLong(rxBytes); // mRxBytes + parcel.writeLong(txBytes); // mTxBytes + parcel.setDataPosition(0); + UidTraffic uidTraffic = UidTraffic.CREATOR.createFromParcel(parcel); + parcel.recycle(); + return uidTraffic; + } } private BluetoothActivityEnergyInfo createBluetoothActivityEnergyInfo( @@ -764,21 +791,31 @@ public class BatteryStatsImplTest { long controllerIdleTimeMs, long controllerEnergyUsed, UidTraffic... uidTraffic) { - Parcel parcel = Parcel.obtain(); - parcel.writeLong(timestamp); // mTimestamp - parcel.writeInt( - BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE); // mBluetoothStackState - parcel.writeLong(controllerTxTimeMs); // mControllerTxTimeMs; - parcel.writeLong(controllerRxTimeMs); // mControllerRxTimeMs; - parcel.writeLong(controllerIdleTimeMs); // mControllerIdleTimeMs; - parcel.writeLong(controllerEnergyUsed); // mControllerEnergyUsed; - parcel.writeTypedList(ImmutableList.copyOf(uidTraffic)); // mUidTraffic - parcel.setDataPosition(0); - - BluetoothActivityEnergyInfo info = - BluetoothActivityEnergyInfo.CREATOR.createFromParcel(parcel); - parcel.recycle(); - return info; + if (RavenwoodRule.isUnderRavenwood()) { + BluetoothActivityEnergyInfo info = mock(BluetoothActivityEnergyInfo.class); + when(info.getTimestampMillis()).thenReturn(timestamp); + when(info.getControllerTxTimeMillis()).thenReturn(controllerTxTimeMs); + when(info.getControllerRxTimeMillis()).thenReturn(controllerRxTimeMs); + when(info.getControllerIdleTimeMillis()).thenReturn(controllerIdleTimeMs); + when(info.getControllerEnergyUsed()).thenReturn(controllerEnergyUsed); + when(info.getUidTraffic()).thenReturn(ImmutableList.copyOf(uidTraffic)); + return info; + } else { + Parcel parcel = Parcel.obtain(); + parcel.writeLong(timestamp); // mTimestamp + parcel.writeInt(BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE); + parcel.writeLong(controllerTxTimeMs); // mControllerTxTimeMs; + parcel.writeLong(controllerRxTimeMs); // mControllerRxTimeMs; + parcel.writeLong(controllerIdleTimeMs); // mControllerIdleTimeMs; + parcel.writeLong(controllerEnergyUsed); // mControllerEnergyUsed; + parcel.writeTypedList(ImmutableList.copyOf(uidTraffic)); // mUidTraffic + parcel.setDataPosition(0); + + BluetoothActivityEnergyInfo info = + BluetoothActivityEnergyInfo.CREATOR.createFromParcel(parcel); + parcel.recycle(); + return info; + } } @Test diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsNoteTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsNoteTest.java index eea287568e13..07cefa9ae878 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsNoteTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsNoteTest.java @@ -28,6 +28,10 @@ import static com.android.server.power.stats.BatteryStatsImpl.ExternalStatsSync. import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import android.app.ActivityManager; @@ -40,6 +44,7 @@ import android.os.Looper; import android.os.Process; import android.os.UserHandle; import android.os.WorkSource; +import android.platform.test.ravenwood.RavenwoodRule; import android.telephony.AccessNetworkConstants; import android.telephony.ActivityStatsTechSpecificInfo; import android.telephony.Annotation; @@ -50,7 +55,6 @@ import android.telephony.NetworkRegistrationInfo; import android.telephony.ServiceState; import android.telephony.TelephonyManager; import android.util.Log; -import android.util.MutableInt; import android.util.SparseIntArray; import android.util.SparseLongArray; import android.view.Display; @@ -63,8 +67,8 @@ import com.android.internal.os.PowerProfile; import com.android.internal.power.EnergyConsumerStats; import com.android.server.power.stats.BatteryStatsImpl.DualTimer; -import junit.framework.TestCase; - +import org.junit.Rule; +import org.junit.Test; import org.mockito.Mock; import java.util.ArrayList; @@ -78,7 +82,14 @@ import java.util.function.IntConsumer; * Test various BatteryStatsImpl noteStart methods. */ @SuppressWarnings("GuardedBy") -public class BatteryStatsNoteTest extends TestCase { +@SmallTest +public class BatteryStatsNoteTest { + + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final String TAG = BatteryStatsNoteTest.class.getSimpleName(); private static final int UID = 10500; @@ -96,7 +107,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.Uid.noteBluetoothScanResultLocked. */ - @SmallTest + @Test public void testNoteBluetoothScanResultLocked() throws Exception { MockBatteryStatsImpl bi = new MockBatteryStatsImpl(new MockClock()); bi.updateTimeBasesLocked(true, Display.STATE_OFF, 0, 0); @@ -125,7 +136,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.Uid.noteStartWakeLocked. */ - @SmallTest + @Test public void testNoteStartWakeLocked() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -155,7 +166,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.Uid.noteStartWakeLocked for an isolated uid. */ - @SmallTest + @Test public void testNoteStartWakeLocked_isolatedUid() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms PowerStatsUidResolver uidResolver = new PowerStatsUidResolver(); @@ -197,7 +208,7 @@ public class BatteryStatsNoteTest extends TestCase { * Test BatteryStatsImpl.Uid.noteStartWakeLocked for an isolated uid, with a race where the * isolated uid is removed from batterystats before the wakelock has been stopped. */ - @SmallTest + @Test public void testNoteStartWakeLocked_isolatedUidRace() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms PowerStatsUidResolver uidResolver = new PowerStatsUidResolver(); @@ -241,7 +252,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.Uid.noteLongPartialWakelockStart for an isolated uid. */ - @SmallTest + @Test public void testNoteLongPartialWakelockStart_isolatedUid() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms PowerStatsUidResolver uidResolver = new PowerStatsUidResolver(); @@ -296,7 +307,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.Uid.noteLongPartialWakelockStart for an isolated uid. */ - @SmallTest + @Test public void testNoteLongPartialWakelockStart_isolatedUidRace() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms PowerStatsUidResolver uidResolver = new PowerStatsUidResolver(); @@ -354,7 +365,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.noteUidProcessStateLocked. */ - @SmallTest + @Test public void testNoteUidProcessStateLocked() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -441,7 +452,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.updateTimeBasesLocked. */ - @SmallTest + @Test public void testUpdateTimeBasesLocked() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -465,7 +476,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.noteScreenStateLocked sets timebases and screen states correctly. */ - @SmallTest + @Test public void testNoteScreenStateLocked() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -512,7 +523,7 @@ public class BatteryStatsNoteTest extends TestCase { * Test BatteryStatsImpl.noteScreenStateLocked sets timebases and screen states correctly for * multi display devices */ - @SmallTest + @Test public void testNoteScreenStateLocked_multiDisplay() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -606,7 +617,7 @@ public class BatteryStatsNoteTest extends TestCase { * Off ------- ---------------------- * Doze ---------------- */ - @SmallTest + @Test public void testNoteScreenStateTimersLocked() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -656,7 +667,7 @@ public class BatteryStatsNoteTest extends TestCase { * Test BatteryStatsImpl.noteScreenStateLocked updates timers correctly for multi display * devices. */ - @SmallTest + @Test public void testNoteScreenStateTimersLocked_multiDisplay() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -807,7 +818,7 @@ public class BatteryStatsNoteTest extends TestCase { /** * Test BatteryStatsImpl.noteScreenBrightnessLocked updates timers correctly. */ - @SmallTest + @Test public void testScreenBrightnessLocked_multiDisplay() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -929,7 +940,7 @@ public class BatteryStatsNoteTest extends TestCase { checkScreenBrightnesses(overallExpected, perDisplayExpected, bi, bk.currentTimeMs); } - @SmallTest + @Test public void testAlarmStartAndFinishLocked() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -967,7 +978,7 @@ public class BatteryStatsNoteTest extends TestCase { assertThat(iterator.next()).isNull(); } - @SmallTest + @Test public void testAlarmStartAndFinishLocked_workSource() throws Exception { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1013,7 +1024,7 @@ public class BatteryStatsNoteTest extends TestCase { assertEquals(500, item.eventTag.uid); } - @SmallTest + @Test public void testNoteWakupAlarmLocked() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1031,7 +1042,7 @@ public class BatteryStatsNoteTest extends TestCase { assertEquals(1, pkg.getWakeupAlarmStats().size()); } - @SmallTest + @Test public void testNoteWakupAlarmLocked_workSource_uid() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1064,7 +1075,7 @@ public class BatteryStatsNoteTest extends TestCase { assertEquals(1, pkg.getWakeupAlarmStats().size()); } - @SmallTest + @Test public void testNoteWakupAlarmLocked_workSource_workChain() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1090,7 +1101,7 @@ public class BatteryStatsNoteTest extends TestCase { assertEquals(0, pkg.getWakeupAlarmStats().size()); } - @SmallTest + @Test public void testNoteGpsChanged() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1114,7 +1125,7 @@ public class BatteryStatsNoteTest extends TestCase { assertFalse(t.isRunningLocked()); } - @SmallTest + @Test public void testNoteGpsChanged_workSource() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1138,7 +1149,7 @@ public class BatteryStatsNoteTest extends TestCase { assertFalse(t.isRunningLocked()); } - @SmallTest + @Test public void testUpdateDisplayMeasuredEnergyStatsLocked() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1223,7 +1234,7 @@ public class BatteryStatsNoteTest extends TestCase { checkMeasuredCharge("H", uid1, blame1, uid2, blame2, globalDoze, bi); } - @SmallTest + @Test public void testUpdateCustomMeasuredEnergyStatsLocked_neverCalled() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1237,7 +1248,7 @@ public class BatteryStatsNoteTest extends TestCase { checkCustomBatteryConsumption("0", 0, 0, uid1, 0, 0, uid2, 0, 0, bi); } - @SmallTest + @Test public void testUpdateCustomMeasuredEnergyStatsLocked() { final MockClock clocks = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -1314,7 +1325,7 @@ public class BatteryStatsNoteTest extends TestCase { "D", totalBlameA, totalBlameB, uid1, blame1A, blame1B, uid2, blame2A, blame2B, bi); } - @SmallTest + @Test public void testGetPerStateActiveRadioDurationMs_noModemActivity() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); @@ -1470,7 +1481,7 @@ public class BatteryStatsNoteTest extends TestCase { expectedTxDurationsMs, bi, state.currentTimeMs); } - @SmallTest + @Test public void testGetPerStateActiveRadioDurationMs_initialModemActivity() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); @@ -1612,7 +1623,7 @@ public class BatteryStatsNoteTest extends TestCase { expectedTxDurationsMs, bi, state.currentTimeMs); } - @SmallTest + @Test public void testGetPerStateActiveRadioDurationMs_withModemActivity() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); @@ -1852,7 +1863,7 @@ public class BatteryStatsNoteTest extends TestCase { expectedTxDurationsMs, bi, state.currentTimeMs); } - @SmallTest + @Test public void testGetPerStateActiveRadioDurationMs_withSpecificInfoModemActivity() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); @@ -2145,19 +2156,19 @@ public class BatteryStatsNoteTest extends TestCase { expectedTxDurationsMs, bi, state.currentTimeMs); } - @SmallTest + @Test @SuppressWarnings("GuardedBy") public void testProcStateSyncScheduling_mobileRadioActiveState() { final MockClock clock = new MockClock(); // holds realtime and uptime in ms final MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clock); - final MutableInt lastProcStateChangeFlags = new MutableInt(0); + final int[] lastProcStateChangeFlags = new int[1]; MockBatteryStatsImpl.DummyExternalStatsSync externalStatsSync = new MockBatteryStatsImpl.DummyExternalStatsSync() { @Override public void scheduleSyncDueToProcessStateChange(int flags, long delayMillis) { - lastProcStateChangeFlags.value = flags; + lastProcStateChangeFlags[0] = flags; } }; @@ -2170,19 +2181,19 @@ public class BatteryStatsNoteTest extends TestCase { bi.noteMobileRadioPowerStateLocked(DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH, curr, UID); - lastProcStateChangeFlags.value = 0; + lastProcStateChangeFlags[0] = 0; clock.realtime = clock.uptime = 2002; bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND); final int allProcFlags = BatteryStatsImpl.ExternalStatsSync.UPDATE_ON_PROC_STATE_CHANGE; - assertEquals(allProcFlags, lastProcStateChangeFlags.value); + assertEquals(allProcFlags, lastProcStateChangeFlags[0]); // Note mobile radio is off. curr = 1000L * (clock.realtime = clock.uptime = 3003); bi.noteMobileRadioPowerStateLocked(DataConnectionRealTimeInfo.DC_POWER_STATE_LOW, curr, UID); - lastProcStateChangeFlags.value = 0; + lastProcStateChangeFlags[0] = 0; clock.realtime = clock.uptime = 4004; bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_CACHED_EMPTY); @@ -2190,10 +2201,10 @@ public class BatteryStatsNoteTest extends TestCase { & ~BatteryStatsImpl.ExternalStatsSync.UPDATE_RADIO; assertEquals( "An inactive radio should not be queried on proc state change", - noRadioProcFlags, lastProcStateChangeFlags.value); + noRadioProcFlags, lastProcStateChangeFlags[0]); } - @SmallTest + @Test public void testNoteMobileRadioPowerStateLocked() { long curr; boolean update; @@ -2243,7 +2254,7 @@ public class BatteryStatsNoteTest extends TestCase { update); } - @SmallTest + @Test public void testNoteMobileRadioPowerStateLocked_rateLimited() { long curr; boolean update; diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsSensorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsSensorTest.java index 9c70f376ca14..96780c322445 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsSensorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsSensorTest.java @@ -16,24 +16,36 @@ package com.android.server.power.stats; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import android.app.ActivityManager; import android.os.BatteryStats; +import android.platform.test.ravenwood.RavenwoodRule; import android.view.Display; import androidx.test.filters.SmallTest; -import junit.framework.TestCase; +import org.junit.Rule; +import org.junit.Test; /** * Test BatteryStatsImpl Sensor Timers. */ -public class BatteryStatsSensorTest extends TestCase { +@SmallTest +public class BatteryStatsSensorTest { + + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); private static final int UID = 10500; private static final int UID_2 = 10501; // second uid for testing pool usage private static final int SENSOR_ID = -10000; - @SmallTest + @Test public void testSensorStartStop() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -70,7 +82,7 @@ public class BatteryStatsSensorTest extends TestCase { clocks.realtime * 1000, BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testCountingWhileOffBattery() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -106,7 +118,7 @@ public class BatteryStatsSensorTest extends TestCase { assertEquals(0, sensorTimer.getCountLocked(BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testCountingWhileOnBattery() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -141,7 +153,7 @@ public class BatteryStatsSensorTest extends TestCase { assertEquals(1, sensorTimer.getCountLocked(BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testBatteryStatusOnToOff() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -187,7 +199,7 @@ public class BatteryStatsSensorTest extends TestCase { sensorTimer.getTotalTimeLocked(curr, BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testBatteryStatusOffToOn() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -238,7 +250,7 @@ public class BatteryStatsSensorTest extends TestCase { assertEquals(0, sensorTimer.getCountLocked(BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testPooledBackgroundUsage() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -375,7 +387,7 @@ public class BatteryStatsSensorTest extends TestCase { assertEquals(2, bgTimer2.getCountLocked(BatteryStats.STATS_SINCE_CHARGED)); } - @SmallTest + @Test public void testSensorReset() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); @@ -419,7 +431,7 @@ public class BatteryStatsSensorTest extends TestCase { assertNull(sensor); } - @SmallTest + @Test public void testSensorResetTimes() throws Exception { final MockClock clocks = new MockClock(); MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsServTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsServTest.java index 200eb1d0ad15..6f683ae5e0c0 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsServTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsServTest.java @@ -18,16 +18,25 @@ package com.android.server.power.stats; import android.os.BatteryStats; import android.os.Parcel; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import junit.framework.Assert; -import junit.framework.TestCase; + +import org.junit.Rule; +import org.junit.Test; /** * Provides test cases for android.os.BatteryStats. */ -public class BatteryStatsServTest extends TestCase { +@SmallTest +public class BatteryStatsServTest { + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final String TAG = "BatteryStatsServTest"; public static class TestServ extends BatteryStatsImpl.Uid.Pkg.Serv { @@ -90,7 +99,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test that the constructor and detach methods touch the time bast observer list. */ - @SmallTest + @Test public void testConstructAndDetach() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); @@ -104,7 +113,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test parceling and unparceling. */ - @SmallTest + @Test public void testParceling() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ orig = new TestServ(bsi); @@ -133,7 +142,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getLaunchTimeToNow() */ - @SmallTest + @Test public void testLaunchTimeToNow() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -151,7 +160,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getStartTimeToNow() */ - @SmallTest + @Test public void testStartTimeToNow() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -168,7 +177,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test startLaunchedLocked while not previously launched */ - @SmallTest + @Test public void testStartLaunchedLockedWhileLaunched() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -197,7 +206,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test startLaunchedLocked while previously launched */ - @SmallTest + @Test public void testStartLaunchedLockedWhileNotLaunched() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -224,7 +233,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test stopLaunchedLocked when not previously launched. */ - @SmallTest + @Test public void testStopLaunchedLockedWhileNotLaunched() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -254,7 +263,7 @@ public class BatteryStatsServTest extends TestCase { * Test stopLaunchedLocked when previously launched, with measurable time between * start and stop. */ - @SmallTest + @Test public void testStopLaunchedLockedWhileLaunchedNormal() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -283,7 +292,7 @@ public class BatteryStatsServTest extends TestCase { * Test stopLaunchedLocked when previously launched, with no measurable time between * start and stop. */ - @SmallTest + @Test public void testStopLaunchedLockedWhileLaunchedTooQuick() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -306,7 +315,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test startRunningLocked while previously running */ - @SmallTest + @Test public void testStartRunningLockedWhileRunning() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -335,7 +344,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test startRunningLocked while not previously launched */ - @SmallTest + @Test public void testStartRunningLockedWhileNotRunning() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -364,7 +373,7 @@ public class BatteryStatsServTest extends TestCase { * Test stopRunningLocked when previously launched, with measurable time between * start and stop. */ - @SmallTest + @Test public void testStopRunningLockedWhileRunningNormal() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() { @Override @@ -393,7 +402,7 @@ public class BatteryStatsServTest extends TestCase { * Test stopRunningLocked when previously launched, with measurable time between * start and stop. */ - @SmallTest + @Test public void testStopRunningLockedWhileRunningTooQuick() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -416,7 +425,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test that getBatteryStats returns the BatteryStatsImpl passed in to the contstructor. */ - @SmallTest + @Test public void testGetBatteryStats() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -427,7 +436,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getLaunches */ - @SmallTest + @Test public void testGetLaunches() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -449,7 +458,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getStartTime while running */ - @SmallTest + @Test public void testGetStartTimeRunning() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -475,7 +484,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getStartTime while not running */ - @SmallTest + @Test public void testGetStartTimeNotRunning() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -502,7 +511,7 @@ public class BatteryStatsServTest extends TestCase { /** * Test getStarts */ - @SmallTest + @Test public void testGetStarts() throws Exception { MockBatteryStatsImpl bsi = new MockBatteryStatsImpl(); TestServ serv = new TestServ(bsi); @@ -521,4 +530,3 @@ public class BatteryStatsServTest extends TestCase { Assert.assertEquals(8085, serv.getLaunches()); } } - diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsUserLifecycleTests.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsUserLifecycleTests.java index face849620d7..05d8a005d21e 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsUserLifecycleTests.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryStatsUserLifecycleTests.java @@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit; @LargeTest @RunWith(AndroidJUnit4.class) +@android.platform.test.annotations.IgnoreUnderRavenwood public class BatteryStatsUserLifecycleTests { private static final long POLL_INTERVAL_MS = 500; diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java index 2e0ba0083850..6cd79bc09fb6 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsProviderTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.content.Context; +import android.hardware.SensorManager; import android.os.BatteryConsumer; import android.os.BatteryManager; import android.os.BatteryStats; @@ -32,6 +33,7 @@ import android.os.ConditionVariable; import android.os.Parcel; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; @@ -40,36 +42,69 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BatteryStatsHistoryIterator; import com.android.internal.os.PowerProfile; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.util.List; -import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) public class BatteryUsageStatsProviderTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; private static final long MINUTE_IN_MS = 60 * 1000; private static final double PRECISION = 0.00001; - private final File mHistoryDir = createTemporaryDirectory(); + private File mHistoryDir; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule(12345, mHistoryDir) .setAveragePower(PowerProfile.POWER_FLASHLIGHT, 360.0) .setAveragePower(PowerProfile.POWER_AUDIO, 720.0); + private MockClock mMockClock = mStatsRule.getMockClock(); + private Context mContext; + + @Before + public void setup() throws IOException { + mHistoryDir = Files.createTempDirectory("BatteryUsageStatsProviderTest").toFile(); + clearDirectory(mHistoryDir); + + if (RavenwoodRule.isUnderRavenwood()) { + mContext = mock(Context.class); + SensorManager sensorManager = mock(SensorManager.class); + when(mContext.getSystemService(SensorManager.class)).thenReturn(sensorManager); + } else { + mContext = InstrumentationRegistry.getContext(); + } + } + + private void clearDirectory(File dir) { + if (dir.exists()) { + for (File child : dir.listFiles()) { + if (child.isDirectory()) { + clearDirectory(child); + } + child.delete(); + } + } + } @Test public void test_getBatteryUsageStats() { BatteryStatsImpl batteryStats = prepareBatteryStats(); - Context context = InstrumentationRegistry.getContext(); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), null, mMockClock); final BatteryUsageStats batteryUsageStats = @@ -105,8 +140,7 @@ public class BatteryUsageStatsProviderTest { public void test_selectPowerComponents() { BatteryStatsImpl batteryStats = prepareBatteryStats(); - Context context = InstrumentationRegistry.getContext(); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), null, mMockClock); final BatteryUsageStats batteryUsageStats = @@ -211,8 +245,7 @@ public class BatteryUsageStatsProviderTest { batteryStats.noteAlarmFinishLocked("foo", null, APP_UID, 3_001_000, 2_001_000); } - Context context = InstrumentationRegistry.getContext(); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), null, mMockClock); final BatteryUsageStats batteryUsageStats = @@ -300,8 +333,7 @@ public class BatteryUsageStatsProviderTest { } } - Context context = InstrumentationRegistry.getContext(); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), null, mMockClock); final BatteryUsageStats batteryUsageStats = @@ -311,7 +343,9 @@ public class BatteryUsageStatsProviderTest { Parcel parcel = Parcel.obtain(); parcel.writeParcelable(batteryUsageStats, 0); - assertThat(parcel.dataSize()).isAtMost(128_000); + if (!RavenwoodRule.isUnderRavenwood()) { + assertThat(parcel.dataSize()).isAtMost(128_000); + } parcel.setDataPosition(0); @@ -375,7 +409,6 @@ public class BatteryUsageStatsProviderTest { @Test public void testAggregateBatteryStats() { - Context context = InstrumentationRegistry.getContext(); BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); setTime(5 * MINUTE_IN_MS); @@ -384,11 +417,11 @@ public class BatteryUsageStatsProviderTest { } PowerStatsStore powerStatsStore = new PowerStatsStore( - new File(context.getCacheDir(), "BatteryUsageStatsProviderTest"), + new File(mHistoryDir, "powerstatsstore"), mStatsRule.getHandler(), null); powerStatsStore.reset(); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), powerStatsStore, mMockClock); @@ -485,7 +518,6 @@ public class BatteryUsageStatsProviderTest { @Test public void testAggregateBatteryStats_incompatibleSnapshot() { - Context context = InstrumentationRegistry.getContext(); MockBatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); batteryStats.initMeasuredEnergyStats(new String[]{"FOO", "BAR"}); @@ -511,7 +543,7 @@ public class BatteryUsageStatsProviderTest { when(powerStatsStore.loadPowerStatsSpan(1, BatteryUsageStatsSection.TYPE)) .thenReturn(span1); - BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, null, + BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(mContext, null, mStatsRule.getPowerProfile(), mStatsRule.getCpuScalingPolicies(), powerStatsStore, mMockClock); @@ -523,20 +555,4 @@ public class BatteryUsageStatsProviderTest { .isEqualTo(batteryStats.getCustomEnergyConsumerNames()); assertThat(stats.getStatsDuration()).isEqualTo(1234); } - - private static final Random sRandom = new Random(); - - /** - * Creates a unique new temporary directory under "java.io.tmpdir". - */ - private static File createTemporaryDirectory() { - while (true) { - String candidateName = - BatteryUsageStatsProviderTest.class.getSimpleName() + sRandom.nextInt(); - File result = new File(System.getProperty("java.io.tmpdir"), candidateName); - if (result.mkdir()) { - return result; - } - } - } } 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 ba2b53854cd7..8bdb0292bf00 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 @@ -49,6 +49,7 @@ import org.mockito.stubbing.Answer; import java.io.File; import java.util.Arrays; +@SuppressWarnings("SynchronizeOnNonFinalField") public class BatteryUsageStatsRule implements TestRule { public static final BatteryUsageStatsQuery POWER_PROFILE_MODEL_ONLY = new BatteryUsageStatsQuery.Builder() @@ -71,6 +72,8 @@ public class BatteryUsageStatsRule implements TestRule { private int mDisplayCount = -1; private int mPerUidModemModel = -1; private NetworkStats mNetworkStats; + private boolean[] mSupportedStandardBuckets; + private String[] mCustomPowerComponentNames; public BatteryUsageStatsRule() { this(0, null); @@ -102,6 +105,11 @@ public class BatteryUsageStatsRule implements TestRule { mBatteryStats = new MockBatteryStatsImpl(mMockClock, mHistoryDir, mHandler); mBatteryStats.setPowerProfile(mPowerProfile); mBatteryStats.setCpuScalingPolicies(new CpuScalingPolicies(mCpusByPolicy, mFreqsByPolicy)); + synchronized (mBatteryStats) { + mBatteryStats.initEnergyConsumerStatsLocked(mSupportedStandardBuckets, + mCustomPowerComponentNames); + } + mBatteryStats.informThatAllExternalStatsAreFlushed(); mBatteryStats.onSystemReady(); @@ -230,13 +238,15 @@ public class BatteryUsageStatsRule implements TestRule { /** Call only after setting the power profile information. */ public BatteryUsageStatsRule initMeasuredEnergyStatsLocked( String[] customPowerComponentNames) { - final boolean[] supportedStandardBuckets = - new boolean[EnergyConsumerStats.NUMBER_STANDARD_POWER_BUCKETS]; - Arrays.fill(supportedStandardBuckets, true); - synchronized (mBatteryStats) { - mBatteryStats.initEnergyConsumerStatsLocked(supportedStandardBuckets, - customPowerComponentNames); - mBatteryStats.informThatAllExternalStatsAreFlushed(); + mCustomPowerComponentNames = customPowerComponentNames; + mSupportedStandardBuckets = new boolean[EnergyConsumerStats.NUMBER_STANDARD_POWER_BUCKETS]; + Arrays.fill(mSupportedStandardBuckets, true); + if (mBatteryStats != null) { + synchronized (mBatteryStats) { + mBatteryStats.initEnergyConsumerStatsLocked(mSupportedStandardBuckets, + mCustomPowerComponentNames); + mBatteryStats.informThatAllExternalStatsAreFlushed(); + } } return this; } 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 079ea2c7832f..851cf4a535a2 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 @@ -37,6 +37,7 @@ import android.os.BatteryUsageStats; import android.os.Parcel; import android.os.UidBatteryConsumer; import android.os.UserBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.Xml; import androidx.test.filters.SmallTest; @@ -45,6 +46,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -62,6 +64,10 @@ import java.util.stream.Collectors; @SmallTest @RunWith(AndroidJUnit4.class) public class BatteryUsageStatsTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); private static final int USER_ID = 42; private static final int APP_UID1 = 271; @@ -115,12 +121,13 @@ public class BatteryUsageStatsTest { final Parcel parcel = Parcel.obtain(); parcel.writeParcelable(outBatteryUsageStats, 0); - assertThat(parcel.dataSize()).isLessThan(2000); + // Under ravenwood this parcel is larger. On a device, 2K would suffice + assertThat(parcel.dataSize()).isLessThan(128_000); parcel.setDataPosition(0); final BatteryUsageStats inBatteryUsageStats = - parcel.readParcelable(getClass().getClassLoader()); + parcel.readParcelable(getClass().getClassLoader(), BatteryUsageStats.class); parcel.recycle(); assertThat(inBatteryUsageStats.getUidBatteryConsumers()).hasSize(uidCount); 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 4d4337c16757..fe6424f91d83 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 @@ -18,6 +18,9 @@ package com.android.server.power.stats; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import android.annotation.Nullable; import android.bluetooth.BluetoothActivityEnergyInfo; import android.bluetooth.UidTraffic; @@ -28,6 +31,7 @@ import android.os.Parcel; import android.os.Process; import android.os.UidBatteryConsumer; import android.os.WorkSource; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -46,10 +50,15 @@ import java.util.List; @SmallTest @SuppressWarnings("GuardedBy") public class BluetoothPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_IDLE, 10.0) .setAveragePower(PowerProfile.POWER_BLUETOOTH_CONTROLLER_RX, 50.0) @@ -331,33 +340,53 @@ public class BluetoothPowerCalculatorTest { assertThat(usageDurationMillis).isEqualTo(durationMs); } - private UidTraffic createUidTraffic(int uid, long traffic1, long traffic2) { - final Parcel uidTrafficParcel = Parcel.obtain(); - uidTrafficParcel.writeInt(uid); - uidTrafficParcel.writeLong(traffic1); - uidTrafficParcel.writeLong(traffic2); - uidTrafficParcel.setDataPosition(0); - - UidTraffic traffic = UidTraffic.CREATOR.createFromParcel(uidTrafficParcel); - uidTrafficParcel.recycle(); - return traffic; + private UidTraffic createUidTraffic(int appUid, long rxBytes, long txBytes) { + if (RavenwoodRule.isUnderRavenwood()) { + UidTraffic uidTraffic = mock(UidTraffic.class); + when(uidTraffic.getUid()).thenReturn(appUid); + when(uidTraffic.getRxBytes()).thenReturn(rxBytes); + when(uidTraffic.getTxBytes()).thenReturn(txBytes); + return uidTraffic; + } else { + final Parcel uidTrafficParcel = Parcel.obtain(); + uidTrafficParcel.writeInt(appUid); + uidTrafficParcel.writeLong(rxBytes); + uidTrafficParcel.writeLong(txBytes); + uidTrafficParcel.setDataPosition(0); + + UidTraffic traffic = UidTraffic.CREATOR.createFromParcel(uidTrafficParcel); + uidTrafficParcel.recycle(); + return traffic; + } } private BluetoothActivityEnergyInfo createBtEnergyInfo(long timestamp, int stackState, long txTime, long rxTime, long idleTime, long energyUsed, List<UidTraffic> traffic) { - final Parcel btActivityEnergyInfoParcel = Parcel.obtain(); - btActivityEnergyInfoParcel.writeLong(timestamp); - btActivityEnergyInfoParcel.writeInt(stackState); - btActivityEnergyInfoParcel.writeLong(txTime); - btActivityEnergyInfoParcel.writeLong(rxTime); - btActivityEnergyInfoParcel.writeLong(idleTime); - btActivityEnergyInfoParcel.writeLong(energyUsed); - btActivityEnergyInfoParcel.writeTypedList(traffic); - btActivityEnergyInfoParcel.setDataPosition(0); - - BluetoothActivityEnergyInfo info = BluetoothActivityEnergyInfo.CREATOR - .createFromParcel(btActivityEnergyInfoParcel); - btActivityEnergyInfoParcel.recycle(); - return info; + if (RavenwoodRule.isUnderRavenwood()) { + BluetoothActivityEnergyInfo info = mock(BluetoothActivityEnergyInfo.class); + when(info.getTimestampMillis()).thenReturn(timestamp); + when(info.getBluetoothStackState()).thenReturn(stackState); + when(info.getControllerTxTimeMillis()).thenReturn(txTime); + when(info.getControllerRxTimeMillis()).thenReturn(rxTime); + when(info.getControllerIdleTimeMillis()).thenReturn(idleTime); + when(info.getControllerEnergyUsed()).thenReturn(energyUsed); + when(info.getUidTraffic()).thenReturn(ImmutableList.copyOf(traffic)); + return info; + } else { + final Parcel btActivityEnergyInfoParcel = Parcel.obtain(); + btActivityEnergyInfoParcel.writeLong(timestamp); + btActivityEnergyInfoParcel.writeInt(stackState); + btActivityEnergyInfoParcel.writeLong(txTime); + btActivityEnergyInfoParcel.writeLong(rxTime); + btActivityEnergyInfoParcel.writeLong(idleTime); + btActivityEnergyInfoParcel.writeLong(energyUsed); + btActivityEnergyInfoParcel.writeTypedList(traffic); + btActivityEnergyInfoParcel.setDataPosition(0); + + BluetoothActivityEnergyInfo info = BluetoothActivityEnergyInfo.CREATOR + .createFromParcel(btActivityEnergyInfoParcel); + btActivityEnergyInfoParcel.recycle(); + return info; + } } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BstatsCpuTimesValidationTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BstatsCpuTimesValidationTest.java index ccace40bb056..29e2f5ee163a 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BstatsCpuTimesValidationTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BstatsCpuTimesValidationTest.java @@ -75,6 +75,7 @@ import java.util.regex.Pattern; @LargeTest @RunWith(AndroidJUnit4.class) +@android.platform.test.annotations.IgnoreUnderRavenwood public class BstatsCpuTimesValidationTest { private static final String TAG = BstatsCpuTimesValidationTest.class.getSimpleName(); 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 5fce32f0598a..7225f2d3995c 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 @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,12 +35,17 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class CameraPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP1_UID = Process.FIRST_APPLICATION_UID + 42; private static final int APP2_UID = Process.FIRST_APPLICATION_UID + 43; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CAMERA, 360.0) .initMeasuredEnergyStatsLocked(); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java index 993d834b9500..5c0e26887505 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuAggregatedPowerStatsProcessorTest.java @@ -33,6 +33,7 @@ import static org.junit.Assert.fail; import android.os.BatteryConsumer; import android.os.PersistableBundle; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.LongArray; import androidx.test.filters.SmallTest; @@ -55,7 +56,12 @@ import java.util.Map; @RunWith(AndroidJUnit4.class) @SmallTest public class CpuAggregatedPowerStatsProcessorTest { - @Rule + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CPU_ACTIVE, 720) .setCpuScalingPolicy(0, new int[]{0, 1}, new int[]{100, 200}) 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 888bc623f669..71a65c85d9e1 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 @@ -32,6 +32,7 @@ import android.os.BatteryStats; import android.os.BatteryUsageStatsQuery; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.SparseArray; import androidx.test.filters.SmallTest; @@ -55,6 +56,11 @@ import org.mockito.MockitoAnnotations; @SmallTest @SuppressWarnings("GuardedBy") public class CpuPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID1 = Process.FIRST_APPLICATION_UID + 42; @@ -62,7 +68,7 @@ public class CpuPowerCalculatorTest { private static final int NUM_CPU_FREQS = 2 + 2; // 2 clusters * 2 freqs each - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CPU_ACTIVE, 720) .setCpuScalingPolicy(0, new int[]{0, 1}, new int[]{100, 200}) @@ -93,14 +99,13 @@ public class CpuPowerCalculatorTest { private SystemServerCpuThreadReader mMockSystemServerCpuThreadReader; @Mock private KernelSingleUidTimeReader mMockKernelSingleUidTimeReader; + private boolean[] mSupportedPowerBuckets; @Before public void setUp() { MockitoAnnotations.initMocks(this); - final boolean[] supportedPowerBuckets = - new boolean[EnergyConsumerStats.NUMBER_STANDARD_POWER_BUCKETS]; - supportedPowerBuckets[EnergyConsumerStats.POWER_BUCKET_CPU] = true; + mSupportedPowerBuckets = new boolean[EnergyConsumerStats.NUMBER_STANDARD_POWER_BUCKETS]; when(mMockCpuUidFreqTimeReader.isFastCpuTimesReader()).thenReturn(true); @@ -112,8 +117,7 @@ public class CpuPowerCalculatorTest { .setKernelCpuUidUserSysTimeReader(mMockKernelCpuUidUserSysTimeReader) .setKernelCpuUidActiveTimeReader(mMockKerneCpuUidActiveTimeReader) .setKernelSingleUidTimeReader(mMockKernelSingleUidTimeReader) - .setSystemServerCpuThreadReader(mMockSystemServerCpuThreadReader) - .initEnergyConsumerStatsLocked(supportedPowerBuckets, new String[0]); + .setSystemServerCpuThreadReader(mMockSystemServerCpuThreadReader); } @Test @@ -216,6 +220,10 @@ public class CpuPowerCalculatorTest { @Test public void testMeasuredEnergyBasedModel() { + mSupportedPowerBuckets[EnergyConsumerStats.POWER_BUCKET_CPU] = true; + mStatsRule.getBatteryStats().initEnergyConsumerStatsLocked(mSupportedPowerBuckets, + new String[0]); + when(mMockUserInfoProvider.exists(anyInt())).thenReturn(true); when(mMockKernelCpuSpeedReaders[0].readDelta()).thenReturn(new long[]{1000, 2000}); @@ -397,6 +405,10 @@ public class CpuPowerCalculatorTest { @Test public void testMeasuredEnergyBasedModel_perProcessState() { + mSupportedPowerBuckets[EnergyConsumerStats.POWER_BUCKET_CPU] = true; + mStatsRule.getBatteryStats().initEnergyConsumerStatsLocked(mSupportedPowerBuckets, + new String[0]); + when(mMockUserInfoProvider.exists(anyInt())).thenReturn(true); when(mMockKernelCpuSpeedReaders[0].readDelta()).thenReturn(new long[]{1000, 2000}); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerStatsCollectorValidationTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerStatsCollectorValidationTest.java index 38a5d1943f8b..cbce7e804de5 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerStatsCollectorValidationTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerStatsCollectorValidationTest.java @@ -52,6 +52,7 @@ import java.util.regex.Pattern; @RunWith(AndroidJUnit4.class) @LargeTest +@android.platform.test.annotations.IgnoreUnderRavenwood public class CpuPowerStatsCollectorValidationTest { @Rule public final CheckFlagsRule mCheckFlagsRule = diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java index 245faaf15cc8..4ab706e28cf8 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/CustomEnergyConsumerPowerCalculatorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import android.util.SparseLongArray; import androidx.test.filters.SmallTest; @@ -34,11 +35,16 @@ import org.junit.runner.RunWith; @SmallTest @SuppressWarnings("GuardedBy") public class CustomEnergyConsumerPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .initMeasuredEnergyStatsLocked(new String[]{"CUSTOM_COMPONENT1", "CUSTOM_COMPONENT2"}); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java index 0f85fdc375fb..757025ecc6f8 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/FlashlightPowerCalculatorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,11 +35,16 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class FlashlightPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_FLASHLIGHT, 360.0); 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 3f2a6d04c1e6..3b5658c2e40a 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 @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -35,12 +36,16 @@ import org.junit.runner.RunWith; @SmallTest @SuppressWarnings("GuardedBy") public class GnssPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; private static final int APP_UID2 = Process.FIRST_APPLICATION_UID + 222; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_GPS_ON, 360.0) .setAveragePower(PowerProfile.POWER_GPS_SIGNAL_QUALITY_BASED, diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/IdlePowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/IdlePowerCalculatorTest.java index 3d150af711f1..487d86446a19 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/IdlePowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/IdlePowerCalculatorTest.java @@ -19,6 +19,7 @@ package com.android.server.power.stats; import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -32,9 +33,14 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class IdlePowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CPU_IDLE, 720.0) .setAveragePower(PowerProfile.POWER_CPU_SUSPEND, 360.0); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/KernelWakelockReaderTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/KernelWakelockReaderTest.java index 2edfc8e1e408..e02386656cb5 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/KernelWakelockReaderTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/KernelWakelockReaderTest.java @@ -24,6 +24,7 @@ import junit.framework.TestCase; import java.nio.charset.Charset; +@android.platform.test.annotations.IgnoreUnderRavenwood public class KernelWakelockReaderTest extends TestCase { /** * Helper class that builds the mock Kernel module file /d/wakeup_sources. diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterArrayTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterArrayTest.java index 2e962c364ed2..1807ac5c6115 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterArrayTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterArrayTest.java @@ -24,7 +24,6 @@ import static com.android.server.power.stats.BatteryStatsImpl.TimeBase; import static org.junit.Assert.assertArrayEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.Parcel; @@ -159,7 +158,7 @@ public class LongSamplingCounterArrayTest { // Test with detachIfReset=false mCounterArray.reset(false /* detachIfReset */); assertArrayEquals(ZEROES, mCounterArray.mCounts); - verifyZeroInteractions(mTimeBase); + verifyNoMoreInteractions(mTimeBase); updateCounts(COUNTS); // Test with detachIfReset=true diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterTest.java index 0eac625051fc..4b608e35c11e 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/LongSamplingCounterTest.java @@ -24,7 +24,6 @@ import static com.android.server.power.stats.BatteryStatsImpl.TimeBase; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.Parcel; @@ -140,7 +139,7 @@ public class LongSamplingCounterTest { // Test with detachIfReset=false mCounter.reset(false /* detachIfReset */); assertEquals(0, getCount()); - verifyZeroInteractions(mTimeBase); + verifyNoMoreInteractions(mTimeBase); mCounter.addCountLocked(COUNT, true); assertEquals(COUNT, getCount()); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/MemoryPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/MemoryPowerCalculatorTest.java index 2cce449c6c05..3a27188e2643 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/MemoryPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/MemoryPowerCalculatorTest.java @@ -19,6 +19,7 @@ package com.android.server.power.stats; import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -32,9 +33,14 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class MemoryPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_MEMORY, new double[] {360.0, 720.0, 1080.0}); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/MockBatteryStatsImpl.java b/services/tests/powerstatstests/src/com/android/server/power/stats/MockBatteryStatsImpl.java index 78c4bac14a74..9f069130502f 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/MockBatteryStatsImpl.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/MockBatteryStatsImpl.java @@ -26,6 +26,7 @@ import android.os.Looper; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; +import com.android.internal.os.BatteryStatsHistory; import com.android.internal.os.Clock; import com.android.internal.os.CpuScalingPolicies; import com.android.internal.os.KernelCpuSpeedReader; @@ -70,7 +71,9 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { MockBatteryStatsImpl(Clock clock, File historyDirectory, Handler handler, PowerStatsUidResolver powerStatsUidResolver) { - super(clock, historyDirectory, handler, powerStatsUidResolver); + super(clock, historyDirectory, handler, powerStatsUidResolver, + mock(FrameworkStatsLogger.class), mock(BatteryStatsHistory.TraceDelegate.class), + mock(BatteryStatsHistory.EventLogger.class)); initTimersAndCounters(); setMaxHistoryBuffer(128 * 1024); @@ -107,7 +110,9 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { } public Queue<UidToRemove> getPendingRemovedUids() { - return mPendingRemovedUids; + synchronized (this) { + return mPendingRemovedUids; + } } public boolean isOnBattery() { @@ -275,6 +280,10 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { mHandler = handler; } + @Override + protected void updateBatteryPropertiesLocked() { + } + public static class DummyExternalStatsSync implements ExternalStatsSync { public int flags = 0; diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsAggregatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsAggregatorTest.java index 22a7351d0b9e..af5b462e017d 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsAggregatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsAggregatorTest.java @@ -60,7 +60,7 @@ public class PowerStatsAggregatorTest { public void setup() throws ParseException { mHistory = new BatteryStatsHistory(32, 1024, mock(BatteryStatsHistory.HistoryStepDetailsCalculator.class), mClock, - mMonotonicClock, mock(BatteryStatsHistory.TraceDelegate.class)); + mMonotonicClock, mock(BatteryStatsHistory.TraceDelegate.class), null); AggregatedPowerStatsConfig config = new AggregatedPowerStatsConfig(); config.trackPowerComponent(TEST_POWER_COMPONENT) @@ -178,7 +178,7 @@ public class PowerStatsAggregatorTest { } @NonNull - private static CharSequence formatDateTime(long timeInMillis) { + private static String formatDateTime(long timeInMillis) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); format.getCalendar().setTimeZone(TimeZone.getTimeZone("GMT")); return format.format(new Date(timeInMillis)); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsExporterTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsExporterTest.java index 3560a2620c8f..18d7b909150b 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsExporterTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsExporterTest.java @@ -99,7 +99,7 @@ public class PowerStatsExporterTest { mPowerStatsStore = new PowerStatsStore(storeDirectory, new TestHandler(), config); mHistory = new BatteryStatsHistory(Parcel.obtain(), storeDirectory, 0, 10000, mock(BatteryStatsHistory.HistoryStepDetailsCalculator.class), mClock, - mMonotonicClock, null); + mMonotonicClock, null, null); mPowerStatsAggregator = new PowerStatsAggregator(config, mHistory); mCpuStatsArrayLayout = new CpuPowerStatsCollector.CpuStatsArrayLayout(); 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 372307985f04..88d4ea75501d 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 @@ -25,6 +25,7 @@ import android.app.ActivityManager; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import android.view.Display; import androidx.test.filters.SmallTest; @@ -38,14 +39,18 @@ import org.junit.runner.RunWith; @SmallTest @SuppressWarnings("GuardedBy") public class ScreenPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID1 = Process.FIRST_APPLICATION_UID + 42; private static final int APP_UID2 = Process.FIRST_APPLICATION_UID + 43; private static final long MINUTE_IN_MS = 60 * 1000; private static final long MINUTE_IN_US = 60 * 1000 * 1000; - private static final long HOUR_IN_MS = 60 * MINUTE_IN_MS; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePowerForOrdinal(POWER_GROUP_DISPLAY_SCREEN_ON, 0, 36.0) .setAveragePowerForOrdinal(POWER_GROUP_DISPLAY_SCREEN_FULL, 0, 48.0) diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/SensorPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/SensorPowerCalculatorTest.java index 474527040839..c01f05f43c04 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/SensorPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/SensorPowerCalculatorTest.java @@ -27,6 +27,7 @@ import android.hardware.input.InputSensorInfo; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -40,6 +41,11 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest public class SensorPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int SENSOR_HANDLE_1 = 1; @@ -47,7 +53,7 @@ public class SensorPowerCalculatorTest { private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule(); @Test @@ -60,10 +66,12 @@ public class SensorPowerCalculatorTest { .thenReturn(List.of(sensor1, sensor2)); final BatteryStatsImpl stats = mStatsRule.getBatteryStats(); - stats.noteStartSensorLocked(APP_UID, SENSOR_HANDLE_1, 1000, 1000); - stats.noteStopSensorLocked(APP_UID, SENSOR_HANDLE_1, 2000, 2000); - stats.noteStartSensorLocked(APP_UID, SENSOR_HANDLE_2, 3000, 3000); - stats.noteStopSensorLocked(APP_UID, SENSOR_HANDLE_2, 5000, 5000); + synchronized (stats) { + stats.noteStartSensorLocked(APP_UID, SENSOR_HANDLE_1, 1000, 1000); + stats.noteStopSensorLocked(APP_UID, SENSOR_HANDLE_1, 2000, 2000); + stats.noteStartSensorLocked(APP_UID, SENSOR_HANDLE_2, 3000, 3000); + stats.noteStopSensorLocked(APP_UID, SENSOR_HANDLE_2, 5000, 5000); + } SensorPowerCalculator calculator = new SensorPowerCalculator(sensorManager); @@ -84,11 +92,20 @@ public class SensorPowerCalculatorTest { .isWithin(PRECISION).of(0.5); } - private Sensor createSensor(int handle, int type, double power) { - return new Sensor(new InputSensorInfo("name", "vendor", 0 /* version */, - handle, type, 100.0f /*maxRange */, 0.02f /* resolution */, - (float) power, 1000 /* minDelay */, 0 /* fifoReservedEventCount */, - 0 /* fifoMaxEventCount */, "" /* stringType */, "" /* requiredPermission */, - 0 /* maxDelay */, 0 /* flags */, 0 /* id */)); + private Sensor createSensor(int handle, int type, float power) { + if (RavenwoodRule.isUnderRavenwood()) { + Sensor sensor = mock(Sensor.class); + + when(sensor.getHandle()).thenReturn(handle); + when(sensor.getType()).thenReturn(type); + when(sensor.getPower()).thenReturn(power); + return sensor; + } else { + return new Sensor(new InputSensorInfo("name", "vendor", 0 /* version */, + handle, type, 100.0f /*maxRange */, 0.02f /* resolution */, + (float) power, 1000 /* minDelay */, 0 /* fifoReservedEventCount */, + 0 /* fifoMaxEventCount */, "" /* stringType */, "" /* requiredPermission */, + 0 /* maxDelay */, 0 /* flags */, 0 /* id */)); + } } } diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/UserPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/UserPowerCalculatorTest.java index f14745ef2daa..438f0ec36177 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/UserPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/UserPowerCalculatorTest.java @@ -25,6 +25,7 @@ import android.os.Process; import android.os.UidBatteryConsumer; import android.os.UserBatteryConsumer; import android.os.UserHandle; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -36,6 +37,11 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class UserPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + public static final int USER1 = 0; public static final int USER2 = 1625; @@ -43,7 +49,7 @@ public class UserPowerCalculatorTest { private static final int APP_UID2 = Process.FIRST_APPLICATION_UID + 272; private static final int APP_UID3 = Process.FIRST_APPLICATION_UID + 314; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule(); @Test diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/VideoPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/VideoPowerCalculatorTest.java index f578aa3b46be..b9b710118cc7 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/VideoPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/VideoPowerCalculatorTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryConsumer; import android.os.Process; import android.os.UidBatteryConsumer; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,11 +35,16 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class VideoPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_VIDEO, 360.0); diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/WakelockPowerCalculatorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/WakelockPowerCalculatorTest.java index f1961855f12f..5b7762d7de65 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/WakelockPowerCalculatorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/WakelockPowerCalculatorTest.java @@ -23,6 +23,7 @@ import android.os.BatteryStats; import android.os.Process; import android.os.UidBatteryConsumer; import android.os.WorkSource; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -36,12 +37,17 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest public class WakelockPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; private static final int APP_PID = 3145; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CPU_IDLE, 360.0); @@ -51,10 +57,12 @@ public class WakelockPowerCalculatorTest { BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats(); - batteryStats.noteStartWakeFromSourceLocked(new WorkSource(APP_UID), APP_PID, "awake", "", - BatteryStats.WAKE_TYPE_PARTIAL, true, 1000, 1000); - batteryStats.noteStopWakeFromSourceLocked(new WorkSource(APP_UID), APP_PID, "awake", "", - BatteryStats.WAKE_TYPE_PARTIAL, 2000, 2000); + synchronized (batteryStats) { + batteryStats.noteStartWakeFromSourceLocked(new WorkSource(APP_UID), APP_PID, "awake", + "", BatteryStats.WAKE_TYPE_PARTIAL, true, 1000, 1000); + batteryStats.noteStopWakeFromSourceLocked(new WorkSource(APP_UID), APP_PID, "awake", + "", BatteryStats.WAKE_TYPE_PARTIAL, 2000, 2000); + } mStatsRule.setTime(10_000, 6_000); 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 113be8b19518..8e221be261e9 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 @@ -23,6 +23,9 @@ import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import android.app.usage.NetworkStatsManager; import android.net.NetworkCapabilities; import android.net.NetworkStats; @@ -33,6 +36,7 @@ import android.os.Process; import android.os.UidBatteryConsumer; import android.os.WorkSource; import android.os.connectivity.WifiActivityEnergyInfo; +import android.platform.test.ravenwood.RavenwoodRule; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -44,10 +48,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import java.util.List; + @RunWith(AndroidJUnit4.class) @SmallTest @SuppressWarnings("GuardedBy") public class WifiPowerCalculatorTest { + @Rule(order = 0) + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private static final double PRECISION = 0.00001; private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42; @@ -55,7 +66,7 @@ public class WifiPowerCalculatorTest { @Mock NetworkStatsManager mNetworkStatsManager; - @Rule + @Rule(order = 1) public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_WIFI_CONTROLLER_IDLE, 360.0) .setAveragePower(PowerProfile.POWER_WIFI_CONTROLLER_RX, 480.0) @@ -64,6 +75,7 @@ public class WifiPowerCalculatorTest { .setAveragePower(PowerProfile.POWER_WIFI_SCAN, 480.0) .setAveragePower(PowerProfile.POWER_WIFI_BATCHED_SCAN, 720.0) .setAveragePower(PowerProfile.POWER_WIFI_ACTIVE, 1080.0) + .setAveragePower(PowerProfile.POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE, 3700) .initMeasuredEnergyStatsLocked(); /** Sets up a batterystats object with pre-populated network values. */ @@ -78,21 +90,54 @@ public class WifiPowerCalculatorTest { return batteryStats; } - private NetworkStats buildNetworkStats(long elapsedRealtime, int rxBytes, int rxPackets, - int txBytes, int txPackets) { - return new NetworkStats(elapsedRealtime, 1) - .addEntry(new NetworkStats.Entry("wifi", APP_UID, 0, 0, - METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, rxBytes, rxPackets, - txBytes, txPackets, 100)) - .addEntry(new NetworkStats.Entry("wifi", Process.WIFI_UID, 0, 0, - METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, 1111, 111, - 2222, 22, 111)); + private NetworkStats buildNetworkStats(long elapsedRealtime, long rxBytes, long rxPackets, + long txBytes, long txPackets) { + if (RavenwoodRule.isUnderRavenwood()) { + NetworkStats stats = mock(NetworkStats.class); +// when(stats.getElapsedRealtime()).thenReturn(elapsedRealtime); + + NetworkStats.Entry entry1 = mock(NetworkStats.Entry.class); +// when(entry1.getIface()).thenReturn("wifi"); + when(entry1.getUid()).thenReturn(APP_UID); + when(entry1.getMetered()).thenReturn(METERED_NO); + when(entry1.getRoaming()).thenReturn(ROAMING_NO); + when(entry1.getDefaultNetwork()).thenReturn(DEFAULT_NETWORK_NO); + when(entry1.getRxBytes()).thenReturn(rxBytes); + when(entry1.getRxPackets()).thenReturn(rxPackets); + when(entry1.getTxBytes()).thenReturn(txBytes); + when(entry1.getTxPackets()).thenReturn(txPackets); + when(entry1.getOperations()).thenReturn(100L); + + NetworkStats.Entry entry2 = mock(NetworkStats.Entry.class); +// when(entry2.getIface()).thenReturn("wifi"); + when(entry2.getUid()).thenReturn(Process.WIFI_UID); + when(entry2.getMetered()).thenReturn(METERED_NO); + when(entry2.getRoaming()).thenReturn(ROAMING_NO); + when(entry2.getDefaultNetwork()).thenReturn(DEFAULT_NETWORK_NO); + when(entry2.getRxBytes()).thenReturn(1111L); + when(entry2.getRxPackets()).thenReturn(111L); + when(entry2.getTxBytes()).thenReturn(2222L); + when(entry2.getTxPackets()).thenReturn(22L); + when(entry2.getOperations()).thenReturn(111L); + + when(stats.iterator()).thenAnswer(inv->List.of(entry1, entry2).iterator()); + + return stats; + } else { + return new NetworkStats(elapsedRealtime, 1) + .addEntry(new NetworkStats.Entry("wifi", APP_UID, 0, 0, + METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, rxBytes, rxPackets, + txBytes, txPackets, 100)) + .addEntry(new NetworkStats.Entry("wifi", Process.WIFI_UID, 0, 0, + METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, 1111, 111, + 2222, 22, 111)); + } } /** Sets up an WifiActivityEnergyInfo for ActivityController-model-based tests. */ private WifiActivityEnergyInfo setupPowerControllerBasedModelEnergyNumbersInfo() { - return new WifiActivityEnergyInfo(10000, - WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, 1000, 2000, 3000, 4000); + return buildWifiActivityEnergyInfo(10000L, WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, + 1000L, 2000L, 3000L, 4000L); } @Test @@ -142,7 +187,7 @@ public class WifiPowerCalculatorTest { uid.setProcessStateForTest( BatteryStats.Uid.PROCESS_STATE_FOREGROUND, 1000); - batteryStats.updateWifiState(new WifiActivityEnergyInfo(2000, + batteryStats.updateWifiState(buildWifiActivityEnergyInfo(2000, WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, 1000, 2000, 3000, 4000), POWER_DATA_UNAVAILABLE, 2000, 2000, mNetworkStatsManager); @@ -152,7 +197,7 @@ public class WifiPowerCalculatorTest { mStatsRule.setNetworkStats(buildNetworkStats(4000, 5000, 200, 7000, 80)); - batteryStats.updateWifiState(new WifiActivityEnergyInfo(4000, + batteryStats.updateWifiState(buildWifiActivityEnergyInfo(4000, WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, 5000, 6000, 7000, 8000), POWER_DATA_UNAVAILABLE, 4000, 4000, mNetworkStatsManager); @@ -231,7 +276,7 @@ public class WifiPowerCalculatorTest { uid.setProcessStateForTest( BatteryStats.Uid.PROCESS_STATE_FOREGROUND, 1000); - batteryStats.updateWifiState(new WifiActivityEnergyInfo(2000, + batteryStats.updateWifiState(buildWifiActivityEnergyInfo(2000, WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, 1000, 2000, 3000, 4000), 1_000_000, 2000, 2000, mNetworkStatsManager); @@ -241,7 +286,7 @@ public class WifiPowerCalculatorTest { mStatsRule.setNetworkStats(buildNetworkStats(4000, 5000, 200, 7000, 80)); - batteryStats.updateWifiState(new WifiActivityEnergyInfo(4000, + batteryStats.updateWifiState(buildWifiActivityEnergyInfo(4000, WifiActivityEnergyInfo.STACK_STATE_STATE_ACTIVE, 5000, 6000, 7000, 8000), 5_000_000, 4000, 4000, mNetworkStatsManager); @@ -329,4 +374,43 @@ public class WifiPowerCalculatorTest { assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI)) .isEqualTo(BatteryConsumer.POWER_MODEL_ENERGY_CONSUMPTION); } + + private WifiActivityEnergyInfo buildWifiActivityEnergyInfo(long timeSinceBoot, + int stackState, long txDuration, long rxDuration, long scanDuration, + long idleDuration) { + if (RavenwoodRule.isUnderRavenwood()) { + WifiActivityEnergyInfo info = mock(WifiActivityEnergyInfo.class); + when(info.getTimeSinceBootMillis()).thenReturn(timeSinceBoot); + when(info.getStackState()).thenReturn(stackState); + when(info.getControllerTxDurationMillis()).thenReturn(txDuration); + when(info.getControllerRxDurationMillis()).thenReturn(rxDuration); + when(info.getControllerScanDurationMillis()).thenReturn(scanDuration); + when(info.getControllerIdleDurationMillis()).thenReturn(idleDuration); + long energy = calculateEnergyMicroJoules(txDuration, rxDuration, idleDuration); + when(info.getControllerEnergyUsedMicroJoules()).thenReturn(energy); + return info; + } else { + return new WifiActivityEnergyInfo(timeSinceBoot, stackState, txDuration, rxDuration, + scanDuration, idleDuration); + } + } + + // See WifiActivityEnergyInfo + private long calculateEnergyMicroJoules( + long txDurationMillis, long rxDurationMillis, long idleDurationMillis) { + PowerProfile powerProfile = mStatsRule.getPowerProfile(); + final double idleCurrent = powerProfile.getAveragePower( + PowerProfile.POWER_WIFI_CONTROLLER_IDLE); + final double rxCurrent = powerProfile.getAveragePower( + PowerProfile.POWER_WIFI_CONTROLLER_RX); + final double txCurrent = powerProfile.getAveragePower( + PowerProfile.POWER_WIFI_CONTROLLER_TX); + final double voltage = powerProfile.getAveragePower( + PowerProfile.POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE) / 1000.0; + + return (long) ((txDurationMillis * txCurrent + + rxDurationMillis * rxCurrent + + idleDurationMillis * idleCurrent) + * voltage); + } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java index ef80b59e49f8..f86cb7bae8dc 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java @@ -21,9 +21,12 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.notNull; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -31,10 +34,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.Manifest; import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityTrace; +import android.accessibilityservice.BrailleDisplayController; import android.accessibilityservice.GestureDescription; import android.accessibilityservice.IAccessibilityServiceClient; +import android.accessibilityservice.IBrailleDisplayConnection; +import android.accessibilityservice.IBrailleDisplayController; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -43,6 +50,9 @@ import android.content.pm.ParceledListSlice; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.hardware.display.DisplayManager; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbManager; +import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; @@ -62,7 +72,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.Arrays; @@ -94,18 +106,30 @@ public class AccessibilityServiceConnectionTest { AccessibilityServiceInfo mServiceInfo; @Mock ResolveInfo mMockResolveInfo; @Mock AccessibilitySecurityPolicy mMockSecurityPolicy; - @Mock AccessibilityWindowManager mMockA11yWindowManager; - @Mock ActivityTaskManagerInternal mMockActivityTaskManagerInternal; - @Mock AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport; - @Mock AccessibilityTrace mMockA11yTrace; - @Mock WindowManagerInternal mMockWindowManagerInternal; - @Mock SystemActionPerformer mMockSystemActionPerformer; - @Mock KeyEventDispatcher mMockKeyEventDispatcher; + @Mock + AccessibilityWindowManager mMockA11yWindowManager; + @Mock + ActivityTaskManagerInternal mMockActivityTaskManagerInternal; + @Mock + AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport; + @Mock + AccessibilityTrace mMockA11yTrace; + @Mock + WindowManagerInternal mMockWindowManagerInternal; + @Mock + SystemActionPerformer mMockSystemActionPerformer; + @Mock + KeyEventDispatcher mMockKeyEventDispatcher; @Mock MagnificationProcessor mMockMagnificationProcessor; - @Mock IBinder mMockIBinder; - @Mock IAccessibilityServiceClient mMockServiceClient; - @Mock MotionEventInjector mMockMotionEventInjector; + @Mock + IBinder mMockIBinder; + @Mock + IAccessibilityServiceClient mMockServiceClient; + @Mock + IBrailleDisplayController mMockBrailleDisplayController; + @Mock + MotionEventInjector mMockMotionEventInjector; MessageCapturingHandler mHandler = new MessageCapturingHandler(null); @@ -134,6 +158,7 @@ public class AccessibilityServiceConnectionTest { mMockWindowManagerInternal, mMockSystemActionPerformer, mMockA11yWindowManager, mMockActivityTaskManagerInternal); when(mMockSecurityPolicy.canPerformGestures(mConnection)).thenReturn(true); + when(mMockSecurityPolicy.checkAccessibilityAccess(mConnection)).thenReturn(true); } @After @@ -291,6 +316,119 @@ public class AccessibilityServiceConnectionTest { } @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectBluetoothBrailleDisplay() throws Exception { + final String macAddress = "00:11:22:33:AA:BB"; + final byte[] descriptor = {0x05, 0x41}; + Bundle bd = new Bundle(); + bd.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_HIDRAW_PATH, "/dev/null"); + bd.putByteArray(BrailleDisplayController.TEST_BRAILLE_DISPLAY_DESCRIPTOR, descriptor); + bd.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_UNIQUE_ID, macAddress); + bd.putBoolean(BrailleDisplayController.TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH, true); + mConnection.setTestBrailleDisplayData(List.of(bd)); + + mConnection.connectBluetoothBrailleDisplay(macAddress, mMockBrailleDisplayController); + + ArgumentCaptor<IBrailleDisplayConnection> connection = + ArgumentCaptor.forClass(IBrailleDisplayConnection.class); + verify(mMockBrailleDisplayController).onConnected(connection.capture(), eq(descriptor)); + // Cleanup the connection. + connection.getValue().disconnect(); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectBluetoothBrailleDisplay_throwsForMissingBluetoothConnectPermission() { + doThrow(SecurityException.class).when(mMockContext) + .enforceCallingPermission(eq(Manifest.permission.BLUETOOTH_CONNECT), any()); + + assertThrows(SecurityException.class, + () -> mConnection.connectBluetoothBrailleDisplay("unused", + mMockBrailleDisplayController)); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectBluetoothBrailleDisplay_throwsForNullMacAddress() { + assertThrows(NullPointerException.class, + () -> mConnection.connectBluetoothBrailleDisplay(null, + mMockBrailleDisplayController)); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectBluetoothBrailleDisplay_throwsForMisformattedMacAddress() { + assertThrows(IllegalArgumentException.class, + () -> mConnection.connectBluetoothBrailleDisplay("12:34", + mMockBrailleDisplayController)); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectUsbBrailleDisplay() throws Exception { + final String serialNumber = "myUsbDevice"; + final byte[] descriptor = {0x05, 0x41}; + Bundle bd = new Bundle(); + bd.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_HIDRAW_PATH, "/dev/null"); + bd.putByteArray(BrailleDisplayController.TEST_BRAILLE_DISPLAY_DESCRIPTOR, descriptor); + bd.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_UNIQUE_ID, serialNumber); + bd.putBoolean(BrailleDisplayController.TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH, false); + mConnection.setTestBrailleDisplayData(List.of(bd)); + UsbDevice usbDevice = Mockito.mock(UsbDevice.class); + when(usbDevice.getSerialNumber()).thenReturn(serialNumber); + UsbManager usbManager = Mockito.mock(UsbManager.class); + when(mMockContext.getSystemService(Context.USB_SERVICE)).thenReturn(usbManager); + when(usbManager.hasPermission(eq(usbDevice), eq(COMPONENT_NAME.getPackageName()), + anyInt(), anyInt())).thenReturn(true); + + mConnection.connectUsbBrailleDisplay(usbDevice, mMockBrailleDisplayController); + + ArgumentCaptor<IBrailleDisplayConnection> connection = + ArgumentCaptor.forClass(IBrailleDisplayConnection.class); + verify(mMockBrailleDisplayController).onConnected(connection.capture(), eq(descriptor)); + // Cleanup the connection. + connection.getValue().disconnect(); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectUsbBrailleDisplay_throwsForMissingUsbPermission() { + UsbManager usbManager = Mockito.mock(UsbManager.class); + when(mMockContext.getSystemService(Context.USB_SERVICE)).thenReturn(usbManager); + when(usbManager.hasPermission(notNull(), eq(COMPONENT_NAME.getPackageName()), + anyInt(), anyInt())).thenReturn(false); + + assertThrows(SecurityException.class, + () -> mConnection.connectUsbBrailleDisplay(Mockito.mock(UsbDevice.class), + mMockBrailleDisplayController)); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectUsbBrailleDisplay_throwsForNullDevice() { + assertThrows(NullPointerException.class, + () -> mConnection.connectUsbBrailleDisplay(null, mMockBrailleDisplayController)); + } + + @Test + @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID) + public void connectUsbBrailleDisplay_callsOnConnectionFailedForEmptySerialNumber() + throws Exception { + UsbManager usbManager = Mockito.mock(UsbManager.class); + when(mMockContext.getSystemService(Context.USB_SERVICE)).thenReturn(usbManager); + when(usbManager.hasPermission(notNull(), eq(COMPONENT_NAME.getPackageName()), + anyInt(), anyInt())).thenReturn(true); + UsbDevice usbDevice = Mockito.mock(UsbDevice.class); + when(usbDevice.getSerialNumber()).thenReturn(""); + + mConnection.connectUsbBrailleDisplay(usbDevice, mMockBrailleDisplayController); + + verify(mMockBrailleDisplayController).onConnectionFailed( + BrailleDisplayController.BrailleDisplayCallback + .FLAG_ERROR_BRAILLE_DISPLAY_NOT_FOUND); + } + + @Test @RequiresFlagsEnabled(Flags.FLAG_RESETTABLE_DYNAMIC_PROPERTIES) public void binderDied_resetA11yServiceInfo() { final int flag = AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/BrailleDisplayConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/BrailleDisplayConnectionTest.java new file mode 100644 index 000000000000..7c278cedbcc5 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/accessibility/BrailleDisplayConnectionTest.java @@ -0,0 +1,159 @@ +/* + * 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.accessibility; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; + +import android.accessibilityservice.BrailleDisplayController; +import android.os.Bundle; +import android.testing.DexmakerShareClassLoaderRule; + +import com.google.common.truth.Expect; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.nio.file.Path; +import java.util.List; + +/** + * Tests for internal details of {@link BrailleDisplayConnection}. + * + * <p>Prefer adding new tests in CTS where possible. + */ +public class BrailleDisplayConnectionTest { + private static final Path NULL_PATH = Path.of("/dev/null"); + + private BrailleDisplayConnection mBrailleDisplayConnection; + @Mock + private BrailleDisplayConnection.NativeInterface mNativeInterface; + @Mock + private AccessibilityServiceConnection mServiceConnection; + + @Rule + public final Expect expect = Expect.create(); + + // To mock package-private class + @Rule + public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule = + new DexmakerShareClassLoaderRule(); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mBrailleDisplayConnection = new BrailleDisplayConnection(new Object(), mServiceConnection); + } + + @Test + public void defaultNativeScanner_getReportDescriptor_returnsDescriptor() { + int descriptorSize = 4; + byte[] descriptor = {0xB, 0xE, 0xE, 0xF}; + when(mNativeInterface.getHidrawDescSize(anyInt())).thenReturn(descriptorSize); + when(mNativeInterface.getHidrawDesc(anyInt(), eq(descriptorSize))).thenReturn(descriptor); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.getDefaultNativeScanner(mNativeInterface); + + assertThat(scanner.getDeviceReportDescriptor(NULL_PATH)).isEqualTo(descriptor); + } + + @Test + public void defaultNativeScanner_getReportDescriptor_invalidSize_returnsNull() { + when(mNativeInterface.getHidrawDescSize(anyInt())).thenReturn(0); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.getDefaultNativeScanner(mNativeInterface); + + assertThat(scanner.getDeviceReportDescriptor(NULL_PATH)).isNull(); + } + + @Test + public void defaultNativeScanner_getUniqueId_returnsUniq() { + String macAddress = "12:34:56:78"; + when(mNativeInterface.getHidrawUniq(anyInt())).thenReturn(macAddress); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.getDefaultNativeScanner(mNativeInterface); + + assertThat(scanner.getUniqueId(NULL_PATH)).isEqualTo(macAddress); + } + + @Test + public void defaultNativeScanner_getDeviceBusType_busUsb() { + when(mNativeInterface.getHidrawBusType(anyInt())) + .thenReturn(BrailleDisplayConnection.BUS_USB); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.getDefaultNativeScanner(mNativeInterface); + + assertThat(scanner.getDeviceBusType(NULL_PATH)) + .isEqualTo(BrailleDisplayConnection.BUS_USB); + } + + @Test + public void defaultNativeScanner_getDeviceBusType_busBluetooth() { + when(mNativeInterface.getHidrawBusType(anyInt())) + .thenReturn(BrailleDisplayConnection.BUS_BLUETOOTH); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.getDefaultNativeScanner(mNativeInterface); + + assertThat(scanner.getDeviceBusType(NULL_PATH)) + .isEqualTo(BrailleDisplayConnection.BUS_BLUETOOTH); + } + + // BrailleDisplayConnection#setTestData() is used to enable CTS testing with + // test Braille display data, but its own implementation should also be tested + // so that issues in this helper don't cause confusing failures in CTS. + @Test + public void setTestData_scannerReturnsTestData() { + Bundle bd1 = new Bundle(), bd2 = new Bundle(); + + Path path1 = Path.of("/dev/path1"), path2 = Path.of("/dev/path2"); + bd1.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_HIDRAW_PATH, path1.toString()); + bd2.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_HIDRAW_PATH, path2.toString()); + byte[] desc1 = {0xB, 0xE}, desc2 = {0xE, 0xF}; + bd1.putByteArray(BrailleDisplayController.TEST_BRAILLE_DISPLAY_DESCRIPTOR, desc1); + bd2.putByteArray(BrailleDisplayController.TEST_BRAILLE_DISPLAY_DESCRIPTOR, desc2); + String uniq1 = "uniq1", uniq2 = "uniq2"; + bd1.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_UNIQUE_ID, uniq1); + bd2.putString(BrailleDisplayController.TEST_BRAILLE_DISPLAY_UNIQUE_ID, uniq2); + int bus1 = BrailleDisplayConnection.BUS_USB, bus2 = BrailleDisplayConnection.BUS_BLUETOOTH; + bd1.putBoolean(BrailleDisplayController.TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH, + bus1 == BrailleDisplayConnection.BUS_BLUETOOTH); + bd2.putBoolean(BrailleDisplayController.TEST_BRAILLE_DISPLAY_BUS_BLUETOOTH, + bus2 == BrailleDisplayConnection.BUS_BLUETOOTH); + + BrailleDisplayConnection.BrailleDisplayScanner scanner = + mBrailleDisplayConnection.setTestData(List.of(bd1, bd2)); + + expect.that(scanner.getHidrawNodePaths()).containsExactly(path1, path2); + expect.that(scanner.getDeviceReportDescriptor(path1)).isEqualTo(desc1); + expect.that(scanner.getDeviceReportDescriptor(path2)).isEqualTo(desc2); + expect.that(scanner.getUniqueId(path1)).isEqualTo(uniq1); + expect.that(scanner.getUniqueId(path2)).isEqualTo(uniq2); + expect.that(scanner.getDeviceBusType(path1)).isEqualTo(bus1); + expect.that(scanner.getDeviceBusType(path2)).isEqualTo(bus2); + } +} diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java index 26934d8e5d6e..4307ec5aa7e1 100644 --- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java @@ -682,19 +682,19 @@ public class UserControllerTest { /* maxRunningUsers= */ 3, /* delayUserDataLocking= */ false); setUpAndStartUserInBackground(TEST_USER_ID); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID, /* allowDelayedLocking= */ true, /* keyEvictedCallback= */ null, /* expectLocking= */ true); setUpAndStartUserInBackground(TEST_USER_ID1); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, /* keyEvictedCallback= */ mKeyEvictedCallback, /* expectLocking= */ true); setUpAndStartUserInBackground(TEST_USER_ID2); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* delayedLocking= */ false, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* allowDelayedLocking= */ false, /* keyEvictedCallback= */ null, /* expectLocking= */ true); setUpAndStartUserInBackground(TEST_USER_ID3); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID3, /* delayedLocking= */ false, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID3, /* allowDelayedLocking= */ false, /* keyEvictedCallback= */ mKeyEvictedCallback, /* expectLocking= */ true); } @@ -739,21 +739,21 @@ public class UserControllerTest { mUserController.setInitialConfig(/* userSwitchUiEnabled= */ true, /* maxRunningUsers= */ 3, /* delayUserDataLocking= */ true); - // delayedLocking set and no KeyEvictedCallback, so it should not lock. + // allowDelayedLocking set and no KeyEvictedCallback, so it should not lock. setUpAndStartUserInBackground(TEST_USER_ID); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID, /* allowDelayedLocking= */ true, /* keyEvictedCallback= */ null, /* expectLocking= */ false); setUpAndStartUserInBackground(TEST_USER_ID1); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, /* keyEvictedCallback= */ mKeyEvictedCallback, /* expectLocking= */ true); setUpAndStartUserInBackground(TEST_USER_ID2); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* delayedLocking= */ false, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* allowDelayedLocking= */ false, /* keyEvictedCallback= */ null, /* expectLocking= */ true); setUpAndStartUserInBackground(TEST_USER_ID3); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID3, /* delayedLocking= */ false, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID3, /* allowDelayedLocking= */ false, /* keyEvictedCallback= */ mKeyEvictedCallback, /* expectLocking= */ true); } @@ -843,7 +843,7 @@ public class UserControllerTest { mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE, android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE); setUpAndStartProfileInBackground(TEST_USER_ID1, UserManager.USER_TYPE_PROFILE_PRIVATE); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, /* keyEvictedCallback */ null, /* expectLocking= */ false); } @@ -855,19 +855,20 @@ public class UserControllerTest { mSetFlagsRule.disableFlags( android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE); setUpAndStartProfileInBackground(TEST_USER_ID1, UserManager.USER_TYPE_PROFILE_PRIVATE); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, /* keyEvictedCallback */ null, /* expectLocking= */ true); mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE); mSetFlagsRule.enableFlags( android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE); setUpAndStartProfileInBackground(TEST_USER_ID2, UserManager.USER_TYPE_PROFILE_PRIVATE); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID2, /* allowDelayedLocking= */ true, /* keyEvictedCallback */ null, /* expectLocking= */ true); } + /** Delayed-locking users (as opposed to devices) have no limits on how many can be unlocked. */ @Test - public void testStopPrivateProfileWithDelayedLocking_maxRunningUsersBreached() + public void testStopPrivateProfileWithDelayedLocking_imperviousToNumberOfRunningUsers() throws Exception { mUserController.setInitialConfig(/* mUserSwitchUiEnabled */ true, /* maxRunningUsers= */ 1, /* delayUserDataLocking= */ false); @@ -875,10 +876,14 @@ public class UserControllerTest { android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE); setUpAndStartProfileInBackground(TEST_USER_ID1, UserManager.USER_TYPE_PROFILE_PRIVATE); setUpAndStartProfileInBackground(TEST_USER_ID2, UserManager.USER_TYPE_PROFILE_MANAGED); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, - /* keyEvictedCallback */ null, /* expectLocking= */ true); + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, + /* keyEvictedCallback */ null, /* expectLocking= */ false); } + /** + * Tests that when a device/user (managed profile) does not permit delayed locking, then + * even if allowDelayedLocking is true, the user will still be locked. + */ @Test public void testStopManagedProfileWithDelayedLocking() throws Exception { mUserController.setInitialConfig(/* mUserSwitchUiEnabled */ true, @@ -886,7 +891,7 @@ public class UserControllerTest { mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE, android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE); setUpAndStartProfileInBackground(TEST_USER_ID1, UserManager.USER_TYPE_PROFILE_MANAGED); - assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* delayedLocking= */ true, + assertUserLockedOrUnlockedAfterStopping(TEST_USER_ID1, /* allowDelayedLocking= */ true, /* keyEvictedCallback */ null, /* expectLocking= */ true); } @@ -1087,29 +1092,29 @@ public class UserControllerTest { mUserStates.put(userId, mUserController.getStartedUserState(userId)); } - private void assertUserLockedOrUnlockedAfterStopping(int userId, boolean delayedLocking, + private void assertUserLockedOrUnlockedAfterStopping(int userId, boolean allowDelayedLocking, KeyEvictedCallback keyEvictedCallback, boolean expectLocking) throws Exception { - int r = mUserController.stopUser(userId, /* force= */ true, /* delayedLocking= */ - delayedLocking, null, keyEvictedCallback); + int r = mUserController.stopUser(userId, /* force= */ true, /* allowDelayedLocking= */ + allowDelayedLocking, null, keyEvictedCallback); assertThat(r).isEqualTo(ActivityManager.USER_OP_SUCCESS); - assertUserLockedOrUnlockedState(userId, delayedLocking, expectLocking); + assertUserLockedOrUnlockedState(userId, allowDelayedLocking, expectLocking); } private void assertProfileLockedOrUnlockedAfterStopping(int userId, boolean expectLocking) throws Exception { boolean profileStopped = mUserController.stopProfile(userId); assertThat(profileStopped).isTrue(); - assertUserLockedOrUnlockedState(userId, /* delayedLocking= */ false, expectLocking); + assertUserLockedOrUnlockedState(userId, /* allowDelayedLocking= */ false, expectLocking); } - private void assertUserLockedOrUnlockedState(int userId, boolean delayedLocking, + private void assertUserLockedOrUnlockedState(int userId, boolean allowDelayedLocking, boolean expectLocking) throws InterruptedException, RemoteException { // fake all interim steps UserState ussUser = mUserStates.get(userId); ussUser.setState(UserState.STATE_SHUTDOWN); // Passing delayedLocking invalidates incorrect internal data passing but currently there is // no easy way to get that information passed through lambda. - mUserController.finishUserStopped(ussUser, delayedLocking); + mUserController.finishUserStopped(ussUser, allowDelayedLocking); waitForHandlerToComplete(FgThread.getHandler(), HANDLER_WAIT_TIME_MS); verify(mInjector.mStorageManagerMock, times(expectLocking ? 1 : 0)) .lockCeStorage(userId); diff --git a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java index fa3936443f31..b7050771d2e4 100644 --- a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java @@ -31,6 +31,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertThrows; import android.annotation.NonNull; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateInfo; import android.hardware.devicestate.DeviceStateRequest; import android.hardware.devicestate.IDeviceStateManagerCallback; @@ -72,7 +73,8 @@ public final class DeviceStateManagerServiceTest { new DeviceState(0, "DEFAULT", 0 /* flags */); private static final DeviceState OTHER_DEVICE_STATE = new DeviceState(1, "OTHER", 0 /* flags */); - private static final DeviceState DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP = + private static final DeviceState + DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP = new DeviceState(2, "DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP", DeviceState.FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP /* flags */); // A device state that is not reported as being supported for the default test provider. diff --git a/services/tests/servicestests/src/com/android/server/devicestate/OverrideRequestControllerTest.java b/services/tests/servicestests/src/com/android/server/devicestate/OverrideRequestControllerTest.java index b3d25f2eef25..cfdb5869e020 100644 --- a/services/tests/servicestests/src/com/android/server/devicestate/OverrideRequestControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicestate/OverrideRequestControllerTest.java @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; import android.annotation.Nullable; +import android.hardware.devicestate.DeviceState; import android.hardware.devicestate.DeviceStateRequest; import android.os.Binder; import android.platform.test.annotations.Presubmit; @@ -48,8 +49,10 @@ import java.util.Map; @RunWith(AndroidJUnit4.class) public final class OverrideRequestControllerTest { - private static final DeviceState TEST_DEVICE_STATE_ZERO = new DeviceState(0, "TEST_STATE", 0); - private static final DeviceState TEST_DEVICE_STATE_ONE = new DeviceState(1, "TEST_STATE", 0); + private static final DeviceState + TEST_DEVICE_STATE_ZERO = new DeviceState(0, "TEST_STATE", 0); + private static final DeviceState + TEST_DEVICE_STATE_ONE = new DeviceState(1, "TEST_STATE", 0); private TestStatusChangeListener mStatusListener; private OverrideRequestController mController; diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index df2069efb0ce..7f7cc35ced55 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -1729,6 +1729,21 @@ public final class UserManagerTest { mUserManager.removeUser(userInfo.id); } + @Test + @RequiresFlagsEnabled(android.multiuser.Flags.FLAG_ENABLE_HIDING_PROFILES) + public void testGetProfileIdsExcludingHidden() throws Exception { + int mainUserId = mUserManager.getMainUser().getIdentifier(); + final UserInfo profile = createProfileForUser("Profile", + UserManager.USER_TYPE_PROFILE_PRIVATE, mainUserId); + + final int[] allProfiles = mUserManager.getProfileIds(mainUserId, /* enabledOnly */ false); + final int[] profilesExcludingHidden = mUserManager.getProfileIdsExcludingHidden( + mainUserId, /* enabledOnly */ false); + + assertThat(allProfiles).asList().contains(profile.id); + assertThat(profilesExcludingHidden).asList().doesNotContain(profile.id); + } + private String generateLongString() { String partialString = "Test Name Test Name Test Name Test Name Test Name Test Name Test " + "Name Test Name Test Name Test Name "; //String of length 100 diff --git a/services/tests/servicestests/src/com/android/server/policy/DeviceStateProviderImplTest.java b/services/tests/servicestests/src/com/android/server/policy/DeviceStateProviderImplTest.java index 7e40f96154d2..16909ab4511e 100644 --- a/services/tests/servicestests/src/com/android/server/policy/DeviceStateProviderImplTest.java +++ b/services/tests/servicestests/src/com/android/server/policy/DeviceStateProviderImplTest.java @@ -40,12 +40,12 @@ import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorManager; +import android.hardware.devicestate.DeviceState; import android.os.PowerManager; import androidx.annotation.NonNull; import com.android.server.LocalServices; -import com.android.server.devicestate.DeviceState; import com.android.server.devicestate.DeviceStateProvider; import com.android.server.input.InputManagerInternal; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java index 344a4b0ce324..4dded1d0342d 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java @@ -16,6 +16,7 @@ package com.android.server.notification; import static android.content.Context.DEVICE_POLICY_SERVICE; +import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR; import static android.os.UserManager.USER_TYPE_FULL_SECONDARY; import static android.os.UserManager.USER_TYPE_PROFILE_CLONE; import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED; @@ -62,6 +63,7 @@ import android.os.IInterface; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.platform.test.annotations.EnableFlags; import android.provider.Settings; import android.text.TextUtils; import android.util.ArrayMap; @@ -1983,6 +1985,22 @@ public class ManagedServicesTest extends UiServiceTestCase { new ComponentName("pkg1", "cmp1"))).isFalse(); } + @Test + @EnableFlags(FLAG_LIFETIME_EXTENSION_REFACTOR) + public void testManagedServiceInfoIsSystemUi() { + ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles, mIpm, + APPROVAL_BY_COMPONENT); + + ManagedServices.ManagedServiceInfo service0 = service.new ManagedServiceInfo( + mock(IInterface.class), ComponentName.unflattenFromString("a/a"), 0, false, + mock(ServiceConnection.class), 26, 34); + + service0.isSystemUi = true; + assertThat(service0.isSystemUi()).isTrue(); + service0.isSystemUi = false; + assertThat(service0.isSystemUi()).isFalse(); + } + private void mockServiceInfoWithMetaData(List<ComponentName> componentNames, ManagedServices service, ArrayMap<ComponentName, Bundle> metaDatas) throws RemoteException { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 96ffec1509da..6aacfd706adc 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -163,6 +163,7 @@ import android.app.AlarmManager; import android.app.AppOpsManager; import android.app.AutomaticZenRule; import android.app.IActivityManager; +import android.app.ICallNotificationEventCallback; import android.app.INotificationManager; import android.app.ITransientNotification; import android.app.IUriGrantsManager; @@ -303,7 +304,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; @@ -2545,6 +2545,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertThat(mBinderService.getActiveNotifications(sbn.getPackageName()).length).isEqualTo(1); assertThat(mService.getNotificationRecordCount()).isEqualTo(1); + // Checks that a post update is sent. + verify(mWorkerHandler, times(1)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).prepareNotifyPostedLocked(captor.capture(), any(), + anyBoolean()); + assertThat(captor.getValue().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo( + FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); + mSetFlagsRule.disableFlags(android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR); mBinderService.cancelNotificationWithTag(PKG, PKG, sbn.getTag(), sbn.getId(), sbn.getUserId()); @@ -2577,6 +2588,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG); assertThat(notifs.length).isEqualTo(1); assertThat(notifs[0].getId()).isEqualTo(1); + + // Checks that a post update is sent. + verify(mWorkerHandler, times(1)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).prepareNotifyPostedLocked(captor.capture(), any(), + anyBoolean()); + assertThat(captor.getValue().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo( + FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); } @Test @@ -2985,18 +3007,29 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testCancelNotificationsFromListener_clearAll_NoClearLifetimeExt() throws Exception { mSetFlagsRule.enableFlags(android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR); - final NotificationRecord notif = generateNotificationRecord( mTestNotificationChannel, 1, null, false); - notif.getNotification().flags = FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY; + notif.getNotification().flags |= FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY; mService.addNotification(notif); - + verify(mWorkerHandler, times(0)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); mService.getBinderService().cancelNotificationsFromListener(null, null); waitForIdle(); - + // Notification not cancelled. StatusBarNotification[] notifs = mBinderService.getActiveNotifications(notif.getSbn().getPackageName()); assertThat(notifs.length).isEqualTo(1); + + // Checks that a post update is sent. + verify(mWorkerHandler, times(1)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).prepareNotifyPostedLocked(captor.capture(), any(), + anyBoolean()); + assertThat(captor.getValue().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo( + FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); } @Test @@ -3217,6 +3250,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification[] notifs = mBinderService.getActiveNotifications(notif.getSbn().getPackageName()); assertEquals(1, notifs.length); + + // Checks that a post update is sent. + verify(mWorkerHandler, times(1)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).prepareNotifyPostedLocked(captor.capture(), any(), + anyBoolean()); + assertThat(captor.getValue().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo( + FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); } @Test @@ -3959,6 +4003,69 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test + public void testUpdateNotificationChannelFromPrivilegedListener_noSoundUriPermission() + throws Exception { + mService.setPreferencesHelper(mPreferencesHelper); + when(mCompanionMgr.getAssociations(PKG, mUserId)) + .thenReturn(singletonList(mock(AssociationInfo.class))); + when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(mTestNotificationChannel.getId()), anyBoolean())) + .thenReturn(mTestNotificationChannel); + + final Uri soundUri = Uri.parse("content://media/test/sound/uri"); + final NotificationChannel updatedNotificationChannel = new NotificationChannel( + TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_DEFAULT); + updatedNotificationChannel.setSound(soundUri, + updatedNotificationChannel.getAudioAttributes()); + + doThrow(new SecurityException("no access")).when(mUgmInternal) + .checkGrantUriPermission(eq(Process.myUid()), any(), eq(soundUri), + anyInt(), eq(Process.myUserHandle().getIdentifier())); + + assertThrows(SecurityException.class, + () -> mBinderService.updateNotificationChannelFromPrivilegedListener(null, PKG, + Process.myUserHandle(), updatedNotificationChannel)); + + verify(mPreferencesHelper, never()).updateNotificationChannel( + anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); + + verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + eq(Process.myUserHandle()), eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); + } + + @Test + public void testUpdateNotificationChannelFromPrivilegedListener_noSoundUriPermission_sameSound() + throws Exception { + mService.setPreferencesHelper(mPreferencesHelper); + when(mCompanionMgr.getAssociations(PKG, mUserId)) + .thenReturn(singletonList(mock(AssociationInfo.class))); + when(mPreferencesHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(mTestNotificationChannel.getId()), anyBoolean())) + .thenReturn(mTestNotificationChannel); + + final Uri soundUri = Settings.System.DEFAULT_NOTIFICATION_URI; + final NotificationChannel updatedNotificationChannel = new NotificationChannel( + TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_DEFAULT); + updatedNotificationChannel.setSound(soundUri, + updatedNotificationChannel.getAudioAttributes()); + + doThrow(new SecurityException("no access")).when(mUgmInternal) + .checkGrantUriPermission(eq(Process.myUid()), any(), eq(soundUri), + anyInt(), eq(Process.myUserHandle().getIdentifier())); + + mBinderService.updateNotificationChannelFromPrivilegedListener( + null, PKG, Process.myUserHandle(), updatedNotificationChannel); + + verify(mPreferencesHelper, times(1)).updateNotificationChannel( + anyString(), anyInt(), any(), anyBoolean(), anyInt(), anyBoolean()); + + verify(mListeners, never()).notifyNotificationChannelChanged(eq(PKG), + eq(Process.myUserHandle()), eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); + } + + @Test public void testGetNotificationChannelFromPrivilegedListener_cdm_success() throws Exception { mService.setPreferencesHelper(mPreferencesHelper); when(mCompanionMgr.getAssociations(PKG, mUserId)) @@ -5659,6 +5766,17 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); assertThat(notifsAfter.length).isEqualTo(1); assertThat(mService.getNotificationRecord(notif.getKey())).isEqualTo(notif); + + // Checks that a post update is sent. + verify(mWorkerHandler, times(1)) + .post(any(NotificationManagerService.PostNotificationRunnable.class)); + ArgumentCaptor<NotificationRecord> captor = + ArgumentCaptor.forClass(NotificationRecord.class); + verify(mListeners, times(1)).prepareNotifyPostedLocked(captor.capture(), any(), + anyBoolean()); + assertThat(captor.getValue().getNotification().flags + & FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY).isEqualTo( + FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY); } @Test @@ -14313,7 +14431,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test - @Ignore("b/324348078") public void cancelNotificationsFromListener_rapidClear_old_cancelOne() throws RemoteException { mSetFlagsRule.enableFlags(android.view.contentprotection.flags.Flags .FLAG_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER_APP_OP_ENABLED); @@ -14403,7 +14520,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test - @Ignore("b/324348078") public void cancelNotificationsFromListener_rapidClear_old_cancelAll() throws RemoteException { mSetFlagsRule.enableFlags(android.view.contentprotection.flags.Flags .FLAG_RAPID_CLEAR_NOTIFICATIONS_BY_LISTENER_APP_OP_ENABLED); @@ -14477,6 +14593,120 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertFalse(mBinderService.getPrivateNotificationsAllowed()); } + @Test + @EnableFlags(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public void testCallNotificationListener_NotifiedOnPostCallStyle() throws Exception { + ICallNotificationEventCallback listener = mock( + ICallNotificationEventCallback.class); + when(listener.asBinder()).thenReturn(mock(IBinder.class)); + mBinderService.registerCallNotificationEventListener(PKG, UserHandle.CURRENT, listener); + waitForIdle(); + + final UserHandle userHandle = UserHandle.getUserHandleForUid(mUid); + final NotificationRecord r = createAndPostCallStyleNotification(PKG, userHandle, + "testCallNotificationListener_NotifiedOnPostCallStyle"); + + verify(listener, times(1)).onCallNotificationPosted(PKG, userHandle); + + mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + r.getSbn().getUserId()); + waitForIdle(); + + verify(listener, times(1)).onCallNotificationRemoved(PKG, userHandle); + } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public void testCallNotificationListener_NotNotifiedOnPostNonCallStyle() throws Exception { + ICallNotificationEventCallback listener = mock( + ICallNotificationEventCallback.class); + when(listener.asBinder()).thenReturn(mock(IBinder.class)); + mBinderService.registerCallNotificationEventListener(PKG, + UserHandle.getUserHandleForUid(mUid), listener); + waitForIdle(); + + Notification.Builder nb = new Notification.Builder(mContext, + mTestNotificationChannel.getId()).setSmallIcon(android.R.drawable.sym_def_app_icon); + final NotificationRecord r = createAndPostNotification(nb, + "testCallNotificationListener_NotNotifiedOnPostNonCallStyle"); + + verify(listener, never()).onCallNotificationPosted(anyString(), any()); + + mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + r.getSbn().getUserId()); + waitForIdle(); + + verify(listener, never()).onCallNotificationRemoved(anyString(), any()); + } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public void testCallNotificationListener_registerForUserAll_notifiedOnAnyUserId() + throws Exception { + ICallNotificationEventCallback listener = mock( + ICallNotificationEventCallback.class); + when(listener.asBinder()).thenReturn(mock(IBinder.class)); + mBinderService.registerCallNotificationEventListener(PKG, UserHandle.ALL, listener); + waitForIdle(); + + final UserHandle otherUser = UserHandle.of(2); + final NotificationRecord r = createAndPostCallStyleNotification(PKG, + otherUser, "testCallNotificationListener_registerForUserAll_notifiedOnAnyUserId"); + + verify(listener, times(1)).onCallNotificationPosted(PKG, otherUser); + + mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + r.getSbn().getUserId()); + waitForIdle(); + + verify(listener, times(1)).onCallNotificationRemoved(PKG, otherUser); + } + + @Test + @EnableFlags(android.service.notification.Flags.FLAG_CALLSTYLE_CALLBACK_API) + public void testCallNotificationListener_differentPackage_notNotified() throws Exception { + final String packageName = "package"; + ICallNotificationEventCallback listener = mock( + ICallNotificationEventCallback.class); + when(listener.asBinder()).thenReturn(mock(IBinder.class)); + mBinderService.registerCallNotificationEventListener(packageName, UserHandle.ALL, listener); + waitForIdle(); + + final NotificationRecord r = createAndPostCallStyleNotification(PKG, + UserHandle.of(mUserId), + "testCallNotificationListener_differentPackage_notNotified"); + + verify(listener, never()).onCallNotificationPosted(anyString(), any()); + + mBinderService.cancelNotificationWithTag(PKG, PKG, r.getSbn().getTag(), r.getSbn().getId(), + r.getSbn().getUserId()); + waitForIdle(); + + verify(listener, never()).onCallNotificationRemoved(anyString(), any()); + } + + private NotificationRecord createAndPostCallStyleNotification(String packageName, + UserHandle userHandle, String testName) throws Exception { + Person person = new Person.Builder().setName("caller").build(); + Notification.Builder nb = new Notification.Builder(mContext, + mTestNotificationChannel.getId()) + .setFlag(FLAG_USER_INITIATED_JOB, true) + .setStyle(Notification.CallStyle.forOngoingCall( + person, mock(PendingIntent.class))) + .setSmallIcon(android.R.drawable.sym_def_app_icon); + StatusBarNotification sbn = new StatusBarNotification(packageName, packageName, 1, + testName, mUid, 0, nb.build(), userHandle, null, 0); + NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel); + + mService.addEnqueuedNotification(r); + mService.new PostNotificationRunnable(r.getKey(), r.getSbn().getPackageName(), + r.getUid(), mPostNotificationTrackerFactory.newTracker(null)).run(); + waitForIdle(); + + return mService.findNotificationLocked( + packageName, r.getSbn().getTag(), r.getSbn().getId(), r.getSbn().getUserId()); + } + private NotificationRecord createAndPostNotification(Notification.Builder nb, String testName) throws RemoteException { StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, testName, mUid, 0, diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenDeviceEffectsTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenDeviceEffectsTest.java index f604f1e77cf4..3ac78908d8ae 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenDeviceEffectsTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenDeviceEffectsTest.java @@ -18,6 +18,8 @@ package com.android.server.notification; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertThrows; + import android.app.Flags; import android.os.Parcel; import android.platform.test.flag.junit.SetFlagsRule; @@ -27,6 +29,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.UiServiceTestCase; +import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -52,6 +56,10 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { .setShouldMaximizeDoze(true) .setShouldUseNightMode(false) .setShouldSuppressAmbientDisplay(false).setShouldSuppressAmbientDisplay(true) + .addExtraEffect("WILL BE GONE") + .setExtraEffects(ImmutableSet.of("1", "2")) + .addExtraEffects(ImmutableSet.of("3", "4")) + .addExtraEffect("5") .build(); assertThat(deviceEffects.shouldDimWallpaper()).isTrue(); @@ -64,6 +72,7 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { assertThat(deviceEffects.shouldMinimizeRadioUsage()).isFalse(); assertThat(deviceEffects.shouldUseNightMode()).isFalse(); assertThat(deviceEffects.shouldSuppressAmbientDisplay()).isTrue(); + assertThat(deviceEffects.getExtraEffects()).containsExactly("1", "2", "3", "4", "5"); } @Test @@ -73,11 +82,13 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { .setShouldDisableTiltToWake(true) .setShouldUseNightMode(true) .setShouldSuppressAmbientDisplay(true) + .addExtraEffect("1") .build(); ZenDeviceEffects modified = new ZenDeviceEffects.Builder(original) .setShouldDisplayGrayscale(true) .setShouldUseNightMode(false) + .addExtraEffect("2") .build(); assertThat(modified.shouldDimWallpaper()).isTrue(); // from original @@ -85,6 +96,32 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { assertThat(modified.shouldDisplayGrayscale()).isTrue(); // updated assertThat(modified.shouldUseNightMode()).isFalse(); // updated assertThat(modified.shouldSuppressAmbientDisplay()).isTrue(); // from original + assertThat(modified.getExtraEffects()).containsExactly("1", "2"); // updated + } + + @Test + public void builder_add_merges() { + ZenDeviceEffects zde1 = new ZenDeviceEffects.Builder() + .setShouldDimWallpaper(true) + .addExtraEffect("one") + .build(); + ZenDeviceEffects zde2 = new ZenDeviceEffects.Builder() + .setShouldDisableTouch(true) + .addExtraEffect("two") + .build(); + ZenDeviceEffects zde3 = new ZenDeviceEffects.Builder() + .setShouldMinimizeRadioUsage(true) + .addExtraEffect("three") + .build(); + + ZenDeviceEffects add = new ZenDeviceEffects.Builder().add(zde1).add(zde2).add(zde3).build(); + + assertThat(add).isEqualTo(new ZenDeviceEffects.Builder() + .setShouldDimWallpaper(true) + .setShouldDisableTouch(true) + .setShouldMinimizeRadioUsage(true) + .setExtraEffects(ImmutableSet.of("one", "two", "three")) + .build()); } @Test @@ -95,6 +132,7 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { .setShouldMinimizeRadioUsage(true) .setShouldUseNightMode(true) .setShouldSuppressAmbientDisplay(true) + .setExtraEffects(ImmutableSet.of("1", "2", "3")) .build(); Parcel parcel = Parcel.obtain(); @@ -113,6 +151,7 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { assertThat(copy.shouldUseNightMode()).isTrue(); assertThat(copy.shouldSuppressAmbientDisplay()).isTrue(); assertThat(copy.shouldDisplayGrayscale()).isFalse(); + assertThat(copy.getExtraEffects()).containsExactly("1", "2", "3"); } @Test @@ -128,4 +167,36 @@ public class ZenDeviceEffectsTest extends UiServiceTestCase { .build(); assertThat(effects.hasEffects()).isTrue(); } + + @Test + public void hasEffects_extras_returnsTrue() { + ZenDeviceEffects effects = new ZenDeviceEffects.Builder() + .addExtraEffect("extra") + .build(); + assertThat(effects.hasEffects()).isTrue(); + } + + @Test + public void validate_extrasLength() { + ZenDeviceEffects okay = new ZenDeviceEffects.Builder() + .addExtraEffect("short") + .addExtraEffect("anotherShort") + .build(); + + ZenDeviceEffects pushingIt = new ZenDeviceEffects.Builder() + .addExtraEffect("0123456789".repeat(60)) + .addExtraEffect("1234567890".repeat(60)) + .build(); + + ZenDeviceEffects excessive = new ZenDeviceEffects.Builder() + .addExtraEffect("0123456789".repeat(60)) + .addExtraEffect("1234567890".repeat(60)) + .addExtraEffect("2345678901".repeat(60)) + .addExtraEffect("3456789012".repeat(30)) + .build(); + + okay.validate(); // No exception. + pushingIt.validate(); // No exception. + assertThrows(Exception.class, () -> excessive.validate()); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java index 539bb37419f1..12f9e26e05d0 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java @@ -49,6 +49,8 @@ import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; import com.android.server.UiServiceTestCase; +import com.google.common.collect.ImmutableSet; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -86,7 +88,8 @@ public class ZenModeConfigTest extends UiServiceTestCase { private final int CREATION_TIME = 123; @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule( + SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT); @Before public final void setUp() { @@ -496,6 +499,7 @@ public class ZenModeConfigTest extends UiServiceTestCase { .setShouldDisableTouch(true) .setShouldMinimizeRadioUsage(false) .setShouldMaximizeDoze(true) + .setExtraEffects(ImmutableSet.of("one", "two")) .build(); rule.creationTime = CREATION_TIME; @@ -543,6 +547,28 @@ public class ZenModeConfigTest extends UiServiceTestCase { } @Test + public void testRuleXml_weirdEffects() throws Exception { + ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule(); + rule.zenDeviceEffects = new ZenDeviceEffects.Builder() + .setShouldMaximizeDoze(true) + .addExtraEffect("one,stillOne,,andStillOne,,,andYetStill") + .addExtraEffect(",two,stillTwo,") + .addExtraEffect("three\\andThree") + .addExtraEffect("four\\,andFour") + .build(); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + writeRuleXml(rule, baos); + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + ZenModeConfig.ZenRule fromXml = readRuleXml(bais); + + assertThat(fromXml.zenDeviceEffects.getExtraEffects()).isNotNull(); + assertThat(fromXml.zenDeviceEffects.getExtraEffects()) + .containsExactly("one,stillOne,,andStillOne,,,andYetStill", ",two,stillTwo,", + "three\\andThree", "four\\,andFour"); + } + + @Test public void testRuleXml_pkg_component() throws Exception { ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule(); rule.configurationActivity = new ComponentName("a", "a"); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeEventLoggerFake.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeEventLoggerFake.java index 5b35e345e46b..ff1308c4f6db 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeEventLoggerFake.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeEventLoggerFake.java @@ -132,4 +132,9 @@ public class ZenModeEventLoggerFake extends ZenModeEventLogger { checkInRange(i); return mChanges.get(i).getAreChannelsBypassing(); } + + public int[] getActiveRuleTypes(int i) throws IllegalArgumentException { + checkInRange(i); + return mChanges.get(i).getActiveRuleTypes(); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 0d88b98de2a7..f9ba33b526a9 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -17,6 +17,7 @@ package com.android.server.notification; import static android.app.AutomaticZenRule.TYPE_BEDTIME; +import static android.app.AutomaticZenRule.TYPE_IMMERSIVE; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_ACTIVATED; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_DEACTIVATED; import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_DISABLED; @@ -68,6 +69,7 @@ import static com.android.os.dnd.DNDProtoEnums.PEOPLE_STARRED; import static com.android.os.dnd.DNDProtoEnums.ROOT_CONFIG; import static com.android.os.dnd.DNDProtoEnums.STATE_ALLOW; import static com.android.os.dnd.DNDProtoEnums.STATE_DISALLOW; +import static com.android.server.notification.ZenModeEventLogger.ACTIVE_RULE_TYPE_MANUAL; import static com.android.server.notification.ZenModeHelper.RULE_LIMIT_PER_PACKAGE; import static com.google.common.collect.Iterables.getOnlyElement; @@ -161,6 +163,7 @@ import com.android.server.UiServiceTestCase; import com.android.server.notification.ManagedServices.UserProfiles; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.truth.Correspondence; import com.google.common.util.concurrent.SettableFuture; import com.google.protobuf.InvalidProtocolBufferException; @@ -2581,6 +2584,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { mSetFlagsRule.enableFlags(Flags.FLAG_MODES_API); ZenDeviceEffects original = new ZenDeviceEffects.Builder() .setShouldDisableTapToWake(true) + .addExtraEffect("extra") .build(); String ruleId = mZenModeHelper.addAutomaticZenRule(mContext.getPackageName(), new AutomaticZenRule.Builder("Rule", CONDITION_ID) @@ -2592,6 +2596,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { ZenDeviceEffects updateFromApp = new ZenDeviceEffects.Builder() .setShouldUseNightMode(true) // Good .setShouldMaximizeDoze(true) // Bad + .addExtraEffect("should be rejected") // Bad .build(); mZenModeHelper.updateAutomaticZenRule(ruleId, new AutomaticZenRule.Builder("Rule", CONDITION_ID) @@ -2605,6 +2610,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { new ZenDeviceEffects.Builder() .setShouldUseNightMode(true) // From update. .setShouldDisableTapToWake(true) // From original. + .addExtraEffect("extra") .build()); } @@ -3550,6 +3556,89 @@ public class ZenModeHelperTest extends UiServiceTestCase { } @Test + @EnableFlags(Flags.FLAG_MODES_API) + public void testZenModeEventLog_activeRuleTypes() { + mTestFlagResolver.setFlagOverride(LOG_DND_STATE_EVENTS, true); + setupZenConfig(); + + // Event 1: turn on manual zen mode. Manual rule will have ACTIVE_RULE_TYPE_MANUAL + mZenModeHelper.setManualZenMode(ZEN_MODE_IMPORTANT_INTERRUPTIONS, null, + UPDATE_ORIGIN_SYSTEM_OR_SYSTEMUI, "", null, Process.SYSTEM_UID); + + // Create bedtime rule + AutomaticZenRule bedtime = new AutomaticZenRule.Builder("Bedtime Mode (TM)", CONDITION_ID) + .setType(TYPE_BEDTIME) + .build(); + String bedtimeRuleId = mZenModeHelper.addAutomaticZenRule("pkg", bedtime, UPDATE_ORIGIN_APP, + "reason", CUSTOM_PKG_UID); + + // Create immersive rule + AutomaticZenRule immersive = new AutomaticZenRule.Builder("Immersed", CONDITION_ID) + .setType(TYPE_IMMERSIVE) + .build(); + String immersiveId = mZenModeHelper.addAutomaticZenRule("pkg", immersive, UPDATE_ORIGIN_APP, + "reason", CUSTOM_PKG_UID); + + // Event 2: Activate bedtime rule + mZenModeHelper.setAutomaticZenRuleState(bedtimeRuleId, + new Condition(bedtime.getConditionId(), "", STATE_TRUE, SOURCE_SCHEDULE), + UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); + + // Event 3: Turn immersive on + mZenModeHelper.setAutomaticZenRuleState(immersiveId, + new Condition(immersive.getConditionId(), "", STATE_TRUE, SOURCE_SCHEDULE), + UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); + + // Event 4: Turn off bedtime mode, leaving just unknown + immersive + mZenModeHelper.setAutomaticZenRuleState(bedtimeRuleId, + new Condition(bedtime.getConditionId(), "", STATE_FALSE, SOURCE_SCHEDULE), + UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); + + // Total of 4 events + assertEquals(4, mZenModeEventLogger.numLoggedChanges()); + + // First event: DND_TURNED_ON; active rules: 1; type is ACTIVE_RULE_TYPE_MANUAL + assertThat(mZenModeEventLogger.getEventId(0)).isEqualTo( + ZenModeEventLogger.ZenStateChangedEvent.DND_TURNED_ON.getId()); + assertThat(mZenModeEventLogger.getChangedRuleType(0)).isEqualTo( + DNDProtoEnums.MANUAL_RULE); + assertThat(mZenModeEventLogger.getNumRulesActive(0)).isEqualTo(1); + int[] ruleTypes0 = mZenModeEventLogger.getActiveRuleTypes(0); + assertThat(ruleTypes0.length).isEqualTo(1); + assertThat(ruleTypes0[0]).isEqualTo(ACTIVE_RULE_TYPE_MANUAL); + + // Second event: active rules: 2; types are TYPE_MANUAL and TYPE_BEDTIME + assertThat(mZenModeEventLogger.getChangedRuleType(1)).isEqualTo( + DNDProtoEnums.AUTOMATIC_RULE); + assertThat(mZenModeEventLogger.getNumRulesActive(1)).isEqualTo(2); + int[] ruleTypes1 = mZenModeEventLogger.getActiveRuleTypes(1); + assertThat(ruleTypes1.length).isEqualTo(2); + assertThat(ruleTypes1[0]).isEqualTo(TYPE_BEDTIME); + assertThat(ruleTypes1[1]).isEqualTo(ACTIVE_RULE_TYPE_MANUAL); + + // Third event: active rules: 3 + assertThat(mZenModeEventLogger.getEventId(2)).isEqualTo( + ZenModeEventLogger.ZenStateChangedEvent.DND_ACTIVE_RULES_CHANGED.getId()); + assertThat(mZenModeEventLogger.getChangedRuleType(2)).isEqualTo( + DNDProtoEnums.AUTOMATIC_RULE); + int[] ruleTypes2 = mZenModeEventLogger.getActiveRuleTypes(2); + assertThat(ruleTypes2.length).isEqualTo(3); + assertThat(ruleTypes2[0]).isEqualTo(TYPE_BEDTIME); + assertThat(ruleTypes2[1]).isEqualTo(TYPE_IMMERSIVE); + assertThat(ruleTypes2[2]).isEqualTo(ACTIVE_RULE_TYPE_MANUAL); + + // Fourth event: active rules 2, types are TYPE_MANUAL and TYPE_IMMERSIVE + assertThat(mZenModeEventLogger.getEventId(3)).isEqualTo( + ZenModeEventLogger.ZenStateChangedEvent.DND_ACTIVE_RULES_CHANGED.getId()); + assertThat(mZenModeEventLogger.getChangedRuleType(3)).isEqualTo( + DNDProtoEnums.AUTOMATIC_RULE); + int[] ruleTypes3 = mZenModeEventLogger.getActiveRuleTypes(3); + assertThat(ruleTypes3.length).isEqualTo(2); + assertThat(ruleTypes3[0]).isEqualTo(TYPE_IMMERSIVE); + assertThat(ruleTypes3[1]).isEqualTo(ACTIVE_RULE_TYPE_MANUAL); + } + + @Test @DisableFlags(Flags.FLAG_MODES_API) public void testUpdateConsolidatedPolicy_preModesApiDefaultRulesOnly_takesGlobalDefault() { setupZenConfig(); @@ -4701,19 +4790,26 @@ public class ZenModeHelperTest extends UiServiceTestCase { verify(mDeviceEffectsApplier).apply(eq(NO_EFFECTS), eq(UPDATE_ORIGIN_INIT)); String ruleId = addRuleWithEffects( - new ZenDeviceEffects.Builder().setShouldDisplayGrayscale(true).build()); + new ZenDeviceEffects.Builder() + .setShouldDisplayGrayscale(true) + .addExtraEffect("ONE") + .build()); mZenModeHelper.setAutomaticZenRuleState(ruleId, CONDITION_TRUE, UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); mTestableLooper.processAllMessages(); verify(mDeviceEffectsApplier).apply( eq(new ZenDeviceEffects.Builder() .setShouldDisplayGrayscale(true) + .addExtraEffect("ONE") .build()), eq(UPDATE_ORIGIN_APP)); // Now create and activate a second rule that adds more effects. String secondRuleId = addRuleWithEffects( - new ZenDeviceEffects.Builder().setShouldDimWallpaper(true).build()); + new ZenDeviceEffects.Builder() + .setShouldDimWallpaper(true) + .addExtraEffect("TWO") + .build()); mZenModeHelper.setAutomaticZenRuleState(secondRuleId, CONDITION_TRUE, UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); mTestableLooper.processAllMessages(); @@ -4722,6 +4818,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { eq(new ZenDeviceEffects.Builder() .setShouldDisplayGrayscale(true) .setShouldDimWallpaper(true) + .setExtraEffects(ImmutableSet.of("ONE", "TWO")) .build()), eq(UPDATE_ORIGIN_APP)); } @@ -4732,7 +4829,10 @@ public class ZenModeHelperTest extends UiServiceTestCase { mZenModeHelper.setDeviceEffectsApplier(mDeviceEffectsApplier); verify(mDeviceEffectsApplier).apply(eq(NO_EFFECTS), eq(UPDATE_ORIGIN_INIT)); - ZenDeviceEffects zde = new ZenDeviceEffects.Builder().setShouldUseNightMode(true).build(); + ZenDeviceEffects zde = new ZenDeviceEffects.Builder() + .setShouldUseNightMode(true) + .addExtraEffect("extra_effect") + .build(); String ruleId = addRuleWithEffects(zde); mZenModeHelper.setAutomaticZenRuleState(ruleId, CONDITION_TRUE, UPDATE_ORIGIN_APP, CUSTOM_PKG_UID); @@ -4798,7 +4898,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { .setDeviceEffects(effects) .build(); return mZenModeHelper.addAutomaticZenRule(mContext.getPackageName(), rule, - UPDATE_ORIGIN_APP, "reasons", CUSTOM_PKG_UID); + UPDATE_ORIGIN_SYSTEM_OR_SYSTEMUI, "reasons", Process.SYSTEM_UID); } @Test diff --git a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java index bdbb6c6baa70..7db707a42ff0 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java @@ -1797,7 +1797,6 @@ public class VibratorManagerServiceTest { cancelVibrate(service); // Clean up long effect. } - @FlakyTest @Test public void onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration() throws Exception { diff --git a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java index 1fb7cd8e6e1c..9e2b1eccc3b2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java @@ -32,14 +32,17 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; +import static com.android.server.wm.DragDropController.MSG_UNHANDLED_DROP_LISTENER_TIMEOUT; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.app.PendingIntent; @@ -49,9 +52,12 @@ import android.content.Intent; import android.content.pm.ShortcutServiceInternal; import android.graphics.PixelFormat; import android.os.Binder; +import android.os.Handler; import android.os.IBinder; import android.os.Looper; +import android.os.Message; import android.os.Parcelable; +import android.os.RemoteException; import android.os.UserHandle; import android.platform.test.annotations.Presubmit; import android.view.DragEvent; @@ -61,6 +67,7 @@ import android.view.SurfaceSession; import android.view.View; import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; +import android.window.IUnhandledDragListener; import androidx.test.filters.SmallTest; @@ -533,14 +540,98 @@ public class DragDropControllerTests extends WindowTestsBase { }); } + @Test + public void testUnhandledDragListenerNotCalledForNormalDrags() throws RemoteException { + assumeTrue(com.android.window.flags.Flags.delegateUnhandledDrags()); + + final IUnhandledDragListener listener = mock(IUnhandledDragListener.class); + doReturn(mock(Binder.class)).when(listener).asBinder(); + mTarget.setUnhandledDragListener(listener); + doDragAndDrop(0, ClipData.newPlainText("label", "Test"), 0, 0); + verify(listener, times(0)).onUnhandledDrop(any(), any()); + } + + @Test + public void testUnhandledDragListenerReceivesUnhandledDropOverWindow() { + assumeTrue(com.android.window.flags.Flags.delegateUnhandledDrags()); + + final IUnhandledDragListener listener = mock(IUnhandledDragListener.class); + doReturn(mock(Binder.class)).when(listener).asBinder(); + mTarget.setUnhandledDragListener(listener); + final int invalidXY = 100_000; + startDrag(View.DRAG_FLAG_GLOBAL, ClipData.newPlainText("label", "Test"), () -> { + // Notify the unhandled drag listener + mTarget.reportDropWindow(mWindow.mInputChannelToken, invalidXY, invalidXY); + mTarget.handleMotionEvent(false /* keepHandling */, invalidXY, invalidXY); + mTarget.reportDropResult(mWindow.mClient, false); + mTarget.onUnhandledDropCallback(true); + mToken = null; + try { + verify(listener, times(1)).onUnhandledDrop(any(), any()); + } catch (RemoteException e) { + fail("Failed to verify unhandled drop: " + e); + } + }); + } + + @Test + public void testUnhandledDragListenerReceivesUnhandledDropOverNoValidWindow() { + assumeTrue(com.android.window.flags.Flags.delegateUnhandledDrags()); + + final IUnhandledDragListener listener = mock(IUnhandledDragListener.class); + doReturn(mock(Binder.class)).when(listener).asBinder(); + mTarget.setUnhandledDragListener(listener); + final int invalidXY = 100_000; + startDrag(View.DRAG_FLAG_GLOBAL, ClipData.newPlainText("label", "Test"), () -> { + // Notify the unhandled drag listener + mTarget.reportDropWindow(mock(IBinder.class), invalidXY, invalidXY); + mTarget.handleMotionEvent(false /* keepHandling */, invalidXY, invalidXY); + mTarget.onUnhandledDropCallback(true); + mToken = null; + try { + verify(listener, times(1)).onUnhandledDrop(any(), any()); + } catch (RemoteException e) { + fail("Failed to verify unhandled drop: " + e); + } + }); + } + + @Test + public void testUnhandledDragListenerCallbackTimeout() { + assumeTrue(com.android.window.flags.Flags.delegateUnhandledDrags()); + + final IUnhandledDragListener listener = mock(IUnhandledDragListener.class); + doReturn(mock(Binder.class)).when(listener).asBinder(); + mTarget.setUnhandledDragListener(listener); + final int invalidXY = 100_000; + startDrag(View.DRAG_FLAG_GLOBAL, ClipData.newPlainText("label", "Test"), () -> { + // Notify the unhandled drag listener + mTarget.reportDropWindow(mock(IBinder.class), invalidXY, invalidXY); + mTarget.handleMotionEvent(false /* keepHandling */, invalidXY, invalidXY); + + // Verify that the unhandled drop listener callback timeout has been scheduled + final Handler handler = mTarget.getHandler(); + assertTrue(handler.hasMessages(MSG_UNHANDLED_DROP_LISTENER_TIMEOUT)); + + // Force trigger the timeout and verify that it actually cleans up the drag & timeout + handler.handleMessage(Message.obtain(handler, MSG_UNHANDLED_DROP_LISTENER_TIMEOUT)); + assertFalse(handler.hasMessages(MSG_UNHANDLED_DROP_LISTENER_TIMEOUT)); + assertFalse(mTarget.dragDropActiveLocked()); + mToken = null; + }); + } + private void doDragAndDrop(int flags, ClipData data, float dropX, float dropY) { startDrag(flags, data, () -> { mTarget.reportDropWindow(mWindow.mInputChannelToken, dropX, dropY); - mTarget.handleMotionEvent(false, dropX, dropY); + mTarget.handleMotionEvent(false /* keepHandling */, dropX, dropY); mToken = mWindow.mClient.asBinder(); }); } + /** + * Starts a drag with the given parameters, calls Runnable `r` after drag is started. + */ private void startDrag(int flag, ClipData data, Runnable r) { final SurfaceSession appSession = new SurfaceSession(); try { diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java index 7d8eb90ea79c..ce890f6d8751 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java @@ -33,6 +33,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; +import static android.window.TransitionInfo.FLAG_CONFIG_AT_END; import static android.window.TransitionInfo.FLAG_FILLS_TASK; import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; import static android.window.TransitionInfo.FLAG_IS_BEHIND_STARTING_WINDOW; @@ -2540,6 +2541,36 @@ public class TransitionTests extends WindowTestsBase { } @Test + public void testConfigAtEnd() { + final TransitionController controller = mDisplayContent.mTransitionController; + Transition transit = createTestTransition(TRANSIT_CHANGE, controller); + final TestTransitionPlayer player = registerTestTransitionPlayer(); + + final Task task = createTask(mDisplayContent); + final Rect taskBounds = new Rect(0, 0, 200, 300); + task.getConfiguration().windowConfiguration.setBounds(taskBounds); + final ActivityRecord activity = createActivityRecord(task); + activity.setVisibleRequested(true); + activity.setVisible(true); + + controller.moveToCollecting(transit); + transit.collect(task); + transit.setConfigAtEnd(task); + task.getRequestedOverrideConfiguration().windowConfiguration.setBounds( + new Rect(10, 10, 200, 300)); + task.onRequestedOverrideConfigurationChanged(task.getRequestedOverrideConfiguration()); + + controller.requestStartTransition(transit, task, null, null); + player.start(); + assertTrue(activity.isConfigurationDispatchPaused()); + // config-at-end flag must propagate up to task if activity was promoted. + assertTrue(player.mLastReady.getChange( + task.mRemoteToken.toWindowContainerToken()).hasFlags(FLAG_CONFIG_AT_END)); + player.finish(); + assertFalse(activity.isConfigurationDispatchPaused()); + } + + @Test public void testReadyTrackerBasics() { final TransitionController controller = new TestTransitionController( mock(ActivityTaskManagerService.class)); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java index aa9c0c8457f5..03b695d170ad 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -48,6 +48,7 @@ import static com.android.server.wm.testing.Assert.assertThrows; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -901,7 +902,8 @@ public class WindowOrganizerTests extends WindowTestsBase { new Binder(), 0 /* index */, WindowInsets.Type.systemOverlays(), - new Rect(0, 0, 1080, 200)); + new Rect(0, 0, 1080, 200), + null /* boundingRects */); mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); assertThat(navigationBarInsetsReceiverTask.mLocalInsetsSources @@ -910,6 +912,31 @@ public class WindowOrganizerTests extends WindowTestsBase { } @Test + public void testAddInsetsSource_withBoundingRects() { + final Task rootTask = createTask(mDisplayContent); + + final Task navigationBarInsetsReceiverTask = createTaskInRootTask(rootTask, 0); + navigationBarInsetsReceiverTask.getConfiguration().windowConfiguration.setBounds(new Rect( + 0, 200, 1080, 700)); + + final Rect[] boundingRects = new Rect[]{ + new Rect(0, 0, 10, 10), new Rect(100, 100, 200, 100) + }; + final WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.addInsetsSource( + navigationBarInsetsReceiverTask.mRemoteToken.toWindowContainerToken(), + new Binder(), + 0 /* index */, + WindowInsets.Type.systemOverlays(), + new Rect(0, 0, 1080, 200), + boundingRects); + mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); + + assertArrayEquals(boundingRects, navigationBarInsetsReceiverTask.mLocalInsetsSources + .valueAt(0).getBoundingRects()); + } + + @Test public void testRemoveInsetsSource() { final Task rootTask = createTask(mDisplayContent); @@ -923,7 +950,8 @@ public class WindowOrganizerTests extends WindowTestsBase { owner, 0 /* index */, WindowInsets.Type.systemOverlays(), - new Rect(0, 0, 1080, 200)); + new Rect(0, 0, 1080, 200), + null /* boundingRects */); mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); final WindowContainerTransaction wct2 = new WindowContainerTransaction(); diff --git a/services/usb/Android.bp b/services/usb/Android.bp index 3a0a6abb2307..e8ffe541d641 100644 --- a/services/usb/Android.bp +++ b/services/usb/Android.bp @@ -34,8 +34,20 @@ java_library_static { "android.hardware.usb-V1.2-java", "android.hardware.usb-V1.3-java", "android.hardware.usb-V3-java", + "usb_flags_lib", ], lint: { baseline_filename: "lint-baseline.xml", }, } + +aconfig_declarations { + name: "usb_flags", + package: "com.android.server.usb.flags", + srcs: ["**/usb_flags.aconfig"], +} + +java_aconfig_library { + name: "usb_flags_lib", + aconfig_declarations: "usb_flags", +} diff --git a/services/usb/java/com/android/server/usb/UsbHandlerManager.java b/services/usb/java/com/android/server/usb/UsbHandlerManager.java index f3112743bcf2..d83ff1fbc381 100644 --- a/services/usb/java/com/android/server/usb/UsbHandlerManager.java +++ b/services/usb/java/com/android/server/usb/UsbHandlerManager.java @@ -37,7 +37,7 @@ import java.util.ArrayList; * * @hide */ -class UsbHandlerManager { +public class UsbHandlerManager { private static final String LOG_TAG = UsbHandlerManager.class.getSimpleName(); private final Context mContext; diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java index f91666081e82..2ff21ad40558 100644 --- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java @@ -18,6 +18,7 @@ package com.android.server.usb; import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE; +import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; @@ -62,6 +63,7 @@ import com.android.internal.util.XmlUtils; import com.android.internal.util.dump.DualDumpOutputStream; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; +import com.android.server.usb.flags.Flags; import com.android.server.utils.EventLogger; import libcore.io.IoUtils; @@ -80,8 +82,20 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; -class UsbProfileGroupSettingsManager { +public class UsbProfileGroupSettingsManager { + /** + * <application> level property that an app can specify to restrict any overlaying of + * activities when usb device is attached. + * + * + * <p>This should only be set by privileged apps having {@link Manifest.permission#MANAGE_USB} + * permission. + * @hide + */ + public static final String PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES = + "android.app.PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES"; private static final String TAG = UsbProfileGroupSettingsManager.class.getSimpleName(); private static final boolean DEBUG = false; @@ -101,6 +115,8 @@ class UsbProfileGroupSettingsManager { private final PackageManager mPackageManager; + private final ActivityManager mActivityManager; + private final UserManager mUserManager; private final @NonNull UsbSettingsManager mSettingsManager; @@ -224,7 +240,7 @@ class UsbProfileGroupSettingsManager { * @param settingsManager The settings manager of the service * @param usbResolveActivityManager The resovle activity manager of the service */ - UsbProfileGroupSettingsManager(@NonNull Context context, @NonNull UserHandle user, + public UsbProfileGroupSettingsManager(@NonNull Context context, @NonNull UserHandle user, @NonNull UsbSettingsManager settingsManager, @NonNull UsbHandlerManager usbResolveActivityManager) { if (DEBUG) Slog.v(TAG, "Creating settings for " + user); @@ -238,6 +254,7 @@ class UsbProfileGroupSettingsManager { mContext = context; mPackageManager = context.getPackageManager(); + mActivityManager = context.getSystemService(ActivityManager.class); mSettingsManager = settingsManager; mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); @@ -895,7 +912,10 @@ class UsbProfileGroupSettingsManager { // Send broadcast to running activities with registered intent mContext.sendBroadcastAsUser(intent, UserHandle.ALL); - resolveActivity(intent, device, true /* showMtpNotification */); + //resolving activities only if there is no foreground activity restricting it. + if (!shouldRestrictOverlayActivities()) { + resolveActivity(intent, device, true /* showMtpNotification */); + } } private void resolveActivity(Intent intent, UsbDevice device, boolean showMtpNotification) { @@ -918,6 +938,63 @@ class UsbProfileGroupSettingsManager { resolveActivity(intent, matches, defaultActivity, device, null); } + /** + * @return true if any application in foreground have set restrict_usb_overlay_activities as + * true in manifest file. The application needs to have MANAGE_USB permission. + */ + private boolean shouldRestrictOverlayActivities() { + + if (!Flags.allowRestrictionOfOverlayActivities()) return false; + + List<ActivityManager.RunningAppProcessInfo> appProcessInfos = mActivityManager + .getRunningAppProcesses(); + + List<String> filteredAppProcessInfos = new ArrayList<>(); + boolean shouldRestrictOverlayActivities; + + //filtering out applications in foreground. + for (ActivityManager.RunningAppProcessInfo processInfo : appProcessInfos) { + if (processInfo.importance <= ActivityManager + .RunningAppProcessInfo.IMPORTANCE_FOREGROUND) { + filteredAppProcessInfos.addAll(List.of(processInfo.pkgList)); + } + } + + if (DEBUG) Slog.d(TAG, "packages in foreground : " + filteredAppProcessInfos); + + List<String> packagesHoldingManageUsbPermission = + mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY).stream() + .map(packageInfo -> packageInfo.packageName).collect(Collectors.toList()); + + //retaining only packages that hold the required permission + filteredAppProcessInfos.retainAll(packagesHoldingManageUsbPermission); + + if (DEBUG) { + Slog.d(TAG, "packages in foreground with required permission : " + + filteredAppProcessInfos); + } + + shouldRestrictOverlayActivities = filteredAppProcessInfos.stream().anyMatch(pkg -> { + try { + return mPackageManager.getProperty(PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES, pkg) + .getBoolean(); + } catch (NameNotFoundException e) { + if (DEBUG) { + Slog.d(TAG, "property PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES " + + "not present for " + pkg); + } + return false; + } + }); + + if (shouldRestrictOverlayActivities) { + Slog.d(TAG, "restricting starting of usb overlay activities"); + } + return shouldRestrictOverlayActivities; + } + public void deviceAttachedForFixedHandler(UsbDevice device, ComponentName component) { final Intent intent = createDeviceAttachedIntent(device); diff --git a/services/usb/java/com/android/server/usb/UsbSettingsManager.java b/services/usb/java/com/android/server/usb/UsbSettingsManager.java index 8e53ff412f0a..0b854a8440a5 100644 --- a/services/usb/java/com/android/server/usb/UsbSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbSettingsManager.java @@ -33,7 +33,7 @@ import java.util.List; /** * Maintains all {@link UsbUserSettingsManager} for all users. */ -class UsbSettingsManager { +public class UsbSettingsManager { private static final String LOG_TAG = UsbSettingsManager.class.getSimpleName(); private static final boolean DEBUG = false; @@ -70,7 +70,7 @@ class UsbSettingsManager { * * @return The settings for the user */ - @NonNull UsbUserSettingsManager getSettingsForUser(@UserIdInt int userId) { + public @NonNull UsbUserSettingsManager getSettingsForUser(@UserIdInt int userId) { synchronized (mSettingsByUser) { UsbUserSettingsManager settings = mSettingsByUser.get(userId); if (settings == null) { diff --git a/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java b/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java index c2b8d0109e68..be729c562f64 100644 --- a/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java @@ -49,7 +49,7 @@ import org.xmlpull.v1.XmlPullParser; import java.util.ArrayList; import java.util.List; -class UsbUserSettingsManager { +public class UsbUserSettingsManager { private static final String TAG = UsbUserSettingsManager.class.getSimpleName(); private static final boolean DEBUG = false; @@ -81,7 +81,7 @@ class UsbUserSettingsManager { * * @return The resolve infos of the activities that can handle the intent */ - List<ResolveInfo> queryIntentActivities(@NonNull Intent intent) { + public List<ResolveInfo> queryIntentActivities(@NonNull Intent intent) { return mPackageManager.queryIntentActivitiesAsUser(intent, PackageManager.GET_META_DATA, mUser.getIdentifier()); } diff --git a/services/usb/java/com/android/server/usb/flags/usb_flags.aconfig b/services/usb/java/com/android/server/usb/flags/usb_flags.aconfig new file mode 100644 index 000000000000..ea6e50221cd0 --- /dev/null +++ b/services/usb/java/com/android/server/usb/flags/usb_flags.aconfig @@ -0,0 +1,8 @@ +package: "com.android.server.usb.flags" + +flag { + name: "allow_restriction_of_overlay_activities" + namespace: "usb" + description: "This flag controls the restriction of usb overlay activities" + bug: "307231174" +} diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VisualQueryDetectorSession.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VisualQueryDetectorSession.java index d7b860f6a857..e4ac993f2d50 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VisualQueryDetectorSession.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VisualQueryDetectorSession.java @@ -33,6 +33,7 @@ import android.service.voice.IDetectorSessionVisualQueryDetectionCallback; import android.service.voice.IMicrophoneHotwordDetectionVoiceInteractionCallback; import android.service.voice.ISandboxedDetectionService; import android.service.voice.IVisualQueryDetectionVoiceInteractionCallback; +import android.service.voice.VisualQueryAttentionResult; import android.service.voice.VisualQueryDetectedResult; import android.service.voice.VisualQueryDetectionServiceFailure; import android.util.Slog; @@ -105,7 +106,7 @@ final class VisualQueryDetectorSession extends DetectorSession { new IDetectorSessionVisualQueryDetectionCallback.Stub(){ @Override - public void onAttentionGained() { + public void onAttentionGained(VisualQueryAttentionResult attentionResult) { Slog.v(TAG, "BinderCallback#onAttentionGained"); synchronized (mLock) { mEgressingData = true; @@ -113,7 +114,7 @@ final class VisualQueryDetectorSession extends DetectorSession { return; } try { - mAttentionListener.onAttentionGained(); + mAttentionListener.onAttentionGained(attentionResult); } catch (RemoteException e) { Slog.e(TAG, "Error delivering attention gained event.", e); try { @@ -129,7 +130,7 @@ final class VisualQueryDetectorSession extends DetectorSession { } @Override - public void onAttentionLost() { + public void onAttentionLost(int interactionIntention) { Slog.v(TAG, "BinderCallback#onAttentionLost"); synchronized (mLock) { mEgressingData = false; @@ -137,7 +138,7 @@ final class VisualQueryDetectorSession extends DetectorSession { return; } try { - mAttentionListener.onAttentionLost(); + mAttentionListener.onAttentionLost(interactionIntention); } catch (RemoteException e) { Slog.e(TAG, "Error delivering attention lost event.", e); try { diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 874c10c8ea83..a52614d5cda1 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -269,6 +269,27 @@ public final class Call { "android.telecom.extra.DIAGNOSTIC_MESSAGE"; /** + * Boolean indicating that the call is a verified business call. + * + * {@link Connection#setExtras(Bundle)} or {@link Connection#putExtras(Bundle)} + * should be used to notify Telecom this extra has been set. + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String EXTRA_IS_BUSINESS_CALL = + "android.telecom.extra.IS_BUSINESS_CALL"; + + /** + * String value indicating the asserted display name reported via + * ImsCallProfile#EXTRA_ASSERTED_DISPLAY_NAME. + * + * {@link Connection#setExtras(Bundle)} or {@link Connection#putExtras(Bundle)} + * should be used to notify Telecom this extra has been set. + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String EXTRA_ASSERTED_DISPLAY_NAME = + "android.telecom.extra.ASSERTED_DISPLAY_NAME"; + + /** * Reject reason used with {@link #reject(int)} to indicate that the user is rejecting this * call because they have declined to answer it. This typically means that they are unable * to answer the call at this time and would prefer it be sent to voicemail. diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 6bdc43ec2414..e6fe406dd8e5 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -190,6 +190,8 @@ public final class PhoneAccount implements Parcelable { * this may be used to skip call filtering when it has already been performed on another device. * @hide */ + @SystemApi + @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) public static final String EXTRA_SKIP_CALL_FILTERING = "android.telecom.extra.SKIP_CALL_FILTERING"; diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 3daa0143f244..15a978d167e1 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1611,6 +1611,26 @@ public class TelecomManager { * {@link PhoneAccount} when the upper bound limit, 10, has already been reached. * * @param account The complete {@link PhoneAccount}. + * @throws UnsupportedOperationException if the caller cannot modify phone state and the device + * does not have the Telecom feature. + * @throws SecurityException if: + * <ol> + * <li>the caller cannot modify phone state and the phone account doesn't belong to the + * calling user.</li> + * <li>the caller is registering a self-managed phone and either they are not allowed to + * manage their own calls or if the account is call capable, a connection manager, or a + * sim account.</li> + * <li>the caller is registering a sim account without the ability to do so.</li> + * <li>the caller is registering a multi-user phone account but isn't a system app.</li> + * <li>the account can make SIM-based voice calls but the caller cannot register sim + * accounts or isn't a sim call manager.</li> + * <li>the account defines the EXTRA_SKIP_CALL_FILTERING extra but the caller isn't + * able to modify the phone state.</li> + * <li>the caller is registering an account for a different user but isn't able to + * interact across users.</li> + * <li>if simultaneous calling is available and the phone account package name doesn't + * correspond to the simultaneous calling accounts associated with this phone account.</li> + * </ol> */ public void registerPhoneAccount(PhoneAccount account) { ITelecomService service = getTelecomService(); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f7793f373916..697c8ecd96e7 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -9778,6 +9778,13 @@ public class CarrierConfigManager { public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool"; /** + * Indicates if the carrier supports a business call composer. + */ + @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String KEY_SUPPORTS_BUSINESS_CALL_COMPOSER_BOOL = + "supports_business_call_composer_bool"; + + /** * Indicates the carrier server url that serves the call composer picture. */ public static final String KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING = @@ -10861,6 +10868,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false); sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, ""); sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false); + sDefaults.putBoolean(KEY_SUPPORTS_BUSINESS_CALL_COMPOSER_BOOL, false); sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, ""); sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false); sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, true); diff --git a/telephony/java/android/telephony/DomainSelectionService.java b/telephony/java/android/telephony/DomainSelectionService.java index 3c11da5f2daa..4ff9712f0907 100644 --- a/telephony/java/android/telephony/DomainSelectionService.java +++ b/telephony/java/android/telephony/DomainSelectionService.java @@ -831,7 +831,7 @@ public abstract class DomainSelectionService extends Service { @NonNull String tag, @NonNull String errorLogName) { try { CompletableFuture.runAsync( - () -> TelephonyUtils.runWithCleanCallingIdentity(r), executor).join(); + () -> TelephonyUtils.runWithCleanCallingIdentity(r), executor); } catch (CancellationException | CompletionException e) { Rlog.w(tag, "Binder - " + errorLogName + " exception: " + e.getMessage()); } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 711820796496..cd641b8be0b6 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1156,6 +1156,28 @@ public class SubscriptionManager { */ public static final String TRANSFER_STATUS = SimInfo.COLUMN_TRANSFER_STATUS; + /** + * TelephonyProvider column name for satellite entitlement status. The value of this column is + * set based on entitlement query result for satellite configuration. + * By default, it's disabled. + * <P>Type: INTEGER (int)</P> + * + * @hide + */ + public static final String SATELLITE_ENTITLEMENT_STATUS = + SimInfo.COLUMN_SATELLITE_ENTITLEMENT_STATUS; + + /** + * TelephonyProvider column name for satellite entitlement plmns. The value of this column is + * set based on entitlement query result for satellite configuration. + * By default, it's empty. + * <P>Type: TEXT </P> + * + * @hide + */ + public static final String SATELLITE_ENTITLEMENT_PLMNS = + SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS; + /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = {"USAGE_SETTING_"}, diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 61c7a420b604..041822bf4ee9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -10629,20 +10629,27 @@ public class TelephonyManager { } /** - * Call composer status OFF from user setting. + * Call composer status <b>OFF</b> from user setting. */ public static final int CALL_COMPOSER_STATUS_OFF = 0; /** - * Call composer status ON from user setting. + * Call composer status <b>ON</b> from user setting. */ public static final int CALL_COMPOSER_STATUS_ON = 1; + /** + * Call composer status <b>Business Only</b> from user setting. + */ + @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final int CALL_COMPOSER_STATUS_BUSINESS_ONLY = 2; + /** @hide */ @IntDef(prefix = {"CALL_COMPOSER_STATUS_"}, value = { CALL_COMPOSER_STATUS_ON, CALL_COMPOSER_STATUS_OFF, + CALL_COMPOSER_STATUS_BUSINESS_ONLY }) @Retention(RetentionPolicy.SOURCE) public @interface CallComposerStatus {} @@ -10663,9 +10670,16 @@ public class TelephonyManager { @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) public void setCallComposerStatus(@CallComposerStatus int status) { - if (status > CALL_COMPOSER_STATUS_ON - || status < CALL_COMPOSER_STATUS_OFF) { - throw new IllegalArgumentException("requested status is invalid"); + if (com.android.server.telecom.flags.Flags.businessCallComposer()) { + if (status > CALL_COMPOSER_STATUS_BUSINESS_ONLY + || status < CALL_COMPOSER_STATUS_OFF) { + throw new IllegalArgumentException("requested status is invalid"); + } + } else { + if (status > CALL_COMPOSER_STATUS_ON + || status < CALL_COMPOSER_STATUS_OFF) { + throw new IllegalArgumentException("requested status is invalid"); + } } try { ITelephony telephony = getITelephony(); diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java index 7935d243397c..e3ce766b40bc 100644 --- a/telephony/java/android/telephony/euicc/EuiccManager.java +++ b/telephony/java/android/telephony/euicc/EuiccManager.java @@ -1024,11 +1024,22 @@ public class EuiccManager { /** * Attempt to download the given {@link DownloadableSubscription}. * - * <p>Requires the {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission, - * or the calling app must be authorized to manage both the currently-active subscription on the + * <p>Requires the {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} + * or the calling app must be authorized to manage both the currently-active + * subscription on the * current eUICC and the subscription to be downloaded according to the subscription metadata. * Without the former, an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} will be - * returned in the callback intent to prompt the user to accept the download. + * eturned in the callback intent to prompt the user to accept the download. + * + * <p> Starting from Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, + * if the caller has the + * {@code android.Manifest.permission#MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS} permission or + * is a profile owner or device owner, and + * {@code switchAfterDownload} is {@code false}, then the downloaded subscription + * will be managed by that caller. If {@code switchAfterDownload} is true, + * an {@link #EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR} will be + * returned in the callback intent to prompt the user to accept the download and the + * subscription will not be managed. * * <p>On a multi-active SIM device, requires the * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission, or a calling app @@ -1061,7 +1072,9 @@ public class EuiccManager { * @throws UnsupportedOperationException If the device does not have * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. */ - @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) + @RequiresPermission(anyOf = { + Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS, + Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS}) public void downloadSubscription(DownloadableSubscription subscription, boolean switchAfterDownload, PendingIntent callbackIntent) { if (!isEnabled()) { @@ -1243,6 +1256,12 @@ public class EuiccManager { * <p>Requires that the calling app has carrier privileges according to the metadata of the * profile to be deleted, or the * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission. + * Starting from Android {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}, if the + * caller is a device owner, profile owner, or holds the + * {@code android.Manifest.permission#MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS} permission, + * then the caller can delete a subscription that was downloaded by that caller. + * If such a caller tries to delete any other subscription then the + * operation will fail with {@link #EMBEDDED_SUBSCRIPTION_RESULT_ERROR}. * * @param subscriptionId the ID of the subscription to delete. * @param callbackIntent a PendingIntent to launch when the operation completes. @@ -1250,7 +1269,9 @@ public class EuiccManager { * @throws UnsupportedOperationException If the device does not have * {@link PackageManager#FEATURE_TELEPHONY_EUICC}. */ - @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) + @RequiresPermission(anyOf = { + Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS, + Manifest.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS}) public void deleteSubscription(int subscriptionId, PendingIntent callbackIntent) { if (!isEnabled()) { sendUnavailableError(callbackIntent); diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index d07edeb971ea..cebfe014a062 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -16,6 +16,7 @@ package android.telephony.ims; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -299,6 +300,16 @@ public final class ImsCallProfile implements Parcelable { "android.telephony.ims.extra.IS_BUSINESS_CALL"; /** + * The vendor IMS stack populates this {@code string} extra; it is used to hold the display name + * passed via the P-Asserted-Identity SIP header’s display-name field + * + * Reference: RFC3325 + */ + @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final String EXTRA_ASSERTED_DISPLAY_NAME = + "android.telephony.ims.extra.ASSERTED_DISPLAY_NAME"; + + /** * Values for EXTRA_OIR / EXTRA_CNAP */ /** diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index 746246c64e8c..9789082e1460 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -17,6 +17,7 @@ package android.telephony.ims.feature; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -59,6 +60,7 @@ import com.android.ims.internal.IImsEcbm; import com.android.ims.internal.IImsMultiEndpoint; import com.android.ims.internal.IImsUt; import com.android.internal.telephony.util.TelephonyUtils; +import com.android.server.telecom.flags.Flags; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -513,7 +515,8 @@ public class MmTelFeature extends ImsFeature { CAPABILITY_TYPE_VIDEO, CAPABILITY_TYPE_UT, CAPABILITY_TYPE_SMS, - CAPABILITY_TYPE_CALL_COMPOSER + CAPABILITY_TYPE_CALL_COMPOSER, + CAPABILITY_TYPE_CALL_COMPOSER_BUSINESS_ONLY }) @Retention(RetentionPolicy.SOURCE) public @interface MmTelCapability {} @@ -550,11 +553,19 @@ public class MmTelFeature extends ImsFeature { */ public static final int CAPABILITY_TYPE_CALL_COMPOSER = 1 << 4; + + /** + * This MmTelFeature supports Business-only Call Composer + */ + @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER) + public static final int CAPABILITY_TYPE_CALL_COMPOSER_BUSINESS_ONLY = 1 << 5; + /** * This is used to check the upper range of MmTel capability * @hide */ - public static final int CAPABILITY_TYPE_MAX = CAPABILITY_TYPE_CALL_COMPOSER + 1; + public static final int CAPABILITY_TYPE_MAX = + CAPABILITY_TYPE_CALL_COMPOSER_BUSINESS_ONLY + 1; /** * @hide @@ -601,6 +612,8 @@ public class MmTelFeature extends ImsFeature { builder.append(isCapable(CAPABILITY_TYPE_SMS)); builder.append(" CALL_COMPOSER: "); builder.append(isCapable(CAPABILITY_TYPE_CALL_COMPOSER)); + builder.append(" BUSINESS_COMPOSER_ONLY: "); + builder.append(isCapable(CAPABILITY_TYPE_CALL_COMPOSER_BUSINESS_ONLY)); builder.append("]"); return builder.toString(); } diff --git a/telephony/java/android/telephony/satellite/stub/ISatellite.aidl b/telephony/java/android/telephony/satellite/stub/ISatellite.aidl index 711be02761fe..9441fb5d02ef 100644 --- a/telephony/java/android/telephony/satellite/stub/ISatellite.aidl +++ b/telephony/java/android/telephony/satellite/stub/ISatellite.aidl @@ -501,4 +501,22 @@ oneway interface ISatellite { * SatelliteResult:SATELLITE_RESULT_REQUEST_NOT_SUPPORTED */ void stopSendingNtnSignalStrength(in IIntegerConsumer resultCallback); + + /** + * Abort all outgoing satellite datagrams which vendor service has received from Telephony + * framework. + * + * This API helps modem to be in sync with framework when framework times out on sending + * datagrams. + * + * @param resultCallback The callback to receive the error code result of the operation. + * + * Valid result codes returned: + * SatelliteResult:SATELLITE_RESULT_SUCCESS + * SatelliteResult:SATELLITE_RESULT_INVALID_MODEM_STATE + * SatelliteResult:SATELLITE_RESULT_MODEM_ERROR + * SatelliteResult:SATELLITE_RESULT_RADIO_NOT_AVAILABLE + * SatelliteResult:SATELLITE_RESULT_REQUEST_NOT_SUPPORTED + */ + void abortSendingSatelliteDatagrams(in IIntegerConsumer resultCallback); } diff --git a/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java b/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java index abacd1527729..f17ff17497f2 100644 --- a/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java +++ b/telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java @@ -265,6 +265,14 @@ public class SatelliteImplBase extends SatelliteService { "stopSendingNtnSignalStrength"); } + @Override + public void abortSendingSatelliteDatagrams(IIntegerConsumer resultCallback) + throws RemoteException { + executeMethodAsync( + () -> SatelliteImplBase.this.abortSendingSatelliteDatagrams(resultCallback), + "abortSendingSatelliteDatagrams"); + } + // Call the methods with a clean calling identity on the executor and wait indefinitely for // the future to return. private void executeMethodAsync(Runnable r, String errorLogName) throws RemoteException { @@ -783,4 +791,13 @@ public class SatelliteImplBase extends SatelliteService { public void stopSendingNtnSignalStrength(@NonNull IIntegerConsumer resultCallback){ // stub implementation } + + /** + * Requests to abort sending satellite datagrams + * + * @param resultCallback The {@link SatelliteError} result of the operation. + */ + public void abortSendingSatelliteDatagrams(@NonNull IIntegerConsumer resultCallback){ + // stub implementation + } } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index bd47b1fc2dc0..ff2ee27abc60 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -3046,13 +3046,24 @@ interface ITelephony { boolean setSatellitePointingUiClassName(in String packageName, in String className); /** - * This API can be used by only CTS to update the timeout duration in milliseconds whether - * the device is aligned with the satellite for demo mode + * This API can be used by only CTS to override the timeout durations used by the + * DatagramController module. * * @param timeoutMillis The timeout duration in millisecond. * @return {@code true} if the timeout duration is set successfully, {@code false} otherwise. */ - boolean setSatelliteDeviceAlignedTimeoutDuration(long timeoutMillis); + boolean setDatagramControllerTimeoutDuration( + boolean reset, int timeoutType, long timeoutMillis); + + /** + * This API can be used by only CTS to override the timeout durations used by the + * SatelliteController module. + * + * @param timeoutMillis The timeout duration in millisecond. + * @return {@code true} if the timeout duration is set successfully, {@code false} otherwise. + */ + boolean setSatelliteControllerTimeoutDuration( + boolean reset, int timeoutType, long timeoutMillis); /** * This API can be used in only testing to override connectivity status in monitoring emergency diff --git a/test-mock/api/test-current.txt b/test-mock/api/test-current.txt index 9ed010881067..14f1b64869ef 100644 --- a/test-mock/api/test-current.txt +++ b/test-mock/api/test-current.txt @@ -3,6 +3,7 @@ package android.test.mock { public class MockContext extends android.content.Context { method public int getDisplayId(); + method public void updateDisplay(int); } @Deprecated public class MockPackageManager extends android.content.pm.PackageManager { diff --git a/tests/UsbManagerTests/Android.bp b/tests/UsbManagerTests/Android.bp index c02d8e96abb0..a16a7eafc8e8 100644 --- a/tests/UsbManagerTests/Android.bp +++ b/tests/UsbManagerTests/Android.bp @@ -29,12 +29,19 @@ android_test { static_libs: [ "frameworks-base-testutils", "androidx.test.rules", - "mockito-target-inline-minus-junit4", + "mockito-target-extended-minus-junit4", "platform-test-annotations", "truth", "UsbManagerTestLib", + "flag-junit", + "TestParameterInjector", + ], + jni_libs: [ + // Required for ExtendedMockito + "libdexmakerjvmtiagent", + "libmultiplejvmtiagentsinterferenceagent", + "libstaticjvmtiagent", ], - jni_libs: ["libdexmakerjvmtiagent"], certificate: "platform", platform_apis: true, test_suites: ["device-tests"], diff --git a/tests/UsbManagerTests/src/android/hardware/usb/UsbPortStatusTest.java b/tests/UsbManagerTests/src/android/hardware/usb/UsbPortStatusTest.java new file mode 100644 index 000000000000..dabfcae8e0fd --- /dev/null +++ b/tests/UsbManagerTests/src/android/hardware/usb/UsbPortStatusTest.java @@ -0,0 +1,99 @@ +/* + * 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.hardware.usb; + +import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED; +import static android.hardware.usb.UsbPortStatus.CONTAMINANT_PROTECTION_NONE; +import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE; +import static android.hardware.usb.UsbPortStatus.DATA_ROLE_HOST; +import static android.hardware.usb.UsbPortStatus.DATA_ROLE_NONE; +import static android.hardware.usb.UsbPortStatus.MODE_NONE; +import static android.hardware.usb.UsbPortStatus.POWER_ROLE_NONE; +import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK; +import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE; + +import static com.google.common.truth.Truth.assertThat; + +import android.hardware.usb.flags.Flags; +import android.platform.test.annotations.RequiresFlagsEnabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; + +import com.google.testing.junit.testparameterinjector.TestParameter; +import com.google.testing.junit.testparameterinjector.TestParameterInjector; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Tests for {@link android.hardware.usb.UsbPortStatus} */ +@RunWith(TestParameterInjector.class) +public class UsbPortStatusTest { + + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + + @Test + @RequiresFlagsEnabled(Flags.FLAG_ENABLE_IS_PD_COMPLIANT_API) + public void testIsPdCompliant( + @TestParameter boolean isSinkDeviceRoleSupported, + @TestParameter boolean isSinkHostRoleSupported, + @TestParameter boolean isSourceDeviceRoleSupported, + @TestParameter boolean isSourceHostRoleSupported) { + int supportedRoleCombinations = getSupportedRoleCombinations( + isSinkDeviceRoleSupported, + isSinkHostRoleSupported, + isSourceDeviceRoleSupported, + isSinkHostRoleSupported); + UsbPortStatus usbPortStatus = new UsbPortStatus( + MODE_NONE, + POWER_ROLE_NONE, + DATA_ROLE_NONE, + supportedRoleCombinations, + CONTAMINANT_PROTECTION_NONE, + CONTAMINANT_DETECTION_NOT_SUPPORTED); + boolean expectedResult = isSinkDeviceRoleSupported + && isSinkHostRoleSupported + && isSourceDeviceRoleSupported + && isSourceHostRoleSupported; + + assertThat(usbPortStatus.isPdCompliant()).isEqualTo(expectedResult); + } + + private int getSupportedRoleCombinations( + boolean isSinkDeviceRoleSupported, + boolean isSinkHostRoleSupported, + boolean isSourceDeviceRoleSupported, + boolean isSourceHostRoleSupported) { + int result = UsbPort.combineRolesAsBit(POWER_ROLE_NONE, DATA_ROLE_NONE); + + if (isSinkDeviceRoleSupported) { + result |= UsbPort.combineRolesAsBit(POWER_ROLE_SINK, DATA_ROLE_DEVICE); + } + if (isSinkHostRoleSupported) { + result |= UsbPort.combineRolesAsBit(POWER_ROLE_SINK, DATA_ROLE_HOST); + } + if (isSourceDeviceRoleSupported) { + result |= UsbPort.combineRolesAsBit(POWER_ROLE_SOURCE, DATA_ROLE_DEVICE); + } + if (isSourceHostRoleSupported) { + result |= UsbPort.combineRolesAsBit(POWER_ROLE_SOURCE, DATA_ROLE_HOST); + } + + return result; + } +} diff --git a/tests/UsbManagerTests/src/com/android/server/usbtest/UsbProfileGroupSettingsManagerTest.java b/tests/UsbManagerTests/src/com/android/server/usbtest/UsbProfileGroupSettingsManagerTest.java new file mode 100644 index 000000000000..4780d8a610e8 --- /dev/null +++ b/tests/UsbManagerTests/src/com/android/server/usbtest/UsbProfileGroupSettingsManagerTest.java @@ -0,0 +1,195 @@ +/* + * 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.usbtest; + +import static com.android.server.usb.UsbProfileGroupSettingsManager.PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.ActivityManager; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.Property; +import android.content.pm.UserInfo; +import android.content.res.Resources; +import android.hardware.usb.UsbDevice; +import android.os.UserHandle; +import android.os.UserManager; + +import androidx.test.runner.AndroidJUnit4; + +import com.android.dx.mockito.inline.extended.ExtendedMockito; +import com.android.server.usb.UsbHandlerManager; +import com.android.server.usb.UsbProfileGroupSettingsManager; +import com.android.server.usb.UsbSettingsManager; +import com.android.server.usb.UsbUserSettingsManager; +import com.android.server.usb.flags.Flags; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.MockitoSession; +import org.mockito.quality.Strictness; + +import java.util.ArrayList; +import java.util.List; + +/** + * Unit tests for {@link com.android.server.usb.UsbProfileGroupSettingsManager}. + * Note: MUST claim MANAGE_USB permission in Manifest + */ +@RunWith(AndroidJUnit4.class) +public class UsbProfileGroupSettingsManagerTest { + + private static final String TEST_PACKAGE_NAME = "testPkg"; + @Mock + private Context mContext; + @Mock + private PackageManager mPackageManager; + @Mock + private ActivityManager mActivityManager; + @Mock + private UserHandle mUserHandle; + @Mock + private UsbSettingsManager mUsbSettingsManager; + @Mock + private UsbHandlerManager mUsbHandlerManager; + @Mock + private UserManager mUserManager; + @Mock + private UsbUserSettingsManager mUsbUserSettingsManager; + @Mock private Property mProperty; + private ActivityManager.RunningAppProcessInfo mRunningAppProcessInfo; + private PackageInfo mPackageInfo; + private UsbProfileGroupSettingsManager mUsbProfileGroupSettingsManager; + private MockitoSession mStaticMockSession; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + mRunningAppProcessInfo = new ActivityManager.RunningAppProcessInfo(); + mRunningAppProcessInfo.pkgList = new String[]{TEST_PACKAGE_NAME}; + mPackageInfo = new PackageInfo(); + mPackageInfo.packageName = TEST_PACKAGE_NAME; + mPackageInfo.applicationInfo = Mockito.mock(ApplicationInfo.class); + + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mContext.getSystemService(ActivityManager.class)).thenReturn(mActivityManager); + when(mContext.getResources()).thenReturn(Mockito.mock(Resources.class)); + when(mContext.createPackageContextAsUser(anyString(), anyInt(), any(UserHandle.class))) + .thenReturn(mContext); + when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + + mUsbProfileGroupSettingsManager = new UsbProfileGroupSettingsManager(mContext, mUserHandle, + mUsbSettingsManager, mUsbHandlerManager); + + mStaticMockSession = ExtendedMockito.mockitoSession() + .mockStatic(Flags.class) + .strictness(Strictness.WARN) + .startMocking(); + + when(mPackageManager.getPackageInfo(TEST_PACKAGE_NAME, 0)).thenReturn(mPackageInfo); + when(mPackageManager.getProperty(eq(PROPERTY_RESTRICT_USB_OVERLAY_ACTIVITIES), + eq(TEST_PACKAGE_NAME))).thenReturn(mProperty); + when(mUserManager.getEnabledProfiles(anyInt())) + .thenReturn(List.of(Mockito.mock(UserInfo.class))); + when(mUsbSettingsManager.getSettingsForUser(anyInt())).thenReturn(mUsbUserSettingsManager); + } + + @After + public void tearDown() throws Exception { + mStaticMockSession.finishMocking(); + } + + @Test + public void testDeviceAttached_flagTrueWithoutForegroundActivity_resolveActivityCalled() { + when(Flags.allowRestrictionOfOverlayActivities()).thenReturn(true); + when(mActivityManager.getRunningAppProcesses()).thenReturn(new ArrayList<>()); + when(mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(List.of(mPackageInfo)); + UsbDevice device = Mockito.mock(UsbDevice.class); + mUsbProfileGroupSettingsManager.deviceAttached(device); + verify(mUsbUserSettingsManager).queryIntentActivities(any(Intent.class)); + } + + @Test + public void testDeviceAttached_noForegroundActivityWithUsbPermission_resolveActivityCalled() { + when(Flags.allowRestrictionOfOverlayActivities()).thenReturn(true); + when(mActivityManager.getRunningAppProcesses()).thenReturn(List.of(mRunningAppProcessInfo)); + when(mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(new ArrayList<>()); + UsbDevice device = Mockito.mock(UsbDevice.class); + mUsbProfileGroupSettingsManager.deviceAttached(device); + verify(mUsbUserSettingsManager).queryIntentActivities(any(Intent.class)); + } + + @Test + public void testDeviceAttached_foregroundActivityWithManifestField_resolveActivityNotCalled() { + when(Flags.allowRestrictionOfOverlayActivities()).thenReturn(true); + when(mProperty.getBoolean()).thenReturn(true); + when(mActivityManager.getRunningAppProcesses()).thenReturn(List.of(mRunningAppProcessInfo)); + when(mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(List.of(mPackageInfo)); + UsbDevice device = Mockito.mock(UsbDevice.class); + mUsbProfileGroupSettingsManager.deviceAttached(device); + verify(mUsbUserSettingsManager, times(0)) + .queryIntentActivities(any(Intent.class)); + } + + @Test + public void testDeviceAttached_foregroundActivityWithoutManifestField_resolveActivityCalled() { + when(Flags.allowRestrictionOfOverlayActivities()).thenReturn(true); + when(mProperty.getBoolean()).thenReturn(false); + when(mActivityManager.getRunningAppProcesses()).thenReturn(List.of(mRunningAppProcessInfo)); + when(mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(List.of(mPackageInfo)); + UsbDevice device = Mockito.mock(UsbDevice.class); + mUsbProfileGroupSettingsManager.deviceAttached(device); + verify(mUsbUserSettingsManager).queryIntentActivities(any(Intent.class)); + } + + @Test + public void testDeviceAttached_flagFalseForegroundActivity_resolveActivityCalled() { + when(Flags.allowRestrictionOfOverlayActivities()).thenReturn(false); + when(mProperty.getBoolean()).thenReturn(true); + when(mActivityManager.getRunningAppProcesses()).thenReturn(List.of(mRunningAppProcessInfo)); + when(mPackageManager.getPackagesHoldingPermissions( + new String[]{android.Manifest.permission.MANAGE_USB}, + PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(List.of(mPackageInfo)); + UsbDevice device = Mockito.mock(UsbDevice.class); + mUsbProfileGroupSettingsManager.deviceAttached(device); + verify(mUsbUserSettingsManager).queryIntentActivities(any(Intent.class)); + } +} diff --git a/tests/testables/src/android/testing/TestableLooper.java b/tests/testables/src/android/testing/TestableLooper.java index 60c25b75d2e9..be5c84c0353c 100644 --- a/tests/testables/src/android/testing/TestableLooper.java +++ b/tests/testables/src/android/testing/TestableLooper.java @@ -14,6 +14,8 @@ package android.testing; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -85,6 +87,57 @@ public class TestableLooper { setupQueue(looper); } + /** + * Wrap the given runnable so that it will run blocking on the Looper that will be set up for + * the given test. + * <p> + * This method is required to support any TestRule which needs to run setup and/or teardown code + * on the TestableLooper. Whether using {@link AndroidTestingRunner} or + * {@link TestWithLooperRule}, the TestRule's Statement evaluates on the test instrumentation + * thread, rather than the TestableLooper thread, so access to the TestableLooper is required. + * However, {@link #get(Object)} will return {@code null} both before and after the inner + * statement is evaluated: + * <ul> + * <li>Before the test {@link #get} returns {@code null} because while the TestableLooperHolder + * is accessible in sLoopers, it has not been initialized with an actual TestableLooper yet. + * This method's use of the internal LooperFrameworkMethod ensures that all setup and teardown + * of the TestableLooper happen as it would for all other wrapped code blocks. + * <li>After the test {@link #get} can return {@code null} because many tests call + * {@link #remove} in the teardown method. The fact that this method returns a runnable allows + * it to be called before the test (when the TestableLooperHolder is still in sLoopers), and + * then executed as teardown after the test. + * </ul> + * + * @param test the test instance (just like passed to {@link #get(Object)}) + * @param runnable the operation that should eventually be run on the TestableLooper + * @return a runnable that will block the thread on which it is called until the given runnable + * is finished. Will be {@code null} if there is no looper for the given test. + * @hide + */ + @Nullable + public static RunnableWithException wrapWithRunBlocking( + Object test, @NonNull RunnableWithException runnable) { + TestableLooperHolder looperHolder = sLoopers.get(test); + if (looperHolder == null) { + return null; + } + try { + FrameworkMethod base = new FrameworkMethod(runnable.getClass().getMethod("run")); + LooperFrameworkMethod wrapped = new LooperFrameworkMethod(base, looperHolder); + return () -> { + try { + wrapped.invokeExplosively(runnable); + } catch (RuntimeException | Error e) { + throw e; + } catch (Throwable e) { + throw new RuntimeException(e); + } + }; + } catch (NoSuchMethodException e) { + throw new RuntimeException(e); + } + } + public Looper getLooper() { return mLooper; } diff --git a/tools/hoststubgen/hoststubgen/Android.bp b/tools/hoststubgen/hoststubgen/Android.bp index 57bcc04a8aec..c6dd29ce7cc6 100644 --- a/tools/hoststubgen/hoststubgen/Android.bp +++ b/tools/hoststubgen/hoststubgen/Android.bp @@ -180,7 +180,6 @@ java_library { "framework-minus-apex.ravenwood", ], static_libs: [ - "core-xml-for-device", "hoststubgen-helper-libcore-runtime.ravenwood", ], } diff --git a/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/CursorWindow_host.java b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/CursorWindow_host.java index 631fc0273c94..eba99107f126 100644 --- a/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/CursorWindow_host.java +++ b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/CursorWindow_host.java @@ -17,6 +17,7 @@ package com.android.hoststubgen.nativesubstitution; import android.database.Cursor; import android.database.sqlite.SQLiteException; +import android.os.Parcel; import android.util.Base64; import java.text.DecimalFormat; @@ -31,6 +32,7 @@ public class CursorWindow_host { private static final HashMap<Long, CursorWindow_host> sInstances = new HashMap<>(); private static long sNextId = 1; + private String mName; private int mColumnNum; private static class Row { String[] fields; @@ -41,6 +43,7 @@ public class CursorWindow_host { public static long nativeCreate(String name, int cursorWindowSize) { CursorWindow_host instance = new CursorWindow_host(); + instance.mName = name; long instanceId = sNextId++; sInstances.put(instanceId, instance); return instanceId; @@ -50,6 +53,10 @@ public class CursorWindow_host { sInstances.remove(windowPtr); } + public static String nativeGetName(long windowPtr) { + return sInstances.get(windowPtr).mName; + } + public static boolean nativeSetNumColumns(long windowPtr, int columnNum) { sInstances.get(windowPtr).mColumnNum = columnNum; return true; @@ -156,4 +163,30 @@ public class CursorWindow_host { return null; } } + + public static void nativeWriteToParcel(long windowPtr, Parcel parcel) { + CursorWindow_host window = sInstances.get(windowPtr); + parcel.writeString(window.mName); + parcel.writeInt(window.mColumnNum); + parcel.writeInt(window.mRows.size()); + for (int row = 0; row < window.mRows.size(); row++) { + parcel.writeStringArray(window.mRows.get(row).fields); + parcel.writeIntArray(window.mRows.get(row).types); + } + } + + public static long nativeCreateFromParcel(Parcel parcel) { + long windowPtr = nativeCreate(null, 0); + CursorWindow_host window = sInstances.get(windowPtr); + window.mName = parcel.readString(); + window.mColumnNum = parcel.readInt(); + int rowCount = parcel.readInt(); + for (int row = 0; row < rowCount; row++) { + Row r = new Row(); + r.fields = parcel.createStringArray(); + r.types = parcel.createIntArray(); + window.mRows.add(r); + } + return windowPtr; + } } diff --git a/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongArrayMultiStateCounter_host.java b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongArrayMultiStateCounter_host.java index a1356237e5a4..4d39d88d58c3 100644 --- a/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongArrayMultiStateCounter_host.java +++ b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongArrayMultiStateCounter_host.java @@ -143,6 +143,16 @@ public class LongArrayMultiStateCounter_host { updateValue(values, timestampMs); } + public void addCounts(long[] delta) { + if (!mEnabled) { + return; + } + + for (int i = 0; i < mArrayLength; i++) { + mStates[mCurrentState].mCounter[i] += delta[i]; + } + } + public void getValues(long[] values, int state) { System.arraycopy(mStates[state].mCounter, 0, values, 0, mArrayLength); } @@ -331,6 +341,10 @@ public class LongArrayMultiStateCounter_host { LongArrayContainer_host.getInstance(containerInstanceId), timestampMs); } + public static void native_addCounts(long instanceId, long containerInstanceId) { + getInstance(instanceId).addCounts(LongArrayContainer_host.getInstance(containerInstanceId)); + } + public static void native_getCounts(long instanceId, long containerInstanceId, int state) { getInstance(instanceId).getValues(LongArrayContainer_host.getInstance(containerInstanceId), state); diff --git a/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongMultiStateCounter_host.java b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongMultiStateCounter_host.java new file mode 100644 index 000000000000..a5d0fc6872de --- /dev/null +++ b/tools/hoststubgen/hoststubgen/helper-framework-runtime-src/framework/com/android/hoststubgen/nativesubstitution/LongMultiStateCounter_host.java @@ -0,0 +1,263 @@ +/* + * 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.hoststubgen.nativesubstitution; + +import android.os.BadParcelableException; +import android.os.Parcel; + +import java.util.HashMap; + +/** + * Native implementation substitutions for the LongMultiStateCounter class. + */ +public class LongMultiStateCounter_host { + + /** + * A reimplementation of {@link com.android.internal.os.LongMultiStateCounter}, only in + * Java instead of native. The majority of the code (in C++) can be found in + * /frameworks/native/libs/battery/MultiStateCounter.h + */ + private static class LongMultiStateCounterRavenwood { + private final int mStateCount; + private int mCurrentState; + private long mLastStateChangeTimestampMs = -1; + private long mLastUpdateTimestampMs = -1; + private boolean mEnabled = true; + + private static class State { + private long mTimeInStateSinceUpdate; + private long mCounter; + } + + private final State[] mStates; + private long mValue; + + LongMultiStateCounterRavenwood(int stateCount) { + mStateCount = stateCount; + mStates = new State[stateCount]; + for (int i = 0; i < mStateCount; i++) { + mStates[i] = new State(); + } + } + + public void setEnabled(boolean enabled, long timestampMs) { + if (enabled == mEnabled) { + return; + } + + if (!enabled) { + setState(mCurrentState, timestampMs); + mEnabled = false; + } else { + if (timestampMs < mLastUpdateTimestampMs) { + timestampMs = mLastUpdateTimestampMs; + } + + if (mLastStateChangeTimestampMs >= 0) { + mLastStateChangeTimestampMs = timestampMs; + } + mEnabled = true; + } + } + + public void setState(int state, long timestampMs) { + if (mEnabled && mLastStateChangeTimestampMs >= 0 && mLastUpdateTimestampMs >= 0) { + if (timestampMs < mLastUpdateTimestampMs) { + timestampMs = mLastUpdateTimestampMs; + } + + if (timestampMs >= mLastStateChangeTimestampMs) { + mStates[mCurrentState].mTimeInStateSinceUpdate += + timestampMs - mLastStateChangeTimestampMs; + } else { + for (int i = 0; i < mStateCount; i++) { + mStates[i].mTimeInStateSinceUpdate = 0; + } + } + } + mCurrentState = state; + mLastStateChangeTimestampMs = timestampMs; + } + + public long updateValue(long value, long timestampMs) { + long returnValue = 0; + if (mEnabled || mLastUpdateTimestampMs < mLastStateChangeTimestampMs) { + if (timestampMs < mLastStateChangeTimestampMs) { + timestampMs = mLastStateChangeTimestampMs; + } + + setState(mCurrentState, timestampMs); + + if (mLastUpdateTimestampMs >= 0) { + if (timestampMs > mLastUpdateTimestampMs) { + long delta = value - mValue; + if (delta >= 0) { + returnValue = delta; + long timeSinceUpdate = timestampMs - mLastUpdateTimestampMs; + for (int i = 0; i < mStateCount; i++) { + long timeInState = mStates[i].mTimeInStateSinceUpdate; + if (timeInState > 0) { + mStates[i].mCounter += delta * timeInState / timeSinceUpdate; + mStates[i].mTimeInStateSinceUpdate = 0; + } + } + } else { + for (int i = 0; i < mStateCount; i++) { + mStates[i].mTimeInStateSinceUpdate = 0; + } + } + } else if (timestampMs < mLastUpdateTimestampMs) { + for (int i = 0; i < mStateCount; i++) { + mStates[i].mTimeInStateSinceUpdate = 0; + } + } + } + } + mValue = value; + mLastUpdateTimestampMs = timestampMs; + return returnValue; + } + + public void incrementValue(long count, long timestampMs) { + updateValue(mValue + count, timestampMs); + } + + public long getValue(int state) { + return mStates[state].mCounter; + } + + public void reset() { + mLastStateChangeTimestampMs = -1; + mLastUpdateTimestampMs = -1; + for (int i = 0; i < mStateCount; i++) { + mStates[i].mTimeInStateSinceUpdate = 0; + mStates[i].mCounter = 0; + } + } + + public void writeToParcel(Parcel parcel) { + parcel.writeInt(mStateCount); + for (int i = 0; i < mStateCount; i++) { + parcel.writeLong(mStates[i].mCounter); + } + } + + public void initFromParcel(Parcel parcel) { + try { + for (int i = 0; i < mStateCount; i++) { + mStates[i].mCounter = parcel.readLong(); + } + } catch (Exception e) { + throw new BadParcelableException(e); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("["); + for (int state = 0; state < mStateCount; state++) { + if (state != 0) { + sb.append(", "); + } + sb.append(state).append(": ").append(mStates[state].mCounter); + } + sb.append("]"); + if (mLastUpdateTimestampMs >= 0) { + sb.append(" updated: ").append(mLastUpdateTimestampMs); + } + if (mLastStateChangeTimestampMs >= 0) { + sb.append(" currentState: ").append(mCurrentState); + if (mLastStateChangeTimestampMs > mLastUpdateTimestampMs) { + sb.append(" stateChanged: ").append(mLastStateChangeTimestampMs); + } + } else { + sb.append(" currentState: none"); + } + return sb.toString(); + } + } + + private static final HashMap<Long, LongMultiStateCounterRavenwood> sInstances = + new HashMap<>(); + private static long sNextId = 1; + + public static long native_init(int stateCount) { + LongMultiStateCounterRavenwood instance = new LongMultiStateCounterRavenwood(stateCount); + long instanceId = sNextId++; + sInstances.put(instanceId, instance); + return instanceId; + } + + private static LongMultiStateCounterRavenwood getInstance(long instanceId) { + return sInstances.get(instanceId); + } + + public static void native_setEnabled(long instanceId, boolean enabled, + long timestampMs) { + getInstance(instanceId).setEnabled(enabled, timestampMs); + } + + public static int native_getStateCount(long instanceId) { + return getInstance(instanceId).mStateCount; + } + + public static long native_updateValue(long instanceId, long value, long timestampMs) { + return getInstance(instanceId).updateValue(value, timestampMs); + } + + public static void native_setState(long instanceId, int state, long timestampMs) { + getInstance(instanceId).setState(state, timestampMs); + } + + public static void native_incrementValue(long instanceId, long count, long timestampMs) { + getInstance(instanceId).incrementValue(count, timestampMs); + } + + public static long native_getCount(long instanceId, int state) { + return getInstance(instanceId).getValue(state); + } + + public static void native_reset(long instanceId) { + getInstance(instanceId).reset(); + } + + public static void native_writeToParcel(long instanceId, Parcel parcel, int flags) { + getInstance(instanceId).writeToParcel(parcel); + } + + public static long native_initFromParcel(Parcel parcel) { + int stateCount = parcel.readInt(); + if (stateCount < 0 || stateCount > 0xEFFF) { + throw new BadParcelableException("stateCount out of range"); + } + // LongMultiStateCounter.cpp uses AParcel, which throws on out-of-data. + if (parcel.dataPosition() >= parcel.dataSize()) { + throw new RuntimeException("Bad parcel"); + } + long instanceId = native_init(stateCount); + getInstance(instanceId).initFromParcel(parcel); + if (parcel.dataPosition() > parcel.dataSize()) { + throw new RuntimeException("Bad parcel"); + } + return instanceId; + } + + public static String native_toString(long instanceId) { + return getInstance(instanceId).toString(); + } +} diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGen.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGen.kt index 97e09b817ef6..1089f82b6472 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGen.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGen.kt @@ -49,6 +49,7 @@ import java.util.zip.ZipOutputStream class HostStubGen(val options: HostStubGenOptions) { fun run() { val errors = HostStubGenErrors() + val stats = HostStubGenStats() // Load all classes. val allClasses = loadClassStructures(options.inJar.get) @@ -80,7 +81,14 @@ class HostStubGen(val options: HostStubGenOptions) { options.enableClassChecker.get, allClasses, errors, + stats, ) + + // Dump statistics, if specified. + options.statsFile.ifSet { + PrintWriter(it).use { pw -> stats.dump(pw) } + log.i("Dump file created at $it") + } } /** @@ -237,6 +245,7 @@ class HostStubGen(val options: HostStubGenOptions) { enableChecker: Boolean, classes: ClassNodes, errors: HostStubGenErrors, + stats: HostStubGenStats, ) { log.i("Converting %s into [stub: %s, impl: %s] ...", inJar, outStubJar, outImplJar) log.i("ASM CheckClassAdapter is %s", if (enableChecker) "enabled" else "disabled") @@ -254,7 +263,8 @@ class HostStubGen(val options: HostStubGenOptions) { while (inEntries.hasMoreElements()) { val entry = inEntries.nextElement() convertSingleEntry(inZip, entry, stubOutStream, implOutStream, - filter, packageRedirector, enableChecker, classes, errors) + filter, packageRedirector, enableChecker, classes, errors, + stats) } log.i("Converted all entries.") } @@ -287,6 +297,7 @@ class HostStubGen(val options: HostStubGenOptions) { enableChecker: Boolean, classes: ClassNodes, errors: HostStubGenErrors, + stats: HostStubGenStats, ) { log.d("Entry: %s", entry.name) log.withIndent { @@ -300,7 +311,7 @@ class HostStubGen(val options: HostStubGenOptions) { // If it's a class, convert it. if (name.endsWith(".class")) { processSingleClass(inZip, entry, stubOutStream, implOutStream, filter, - packageRedirector, enableChecker, classes, errors) + packageRedirector, enableChecker, classes, errors, stats) return } @@ -354,6 +365,7 @@ class HostStubGen(val options: HostStubGenOptions) { enableChecker: Boolean, classes: ClassNodes, errors: HostStubGenErrors, + stats: HostStubGenStats, ) { val classInternalName = entry.name.replaceFirst("\\.class$".toRegex(), "") val classPolicy = filter.getPolicyForClass(classInternalName) @@ -370,7 +382,7 @@ class HostStubGen(val options: HostStubGenOptions) { stubOutStream.putNextEntry(newEntry) convertClass(classInternalName, /*forImpl=*/false, bis, stubOutStream, filter, packageRedirector, enableChecker, classes, - errors) + errors, null) stubOutStream.closeEntry() } } @@ -383,7 +395,7 @@ class HostStubGen(val options: HostStubGenOptions) { implOutStream.putNextEntry(newEntry) convertClass(classInternalName, /*forImpl=*/true, bis, implOutStream, filter, packageRedirector, enableChecker, classes, - errors) + errors, stats) implOutStream.closeEntry() } } @@ -403,6 +415,7 @@ class HostStubGen(val options: HostStubGenOptions) { enableChecker: Boolean, classes: ClassNodes, errors: HostStubGenErrors, + stats: HostStubGenStats?, ) { val cr = ClassReader(input) @@ -420,6 +433,7 @@ class HostStubGen(val options: HostStubGenOptions) { enablePostTrace = options.enablePostTrace.get, enableNonStubMethodCallDetection = options.enableNonStubMethodCallDetection.get, errors = errors, + stats = stats, ) outVisitor = BaseAdapter.getVisitor(classInternalName, classes, outVisitor, filter, packageRedirector, forImpl, visitorOptions) diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenOptions.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenOptions.kt index d2ead18b5492..9f5d524517d0 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenOptions.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenOptions.kt @@ -108,6 +108,8 @@ class HostStubGenOptions( var enablePostTrace: SetOnce<Boolean> = SetOnce(false), var enableNonStubMethodCallDetection: SetOnce<Boolean> = SetOnce(false), + + var statsFile: SetOnce<String?> = SetOnce(null), ) { companion object { @@ -252,6 +254,8 @@ class HostStubGenOptions( "--verbose-log" -> setLogFile(LogLevel.Verbose, nextArg()) "--debug-log" -> setLogFile(LogLevel.Debug, nextArg()) + "--stats-file" -> ret.statsFile.setNextStringArg() + else -> throw ArgumentsException("Unknown option: $arg") } } catch (e: SetOnce.SetMoreThanOnceException) { @@ -387,6 +391,7 @@ class HostStubGenOptions( enablePreTrace=$enablePreTrace, enablePostTrace=$enablePostTrace, enableNonStubMethodCallDetection=$enableNonStubMethodCallDetection, + statsFile=$statsFile, } """.trimIndent() } diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenStats.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenStats.kt new file mode 100644 index 000000000000..50518e1ccd9c --- /dev/null +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenStats.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.hoststubgen + +import com.android.hoststubgen.asm.toHumanReadableClassName +import com.android.hoststubgen.filters.FilterPolicyWithReason +import org.objectweb.asm.Opcodes +import java.io.PrintWriter + +open class HostStubGenStats { + data class Stats( + var supported: Int = 0, + var total: Int = 0, + val children: MutableMap<String, Stats> = mutableMapOf<String, Stats>(), + ) + + private val stats = mutableMapOf<String, Stats>() + + fun onVisitPolicyForMethod(fullClassName: String, methodName: String, descriptor: String, + policy: FilterPolicyWithReason, access: Int) { + // Ignore methods that aren't public + if ((access and Opcodes.ACC_PUBLIC) == 0) return + // Ignore methods that are abstract + if ((access and Opcodes.ACC_ABSTRACT) != 0) return + // Ignore methods where policy isn't relevant + if (policy.isIgnoredForStats) return + + val packageName = resolvePackageName(fullClassName) + val className = resolveClassName(fullClassName) + + // Ignore methods for certain generated code + if (className.endsWith("Proto") + or className.endsWith("ProtoEnums") + or className.endsWith("LogTags") + or className.endsWith("StatsLog")) { + return + } + + val packageStats = stats.getOrPut(packageName) { Stats() } + val classStats = packageStats.children.getOrPut(className) { Stats() } + + if (policy.policy.isSupported) { + packageStats.supported += 1 + classStats.supported += 1 + } + packageStats.total += 1 + classStats.total += 1 + } + + fun dump(pw: PrintWriter) { + pw.printf("PackageName,ClassName,SupportedMethods,TotalMethods\n") + stats.forEach { (packageName, packageStats) -> + if (packageStats.supported > 0) { + packageStats.children.forEach { (className, classStats) -> + pw.printf("%s,%s,%d,%d\n", packageName, className, + classStats.supported, classStats.total) + } + } + } + } + + private fun resolvePackageName(fullClassName: String): String { + val start = fullClassName.lastIndexOf('/') + return fullClassName.substring(0, start).toHumanReadableClassName() + } + + private fun resolveClassName(fullClassName: String): String { + val start = fullClassName.lastIndexOf('/') + val end = fullClassName.indexOf('$') + if (end == -1) { + return fullClassName.substring(start + 1) + } else { + return fullClassName.substring(start + 1, end) + } + } +} diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicy.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicy.kt index 93179969e968..4d211065f1c8 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicy.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicy.kt @@ -111,6 +111,16 @@ enum class FilterPolicy { } } + /** Returns whether a policy is considered supported. */ + val isSupported: Boolean + get() { + return when (this) { + // TODO: handle native method with no substitution as being unsupported + Stub, StubClass, Keep, KeepClass, SubstituteAndStub, SubstituteAndKeep -> true + else -> false + } + } + fun getSubstitutionBasePolicy(): FilterPolicy { return when (this) { SubstituteAndKeep -> Keep @@ -136,4 +146,4 @@ enum class FilterPolicy { fun withReason(reason: String): FilterPolicyWithReason { return FilterPolicyWithReason(this, reason) } -}
\ No newline at end of file +} diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicyWithReason.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicyWithReason.kt index b64a2f5fd8a5..eb03f66b5afa 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicyWithReason.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/FilterPolicyWithReason.kt @@ -63,4 +63,15 @@ data class FilterPolicyWithReason ( override fun toString(): String { return "[$policy - reason: $reason]" } -}
\ No newline at end of file + + /** Returns whether this policy should be ignored for stats. */ + val isIgnoredForStats: Boolean + get() { + return reason.contains("anonymous-inner-class") + || reason.contains("is-annotation") + || reason.contains("is-enum") + || reason.contains("is-synthetic-method") + || reason.contains("special-class") + || reason.contains("substitute-to") + } +} diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/ImplicitOutputFilter.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/ImplicitOutputFilter.kt index ea7d1d0ff391..78b13fd36f06 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/ImplicitOutputFilter.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/ImplicitOutputFilter.kt @@ -119,14 +119,14 @@ class ImplicitOutputFilter( if (cn.isEnum()) { mn?.let { mn -> if (isAutoGeneratedEnumMember(mn)) { - return memberPolicy.withReason(classPolicy.reason).wrapReason("enum") + return memberPolicy.withReason(classPolicy.reason).wrapReason("is-enum") } } } // Keep (or stub) all members of annotations. if (cn.isAnnotation()) { - return memberPolicy.withReason(classPolicy.reason).wrapReason("annotation") + return memberPolicy.withReason(classPolicy.reason).wrapReason("is-annotation") } mn?.let { @@ -134,7 +134,7 @@ class ImplicitOutputFilter( // For synthetic methods (such as lambdas), let's just inherit the class's // policy. return memberPolicy.withReason(classPolicy.reason).wrapReason( - "synthetic method") + "is-synthetic-method") } } } diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/TextFileFilterPolicyParser.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/TextFileFilterPolicyParser.kt index 7fdd944770c6..6ad83fbab083 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/TextFileFilterPolicyParser.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/TextFileFilterPolicyParser.kt @@ -132,23 +132,24 @@ fun createFilterFromTextPolicyFile( throw ParseException( "Policy for AIDL classes already defined") } - aidlPolicy = policy.withReason("$FILTER_REASON (AIDL)") + aidlPolicy = policy.withReason( + "$FILTER_REASON (special-class AIDL)") } SpecialClass.FeatureFlags -> { if (featureFlagsPolicy != null) { throw ParseException( "Policy for feature flags already defined") } - featureFlagsPolicy = - policy.withReason("$FILTER_REASON (feature flags)") + featureFlagsPolicy = policy.withReason( + "$FILTER_REASON (special-class feature flags)") } SpecialClass.Sysprops -> { if (syspropsPolicy != null) { throw ParseException( "Policy for sysprops already defined") } - syspropsPolicy = - policy.withReason("$FILTER_REASON (sysprops)") + syspropsPolicy = policy.withReason( + "$FILTER_REASON (special-class sysprops)") } } } diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/visitors/BaseAdapter.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/visitors/BaseAdapter.kt index 21cfd4bcd0d8..45e140c8e3ff 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/visitors/BaseAdapter.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/visitors/BaseAdapter.kt @@ -16,6 +16,7 @@ package com.android.hoststubgen.visitors import com.android.hoststubgen.HostStubGenErrors +import com.android.hoststubgen.HostStubGenStats import com.android.hoststubgen.LogLevel import com.android.hoststubgen.asm.ClassNodes import com.android.hoststubgen.asm.UnifiedVisitor @@ -50,6 +51,7 @@ abstract class BaseAdapter ( */ data class Options ( val errors: HostStubGenErrors, + val stats: HostStubGenStats?, val enablePreTrace: Boolean, val enablePostTrace: Boolean, val enableNonStubMethodCallDetection: Boolean, @@ -176,6 +178,7 @@ abstract class BaseAdapter ( } val p = filter.getPolicyForMethod(currentClassName, name, descriptor) log.d("visitMethod: %s%s [%x] [%s] Policy: %s", name, descriptor, access, signature, p) + options.stats?.onVisitPolicyForMethod(currentClassName, name, descriptor, p, access) log.withIndent { // If it's a substitute-from method, then skip (== remove). diff --git a/tools/protologtool/OWNERS b/tools/protologtool/OWNERS new file mode 100644 index 000000000000..18cf2be9f7df --- /dev/null +++ b/tools/protologtool/OWNERS @@ -0,0 +1,3 @@ +# ProtoLog owners +# Bug component: 1157642 +include platform/development:/tools/winscope/OWNERS |